Release to Oracular

debian/changelog

@@ -1,3 +1,14 @@
+lxqt-powermanagement (2.0.0-0ubuntu1) oracular; urgency=medium
+
+  * New upstream release.
+  * Fix DPMS-related patch.
+  * Update copyright file.
+  * Adjusted build dependencies.
+  * Fix battery notification patch.
+  * Bump Standards-Version to 4.7.0, no changes necessary.
+
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 15 Aug 2024 16:29:08 -0500
+
 lxqt-powermanagement (1.4.0-0ubuntu2) noble; urgency=medium
 
   * Patched out DPMS-related code (it was causing constant crashes)

debian/control

@@ -7,19 +7,18 @@ Uploaders: Alf Gaida <agaida@siduction.org>,
 Section: x11
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
-               libkf5idletime-dev,
+               libkf6idletime-dev,
-               libkf5solid-dev,
+               libkf6solid-dev,
-               libkf5windowsystem-dev,
+               libkf6windowsystem-dev,
-               liblxqt-globalkeys-ui1-dev (>= 1.4.0),
+               liblxqt-globalkeys-ui2-dev (>= 2.0.0),
-               liblxqt-globalkeys1-dev (>= 1.4.0),
+               liblxqt-globalkeys2-dev (>= 2.0.0),
-               liblxqt1-dev (>= 1.4.0),
+               liblxqt2-dev (>= 2.0.0),
-               libqt5svg5-dev,
-               libqt5x11extras5-dev,
                libx11-dev,
                libxcb-dpms0-dev,
                libxcb-screensaver0-dev,
-               qtbase5-private-dev
+               qt6-base-private-dev,
-Standards-Version: 4.6.2
+               qt6-svg-dev
+Standards-Version: 4.7.0
 Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-powermanagement-packaging
 Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-powermanagement-packaging.git
 XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-powermanagement
@@ -40,7 +39,7 @@ Package: lxqt-powermanagement-l10n
 Architecture: all
 Multi-Arch: foreign
 Section: localization
-Depends: qttranslations5-l10n, ${misc:Depends}
+Depends: qt6-translations-l10n, ${misc:Depends}
 Description: Language package for lxqt-powermanagement
  The l10n files for lxqt-powermanagement
  .

debian/copyright

@@ -3,7 +3,7 @@ Upstream-Name: lxqt-powermanagement
 Source: https://github.com/lxqt/lxqt-powermanagement
 
 Files: *
-Copyright: 2013-2023, LXQt team
+Copyright: 2013-2024, LXQt team
            2011-2012, Razor team
 License: LGPL-2.1+
 
