Compare commits

..

2 Commits

16
debian/changelog vendored

@ -1,18 +1,8 @@
screengrab (2.9.0-0ubuntu1) plucky; urgency=medium
screengrab (2.7.0-0ubuntu1~ppa2) jammy; urgency=medium
* New upstream release.
- Bump build dependencies.
-- Simon Quigley <tsimonq2@ubuntu.com> Fri, 15 Nov 2024 15:33:53 -0600
screengrab (2.8.0-0ubuntu1) oracular; urgency=medium
* New upstream release.
* Update copyright file.
* Bump Standards-Version to 4.7.0, no changes necessary.
* Adjust dependencies.
* Backport to Jammy.
-- Aaron Rainbolt <arraybolt3@ubuntu.com> Thu, 15 Aug 2024 16:50:01 -0500
-- Simon Quigley <tsimonq2@ubuntu.com> Sun, 12 Nov 2023 17:33:37 -0600
screengrab (2.7.0-0ubuntu1) noble; urgency=medium

13
debian/control vendored

@ -1,18 +1,19 @@
Source: screengrab
Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
Original-Maintainer: LXQt Packaging Team <team+lxqt@tracker.debian.org>
XSBC-Original-Maintainer: LXQt Packaging Team <team+lxqt@tracker.debian.org>
Uploaders: Alf Gaida <agaida@siduction.org>,
ChangZhuo Chen (陳昌倬) <czchen@debian.org>,
Andrew Lee (李健秋) <ajqlee@debian.org>
Section: graphics
Priority: optional
Build-Depends: debhelper-compat (= 13),
libkf6windowsystem-dev (>= 6.0.0),
libqt6xdg-dev (>= 4.1.0),
libkf5windowsystem-dev (>= 5.36.0),
libqt5x11extras5-dev (>= 5.15.0),
libqt5xdg-dev (>= 3.12.0),
libx11-xcb-dev,
libxcb-xfixes0-dev [!kfreebsd-any],
lxqt-build-tools (>= 2.1.0)
Standards-Version: 4.7.0
lxqt-build-tools
Standards-Version: 4.6.2
Vcs-Browser: https://salsa.debian.org/lxqt-team/screengrab
Vcs-Git: https://salsa.debian.org/lxqt-team/screengrab.git
Homepage: https://github.com/lxqt/screengrab
@ -20,7 +21,7 @@ Rules-Requires-Root: no
Package: screengrab
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}, doc-base
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Crossplatform tool for getting screenshots
Screengrab working in Linux and Windows. The program uses Qt and is
independent of any desktop environment.

3
debian/copyright vendored

@ -4,7 +4,7 @@ Source: https://github.com/lxqt/screengrab
Files: *
Copyright: 2009-2015 Artem Galichkin <doomer3d@gmail.com>
2014-2024, LXQt Project
2014-2021, LXQt Project
License: GPL-2.0+
Files: screengrab.metainfo.xml
@ -21,7 +21,6 @@ Copyright: 2010-2013 Artem Galichkin <doomer3d@gmail.com>
2015-2023 ChangZhuo Chen (陳昌倬) <czchen@debian.org>
2022 suman rajan <suman@protonmail.com>
2023 Andrew Lee (李健秋) <ajqlee@debian.org>
2024 Aaron Rainbolt <arraybolt3@ubuntu.com>
License: GPL-2.0+
License: GPL-2.0+

@ -0,0 +1,50 @@
Description: Revert commit porting to newer features that Jammy doesn't have yet
Author: Simon Quigley <tsimonq2@ubuntu.com>
Origin: vendor
Applied-Upstream: 39a03962d27eb2d786b17af517c50075cdf678d1, revert
Last-Update: 2023-11-12
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,7 +15,7 @@ option(SG_EXT_EDIT "Enable ability to ed
option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF)
# Minimum Versions
-set(KF5_MINIMUM_VERSION "5.101.0")
+set(KF5_MINIMUM_VERSION "5.36.0")
set(QT_MINIMUM_VERSION "5.15.0")
set(QTXDG_MINIMUM_VERSION "3.12.0")
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -32,8 +32,7 @@
#include <XdgMimeApps>
#include <qt5xdg/XdgDesktopFile>
-#include <KWindowSystem/KWindowSystem>
-#include <KWindowSystem/KX11Extras>
+#include <KF5/KWindowSystem/KWindowSystem>
#include <xcb/xfixes.h>
#ifdef X11_XCB_FOUND
@@ -269,15 +268,15 @@ void Core::getActiveWindow() // called o
if (screen == nullptr)
screen = QGuiApplication::screens().at(0);
- WId wnd = KX11Extras::activeWindow();
+ WId wnd = KWindowSystem::activeWindow();
// this window screenshot will be invalid
// if there's no active window or the active window is ours
- bool invalid(!wnd || !KX11Extras::hasWId(wnd) || (_wnd && _wnd->winId() == wnd));
+ bool invalid(!wnd || !KWindowSystem::hasWId(wnd) || (_wnd && _wnd->winId() == wnd));
if (!invalid)
{ // or if it isn't on the current desktop
KWindowInfo info(wnd, NET::WMDesktop);
- invalid = info.valid() && !info.isOnDesktop(KX11Extras::currentDesktop());
+ invalid = info.valid() && !info.isOnDesktop(KWindowSystem::currentDesktop());
if (!invalid)
{ // or if it is a desktop or panel/dock
info = KWindowInfo(wnd, NET::WMWindowType);

@ -0,0 +1 @@
revert-port-from-kwindowsystem.patch

@ -1,7 +0,0 @@
Document: screengrab
Title: Screengrab Documentation
Section: Viewers
Format: HTML
Index: /usr/share/doc/screengrab/html/en/index.html
Files: /usr/share/doc/screengrab/html/*/*.html

@ -1 +0,0 @@
debian/screengrab.doc-base usr/share/doc-base/

@ -1,4 +0,0 @@
# This is expected
screengrab: desktop-entry-lacks-keywords-entry [usr/share/applications/*.desktop]
screengrab: appstream-metadata-validation-failed *
screengrab: no-manual-page [usr/bin/*]

@ -0,0 +1,6 @@
localize/screengrab_de_DE.qm
localize/screengrab_es_ES.qm
localize/screengrab_it_IT.qm
localize/screengrab_pt_BR.qm
localize/screengrab_ru.qm
localize/screengrab_uk_UA.qm

9
debian/watch vendored

@ -1,5 +1,6 @@
version=4
opts="searchmode=plain, \
pgpsigurlmangle=s/$/.asc/, \
uversionmangle=s/(\d+\.\d+\.\d+).*/$1/" \
https://api.github.com/repos/lxqt/@PACKAGE@/releases https:\/\/github.com\/lxqt\/@PACKAGE@\/releases\/download\/@ANY_VERSION@\/@PACKAGE@-@ANY_VERSION@.tar.xz
# See https://davesteele.github.io/development/2015/05/02/debian-watch-file-format-for-signed-github-source-tars/ for GitHub workaround for releases page.
opts="downloadurlmangle=s/archive\/refs\/tags\/@ANY_VERSION@@ARCHIVE_EXT@/releases\/download\/$1\/@PACKAGE@-$1\.tar\.xz/,filenamemangle=s/@ANY_VERSION@@ARCHIVE_EXT@/@PACKAGE@-$1\.tar\.xz/,pgpsigurlmangle=s/$/.asc/" \
https://github.com/lxqt/@PACKAGE@/tags .*/@ANY_VERSION@@ARCHIVE_EXT@

Loading…
Cancel
Save