From ea857388019bfa59cab43ade5b16314795a987c0 Mon Sep 17 00:00:00 2001
From: Simon Quigley <simon@tsimonq2.net>
Date: Sun, 12 Nov 2023 17:47:17 -0600
Subject: [PATCH] Revert commit porting to newer features that Jammy doesn't
 have yet.

---
 debian/changelog                              |  2 +-
 .../revert-port-from-kwindowsystem.patch      | 50 +++++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 debian/patches/revert-port-from-kwindowsystem.patch
 create mode 100644 debian/patches/series

diff --git a/debian/changelog b/debian/changelog
index 1f7306f..15f6814 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-screengrab (2.7.0-0ubuntu1~ppa1) jammy; urgency=medium
+screengrab (2.7.0-0ubuntu1~ppa2) jammy; urgency=medium
 
   * Backport to Jammy.
 
diff --git a/debian/patches/revert-port-from-kwindowsystem.patch b/debian/patches/revert-port-from-kwindowsystem.patch
new file mode 100644
index 0000000..345f886
--- /dev/null
+++ b/debian/patches/revert-port-from-kwindowsystem.patch
@@ -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);
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..eaf1c83
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+revert-port-from-kwindowsystem.patch