summaryrefslogtreecommitdiff
path: root/user
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2022-07-21 23:26:54 -0500
committerZach van Rijn <me@zv.io>2022-10-21 18:34:02 -0500
commit3501750037b63e7d0e1bed22da8152d38401da2c (patch)
tree7f9a53213d0a1bab8df0b66846eccdf016c0a319 /user
parent514e2385b830626bc4ec8629befc19cd01cee5a0 (diff)
downloadpackages-3501750037b63e7d0e1bed22da8152d38401da2c.tar.gz
packages-3501750037b63e7d0e1bed22da8152d38401da2c.tar.bz2
packages-3501750037b63e7d0e1bed22da8152d38401da2c.tar.xz
packages-3501750037b63e7d0e1bed22da8152d38401da2c.zip
user/lxqt-build-tools: Update to 0.11.0
Also include a fix for GLib 2.73.
Diffstat (limited to 'user')
-rw-r--r--user/lxqt-build-tools/APKBUILD9
-rw-r--r--user/lxqt-build-tools/glib.patch35
2 files changed, 41 insertions, 3 deletions
diff --git a/user/lxqt-build-tools/APKBUILD b/user/lxqt-build-tools/APKBUILD
index 3cadc7c1e..ea0d77463 100644
--- a/user/lxqt-build-tools/APKBUILD
+++ b/user/lxqt-build-tools/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=lxqt-build-tools
-pkgver=0.9.0
+pkgver=0.11.0
pkgrel=0
pkgdesc="Toolchain for building and packaging LXQt"
url="https://lxqt.github.io/"
@@ -12,7 +12,9 @@ license="BSD-3-Clause"
depends=""
makedepends="cmake extra-cmake-modules qt5-qtbase-dev"
subpackages=""
-source="lxqt-build-tools-$pkgver.tar.gz::https://github.com/lxde/lxqt-build-tools/archive/$pkgver.tar.gz"
+source="https://github.com/lxqt/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.xz
+ glib.patch
+ "
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -33,4 +35,5 @@ package() {
make DESTDIR="$pkgdir" -C build install
}
-sha512sums="7f029b65a8dd136757a1151e97a884bce55a799f6ca9155f092fcb9934a4517e5c4a060cd6376de52bff38daf200b38e94cb9c8487da278705eb5f8555b63b1b lxqt-build-tools-0.9.0.tar.gz"
+sha512sums="d421aaf74b13efa3b603b5c8a998bfd6091f5d3c45e0201d64e0c1f12d93c45fdc12d9232b0ac1c98ccf47007560c5814612162d1ac879bb3173bad57164408d lxqt-build-tools-0.11.0.tar.xz
+1213f49c2832089ec4312f95c2cb3a4b95e379214c58f47b8815b31ac692a77d3a1e0e4bcfbbc7dbbe163b0de67faf44bb6a706893ca3c66fea3f3aaf60bd589 glib.patch"
diff --git a/user/lxqt-build-tools/glib.patch b/user/lxqt-build-tools/glib.patch
new file mode 100644
index 000000000..0b56e02ff
--- /dev/null
+++ b/user/lxqt-build-tools/glib.patch
@@ -0,0 +1,35 @@
+From 4991811d9212ec1176af6d1cbe88aa37efad4836 Mon Sep 17 00:00:00 2001
+From: Zamir SUN <zsun@fedoraproject.org>
+Date: Fri, 15 Jul 2022 18:06:03 +0800
+Subject: [PATCH] FindGLIB.cmake: Use gdesktopappinfo.h to find gio-unix-2.0
+ (#79)
+
+In glib2 2.73.1 gunixfdlist have been moved into glib-2.0
+
+<mock-chroot> sh-5.1# rpm -ql glib2-devel | grep gio/gunixfdlist.h
+/usr/include/glib-2.0/gio/gunixfdlist.h
+<mock-chroot> sh-5.1# rpm -q glib2-devel
+glib2-devel-2.73.1-2.fc37.x86_64
+
+So using gdesktopappinfo.h for gio-unix-2.0.
+
+Fixes: https://github.com/lxqt/lxqt-build-tools/issues/78
+
+Signed-off-by: Zamir SUN <sztsian@gmail.com>
+---
+ cmake/find-modules/FindGLIB.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/find-modules/FindGLIB.cmake b/cmake/find-modules/FindGLIB.cmake
+index bb2336a..c6a06f7 100644
+--- a/cmake/find-modules/FindGLIB.cmake
++++ b/cmake/find-modules/FindGLIB.cmake
+@@ -101,7 +101,7 @@ foreach (_component ${GLIB_FIND_COMPONENTS})
+ elseif (${_component} STREQUAL "gio-unix")
+ pkg_check_modules(GIO_UNIX gio-unix-2.0)
+ find_path(GLIB_GIO_UNIX_INCLUDE_DIR
+- NAMES gio/gunixfdlist.h
++ NAMES gio/gdesktopappinfo.h
+ HINTS ${GIO_UNIX_INCLUDEDIR}
+ PATH_SUFFIXES gio-unix-2.0)
+