Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] libreoffice and its dependencies update
@ 2024-07-05 22:30 sgn
  2024-07-06  8:19 ` [PR PATCH] [Updated] " sgn
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: sgn @ 2024-07-05 22:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1270 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages loffice-update
https://github.com/void-linux/void-packages/pull/51121

libreoffice and its dependencies update
<!-- Uncomment relevant sections and delete options which are not applicable -->
[ci skip][skip ci]
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/51121.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-loffice-update-51121.patch --]
[-- Type: text/x-diff, Size: 51732 bytes --]

From 24140283bf1762e540c6f8d6d5275faba8475e10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 1 Jul 2024 19:17:24 +0700
Subject: [PATCH 1/6] libtool: no longer require tar

---
 srcpkgs/libtool/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/libtool/template b/srcpkgs/libtool/template
index ff545abd3f0da5..5ceea56afe3364 100644
--- a/srcpkgs/libtool/template
+++ b/srcpkgs/libtool/template
@@ -1,10 +1,9 @@
 # Template file for 'libtool'
 pkgname=libtool
 version=2.4.7
-revision=6
+revision=7
 build_style=gnu-configure
 hostmakedepends="texinfo perl automake help2man xz gnulib tar"
-depends="tar"
 short_desc="Generic library support script"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From 71644cd58edf60ecf550480efde7d3a940f63209 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 4 Jul 2024 08:12:04 +0700
Subject: [PATCH 2/6] zint: update to 2.13.0.

---
 common/shlibs         |  2 +-
 srcpkgs/zint-qt       |  1 +
 srcpkgs/zint/template | 18 ++++++++++++++----
 3 files changed, 16 insertions(+), 5 deletions(-)
 create mode 120000 srcpkgs/zint-qt

diff --git a/common/shlibs b/common/shlibs
index 07502488237efb..d5d256bededd64 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4443,7 +4443,7 @@ libabsl_throw_delegate.so.2401.0.0 abseil-cpp-20240116.1_1
 libabsl_time.so.2401.0.0 abseil-cpp-20240116.1_1
 libabsl_time_zone.so.2401.0.0 abseil-cpp-20240116.1_1
 libabsl_vlog_config_internal.so.2401.0.0 abseil-cpp-20240116.1_1
-libzint.so.2.12 libzint-2.12.0_1
+libzint.so.2.13 libzint-2.13.0_1
 libairspyhf.so.0 libairspyhf-1.6.8_1
 libtraceevent.so.1 libtraceevent-1.6.2_1
 libtracefs.so.1 libtracefs-1.4.2_1
diff --git a/srcpkgs/zint-qt b/srcpkgs/zint-qt
new file mode 120000
index 00000000000000..e8e72ad27716a0
--- /dev/null
+++ b/srcpkgs/zint-qt
@@ -0,0 +1 @@
+zint
\ No newline at end of file
diff --git a/srcpkgs/zint/template b/srcpkgs/zint/template
index 30412d8cbd41cb..4dd659e0e2290b 100644
--- a/srcpkgs/zint/template
+++ b/srcpkgs/zint/template
@@ -1,17 +1,18 @@
 # Template file for 'zint'
 pkgname=zint
-version=2.12.0
+version=2.13.0
 revision=1
 build_style=cmake
-configure_args="-DZINT_USE_QT=OFF"
-makedepends="libpng-devel zlib-devel"
+configure_args="-DZINT_USE_QT=ON -DZINT_USE_PNG=ON -DZINT_QT6=ON"
+hostmakedepends="qt6-base"
+makedepends="libpng-devel zlib-devel qt6-base-devel qt6-tools-devel qt6-svg-devel"
 short_desc="Barcode encoding library"
 maintainer="Piraty <mail@piraty.dev>"
 license="GPL-3.0-or-later"
 homepage="https://www.zint.org.uk/"
 changelog="https://raw.githubusercontent.com/zint/zint/master/ChangeLog"
 distfiles="https://github.com/zint/zint/archive/refs/tags/${version}.tar.gz"
-checksum=83c76873cda163537de4b937d390de42a8ae487e830e73212c4a74c8cc49ce65
+checksum=480d95e46d2a2dae204c0f2b6433f185aba50786a0f00d1420752a6e287311ec
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DZINT_TEST=ON"
@@ -35,6 +36,7 @@ zint-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
+		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 		vmove usr/lib/cmake
 	}
@@ -46,3 +48,11 @@ libzint_package() {
 		vmove "usr/lib/*.so.*"
 	}
 }
+
+zint-qt_package() {
+	short_desc+=" - Qt frontend"
+	depends="qt6-svg"
+	pkg_install() {
+		vmove usr/bin/zint-qt
+	}
+}

From 1dcf79e68ebf42d5a111e4274f5881d7fd84bb99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 4 Jul 2024 09:14:41 +0700
Subject: [PATCH 3/6] zxing-cpp: update to 2.2.1.

---
 srcpkgs/zxing-cpp/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/zxing-cpp/template b/srcpkgs/zxing-cpp/template
index 4bbe277e6fac51..9dec982ed5e5d6 100644
--- a/srcpkgs/zxing-cpp/template
+++ b/srcpkgs/zxing-cpp/template
@@ -1,17 +1,18 @@
 # Template file for 'zxing-cpp'
 pkgname=zxing-cpp
-version=2.1.0
+version=2.2.1
 revision=1
 build_style=cmake
-configure_args="-DBUILD_EXAMPLES=OFF -DBUILD_BLACKBOX_TESTS=OFF -DBUILD_DEPENDENCIES=LOCAL"
+configure_args="-DBUILD_EXAMPLES=OFF -DBUILD_BLACKBOX_TESTS=OFF
+ -DBUILD_DEPENDENCIES=LOCAL"
 checkdepends="gtest-devel"
 short_desc="Multi-format 1D/2D barcode image processing library"
 maintainer="John <me@johnnynator.dev>"
 license="Apache-2.0"
-homepage="https://github.com/nu-book/zxing-cpp/"
+homepage="https://github.com/zxing-cpp/zxing-cpp/"
 changelog="https://github.com/zxing-cpp/zxing-cpp/releases"
-distfiles="https://github.com/nu-book/zxing-cpp/archive/refs/tags/v${version}.tar.gz"
-checksum=6d54e403592ec7a143791c6526c1baafddf4c0897bb49b1af72b70a0f0c4a3fe
+distfiles="https://github.com/zxing-cpp/zxing-cpp/archive/refs/tags/v${version}.tar.gz"
+checksum=02078ae15f19f9d423a441f205b1d1bee32349ddda7467e2c84e8f08876f8635
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DBUILD_UNIT_TESTS=ON"

From 6cf17385c50e6e0289eb93f73e792500dca3073b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 15 Jun 2024 13:34:09 +0700
Subject: [PATCH 4/6] bluez: update to 5.76.

---
 srcpkgs/bluez-mesh                            |  1 +
 srcpkgs/bluez-obex                            |  1 +
 .../0001-enable-dbus-without-systemd.patch    | 22 ++-----
 ...02-allow-obexd-on-non-systemd-system.patch | 60 +++++--------------
 ...003-allow-mesh-on-non-systemd-system.patch | 18 +-----
 srcpkgs/bluez/patches/0004-permission.patch   | 35 +++++++++++
 ...-grant-permission-to-bluetooth-group.patch | 27 ---------
 srcpkgs/bluez/patches/CVE-2023-45866.patch    | 52 ----------------
 srcpkgs/bluez/patches/basename.patch          | 58 ++++++++++++++++++
 srcpkgs/bluez/template                        | 45 +++++++++-----
 10 files changed, 146 insertions(+), 173 deletions(-)
 create mode 120000 srcpkgs/bluez-mesh
 create mode 120000 srcpkgs/bluez-obex
 create mode 100644 srcpkgs/bluez/patches/0004-permission.patch
 delete mode 100644 srcpkgs/bluez/patches/0008-grant-permission-to-bluetooth-group.patch
 delete mode 100644 srcpkgs/bluez/patches/CVE-2023-45866.patch
 create mode 100644 srcpkgs/bluez/patches/basename.patch

diff --git a/srcpkgs/bluez-mesh b/srcpkgs/bluez-mesh
new file mode 120000
index 00000000000000..db15886a96e083
--- /dev/null
+++ b/srcpkgs/bluez-mesh
@@ -0,0 +1 @@
+bluez
\ No newline at end of file
diff --git a/srcpkgs/bluez-obex b/srcpkgs/bluez-obex
new file mode 120000
index 00000000000000..db15886a96e083
--- /dev/null
+++ b/srcpkgs/bluez-obex
@@ -0,0 +1 @@
+bluez
\ No newline at end of file
diff --git a/srcpkgs/bluez/patches/0001-enable-dbus-without-systemd.patch b/srcpkgs/bluez/patches/0001-enable-dbus-without-systemd.patch
index 5b9c7dc708c7ea..a7d5eb46ac1d6e 100644
--- a/srcpkgs/bluez/patches/0001-enable-dbus-without-systemd.patch
+++ b/srcpkgs/bluez/patches/0001-enable-dbus-without-systemd.patch
@@ -1,19 +1,8 @@
-From 2625ab38ae27754205d060f09e3a18f7648d5167 Mon Sep 17 00:00:00 2001
-From: Doan Tran Cong Danh <congdanhqx@gmail.com>
-Date: Thu, 3 Oct 2019 12:57:09 +0700
-Subject: [PATCH 1/9] enable dbus without systemd
-
----
- Makefile.am | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 404e6a460..0884156fa 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -40,14 +40,14 @@ conf_DATA =
- 
- statedir = $(localstatedir)/lib/bluetooth
+@@ -43,14 +43,14 @@ conf_DATA = src/main.conf
+ conf_DATA += profiles/input/input.conf
+ conf_DATA += profiles/network/network.conf
  state_DATA =
 +
 +dbussystembusdir = $(DBUS_SYSTEMBUSDIR)
@@ -28,7 +17,4 @@ index 404e6a460..0884156fa 100644
 -dbussystembus_DATA = src/org.bluez.service
  endif
  
- EXTRA_DIST += src/bluetooth.service.in src/org.bluez.service
--- 
-2.23.0
-
+ EXTRA_DIST += src/org.bluez.service
diff --git a/srcpkgs/bluez/patches/0002-allow-obexd-on-non-systemd-system.patch b/srcpkgs/bluez/patches/0002-allow-obexd-on-non-systemd-system.patch
index c011d23073b902..8dab1698b6ce55 100644
--- a/srcpkgs/bluez/patches/0002-allow-obexd-on-non-systemd-system.patch
+++ b/srcpkgs/bluez/patches/0002-allow-obexd-on-non-systemd-system.patch
@@ -1,54 +1,22 @@
-From 5f27d3887b60c95cbcdefaeae5dea38f020c390e Mon Sep 17 00:00:00 2001
-From: Doan Tran Cong Danh <congdanhqx@gmail.com>
-Date: Thu, 3 Oct 2019 12:57:55 +0700
-Subject: [PATCH 2/8] allow obexd on non-systemd system
-
----
- Makefile.obexd                                              | 6 +++---
- .../{org.bluez.obex.service => org.bluez.obex.service.in}   | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
- rename obexd/src/{org.bluez.obex.service => org.bluez.obex.service.in} (74%)
-
-diff --git a/Makefile.obexd b/Makefile.obexd
-index de59d297b..cb04bb1e2 100644
 --- a/Makefile.obexd
 +++ b/Makefile.obexd
-@@ -1,12 +1,12 @@
- if SYSTEMD
+@@ -5,9 +5,6 @@ if SYSTEMD
  systemduserunitdir = $(SYSTEMD_USERUNITDIR)
  systemduserunit_DATA = obexd/src/obex.service
-+endif
  
- dbussessionbusdir = $(DBUS_SESSIONBUSDIR)
- dbussessionbus_DATA = obexd/src/org.bluez.obex.service
--endif
+-dbussessionbusdir = $(DBUS_SESSIONBUSDIR)
+-dbussessionbus_DATA = obexd/src/org.bluez.obex.service
+-
+ obexd-add-service-symlink:
+ 	$(LN_S) -f obex.service $(DESTDIR)$(SYSTEMD_USERUNITDIR)/dbus-org.bluez.obex.service
  
--EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service
-+EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in
+@@ -18,6 +15,9 @@ obexd-add-service-symlink:
+ obexd-remove-service-symlink:
+ endif
  
- if OBEX
++dbussessionbusdir = $(DBUS_SESSIONBUSDIR)
++dbussessionbus_DATA = obexd/src/org.bluez.obex.service
++
+ obex_plugindir = $(libdir)/obex/plugins
  
-@@ -107,6 +107,6 @@ obexd/src/builtin.h: obexd/src/genbuiltin $(obexd_builtin_sources)
- 	$(AM_V_at)$(MKDIR_P) $(dir $@)
- 	$(AM_V_GEN)$(srcdir)/obexd/src/genbuiltin $(obexd_builtin_modules) > $@
- 
--CLEANFILES += obexd/src/builtin.h $(builtin_files) obexd/src/obex.service
-+CLEANFILES += obexd/src/builtin.h $(builtin_files) obexd/src/obex.service obexd/src/org.bluez.obex.service
- 
- EXTRA_DIST += obexd/src/genbuiltin
-diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service.in
-similarity index 74%
-rename from obexd/src/org.bluez.obex.service
-rename to obexd/src/org.bluez.obex.service.in
-index a53808884..543d7bc07 100644
---- a/obexd/src/org.bluez.obex.service
-+++ b/obexd/src/org.bluez.obex.service.in
-@@ -1,4 +1,4 @@
- [D-BUS Service]
- Name=org.bluez.obex
--Exec=/bin/false
-+Exec=@pkglibexecdir@/obexd
- SystemdService=dbus-org.bluez.obex.service
--- 
-2.23.0
-
+ obexd_builtin_modules =
diff --git a/srcpkgs/bluez/patches/0003-allow-mesh-on-non-systemd-system.patch b/srcpkgs/bluez/patches/0003-allow-mesh-on-non-systemd-system.patch
index 2cf6f73442dfa7..9f982f76130683 100644
--- a/srcpkgs/bluez/patches/0003-allow-mesh-on-non-systemd-system.patch
+++ b/srcpkgs/bluez/patches/0003-allow-mesh-on-non-systemd-system.patch
@@ -1,20 +1,9 @@
-From 32a425c3f9b42a55824c044a6b486c9c12e65a65 Mon Sep 17 00:00:00 2001
-From: Doan Tran Cong Danh <congdanhqx@gmail.com>
-Date: Thu, 3 Oct 2019 12:58:18 +0700
-Subject: [PATCH 3/9] allow mesh on non-systemd system
-
----
- Makefile.mesh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.mesh b/Makefile.mesh
-index 90979cbc0..9e6e2c2ca 100644
 --- a/Makefile.mesh
 +++ b/Makefile.mesh
-@@ -2,11 +2,11 @@ if MESH
- 
+@@ -4,11 +4,11 @@ if MESH
  if DATAFILES
  dbus_DATA += mesh/bluetooth-mesh.conf
+ conf_DATA += mesh/mesh-main.conf
 +dbussystembus_DATA += mesh/org.bluez.mesh.service
  endif
  
@@ -24,6 +13,3 @@ index 90979cbc0..9e6e2c2ca 100644
  endif
  
  mesh_sources = mesh/mesh.h mesh/mesh.c \
--- 
-2.23.0
-
diff --git a/srcpkgs/bluez/patches/0004-permission.patch b/srcpkgs/bluez/patches/0004-permission.patch
new file mode 100644
index 00000000000000..4ec3ec9206ab23
--- /dev/null
+++ b/srcpkgs/bluez/patches/0004-permission.patch
@@ -0,0 +1,35 @@
+--- a/src/bluetooth.conf
++++ b/src/bluetooth.conf
+@@ -23,6 +23,10 @@
+     <allow send_interface="org.mpris.MediaPlayer2.Player"/>
+   </policy>
+ 
++  <policy group="bluetooth">
++    <allow send_destination="org.bluez"/>
++  </policy>
++
+   <policy context="default">
+     <allow send_destination="org.bluez"/>
+   </policy>
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -32,7 +32,7 @@ confdir = $(sysconfdir)/bluetooth
+ statedir = $(localstatedir)/lib/bluetooth
+ 
+ bluetoothd-fix-permissions:
+-	install -dm555 $(DESTDIR)$(confdir)
++	install -dm755 $(DESTDIR)$(confdir)
+ 	install -dm700 $(DESTDIR)$(statedir)
+ 
+ if DATAFILES
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -13737,7 +13737,7 @@ uninstall-man: uninstall-man1 uninstall-
+ 
+ 
+ bluetoothd-fix-permissions:
+-	install -dm555 $(DESTDIR)$(confdir)
++	install -dm755 $(DESTDIR)$(confdir)
+ 	install -dm700 $(DESTDIR)$(statedir)
+ @BTPCLIENT_TRUE@tools/btpclient.$(OBJEXT): src/libshared-ell.la ell/internal
+ 
diff --git a/srcpkgs/bluez/patches/0008-grant-permission-to-bluetooth-group.patch b/srcpkgs/bluez/patches/0008-grant-permission-to-bluetooth-group.patch
deleted file mode 100644
index ec8a1f554af7fe..00000000000000
--- a/srcpkgs/bluez/patches/0008-grant-permission-to-bluetooth-group.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 05853e46e66868228468fc73d86f221b12edaef1 Mon Sep 17 00:00:00 2001
-From: Doan Tran Cong Danh <congdanhqx@gmail.com>
-Date: Fri, 4 Oct 2019 11:36:47 +0700
-Subject: [PATCH 8/9] grant permission to bluetooth group
-
----
- src/bluetooth.conf | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/bluetooth.conf b/src/bluetooth.conf
-index 8a1e25801..75dd7d670 100644
---- a/src/bluetooth.conf
-+++ b/src/bluetooth.conf
-@@ -22,6 +22,10 @@
-     <allow send_interface="org.mpris.MediaPlayer2.Player"/>
-   </policy>
- 
-+  <policy group="bluetooth">
-+    <allow send_destination="org.bluez"/>
-+  </policy>
-+
-   <policy context="default">
-     <allow send_destination="org.bluez"/>
-   </policy>
--- 
-2.23.0
-
diff --git a/srcpkgs/bluez/patches/CVE-2023-45866.patch b/srcpkgs/bluez/patches/CVE-2023-45866.patch
deleted file mode 100644
index 7d3be48eeb66cf..00000000000000
--- a/srcpkgs/bluez/patches/CVE-2023-45866.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 25a471a83e02e1effb15d5a488b3f0085eaeb675 Mon Sep 17 00:00:00 2001
-From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
-Date: Tue, 10 Oct 2023 13:03:12 -0700
-Subject: input.conf: Change default of ClassicBondedOnly
-
-This changes the default of ClassicBondedOnly since defaulting to false
-is not inline with HID specification which mandates the of Security Mode
-4:
-
-BLUETOOTH SPECIFICATION Page 84 of 123
-Human Interface Device (HID) Profile:
-
-  5.4.3.4.2 Security Modes
-  Bluetooth HID Hosts shall use Security Mode 4 when interoperating with
-  Bluetooth HID devices that are compliant to the Bluetooth Core
-  Specification v2.1+EDR[6].
----
- profiles/input/device.c   | 2 +-
- profiles/input/input.conf | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-(limited to 'profiles/input')
-
-diff --git a/profiles/input/device.c b/profiles/input/device.c
-index 4a50ea9921..4310dd192e 100644
---- a/profiles/input/device.c
-+++ b/profiles/input/device.c
-@@ -81,7 +81,7 @@ struct input_device {
- 
- static int idle_timeout = 0;
- static bool uhid_enabled = false;
--static bool classic_bonded_only = false;
-+static bool classic_bonded_only = true;
- 
- void input_set_idle_timeout(int timeout)
- {
-diff --git a/profiles/input/input.conf b/profiles/input/input.conf
-index 4c70bc561f..d8645f3dd6 100644
---- a/profiles/input/input.conf
-+++ b/profiles/input/input.conf
-@@ -17,7 +17,7 @@
- # platforms may want to make sure that input connections only come from bonded
- # device connections. Several older mice have been known for not supporting
- # pairing/encryption.
--# Defaults to false to maximize device compatibility.
-+# Defaults to true for security.
- #ClassicBondedOnly=true
- 
- # LE upgrade security
--- 
-cgit 1.2.3-korg
-
diff --git a/srcpkgs/bluez/patches/basename.patch b/srcpkgs/bluez/patches/basename.patch
new file mode 100644
index 00000000000000..07139a94272bfc
--- /dev/null
+++ b/srcpkgs/bluez/patches/basename.patch
@@ -0,0 +1,58 @@
+--- a/mesh/rpl.c
++++ b/mesh/rpl.c
+@@ -33,6 +33,17 @@
+ 
+ static const char *rpl_dir = "/rpl";
+ 
++char *
++xbasename(const char *filename)
++{
++#ifdef __GLIBC__
++	return basename(filename);
++#else
++	char *p = strrchr (filename, '/');
++	return p ? p + 1 : (char *) filename;
++#endif
++}
++
+ bool rpl_put_entry(struct mesh_node *node, uint16_t src, uint32_t iv_index,
+ 								uint32_t seq)
+ {
+@@ -146,7 +157,7 @@ static void get_entries(const char *iv_p
+ 	if (!dir)
+ 		return;
+ 
+-	iv_txt = basename(iv_path);
++	iv_txt = xbasename(iv_path);
+ 	if (sscanf(iv_txt, "%08x", &iv_index) != 1) {
+ 		closedir(dir);
+ 		return;
+--- a/tools/hex2hcd.c
++++ b/tools/hex2hcd.c
+@@ -25,6 +25,17 @@
+ #include <stdbool.h>
+ #include <sys/stat.h>
+ 
++char *
++xbasename(const char *filename)
++{
++#ifdef __GLIBC__
++	return basename(filename);
++#else
++	char *p = strrchr (filename, '/');
++	return p ? p + 1 : (char *) filename;
++#endif
++}
++
+ static ssize_t process_record(int fd, const char *line, uint16_t *upper_addr)
+ {
+ 	const char *ptr = line + 1;
+@@ -302,7 +313,7 @@ static void ver_parse_entry(const char *
+ 	}
+ 
+ 	if (S_ISREG(st.st_mode)) {
+-		ver_parse_file(basename(pathname));
++		ver_parse_file(xbasename(pathname));
+ 		goto done;
+ 	}
+ 
diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template
index 41ab3df051b29d..2f701242ee680f 100644
--- a/srcpkgs/bluez/template
+++ b/srcpkgs/bluez/template
@@ -1,28 +1,25 @@
 # Template file for 'bluez'
 pkgname=bluez
-version=5.70
-revision=4
+version=5.76
+revision=1
 build_style=gnu-configure
 configure_args="--with-udevdir=/usr/lib/udev --disable-systemd
  --enable-sixaxis --enable-threads --enable-library --enable-deprecated
- --enable-external-ell $(vopt_enable mesh) $(vopt_enable nfc)
- $(vopt_enable experimental) --enable-hid2hci"
+ --enable-external-ell --enable-mesh --enable-nfc --enable-experimental
+ --enable-hid2hci"
 hostmakedepends="automake flex libtool pkg-config python3-docutils"
 makedepends="cups-devel eudev-libudev-devel libglib-devel libical-devel
- readline-devel ell-devel $(vopt_if mesh json-c-devel)"
+ readline-devel ell-devel json-c-devel"
 short_desc="Bluetooth tools and daemons"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://www.bluez.org/"
 changelog="https://git.kernel.org/pub/scm/bluetooth/bluez.git/plain/ChangeLog"
 distfiles="${KERNEL_SITE}/bluetooth/bluez-${version}.tar.xz"
-checksum=37e372e916955e144cb882f888e4be40898f10ae3b7c213ddcdd55ee9c009278
+checksum=55e2c645909ad82d833c42ce85ec20434e0ef0070941b1eab73facdd240bbd63
 conf_files="/etc/bluetooth/main.conf"
 system_groups="bluetooth"
 
-build_options="mesh nfc experimental"
-build_options_default="mesh nfc"
-
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	makedepends+=" musl-legacy-compat"
 fi
@@ -45,11 +42,6 @@ post_install() {
 	vbin tools/btgatt-server
 	vbin tools/btmgmt
 	vsv bluetoothd
-	if [ "$build_option_mesh" ]; then
-		vsv bluetooth-meshd
-		vinstall mesh/bluetooth-mesh.conf 644 etc/bluetooth
-		vinstall mesh/mesh-main.conf 644 etc/bluetooth
-	fi
 
 	vdoc ${FILESDIR}/README.voidlinux
 }
@@ -77,6 +69,7 @@ bluez-cups_package() {
 		vmove usr/lib/cups/backend/bluetooth
 	}
 }
+
 bluez-deprecated_package() {
 	short_desc+=" - deprecated tools"
 	pkg_install() {
@@ -99,8 +92,32 @@ bluez-deprecated_package() {
 }
 
 bluez-hid2hci_package() {
+	short_desc+=" - hid2hci"
 	pkg_install() {
 		vmove usr/lib/udev
 		vmove usr/share/man/man1/hid2hci.1
 	}
 }
+
+bluez-obex_package() {
+	short_desc+=" - obex OBject EXchange"
+	pkg_install() {
+		vmove usr/libexec/bluetooth/obexd
+		vmove usr/share/dbus-1/services/org.bluez.obex.service
+		vmove "usr/share/man/man5/org.bluez.obex.*"
+	}
+}
+
+bluez-mesh_package() {
+	short_desc+=" - mesh"
+	pkg_install() {
+		vmove "usr/bin/mesh*"
+		vmove usr/libexec/bluetooth/bluetooth-meshd
+		vmove usr/share/man/man8/bluetooth-meshd.8
+		vmove usr/share/dbus-1/system-services/org.bluez.mesh.service
+		vmove usr/share/dbus-1/system.d/bluetooth-mesh.conf
+		vsv bluetooth-meshd
+		vinstall mesh/bluetooth-mesh.conf 644 etc/bluetooth
+		vinstall mesh/mesh-main.conf 644 etc/bluetooth
+	}
+}

From 3b605494580e92f0d04db7fa04b162cf57e0658e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 1 Jul 2024 18:18:06 +0700
Subject: [PATCH 5/6] libreoffice-dictionaries: update to 24.2.4.2.

---
 srcpkgs/libreoffice-dictionaries/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libreoffice-dictionaries/template b/srcpkgs/libreoffice-dictionaries/template
index 69b757d0d28136..a622fb88e6e386 100644
--- a/srcpkgs/libreoffice-dictionaries/template
+++ b/srcpkgs/libreoffice-dictionaries/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice-dictionaries'
 pkgname=libreoffice-dictionaries
-version=24.2.2.2
-revision=3
+version=24.2.4.2
+revision=1
 build_style=meta
 hostmakedepends="mythes perl"
 short_desc="Libre Office Dictionaries"
@@ -9,8 +9,8 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.libreoffice.org/"
 distfiles="https://download.documentfoundation.org/libreoffice/src/${version%.*}/${pkgname}-${version}.tar.xz"
-distfiles="https://download.nus.edu.sg/mirror/tdf/libreoffice/src/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a4606997cbb04d5aa0043ccdc55abad802d8fe6aab78b1166ef562fb678f130d
+# distfiles="https://download.nus.edu.sg/mirror/tdf/libreoffice/src/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=164e658059d606869c2c088dd927e18abfd1d36e35377416332a18cb627ab20a
 
 depends="hunspell-af hyphen-af
  hunspell-an

From 5a970ad6abb01ad50d970ccb1199ccd99a4ae6a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 6 Jul 2024 05:29:46 +0700
Subject: [PATCH 6/6] libreoffice: update to 24.2.4.2.

---
 .../patches/001-build-option-java.patch       |  18 +++
 ...-musl.patch => 002-libjvm-path-musl.patch} |   0
 .../{musl-java.patch => 003-musl-java.patch}  |   8 +-
 ...o-fsword_t.patch => 004-no-fsword_t.patch} |   2 -
 ...slowcheck.patch => 005-no-slowcheck.patch} |   0
 .../libreoffice/patches/006-cross-flag.patch  |  33 +++++
 .../patches/007-cross-python.patch            |  13 ++
 srcpkgs/libreoffice/patches/008-zxing.patch   |  90 ++++++++++++
 srcpkgs/libreoffice/patches/009-kde.patch     |  38 +++++
 srcpkgs/libreoffice/patches/010-gpgmepp.patch | 124 ++++++++++++++++
 .../patches/build-option-java.patch           |  19 ---
 srcpkgs/libreoffice/template                  | 134 +++++++++++-------
 12 files changed, 406 insertions(+), 73 deletions(-)
 create mode 100644 srcpkgs/libreoffice/patches/001-build-option-java.patch
 rename srcpkgs/libreoffice/patches/{libjvm-path-musl.patch => 002-libjvm-path-musl.patch} (100%)
 rename srcpkgs/libreoffice/patches/{musl-java.patch => 003-musl-java.patch} (87%)
 rename srcpkgs/libreoffice/patches/{no-fsword_t.patch => 004-no-fsword_t.patch} (92%)
 rename srcpkgs/libreoffice/patches/{no-slowcheck.patch => 005-no-slowcheck.patch} (100%)
 create mode 100644 srcpkgs/libreoffice/patches/006-cross-flag.patch
 create mode 100644 srcpkgs/libreoffice/patches/007-cross-python.patch
 create mode 100644 srcpkgs/libreoffice/patches/008-zxing.patch
 create mode 100644 srcpkgs/libreoffice/patches/009-kde.patch
 create mode 100644 srcpkgs/libreoffice/patches/010-gpgmepp.patch
 delete mode 100644 srcpkgs/libreoffice/patches/build-option-java.patch

diff --git a/srcpkgs/libreoffice/patches/001-build-option-java.patch b/srcpkgs/libreoffice/patches/001-build-option-java.patch
new file mode 100644
index 00000000000000..bc135ea534543e
--- /dev/null
+++ b/srcpkgs/libreoffice/patches/001-build-option-java.patch
@@ -0,0 +1,18 @@
+--- a/cui/source/options/optjava.cxx
++++ b/cui/source/options/optjava.cxx
+@@ -976,6 +976,7 @@ OUString SvxJavaClassPathDlg::GetClassPa
+ #if HAVE_FEATURE_JAVA
+ void SvxJavaClassPathDlg::SetClassPath( const OUString& _rPath )
+ {
++#if HAVE_FEATURE_JAVA
+     if ( m_sOldPath.isEmpty() )
+         m_sOldPath = _rPath;
+     m_xPathList->clear();
+@@ -1001,6 +1002,7 @@ void SvxJavaClassPathDlg::SetClassPath(
+         m_xPathList->select(0);
+     }
+     SelectHdl_Impl(*m_xPathList);
++#endif
+ }
+ #endif
+ 
diff --git a/srcpkgs/libreoffice/patches/libjvm-path-musl.patch b/srcpkgs/libreoffice/patches/002-libjvm-path-musl.patch
similarity index 100%
rename from srcpkgs/libreoffice/patches/libjvm-path-musl.patch
rename to srcpkgs/libreoffice/patches/002-libjvm-path-musl.patch
diff --git a/srcpkgs/libreoffice/patches/musl-java.patch b/srcpkgs/libreoffice/patches/003-musl-java.patch
similarity index 87%
rename from srcpkgs/libreoffice/patches/musl-java.patch
rename to srcpkgs/libreoffice/patches/003-musl-java.patch
index a5c62c296ff680..3524fd66323e61 100644
--- a/srcpkgs/libreoffice/patches/musl-java.patch
+++ b/srcpkgs/libreoffice/patches/003-musl-java.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -8909,7 +8909,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAIN
+@@ -8998,7 +8998,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,7 +9,7 @@
          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"
-@@ -14744,7 +14744,7 @@ else
+@@ -15074,7 +15074,7 @@ else
  
      case "$host_os" in
  
@@ -20,7 +20,7 @@
          fi
 --- a/configure
 +++ b/configure
-@@ -22737,7 +22737,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAIN
+@@ -23020,7 +23020,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,7 +29,7 @@
          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"
-@@ -46802,7 +46802,7 @@ else
+@@ -48162,7 +48162,7 @@ else
  
      case "$host_os" in
  
diff --git a/srcpkgs/libreoffice/patches/no-fsword_t.patch b/srcpkgs/libreoffice/patches/004-no-fsword_t.patch
similarity index 92%
rename from srcpkgs/libreoffice/patches/no-fsword_t.patch
rename to srcpkgs/libreoffice/patches/004-no-fsword_t.patch
index 482674caaaf38d..af2481f38f97fe 100644
--- a/srcpkgs/libreoffice/patches/no-fsword_t.patch
+++ b/srcpkgs/libreoffice/patches/004-no-fsword_t.patch
@@ -13,8 +13,6 @@ Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
  sal/osl/unx/file.cxx | 7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
 
-diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
-index 5c4069cae2de4..b15fe963605fd 100644
 --- a/sal/osl/unx/file.cxx
 +++ b/sal/osl/unx/file.cxx
 @@ -39,6 +39,7 @@
diff --git a/srcpkgs/libreoffice/patches/no-slowcheck.patch b/srcpkgs/libreoffice/patches/005-no-slowcheck.patch
similarity index 100%
rename from srcpkgs/libreoffice/patches/no-slowcheck.patch
rename to srcpkgs/libreoffice/patches/005-no-slowcheck.patch
diff --git a/srcpkgs/libreoffice/patches/006-cross-flag.patch b/srcpkgs/libreoffice/patches/006-cross-flag.patch
new file mode 100644
index 00000000000000..a43847862c0b47
--- /dev/null
+++ b/srcpkgs/libreoffice/patches/006-cross-flag.patch
@@ -0,0 +1,33 @@
+Upstream: needs work
+Description: Perhaps cleanup a bit and submit to upstream
+ And we need to force *FLAGS_FOR_BUILD to something,
+ otherwise, those flags will be empty and make will pick up the *FLAGS
+ environment during build.
+--- a/configure.ac
++++ b/configure.ac
+@@ -5753,10 +5753,11 @@ if test "$cross_compiling" = "yes"; then
+     test -d config_build && cp -p config_build/*.h CONF-FOR-BUILD/config_host 2>/dev/null
+     (
+     unset COM USING_X11 OS CPUNAME
+-    unset CC CXX SYSBASE CFLAGS
++    unset CC CXX SYSBASE CFLAGS CXXFLAGS CPP CPPFLAGS LD LDFLAGS
+     unset AR LD NM OBJDUMP PKG_CONFIG RANLIB READELF STRIP
+     unset CPPUNIT_CFLAGS CPPUNIT_LIBS
+     unset LIBXML_CFLAGS LIBXML_LIBS LIBXSLT_CFLAGS LIBXSLT_LIBS XSLTPROC
++    unset PYTHON_CFLAGS PYTHON_LIBS
+     unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH
+     if test -n "$CC_FOR_BUILD"; then
+         export CC="$CC_FOR_BUILD"
+@@ -5766,6 +5767,12 @@ if test "$cross_compiling" = "yes"; then
+         export CXX="$CXX_FOR_BUILD"
+         CXX_BASE=`first_arg_basename "$CXX"`
+     fi
++    export CFLAGS="$CFLAGS_FOR_BUILD"
++    export CXXFLAGS="$CXXFLAGS_FOR_BUILD"
++    export CPP="$CPP_FOR_BUILD"
++    export CPPFLAGS="$CPPFLAGS_FOR_BUILD"
++    export LD="$LD_FOR_BUILD"
++    export LDFLAGS="$LDFLAGS_FOR_BUILD"
+     test -n "$PKG_CONFIG_FOR_BUILD" && export PKG_CONFIG="$PKG_CONFIG_FOR_BUILD"
+     cd CONF-FOR-BUILD
+ 
diff --git a/srcpkgs/libreoffice/patches/007-cross-python.patch b/srcpkgs/libreoffice/patches/007-cross-python.patch
new file mode 100644
index 00000000000000..4fcef7d3e54de8
--- /dev/null
+++ b/srcpkgs/libreoffice/patches/007-cross-python.patch
@@ -0,0 +1,13 @@
+Upstream: no
+Description: In VoidLinux, we always have same version of python in build and host
+--- a/configure.ac
++++ b/configure.ac
+@@ -9879,8 +9879,6 @@ if test "$build_os" != "cygwin" -a "$ena
+     else
+         # This allows a lack of system python with no error, we use internal one in that case.
+         AM_PATH_PYTHON([3.3],, [:])
+-        # Clean PYTHON_VERSION checked below if cross-compiling
+-        PYTHON_VERSION=""
+         if test "$PYTHON" != ":"; then
+             PYTHON_FOR_BUILD=$PYTHON
+         fi
diff --git a/srcpkgs/libreoffice/patches/008-zxing.patch b/srcpkgs/libreoffice/patches/008-zxing.patch
new file mode 100644
index 00000000000000..133b28c605e083
--- /dev/null
+++ b/srcpkgs/libreoffice/patches/008-zxing.patch
@@ -0,0 +1,90 @@
+Upstream: maybe
+Description: we should always check for full path
+ (i.e.  ZXing/MultiFormatWriter), however those file hierarchy is made
+ by installation step, thus libreoffice must use the non-prefix.
+ Perhap we should changes the file hierarchy of zxing-cpp project instead?
+--- a/configure.ac
++++ b/configure.ac
+@@ -11292,35 +11292,16 @@ else
+         SYSTEM_ZXING=TRUE
+         ZXING_CFLAGS=
+         AC_LANG_PUSH([C++])
+-        save_CXXFLAGS=$CXXFLAGS
+-        save_IFS=$IFS
+-        IFS=$P_SEP
+-        for i in $CPLUS_INCLUDE_PATH /usr/include; do
+-            dnl Reset IFS as soon as possible, to avoid unexpected side effects (and the
+-            dnl "/usr/include" fallback makes sure we get here at least once; resetting rather than
+-            dnl unsetting follows the advice at <https://git.savannah.gnu.org/gitweb/?p=autoconf.git;
+-            dnl a=commitdiff;h=e51c9919f2cf70185b7916ac040bc0bbfd0f743b> "Add recommendation on (not)
+-            dnl unsetting IFS."):
+-            IFS=$save_IFS
+-            dnl TODO: GCC and Clang treat empty paths in CPLUS_INCLUDE_PATH like ".", but we simply
+-            dnl ignore them here:
+-            if test -z "$i"; then
+-                continue
+-            fi
+-            dnl TODO: White space in $i would cause problems:
+-            CXXFLAGS="$save_CXXFLAGS ${CXXFLAGS_CXX11} -I$i/ZXing"
+-            AC_CHECK_HEADER(MultiFormatWriter.h, [ZXING_CFLAGS=-I$i/ZXing; break],
+-                [unset ac_cv_header_MultiFormatWriter_h], [#include <stdexcept>])
+-        done
+-        CXXFLAGS=$save_CXXFLAGS
+-        if test -z "$ZXING_CFLAGS"; then
++        AC_CHECK_HEADER([ZXing/MultiFormatWriter.h],[],[
+             AC_MSG_ERROR(zxing headers not found.)
+-        fi
++        ], [
++            AC_INCLUDES_DEFAULT
++            #include <stdexcept>
++        ])
+         AC_CHECK_LIB([ZXing], [main], [ZXING_LIBS=-lZXing],
+             [ AC_CHECK_LIB([ZXingCore], [main], [ZXING_LIBS=-lZXingCore],
+             [ AC_MSG_ERROR(zxing C++ library not found.) ])], [])
+         AC_LANG_POP([C++])
+-        ZXING_CFLAGS=$(printf '%s' "$ZXING_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
+         FilterLibs "${ZXING_LIBS}"
+         ZXING_LIBS="${filteredlibs}"
+     else
+@@ -11337,8 +11318,8 @@ else
+     save_CXXFLAGS=$CXXFLAGS
+     CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11 $ZXING_CFLAGS"
+     AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+-            #include <BitMatrix.h>
+-            #include <BitMatrixIO.h>
++            #include <ZXing/BitMatrix.h>
++            #include <ZXing/BitMatrixIO.h>
+             int main(){
+                 ZXing::BitMatrix matrix(1, 1);
+                 matrix.set(0, 0, true);
+--- a/cui/source/dialogs/QrCodeGenDialog.cxx
++++ b/cui/source/dialogs/QrCodeGenDialog.cxx
+@@ -26,22 +26,22 @@
+ #pragma GCC diagnostic ignored "-Wshadow"
+ #endif
+ 
+-#include <BarcodeFormat.h>
+-#include <BitMatrix.h>
+-#include <MultiFormatWriter.h>
++#include <ZXing/BarcodeFormat.h>
++#include <ZXing/BitMatrix.h>
++#include <ZXing/MultiFormatWriter.h>
+ 
+ #ifdef __GNUC__
+ #pragma GCC diagnostic pop
+ #endif
+ 
+ #if HAVE_ZXING_TOSVG
+-#include <BitMatrixIO.h>
++#include <ZXing/BitMatrixIO.h>
+ #endif
+ 
+ #if __has_include(<Utf.h>)
+-#include <Utf.h>
++#include <ZXing/Utf.h>
+ #else
+-#include <TextUtfEncoding.h>
++#include <ZXing/TextUtfEncoding.h>
+ #endif
+ 
+ #endif // ENABLE_ZXING
diff --git a/srcpkgs/libreoffice/patches/009-kde.patch b/srcpkgs/libreoffice/patches/009-kde.patch
new file mode 100644
index 00000000000000..ea299000f9f09f
--- /dev/null
+++ b/srcpkgs/libreoffice/patches/009-kde.patch
@@ -0,0 +1,38 @@
+Upstream: maybe
+Description: Moving some runtime check to compile time check
+--- a/configure.ac
++++ b/configure.ac
+@@ -13410,12 +13410,13 @@ then
+     save_CXXFLAGS=$CXXFLAGS
+     CXXFLAGS="$CXXFLAGS $KF5_CFLAGS"
+     AC_MSG_CHECKING([whether KDE is >= 5.0])
+-       AC_RUN_IFELSE([AC_LANG_SOURCE([[
++       AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+ #include <kcoreaddons_version.h>
+ 
+ int main(int argc, char **argv) {
+-       if (KCOREADDONS_VERSION_MAJOR == 5 && KCOREADDONS_VERSION_MINOR >= 0) return 0;
+-       else return 1;
++       int a[2 * (KCOREADDONS_VERSION_MAJOR == 5 && KCOREADDONS_VERSION_MINOR >= 0) - 1];
++       a[0] = 0;
++       return a[0];
+ }
+        ]])],[AC_MSG_RESULT([yes])],[AC_MSG_ERROR([KDE version too old])],[])
+     CXXFLAGS=$save_CXXFLAGS
+@@ -13486,12 +13487,13 @@ then
+     CXXFLAGS="$CXXFLAGS $KF6_CFLAGS"
+     dnl KF6 development version as of 2023-06 uses version number 5.240
+     AC_MSG_CHECKING([whether KDE is >= 5.240])
+-       AC_RUN_IFELSE([AC_LANG_SOURCE([[
++       AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+ #include <kcoreaddons_version.h>
+ 
+ int main(int argc, char **argv) {
+-       if (KCOREADDONS_VERSION_MAJOR == 6 || (KCOREADDONS_VERSION_MAJOR == 5 && KCOREADDONS_VERSION_MINOR >= 240)) return 0;
+-       else return 1;
++       int a[2 *(KCOREADDONS_VERSION_MAJOR == 6 || (KCOREADDONS_VERSION_MAJOR == 5 && KCOREADDONS_VERSION_MINOR >= 240)) - 1];
++       a[0] = 0;
++       return a[0];
+ }
+        ]])],[AC_MSG_RESULT([yes])],[AC_MSG_ERROR([KDE version too old])],[])
+     CXXFLAGS=$save_CXXFLAGS
diff --git a/srcpkgs/libreoffice/patches/010-gpgmepp.patch b/srcpkgs/libreoffice/patches/010-gpgmepp.patch
new file mode 100644
index 00000000000000..19651724461734
--- /dev/null
+++ b/srcpkgs/libreoffice/patches/010-gpgmepp.patch
@@ -0,0 +1,124 @@
+Upstream: no
+Description: we should always use full path
+ (i.e.  gpgme++/context.h), however those file hierarchy is made
+ by installation step, thus libreoffice must use the non-prefix
+ for vendored file.
+--- a/comphelper/source/misc/docpasswordhelper.cxx
++++ b/comphelper/source/misc/docpasswordhelper.cxx
+@@ -39,9 +39,9 @@
+ #include <string.h>
+ 
+ #if HAVE_FEATURE_GPGME
+-# include <context.h>
+-# include <data.h>
+-# include <decryptionresult.h>
++# include <gpgme++/context.h>
++# include <gpgme++/data.h>
++# include <gpgme++/decryptionresult.h>
+ #endif
+ 
+ using ::com::sun::star::uno::Sequence;
+--- a/comphelper/source/misc/storagehelper.cxx
++++ b/comphelper/source/misc/storagehelper.cxx
+@@ -62,10 +62,10 @@
+ #include <o3tl/string_view.hxx>
+ 
+ #if HAVE_FEATURE_GPGME
+-# include <context.h>
+-# include <encryptionresult.h>
+-# include <key.h>
+-# include <data.h>
++# include <gpgme++/context.h>
++# include <gpgme++/encryptionresult.h>
++# include <gpgme++/key.h>
++# include <gpgme++/data.h>
+ #endif
+ 
+ using namespace ::com::sun::star;
+--- a/configure.ac
++++ b/configure.ac
+@@ -12707,7 +12707,7 @@ elif test \( \( "$_os" = "Linux" -o "$_o
+         SYSTEM_GPGMEPP=TRUE
+ 
+         # C++ library doesn't come with fancy gpgmepp-config, check for headers the old-fashioned way
+-        AC_CHECK_HEADER(gpgme++/gpgmepp_version.h, [ GPGMEPP_CFLAGS=-I/usr/include/gpgme++ ],
++        AC_CHECK_HEADER(gpgme++/gpgmepp_version.h, [],
+             [AC_MSG_ERROR([gpgmepp headers not found, install gpgmepp >= 1.14 development package])], [])
+         AC_CHECK_HEADER(gpgme.h, [],
+             [AC_MSG_ERROR([gpgme headers not found, install gpgme development package])], [])
+--- a/xmlsecurity/source/gpg/CertificateImpl.cxx
++++ b/xmlsecurity/source/gpg/CertificateImpl.cxx
+@@ -19,8 +19,8 @@
+ #include <officecfg/Office/Common.hxx>
+ #include <svl/sigstruct.hxx>
+ 
+-#include <context.h>
+-#include <data.h>
++#include <gpgme++/context.h>
++#include <gpgme++/data.h>
+ 
+ using namespace css;
+ using namespace css::uno;
+--- a/xmlsecurity/source/gpg/SEInitializer.cxx
++++ b/xmlsecurity/source/gpg/SEInitializer.cxx
+@@ -12,7 +12,7 @@
+ #include "SecurityEnvironment.hxx"
+ #include "XMLSecurityContext.hxx"
+ 
+-#include <global.h>
++#include <gpgme++/global.h>
+ 
+ namespace com::sun::star::uno
+ {
+--- a/xmlsecurity/source/gpg/SecurityEnvironment.cxx
++++ b/xmlsecurity/source/gpg/SecurityEnvironment.cxx
+@@ -25,8 +25,8 @@
+ #include <tools/urlobj.hxx>
+ #endif
+ 
+-#include <key.h>
+-#include <keylistresult.h>
++#include <gpgme++/key.h>
++#include <gpgme++/keylistresult.h>
+ #include <xmlsec-wrapper.h>
+ 
+ #if defined _MSC_VER && defined __clang__
+@@ -37,7 +37,7 @@
+ #if defined _MSC_VER && defined __clang__
+ #pragma clang diagnostic pop
+ #endif
+-#include <context.h>
++#include <gpgme++/context.h>
+ 
+ using namespace css;
+ using namespace css::security;
+--- a/xmlsecurity/source/gpg/CertificateImpl.hxx
++++ b/xmlsecurity/source/gpg/CertificateImpl.hxx
+@@ -25,7 +25,7 @@
+ #pragma clang diagnostic push
+ #pragma clang diagnostic ignored "-Wundef"
+ #endif
+-#include <key.h>
++#include <gpgme++/key.h>
+ #if defined _MSC_VER && defined __clang__
+ #pragma clang diagnostic pop
+ #endif
+--- a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx
++++ b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx
+@@ -32,11 +32,11 @@
+ #if defined _MSC_VER && defined __clang__
+ #pragma clang diagnostic pop
+ #endif
+-#include <context.h>
+-#include <key.h>
+-#include <data.h>
+-#include <signingresult.h>
+-#include <importresult.h>
++#include <gpgme++/context.h>
++#include <gpgme++/key.h>
++#include <gpgme++/data.h>
++#include <gpgme++/signingresult.h>
++#include <gpgme++/importresult.h>
+ 
+ #include <xmlelementwrapper_xmlsecimpl.hxx>
+ #include <xmlsec/xmlstreamio.hxx>
diff --git a/srcpkgs/libreoffice/patches/build-option-java.patch b/srcpkgs/libreoffice/patches/build-option-java.patch
deleted file mode 100644
index 217d54c12fa51e..00000000000000
--- a/srcpkgs/libreoffice/patches/build-option-java.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur libreoffice-7.6.0.3.orig/cui/source/options/optjava.cxx libreoffice-7.6.0.3/cui/source/options/optjava.cxx
---- libreoffice-7.6.0.3.orig/cui/source/options/optjava.cxx	2023-08-08 15:49:18.000000000 -0400
-+++ libreoffice-7.6.0.3/cui/source/options/optjava.cxx	2023-08-21 12:38:20.652657824 -0400
-@@ -937,6 +937,7 @@
- 
- void SvxJavaClassPathDlg::SetClassPath( const OUString& _rPath )
- {
-+#if HAVE_FEATURE_JAVA
-     if ( m_sOldPath.isEmpty() )
-         m_sOldPath = _rPath;
-     m_xPathList->clear();
-@@ -962,6 +963,7 @@
-         m_xPathList->select(0);
-     }
-     SelectHdl_Impl(*m_xPathList);
-+#endif
- }
- 
- /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 96ea62b01ea0e8..31aeb3d060fda9 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,31 +1,33 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
-version=24.2.3.2
-revision=2
+version=24.2.4.2
+revision=1
 build_style=meta
+build_helper="gir"
 make_build_target="build"
+# Use order in configure.ac
+_xdeps="zlib-devel libjpeg-turbo-devel clucene-devel expat-devel xmlsec1-devel
+ nss-devel nspr-devel librevenge-devel libodfgen-devel libepubgen-devel
+ libwpd-devel libwpg-devel libwps-devel libvisio-devel libcdr-devel
+ libmspub-devel libmwaw-devel libetonyek-devel libfreehand-devel
+ libe-book-devel libabw-devel libpagemaker-devel libqxp-devel libzmf-devel
+ libstaroffice-devel lcms2-devel libcppunit-devel freetype-devel libxslt-devel
+ libgcrypt-devel libxml2-devel python3-devel libcurl-devel boost-devel
+ mdds frozen glm unixodbc-devel libldap-devel sane-devel icu-devel liborcus-devel
+ graphite-devel harfbuzz-devel libargon2-devel redland-devel hunspell-devel
+ zxcvbn-c-devel zxing-cpp-devel box2d-devel hyphen-devel mythes-devel
+ CoinMP-devel lpsolve-devel libexttextcat-devel libnumbertext-devel
+ libepoxy-devel cairo-devel liblangtag-devel libpng-devel tiff-devel
+ libwebp-devel fontconfig-devel gobject-introspection libgirepository-devel"
 hostmakedepends="automake flex gperf hyphen icu libtool openldap which gettext xz
  tar perl-Archive-Zip pkg-config sane unzip zip python3-setuptools
- fontforge python3-lxml qt6-base gtk4-devel gobject-introspection gnupg"
-makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel
- kf6-kio-devel
- kf6-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 frozen
- libgcrypt-devel libgltf-devel libldap-devel libmariadbclient-devel libmspub-devel
- libmwaw-devel libnumbertext-devel libodfgen-devel libopenjpeg2-devel
- liborcus-devel libargon2-devel zxcvbn-c-devel libzmf-devel
- libpagemaker-devel libqxp-devel librsvg-devel libvisio-devel libwpg-devel
- libwps-devel lpsolve-devel mdds mythes-devel neon-devel nss-devel nspr-devel
- postgresql-libs-devel python3-devel redland-devel sane-devel
- telepathy-glib-devel unixodbc-devel vigra-devel libcppunit-devel imath-devel
- qt6-base-devel libwebp-devel libgirepository-devel icu-devel twaindsm-devel
- libepoxy-devel libcurl-devel cairo-devel graphite-devel libjpeg-turbo-devel
- expat-devel fontconfig-devel freetype-devel harfbuzz-devel gpgmepp-devel
- lcms2-devel openssl-devel libpng-devel tiff-devel librevenge-devel
- xmlsec1-devel poppler-cpp-devel libxml2-devel zxing-cpp-devel"
+ fontforge python3-lxml qt6-base gnupg"
+makedepends="$_xdeps openssl-devel libXrender-devel libbluetooth-devel
+ gpgmepp-devel libXinerama-devel libXt-devel libX11-devel libICE-devel
+ libSM-devel libopenjpeg2-devel abseil-cpp-devel poppler-cpp-devel
+ gtk+3-devel gtk4-devel gst-plugins-base1-devel
+ qt6-base-devel kf6-kio-devel kf6-frameworkintegration-devel
+ libmariadbclient-devel postgresql-libs-devel"
 # Add the previously installed default languages as well
 depends="libreoffice-common>=${version}_${revision}
  libreoffice-base>=${version}_${revision}
@@ -47,15 +49,15 @@ depends="libreoffice-common>=${version}_${revision}
  libreoffice-i18n-pt>=${version}_${revision}"
 checkdepends="gdb"
 short_desc="Productivity suite"
-maintainer="Érico Nogueira <ericonr@disroot.org>"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.libreoffice.org/"
-nocross="Several dependencies are nocross=yes"
+# nocross="Several dependencies are nocross=yes"
 
 # Source, dictionary, help and translations
 _baseurl="https://download.documentfoundation.org/libreoffice/src/${version%.*}"
 # Please don't remove this mirror, it's faster for me
-_baseurl="https://download.nus.edu.sg/mirror/tdf/libreoffice/src/${version%.*}"
+# _baseurl="https://download.nus.edu.sg/mirror/tdf/libreoffice/src/${version%.*}"
 # _baseurl="https://mirrors.nju.edu.cn/tdf/libreoffice/src/${version%.*}"
 _addurl="https://dev-www.libreoffice.org/src"
 _exturl="https://dev-www.libreoffice.org/extern"
@@ -73,9 +75,7 @@ distfiles="
  ${_addurl}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
  ${_addurl}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
  ${_addurl}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${_addurl}/box2d-2.4.1.tar.gz
  ${_addurl}/libcmis-0.6.1.tar.xz
- ${_addurl}/libstaroffice-0.0.7.tar.xz
  ${_addurl}/pdfium-6179.tar.bz2
  ${_exturl}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
  ${_exturl}/odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar
@@ -97,9 +97,9 @@ distfiles="
  ${_addurl}/Java-WebSocket-1.5.4.tar.gz
  ${_addurl}/zxcvbn-c-2.5.tar.gz
 "
-checksum="f6e2059cd85d07793e8d95828b2412906bdba8bf61a5f76b8c51907898481e64
- 8e8acf4c09e2a43e8a86a19418bade97f67b837917bd0c2c6af9c8a8b261bb6b
- e71053a3b51f79079ef745663e68432c2bf20e49557083ab4de1a40c9fae2b4a
+checksum="9e3180a550af2c5f5c70a64516ef083ca6149076beafee33d83c4edb55b5ee83
+ d818370c54012ba2ecde41bb3a63275e9e6a1087fc239c87fbe7722753067cea
+ b8f3dad0a88d7998a2a2333fb1d16c0187b3dfd480ecf65d3b71468160dc9fcd
  1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
  75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
  7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66
@@ -107,9 +107,7 @@ checksum="f6e2059cd85d07793e8d95828b2412906bdba8bf61a5f76b8c51907898481e64
  d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
  1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133
  233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd
- d6b4650ff897ee1ead27cf77a5933ea197cbeef6705638dd181adc2e816b23c2
  d54d19d86153dbc88e2d468f7136269a2cfe71b73227e12fded01d29ac268074
- f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db
  4d3f08fe0e2fda86246832085426616826dcca0912202874428bfbc24d13d95c
  f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770
  d55495ab3a86544650587de2a72180ddf8bfc6376d14ddfa923992dbc86a06e0
@@ -138,9 +136,7 @@ skip_extraction="
  17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
  d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
  ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- box2d-2.4.1.tar.gz
  libcmis-0.6.1.tar.xz
- libstaroffice-0.0.7.tar.xz
  pdfium-6179.tar.bz2
  8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
  odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar
@@ -164,8 +160,9 @@ skip_extraction="
 "
 replaces="libreoffice-firebird<6.2.4.2_1"
 
-build_options="java"
+build_options="java firebird"
 desc_option_java="Enable Java support"
+desc_option_firebird="Enable Firebird SDBC support"
 
 CXXFLAGS="-DGLM_ENABLE_EXPERIMENTAL -DU_USING_ICU_NAMESPACE=1"
 
@@ -173,11 +170,24 @@ case "$XBPS_TARGET_MACHINE" in
 	i686*)	# Broken unit tests
 		CXXFLAGS+=" -DDISABLE_CVE_TESTS=1"
 		;;
-	x86_64*|ppc64*) build_options_default="java"
-		makedepends+=" openjdk17 apache-ant"
-		;;
+	x86_64*|ppc64*) build_options_default="java" ;;
+	armv[56]*) broken="untested" ;;
 esac
 
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default+=" firebird"
+else
+	hostmakedepends+=" $_xdeps"
+fi
+
+if [ "$build_option_java" ]; then
+	makedepends+=" openjdk17 apache-ant"
+fi
+
+if [ "$build_option_firebird" ]; then
+	makedepends+=" libfbclient3-devel libatomic_ops-devel"
+fi
+
 # Move files listed in a <name>_list.txt into $PKGDESTDIR
 _split() {
 	local list file dir destdir
@@ -396,6 +406,7 @@ post_patch() {
 
 do_configure() {
 	local opts
+	local bopts=
 
 	# the build system tries to call curl or wget, we can catch any invocations here and add them to distfiles
 	ln -sf /bin/false ${XBPS_WRAPPERDIR}/curl
@@ -436,7 +447,9 @@ do_configure() {
 	opts+=" --disable-epm"
 	# New strategy: enable all libs and headers, then disable what's missing
 	opts+=" --with-system-libs"
+	bopts+=" --with-system-libs"
 	opts+=" --with-system-headers"
+	bopts+=" --with-system-headers"
 	case "$XBPS_TARGET_MACHINE" in
 	x86_64)	# opts+=" --enable-ext-mariadb-connector"
 		# opts+=" --enable-ext-ct2n"
@@ -462,30 +475,55 @@ do_configure() {
 	else
 		opts+=" --without-java"
 	fi
+
+	# You can native compile firebird then cross-compile libreoffice.
+	if [ "$build_option_firebird" ]; then
+		export FIREBIRD_CFLAGS=-I$XBPS_CROSS_BASE/usr/include/firebird
+		export FIREBIRD_LIBS=-lfbclient
+		opts+=" --enable-firebird-sdbc"
+	else
+		opts+=" --disable-firebird-sdbc"
+	fi
+
 	opts+=" --with-tls=nss"
-	opts+=" --without-system-abseil"
-	opts+=" --without-system-box2d"
 	# https://github.com/tdf/libcmis/pull/43 changes ABI
 	opts+=" --without-system-libcmis"
-	opts+=" --without-system-libstaroffice"
+	bopts+=" --without-system-libcmis"
 	opts+=" --without-system-libtommath"
+	bopts+=" --without-system-libtommath"
 	opts+=" --without-system-jfreereport"
+	bopts+=" --without-system-jfreereport"
 	opts+=" --without-system-beanshell"
-	# opts+=" --without-system-cuckoo"
-	# opts+=" --without-system-glm"
+	bopts+=" --without-system-beanshell"
 	opts+=" --without-system-dragonbox"
+	bopts+=" --without-system-dragonbox"
 	opts+=" --without-system-libfixmath"
+	bopts+=" --without-system-libfixmath"
 	opts+=" --without-myspell-dicts"
-	# opts+=" --with-system-icu-for-build=yes"
 	# use system utilities
 	opts+=" --enable-build-opensymbol"
 	# finish configuring build
-	opts+=" --with-external-dict-dir=${XBPS_CROSS_BASE}/usr/share/hunspell"
-	opts+=" --with-external-hyph-dir=${XBPS_CROSS_BASE}/usr/share/hyphen"
-	opts+=" --with-external-thes-dir=${XBPS_CROSS_BASE}/usr/share/mythes"
+	opts+=" --with-external-dict-dir=/usr/share/hunspell"
+	opts+=" --with-external-hyph-dir=/usr/share/hyphen"
+	opts+=" --with-external-thes-dir=/usr/share/mythes"
 	opts+=" --with-parallelism=${XBPS_MAKEJOBS}"
 
-	./configure ${opts} --with-lang="${_languages}"
+	if [ "$CROSS_BUILD" ]; then
+		opts+=" --host=$XBPS_CROSS_TRIPLET"
+		opts+=" --with-boost=${XBPS_CROSS_BASE}/usr"
+		opts+=" --x-libraries=${XBPS_CROSS_BASE}/usr/lib"
+		export QT6INC=$XBPS_CROSS_BASE/usr/include/qt6
+		export QT6LIB=$XBPS_CROSS_BASE/usr/lib
+		export KF6INC=$XBPS_CROSS_BASE/usr/include
+		export KF6LIB=$XBPS_CROSS_BASE/usr/lib
+		# CXXFLAGS+=" -I$XBPS_CROSS_BASE/${py3_inc}"
+		export PYTHON_CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
+		export PYTHON_LIBS="-L$XBPS_CROSS_BASE/usr/lib -lpython${py3_ver}"
+		LDFLAGS_FOR_BUILD="$CFLAGS_FOR_BUILD $LDFLAGS_FOR_BUILD"
+	fi
+
+	./configure ${opts} --with-lang="${_languages}" \
+		--with-build-platform-configure-options="$bopts"
 }
 
 do_build() {

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-07-06 11:30 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-07-05 22:30 [PR PATCH] libreoffice and its dependencies update sgn
2024-07-06  8:19 ` [PR PATCH] [Updated] " sgn
2024-07-06  8:25 ` Chocimier
2024-07-06  9:05 ` [PR PATCH] [Merged]: " sgn
2024-07-06 11:30 ` sgn

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).