summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/firefox/Makefile8
-rw-r--r--package/firefox/patches/patch-build_moz_configure_flags_configure13
-rw-r--r--package/firefox/patches/patch-servo_components_style_traits_values_rs37
-rw-r--r--package/firefox/patches/patch-servo_ports_geckolib_cbindgen_toml10
-rw-r--r--package/gdk-pixbuf/Makefile2
-rw-r--r--package/glib/Makefile32
-rw-r--r--package/glib/patches/patch-meson_build6
-rw-r--r--package/libiconv/Makefile2
-rw-r--r--package/libtiff/Makefile2
-rw-r--r--package/pcre2/Makefile7
-rw-r--r--package/python-mako/Makefile2
-rw-r--r--package/python-markupsafe/Makefile33
12 files changed, 121 insertions, 33 deletions
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index eb3cfeb9e..93a0199cb 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= firefox
-PKG_VERSION:= 108.0.1
+PKG_VERSION:= 129.0.2
PKG_RELEASE:= 1
-PKG_HASH:= 9821ac130dad01383e03276bf6cc92d41329d351da1fa7fa238168f8890611ea
+PKG_HASH:= 35a1da121af474833d013ecbc1f77aa55bb35678fe06d438842d320dfab3f344
PKG_DESCR:= www browser
PKG_SECTION:= app/browser
PKG_DEPENDS:= pango libfreetype fontconfig libxcomposite libxcursor
@@ -41,7 +41,9 @@ CONFIGURE_ARGS+= --prefix=/usr \
--disable-audio-backends \
--without-wasm-sandboxed-libraries \
--disable-profiling \
- --with-clang-path=/usr/bin/clang-13
+ --disable-crashreporter \
+ --with-clang-path=/usr/bin/clang-18 \
+ --with-libclang-path=/usr/lib/llvm-18/lib
firefox-install:
$(INSTALL_DIR) $(IDIR_FIREFOX)/usr/bin
diff --git a/package/firefox/patches/patch-build_moz_configure_flags_configure b/package/firefox/patches/patch-build_moz_configure_flags_configure
new file mode 100644
index 000000000..c0ac77a7c
--- /dev/null
+++ b/package/firefox/patches/patch-build_moz_configure_flags_configure
@@ -0,0 +1,13 @@
+--- firefox-129.0.2.orig/build/moz.configure/flags.configure 2024-08-19 21:21:42.000000000 +0200
++++ firefox-129.0.2/build/moz.configure/flags.configure 2024-09-08 06:27:20.661198142 +0200
+@@ -72,10 +72,6 @@ def link_libstdcxx_statically(
+ )
+
+
+-@depends(when=link_libstdcxx_statically)
+-def check_libstdcxx_linkage():
+- die("Firefox does not support linking statically with libstdc++")
+-
+
+ check_and_add_flag(
+ "-mieee",
diff --git a/package/firefox/patches/patch-servo_components_style_traits_values_rs b/package/firefox/patches/patch-servo_components_style_traits_values_rs
new file mode 100644
index 000000000..cc02de658
--- /dev/null
+++ b/package/firefox/patches/patch-servo_components_style_traits_values_rs
@@ -0,0 +1,37 @@
+--- firefox-129.0.2.orig/servo/components/style_traits/values.rs 2024-08-19 21:21:51.000000000 +0200
++++ firefox-129.0.2/servo/components/style_traits/values.rs 2024-09-08 06:18:31.271680673 +0200
+@@ -388,11 +388,11 @@ impl Separator for Space {
+ where
+ F: for<'tt> FnMut(&mut Parser<'i, 'tt>) -> Result<T, ParseError<'i, E>>,
+ {
+- input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less.
++ input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less.
+ let mut results = vec![parse_one(input)?];
+ loop {
+- input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less.
+- if let Ok(item) = input.try(&mut parse_one) {
++ input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less.
++ if let Ok(item) = input.try_parse(&mut parse_one) {
+ results.push(item);
+ } else {
+ return Ok(results);
+@@ -413,14 +413,14 @@ impl Separator for CommaWithSpace {
+ where
+ F: for<'tt> FnMut(&mut Parser<'i, 'tt>) -> Result<T, ParseError<'i, E>>,
+ {
+- input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less.
++ input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less.
+ let mut results = vec![parse_one(input)?];
+ loop {
+- input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less.
++ input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less.
+ let comma_location = input.current_source_location();
+- let comma = input.try(|i| i.expect_comma()).is_ok();
+- input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less.
+- if let Ok(item) = input.try(&mut parse_one) {
++ let comma = input.try_parse(|i| i.expect_comma()).is_ok();
++ input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less.
++ if let Ok(item) = input.try_parse(&mut parse_one) {
+ results.push(item);
+ } else if comma {
+ return Err(comma_location.new_unexpected_token_error(Token::Comma));
diff --git a/package/firefox/patches/patch-servo_ports_geckolib_cbindgen_toml b/package/firefox/patches/patch-servo_ports_geckolib_cbindgen_toml
new file mode 100644
index 000000000..7cf9a3d17
--- /dev/null
+++ b/package/firefox/patches/patch-servo_ports_geckolib_cbindgen_toml
@@ -0,0 +1,10 @@
+--- firefox-129.0.2.orig/servo/ports/geckolib/cbindgen.toml 2024-08-19 21:21:52.000000000 +0200
++++ firefox-129.0.2/servo/ports/geckolib/cbindgen.toml 2024-09-08 06:18:31.275680774 +0200
+@@ -360,7 +360,6 @@ renaming_overrides_prefixing = true
+ "Keyframe" = "Keyframe"
+ "nsChangeHint" = "nsChangeHint"
+ "ServoElementSnapshotTable" = "ServoElementSnapshotTable"
+-"Keyframe" = "Keyframe"
+ "ComputedKeyframeValues" = "ComputedKeyframeValues"
+ "OriginFlags" = "OriginFlags"
+ "ServoTraversalFlags" = "ServoTraversalFlags"
diff --git a/package/gdk-pixbuf/Makefile b/package/gdk-pixbuf/Makefile
index ee6d9c043..058134b26 100644
--- a/package/gdk-pixbuf/Makefile
+++ b/package/gdk-pixbuf/Makefile
@@ -23,7 +23,7 @@ $(eval $(call HOST_template,GDK_PIXBUF,gdk-pixbuf,$(PKG_VERSION)-$(PKG_RELEASE))
$(eval $(call PKG_template,GDK_PIXBUF,gdk-pixbuf,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
HOST_STYLE:= auto
-HOST_LDFLAGS+= -lffi -lz -ldl -lresolv -liconv -lmount
+HOST_LDFLAGS+= -lz -ldl -lresolv -liconv -lmount -lffi
HOST_CONFIGURE_ARGS+= --disable-glibtest \
--without-libjpeg \
--without-libpng \
diff --git a/package/glib/Makefile b/package/glib/Makefile
index eb77cf8fe..f83648bae 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -10,8 +10,8 @@ PKG_EXTRAVER:= 2.78
PKG_HASH:= 24b8e0672dca120cc32d394bccb85844e732e04fe75d18bb0573b2dbc7548f63
PKG_DESCR:= low-level core library that forms the basis of gtk+
PKG_SECTION:= libs/misc
-PKG_DEPENDS:= pcre2 zlib libffi
-PKG_BUILDDEP:= glib-host util-linux libffi zlib dbus pcre2
+PKG_DEPENDS:= pcre2 zlib libffi libiconv
+PKG_BUILDDEP:= glib-host util-linux libffi zlib dbus pcre2 libiconv
HOST_BUILDDEP:= pkgconf-host libiconv-host libffi-host python3-host gettext-host util-linux-host
HOST_BUILDDEP+= pcre2-host meson-host
PKG_NEEDS:= threads intl iconv
@@ -28,29 +28,23 @@ $(eval $(call PKG_template,GLIB,glib,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS
HOSTWRKBUILD= $(WRKSRC)
WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj
-HOST_CONFIG_STYLE:= manual
-HOST_STYLE:= manual
+HOST_STYLE:= meson
+HOST_INSTALL_STYLE:= meson
+
CONFIG_STYLE:= meson
BUILD_STYLE:= meson
INSTALL_STYLE:= meson
+HOST_MESON_FLAGS:= --default-library static -Dtests=false -Dxattr=false -Doss_fuzz=disabled
MESON_FLAGS:= -Dtests=false -Dxattr=false -Doss_fuzz=disabled
-host-configure:
- (cd $(HOSTWRKBUILD) && PATH='$(HOST_PATH)' meson setup --prefix $(STAGING_HOST_DIR)/usr _build)
-
-host-build:
- (cd $(HOSTWRKBUILD) && PATH='$(HOST_PATH)' meson compile -C _build)
-
-glib-hostinstall:
- (cd $(HOSTWRKBUILD) && PATH='$(HOST_PATH)' meson install -C _build)
-
-do-configure:
- (cd $(WRKBUILD) && PATH='$(HOST_PATH)' meson setup --prefix /usr \
- --libdir lib --cross-file $(STAGING_HOST_DIR)/etc/meson/cross-compilation.conf -Dtests=false _build)
-
-do-build:
- (cd $(WRKBUILD) && PATH='$(HOST_PATH)' meson compile -C _build)
+hostpost-install:
+ $(CP) $(HOSTWRKBUILD)/../glib-obj/meson-private/glib-2.0.pc \
+ $(STAGING_HOST_DIR)/usr/lib/pkgconfig
+ $(INSTALL_BIN) $(HOSTWRKBUILD)/../glib-obj/gobject/glib-mkenums \
+ $(STAGING_HOST_DIR)/usr/bin
+ $(INSTALL_BIN) $(HOSTWRKBUILD)/../glib-obj/gobject/glib-genmarshal \
+ $(STAGING_HOST_DIR)/usr/bin
glib-install:
$(INSTALL_DIR) $(IDIR_GLIB)/usr/lib
diff --git a/package/glib/patches/patch-meson_build b/package/glib/patches/patch-meson_build
index c410eac33..dbc6c7457 100644
--- a/package/glib/patches/patch-meson_build
+++ b/package/glib/patches/patch-meson_build
@@ -1,6 +1,6 @@
---- glib-2.75.2.orig/meson.build 2023-01-06 13:49:52.000000000 +0100
-+++ glib-2.75.2/meson.build 2023-01-22 14:18:11.633406695 +0100
-@@ -513,6 +513,7 @@ if cc.get_id() == 'gcc' or cc.get_id() =
+--- glib-2.78.4.orig/meson.build 2024-01-21 20:48:20.000000000 +0100
++++ glib-2.78.4/meson.build 2024-08-30 10:20:24.877632538 +0200
+@@ -527,6 +527,7 @@ if cc.get_id() == 'gcc' or cc.get_id() =
'-Werror=missing-include-dirs',
'-Werror=pointer-arith',
'-Werror=unused-result',
diff --git a/package/libiconv/Makefile b/package/libiconv/Makefile
index d978dbba8..941d6a8d0 100644
--- a/package/libiconv/Makefile
+++ b/package/libiconv/Makefile
@@ -21,6 +21,8 @@ include $(ADK_TOPDIR)/mk/package.mk
$(eval $(call HOST_template,LIBICONV,libiconv,$(PKG_VERSION)-$(PKG_RELEASE)))
$(eval $(call PKG_template,LIBICONV,libiconv,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
+HOST_CONFIGURE_ARGS+= --enable-static
+
libiconv-install:
$(INSTALL_DIR) $(IDIR_LIBICONV)/usr/lib
$(CP) $(WRKINST)/usr/lib/libiconv.so* $(IDIR_LIBICONV)/usr/lib/
diff --git a/package/libtiff/Makefile b/package/libtiff/Makefile
index 960605be8..282f1befc 100644
--- a/package/libtiff/Makefile
+++ b/package/libtiff/Makefile
@@ -10,7 +10,7 @@ PKG_HASH:= 0e46e5acb087ce7d1ac53cf4f56a09b221537fc86dfc5daaad1c2e89e1b37ac8
PKG_DESCR:= library for reading/writing tiff images
PKG_SECTION:= libs/image
PKG_NEEDS:= c++
-PKG_BUILDDEP:= zlib xz
+PKG_BUILDDEP:= zlib
PKG_URL:= http://simplesystems.org/libtiff/
PKG_SITES:= http://download.osgeo.org/libtiff/
PKG_LIBNAME:= libtiff
diff --git a/package/pcre2/Makefile b/package/pcre2/Makefile
index 3bd0d9935..5062daea4 100644
--- a/package/pcre2/Makefile
+++ b/package/pcre2/Makefile
@@ -23,14 +23,11 @@ include $(ADK_TOPDIR)/mk/package.mk
$(eval $(call HOST_template,PCRE2,pcre2,${PKG_VERSION}-${PKG_RELEASE}))
$(eval $(call PKG_template,PCRE2,pcre2,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
-HOST_STYLE:= cmake
+HOST_CONFIG_STYLE:= cmake
+HOST_CMAKE_FLAGS+= -DBUILD_SHARED_LIBS=ON
CONFIG_STYLE:= cmake
CMAKE_FLAGS+= -DBUILD_SHARED_LIBS=ON
-pcre2-hostinstall:
- cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -j${ADK_MAKE_JOBS} -f ${MAKE_FILE} \
- ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET}
-
pcre2-install:
$(INSTALL_DIR) $(IDIR_PCRE2)/usr/lib
$(CP) $(WRKINST)/usr/lib/libpcre2*.so* \
diff --git a/package/python-mako/Makefile b/package/python-mako/Makefile
index bb069a434..0fe5b1923 100644
--- a/package/python-mako/Makefile
+++ b/package/python-mako/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_HASH:= d60a3903dc3bb01a18ad6a89cdbe2e4eadc69c0bc8ef1e3773ba53d44c3f7a34
PKG_DESCR:= fast, expressive, extensible templating engine
PKG_SECTION:= dev/tools
-PKG_BUILDDEP:= python3-host
+HOST_BUILDDEP:= python3-host python-markupsafe-host
PKG_SITES:= https://files.pythonhosted.org/packages/05/5f/2ba6e026d33a0e6ddc1dddf9958677f76f5f80c236bd65309d280b166d3e/
DISTFILES:= Mako-$(PKG_VERSION).tar.gz
diff --git a/package/python-markupsafe/Makefile b/package/python-markupsafe/Makefile
new file mode 100644
index 000000000..e35e13602
--- /dev/null
+++ b/package/python-markupsafe/Makefile
@@ -0,0 +1,33 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:= python-markupsafe
+PKG_VERSION:= 2.1.5
+PKG_RELEASE:= 1
+PKG_HASH:= d283d37a890ba4c1ae73ffadf8046435c76e7bc2247bbb63c00bd1a709c6544b
+PKG_DESCR:= implements a XML/HTML/XHTML markup safe string
+PKG_SECTION:= dev/tools
+HOST_BUILDDEP:= python3-host
+PKG_SITES:= https://files.pythonhosted.org/packages/87/5b/aae44c6655f3801e81aa3eef09dbbf012431987ba564d7231722f68df02d/
+
+DISTFILES:= MarkupSafe-$(PKG_VERSION).tar.gz
+
+WRKDIST= $(WRKDIR)/MarkupSafe-$(PKG_VERSION)
+
+include ${ADK_TOPDIR}/mk/host.mk
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call HOST_template,PYTHON_MAKO,python-markupsafe,${PKG_VERSION}-${PKG_RELEASE}))
+
+include $(ADK_TOPDIR)/mk/python3.mk
+
+HOST_STYLE:= manual
+
+python-markupsafe-hostinstall:
+ (cd $(WRKBUILD); PATH='$(HOST_PATH)' python3 ./setup.py install \
+ --prefix=$(STAGING_HOST_DIR)/usr)
+
+include ${ADK_TOPDIR}/mk/host-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 19:46:54 +0000