From 75f909c16a224a3598bb399cc9cb5a5e61cb1aea890a246ef6f9b7cef6aaaff5 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Tue, 22 May 2018 11:05:15 +0000 Subject: [PATCH] Accepting request 611216 from home:adamm:branches:X11:LXQt - cleanup cmake build - build.patch: add missing requirements OBS-URL: https://build.opensuse.org/request/show/611216 OBS-URL: https://build.opensuse.org/package/show/X11:LXQt/screengrab?expand=0&rev=5 --- build.patch | 13 +++++++++++++ screengrab.changes | 6 ++++++ screengrab.spec | 7 ++----- 3 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 build.patch diff --git a/build.patch b/build.patch new file mode 100644 index 0000000..249b557 --- /dev/null +++ b/build.patch @@ -0,0 +1,13 @@ +Index: screengrab-1.98/CMakeLists.txt +=================================================================== +--- screengrab-1.98.orig/CMakeLists.txt ++++ screengrab-1.98/CMakeLists.txt +@@ -261,7 +261,7 @@ if (XCB_XFIXES_FOUND) + target_link_libraries(screengrab ${XCB_XFIXES_LIBRARY}) + endif() + +-target_link_libraries(screengrab qkeysequencewidget Qt5::Widgets KF5::WindowSystem ${X11_LIBRARIES}) ++target_link_libraries(screengrab qkeysequencewidget Qt5::Widgets KF5::WindowSystem Qt5::X11Extras Qt5::Network ${X11_LIBRARIES}) + + # installing + install(TARGETS screengrab RUNTIME DESTINATION bin) diff --git a/screengrab.changes b/screengrab.changes index ee37196..15acec6 100644 --- a/screengrab.changes +++ b/screengrab.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 22 10:58:19 UTC 2018 - adam.majer@suse.de + +- cleanup cmake build +- build.patch: add missing requirements + ------------------------------------------------------------------- Tue May 22 10:29:04 UTC 2018 - mvetter@suse.com diff --git a/screengrab.spec b/screengrab.spec index 414f474..b5bca4b 100644 --- a/screengrab.spec +++ b/screengrab.spec @@ -26,6 +26,7 @@ URL: https://github.com/lxqt/screengrab Source: https://github.com/lxqt/screengrab/releases/download/%{version}/%{name}-%{version}.tar.xz Source1: https://github.com/lxqt/screengrab/releases/download/%{version}/%{name}-%{version}.tar.xz.asc Source2: %{name}.keyring +Patch1: build.patch BuildRequires: cmake >= 3.0.2 BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme @@ -53,20 +54,16 @@ Screenshot taker with the ability to publish them via hosting services. %prep %setup -q +%patch1 -p1 %build %cmake \ - -DCMAKE_CXX_FLAGS="%{optflags} -std=c++11 -lX11 -lQt5X11Extras -I%{_includedir}/qt5/QtNetwork -I%{_includedir}/qt5/QtX11Extras" \ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DCMAKE_BUILD_TYPE=release \ -DSG_DBUS_NOTIFY=ON \ -DSG_EXT_EDIT=OFF \ -DSG_EXT_UPLOADS=OFF \ -DSG_GLOBALSHORTCUTS=OFF \ -DUPDATE_TRANSLATIONS=OFF -#%make_jobs - %install %cmake_install #rm -rf %{buildroot}%{_datadir}/doc