*/*: rebuild for icu-74

chimera-linux · Dec 29, 2023 · 1c5da3f · 1c5da3f
1 parent d92e38f
commit 1c5da3f
Show file tree

Hide file tree

Showing 33 changed files with 53 additions and 32 deletions.
diff --git a/contrib/darktable/template.py b/contrib/darktable/template.py
@@ -1,6 +1,6 @@
 pkgname = "darktable"
 pkgver = "4.6.0"
-pkgrel = 1
+pkgrel = 2
 # only supported archs
 archs = ["aarch64", "ppc64le", "riscv64", "x86_64"]
 build_style = "cmake"

diff --git a/contrib/firefox/template.py b/contrib/firefox/template.py
@@ -1,6 +1,6 @@
 pkgname = "firefox"
 pkgver = "121.0"
-pkgrel = 0
+pkgrel = 1
 make_cmd = "gmake"
 hostmakedepends = [
     "pkgconf",

diff --git a/contrib/libcdr/template.py b/contrib/libcdr/template.py
@@ -1,6 +1,6 @@
 pkgname = "libcdr"
 pkgver = "0.1.7"
-pkgrel = 1
+pkgrel = 2
 build_style = "gnu_configure"
 configure_args = ["--disable-debug"]
 make_cmd = "gmake"

diff --git a/contrib/libe-book/template.py b/contrib/libe-book/template.py
@@ -1,6 +1,6 @@
 pkgname = "libe-book"
 pkgver = "0.1.3"
-pkgrel = 1
+pkgrel = 2
 build_style = "gnu_configure"
 make_cmd = "gmake"
 make_dir = "."

diff --git a/contrib/libmspub/template.py b/contrib/libmspub/template.py
@@ -1,6 +1,6 @@
 pkgname = "libmspub"
 pkgver = "0.1.4"
-pkgrel = 1
+pkgrel = 2
 build_style = "gnu_configure"
 make_cmd = "gmake"
 make_dir = "."

diff --git a/contrib/libqxp/template.py b/contrib/libqxp/template.py
@@ -1,6 +1,6 @@
 pkgname = "libqxp"
 pkgver = "0.0.2"
-pkgrel = 1
+pkgrel = 2
 build_style = "gnu_configure"
 make_cmd = "gmake"
 make_dir = "."

diff --git a/contrib/libreoffice/template.py b/contrib/libreoffice/template.py
@@ -1,6 +1,6 @@
 pkgname = "libreoffice"
 pkgver = "7.6.2.1"
-pkgrel = 0
+pkgrel = 1
 # riscv64: no handling of libcxxabi + likely too slow
 archs = ["x86_64", "ppc64le", "ppc64", "aarch64"]
 build_style = "gnu_configure"

diff --git a/contrib/libvisio/template.py b/contrib/libvisio/template.py
@@ -1,6 +1,6 @@
 pkgname = "libvisio"
 pkgver = "0.1.7"
-pkgrel = 1
+pkgrel = 2
 build_style = "gnu_configure"
 make_cmd = "gmake"
 make_dir = "."

diff --git a/contrib/nodejs/template.py b/contrib/nodejs/template.py
@@ -1,6 +1,6 @@
 pkgname = "nodejs"
 pkgver = "21.5.0"
-pkgrel = 0
+pkgrel = 1
 build_style = "configure"
 configure_args = [
     "--shared-zlib",

diff --git a/contrib/qt6-qt5compat/template.py b/contrib/qt6-qt5compat/template.py
@@ -1,6 +1,6 @@
 pkgname = "qt6-qt5compat"
 pkgver = "6.6.1"
-pkgrel = 0
+pkgrel = 1
 build_style = "cmake"
 hostmakedepends = ["cmake", "ninja", "pkgconf", "qt6-qtbase"]
 makedepends = ["qt6-qtdeclarative-devel"]

diff --git a/contrib/qt6-qtbase/patches/foortify.patch b/contrib/qt6-qtbase/patches/foortify.patch
@@ -0,0 +1,21 @@
+https://github.com/llvm/llvm-project/issues/76264
+--- a/src/corelib/tools/qhash.cpp
++++ b/src/corelib/tools/qhash.cpp
+@@ -1429,7 +1429,7 @@
+     key += 0.0;
+     if constexpr (sizeof(double) == sizeof(size_t)) {
+         size_t k;
+-        memcpy(&k, &key, sizeof(double));
++        memcpy(&k, &key, sizeof(size_t));
+         return QHashPrivate::hash(k, seed);
+     } else {
+         return murmurhash(&key, sizeof(key), seed);
+@@ -1448,7 +1448,7 @@
+     key += static_cast<long double>(0.0);
+     if constexpr (sizeof(long double) == sizeof(size_t)) {
+         size_t k;
+-        memcpy(&k, &key, sizeof(long double));
++        memcpy(&k, &key, sizeof(size_t));
+         return QHashPrivate::hash(k, seed);
+     } else {
+         return murmurhash(&key, sizeof(key), seed);
diff --git a/contrib/qt6-qtbase/template.py b/contrib/qt6-qtbase/template.py
@@ -1,7 +1,7 @@
 # keep pkgver AND pkgrel in sync with qt6-qtwayland
 pkgname = "qt6-qtbase"
 pkgver = "6.6.1"
-pkgrel = 1
+pkgrel = 2
 build_style = "cmake"
 configure_args = [
     "-DINSTALL_DATADIR=share/qt6",

diff --git a/contrib/thunderbird/template.py b/contrib/thunderbird/template.py
@@ -1,6 +1,6 @@
 pkgname = "thunderbird"
 pkgver = "115.6.0"
-pkgrel = 0
+pkgrel = 1
 make_cmd = "gmake"
 hostmakedepends = [
     "pkgconf",

diff --git a/main/boost/template.py b/main/boost/template.py
@@ -1,6 +1,6 @@
 pkgname = "boost"
 pkgver = "1.83.0"
-pkgrel = 0
+pkgrel = 1
 hostmakedepends = ["pkgconf"]
 makedepends = [
     "icu-devel",

diff --git a/main/dino/template.py b/main/dino/template.py
@@ -1,6 +1,6 @@
 pkgname = "dino"
 pkgver = "0.4.3"
-pkgrel = 0
+pkgrel = 1
 build_style = "cmake"
 # TODO: openpgp maybe
 configure_args = [

diff --git a/main/enchant/template.py b/main/enchant/template.py
@@ -1,6 +1,6 @@
 pkgname = "enchant"
 pkgver = "2.6.4"
-pkgrel = 0
+pkgrel = 1
 build_style = "gnu_configure"
 configure_args = ["--enable-relocatable", "--disable-static"]
 hostmakedepends = ["pkgconf", "automake", "libtool"]

diff --git a/main/evolution-data-server/template.py b/main/evolution-data-server/template.py
@@ -1,6 +1,6 @@
 pkgname = "evolution-data-server"
 pkgver = "3.50.2"
-pkgrel = 0
+pkgrel = 1
 build_style = "cmake"
 # TODO: libgdata
 configure_args = [

diff --git a/main/gnome-text-editor/template.py b/main/gnome-text-editor/template.py
@@ -1,6 +1,6 @@
 pkgname = "gnome-text-editor"
 pkgver = "45.1"
-pkgrel = 0
+pkgrel = 1
 build_style = "meson"
 hostmakedepends = [
     "meson",

diff --git a/main/gspell/template.py b/main/gspell/template.py
@@ -1,6 +1,6 @@
 pkgname = "gspell"
 pkgver = "1.12.2"
-pkgrel = 0
+pkgrel = 1
 build_style = "gnu_configure"
 configure_args = ["--disable-static", "--enable-introspection", "--enable-vala"]
 make_cmd = "gmake"

diff --git a/main/harfbuzz/template.py b/main/harfbuzz/template.py
@@ -1,6 +1,6 @@
 pkgname = "harfbuzz"
 pkgver = "8.3.0"
-pkgrel = 0
+pkgrel = 1
 build_style = "meson"
 configure_args = [
     "-Db_ndebug=true",

diff --git a/main/libical/template.py b/main/libical/template.py
@@ -1,6 +1,6 @@
 pkgname = "libical"
 pkgver = "3.0.17"
-pkgrel = 0
+pkgrel = 1
 build_style = "cmake"
 configure_args = [
     "-DICAL_BUILD_DOCS=false",

diff --git a/main/libspelling/template.py b/main/libspelling/template.py
@@ -1,6 +1,6 @@
 pkgname = "libspelling"
 pkgver = "0.2.0"
-pkgrel = 0
+pkgrel = 1
 build_style = "meson"
 configure_args = ["-Denchant=enabled", "-Dvapi=true", "-Ddocs=false"]
 hostmakedepends = [

diff --git a/main/libxml2/template.py b/main/libxml2/template.py
@@ -1,6 +1,6 @@
 pkgname = "libxml2"
 pkgver = "2.12.3"
-pkgrel = 0
+pkgrel = 1
 build_style = "gnu_configure"
 configure_args = [
     "--with-threads",

diff --git a/main/mozjs115/template.py b/main/mozjs115/template.py
@@ -1,6 +1,6 @@
 pkgname = "mozjs115"
 pkgver = "115.6.0"
-pkgrel = 0
+pkgrel = 1
 make_cmd = "gmake"
 hostmakedepends = [
     "gmake",

diff --git a/main/nuspell/template.py b/main/nuspell/template.py
@@ -1,6 +1,6 @@
 pkgname = "nuspell"
 pkgver = "5.1.4"
-pkgrel = 0
+pkgrel = 1
 build_style = "cmake"
 configure_args = ["-DBUILD_SHARED_LIBS=ON", "-DBUILD_TESTING=OFF"]
 hostmakedepends = ["cmake", "ninja", "pkgconf"]

diff --git a/main/raptor/template.py b/main/raptor/template.py
@@ -1,6 +1,6 @@
 pkgname = "raptor"
 pkgver = "2.0.16"
-pkgrel = 1
+pkgrel = 2
 build_style = "gnu_configure"
 configure_args = ["--with-yajl=no"]
 make_check_args = ["-j1"]  # racey tests

diff --git a/main/samba/template.py b/main/samba/template.py
@@ -1,7 +1,7 @@
 # TODO: service files, cleanup
 pkgname = "samba"
 pkgver = "4.19.3"
-pkgrel = 0
+pkgrel = 1
 build_style = "waf"
 configure_script = "buildtools/bin/waf"
 configure_args = [

diff --git a/main/tracker-miners/template.py b/main/tracker-miners/template.py
@@ -1,6 +1,6 @@
 pkgname = "tracker-miners"
 pkgver = "3.6.2"
-pkgrel = 0
+pkgrel = 1
 build_style = "meson"
 configure_args = [
     # TODO: user services with dinit?

diff --git a/main/tracker/template.py b/main/tracker/template.py
@@ -1,6 +1,6 @@
 pkgname = "tracker"
 pkgver = "3.6.0"
-pkgrel = 1
+pkgrel = 2
 build_style = "meson"
 configure_args = [
     # TODO: user services with dinit?

diff --git a/main/vte-common/template.py b/main/vte-common/template.py
@@ -1,6 +1,6 @@
 pkgname = "vte-common"
 pkgver = "0.74.2"
-pkgrel = 0
+pkgrel = 1
 build_style = "meson"
 configure_args = [
     "-D_systemd=false",

diff --git a/main/webkitgtk/template.py b/main/webkitgtk/template.py
@@ -1,6 +1,6 @@
 pkgname = "webkitgtk"
 pkgver = "2.42.4"
-pkgrel = 1
+pkgrel = 2
 build_style = "cmake"
 configure_args = [
     "-DPORT=GTK",

diff --git a/main/webkitgtk4/template.py b/main/webkitgtk4/template.py
@@ -1,7 +1,7 @@
 # mirrors the gtk3 webkitgtk template
 pkgname = "webkitgtk4"
 pkgver = "2.42.4"
-pkgrel = 1
+pkgrel = 2
 build_style = "cmake"
 configure_args = [
     "-DPORT=GTK",

diff --git a/main/yelp/template.py b/main/yelp/template.py
@@ -1,6 +1,6 @@
 pkgname = "yelp"
 pkgver = "42.2"
-pkgrel = 2
+pkgrel = 3
 build_style = "gnu_configure"
 configure_args = [
     "--disable-schemas-compile",