From 596599b21f1d27ae1bd4b932b8f50ac9c4c2eb44 Mon Sep 17 00:00:00 2001 From: Síle Ekaterin Liszka Date: Mon, 12 Dec 2022 05:46:09 +0000 Subject: user/lxqt-build-tools: upgrade to 0.12 --- user/lxqt-build-tools/APKBUILD | 9 +++------ user/lxqt-build-tools/glib.patch | 35 ----------------------------------- 2 files changed, 3 insertions(+), 41 deletions(-) delete mode 100644 user/lxqt-build-tools/glib.patch (limited to 'user/lxqt-build-tools') diff --git a/user/lxqt-build-tools/APKBUILD b/user/lxqt-build-tools/APKBUILD index 494c7e36a..a9ee260bf 100644 --- a/user/lxqt-build-tools/APKBUILD +++ b/user/lxqt-build-tools/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Síle Ekaterin Liszka # Maintainer: Síle Ekaterin Liszka pkgname=lxqt-build-tools -pkgver=0.11.0 +pkgver=0.12.0 pkgrel=0 pkgdesc="Toolchain for building and packaging LXQt" url="https://lxqt.github.io/" @@ -12,9 +12,7 @@ license="BSD-3-Clause" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev" subpackages="" -source="https://github.com/lxqt/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.xz - glib.patch - " +source="https://github.com/lxqt/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -35,5 +33,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="d421aaf74b13efa3b603b5c8a998bfd6091f5d3c45e0201d64e0c1f12d93c45fdc12d9232b0ac1c98ccf47007560c5814612162d1ac879bb3173bad57164408d lxqt-build-tools-0.11.0.tar.xz -1213f49c2832089ec4312f95c2cb3a4b95e379214c58f47b8815b31ac692a77d3a1e0e4bcfbbc7dbbe163b0de67faf44bb6a706893ca3c66fea3f3aaf60bd589 glib.patch" +sha512sums="6c8f0d8f04a2ba06c1cff935580a88312f18f87b5da99e53f46c053b842f179bf474b3637ddcb0e9a0007f1d03b9e7cfd92a6552e53082ce34348fcfb6436add lxqt-build-tools-0.12.0.tar.xz" diff --git a/user/lxqt-build-tools/glib.patch b/user/lxqt-build-tools/glib.patch deleted file mode 100644 index 0b56e02ff..000000000 --- a/user/lxqt-build-tools/glib.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 4991811d9212ec1176af6d1cbe88aa37efad4836 Mon Sep 17 00:00:00 2001 -From: Zamir SUN -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 - - sh-5.1# rpm -ql glib2-devel | grep gio/gunixfdlist.h -/usr/include/glib-2.0/gio/gunixfdlist.h - 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 ---- - 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) - -- cgit v1.2.3-70-g09d2