pool/lxqt-build-tools
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1033821 from X11:LXQt

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1033821
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lxqt-build-tools?expand=0&rev=13
This commit is contained in:
Dominique Leuenberger 2022-11-06 11:42:52 +00:00 committed by Git OBS Bridge
commit 77efd97ded
8 changed files with 33 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
4991811-fix-FindGLIB.cmake.patch
View File

@ -1,35 +0,0 @@
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)

3
lxqt-build-tools-0.11.0.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dd5d49e59f9b0552cb40118eb28a463f630b5de6e626b2910410b54ef3bcc1b9
size 25348

17
lxqt-build-tools-0.11.0.tar.xz.asc
View File

@ -1,17 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQJJBAABCAAzFiEEGd/fOleb1QnbtXLYvnkwB60i334FAmJaEssVHHRzdWphbjIw
MDBAZ21haWwuY29tAAoJEL55MAetIt9+YikQAJa2Q/OH6ZtoWsA46y0FeZemy2rz
iRU8zrqC8skItNZkkXYBHiDf1LBn4eDg66woGnIKQ39XXxVfGZIcnmsmJKrZOThd
LNbn8uucAC1OsRwC6+ttAON2fyuFGyO3qSPhT5bX26/vXdSu2/xBGkIw9qQvx5hB
q1zc2AA3lY+33SNw5ZppO+d4a/ySU0ewmL8bfTnHmMNgKCMdy+VJVVR5jxLr6Ohc
bnNZtWdtOt6HZXM4Q6l2J1aEdhTZ7ZpyxHzrrpi1C5iLqSEEuW6ROJxXzmFGVV/P
Mx+g9P/WJ7P28B1yU4nPbTT6b1HSGXU2eBEv3sPwcvaGkXkEYRee6o93a1j6Tqvy
zCBT3lWRhaWTsGzfPTSpidQ4ul7VQHH+zIHElD5odHIKPe2nIOWFYboQWU4XMVxJ
0tt1zRvqwDKiIIoTbNFNSppdPdbt1h8BCsYmcufz9Q/c0W/a2B0kvpRwJwITb/As
9KDAQTRD4qVPMlCs5Z7eUdec1CVNk1/pqbWhZXEeE0/bSoV3NxuV+nH8hxx60Jx/
dnywYTDZgdhFbxrXB0S94Hn+gKBjprTrDIFrdwRPOwXJ0RaFbspooDM2ePOVNtFE
tMq+2kTgL4ouJcc0EyIJdY9+pphz302MP0Eer4MjWv+OEjRppv0SeVPjQRLsvVzK
ony5EHOoiAP8cn4C
=DkC2
-----END PGP SIGNATURE-----

3
lxqt-build-tools-0.12.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:10075cf6ba6d3bcd8bf444ef78e7e754f40e1f40cd90e8338c1e4c784ca89530
size 25444

17
lxqt-build-tools-0.12.0.tar.xz.asc Normal file
View File

@ -0,0 +1,17 @@
-----BEGIN PGP SIGNATURE-----
iQJJBAABCAAzFiEEGd/fOleb1QnbtXLYvnkwB60i334FAmNmI68VHHRzdWphbjIw
MDBAZ21haWwuY29tAAoJEL55MAetIt9+RasQALzh07gOxh1bTbgtjgpM/+jWOFvZ
+hD0zGsE4Tk8wrYTM1RpIuA2ZnN85aR3FDJiczF9YxIS0pZdLv+0Ty17Yyvsb1e2
cCHT75Bm+xCCSiTxur/MmXAuYrZ3WN5ZXesOPQk1eYDD7MYdJQZwOdfUfEJvJLLv
dY0BHqq9RilcxDHjleaOX/gWasb3VRNuA3QjX/FB8Z+LPyEGS03PHRhu9kOefPLl
ZsWvWeVZTwKIhfFhqnvchGaKaoRd1899WPsqifK5HT5tgmv8r+lE2Q/9hC2gM4cn
twUa5uZlt/yYptF0KXWGE2HPLFY5cDeP2rExe1nTjlf4MO7PVcj9yaREqIiC4gAC
y+DDc4VEBkQ54/wuiKXmO/NkZZnuzl5IpGGhqL7O5PzFuMBNN3nocVRrGlwC8lfr
1KLYRJRi4iXmZRLuEbPdzhZFmZbMhVPwKfLTnpKwKX+tenbWJdTBsbrlUb712clt
qV4bHLGPbyOnNEQ35hOSCJLO+wfDxuLD4i1MjDeglOfG+1Jx62F83raL0qnUvhlJ
TtJGN//OiQjfki67oLlZmHakDGevB5MGebOdQyW4SAzRUaEOlc/ij9IUUmDKzn20
7+xWgL9zzqE65KlEFNxSUd+fGu+NPHrISR+PNNaJA9Z+sYPYL/UAO8oW9Yz57epI
JUyVrMCRiAUFsnn2
=piGr
-----END PGP SIGNATURE-----

