From 5d8a4a712d268bed2284e584beaef705d696bad8 Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Thu, 23 Apr 2020 03:20:47 -0500 Subject: [PATCH] Remove upstream patches fixing Mac OS X and Hurd builds. --- debian/changelog | 6 + debian/patches/fix-hurd-ftbfs.patch | 131 ------------------- debian/patches/fix-osx-ftbfs.patch | 190 ---------------------------- debian/patches/series | 2 - 4 files changed, 6 insertions(+), 323 deletions(-) delete mode 100644 debian/patches/fix-hurd-ftbfs.patch delete mode 100644 debian/patches/fix-osx-ftbfs.patch delete mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index 2363e3e..41a41ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +liblxqt (0.14.1-4ubuntu2) UNRELEASED; urgency=medium + + * Remove upstream patches fixing Mac OS X and Hurd builds. + + -- Simon Quigley Thu, 23 Apr 2020 03:19:56 -0500 + liblxqt (0.14.1-4ubuntu1) focal; urgency=low * Merge from Debian unstable. Remaining changes: diff --git a/debian/patches/fix-hurd-ftbfs.patch b/debian/patches/fix-hurd-ftbfs.patch deleted file mode 100644 index 13ccbd4..0000000 --- a/debian/patches/fix-hurd-ftbfs.patch +++ /dev/null @@ -1,131 +0,0 @@ -From 0b50e60a67ef51b07edc6fc8d9e9be1075dda12f Mon Sep 17 00:00:00 2001 -From: Paul Sonnenschein -Date: Tue, 23 Jul 2019 18:44:29 +0200 -Subject: [PATCH] Fix compilation error on the Hurd. - -* This commit disables the Linux backend on the Hurd because it fails to - compile on Debian GNU/Hurd and does not seem to be useful on the Hurd - (the code contains paths which do not exist on Hurd). - . - The build failure was caused by an unconditional use of PATH_MAX, which - is not defined on the Hurd. -* Replace operating system check for the Hurd with an option. -* Do not use Polkit if not compiling the linux backlight backend. ---- - CMakeLists.txt | 28 +++++++++++++++++++++++----- - lxqtbacklight.cpp | 8 +++++++- - 2 files changed, 30 insertions(+), 6 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6a26f19..537de65 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -30,6 +30,7 @@ set(LXQT_VERSION ${LXQT_MAJOR_VERSION}.${LXQT_MINOR_VERSION}.${LXQT_PATCH_VERSIO - - - option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF) -+option(BUILD_BACKLIGHT_LINUX_BACKEND "Build the Linux backend for the backlight" ON) - - set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_POSITION_INDEPENDENT_CODE ON) -@@ -41,7 +42,9 @@ find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED) - find_package(Qt5 ${QT_MINIMUM_VERSION} CONFIG REQUIRED Widgets DBus LinguistTools) - find_package(Qt5Xdg ${QTXDG_MINIMUM_VERSION} REQUIRED) - find_package(KF5WindowSystem ${KF5_MINIMUM_VERSION} REQUIRED) --find_package(PolkitQt5-1 REQUIRED) -+if (BUILD_BACKLIGHT_LINUX_BACKEND) -+ find_package(PolkitQt5-1 REQUIRED) -+endif (BUILD_BACKLIGHT_LINUX_BACKEND) - if (NOT APPLE) - find_package(Qt5 ${QT_MINIMUM_VERSION} CONFIG REQUIRED X11Extras) - find_package(X11 REQUIRED) -@@ -51,7 +54,10 @@ message(STATUS "Building ${PROJECT_NAME} with Qt ${Qt5Core_VERSION}") - include(CMakePackageConfigHelpers) - include(GNUInstallDirs) # Standard directories for installation - --add_subdirectory(lxqtbacklight/linux_backend/driver) -+if (BUILD_BACKLIGHT_LINUX_BACKEND) -+ add_subdirectory(lxqtbacklight/linux_backend/driver) -+ add_definitions(-DUSE_BACKLIGHT_LINUX_BACKEND) -+endif (BUILD_BACKLIGHT_LINUX_BACKEND) - - set(LXQT_PKG_CONFIG_DESCRIPTION "Shared library for LXQt applications") - -@@ -136,7 +142,6 @@ set(SRCS - lxqtrotatedwidget.cpp - lxqtbacklight.cpp - lxqtbacklight/virtual_backend.cpp -- lxqtbacklight/linux_backend/linuxbackend.cpp - ) - - if (NOT APPLE) -@@ -145,6 +150,12 @@ if (NOT APPLE) - ) - endif (NOT APPLE) - -+if (BUILD_BACKLIGHT_LINUX_BACKEND) -+ list (APPEND SRCS -+ lxqtbacklight/linux_backend/linuxbackend.cpp -+ ) -+endif (BUILD_BACKLIGHT_LINUX_BACKEND) -+ - set(MOCS - lxqthtmldelegate.h - lxqtpowermanager.h -@@ -163,7 +174,6 @@ set(MOCS - lxqtgridlayout.h - lxqtrotatedwidget.h - lxqtbacklight/virtual_backend.h -- lxqtbacklight/linux_backend/linuxbackend.h - ) - - if (NOT APPLE) -@@ -172,6 +182,12 @@ if (NOT APPLE) - ) - endif (NOT APPLE) - -+if (BUILD_BACKLIGHT_LINUX_BACKEND) -+ list (APPEND SRCS -+ lxqtbacklight/linux_backend/linuxbackend.h -+ ) -+endif (BUILD_BACKLIGHT_LINUX_BACKEND) -+ - set(FORMS - configdialog/lxqtconfigdialog.ui - ) -@@ -395,7 +411,9 @@ install(FILES ${LXQT_CONFIG_FILES} - COMPONENT Runtime - ) - --install(FILES ${POLKIT_FILES} DESTINATION "${POLKITQT-1_POLICY_FILES_INSTALL_DIR}") -+if (BUILD_BACKLIGHT_LINUX_BACKEND) -+ install(FILES ${POLKIT_FILES} DESTINATION "${POLKITQT-1_POLICY_FILES_INSTALL_DIR}") -+endif (BUILD_BACKLIGHT_LINUX_BACKEND) - - #************************************************ - # Create and install pkgconfig file -diff --git a/lxqtbacklight.cpp b/lxqtbacklight.cpp -index 581eb9d..c31f219 100644 ---- a/lxqtbacklight.cpp -+++ b/lxqtbacklight.cpp -@@ -18,13 +18,19 @@ - - #include "lxqtbacklight.h" - #include "lxqtbacklight/virtual_backend.h" --#include "lxqtbacklight/linux_backend/linuxbackend.h" -+#ifdef USE_BACKLIGHT_LINUX_BACKEND -+ #include "lxqtbacklight/linux_backend/linuxbackend.h" -+#endif - - namespace LXQt { - - Backlight::Backlight(QObject *parent):QObject(parent) - { -+#ifdef USE_BACKLIGHT_LINUX_BACKEND - m_backend = (VirtualBackEnd *) new LinuxBackend(this); -+#else -+ m_backend = new VirtualBackEnd(this); -+#endif - connect(m_backend, &VirtualBackEnd::backlightChanged, this, &Backlight::backlightChangedSlot); - } - diff --git a/debian/patches/fix-osx-ftbfs.patch b/debian/patches/fix-osx-ftbfs.patch deleted file mode 100644 index c4440a5..0000000 --- a/debian/patches/fix-osx-ftbfs.patch +++ /dev/null @@ -1,190 +0,0 @@ -From 5bb1354a1e9a6fe35fb2ed09911d3d480f7bbfe9 Mon Sep 17 00:00:00 2001 -From: Chih-Hsuan Yen -Date: Sat, 15 Jun 2019 11:14:53 +0800 -Subject: [PATCH] Make it build on macOS - -* Don't use X11 libs. -* Don't build LXQt::ScreenSaver. It uses the X11 screensaver protocol. -* Use symbols from the KWindowSystem class instead of NET class. The - NETWM header is available on XCB only. ---- - CMakeLists.txt | 54 ++++++++++++++++++++++++++++++-------- - cmake/lxqt-config.cmake.in | 4 ++- - lxqtsingleapplication.cpp | 3 +-- - 3 files changed, 47 insertions(+), 14 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 30b6d47..6a26f19 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -38,11 +38,14 @@ set(CMAKE_AUTOMOC ON) - set(CMAKE_AUTOUIC ON) - - find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED) --find_package(Qt5 ${QT_MINIMUM_VERSION} CONFIG REQUIRED Widgets DBus X11Extras LinguistTools) -+find_package(Qt5 ${QT_MINIMUM_VERSION} CONFIG REQUIRED Widgets DBus LinguistTools) - find_package(Qt5Xdg ${QTXDG_MINIMUM_VERSION} REQUIRED) - find_package(KF5WindowSystem ${KF5_MINIMUM_VERSION} REQUIRED) - find_package(PolkitQt5-1 REQUIRED) --find_package(X11 REQUIRED) -+if (NOT APPLE) -+ find_package(Qt5 ${QT_MINIMUM_VERSION} CONFIG REQUIRED X11Extras) -+ find_package(X11 REQUIRED) -+endif() - message(STATUS "Building ${PROJECT_NAME} with Qt ${Qt5Core_VERSION}") - - include(CMakePackageConfigHelpers) -@@ -57,7 +60,6 @@ set(PUB_HDRS - lxqtsettings.h - lxqtplugininfo.h - lxqtpowermanager.h -- lxqtscreensaver.h - lxqtapplication.h - lxqtsingleapplication.h - lxqttranslator.h -@@ -78,12 +80,17 @@ set(PUB_HDRS - #lxqtbacklight/linux_backend/linuxbackend.h - ) - -+if (NOT APPLE) -+ list (APPEND PUB_HDRS -+ lxqtscreensaver.h -+ ) -+endif (NOT APPLE) -+ - set(PUBLIC_CLASSES - HtmlDelegate - Settings - PluginInfo - PowerManager -- ScreenSaver - Application - SingleApplication - Translator -@@ -101,13 +108,17 @@ set(PUBLIC_CLASSES - Globals - Backlight - ) -+if (NOT APPLE) -+ list (APPEND PUBLIC_CLASSES -+ ScreenSaver -+ ) -+endif (NOT APPLE) - - set(SRCS - lxqthtmldelegate.cpp - lxqtplugininfo.cpp - lxqtpowermanager.cpp - lxqtsettings.cpp -- lxqtscreensaver.cpp - lxqtapplication.cpp - lxqtsingleapplication.cpp - lxqttranslator.cpp -@@ -128,11 +139,16 @@ set(SRCS - lxqtbacklight/linux_backend/linuxbackend.cpp - ) - -+if (NOT APPLE) -+ list (APPEND SRCS -+ lxqtscreensaver.cpp -+ ) -+endif (NOT APPLE) -+ - set(MOCS - lxqthtmldelegate.h - lxqtpowermanager.h - lxqtsettings.h -- lxqtscreensaver.h - lxqtapplication.h - lxqtbacklight.h - -@@ -150,6 +166,12 @@ set(MOCS - lxqtbacklight/linux_backend/linuxbackend.h - ) - -+if (NOT APPLE) -+ list (APPEND MOCS -+ lxqtscreensaver.h -+ ) -+endif (NOT APPLE) -+ - set(FORMS - configdialog/lxqtconfigdialog.ui - ) -@@ -177,7 +199,11 @@ set_property(SOURCE ${DBUS_INTERFACE_SRCS} ${DBUS_ADAPTOR_SRCS} PROPERTY SKIP_AU - list(APPEND SRCS "${DBUS_INTERFACE_SRCS}" "${DBUS_ADAPTOR_SRCS}") - - # KF5WindowSystem is missing here. KF5WindowSystem doesn't provide an .pc file. --set(LXQT_PKG_CONFIG_REQUIRES "Qt5Xdg >= ${QTXDG_MINIMUM_VERSION}, Qt5Widgets >= ${QT_MINIMUM_VERSION}, Qt5Xml >= ${QT_MINIMUM_VERSION}, Qt5DBus >= ${QT_MINIMUM_VERSION}, Qt5X11Extras >= ${QT_MINIMUM_VERSION}") -+set(LXQT_PKG_CONFIG_REQUIRES "Qt5Xdg >= ${QTXDG_MINIMUM_VERSION}, Qt5Widgets >= ${QT_MINIMUM_VERSION}, Qt5Xml >= ${QT_MINIMUM_VERSION}, Qt5DBus >= ${QT_MINIMUM_VERSION}") -+ -+if (NOT APPLE) -+ set(LXQT_PKG_CONFIG_REQUIRES "${LXQT_PKG_CONFIG_REQUIRES}, Qt5X11Extras >= ${QT_MINIMUM_VERSION}") -+endif (NOT APPLE) - - - # Standard directories for installation -@@ -282,13 +308,19 @@ target_link_libraries(${LXQT_LIBRARY_NAME} - KF5::WindowSystem - Qt5::Widgets - Qt5::DBus -- Qt5::X11Extras - Qt5Xdg -- PRIVATE -- ${X11_Xscreensaver_LIB} -- ${X11_X11_LIB} - ) - -+if (NOT APPLE) -+ target_link_libraries(${LXQT_LIBRARY_NAME} -+ PUBLIC -+ Qt5::X11Extras -+ PRIVATE -+ ${X11_Xscreensaver_LIB} -+ ${X11_X11_LIB} -+ ) -+endif (NOT APPLE) -+ - set_target_properties(${LXQT_LIBRARY_NAME} PROPERTIES - VERSION ${LXQT_VERSION} - SOVERSION ${LXQT_MAJOR_VERSION} -diff --git a/cmake/lxqt-config.cmake.in b/cmake/lxqt-config.cmake.in -index 5cb6dc5..25eaf61 100644 ---- a/cmake/lxqt-config.cmake.in -+++ b/cmake/lxqt-config.cmake.in -@@ -10,11 +10,13 @@ include(CMakeFindDependencyMacro) - - find_dependency(Qt5Widgets @QT_MINIMUM_VERSION@) - find_dependency(Qt5DBus @QT_MINIMUM_VERSION@) --find_dependency(Qt5X11Extras @QT_MINIMUM_VERSION@) - find_dependency(Qt5LinguistTools @QT_MINIMUM_VERSION@) - find_dependency(Qt5Xdg @QTXDG_MINIMUM_VERSION@) - find_dependency(KF5WindowSystem) - find_dependency(lxqt-build-tools @LXQTBT_MINIMUM_VERSION@) -+if (NOT APPLE) -+ find_dependency(Qt5X11Extras @QT_MINIMUM_VERSION@) -+endif (NOT APPLE) - include(LXQtConfigVars) - - -diff --git a/lxqtsingleapplication.cpp b/lxqtsingleapplication.cpp -index 4ad4b48..508ec3d 100644 ---- a/lxqtsingleapplication.cpp -+++ b/lxqtsingleapplication.cpp -@@ -28,7 +28,6 @@ - #include "lxqtsingleapplication.h" - #include "singleapplicationadaptor.h" - #include --#include - #include - #include - #include -@@ -99,7 +98,7 @@ void SingleApplication::activateWindow() - mActivationWindow->show(); - WId window = mActivationWindow->effectiveWinId(); - -- KWindowInfo info(window, NET::WMDesktop); -+ KWindowInfo info(window, KWindowSystem::WMDesktop); - int windowDesktop = info.desktop(); - - if (windowDesktop != KWindowSystem::currentDesktop()) diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 49ace55..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -fix-osx-ftbfs.patch -fix-hurd-ftbfs.patch