@@ -24,7 +24,7 @@ Copyright: 2013, Alec Moskvin <alecm@gmx.com>
 License: LGPL-2.1+
 
 Files: debian/*
-Copyright: 2021-2023, Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+Copyright: 2021-2024, Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
            2014-2019, Alf Gaida <agaida@siduction.org>
            2015,      Andrew Lee (李健秋) <ajqlee@debian.org>
 License: LGPL-2.1+

debian/patches/battery-ux.patch

@@ -57,7 +57,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +    bool discharging;
      double chargeLevel;
  
--    for (const Solid::Battery *battery : qAsConst(mBatteries))
+-    for (const Solid::Battery *battery : std::as_const(mBatteries))
 -    {
 -        totalEnergyFull += battery->energyFull();
 -        totalEnergyNow += battery->energy();
@@ -80,7 +80,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +    bool batteries = false;
 +    discharging = true;
 +
-+    for (const Solid::Battery *battery : qAsConst(mBatteries))
++    for (const Solid::Battery *battery : std::as_const(mBatteries))
 +    {
 +        batteries = true;
 +

debian/patches/revert-dpms-changes.patch

@@ -7,87 +7,48 @@ Description: Remove DPMS-related and screensaver-suspending-related code
  sets DPMS timeouts. This patch removes all of that code, fixing the crashes.
 Author: Aaron Rainbolt
 Origin: ubuntu
-Last-Update: 2023-11-14
+Last-Update: 2024-06-26
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-diff --git a/CMakeLists.txt b/CMakeLists.txt
+
-index 07f9549..6215d9c 100644
+--- lxqt-powermanagement-2.0.0.orig/CMakeLists.txt
---- a/CMakeLists.txt
++++ lxqt-powermanagement-2.0.0/CMakeLists.txt
-+++ b/CMakeLists.txt
+@@ -29,7 +29,6 @@ find_package(KF6IdleTime ${KF6_MINIMUM_V
-@@ -15,22 +15,18 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+ find_package(KF6Solid ${KF6_MINIMUM_VERSION} REQUIRED)
- 
- option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF)
- 
--set(LXQTBT_MINIMUM_VERSION "0.13.0")
- set(KF5_MINIMUM_VERSION "5.101.0")
- set(LXQT_MINIMUM_VERSION "1.4.0")
- set(QT_MINIMUM_VERSION "5.15.0")
- 
--find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED)
- find_package(Qt5DBus ${QT_MINIMUM_VERSION} REQUIRED)
- find_package(Qt5LinguistTools ${QT_MINIMUM_VERSION} REQUIRED)
- find_package(Qt5Svg ${QT_MINIMUM_VERSION} REQUIRED)
- find_package(Qt5Widgets ${QT_MINIMUM_VERSION} REQUIRED)
--find_package(Qt5X11Extras ${QT_MINIMUM_VERSION} REQUIRED)
- find_package(KF5IdleTime ${KF5_MINIMUM_VERSION} REQUIRED)
- find_package(KF5Solid ${KF5_MINIMUM_VERSION} REQUIRED)
  find_package(lxqt ${LXQT_MINIMUM_VERSION} REQUIRED)
  find_package(lxqt-globalkeys-ui ${LXQT_GLOBALKEYS_MINIMUM_VERSION} REQUIRED)
 -find_package(XCB REQUIRED COMPONENTS xcb-dpms xcb-screensaver)
  
- message(STATUS "Building with Qt${Qt5Core_VERSION}")
+ message(STATUS "Building with Qt${Qt6Core_VERSION}")
- 
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index b29362a..177ddb1 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -57,8 +57,6 @@ target_link_libraries(lxqt-powermanagement
-     KF5::Solid
-     KF5::IdleTime
-     lxqt-globalkeys
--    Qt5::X11Extras
--    ${XCB_LIBRARIES}
- )
- 
- install(TARGETS
-diff --git a/src/idlenesswatcher.cpp b/src/idlenesswatcher.cpp
-index ecaa641..cb9d9e1 100644
---- a/src/idlenesswatcher.cpp
-+++ b/src/idlenesswatcher.cpp
-@@ -24,7 +24,7 @@
  
- #include "idlenesswatcher.h"
+--- lxqt-powermanagement-2.0.0.orig/src/idlenesswatcher.cpp
- 
++++ lxqt-powermanagement-2.0.0/src/idlenesswatcher.cpp
--#include <QGuiApplication>
+@@ -35,8 +35,6 @@
-+#include <QCoreApplication>
- #include <QTimer>
- #include <KIdleTime>
- #include <Solid/Device>
-@@ -35,9 +35,6 @@
  #include <QDebug>
  #include <LXQt/lxqtnotification.h>
  #include <QObject>
--#include <QX11Info>
 -#include <xcb/dpms.h>
 -#include <xcb/screensaver.h>
  
  IdlenessWatcher::IdlenessWatcher(QObject* parent):
      Watcher(parent)
-@@ -71,43 +68,14 @@ IdlenessWatcher::IdlenessWatcher(QObject* parent):
+@@ -70,47 +68,14 @@ IdlenessWatcher::IdlenessWatcher(QObject
  
      connect(&mPSettings, &LXQt::Settings::settingsChanged, this, &IdlenessWatcher::onSettingsChanged);
  
 -    // retrieve DPMS timeouts
 -    mDpmsStandby = mDpmsSuspend = mDpmsOff = 0;
 -    if (QGuiApplication::platformName() == QStringLiteral("xcb")) {
--        xcb_connection_t* c = QX11Info::connection();
+-        if (auto x11NativeInterface = qGuiApp->nativeInterface<QNativeInterface::QX11Application>()) {
--        xcb_dpms_get_timeouts_cookie_t cookie = xcb_dpms_get_timeouts(c);
+-            xcb_connection_t* c = x11NativeInterface->connection();
--        xcb_dpms_get_timeouts_reply_t* reply = xcb_dpms_get_timeouts_reply(c, cookie, nullptr);
+-            xcb_dpms_get_timeouts_cookie_t cookie = xcb_dpms_get_timeouts(c);
--        if (reply) {
+-            xcb_dpms_get_timeouts_reply_t* reply = xcb_dpms_get_timeouts_reply(c, cookie, nullptr);
--            mDpmsStandby = reply->standby_timeout;
+-            if (reply) {
--            mDpmsSuspend = reply->suspend_timeout;
+-                mDpmsStandby = reply->standby_timeout;
--            mDpmsOff = reply->off_timeout;
+-                mDpmsSuspend = reply->suspend_timeout;
--            free(reply);
+-                mDpmsOff = reply->off_timeout;
+-                free(reply);
+-            }
 -        }
 -    }
 -
@@ -102,14 +63,16 @@ index ecaa641..cb9d9e1 100644
  
 -void IdlenessWatcher::setDpmsTimeouts(bool restore) {
 -    if (QGuiApplication::platformName() == QStringLiteral("xcb")) {
--        xcb_connection_t* c = QX11Info::connection();
+-        if (auto x11NativeInterface = qGuiApp->nativeInterface<QNativeInterface::QX11Application>()) {
--        if (restore) {
+-            xcb_connection_t* c = x11NativeInterface->connection();
--            xcb_dpms_set_timeouts(c, mDpmsStandby, mDpmsSuspend, mDpmsOff);
+-            if (restore) {
--            xcb_screensaver_suspend(c, 0); // WARNING: This is not documented but works.
+-                xcb_dpms_set_timeouts(c, mDpmsStandby, mDpmsSuspend, mDpmsOff);
--        }
+-                xcb_screensaver_suspend(c, 0); // WARNING: This is not documented but works.
--        else {
+-            }
--            xcb_dpms_set_timeouts(c, 0, 0, 0);
+-            else {
--            xcb_screensaver_suspend(c, XCB_SCREENSAVER_SUSPEND);
+-                xcb_dpms_set_timeouts(c, 0, 0, 0);
+-                xcb_screensaver_suspend(c, XCB_SCREENSAVER_SUSPEND);
+-            }
 -        }
 -    }
 -}
@@ -117,7 +80,7 @@ index ecaa641..cb9d9e1 100644
  void IdlenessWatcher::setup()
  {
      if(mPSettings.isIdlenessWatcherEnabled()) {
-@@ -141,13 +109,6 @@ void IdlenessWatcher::setup()
+@@ -144,13 +109,6 @@ void IdlenessWatcher::setup()
                  milliseconds = 1000;
              mIdleBacklightWatcher = KIdleTime::instance()->addIdleTimeout(milliseconds);
          }
@@ -131,10 +94,8 @@ index ecaa641..cb9d9e1 100644
      }
  }
  
-diff --git a/src/idlenesswatcher.h b/src/idlenesswatcher.h
+--- lxqt-powermanagement-2.0.0.orig/src/idlenesswatcher.h
-index dce9cc6..af0b585 100644
++++ lxqt-powermanagement-2.0.0/src/idlenesswatcher.h
---- a/src/idlenesswatcher.h
-+++ b/src/idlenesswatcher.h
 @@ -45,8 +45,6 @@ private Q_SLOTS:
      void onSettingsChanged();
  
@@ -152,16 +113,3 @@ index dce9cc6..af0b585 100644
  };
  
  #endif // IDLENESSWATCHER_H
-diff --git a/src/main.cpp b/src/main.cpp
-index eedd360..493bf8b 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -34,7 +34,7 @@
- int main(int argc, char *argv[])
- {
- 
--    LXQt::Application a(argc, argv, true);
-+    LXQt::Application a(argc, argv);
-     a.setQuitOnLastWindowClosed(false);
- 
-     QCommandLineParser parser;