From 713ed48d5e1916322a31be183a815b5aea7dacf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 18 Aug 2023 11:47:46 +0700 Subject: [PATCH 01/28] fcitx5: update to 5.1.0. --- srcpkgs/fcitx5/patches/xbps-src-download.patch | 10 ---------- srcpkgs/fcitx5/template | 4 ++-- 2 files changed, 2 insertions(+), 12 deletions(-) delete mode 100644 srcpkgs/fcitx5/patches/xbps-src-download.patch diff --git a/srcpkgs/fcitx5/patches/xbps-src-download.patch b/srcpkgs/fcitx5/patches/xbps-src-download.patch deleted file mode 100644 index 2a380fb644595..0000000000000 --- a/srcpkgs/fcitx5/patches/xbps-src-download.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/lib/fcitx-utils/Fcitx5Download.cmake.in -+++ b/src/lib/fcitx-utils/Fcitx5Download.cmake.in -@@ -1,4 +1,7 @@ - if (NOT EXISTS "@FCITX5_DOWNLOAD_DEST@") -+ if (DEFINED ENV{XBPS_MACHINE}) -+ message(FATAL_ERROR "Downloading @FCITX5_DOWNLOAD_URL@ is forbidden inside xbps-src") -+ endif() - message(STATUS "Downloading '@FCITX5_DOWNLOAD_URL@' to '@FCITX5_DOWNLOAD_DEST@'...") - file(DOWNLOAD - "@FCITX5_DOWNLOAD_URL@" diff --git a/srcpkgs/fcitx5/template b/srcpkgs/fcitx5/template index 1a6a845623977..a30c5801831ee 100644 --- a/srcpkgs/fcitx5/template +++ b/srcpkgs/fcitx5/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5' pkgname=fcitx5 -version=5.0.23 +version=5.1.0 revision=1 build_style=cmake build_helper=qemu @@ -21,7 +21,7 @@ homepage="https://fcitx-im.org/wiki/Fcitx" _en_dict_ver=20121020 distfiles="https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-${version}.tar.xz https://download.fcitx-im.org/data/en_dict-${_en_dict_ver}.tar.gz" -checksum="04f209a6406225ce19785f8d9d3bdb253944586edcfa9601414fcdda8a1b13a0 +checksum="3305a077478fafb8d738059e4616b9a28b89e89baf505c9edb208daeb9ed4619 c44a5d7847925eea9e4d2d04748d442cd28dd9299a0b572ef7d91eac4f5a6ceb" skip_extraction=en_dict-${_en_dict_ver}.tar.gz lib32disabled=yes From f56314d47f41f94d51f4f633c025f3a55726c61a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 18 Aug 2023 11:47:51 +0700 Subject: [PATCH 02/28] fcitx5-anthy: update to 5.1.0. --- srcpkgs/fcitx5-anthy/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-anthy/template b/srcpkgs/fcitx5-anthy/template index 653a78bb8f45c..3226e0f0cadf7 100644 --- a/srcpkgs/fcitx5-anthy/template +++ b/srcpkgs/fcitx5-anthy/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-anthy' pkgname=fcitx5-anthy -version=5.0.14 +version=5.1.0 revision=1 build_style=cmake hostmakedepends="pkg-config gettext extra-cmake-modules" @@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh " license="GPL-2.0-or-later" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-anthy/fcitx5-anthy-${version}.tar.xz" -checksum=0a874d70df4ef22f1eb868c27eaf66e3354e1609db8ded392544f8f6bc54a7b7 +checksum=b725b13610ab78968073e2141fce626b2a3c3802dc634cad15cec06bc61ef343 fcitx5-anthy-icons_package() { short_desc+=" - icons" From 58c0953e3edb985108e3585fce8f0751a6259b41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 18 Aug 2023 11:47:56 +0700 Subject: [PATCH 03/28] fcitx5-chewing: update to 5.1.0. --- srcpkgs/fcitx5-chewing/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-chewing/template b/srcpkgs/fcitx5-chewing/template index 33bbfff524eb0..edc6eb9530a3c 100644 --- a/srcpkgs/fcitx5-chewing/template +++ b/srcpkgs/fcitx5-chewing/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-chewing' pkgname=fcitx5-chewing -version=5.0.14 +version=5.1.0 revision=1 build_style=cmake hostmakedepends="pkg-config gettext doxygen extra-cmake-modules" @@ -10,7 +10,7 @@ maintainer="Đoàn Trần Công Danh " license="GPL-3.0-or-later" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-chewing/fcitx5-chewing-${version}.tar.xz" -checksum=7000d66a341e3bdb5bdf8c948c20bf1b6f4cb08b458d13d4d3c2e3fd6e30e6f8 +checksum=e0ce16fcd00ddf7c7b14c57580a790b32d7240829105340ea0678f72dfd33835 lib32disabled=yes fcitx5-chewing-icons_package() { From 95d24a9969237deb0ae2641bb86f984d46580012 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 18 Aug 2023 11:48:06 +0700 Subject: [PATCH 04/28] fcitx5-chinese-addons: update to 5.1.0. --- srcpkgs/fcitx5-chinese-addons/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-chinese-addons/template b/srcpkgs/fcitx5-chinese-addons/template index 63829a2d30632..626ff4400ff8c 100644 --- a/srcpkgs/fcitx5-chinese-addons/template +++ b/srcpkgs/fcitx5-chinese-addons/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-chinese-addons' pkgname=fcitx5-chinese-addons -version=5.0.17 +version=5.1.0 revision=1 build_style=cmake hostmakedepends="pkg-config gettext doxygen extra-cmake-modules qt5-qmake @@ -17,7 +17,7 @@ _pystroke_version=20121124 distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-chinese-addons/fcitx5-chinese-addons-${version}.tar.xz http://download.fcitx-im.org/data/py_table-${_pytable_version}.tar.gz http://download.fcitx-im.org/data/py_stroke-${_pystroke_version}.tar.gz" -checksum="9822aeac6b772d38df8bca4f806798d0cef8e8493cc601ddbe060b50b6f75f46 +checksum="09e66cd8a15e15e3a129b9658c39a7a676bb6de62b1dd6f902149de04d27fa35 42146ac97de6c13d55f9e99ed873915f4c66739e9c11532a34556badf9792c04 8eb128a9bfa43952e67cf2fcee1fd134c6f4cfd317bc2f6c38a615f5eb64e248" skip_extraction=" From 4f414dd8e92b23c138e624eceb74e4eb5ba5586c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 18 Aug 2023 11:48:12 +0700 Subject: [PATCH 05/28] fcitx5-configtool: update to 5.1.0. --- srcpkgs/fcitx5-configtool/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-configtool/template b/srcpkgs/fcitx5-configtool/template index 768e536c51331..864e6a4aa5256 100644 --- a/srcpkgs/fcitx5-configtool/template +++ b/srcpkgs/fcitx5-configtool/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-configtool' pkgname=fcitx5-configtool -version=5.0.17 +version=5.1.0 revision=1 build_style=cmake configure_args="-DENABLE_KCM=ON -DENABLE_CONFIG_QT=ON -DENABLE_TEST=ON" @@ -19,7 +19,7 @@ maintainer="Đoàn Trần Công Danh " license="GPL-2.0-or-later" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-configtool/fcitx5-configtool-${version}.tar.xz" -checksum=f8b6196d23d14a6acc9a2b3dbc3772b6e5b2e3a5147b78b649238a3d775786d5 +checksum=ff869e88e4b565cc1460fcd244a046f26c874478380a0df8564b2f53279b6577 lib32disabled=yes post_install() { From 73460eefa8a685d183af69eed99ee0b26759fe63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 18 Aug 2023 11:48:17 +0700 Subject: [PATCH 06/28] fcitx5-gtk: update to 5.1.0. --- srcpkgs/fcitx5-gtk/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-gtk/template b/srcpkgs/fcitx5-gtk/template index 6d5d0605a749f..ef489fb5f3f20 100644 --- a/srcpkgs/fcitx5-gtk/template +++ b/srcpkgs/fcitx5-gtk/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-gtk' pkgname=fcitx5-gtk -version=5.0.23 +version=5.1.0 revision=1 build_style=cmake build_helper=gir @@ -14,7 +14,7 @@ maintainer="Đoàn Trần Công Danh " license="LGPL-2.1-or-later" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-gtk/fcitx5-gtk-${version}.tar.xz" -checksum=ad124ce7f1bbca650dda47cb73c5572913419513eacf9ebe84c9f6753c920868 +checksum=7c2227bb1b1b252b1980e1f1ee9819f3fb3d5173cc5e5c52d5bef9b3308f8465 lib32disabled=yes build_options="gir" From 037162e51c063068ed339c87447b16f4aeb1c048 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 18 Aug 2023 11:48:22 +0700 Subject: [PATCH 07/28] fcitx5-hangul: update to 5.1.0. --- srcpkgs/fcitx5-hangul/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-hangul/template b/srcpkgs/fcitx5-hangul/template index 2796d4203b7fe..f3296b73807c6 100644 --- a/srcpkgs/fcitx5-hangul/template +++ b/srcpkgs/fcitx5-hangul/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-hangul' pkgname=fcitx5-hangul -version=5.0.11 +version=5.1.0 revision=1 build_style=cmake hostmakedepends="pkg-config gettext extra-cmake-modules" @@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh " license="GPL-3.0-or-later" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-hangul/fcitx5-hangul-${version}.tar.xz" -checksum=6894702e73ef431c7699698b55421494419383170b502aa98209a7eff3fdd0d3 +checksum=fc099de6b809e086c1ef5467b3fd2ff31c4d0785c9c1c5951615319562ffa83c lib32disabled=yes fcitx5-hangul-icons_package() { From 65bb96a58bb6a8dc89d529e23b998ba25db97f51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 18 Aug 2023 11:48:27 +0700 Subject: [PATCH 08/28] fcitx5-m17n: update to 5.1.0. --- srcpkgs/fcitx5-m17n/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-m17n/template b/srcpkgs/fcitx5-m17n/template index ed1ec9d7b334c..144eafb1b8bb6 100644 --- a/srcpkgs/fcitx5-m17n/template +++ b/srcpkgs/fcitx5-m17n/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-m17n' pkgname=fcitx5-m17n -version=5.0.11 +version=5.1.0 revision=1 build_style=cmake hostmakedepends="pkg-config gettext doxygen extra-cmake-modules" @@ -12,5 +12,5 @@ maintainer="Đoàn Trần Công Danh " license="LGPL-2.1-or-later" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-m17n/fcitx5-m17n-${version}.tar.xz" -checksum=92df1f69d293abea9894e21bdd8c18d0853cc0a1d7423aac26030695e5824196 +checksum=8556f492afa1c624710de9116bcc33f46407a6225538f3bcf22face60c9acb67 lib32disabled=yes From 919732e8d2e125f7f727b3d1cbf1633773ca8746 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 18 Aug 2023 11:48:32 +0700 Subject: [PATCH 09/28] fcitx5-qt: update to 5.1.0. --- srcpkgs/fcitx5-qt/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/fcitx5-qt/template b/srcpkgs/fcitx5-qt/template index 28d605b30e4b0..64a35825e9a6a 100644 --- a/srcpkgs/fcitx5-qt/template +++ b/srcpkgs/fcitx5-qt/template @@ -1,7 +1,7 @@ # Template file for 'fcitx5-qt' pkgname=fcitx5-qt -version=5.0.17 -revision=2 +version=5.1.0 +revision=1 build_style=cmake configure_args="-DENABLE_QT4=OFF -DENABLE_QT5=ON -DENABLE_QT6=ON -DQT_HOST_PATH=/usr" @@ -14,7 +14,7 @@ maintainer="Đoàn Trần Công Danh " license="LGPL-2.1-or-later, BSD-3-Clause" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-qt/fcitx5-qt-${version}.tar.xz" -checksum=4268e7a1277692a79dcff08e662d1e74407e598a61d3d0386bc64a51809e91f4 +checksum=f054e482a1743080651ae34bfe156e150f628c4181210e03ac50d30a1cfff609 lib32disabled=yes post_install() { From b045167de6c08f10cb2b94e5a9f941bc83461f81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 18 Aug 2023 11:48:37 +0700 Subject: [PATCH 10/28] fcitx5-rime: update to 5.1.0. --- srcpkgs/fcitx5-rime/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-rime/template b/srcpkgs/fcitx5-rime/template index 9173ad8939522..be3e1a14c6e3f 100644 --- a/srcpkgs/fcitx5-rime/template +++ b/srcpkgs/fcitx5-rime/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-rime' pkgname=fcitx5-rime -version=5.0.16 +version=5.1.0 revision=1 build_style=cmake configure_args="-DRIME_DATA_DIR=/usr/share/rime-data" @@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh " license="GPL-3.0-or-later" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-rime/fcitx5-rime-${version}.tar.xz" -checksum=5076d90b95d67bde6beffb48a3c9d643c60f54e82dc6e7243eb794cada8c7834 +checksum=25c17a7ddbcf6e2f6c1599a208f8c3b168f3ac12518c272d524dbc29b3f75e9c lib32disabled=yes fcitx5-rime-icons_package() { From 4fc899699ea25d5a9f6e17ae86404c36b45dfd9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 18 Aug 2023 11:48:43 +0700 Subject: [PATCH 11/28] fcitx5-table-extra: update to 5.1.0. --- srcpkgs/fcitx5-table-extra/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-table-extra/template b/srcpkgs/fcitx5-table-extra/template index cba0aac144132..e166356258c3c 100644 --- a/srcpkgs/fcitx5-table-extra/template +++ b/srcpkgs/fcitx5-table-extra/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-table-extra' pkgname=fcitx5-table-extra -version=5.0.13 +version=5.1.0 revision=1 build_style=cmake hostmakedepends="gettext libime-utils extra-cmake-modules" @@ -11,4 +11,4 @@ maintainer="Đoàn Trần Công Danh " license="Public Domain" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-table-extra/fcitx5-table-extra-${version}.tar.xz" -checksum=6aec03e6cb1408d8447898226132e7226071535c0584e35e04159e4c5f74a016 +checksum=9b95844559ff1b99c04cf798cee7602070bb30a46c8e11ba2b1792f54a38041c From 7c7ab513597f9c0196c932923f4318c29ea2b7c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 18 Aug 2023 11:48:49 +0700 Subject: [PATCH 12/28] fcitx5-table-other: update to 5.1.0. --- srcpkgs/fcitx5-table-other/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-table-other/template b/srcpkgs/fcitx5-table-other/template index d834548149286..787d460f046e8 100644 --- a/srcpkgs/fcitx5-table-other/template +++ b/srcpkgs/fcitx5-table-other/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-table-other' pkgname=fcitx5-table-other -version=5.0.11 +version=5.1.0 revision=1 build_style=cmake hostmakedepends="gettext libime-utils extra-cmake-modules" @@ -11,4 +11,4 @@ maintainer="Đoàn Trần Công Danh " license="GPL-3.0-or-later" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-table-other/fcitx5-table-other-${version}.tar.xz" -checksum=3f61b7f0364cb7149eaeaeac6fce3d00ab72d6cb5bb884760a41d4738df3244c +checksum=90facbac69b26a04a22f5d43b0dab3900e5935f83515579837839d0493dd20ae From 1e56f1821dca5a3cf125aea58b20f4589e635bdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 18 Aug 2023 11:48:54 +0700 Subject: [PATCH 13/28] fcitx5-unikey: update to 5.1.0. --- srcpkgs/fcitx5-unikey/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-unikey/template b/srcpkgs/fcitx5-unikey/template index 962e30d790fc5..cd3e928ea272c 100644 --- a/srcpkgs/fcitx5-unikey/template +++ b/srcpkgs/fcitx5-unikey/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-unikey' pkgname=fcitx5-unikey -version=5.0.13 +version=5.1.0 revision=1 build_style=cmake #configure_args="" @@ -16,7 +16,7 @@ maintainer="Đoàn Trần Công Danh " license="GPL-2.0-or-later" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-unikey/fcitx5-unikey-${version}.tar.xz" -checksum=7e6db370927d5c76782c129fe39c142c83f85bc2abfd1d599bc91364b473d78e +checksum=84fe376e2b48f4ae4a1f1caf51917cfb94892af5aae246b872a958af0a089cca conflicts="fcitx-unikey>=0" fcitx5-unikey-macro-editor_package() { From fffefb0a51a7b92ee7de3a58704238a5ff1e3812 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 18 Aug 2023 11:49:02 +0700 Subject: [PATCH 14/28] fcitx5-zhuyin: update to 5.1.0. --- srcpkgs/fcitx5-zhuyin/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-zhuyin/template b/srcpkgs/fcitx5-zhuyin/template index 80228061da1fa..1f1e875818796 100644 --- a/srcpkgs/fcitx5-zhuyin/template +++ b/srcpkgs/fcitx5-zhuyin/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-zhuyin' pkgname=fcitx5-zhuyin -version=5.0.12 +version=5.1.0 revision=1 build_style=cmake hostmakedepends="pkg-config gettext doxygen extra-cmake-modules libzhuyin" @@ -13,7 +13,7 @@ homepage="https://fcitx-im.org/wiki/Fcitx" _model_version=20161206 distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-zhuyin/fcitx5-zhuyin-${version}.tar.xz https://download.fcitx-im.org/data/model.text.${_model_version}.tar.gz" -checksum="5d9b9f78d2992c672e5bd85a2a89397f02d56dfb48134733ee4d408c96e110b8 +checksum="130c1fad23e097d2c3ea041efb58758290445284f6ab77612786dd411867c533 5c7024e5735389c471f54b867eda0d98c5a40a5e5e75333a9febac107508f704" skip_extraction="model.text.${_model_version}.tar.gz" lib32disabled=yes From de363942385346619875b8b1154e3a37d37757f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 18 Aug 2023 11:49:16 +0700 Subject: [PATCH 15/28] libime: update to 1.1.1. --- srcpkgs/libime/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/libime/template b/srcpkgs/libime/template index dcf29ea8959e5..1ccb20e5c1fa6 100644 --- a/srcpkgs/libime/template +++ b/srcpkgs/libime/template @@ -1,6 +1,6 @@ # Template file for 'libime' pkgname=libime -version=1.0.17 +version=1.1.1 revision=1 build_style=cmake build_helper=qemu @@ -10,15 +10,15 @@ short_desc="Library to support generic input method implementation" maintainer="Đoàn Trần Công Danh " license="LGPL-2.1-or-later" homepage="https://fcitx-im.org/wiki/Fcitx" -_lm_sc=lm_sc.arpa-20220810.tar.xz -_dict=dict-20220810.tar.xz +_lm_sc=lm_sc.arpa-20230712.tar.xz +_dict=dict-20230412.tar.xz distfiles="https://download.fcitx-im.org/fcitx5/libime/libime-${version}.tar.xz https://download.fcitx-im.org/data/${_lm_sc} https://download.fcitx-im.org/data/${_dict} https://download.fcitx-im.org/data/table.tar.gz" -checksum="23f87b8104b9161bdc41fbac44294fef825d586260afc698f6a85ff20ea65407 - a11bc97d275adaf195f9bac854368ae06cdb4a0fe1eecf59db5ae580615db4fa - 971752f413188007e8d19158c11b85c955e25d7b321ec2275c4b3af6d8a85d26 +checksum="aaa361c2efb0cafc5820823095e4f80522489ceb7b53d4500216c0d6e893cea5 + badd62c16c6373787a0fda8f09cd452d12f60d5868856f651ceecf1a07baba32 + f05fccaff9687900aac3d9ad5a81b20888b573201403fbcd9bbc7907d9e97507 6196053c724125e3ae3d8bd6b2f9172d0c83b65b0d410d3cde63b7a8d6ab87b7" skip_extraction=" ${_lm_sc} From ca3dd547a1fe117d0f16ae6b29631f502bad7dd6 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Thu, 27 Jul 2023 06:28:29 -0400 Subject: [PATCH 16/28] qbittorrent: update to 4.5.4 --- srcpkgs/qbittorrent/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template index 0970d32df279b..368d68f2f17a8 100644 --- a/srcpkgs/qbittorrent/template +++ b/srcpkgs/qbittorrent/template @@ -1,7 +1,7 @@ # Template file for 'qbittorrent' pkgname=qbittorrent -version=4.5.2 -revision=2 +version=4.5.4 +revision=1 create_wrksrc=yes build_style=gnu-configure build_helper=qmake @@ -16,7 +16,7 @@ license="GPL-2.0-or-later" homepage="https://www.qbittorrent.org/" changelog="https://www.qbittorrent.org/news.php" distfiles="${SOURCEFORGE_SITE}/qbittorrent/qbittorrent-${version}.tar.xz" -checksum=109ecff22cb80f1e3ee5b7d3d2d34537839c15f75030632ef131d92b047f4e05 +checksum=f92bcd3ed25600796c59257c507e56a252a65af60bd042b71f1e7ff3fe5264da CXXFLAGS=-std=gnu++17 do_extract() { From 142cbfc47f3b3afd30f3ddf3bd9fc43b8f98eaeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 21 Aug 2023 21:57:40 +0700 Subject: [PATCH 17/28] mdds: update to 2.1.1. --- srcpkgs/mdds/patches/configure.patch | 12 ++++++++++-- srcpkgs/mdds/template | 9 ++------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/srcpkgs/mdds/patches/configure.patch b/srcpkgs/mdds/patches/configure.patch index e838ac27a9de2..d546d750ac890 100644 --- a/srcpkgs/mdds/patches/configure.patch +++ b/srcpkgs/mdds/patches/configure.patch @@ -13,8 +13,6 @@ compilation terminated. Normally, this isn't an issue with the compiler itself, because we have a wrapper that discards bad -I flags, but we don't have a cpp wrapper. -diff --git a/configure.ac b/configure.ac -index 40569655..5a64324a 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,6 @@ AC_SUBST(QUICKCHECKDIR) @@ -25,3 +23,13 @@ index 40569655..5a64324a 100644 AC_CHECK_SIZEOF([void *]) CXXFLAGS="$CXXFLAGS -DSIZEOF_VOID_P=$ac_cv_sizeof_void_p" +--- a/configure ++++ b/configure +@@ -5237,7 +5237,6 @@ printf "%s\n" "#define HAVE_CXX17 1" >>c + + + CPPFLAGS="$CPPFLAGS -Wall -Wshadow -g -pedantic-errors" +-CPPFLAGS="$CPPFLAGS -I/usr/include -I/usr/local/include" + + + diff --git a/srcpkgs/mdds/template b/srcpkgs/mdds/template index 3ce27a1a395cc..60fa31cde555a 100644 --- a/srcpkgs/mdds/template +++ b/srcpkgs/mdds/template @@ -5,22 +5,17 @@ # pkgname=mdds -version=2.0.3 +version=2.1.1 revision=1 build_style=gnu-configure -hostmakedepends="automake" checkdepends="boost-devel" short_desc="Collection of multi-dimensional data structures and indexing algorithms" maintainer="Enno Boland " license="MIT" homepage="https://gitlab.com/mdds/mdds" distfiles="http://kohei.us/files/mdds/src/mdds-${version}.tar.bz2" -checksum=9771fe42e133443c13ca187253763e17c8bc96a1a02aec9e1e8893367ffa9ce5 +checksum=8a3767f0a60c53261b5ebbaa717381446813aef8cf28fe9d0ea1371123bbe3f1 post_install() { vlicense LICENSE } - -pre_configure() { - autoreconf -fi -} From 7f235bd329cd329afa6777bbf961ab8dfee5184b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 27 Aug 2023 13:24:22 +0700 Subject: [PATCH 18/28] *: rebuild for boost 1.83.0 --- srcpkgs/0ad/template | 2 +- srcpkgs/Aegisub/template | 2 +- srcpkgs/LGOGDownloader/template | 2 +- srcpkgs/Lucene++/template | 2 +- srcpkgs/PrusaSlicer/template | 2 +- srcpkgs/TSC/template | 2 +- srcpkgs/astroid/template | 2 +- srcpkgs/bastet/template | 2 +- srcpkgs/blender/template | 2 +- srcpkgs/btfs/template | 2 +- srcpkgs/cclive/template | 2 +- srcpkgs/cgal/template | 2 +- srcpkgs/codeblocks/template | 2 +- srcpkgs/colobot/template | 2 +- srcpkgs/cpp-hocon/template | 2 +- srcpkgs/cryfs/template | 2 +- srcpkgs/eclib/template | 2 +- srcpkgs/fifengine/template | 2 +- srcpkgs/freecad/template | 2 +- srcpkgs/freeorion/template | 2 +- srcpkgs/gnucash/template | 2 +- srcpkgs/gnuradio-osmosdr/template | 2 +- srcpkgs/gnuradio-rds/template | 2 +- srcpkgs/gnuradio/template | 2 +- srcpkgs/gource/template | 2 +- srcpkgs/grive2/template | 2 +- srcpkgs/guitarix2/template | 2 +- srcpkgs/heaptrack/template | 2 +- srcpkgs/hugin/template | 2 +- srcpkgs/imagescan/template | 2 +- srcpkgs/imath/template | 2 +- srcpkgs/inkscape/template | 2 +- srcpkgs/innoextract/template | 2 +- srcpkgs/juCi++/template | 2 +- srcpkgs/kig/template | 2 +- srcpkgs/leatherman/template | 2 +- srcpkgs/ledger/template | 2 +- srcpkgs/libcmis/template | 2 +- srcpkgs/libetonyek/template | 4 ++-- srcpkgs/libphonenumber/template | 2 +- srcpkgs/librime/template | 2 +- srcpkgs/lms/template | 2 +- srcpkgs/logstalgia/template | 2 +- srcpkgs/mkvtoolnix/template | 2 +- srcpkgs/mupen64plus/template | 2 +- srcpkgs/ncmpcpp/template | 2 +- srcpkgs/nix/template | 2 +- srcpkgs/openimageio/template | 2 +- srcpkgs/openmw/template | 2 +- srcpkgs/openscad/template | 2 +- srcpkgs/openvdb/template | 2 +- srcpkgs/osm2pgsql/template | 2 +- srcpkgs/poedit/template | 2 +- srcpkgs/povray/template | 2 +- srcpkgs/pulseeffects-legacy/template | 2 +- srcpkgs/pulseview/template | 2 +- srcpkgs/remwharead/template | 2 +- srcpkgs/schroot/template | 2 +- srcpkgs/snapper/template | 2 +- srcpkgs/source-highlight/template | 2 +- srcpkgs/supercollider/template | 2 +- srcpkgs/supertux2/template | 2 +- srcpkgs/syncthingtray/template | 2 +- srcpkgs/tmfs/template | 2 +- srcpkgs/tomahawk/template | 2 +- srcpkgs/uhd/template | 2 +- srcpkgs/wsjtx/template | 2 +- srcpkgs/wt/template | 2 +- 68 files changed, 69 insertions(+), 69 deletions(-) diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template index 6d596c3319886..8cf4a75721619 100644 --- a/srcpkgs/0ad/template +++ b/srcpkgs/0ad/template @@ -1,7 +1,7 @@ # Template file for '0ad' pkgname=0ad version=0.0.26 -revision=6 +revision=7 archs="x86_64* i686* aarch64* armv7l* ppc64le*" hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang" makedepends="SDL2-devel boost-devel gloox-devel libcurl-devel libenet-devel diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template index 85f735406319d..a69540e82128e 100644 --- a/srcpkgs/Aegisub/template +++ b/srcpkgs/Aegisub/template @@ -1,7 +1,7 @@ # Template file for 'Aegisub' pkgname=Aegisub version=3.3.2 -revision=9 +revision=10 build_style=cmake build_helper=cmake-wxWidgets-gtk3 cmake_builddir="BUILD" diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template index e88351cc45784..f7c58877cbe65 100644 --- a/srcpkgs/LGOGDownloader/template +++ b/srcpkgs/LGOGDownloader/template @@ -1,7 +1,7 @@ # Template file for 'LGOGDownloader' pkgname=LGOGDownloader version=3.11 -revision=3 +revision=4 build_style=cmake configure_args="$(vopt_bool qt USE_QT_GUI)" hostmakedepends="pkg-config" diff --git a/srcpkgs/Lucene++/template b/srcpkgs/Lucene++/template index 5cbc5262c63a7..931e80cdbee49 100644 --- a/srcpkgs/Lucene++/template +++ b/srcpkgs/Lucene++/template @@ -1,7 +1,7 @@ # Template file for 'Lucene++' pkgname=Lucene++ version=3.0.7 -revision=14 +revision=15 build_style=cmake configure_args="-Wno-dev" makedepends="boost-devel gtest-devel" diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template index e4e874c25a925..ae19034e83819 100644 --- a/srcpkgs/PrusaSlicer/template +++ b/srcpkgs/PrusaSlicer/template @@ -1,7 +1,7 @@ # Template file for 'PrusaSlicer' pkgname=PrusaSlicer version=2.5.2 -revision=1 +revision=2 build_style=cmake build_helper="qemu cmake-wxWidgets-gtk3" # Pre-Compiled Headers seems to be slower diff --git a/srcpkgs/TSC/template b/srcpkgs/TSC/template index 86ac15a7a2e3a..16612c13d38a2 100644 --- a/srcpkgs/TSC/template +++ b/srcpkgs/TSC/template @@ -1,7 +1,7 @@ # Template file for 'TSC' pkgname=TSC version=2.1.0 -revision=5 +revision=6 build_wrksrc=tsc build_style=cmake build_helper="qemu" diff --git a/srcpkgs/astroid/template b/srcpkgs/astroid/template index 03b4384a86065..c56fbbb1ba358 100644 --- a/srcpkgs/astroid/template +++ b/srcpkgs/astroid/template @@ -1,7 +1,7 @@ # Template file for 'astroid' pkgname=astroid version=0.16 -revision=10 +revision=11 build_style=cmake build_helper=gir hostmakedepends="pkg-config scdoc protobuf gobject-introspection" diff --git a/srcpkgs/bastet/template b/srcpkgs/bastet/template index fabf4b51d5c76..d28c40a05a734 100644 --- a/srcpkgs/bastet/template +++ b/srcpkgs/bastet/template @@ -1,7 +1,7 @@ # Template file for 'bastet' pkgname=bastet version=0.43.2 -revision=2 +revision=3 build_style=gnu-makefile make_use_env=yes makedepends="boost-devel ncurses-devel" diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template index 094f17c34c74c..55edc84eb1108 100644 --- a/srcpkgs/blender/template +++ b/srcpkgs/blender/template @@ -1,7 +1,7 @@ # Template file for 'blender' pkgname=blender version=3.6.1 -revision=1 +revision=2 archs="x86_64* ppc64*" build_style="cmake" pycompile_dirs="/usr/share/blender/${version%.*}/scripts" diff --git a/srcpkgs/btfs/template b/srcpkgs/btfs/template index 305b588d007b4..8f3818e6c2efc 100644 --- a/srcpkgs/btfs/template +++ b/srcpkgs/btfs/template @@ -1,7 +1,7 @@ # Template file for 'btfs' pkgname=btfs version=2.24 -revision=3 +revision=4 build_style=gnu-configure hostmakedepends="automake pkg-config" makedepends="boost-devel fuse-devel libcurl-devel libtorrent-rasterbar-devel" diff --git a/srcpkgs/cclive/template b/srcpkgs/cclive/template index 365246f9ba332..ae5a4ad604028 100644 --- a/srcpkgs/cclive/template +++ b/srcpkgs/cclive/template @@ -1,7 +1,7 @@ # Template file for 'cclive' pkgname=cclive version=0.9.3 -revision=8 +revision=9 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="boost-devel pcre-devel libcurl-devel libquvi-devel glibmm-devel" diff --git a/srcpkgs/cgal/template b/srcpkgs/cgal/template index 272ad67aed145..25e7bb0a992b7 100644 --- a/srcpkgs/cgal/template +++ b/srcpkgs/cgal/template @@ -1,7 +1,7 @@ # Template file for 'cgal' pkgname=cgal version=4.14 -revision=6 +revision=7 build_style=cmake build_helper="qemu" makedepends="boost-devel eigen mpfr-devel" diff --git a/srcpkgs/codeblocks/template b/srcpkgs/codeblocks/template index af2c062d43c95..6c6c31dfd3e1e 100644 --- a/srcpkgs/codeblocks/template +++ b/srcpkgs/codeblocks/template @@ -1,7 +1,7 @@ # Template file for 'codeblocks' pkgname=codeblocks version=20.03 -revision=4 +revision=5 build_style=gnu-configure configure_args="--with-wx-config=wx-config-gtk3 --with-contrib-plugins --with-boost=${XBPS_CROSS_BASE}/usr diff --git a/srcpkgs/colobot/template b/srcpkgs/colobot/template index 08181b41943e3..e67aa41f7c9ff 100644 --- a/srcpkgs/colobot/template +++ b/srcpkgs/colobot/template @@ -2,7 +2,7 @@ pkgname=colobot # needs to be kept in sync with colobot-data (provides game assets) version=0.2.1 -revision=1 +revision=2 build_style=cmake configure_args="-DCOLOBOT_INSTALL_BIN_DIR=/usr/bin -DOpenGL_GL_PREFERENCE=GLVND" hostmakedepends="gettext librsvg-utils perl po4a xmlstarlet" diff --git a/srcpkgs/cpp-hocon/template b/srcpkgs/cpp-hocon/template index 189bd97e8d1e7..011d49e9a9504 100644 --- a/srcpkgs/cpp-hocon/template +++ b/srcpkgs/cpp-hocon/template @@ -1,7 +1,7 @@ # Template file for 'cpp-hocon' pkgname=cpp-hocon version=0.3.0 -revision=7 +revision=8 build_style=cmake configure_args="-DBUILD_SHARED_LIBS=ON" hostmakedepends="pkg-config" diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template index 80d729d5342ff..bb2109c034e8c 100644 --- a/srcpkgs/cryfs/template +++ b/srcpkgs/cryfs/template @@ -1,7 +1,7 @@ # Template file for 'cryfs' pkgname=cryfs version=0.11.4 -revision=1 +revision=2 build_style=cmake configure_args="-DBoost_USE_STATIC_LIBS=OFF -DCRYFS_UPDATE_CHECKS=off -DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake" diff --git a/srcpkgs/eclib/template b/srcpkgs/eclib/template index b20fb852a5bab..1d4ad58f21b7b 100644 --- a/srcpkgs/eclib/template +++ b/srcpkgs/eclib/template @@ -1,7 +1,7 @@ # Template file for 'eclib' pkgname=eclib version=20230424 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-flint --with-boost" makedepends="pari-devel ntl-devel flintlib-devel boost-devel" diff --git a/srcpkgs/fifengine/template b/srcpkgs/fifengine/template index b5cf789320c36..79c34d17b8da0 100644 --- a/srcpkgs/fifengine/template +++ b/srcpkgs/fifengine/template @@ -1,7 +1,7 @@ # Template file for 'fifengine' pkgname=fifengine version=0.4.2 -revision=12 +revision=13 build_style=cmake hostmakedepends="swig python3" makedepends="SDL2-devel SDL2_image-devel SDL2_ttf-devel boost-devel diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template index a4a3f5f76b29a..8608d1670c87f 100644 --- a/srcpkgs/freecad/template +++ b/srcpkgs/freecad/template @@ -1,7 +1,7 @@ # Template file for 'freecad' pkgname=freecad version=0.20.2 -revision=5 +revision=6 build_style=cmake _inst_prefix=/usr/lib/${pkgname} diff --git a/srcpkgs/freeorion/template b/srcpkgs/freeorion/template index c57e2ccc03591..2b0b0d53b2825 100644 --- a/srcpkgs/freeorion/template +++ b/srcpkgs/freeorion/template @@ -1,7 +1,7 @@ # Template file for 'freeorion' pkgname=freeorion version=0.4.10.2 -revision=6 +revision=7 _release=${version}_2021-08-01.f663dad build_style=cmake hostmakedepends="cppcheck doxygen python3-pycodestyle" diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template index fc6275c77eb96..1a5d08e02469f 100644 --- a/srcpkgs/gnucash/template +++ b/srcpkgs/gnucash/template @@ -1,7 +1,7 @@ # Template file for 'gnucash' pkgname=gnucash version=5.3 -revision=1 +revision=2 build_style=cmake make_check_target=check configure_args="-DWITH_PYTHON=1 -DCOMPILE_GSCHEMAS=OFF" diff --git a/srcpkgs/gnuradio-osmosdr/template b/srcpkgs/gnuradio-osmosdr/template index a4cb14a2ac1ef..781531647b13e 100644 --- a/srcpkgs/gnuradio-osmosdr/template +++ b/srcpkgs/gnuradio-osmosdr/template @@ -1,7 +1,7 @@ # Template file for 'gnuradio-osmosdr' pkgname=gnuradio-osmosdr version=0.2.4 -revision=2 +revision=3 build_style=cmake configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11" hostmakedepends="pkg-config gnuradio python3" diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template index b1bc96848bf84..ff4db3a1e0d08 100644 --- a/srcpkgs/gnuradio-rds/template +++ b/srcpkgs/gnuradio-rds/template @@ -1,7 +1,7 @@ # Template file for 'gnuradio-rds' pkgname=gnuradio-rds version=3.10 -revision=7 +revision=8 build_style=cmake configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11" hostmakedepends="pkg-config gnuradio python3" diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template index be803231f80d2..c7dda01f9913d 100644 --- a/srcpkgs/gnuradio/template +++ b/srcpkgs/gnuradio/template @@ -1,7 +1,7 @@ # Template file for 'gnuradio' pkgname=gnuradio version=3.10.5.1 -revision=2 +revision=3 build_style=cmake conf_files="/etc/gnuradio/conf.d/*" configure_args="-DMATHJAX2_USE_ROOT=/usr/share/mathjax diff --git a/srcpkgs/gource/template b/srcpkgs/gource/template index 453e7e328f274..717a9cb764136 100644 --- a/srcpkgs/gource/template +++ b/srcpkgs/gource/template @@ -1,7 +1,7 @@ # Template file for 'gource' pkgname=gource version=0.54 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-tinyxml --enable-ttf-font-dir=/usr/share/fonts/TTF --with-boost-libdir=$XBPS_CROSS_BASE/usr/lib/" diff --git a/srcpkgs/grive2/template b/srcpkgs/grive2/template index 5c524f78958d4..eeb50cc389eef 100644 --- a/srcpkgs/grive2/template +++ b/srcpkgs/grive2/template @@ -1,7 +1,7 @@ # Template file for 'grive2' pkgname=grive2 version=0.5.3 -revision=3 +revision=4 build_style=cmake hostmakedepends="pkg-config" makedepends="boost-devel libcurl-devel yajl-devel libgcrypt-devel expat-devel" diff --git a/srcpkgs/guitarix2/template b/srcpkgs/guitarix2/template index 6a294f6b962fd..f71a472bf8e64 100644 --- a/srcpkgs/guitarix2/template +++ b/srcpkgs/guitarix2/template @@ -1,7 +1,7 @@ # Template file for 'guitarix2' pkgname=guitarix2 version=0.44.1 -revision=2 +revision=3 build_style=waf3 configure_args="--cxxflags-release=-DNDEBUG --ladspa --new-ladspa --no-faust $(vopt_if avahi '' '--no-avahi') $(vopt_if bluez '' '--no-bluez')" diff --git a/srcpkgs/heaptrack/template b/srcpkgs/heaptrack/template index 7388dd0506470..332dbd35532d4 100644 --- a/srcpkgs/heaptrack/template +++ b/srcpkgs/heaptrack/template @@ -1,7 +1,7 @@ # Template file for 'heaptrack' pkgname=heaptrack version=1.4.0 -revision=4 +revision=5 build_style=cmake configure_args="-DHEAPTRACK_BUILD_GUI=ON" hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules kcoreaddons diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template index 52b56a2c41022..943d23d1a932f 100644 --- a/srcpkgs/hugin/template +++ b/srcpkgs/hugin/template @@ -1,7 +1,7 @@ # Template file for 'hugin' pkgname=hugin version=2022.0.0 -revision=7 +revision=8 build_style=cmake build_helper=cmake-wxWidgets-gtk3 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates" diff --git a/srcpkgs/imagescan/template b/srcpkgs/imagescan/template index 9a4101e582a6e..3de7199dbe77a 100644 --- a/srcpkgs/imagescan/template +++ b/srcpkgs/imagescan/template @@ -1,7 +1,7 @@ # Template file for 'imagescan' pkgname=imagescan version=3.65.0 -revision=5 +revision=6 build_style=gnu-configure configure_args="--libexecdir=/usr/lib --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib --with-gtkmm --enable-sane-config --with-sane-confdir=/etc/sane.d --enable-udev-config diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template index e43f1a707562b..4ce09493e940a 100644 --- a/srcpkgs/imath/template +++ b/srcpkgs/imath/template @@ -1,7 +1,7 @@ # Template file for 'imath' pkgname=imath version=3.1.9 -revision=1 +revision=2 build_style=cmake configure_args="-DPYTHON=ON" hostmakedepends="python3-numpy" diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template index 56365acf8d85c..1e0e2c26b5c58 100644 --- a/srcpkgs/inkscape/template +++ b/srcpkgs/inkscape/template @@ -1,7 +1,7 @@ # Template file for 'inkscape' pkgname=inkscape version=1.3 -revision=2 +revision=3 build_style=cmake make_check_target="check" hostmakedepends="automake gettext glib-devel intltool libgraphicsmagick-devel diff --git a/srcpkgs/innoextract/template b/srcpkgs/innoextract/template index 7d2e50b622459..0304685724796 100644 --- a/srcpkgs/innoextract/template +++ b/srcpkgs/innoextract/template @@ -1,7 +1,7 @@ # Template file for 'innoextract' pkgname=innoextract version=1.9 -revision=4 +revision=5 build_style=cmake hostmakedepends="extra-cmake-modules" makedepends="boost-devel liblzma-devel" diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template index 1948023bd290b..4cb4644663800 100644 --- a/srcpkgs/juCi++/template +++ b/srcpkgs/juCi++/template @@ -1,7 +1,7 @@ # Template file for 'juCi++' pkgname=juCi++ version=1.7.2 -revision=5 +revision=6 _libclangmm_commit="9704b9b6de0982a588fa41741157d5640afedf30" _tiny_commit="839ff806dc447ff49af80f9a9eaa7949f770f8e5" create_wrksrc=yes diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template index 9719dbc661ccc..a3e8ce0f97ed5 100644 --- a/srcpkgs/kig/template +++ b/srcpkgs/kig/template @@ -1,7 +1,7 @@ # Template file for 'kig' pkgname=kig version=23.04.2 -revision=1 +revision=2 build_style=cmake hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext pkg-config qt5-host-tools qt5-qmake" diff --git a/srcpkgs/leatherman/template b/srcpkgs/leatherman/template index d0e44a5e970c3..a8c50f8fc00d9 100644 --- a/srcpkgs/leatherman/template +++ b/srcpkgs/leatherman/template @@ -1,7 +1,7 @@ # Template file for 'leatherman' pkgname=leatherman version=1.12.4 -revision=6 +revision=7 build_style=cmake configure_args="-DLEATHERMAN_SHARED=ON" hostmakedepends="pkg-config python3" diff --git a/srcpkgs/ledger/template b/srcpkgs/ledger/template index 53335b1671e98..9f132f609103c 100644 --- a/srcpkgs/ledger/template +++ b/srcpkgs/ledger/template @@ -1,7 +1,7 @@ # Template file for 'ledger' pkgname=ledger version=3.2.1 -revision=4 +revision=5 build_style=cmake makedepends="boost-devel gmp-devel mpfr-devel gettext-devel libedit-devel" short_desc="Double-entry accounting system with a command-line reporting interface" diff --git a/srcpkgs/libcmis/template b/srcpkgs/libcmis/template index 80239ba34f9a3..9f5be0f32b6d4 100644 --- a/srcpkgs/libcmis/template +++ b/srcpkgs/libcmis/template @@ -1,7 +1,7 @@ # Template file for 'libcmis' pkgname=libcmis version=0.5.2 -revision=7 +revision=8 build_style=gnu-configure configure_args="DOCBOOK2MAN=docbook2man --disable-werror" hostmakedepends="pkg-config docbook2x" diff --git a/srcpkgs/libetonyek/template b/srcpkgs/libetonyek/template index c0b5152acdb67..96bb9554f8094 100644 --- a/srcpkgs/libetonyek/template +++ b/srcpkgs/libetonyek/template @@ -1,9 +1,9 @@ # Template file for 'libetonyek' pkgname=libetonyek version=0.1.10 -revision=1 +revision=2 build_style=gnu-configure -configure_args="--with-mdds=2.0" +configure_args="--with-mdds=2.1" make_build_args=V=1 hostmakedepends="pkg-config" makedepends="libxml2-devel boost-devel libcppunit-devel librevenge-devel diff --git a/srcpkgs/libphonenumber/template b/srcpkgs/libphonenumber/template index 5b7be9d3a78b4..3c00e8c7056b0 100644 --- a/srcpkgs/libphonenumber/template +++ b/srcpkgs/libphonenumber/template @@ -1,7 +1,7 @@ # Template file for 'libphonenumber' pkgname=libphonenumber version=8.12.39 -revision=14 +revision=15 build_wrksrc=cpp build_style=cmake build_helper=qemu diff --git a/srcpkgs/librime/template b/srcpkgs/librime/template index f4736e3b712d6..b44cb170cf79b 100644 --- a/srcpkgs/librime/template +++ b/srcpkgs/librime/template @@ -1,7 +1,7 @@ # Template file for 'librime' pkgname=librime version=1.7.3 -revision=7 +revision=8 build_style=cmake configure_args="-DCMAKE_BUILD_TYPE=None -DENABLE_LOGGING=OFF -DBUILD_TEST=ON -DCAPNP_EXECUTABLE=/usr/bin/capnp -DCAPNPC_CXX_EXECUTABLE=/usr/bin/capnpc-c++" diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template index 2df52c51dbfe6..cb3ea5e58c80f 100644 --- a/srcpkgs/lms/template +++ b/srcpkgs/lms/template @@ -1,7 +1,7 @@ # Template file for 'lms' pkgname=lms version=3.40.0 -revision=1 +revision=2 build_style=cmake hostmakedepends="pkg-config" makedepends="wt-devel ffmpeg-devel boost-devel libconfig++-devel taglib-devel pam-devel libgraphicsmagick-devel gtest-devel libarchive-devel" diff --git a/srcpkgs/logstalgia/template b/srcpkgs/logstalgia/template index 34363498a6b32..a51a3aaca3ba6 100644 --- a/srcpkgs/logstalgia/template +++ b/srcpkgs/logstalgia/template @@ -1,7 +1,7 @@ # Template file for 'logstalgia' pkgname=logstalgia version=1.1.4 -revision=3 +revision=4 build_style=gnu-configure configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib" hostmakedepends="pkg-config" diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template index 0f7967faa664c..f1e233ef86422 100644 --- a/srcpkgs/mkvtoolnix/template +++ b/srcpkgs/mkvtoolnix/template @@ -1,7 +1,7 @@ # Template file for 'mkvtoolnix' pkgname=mkvtoolnix version=78.0 -revision=1 +revision=2 build_style=gnu-configure build_helper=qmake configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt diff --git a/srcpkgs/mupen64plus/template b/srcpkgs/mupen64plus/template index 9f8e98249408b..b91898f321c42 100644 --- a/srcpkgs/mupen64plus/template +++ b/srcpkgs/mupen64plus/template @@ -1,7 +1,7 @@ # Template file for 'mupen64plus' pkgname=mupen64plus version=2.5.9 -revision=6 +revision=7 archs="x86_64* i686*" hostmakedepends="pkg-config which nasm" makedepends="boost-devel SDL2-devel speexdsp-devel freetype-devel glu-devel libpng-devel libsamplerate-devel" diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template index 31a5c007a9905..75ce5f6f31f55 100644 --- a/srcpkgs/ncmpcpp/template +++ b/srcpkgs/ncmpcpp/template @@ -1,7 +1,7 @@ # Template file for 'ncmpcpp' pkgname=ncmpcpp version=0.9.2 -revision=10 +revision=11 build_style=gnu-configure configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw" diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template index 59d01427205ef..104739e7d52c8 100644 --- a/srcpkgs/nix/template +++ b/srcpkgs/nix/template @@ -1,7 +1,7 @@ # Template file for 'nix' pkgname=nix version=2.11.0 -revision=7 +revision=8 build_style=gnu-configure build_helper=qemu # Use /nix/var as suggested by the official Manual. diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template index 69a9e23786942..d8a6ba56efd11 100644 --- a/srcpkgs/openimageio/template +++ b/srcpkgs/openimageio/template @@ -1,7 +1,7 @@ # Template file for 'openimageio' pkgname=openimageio version=2.4.9.0 -revision=5 +revision=6 build_style=cmake build_helper=qemu configure_args="-DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0 diff --git a/srcpkgs/openmw/template b/srcpkgs/openmw/template index 2f987fec0aad8..0abf5ff7cdbec 100644 --- a/srcpkgs/openmw/template +++ b/srcpkgs/openmw/template @@ -1,7 +1,7 @@ # Template file for 'openmw' pkgname=openmw version=0.48.0 -revision=1 +revision=2 build_style=cmake _recast_commit=e75adf86f91eb3082220085e42dda62679f9a3ea _bullet_tag=3.17 diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template index a31b34b5fe397..fa82723ef249a 100644 --- a/srcpkgs/openscad/template +++ b/srcpkgs/openscad/template @@ -1,7 +1,7 @@ # Template file for 'openscad' pkgname=openscad version=2021.01 -revision=5 +revision=6 build_style=qmake hostmakedepends="bison flex pkg-config gettext qt5-qmake qt5-host-tools" makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template index 30a61927059d9..1596120b26cb9 100644 --- a/srcpkgs/openvdb/template +++ b/srcpkgs/openvdb/template @@ -1,7 +1,7 @@ # Template file for 'openvdb' pkgname=openvdb version=9.0.0 -revision=6 +revision=7 build_style=cmake configure_args="-DOPENVDB_BUILD_VDB_VIEW=1" hostmakedepends="pkg-config" diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template index 4281609e911b8..26a5222a751e7 100644 --- a/srcpkgs/osm2pgsql/template +++ b/srcpkgs/osm2pgsql/template @@ -1,7 +1,7 @@ # Template file for 'osm2pgsql' pkgname=osm2pgsql version=1.6.0 -revision=5 +revision=6 build_style=cmake hostmakedepends="boost" makedepends="expat-devel proj-devel bzip2-devel zlib-devel boost-devel diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template index 377183469ae74..fc16c03f8ffe6 100644 --- a/srcpkgs/poedit/template +++ b/srcpkgs/poedit/template @@ -1,7 +1,7 @@ # Template file for 'poedit' pkgname=poedit version=3.3.2 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-wx-config=wx-config-gtk3" hostmakedepends="pkg-config" diff --git a/srcpkgs/povray/template b/srcpkgs/povray/template index e7cf16f4b0892..1bd7309959d35 100644 --- a/srcpkgs/povray/template +++ b/srcpkgs/povray/template @@ -1,7 +1,7 @@ # Template file for 'povray' pkgname=povray version=3.7.0.8 -revision=9 +revision=10 build_style=gnu-configure _v=${version%.*.*} configure_args="COMPILED_BY=Void --disable-optimiz-arch" diff --git a/srcpkgs/pulseeffects-legacy/template b/srcpkgs/pulseeffects-legacy/template index ca614d7a5eaed..6921872f2d974 100644 --- a/srcpkgs/pulseeffects-legacy/template +++ b/srcpkgs/pulseeffects-legacy/template @@ -1,7 +1,7 @@ # Template file for 'pulseeffects-legacy' pkgname=pulseeffects-legacy version=4.8.5 -revision=6 +revision=7 build_style=meson hostmakedepends="itstool pkg-config gettext glib-devel" makedepends="boost-devel gsettings-desktop-schemas-devel diff --git a/srcpkgs/pulseview/template b/srcpkgs/pulseview/template index 0eb44a822c469..51866bfbf4b7b 100644 --- a/srcpkgs/pulseview/template +++ b/srcpkgs/pulseview/template @@ -1,7 +1,7 @@ # Template file for 'pulseview' pkgname=pulseview version=0.4.2 -revision=5 +revision=6 build_style=cmake configure_args="-DDISABLE_WERROR=TRUE" hostmakedepends="pkg-config qt5-qmake qt5-host-tools" diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template index 12366e47c0060..4f6276ca2477d 100644 --- a/srcpkgs/remwharead/template +++ b/srcpkgs/remwharead/template @@ -1,7 +1,7 @@ # Template file for 'remwharead' pkgname=remwharead version=0.10.0 -revision=6 +revision=7 build_style=cmake hostmakedepends="poco-devel asciidoc pkg-config" makedepends="poco-devel boost-devel" diff --git a/srcpkgs/schroot/template b/srcpkgs/schroot/template index e6f6b9f171ad7..4bd5d1bed3db9 100644 --- a/srcpkgs/schroot/template +++ b/srcpkgs/schroot/template @@ -2,7 +2,7 @@ pkgname=schroot reverts="1.7.2_9" version=1.6.10 -revision=15 +revision=16 _debian_version=12+deb11u1 build_style=cmake configure_args=" diff --git a/srcpkgs/snapper/template b/srcpkgs/snapper/template index 07a8e34530f96..2f9e7a22f815a 100644 --- a/srcpkgs/snapper/template +++ b/srcpkgs/snapper/template @@ -1,7 +1,7 @@ # Template file for 'snapper' pkgname=snapper version=0.10.3 -revision=3 +revision=4 build_style=gnu-configure configure_args="--disable-zypp --disable-systemd --with-conf=/etc/conf.d" conf_files="/etc/conf.d/snapper" diff --git a/srcpkgs/source-highlight/template b/srcpkgs/source-highlight/template index 5a8a4ac60d38f..07b09fe5c1cf6 100644 --- a/srcpkgs/source-highlight/template +++ b/srcpkgs/source-highlight/template @@ -1,7 +1,7 @@ # Template file for 'source-highlight' pkgname=source-highlight version=3.1.9 -revision=7 +revision=8 build_style=gnu-configure configure_args="--with-boost=${XBPS_CROSS_BASE}/usr --with-bash-completion=/usr/share/bash-completion/completions" diff --git a/srcpkgs/supercollider/template b/srcpkgs/supercollider/template index 7c147c4a59e77..e7d61fc7d35fb 100644 --- a/srcpkgs/supercollider/template +++ b/srcpkgs/supercollider/template @@ -1,7 +1,7 @@ # Template file for 'supercollider' pkgname=supercollider version=3.11.1 -revision=6 +revision=7 build_style=cmake make_cmd=make configure_args="-DENABLE_TESTSUITE=OFF -DSYSTEM_BOOST=ON -DSYSTEM_YAMLCPP=ON" diff --git a/srcpkgs/supertux2/template b/srcpkgs/supertux2/template index 2fa412a4199f6..e40c525585053 100644 --- a/srcpkgs/supertux2/template +++ b/srcpkgs/supertux2/template @@ -1,7 +1,7 @@ # Template file for 'supertux2' pkgname=supertux2 version=0.6.3 -revision=4 +revision=5 build_style=cmake configure_args=" -DAPPDATADIR=/usr/share/supertux2 diff --git a/srcpkgs/syncthingtray/template b/srcpkgs/syncthingtray/template index e9963cb3cd48e..97575e8f7a3fa 100644 --- a/srcpkgs/syncthingtray/template +++ b/srcpkgs/syncthingtray/template @@ -1,7 +1,7 @@ # Template file for 'syncthingtray' pkgname=syncthingtray version=1.4.5 -revision=1 +revision=2 build_style=cmake configure_args="-DJS_PROVIDER=qml -DBUILTIN_TRANSLATIONS=ON -DSYSTEMD_SUPPORT=OFF -DBUILD_SHARED_LIBS=ON -DWEBVIEW_PROVIDER=$(vopt_if webengine webengine none) diff --git a/srcpkgs/tmfs/template b/srcpkgs/tmfs/template index af0dcf154082e..1bd2146e59090 100644 --- a/srcpkgs/tmfs/template +++ b/srcpkgs/tmfs/template @@ -1,7 +1,7 @@ # Template file for 'tmfs' pkgname=tmfs version=r5 -revision=10 +revision=11 build_style=cmake hostmakedepends="pkg-config" makedepends="fuse-devel boost-devel" diff --git a/srcpkgs/tomahawk/template b/srcpkgs/tomahawk/template index cb6b40de7e907..82c5a7f8fef7b 100644 --- a/srcpkgs/tomahawk/template +++ b/srcpkgs/tomahawk/template @@ -1,7 +1,7 @@ # Template file for 'tomahawk' pkgname=tomahawk version=0.8.4 -revision=24 +revision=25 _commit=90ec6f0dc701cba0533c66abdcb904e29f02a66f build_style=cmake configure_args="-Wno-dev -DBUILD_RELEASE=ON \ diff --git a/srcpkgs/uhd/template b/srcpkgs/uhd/template index 8645921e88d6f..40f3875d0c04a 100644 --- a/srcpkgs/uhd/template +++ b/srcpkgs/uhd/template @@ -1,7 +1,7 @@ # Template file for 'uhd' pkgname=uhd version=4.0.0.0 -revision=4 +revision=5 build_wrksrc=host build_style=cmake configure_args="-DCMAKE_BUILD_TYPE=None" diff --git a/srcpkgs/wsjtx/template b/srcpkgs/wsjtx/template index 44310303ab59f..16f1fa426dfa0 100644 --- a/srcpkgs/wsjtx/template +++ b/srcpkgs/wsjtx/template @@ -1,7 +1,7 @@ # Template file for 'wsjtx' pkgname=wsjtx version=2.6.1 -revision=2 +revision=3 build_wrksrc=wsjtx build_style=cmake configure_args="-DRIGCTLCOM_EXE= -DRIGCTL_EXE= -DRIGCTLD_EXE= diff --git a/srcpkgs/wt/template b/srcpkgs/wt/template index 33a48ed75ffea..cad0482b15a03 100644 --- a/srcpkgs/wt/template +++ b/srcpkgs/wt/template @@ -1,7 +1,7 @@ # Template file for 'wt' pkgname=wt version=4.10.0 -revision=1 +revision=2 build_style=cmake makedepends="boost-devel" short_desc="Wt, C++ Web Toolkit" From 56ee0d4a76871c50b84368289f38136b37a43ffc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 21 Aug 2023 22:05:58 +0700 Subject: [PATCH 19/28] libixion: update to 0.18.1. --- common/shlibs | 2 +- srcpkgs/libixion/template | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/common/shlibs b/common/shlibs index e83eb5289501e..f8770b30c1bf8 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2653,7 +2653,7 @@ libCbc.so.3 CoinMP-1.8.3_1 libOsiCommonTests.so.1 CoinMP-1.8.3_1 libCbcSolver.so.3 CoinMP-1.8.3_1 libmwaw-0.3.so.3 libmwaw-0.3.7_1 -libixion-0.17.so.0 libixion-0.17.0_1 +libixion-0.18.so.0 libixion-0.18.1_1 liborcus-parser-0.17.so.0 liborcus-0.17.2_1 liborcus-mso-0.17.so.0 liborcus-0.17.2_1 liborcus-0.17.so.0 liborcus-0.17.2_1 diff --git a/srcpkgs/libixion/template b/srcpkgs/libixion/template index 91f9956b04480..8189be65483ac 100644 --- a/srcpkgs/libixion/template +++ b/srcpkgs/libixion/template @@ -1,7 +1,7 @@ # Template file for 'libixion' pkgname=libixion -version=0.17.0 -revision=5 +version=0.18.1 +revision=1 build_style=gnu-configure hostmakedepends="pkg-config python3" makedepends="boost-devel fmt-devel mdds python3-devel spdlog" @@ -10,9 +10,8 @@ maintainer="Orphaned " license="MPL-2.0" homepage="https://gitlab.com/ixion/ixion/" distfiles="http://kohei.us/files/ixion/src/${pkgname}-${version}.tar.xz" -distfiles="${DEBIAN_SITE}/main/libi/libixion/libixion_${version}.orig.tar.gz" -checksum=53c97139223f3b786d498f86512a20ee878fab0ef981947647aa116df7c4101e -checksum=a081c8ffd495396f1f801ea3eaf8266a8b4fc5ffbc529d2599bb7a59acd6595c +# distfiles="${DEBIAN_SITE}/main/libi/libixion/libixion_${version}.orig.tar.gz" +checksum=ec2327854601d41bd38f151bc94b47ef43f0b8258a551e41e9f5e19b9ad729c1 replaces="libixion11>=0" libixion-devel_package() { From 38fb0674afc42536384740fce3cae845231610bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 21 Aug 2023 22:06:03 +0700 Subject: [PATCH 20/28] liborcus: update to 0.18.1. --- common/shlibs | 8 ++++---- srcpkgs/liborcus/template | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/common/shlibs b/common/shlibs index f8770b30c1bf8..82107af453333 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2654,10 +2654,10 @@ libOsiCommonTests.so.1 CoinMP-1.8.3_1 libCbcSolver.so.3 CoinMP-1.8.3_1 libmwaw-0.3.so.3 libmwaw-0.3.7_1 libixion-0.18.so.0 libixion-0.18.1_1 -liborcus-parser-0.17.so.0 liborcus-0.17.2_1 -liborcus-mso-0.17.so.0 liborcus-0.17.2_1 -liborcus-0.17.so.0 liborcus-0.17.2_1 -liborcus-spreadsheet-model-0.17.so.0 liborcus-0.17.2_1 +liborcus-parser-0.18.so.0 liborcus-0.18.1_1 +liborcus-mso-0.18.so.0 liborcus-0.18.1_1 +liborcus-0.18.so.0 liborcus-0.18.1_1 +liborcus-spreadsheet-model-0.18.so.0 liborcus-0.18.1_1 libnumbertext-1.0.so.0 libnumbertext-1.0.4_1 libGeneratedSaxParser.so opencollada-0.0.20160223_1 libMathMLSolver.so opencollada-0.0.20160223_1 diff --git a/srcpkgs/liborcus/template b/srcpkgs/liborcus/template index 276b3b3a59896..bc8f3ddc11ee9 100644 --- a/srcpkgs/liborcus/template +++ b/srcpkgs/liborcus/template @@ -1,7 +1,7 @@ # Template file for 'liborcus' pkgname=liborcus -version=0.17.2 -revision=5 +version=0.18.1 +revision=1 build_style=gnu-configure hostmakedepends="automake libtool pkg-config python3" makedepends="boost-devel mdds libixion-devel python3-devel zlib-devel" @@ -10,8 +10,8 @@ maintainer="Orphaned " license="MPL-2.0" homepage="https://gitlab.com/orcus/orcus" distfiles="http://kohei.us/files/orcus/src/liborcus-${version}.tar.xz" -distfiles="${DEBIAN_SITE}/main/libo/liborcus/liborcus_${version}.orig.tar.xz" -checksum=30509d414e3cf439e0ae1e0c31b4b0ef5b2bb8e2b2404e3cb7d44a72162640ab +# distfiles="${DEBIAN_SITE}/main/libo/liborcus/liborcus_${version}.orig.tar.xz" +checksum=6006b9f1576315e313df715a7e72a17f3e0b17d7b6bd119cfa8a0b608ce971eb replaces="liborcus11>=0" pre_configure() { @@ -23,9 +23,9 @@ liborcus-devel_package() { depends="${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/include - vmove usr/lib/*.so - vmove usr/lib/*.a - vmove ${py3_sitelib}/*.a + vmove "usr/lib/*.so" + vmove "usr/lib/*.la" + vmove "${py3_sitelib}/*.la" vmove usr/lib/pkgconfig } } From bc9c0b58458be65fc30816a7a42a83b68015b6a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 22 Aug 2023 08:30:56 +0700 Subject: [PATCH 21/28] New package: frozen-1.1.1 --- srcpkgs/frozen/patches/no-constexpr.patch | 12 ++++++++++++ srcpkgs/frozen/template | 13 +++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 srcpkgs/frozen/patches/no-constexpr.patch create mode 100644 srcpkgs/frozen/template diff --git a/srcpkgs/frozen/patches/no-constexpr.patch b/srcpkgs/frozen/patches/no-constexpr.patch new file mode 100644 index 0000000000000..1a5d52357b627 --- /dev/null +++ b/srcpkgs/frozen/patches/no-constexpr.patch @@ -0,0 +1,12 @@ +--- a/tests/test_unordered_set.cpp ++++ b/tests/test_unordered_set.cpp +@@ -65,8 +65,8 @@ TEST_CASE("tripleton str frozen unordere + constexpr auto max_size = ze_set.max_size(); + REQUIRE(max_size == 3); + +- constexpr auto nocount = ze_set.count(4); ++ auto nocount = ze_set.count(4); + REQUIRE(nocount == 0); + + constexpr auto count = ze_set.count(1); + REQUIRE(count == 1); diff --git a/srcpkgs/frozen/template b/srcpkgs/frozen/template new file mode 100644 index 0000000000000..c8b8c1cbb16ce --- /dev/null +++ b/srcpkgs/frozen/template @@ -0,0 +1,13 @@ +# Template file for 'frozen' +pkgname=frozen +version=1.1.1 +revision=1 +build_style=cmake +configure_args="-DBUILD_TESTING=ON" +short_desc="Header-only, constexpr alternative to gperf for C++14 users" +maintainer="Đoàn Trần Công Danh " +license="Apache-2.0" +homepage="https://github.com/serge-sans-paille/frozen" +distfiles="https://github.com/serge-sans-paille/frozen/archive/refs/tags/${version}.tar.gz" +distfiles="https://dev-www.libreoffice.org/src/frozen-${version}.tar.gz" +checksum=f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45 From d9169fd388757bbd3c41c40461226a441571432e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 8 Aug 2023 13:44:43 +0700 Subject: [PATCH 22/28] hooks: move prepare-32bit and shlib-provides to post-install In a later change, we will generate shlib-depends cross subpkgs during pre-pkg stage. Thus we need shlib-provides information of all subpkgs ready before pre-pkg is run. Those information can only be read in post-install stage at the eariliest. Let's move the shlib-provides to post-install. This hook requires prepare-32bit, so, let's move that hook, too. --- .../05-prepare-32bit.sh => post-install/80-prepare-32bit.sh} | 0 .../06-shlib-provides.sh => post-install/98-shlib-provides.sh} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename common/hooks/{pre-pkg/05-prepare-32bit.sh => post-install/80-prepare-32bit.sh} (100%) rename common/hooks/{pre-pkg/06-shlib-provides.sh => post-install/98-shlib-provides.sh} (100%) diff --git a/common/hooks/pre-pkg/05-prepare-32bit.sh b/common/hooks/post-install/80-prepare-32bit.sh similarity index 100% rename from common/hooks/pre-pkg/05-prepare-32bit.sh rename to common/hooks/post-install/80-prepare-32bit.sh diff --git a/common/hooks/pre-pkg/06-shlib-provides.sh b/common/hooks/post-install/98-shlib-provides.sh similarity index 100% rename from common/hooks/pre-pkg/06-shlib-provides.sh rename to common/hooks/post-install/98-shlib-provides.sh From 8d6df80a5aab4571e4e4bf43f7702a3d3424285f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 8 Aug 2023 22:08:27 +0700 Subject: [PATCH 23/28] hooks/shlib-provides: record shared libraries without SONAME In a later change, we would like to generate runtime-deps between sub-packages. In order to do that, we can add everything into etc/shlibs or we can look into other subpackages directly. The former is cumbersome if such package has lot of shared-objects. The latter requires traversing and checking a lot of files. Furtunately, we can speed up the latter one by storing all shared-objects' information in a centralised place. --- .../hooks/post-install/98-shlib-provides.sh | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/common/hooks/post-install/98-shlib-provides.sh b/common/hooks/post-install/98-shlib-provides.sh index a09eb6f5c3b33..ad1c31c72db05 100644 --- a/common/hooks/post-install/98-shlib-provides.sh +++ b/common/hooks/post-install/98-shlib-provides.sh @@ -6,19 +6,30 @@ collect_sonames() { local _pattern="^[[:alnum:]]+(.*)+\.so(\.[0-9]+)*$" local _versioned_pattern="^[[:alnum:]]+(.*)+\.so(\.[0-9]+)+$" local _tmpfile=$(mktemp) || exit 1 + local _mainpkg="$2" + local _shlib_dir="${XBPS_STATEDIR}/shlib-provides" + local _no_soname=$(mktemp) || exit 1 + mkdir -p "${_shlib_dir}" || exit 1 if [ ! -d ${_destdir} ]; then rm -f ${_tmpfile} + rm -f ${_no_soname} return 0 fi + # real pkg find ${_destdir} -type f -name "*.so*" | while read f; do _fname="${f##*/}" case "$(file -bi "$f")" in application/x-sharedlib*|application/x-pie-executable*) # shared library - _soname=$(${OBJDUMP} -p "$f"|grep SONAME|awk '{print $2}') + _soname=$(${OBJDUMP} -p "$f"|awk '/SONAME/{print $2}') + if [ -n "$noshlibprovides" ]; then + # register all shared lib for rt-deps between sub-pkg + echo "${_fname}" >>${_no_soname} + continue + fi # Register all versioned sonames, and # unversioned sonames only when in libdir. if [[ ${_soname} =~ ${_versioned_pattern} ]] || @@ -27,6 +38,9 @@ collect_sonames() { -e ${_destdir}/usr/lib32/${_fname} ) ]]; then echo "${_soname}" >> ${_tmpfile} echo " SONAME ${_soname} from ${f##${_destdir}}" + else + # register all shared lib for rt-deps between sub-pkg + echo "${_fname}" >>${_no_soname} fi ;; esac @@ -38,6 +52,14 @@ collect_sonames() { if [ -s "${_tmpfile}" ]; then tr '\n' ' ' < "${_tmpfile}" > ${_destdir}/shlib-provides echo >> ${_destdir}/shlib-provides + if [ "$_mainpkg" ]; then + cp "${_tmpfile}" "${_shlib_dir}/${pkgname}.soname" + fi + fi + if [ "$_mainpkg" ] && [ -s "${_no_soname}" ]; then + mv "${_no_soname}" "${_shlib_dir}/${pkgname}.nosoname" + else + rm -f ${_no_soname} fi rm -f ${_tmpfile} } @@ -45,12 +67,8 @@ collect_sonames() { hook() { local _destdir32=${XBPS_DESTDIR}/${pkgname}-32bit-${version} - if [ -n "$noshlibprovides" ]; then - return 0 - fi - # native pkg - collect_sonames ${PKGDESTDIR} + collect_sonames ${PKGDESTDIR} yes # 32bit pkg collect_sonames ${_destdir32} } From 7a3f49143c38f0fe5e0d27198497f1e9345811da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 9 Aug 2023 13:19:01 +0700 Subject: [PATCH 24/28] hooks/gen-rt-deps: Look for rt-deps by subpkg first, common/shlibs later --- .../hooks/pre-pkg/04-generate-runtime-deps.sh | 80 +++++++------------ 1 file changed, 29 insertions(+), 51 deletions(-) diff --git a/common/hooks/pre-pkg/04-generate-runtime-deps.sh b/common/hooks/pre-pkg/04-generate-runtime-deps.sh index a291f2ccc8720..e2020ce05f79f 100644 --- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh +++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh @@ -47,6 +47,7 @@ store_pkgdestdir_rundeps() { hook() { local depsftmp f lf j mapshlibs sorequires _curdep elfmagic broken_shlibs verify_deps + local _shlib_dir="${XBPS_STATEDIR}/shlib-provides" # Disable trap on ERR, xbps-uhelper cmd might return error... but not something # to be worried about because if there are broken shlibs this hook returns @@ -95,65 +96,42 @@ hook() { # above, the mapping is done thru the common/shlibs file. # for f in ${verify_deps}; do - unset _f j rdep _rdep rdepcnt soname _pkgname _rdepver found - _f=$(echo "$f"|sed -E 's|\+|\\+|g') - rdep="$(grep -E "^${_f}[[:blank:]]+.*$" $mapshlibs|cut -d ' ' -f2)" - rdepcnt="$(grep -E "^${_f}[[:blank:]]+.*$" $mapshlibs|cut -d ' ' -f2|wc -l)" - if [ -z "$rdep" ]; then + unset _rdep _pkgname _rdepver + + if [ "$(find ${PKGDESTDIR} -name "$f")" ]; then # Ignore libs by current pkg - soname=$(find ${PKGDESTDIR} -name "$f") - if [ -z "$soname" ]; then + echo " SONAME: $f <-> $pkgname (ignored)" + continue + # If this library is provided by a subpkg of sourcepkg, use that subpkg + elif _pkgname="$(cd "$_shlib_dir" && grep -F -l -x "$f" *.soname 2>/dev/null)"; then + # If that library has SONAME, add it to shlibs-requires, too. + _pkgname=${_pkgname%.soname} + _sdep="${_pkgname}-${version}_${revision}" + sorequires+="${f} " + elif _pkgname="$(cd "$_shlib_dir" && grep -F -l -x "$f" *.nosoname 2>/dev/null)"; then + _pkgname=${_pkgname%.nosoname} + _sdep="${_pkgname}-${version}_${revision}" + else + _rdep="$(awk -v sl="$f" '$1 == sl { print $2; exit; }' "$mapshlibs")" + + if [ -z "$_rdep" ]; then msg_red_nochroot " SONAME: $f <-> UNKNOWN PKG PLEASE FIX!\n" broken_shlibs=1 - else - echo " SONAME: $f <-> $pkgname (ignored)" - fi - continue - elif [ "$rdepcnt" -gt 1 ]; then - unset j found - # Check if shlib is provided by multiple pkgs. - for j in ${rdep}; do - _pkgname=$($XBPS_UHELPER_CMD getpkgname "$j") - # if there's a SONAME matching pkgname, use it. - for x in ${pkgname} ${subpackages}; do - [[ $_pkgname == $x ]] && found=1 && break - done - [[ $found ]] && _rdep=$j && break - done - if [ -z "${_rdep}" ]; then - # otherwise pick up the first one. - for j in ${rdep}; do - [ -z "${_rdep}" ] && _rdep=$j - done + continue fi - else - _rdep=$rdep - fi - _pkgname=$($XBPS_UHELPER_CMD getpkgname "${_rdep}" 2>/dev/null) - _rdepver=$($XBPS_UHELPER_CMD getpkgversion "${_rdep}" 2>/dev/null) - if [ -z "${_pkgname}" -o -z "${_rdepver}" ]; then - msg_red_nochroot " SONAME: $f <-> UNKNOWN PKG PLEASE FIX!\n" - broken_shlibs=1 - continue - fi - # Check if pkg is a subpkg of sourcepkg; if true, ignore version - # in common/shlibs. - _sdep="${_pkgname}>=${_rdepver}" - for _subpkg in ${subpackages}; do - if [ "${_subpkg}" = "${_pkgname}" ]; then - _sdep="${_pkgname}-${version}_${revision}" - break + _pkgname=$($XBPS_UHELPER_CMD getpkgname "${_rdep}" 2>/dev/null) + _rdepver=$($XBPS_UHELPER_CMD getpkgversion "${_rdep}" 2>/dev/null) + if [ -z "${_pkgname}" -o -z "${_rdepver}" ]; then + msg_red_nochroot " SONAME: $f <-> UNKNOWN PKG PLEASE FIX!\n" + broken_shlibs=1 + continue fi - done + _sdep="${_pkgname}>=${_rdepver}" - if [ "${_pkgname}" != "${pkgname}" ]; then - echo " SONAME: $f <-> ${_sdep}" + # By this point, SONAME can't be found in current pkg sorequires+="${f} " - else - # Ignore libs by current pkg - echo " SONAME: $f <-> ${_rdep} (ignored)" - continue fi + echo " SONAME: $f <-> ${_sdep}" add_rundep "${_sdep}" done # From 734e92592735a24c36897abcefbe9e62da53f73b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 17 Aug 2023 09:35:21 +0700 Subject: [PATCH 25/28] mercury: verify runtime deps --- srcpkgs/mercury/template | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/srcpkgs/mercury/template b/srcpkgs/mercury/template index 078da62c329ee..07ab9363960bc 100644 --- a/srcpkgs/mercury/template +++ b/srcpkgs/mercury/template @@ -1,9 +1,8 @@ # Template file for 'mercury' pkgname=mercury version=22.01.3 -revision=1 +revision=2 hostmakedepends="flex bison gettext texinfo" -depends="mercury-libs>=${version}_${revision}" short_desc="Logic/Functional Programming Language" maintainer="Emily McDonough " license="GPL-2.0-only, custom:LGPL-2.0-only-linking-exception" @@ -11,7 +10,6 @@ homepage="https://mercurylang.org/" distfiles="https://dl.mercurylang.org/release/mercury-srcdist-${version}.tar.xz" checksum=4b0783ee9205021e4193b0404fd654e9c6fd288bc9bb7e144b1c1f6cd45dcd2e nocross="Mercury cannot be cross-compiled to different architectures" -noverifyrdeps=yes CFLAGS="-Wno-array-bounds -fno-tree-slp-vectorize" From 4df5d13493144bfbe92f889fc13764963d971547 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 17 Aug 2023 07:05:45 +0700 Subject: [PATCH 26/28] (restricted): verify runtime deps --- common/shlibs | 1 + srcpkgs/CLion/template | 4 +--- srcpkgs/PhpStorm/template | 2 -- srcpkgs/intellij-idea-ultimate-edition/INSTALL.msg | 2 -- srcpkgs/intellij-idea-ultimate-edition/template | 9 ++++----- srcpkgs/jetbrains-jdk-bin/template | 4 ---- srcpkgs/protonmail-bridge/template | 13 +++++++++++-- srcpkgs/teamspeak3/template | 7 ++----- srcpkgs/zoom/template | 12 ++++++------ 9 files changed, 25 insertions(+), 29 deletions(-) delete mode 100644 srcpkgs/intellij-idea-ultimate-edition/INSTALL.msg diff --git a/common/shlibs b/common/shlibs index 82107af453333..fafbe7af4d97d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2052,6 +2052,7 @@ libQt6LabsSharedImage.so.6 qt6-declarative-6.1.0_1 libQt6LabsWavefrontMesh.so.6 qt6-declarative-6.1.0_1 libQt6QmlLocalStorage.so.6 qt6-declarative-6.1.0_1 libQt6QmlWorkerScript.so.6 qt6-declarative-6.0.0_1 +libQt6QmlXmlListModel.so.6 qt6-declarative-6.5.0_1 libQt6QuickTest.so.6 qt6-quick-test-6.4.2_1 libQt6QuickShapes.so.6 qt6-declarative-6.0.0_1 libQt6QuickWidgets.so.6 qt6-declarative-6.0.0_1 diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template index f302b7d6798e9..cc924d23fe49c 100644 --- a/srcpkgs/CLion/template +++ b/srcpkgs/CLion/template @@ -1,7 +1,7 @@ # Template file for 'CLion' pkgname=CLion version=2021.3.4 -revision=1 +revision=2 archs="x86_64 aarch64" depends="jetbrains-jdk-bin giflib libXtst" short_desc="Smart cross-platform IDE for C and C++" @@ -13,8 +13,6 @@ checksum=f3b0b9e0dd0cd4aebef5d424e7a22868c732daad47d6c94f73630cef449ccf78 repository=nonfree restricted=yes nopie=yes -# JetBrains' tools are self-sufficient and while they include code that appears to be linked to libs from other packages, these libs are either included in the tool package, or the code works by looking for one of several supported libs. -noverifyrdeps=yes python_version=3 build_options="bundled_cmake bundled_gdb bundled_lldb" diff --git a/srcpkgs/PhpStorm/template b/srcpkgs/PhpStorm/template index 306a6c77d0b36..cb84a08e13636 100644 --- a/srcpkgs/PhpStorm/template +++ b/srcpkgs/PhpStorm/template @@ -13,8 +13,6 @@ checksum=a23922f5f93bc8df1f2aabbb0f9969e27d28f706c09d18d66d4cc2d56c52ddc9 repository=nonfree restricted=yes nopie=yes -# JetBrains' tools are self-sufficient and while they include code that appears to be linked to libs from other packages, these libs are either included in the tool package, or the code works by looking for one of several supported libs. -noverifyrdeps=yes python_version=3 post_extract() { diff --git a/srcpkgs/intellij-idea-ultimate-edition/INSTALL.msg b/srcpkgs/intellij-idea-ultimate-edition/INSTALL.msg deleted file mode 100644 index c04f6c9ab2a95..0000000000000 --- a/srcpkgs/intellij-idea-ultimate-edition/INSTALL.msg +++ /dev/null @@ -1,2 +0,0 @@ -IntelliJ Ultimate has the following optional dependencies: - libdbusmenu-glib: For global menu support diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template index 92ad9135f3a97..00c1186b589f7 100644 --- a/srcpkgs/intellij-idea-ultimate-edition/template +++ b/srcpkgs/intellij-idea-ultimate-edition/template @@ -1,10 +1,9 @@ # Template file for 'intellij-idea-ultimate-edition' pkgname=intellij-idea-ultimate-edition version=2021.3.3 -revision=1 +revision=2 archs="i686 x86_64" -create_wrksrc="true" -depends="giflib libXtst jetbrains-jdk-bin" +depends="giflib libXtst jetbrains-jdk-bin lldb-devel" short_desc="Most intelligent Java IDE" maintainer="Anton Afanasyev " license="custom:Commercial" @@ -15,9 +14,9 @@ checksum=2a3295fca08060ad515f6c7198879d09963724cfb36af3ea94f16dcd76636470 repository=nonfree restricted=yes nopie=yes -# JetBrains' tools are self-sufficient and while they include code that appears to be linked to libs from other packages, these libs are either included in the tool package, or the code works by looking for one of several supported libs. -noverifyrdeps=yes python_version=3 +# requires liblldb.so which is unversioned, pulled by lldb-devel +skiprdeps="/usr/lib/intellij-idea-ultimate-edition/plugins/Kotlin/bin/linux/LLDBFrontend" do_extract() { bsdtar xf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_filename} --strip-components=1 -C . diff --git a/srcpkgs/jetbrains-jdk-bin/template b/srcpkgs/jetbrains-jdk-bin/template index c275199504e8c..79534a1383f51 100644 --- a/srcpkgs/jetbrains-jdk-bin/template +++ b/srcpkgs/jetbrains-jdk-bin/template @@ -11,11 +11,7 @@ _jdk_ver=${version%b*} _jdk_build=${version#*b} distfiles="https://cache-redirector.jetbrains.com/intellij-jbr/jbr_jcef-${_jdk_ver//\./_}-linux-x64-b${_jdk_build}.tar.gz" checksum=192bc1c4d877a9035a08db8a4bc9ac98551fa344ec5835f08d455fab66c82fe0 -# This JDK appears to link to libs that do not exist, but functions well even in their absence. -# Best guess is that they are optional. ¯\_(ツ)_/¯ -noverifyrdeps=yes nopie=yes -noshlibprovides=yes do_install() { TARGET_PATH="usr/lib/jvm/jbrsdk" diff --git a/srcpkgs/protonmail-bridge/template b/srcpkgs/protonmail-bridge/template index 5d1315f6063ca..ff08aee8720d7 100644 --- a/srcpkgs/protonmail-bridge/template +++ b/srcpkgs/protonmail-bridge/template @@ -1,7 +1,7 @@ # Template file for 'protonmail-bridge' pkgname=protonmail-bridge version=3.3.0 -revision=1 +revision=2 archs="x86_64" create_wrksrc=yes depends="desktop-file-utils" @@ -13,9 +13,18 @@ distfiles="https://proton.me/download/bridge/protonmail-bridge_${version}-1_amd6 checksum=4541f8aa145097ee171889b0c9d058450d09dc23be10231c83d6659789a27627 restricted=yes -noverifyrdeps=yes nopie=yes do_install() { + rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlmysql.so + rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlodbc.so + rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlpsql.so + rm -rf usr/lib/protonmail/bridge/plugins/designer + rm -rf usr/lib/protonmail/bridge/plugins/qmltooling + rm -rf usr/lib/protonmail/bridge/qml/QtTest + rm -rf usr/lib/protonmail/bridge/qml/Qt/labs + rm -rf usr/lib/protonmail/bridge/lib/cmake + rm -rf usr/lib/protonmail/bridge/lib/pkgconfig + rm -rf usr/lib/protonmail/bridge/lib/*.a vcopy usr / } diff --git a/srcpkgs/teamspeak3/template b/srcpkgs/teamspeak3/template index 23ca26aeb08e9..bf0dcfd75b642 100644 --- a/srcpkgs/teamspeak3/template +++ b/srcpkgs/teamspeak3/template @@ -1,12 +1,10 @@ # Template file for 'teamspeak3' pkgname=teamspeak3 version=3.5.6 -revision=1 +revision=2 archs="i686 x86_64" -create_wrksrc=yes hostmakedepends="tar" -depends="glib bash grep freetype nss libXcomposite fontconfig glibc - libxslt dbus-libs alsa-lib libXi libXcursor libXtst libXScrnSaver pciutils" +depends="bash grep" short_desc="Popular proprietary voice chat for gaming" maintainer="Tai Chi Minh Ralph Eastwood " license="custom:Proprietary" @@ -15,7 +13,6 @@ restricted=yes repository="nonfree" nopie=yes nostrip=yes -noverifyrdeps=yes if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then _pkg="TeamSpeak3-Client-linux_amd64-${version}" diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template index 7b026f182ae7d..db3e3288bc05c 100644 --- a/srcpkgs/zoom/template +++ b/srcpkgs/zoom/template @@ -1,13 +1,10 @@ # Template file for 'zoom' pkgname=zoom version=5.15.3.4839 -revision=1 +revision=2 archs="x86_64" create_wrksrc=yes -depends="$(vopt_if systemqt 'qt5 qt5-graphicaleffects qt5-imageformats qt5-quickcontrols qt5-quickcontrols2 qt5-svg qt5-script qt5-declarative') - xcb-util-image xcb-util-keysyms glib libXfixes libXtst libgbm libglvnd - nss atk at-spi2-atk libXcomposite libXdamage libXrandr libxkbcommon pango - alsa-lib libcups libxshmfence pulseaudio-utils" +depends="libglvnd pulseaudio-utils" short_desc="Video Conferencing and Web Conferencing Service" maintainer="Orphaned " license="custom:Proprietary" @@ -16,13 +13,16 @@ distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm" checksum=3dc36195400744ceacd025009e88549f7a8481a6964ef3276a4f753764e51ac6 repository=nonfree noshlibprovides=yes -noverifyrdeps=yes restricted=yes nopie=yes build_options="systemqt" desc_option_systemqt="Use system QT libraries" pre_install() { + # rm -rf opt/zoom/Qt/qml/QtQml/RemoteObjects + # rm -rf opt/zoom/Qt/qml/Qt/labs + # rm -rf opt/zoom/Qt/qml/QtQuick/Scene2D + # rm -rf opt/zoom/Qt/qml/QtQuick/Scene3D if [ "${build_option_systemqt}" ]; then rm -f opt/zoom/libQt5*.so{,.*} rm -f opt/zoom/libicu*.so{,.*} From cf8fef40dcee6fc1b560d6fcbc3b6189c64e25b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 17 Aug 2023 11:04:58 +0700 Subject: [PATCH 27/28] common/shlibs: clean up --- common/shlibs | 49 ------------------------------------------------- 1 file changed, 49 deletions(-) diff --git a/common/shlibs b/common/shlibs index fafbe7af4d97d..616785bdb4778 100644 --- a/common/shlibs +++ b/common/shlibs @@ -131,13 +131,6 @@ libGL.so.1 libGL-7.11_1 libEGL.so.1 libEGL-7.11_1 libGLESv1_CM.so.1 libGLES-1.0_1 libGLESv2.so.2 libGLES-1.0_1 -libEGL.so rpi-userland-0.0.0.0.20150907_1 -libGLESv2.so rpi-userland-0.0.0.0.20150907_1 -libGLESv2.so opera-55.0.2994.37_2 -libGLESv2.so discord-0.0.7_1 -libGLESv2.so keybase-desktop-3.1.2_1 -libGLESv2.so Signal-Desktop-1.23.2_1 -libGLESv2.so slack-desktop-3.4.2_1 libbrcmEGL.so rpi-userland-20180103_2 libbrcmGLESv2.so rpi-userland-20180103_2 libbrcmOpenVG.so rpi-userland-20180103_2 @@ -1141,7 +1134,6 @@ libgstpbutils-1.0.so.0 gst-plugins-base1-1.0.0_1 libgstriff-1.0.so.0 gst-plugins-base1-1.0.0_1 libgstapp-1.0.so.0 gst-plugins-base1-1.0.0_1 libgstallocators-1.0.so.0 gst-plugins-base1-1.1.1_1 -libgsttranscoder-1.0.so.0 gst-plugins-bad1-1.22.1_1 libgstphotography-1.0.so.0 gst-plugins-bad1-1.18.3_2 libgstsignalprocessor-1.0.so.0 gst-plugins-bad1-1.18.3_2 libgstbasevideo-1.0.so.0 gst-plugins-bad1-1.18.3_2 @@ -1844,30 +1836,6 @@ libawt_xawt.so openjdk11-jre-11.0.5+10_1 libjava.so openjdk11-jre-11.0.5+10_1 libjli.so openjdk11-jre-11.0.5+10_1 libjvm.so openjdk11-jre-11.0.5+10_1 -libjawt.so openjdk7-bootstrap-7u221b02_1 -libawt.so openjdk7-bootstrap-7u221b02_1 -libawt_xawt.so openjdk7-bootstrap-7u221b02_1 -libjava.so openjdk7-bootstrap-7u221b02_1 -libjli.so openjdk7-bootstrap-7u221b02_1 -libjvm.so openjdk7-bootstrap-7u221b02_1 -libjawt.so openjdk9-bootstrap-9.0.4p12_1 -libawt.so openjdk9-bootstrap-9.0.4p12_1 -libawt_xawt.so openjdk9-bootstrap-9.0.4p12_1 -libjava.so openjdk9-bootstrap-9.0.4p12_1 -libjli.so openjdk9-bootstrap-9.0.4p12_1 -libjvm.so openjdk9-bootstrap-9.0.4p12_1 -libjawt.so openjdk10-bootstrap-10.0.2p13_1 -libawt.so openjdk10-bootstrap-10.0.2p13_1 -libawt_xawt.so openjdk10-bootstrap-10.0.2p13_1 -libjava.so openjdk10-bootstrap-10.0.2p13_1 -libjli.so openjdk10-bootstrap-10.0.2p13_1 -libjvm.so openjdk10-bootstrap-10.0.2p13_1 -libjawt.so mandrel-21.1.0.0_1 -libawt.so mandrel-21.1.0.0_1 -libawt_xawt.so mandrel-21.1.0.0_1 -libjava.so mandrel-21.1.0.0_1 -libjli.so mandrel-21.1.0.0_1 -libjvm.so mandrel-21.1.0.0_1 libucl.so.5 libucl-0.8.1_6 libhandle.so.1 xfsprogs-3.2.1_1 libnfnetlink.so.0 libnfnetlink-1.0.1_1 @@ -2642,16 +2610,10 @@ libglyphy.so.0 glyphy-0.0.20160104_1 libSwiften.so.0 swiften-4.0.3_2 libfreehand-0.1.so.1 libfreehand-0.1.1_1 libe-book-0.1.so.1 libe-book-0.1.2_1 -libOsi.so.1 CoinMP-1.8.3_1 -libClp.so.1 CoinMP-1.8.3_1 libCoinMP.so.1 CoinMP-1.8.3_1 libOsiCbc.so.3 CoinMP-1.8.3_1 -libCoinUtils.so.3 CoinMP-1.8.3_1 -libClpSolver.so.1 CoinMP-1.8.3_1 libCgl.so.1 CoinMP-1.8.3_1 -libOsiClp.so.1 CoinMP-1.8.3_1 libCbc.so.3 CoinMP-1.8.3_1 -libOsiCommonTests.so.1 CoinMP-1.8.3_1 libCbcSolver.so.3 CoinMP-1.8.3_1 libmwaw-0.3.so.3 libmwaw-0.3.7_1 libixion-0.18.so.0 libixion-0.18.1_1 @@ -2675,10 +2637,6 @@ leatherman_curl.so.1.12.4 leatherman-1.12.4_1 leatherman_dynamic_library.so.1.12.4 leatherman-1.12.4_1 leatherman_execution.so.1.12.4 leatherman-1.12.4_1 leatherman_ruby.so.1.12.4 leatherman-1.12.4_1 -libUTF.so opencollada-0.0.20160223_1 -libbuffer.so opencollada-0.0.20160223_1 -libftoa.so opencollada-0.0.20160223_1 -libzlib.so opencollada-1.6.51_1 libfbclient.so.2 libfbclient3-3.0.4.33054_1 libipmiutil.so.1 ipmiutil-3.1.3_4 libqxmpp.so.3 qxmpp-1.2.0_1 @@ -3646,12 +3604,6 @@ libTECkit.so.0 libteckit-2.5.8_1 libTECkit_Compiler.so.0 libteckit-2.5.8_1 libwf-config.so.1 wf-config-0.5.0_1 libQt5Pas.so.1 qt5pas-2.6~beta_1 -libClp.so.1 libClp-1.16.11_1 -libCoinUtils.so.3 libClp-1.16.11_1 -libOsiClp.so.1 libClp-1.16.11_1 -libClpSolver.so.1 libClp-1.16.11_1 -libOsiCommonTests.so.1 libClp-1.16.11_1 -libOsi.so.1 libClp-1.16.11_1 libOGDF.so libogdf-2018.03_1 libCOIN.so libogdf-2018.03_1 librocksdb.so.7 rocksdb-7.4.5_1 @@ -4189,7 +4141,6 @@ libThread.so root-6.24.06_1 libTMVA.so root-6.24.06_1 libMathCore.so root-6.24.06_1 libCore.so root-6.24.06_1 -libCore.so qtcreator-7.0.2_1 liblowdown.so.3 lowdown-1.0.2_1 libjaylink.so.0 libjaylink-0.2.0_1 libnvidia-container.so.1 libnvidia-container-1.10.0_1 From 1e18de894884cb7de60acaabfb8e59f7ee7f8a2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 9 Aug 2023 19:50:06 +0700 Subject: [PATCH 28/28] libreoffice: update to 7.6.0.3. --- srcpkgs/libreoffice-epub | 1 - .../libreoffice/files/skia-no-execinfo.patch | 25 --------- srcpkgs/libreoffice/patches/musl-java.patch | 16 +++--- .../patches/musl-no-execinfo.patch | 10 ---- srcpkgs/libreoffice/template | 52 ++++++------------- 5 files changed, 25 insertions(+), 79 deletions(-) delete mode 120000 srcpkgs/libreoffice-epub delete mode 100644 srcpkgs/libreoffice/files/skia-no-execinfo.patch delete mode 100644 srcpkgs/libreoffice/patches/musl-no-execinfo.patch diff --git a/srcpkgs/libreoffice-epub b/srcpkgs/libreoffice-epub deleted file mode 120000 index d5e3a56f35028..0000000000000 --- a/srcpkgs/libreoffice-epub +++ /dev/null @@ -1 +0,0 @@ -libreoffice \ No newline at end of file diff --git a/srcpkgs/libreoffice/files/skia-no-execinfo.patch b/srcpkgs/libreoffice/files/skia-no-execinfo.patch deleted file mode 100644 index 4495e8ab060ce..0000000000000 --- a/srcpkgs/libreoffice/files/skia-no-execinfo.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/tools/gpu/vk/VkTestUtils.cpp -+++ b/tools/gpu/vk/VkTestUtils.cpp -@@ -26,7 +26,9 @@ - #include - - #if defined(SK_BUILD_FOR_UNIX) --#include -+ #if !defined(__linux__) || defined(__GLIBC__) -+ #include -+ #endif - #endif - #include "include/gpu/vk/GrVkBackendContext.h" - #include "include/gpu/vk/GrVkExtensions.h" -@@ -104,9 +106,11 @@ static int should_include_debug_layer(co - - static void print_backtrace() { - #if defined(SK_BUILD_FOR_UNIX) -+ #if !defined(__linux__) || defined(__GLIBC__) - void* stack[64]; - int count = backtrace(stack, SK_ARRAY_COUNT(stack)); - backtrace_symbols_fd(stack, count, 2); -+ #endif - #else - // Please add implementations for other platforms. - #endif diff --git a/srcpkgs/libreoffice/patches/musl-java.patch b/srcpkgs/libreoffice/patches/musl-java.patch index f5205f3cb48ee..a5c62c296ff68 100644 --- a/srcpkgs/libreoffice/patches/musl-java.patch +++ b/srcpkgs/libreoffice/patches/musl-java.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -8910,7 +8910,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAIN +@@ -8909,7 +8909,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAIN test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" ;; @@ -9,18 +9,18 @@ JAVAINC="-I$JAVA_HOME/include" JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux" test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" -@@ -14646,7 +14646,7 @@ else +@@ -14744,7 +14744,7 @@ else case "$host_os" in -- aix*|dragonfly*|freebsd*|linux-gnu*|*netbsd*|openbsd*) -+ aix*|dragonfly*|freebsd*|linux-gnu*|linux-musl*|*netbsd*|openbsd*) +- dragonfly*|freebsd*|linux-gnu*|*netbsd*|openbsd*) ++ dragonfly*|freebsd*|linux-gnu*|linux-musl*|*netbsd*|openbsd*) if test "$ENABLE_JAVA" != ""; then pathmunge "$JAVA_HOME/bin" "after" fi --- a/configure +++ b/configure -@@ -22754,7 +22754,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAIN +@@ -22737,7 +22737,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAIN test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" ;; @@ -29,12 +29,12 @@ JAVAINC="-I$JAVA_HOME/include" JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux" test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" -@@ -46454,7 +46454,7 @@ else +@@ -46802,7 +46802,7 @@ else case "$host_os" in -- aix*|dragonfly*|freebsd*|linux-gnu*|*netbsd*|openbsd*) -+ aix*|dragonfly*|freebsd*|linux-gnu*|linux-musl*|*netbsd*|openbsd*) +- dragonfly*|freebsd*|linux-gnu*|*netbsd*|openbsd*) ++ dragonfly*|freebsd*|linux-gnu*|linux-musl*|*netbsd*|openbsd*) if test "$ENABLE_JAVA" != ""; then pathmunge "$JAVA_HOME/bin" "after" fi diff --git a/srcpkgs/libreoffice/patches/musl-no-execinfo.patch b/srcpkgs/libreoffice/patches/musl-no-execinfo.patch deleted file mode 100644 index a430c5d153664..0000000000000 --- a/srcpkgs/libreoffice/patches/musl-no-execinfo.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/external/skia/UnpackedTarball_skia.mk -+++ b/external/skia/UnpackedTarball_skia.mk -@@ -41,6 +41,7 @@ skia_patches := \ - constexpr-template.patch.0 \ - missing-include.patch.0 \ - tdf147342.patch.0 \ -+ skia-no-execinfo.patch.1 \ - - $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1)) - diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index a5ade73cc1969..6dbe8c8730943 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -1,18 +1,18 @@ # Template file for 'libreoffice' pkgname=libreoffice -version=7.5.5.2 -revision=2 +version=7.6.0.3 +revision=1 build_style=meta make_build_target="build" hostmakedepends="automake flex gperf hyphen icu libtool openldap which gettext xz perl-Archive-Zip pkg-config qt5-qmake sane unzip zip python3-setuptools - fontforge python3-lxml qt6-base-devel gtk4-devel gobject-introspection gnupg" + fontforge python3-lxml qt6-base gtk4-devel gobject-introspection gnupg" makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel frameworkintegration-devel glyphy-devel gpgmepp-devel gst-plugins-base1-devel gtk+3-devel gtk4-devel hunspell-devel hyphen-devel libXt-devel libabw-devel glm libatomic_ops-devel libbluetooth-devel libcdr-devel libe-book-devel libepubgen-devel libetonyek-devel libexttextcat-devel libfbclient3-devel - libfreehand-devel boost-devel zlib-devel bzip2-devel libxslt-devel + libfreehand-devel boost-devel zlib-devel bzip2-devel libxslt-devel frozen libgcrypt-devel libgltf-devel libldap-devel libmariadbclient-devel libmspub-devel libmwaw-devel libnumbertext-devel libodfgen-devel libopenjpeg2-devel liborcus-devel libpagemaker-devel libqxp-devel librsvg-devel libvisio-devel libwpg-devel @@ -90,13 +90,14 @@ distfiles=" ${_addurl}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip ${_addurl}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip ${_addurl}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip - ${_addurl}/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz + ${_addurl}/skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz + ${_addurl}/frozen-1.1.1.tar.gz ${_addurl}/dragonbox-1.1.3.tar.gz " -checksum="6628dfd2a21041a7c5bb6d72733e0fd52efa7959c95084fcd4d96cc4a61b0561 - 33c023d3e5abe5649350ae1242fcd5d6c069066f283db967b6aab35aa4857504 - 1de834979bf25c3c6f368362dd20c95d0bee514a42eee903a32188d40488aa62 - 24b5c791a17128361b5f3c8538348002a714d0ba2aab37e3bf10e16b7ac049b7 +checksum="07f33f11a75b72a3044749d4f2f7d02a0fd79eaed4fb73e618ec5fe3576d0c25 + b932cdd6bd2ee717f3a09766c88fe90100b0c2c0509313c3ee297f95c084ee2e + 210f18ff60e93d366856d84e714d3fd6f184f399b5163afc92b7e11155cbe768 + 667e4ffeacc01bd0f830c2edcc56e2328f924eeac224639babeb3841a44ec5f4 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66 @@ -123,7 +124,8 @@ checksum="6628dfd2a21041a7c5bb6d72733e0fd52efa7959c95084fcd4d96cc4a61b0561 abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095 05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343 085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045 - c094a6247e44104beaaa0d00c825beb6baf1a8e532dc22214747495317a65bd9 + 0d08a99ed46cde43b5ad2672b5d8770c8eb85d0d26cb8f1f85fd9befe1e9ceb9 + f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45 09d63b05e9c594ec423778ab59b7a5aa1d76fdd71d25c7048b0258c4ec9c3384" skip_extraction=" 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip @@ -152,7 +154,8 @@ skip_extraction=" 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip - skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz + skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz + frozen-1.1.1.tar.gz dragonbox-1.1.3.tar.gz " replaces="libreoffice-firebird<6.2.4.2_1" @@ -488,8 +491,9 @@ do_install() { libreoffice-common_package() { short_desc+=" - Common files" - depends="hunspell hyphen mythes openldap libreoffice-i18n-en-US>=${version}_${revision}" + depends="libreoffice-i18n-en-US>=${version}_${revision}" skiprdeps=/usr/lib/libreoffice/program/libofficebean.so + replaces="libreoffice-epub>=0" pkg_install() { _split common } @@ -498,7 +502,6 @@ libreoffice-common_package() { libreoffice-base_package() { short_desc+=" - Database frontend" depends="libreoffice-writer>=${version}_${revision}" - noverifyrdeps=yes pkg_install() { _split base } @@ -507,7 +510,6 @@ libreoffice-base_package() { libreoffice-calc_package() { short_desc+=" - Spreadsheet" depends="libreoffice-writer>=${version}_${revision}" - noverifyrdeps=yes pkg_install() { _split calc } @@ -516,7 +518,6 @@ libreoffice-calc_package() { libreoffice-draw_package() { short_desc+=" - Drawing application" depends="sane libreoffice-writer>=${version}_${revision}" - noverifyrdeps=yes pkg_install() { _split draw } @@ -556,8 +557,6 @@ libreoffice-fonts_package() { libreoffice-gnome_package() { short_desc+=" - GNOME integration" - depends="libreoffice-common>=${version}_${revision}" - noverifyrdeps=yes pkg_install() { _split gnome } @@ -566,7 +565,6 @@ libreoffice-gnome_package() { libreoffice-impress_package() { short_desc+=" - Presentation application" depends="libreoffice-writer>=${version}_${revision}" - noverifyrdeps=yes pkg_install() { _split impress } @@ -574,8 +572,6 @@ libreoffice-impress_package() { libreoffice-kde_package() { short_desc+=" - KDE integration" - depends="libreoffice-common>=${version}_${revision}" - noverifyrdeps=yes pkg_install() { cat > ${wrksrc}/file-lists/kde5_list.txt <<-EOF %dir /usr/lib/libreoffice/program @@ -593,8 +589,6 @@ libreoffice-kde_package() { libreoffice-qt6_package() { short_desc+=" - Qt6 integration" - depends="libreoffice-common>=${version}_${revision}" - noverifyrdeps=yes pkg_install() { cat > ${wrksrc}/file-lists/qt6_list.txt <<-EOF %dir /usr/lib/libreoffice/program @@ -615,7 +609,6 @@ libreoffice-kit_package() { libreoffice-math_package() { short_desc+=" - Equation editor" depends="libreoffice-writer>=${version}_${revision}" - noverifyrdeps=yes pkg_install() { _split math } @@ -623,8 +616,7 @@ libreoffice-math_package() { libreoffice-postgresql_package() { short_desc+=" - Connector for PostgreSQL" - depends="libreoffice-base>=${version}_${revision} libreoffice-common>=${version}_${revision}" - noverifyrdeps=yes + depends="libreoffice-base>=${version}_${revision}" pkg_install() { _split postgresql } @@ -632,25 +624,15 @@ libreoffice-postgresql_package() { libreoffice-writer_package() { short_desc+=" - Word processor" - depends="libreoffice-common>=${version}_${revision}" - noverifyrdeps=yes pkg_install() { _split writer } } -libreoffice-epub_package() { - short_desc+=" - EPUB output" - build_style=meta - depends="libreoffice-common>=${version}_${revision} libepubgen libabw libe-book - libetonyek libwps" -} - # Use a name which makes this catch-all subpackage the last one libreoffice-xtensions_package() { short_desc+=" - Extensions" depends="libreoffice-common>=${version}_${revision}" - noverifyrdeps=yes pkg_install() { # Remove empty files find ${DESTDIR}/all -size 0 -delete