diff --git a/fix-no-undefined-builderror.patch b/fix-no-undefined-builderror.patch new file mode 100644 index 0000000..af68864 --- /dev/null +++ b/fix-no-undefined-builderror.patch @@ -0,0 +1,18 @@ +diff -ruNp screengrab-orig/src/modules/extedit/CMakeLists.txt screengrab/src/modules/extedit/CMakeLists.txt +--- screengrab-orig/src/modules/extedit/CMakeLists.txt ++++ screengrab/src/modules/extedit/CMakeLists.txt +@@ -24,12 +24,10 @@ qt5_translation_loader(extedit_QM_LOADER + ) + + add_library(extedit +- SHARED ++ STATIC + ${extedit_SRC} + ${extedit_QMS} + ${extedit_QM_LOADER} + ) +-set_property (TARGET extedit PROPERTY SOVERSION 1.0.0) +-install(TARGETS extedit DESTINATION ${SG_LIBDIR}) + + target_link_libraries(extedit Qt5::Widgets Qt5::X11Extras Qt5Xdg) + diff --git a/screengrab-2.3.0.tar.xz b/screengrab-2.3.0.tar.xz deleted file mode 100644 index b400f28..0000000 --- a/screengrab-2.3.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7aad87c57b5972186c955069d5facb8baf7ca8e8cecca42d2c4745644faee160 -size 142160 diff --git a/screengrab-2.3.0.tar.xz.asc b/screengrab-2.3.0.tar.xz.asc deleted file mode 100644 index bf6ad8c..0000000 --- a/screengrab-2.3.0.tar.xz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQJJBAABCAAzFiEEGd/fOleb1QnbtXLYvnkwB60i334FAmGFGqsVHHRzdWphbjIw -MDBAZ21haWwuY29tAAoJEL55MAetIt9+xZwQALxDh2/bDnG0RKXTM0lZb3fExxjb -7kmw4GAygqxlKu3umNYRAZrMAS2zKe/KtG+DvTn9saB4mGkQUYLBnu8dV3naYca4 -21FaAknb39KLHd/fzGp55IIOWhIDIqQ/RWqzmRlMhTgAf+yPOIajCCfinAFCWtRS -NPqEgBTDpOUxkcQ/gb5qu3EReupIMZW6+EmVepAh1kY0KorgHOmxqHHmR8S2/EUk -VRs11U9u8ppG40hGHI3Vnqz3BNhy0H++Wjgj4BCetQEFLQYwuGPYY6F7hvl1gLoP -2Au2x+3lmQQ7BvdsZzNbc+fyavACqA9pmhWilC2QRgihe8BEup4OLhe7aS7unQQN -eX2IeRb8zO0KIbKjQd6uVlPjQ7MttbtTmnFcqddgxkJKsqrBndwxECj1Qub8ybL9 -+XE6xzolnxdqXEEpKCUeiUFGhZZNNEtbamzDsN3NeP0WXL2RSgDJ9QywfOLSIFcR -4xcxox3EzG3BCe0wEluuH0uXYw3w/IJUohPCnnzXoWgt7eObV36ZjdEMkW5lCrEz -6JGAhi9inXYxhcZyHfF0xsbmjoeI89AxPEjlhsIuaskFpKU35YUF3grKLUNB2FKT -+YBaxndfoxi+gAfyEoLacjmqCxQ6hqR6TvxaQj8u+VumSDjTYGCfboNBaYVBR1WS -fNotiHW1mBB7VpZu -=Az32 ------END PGP SIGNATURE----- diff --git a/screengrab-2.4.0.tar.xz b/screengrab-2.4.0.tar.xz new file mode 100644 index 0000000..8d7f502 --- /dev/null +++ b/screengrab-2.4.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a77f7af9327be6afed3e224182096972f06a118af2225edaa56183d30e127092 +size 336400 diff --git a/screengrab-2.4.0.tar.xz.asc b/screengrab-2.4.0.tar.xz.asc new file mode 100644 index 0000000..9e24db9 --- /dev/null +++ b/screengrab-2.4.0.tar.xz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- + +iQJJBAABCAAzFiEEGd/fOleb1QnbtXLYvnkwB60i334FAmJayuUVHHRzdWphbjIw +MDBAZ21haWwuY29tAAoJEL55MAetIt9+pu4P/jMCZKTgk34aEc7sd3Q9++XM4mHW +mAPWILVjzO6gUect2w8Wm3IIgmu7sqVBeeYr9m1fBkvb/UCv2CwFtGCk9HdfaXw+ +pbOSETpS8uy+bJ+QT2iXvlwHOvCAwjjKLVM+7ANaLsLl2H1tSOx1CshfQ/H+8Tzd +vVAfnYVJTWtoD4qCElZ1P3uMw4EMLrkAN4gtgJ4BawhBaEaeJ6k3ZN9yAr2x9YRF +APs5QZGRwshYX7dzuXLqrgqHJ+ag8DHKlofO7gsXKsRQxjRpoV9Y1UMMBIQ15/Rc +dtUP4A7EqjgD/T+tyKunF1WzX1wLBNFoqZuaaADCq68Z/dBLiXz+c1E5hEE8l8en +uDTrezY3Wgc+JnUYIuj1OVEi7PcgSoPZlcMcEPshMcJCi0MaUFLOK5IDmqHT0Vpp +BKKirECMJ89uudB9QoNn4+WG9SwlrptyY59OT/87upJleqzSXyCY0edmEKuBScvq +JfTlgc55TKAh0BK3B4nG6Gc0QzUKnHXJjrXXjP3aiKyPI4Q3XBuFd56LWOICPo3o +6Okg+PH2yS7FBVCFzprxxXMa8dIShsVoiNkCLeg7DUp4k6O7BjxoIFXOSJ32Vn19 +Lem9VNg8iACbDAqZw4kmIXUHkaAXPkLLEYilQOKleeglWEPmsE9PmD8gKRppjP/+ +X5Bzv55o3rIBV8FS +=UA6C +-----END PGP SIGNATURE----- diff --git a/screengrab-link.patch b/screengrab-link.patch new file mode 100644 index 0000000..069e6b3 --- /dev/null +++ b/screengrab-link.patch @@ -0,0 +1,13 @@ +Index: screengrab-2.4.0/CMakeLists.txt +=================================================================== +--- screengrab-2.4.0.orig/CMakeLists.txt ++++ screengrab-2.4.0/CMakeLists.txt +@@ -183,7 +183,7 @@ add_executable(screengrab + ) + + if(SG_EXT_EDIT) +- target_link_libraries(screengrab extedit) ++ target_link_libraries(screengrab extedit Qt5Xdg) + endif() + + if(SG_DBUS_NOTIFY) diff --git a/screengrab.changes b/screengrab.changes index a29eeac..298abb7 100644 --- a/screengrab.changes +++ b/screengrab.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Sun Aug 28 18:27:32 UTC 2022 - Shawn Dunn + +- Add patch to correct failing build. [gh#lxqt/screengrab#310] + * fix-no-undefined-builderror.patch +- Cleaned up %build section +- Modified %files, due to new additions from upstream + +------------------------------------------------------------------- +Fri Apr 29 06:31:47 UTC 2022 - Michael Vetter + +- Update to 2.4.0: + * Used an SVG icon instead of the blurry PNG icon. + * Fixed several problems in calling external editors or default app. + * Added metadata file. +- Use -DSG_EXT_EDIT=ON +- Add screengrab-link.patch + ------------------------------------------------------------------- Mon Nov 8 10:15:23 UTC 2021 - Michael Vetter diff --git a/screengrab.spec b/screengrab.spec index 47b5979..6a7df79 100644 --- a/screengrab.spec +++ b/screengrab.spec @@ -1,7 +1,7 @@ # # spec file for package screengrab # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: screengrab -Version: 2.3.0 +Version: 2.4.0 Release: 0 Summary: Qt tool for creating screenshots License: GPL-2.0-only @@ -26,6 +26,9 @@ 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 +Patch0: screengrab-link.patch +# PATCH-FIX-UPSTREAM fix-no-undefined-builderror.patch gh#lxqt/screengrab#310 +Patch1: fix-no-undefined-builderror.patch BuildRequires: cmake >= 3.1.0 BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme @@ -38,7 +41,8 @@ BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Network) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5X11Extras) -BuildRequires: pkgconfig(Qt5Xdg) >= 3.8.0 +BuildRequires: pkgconfig(Qt5Xdg) >= 3.9.0 +BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x11-xcb) BuildRequires: pkgconfig(xcb) @@ -53,15 +57,12 @@ Screenshot taker with the ability to publish them via hosting services. %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build -%cmake \ - -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DSG_DBUS_NOTIFY=ON \ - -DSG_EXT_EDIT=OFF \ - -DSG_EXT_UPLOADS=OFF \ - -DSG_GLOBALSHORTCUTS=OFF \ - -DUPDATE_TRANSLATIONS=OFF +%cmake +%cmake_build %install %cmake_install @@ -76,6 +77,7 @@ rm -rf %{buildroot}%{_datadir}/doc %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.??g %{_datadir}/screengrab/screengrab.conf +%{_datadir}/metainfo/%{name}.metainfo.xml %files lang -f %{name}.lang %dir %{_datadir}/%{name}