33
lxqt-build-tools-symbolic.patch
View File

@ -1,33 +0,0 @@
From fd449e28e30886522c32df610c77124fb7be4b37 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.de>
Date: Mon, 29 Aug 2022 16:07:20 +0200
Subject: [PATCH] LXQtCompilerSettings: Drop use of -Bsymbolic
The use of "copy relocations" in ELF executables makes this rather dangerous,
as that moves the definition of the symbol from the library to the executable,
but the library still uses its own definition with -Bsymbolic.
In particular, this led to pcmanfm-qt not saving settings properly
(https://bugzilla.opensuse.org/show_bug.cgi?id=1195421), but can also cause
worse issues like just crashing on startup.
See https://bugreports.qt.io/browse/QTBUG-86173 and
https://bugzilla.opensuse.org/show_bug.cgi?id=1175278 for some details and
discussion about issues with -Bsymbolic.
---
cmake/modules/LXQtCompilerSettings.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmake/modules/LXQtCompilerSettings.cmake b/cmake/modules/LXQtCompilerSettings.cmake
index dfb0eaa..a8cb16d 100644
--- a/cmake/modules/LXQtCompilerSettings.cmake
+++ b/cmake/modules/LXQtCompilerSettings.cmake
@@ -164,7 +164,7 @@ if (CMAKE_COMPILER_IS_GNUCXX OR LXQT_COMPILER_IS_CLANGCXX)
set(NO_UNDEFINED_FLAGS "-Wl,--no-undefined")
# -Bsymbolic-functions: replace dynamic symbols used internally in
# shared libs with direct addresses.
- set(SYMBOLIC_FLAGS "-Wl,-Bsymbolic-functions -Wl,-Bsymbolic")
+ set(SYMBOLIC_FLAGS "-Wl,-Bsymbolic-functions")
endif()
set(CMAKE_SHARED_LINKER_FLAGS

12
lxqt-build-tools.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Sat Nov 5 16:28:08 UTC 2022 - Shawn Dunn <sfalken@cloverleaf-linux.org>
- Update to 0.12.0
* Support absolute `CMAKE_INSTALL_{INCLUDE,LIB}DIR` in
`LXQtCreatePkgConfigFile'
* Use `gdesktopappinfo.h` to find gio-unix-2.0 in
`FindGLIB.cmake`
* Drop use of `-Bsymbolic` in `LXQtCompilerSettings`
- Remove lxqt-build-tools-symbolic.patch
- Remove 4991811-fix-FindGLIB.cmake.patch
-------------------------------------------------------------------
Thu Sep 29 09:18:23 UTC 2022 - Guillaume GARDET <guillaume.gardet@opensuse.org>

8
lxqt-build-tools.spec
View File

@ -17,7 +17,7 @@
Name: lxqt-build-tools
Version: 0.11.0
Version: 0.12.0
Release: 0
Summary: Core build tools for LXQt
License: BSD-3-Clause
@ -25,10 +25,6 @@ Group: Development/Libraries/C and C++
URL: http://www.lxqt.org
Source: https://github.com/lxqt/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz
Source1: https://github.com/lxqt/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz.asc
# PATCH-FIX-UPSTREAM lxqt-build-tools-symbolic.patch [bsc#1195421]
Patch0: lxqt-build-tools-symbolic.patch
# PATCH-FIX-UPSTREAM 4991811-fix-FindGLIB.cmake.patch
Patch1: 4991811-fix-FindGLIB.cmake.patch
BuildRequires: cmake >= 3.1.0
BuildRequires: pkgconfig
BuildRequires: pkgconfig(Qt5Core) >= 5.15
@ -51,8 +47,6 @@ These tools used to be spread over the repositories of various other components
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
%cmake -DPULL_TRANSLATIONS=No