From af0d685ba1f0a3c1225dacb3ffa85168add0cfa34d83af0ee2631df43b9bbe25 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Fri, 29 Apr 2022 06:33:05 +0000 Subject: [PATCH 1/8] - 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. OBS-URL: https://build.opensuse.org/package/show/X11:LXQt/screengrab?expand=0&rev=30 --- screengrab-2.3.0.tar.xz | 3 --- screengrab-2.3.0.tar.xz.asc | 17 ----------------- screengrab-2.4.0.tar.xz | 3 +++ screengrab-2.4.0.tar.xz.asc | 17 +++++++++++++++++ screengrab.changes | 8 ++++++++ screengrab.spec | 4 ++-- 6 files changed, 30 insertions(+), 22 deletions(-) delete mode 100644 screengrab-2.3.0.tar.xz delete mode 100644 screengrab-2.3.0.tar.xz.asc create mode 100644 screengrab-2.4.0.tar.xz create mode 100644 screengrab-2.4.0.tar.xz.asc 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.changes b/screengrab.changes index a29eeac..0d6e3b8 100644 --- a/screengrab.changes +++ b/screengrab.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +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. + ------------------------------------------------------------------- Mon Nov 8 10:15:23 UTC 2021 - Michael Vetter diff --git a/screengrab.spec b/screengrab.spec index 47b5979..41bf8c5 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 From dddfcfeb1cf0bb6e92abf12bfc863f4c17e9d87a9f5b1eff368a62574dcd7918 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Fri, 29 Apr 2022 07:21:41 +0000 Subject: [PATCH 2/8] OBS-URL: https://build.opensuse.org/package/show/X11:LXQt/screengrab?expand=0&rev=31 --- screengrab.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/screengrab.spec b/screengrab.spec index 41bf8c5..c1e7d54 100644 --- a/screengrab.spec +++ b/screengrab.spec @@ -38,7 +38,7 @@ 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(x11) BuildRequires: pkgconfig(x11-xcb) BuildRequires: pkgconfig(xcb) From 774831130ea3d85e07044e010ba8d0a5a2c2a7239493b24cd23275fda2c2369d Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Fri, 29 Apr 2022 07:59:45 +0000 Subject: [PATCH 3/8] OBS-URL: https://build.opensuse.org/package/show/X11:LXQt/screengrab?expand=0&rev=32 --- screengrab-link.patch | 12 ++++++++++++ screengrab.spec | 6 ++++++ 2 files changed, 18 insertions(+) create mode 100644 screengrab-link.patch diff --git a/screengrab-link.patch b/screengrab-link.patch new file mode 100644 index 0000000..6032e0e --- /dev/null +++ b/screengrab-link.patch @@ -0,0 +1,12 @@ +Index: screengrab-2.4.0/CMakeLists.txt +=================================================================== +--- screengrab-2.4.0.orig/CMakeLists.txt ++++ screengrab-2.4.0/CMakeLists.txt +@@ -184,6 +184,7 @@ add_executable(screengrab + + if(SG_EXT_EDIT) + target_link_libraries(screengrab extedit) ++ target_link_libraries(screengrab Qt5Xdg) + endif() + + if(SG_DBUS_NOTIFY) diff --git a/screengrab.spec b/screengrab.spec index c1e7d54..8ddf5b4 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 +Patch0: screengrab-link.patch BuildRequires: cmake >= 3.1.0 BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme @@ -53,8 +54,13 @@ Screenshot taker with the ability to publish them via hosting services. %prep %setup -q +%patch0 -p1 %build +# seems like their cmake doesnt do this +#SUSE_ASNEEDED=0 +#CXXFLAGS="%{optflags} -I%{_includedir}/qt5xdg -lQt5Xdg" + %cmake \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DSG_DBUS_NOTIFY=ON \ From 028c49971f8344c4bd69b4341636e8d667a103311c88b901006b8d9187d6f507 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Fri, 29 Apr 2022 08:17:44 +0000 Subject: [PATCH 4/8] OBS-URL: https://build.opensuse.org/package/show/X11:LXQt/screengrab?expand=0&rev=33 --- screengrab-link.patch | 7 ++++--- screengrab.spec | 3 +-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/screengrab-link.patch b/screengrab-link.patch index 6032e0e..0e86eb5 100644 --- a/screengrab-link.patch +++ b/screengrab-link.patch @@ -2,11 +2,12 @@ Index: screengrab-2.4.0/CMakeLists.txt =================================================================== --- screengrab-2.4.0.orig/CMakeLists.txt +++ screengrab-2.4.0/CMakeLists.txt -@@ -184,6 +184,7 @@ add_executable(screengrab +@@ -183,7 +183,7 @@ add_executable(screengrab + ) if(SG_EXT_EDIT) - target_link_libraries(screengrab extedit) -+ target_link_libraries(screengrab Qt5Xdg) +- target_link_libraries(screengrab extedit) ++ target_link_libraries(screengrab extedit Qt5::Xdg) endif() if(SG_DBUS_NOTIFY) diff --git a/screengrab.spec b/screengrab.spec index 8ddf5b4..1f4d666 100644 --- a/screengrab.spec +++ b/screengrab.spec @@ -59,8 +59,7 @@ Screenshot taker with the ability to publish them via hosting services. %build # seems like their cmake doesnt do this #SUSE_ASNEEDED=0 -#CXXFLAGS="%{optflags} -I%{_includedir}/qt5xdg -lQt5Xdg" - +CXXFLAGS="%{optflags} -I%{_includedir}/qt5xdg" %cmake \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DSG_DBUS_NOTIFY=ON \ From dae526d879578a66bca5a7d928a89cf75dd892c43c6ea41ae8d1c8d9b8be0109 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Fri, 29 Apr 2022 08:47:24 +0000 Subject: [PATCH 5/8] - Use -DSG_EXT_EDIT=ON OBS-URL: https://build.opensuse.org/package/show/X11:LXQt/screengrab?expand=0&rev=34 --- screengrab-link.patch | 2 +- screengrab.changes | 1 + screengrab.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/screengrab-link.patch b/screengrab-link.patch index 0e86eb5..069e6b3 100644 --- a/screengrab-link.patch +++ b/screengrab-link.patch @@ -7,7 +7,7 @@ Index: screengrab-2.4.0/CMakeLists.txt if(SG_EXT_EDIT) - target_link_libraries(screengrab extedit) -+ target_link_libraries(screengrab extedit Qt5::Xdg) ++ target_link_libraries(screengrab extedit Qt5Xdg) endif() if(SG_DBUS_NOTIFY) diff --git a/screengrab.changes b/screengrab.changes index 0d6e3b8..c13419a 100644 --- a/screengrab.changes +++ b/screengrab.changes @@ -5,6 +5,7 @@ Fri Apr 29 06:31:47 UTC 2022 - Michael Vetter * 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 ------------------------------------------------------------------- Mon Nov 8 10:15:23 UTC 2021 - Michael Vetter diff --git a/screengrab.spec b/screengrab.spec index 1f4d666..c263e7d 100644 --- a/screengrab.spec +++ b/screengrab.spec @@ -40,6 +40,7 @@ BuildRequires: pkgconfig(Qt5Network) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5X11Extras) BuildRequires: pkgconfig(Qt5Xdg) >= 3.9.0 +BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x11-xcb) BuildRequires: pkgconfig(xcb) @@ -63,7 +64,6 @@ CXXFLAGS="%{optflags} -I%{_includedir}/qt5xdg" %cmake \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DSG_DBUS_NOTIFY=ON \ - -DSG_EXT_EDIT=OFF \ -DSG_EXT_UPLOADS=OFF \ -DSG_GLOBALSHORTCUTS=OFF \ -DUPDATE_TRANSLATIONS=OFF From 5c0d0e32853e0d9f27abbeca62ec7ca956749da663c547c524cebed25b1e1cbe Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Mon, 29 Aug 2022 07:20:56 +0000 Subject: [PATCH 6/8] Accepting request 999695 from home:sfalken:branches:X11:LXQt - Add fix-no-undefined-builderror.patch, to correct failing build. [gh#lxqt/screengrab#310] - Cleaned up %build section - Modified %files, due to new additions from upstream OBS-URL: https://build.opensuse.org/request/show/999695 OBS-URL: https://build.opensuse.org/package/show/X11:LXQt/screengrab?expand=0&rev=35 --- fix-no-undefined-builderror.patch | 18 ++++++++++++++++++ screengrab.changes | 7 +++++++ screengrab.spec | 15 ++++++--------- 3 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 fix-no-undefined-builderror.patch 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.changes b/screengrab.changes index c13419a..cbc26e7 100644 --- a/screengrab.changes +++ b/screengrab.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Aug 28 18:27:32 UTC 2022 - Shawn Dunn + +- Add fix-no-undefined-builderror.patch, to correct failing build. [gh#lxqt/screengrab#310] +- Cleaned up %build section +- Modified %files, due to new additions from upstream + ------------------------------------------------------------------- Fri Apr 29 06:31:47 UTC 2022 - Michael Vetter diff --git a/screengrab.spec b/screengrab.spec index c263e7d..6a7df79 100644 --- a/screengrab.spec +++ b/screengrab.spec @@ -27,6 +27,8 @@ Source: https://github.com/lxqt/screengrab/releases/download/%{version}/ 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 @@ -56,17 +58,11 @@ Screenshot taker with the ability to publish them via hosting services. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build -# seems like their cmake doesnt do this -#SUSE_ASNEEDED=0 -CXXFLAGS="%{optflags} -I%{_includedir}/qt5xdg" -%cmake \ - -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DSG_DBUS_NOTIFY=ON \ - -DSG_EXT_UPLOADS=OFF \ - -DSG_GLOBALSHORTCUTS=OFF \ - -DUPDATE_TRANSLATIONS=OFF +%cmake +%cmake_build %install %cmake_install @@ -81,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} From 580a20c50c295e4ed28d0d1af7032357d74f056aa84251e83b6b5a8759452a47 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Thu, 1 Sep 2022 13:45:44 +0000 Subject: [PATCH 7/8] Accepting request 1000059 from home:sfalken:branches:X11:LXQt - Add patch to correct failing build. [gh#lxqt/screengrab#310] * fix-no-undefined-builderror.patch OBS-URL: https://build.opensuse.org/request/show/1000059 OBS-URL: https://build.opensuse.org/package/show/X11:LXQt/screengrab?expand=0&rev=36 --- screengrab.changes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/screengrab.changes b/screengrab.changes index cbc26e7..70c3898 100644 --- a/screengrab.changes +++ b/screengrab.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Sun Aug 28 18:27:32 UTC 2022 - Shawn Dunn -- Add fix-no-undefined-builderror.patch, to correct failing build. [gh#lxqt/screengrab#310] +- 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 From 5abdbd6d83ad8ba6510e63f59bb1d55dbb2473a9db967bc5ae2761e144e6c668 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Thu, 1 Sep 2022 15:33:05 +0000 Subject: [PATCH 8/8] - Add screengrab-link.patch OBS-URL: https://build.opensuse.org/package/show/X11:LXQt/screengrab?expand=0&rev=37 --- screengrab.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/screengrab.changes b/screengrab.changes index 70c3898..298abb7 100644 --- a/screengrab.changes +++ b/screengrab.changes @@ -14,6 +14,7 @@ Fri Apr 29 06:31:47 UTC 2022 - Michael Vetter * 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