Merge from debian unstable.
This commit is contained in:
Raman Sarda
parent
bedc8cdb81
commit
1877d05509
72
debian/changelog
vendored
72
debian/changelog
vendored
@ -1,3 +1,47 @@
|
||||
liblxqt (0.14.1-4ubuntu1) focal; urgency=low
|
||||
|
||||
* Merge from Debian unstable. Remaining changes:
|
||||
- New upstream version 0.14.1-4.
|
||||
- Bumped standards version to 4.5.0.
|
||||
- Using debhelper-compat ( =12).
|
||||
- Added new build dependency dh-exec.
|
||||
- Updated rules.
|
||||
- Updated copyrights.
|
||||
- Added upstream metadata.
|
||||
- Added upstream patches fix-hurd-ftbfs and fix-osx-ftbfs.
|
||||
|
||||
-- Raman Sarda <theloudspeaker@lubuntu.me> Tue, 07 Apr 2020 21:20:31 +0530
|
||||
|
||||
liblxqt (0.14.1-4) unstable; urgency=medium
|
||||
|
||||
* Added kfreebsd as non-linux to rules
|
||||
* New build dependency dh-exec
|
||||
* Don't install backlight things for hurd and kfreebsd
|
||||
* Prepared helper package
|
||||
|
||||
-- Alf Gaida <agaida@siduction.org> Sat, 27 Jul 2019 22:59:58 +0200
|
||||
|
||||
liblxqt (0.14.1-3) unstable; urgency=medium
|
||||
|
||||
* Modified debian/rules for Hurd.
|
||||
|
||||
-- Alf Gaida <agaida@siduction.org> Sat, 27 Jul 2019 14:43:27 +0200
|
||||
|
||||
liblxqt (0.14.1-2) unstable; urgency=medium
|
||||
|
||||
* Applied upstream CMakeLists patches for non-linux.
|
||||
|
||||
-- Alf Gaida <agaida@siduction.org> Sat, 27 Jul 2019 14:20:35 +0200
|
||||
|
||||
liblxqt (0.14.1-1) unstable; urgency=medium
|
||||
|
||||
* Cherry-picking upstream version 0.14.1.
|
||||
* Bumped minimum version libqt5xdg-dev (>= 3.3.1~)
|
||||
* Bumped minimum version libqt5xdgiconloader-dev (>= 3.3.1~)
|
||||
* Added new symbol
|
||||
|
||||
-- Alf Gaida <agaida@siduction.org> Sun, 24 Feb 2019 18:01:40 +0100
|
||||
|
||||
liblxqt (0.14.1-0ubuntu2) focal; urgency=medium
|
||||
|
||||
* No-change rebuild for libgcc-s1 package name change.
|
||||
@ -11,6 +55,21 @@ liblxqt (0.14.1-0ubuntu1) disco; urgency=medium
|
||||
|
||||
-- Simon Quigley <tsimonq2@ubuntu.com> Fri, 08 Mar 2019 23:11:56 -0600
|
||||
|
||||
liblxqt (0.14.0-1) unstable; urgency=medium
|
||||
|
||||
* Cherry-picking upstream version 0.14.0.
|
||||
* Added Build-Depends-Package: liblxqt0-dev to d/liblxqt0-dev.symbols
|
||||
* Dropped d/compat, use debhelper-compat = 12, no changes needed
|
||||
* Fixed years in d/copyright
|
||||
* Bumped minimum version libqt5xdg-dev (>= 3.3.0~)
|
||||
* Bumped minimum version libqt5xdgiconloader-dev (>= 3.3.0~)
|
||||
* Bumped minimum version lxqt-build-tools (>= 0.6.0~)
|
||||
* Removed obsolete PULL_TRANSLATIONS= OFF from dh_auto_configure
|
||||
* Added l10n-package, moved from lxqt-l10n
|
||||
* Added d/upstream/metadata
|
||||
|
||||
-- Alf Gaida <agaida@siduction.org> Sun, 27 Jan 2019 13:37:40 +0100
|
||||
|
||||
liblxqt (0.14.0-0ubuntu3) disco; urgency=medium
|
||||
|
||||
* Add Breaks/Replaces on the old liblxqt-l10n package.
|
||||
@ -32,6 +91,18 @@ liblxqt (0.14.0-0ubuntu1) disco; urgency=medium
|
||||
|
||||
-- Simon Quigley <tsimonq2@ubuntu.com> Fri, 25 Jan 2019 22:20:23 -0600
|
||||
|
||||
liblxqt (0.13.0-1) unstable; urgency=medium
|
||||
|
||||
* Cherry-picking upstream version 0.12.0.
|
||||
* Bumped build dependencies liblqt5xdg* to >= 3.2.0~
|
||||
* Bumpde build dependency lxqt-build-tools to >= 0.5.0~
|
||||
* Fixed symbols for the new release
|
||||
* Added lintian overrides for the helper scripts and configurations
|
||||
* Removed multiarch=same - packages will not be co-installable anymore
|
||||
* Moved debian/.gitignore to ./.gitignore
|
||||
|
||||
-- Alf Gaida <agaida@siduction.org> Thu, 24 May 2018 18:49:19 +0200
|
||||
|
||||
liblxqt (0.13.0-0ubuntu1) cosmic; urgency=medium
|
||||
|
||||
* New upstream release.
|
||||
@ -234,3 +305,4 @@ liblxqt (0.9.0-1) experimental; urgency=low
|
||||
* Initial release (Closes: #747620)
|
||||
|
||||
-- Alf Gaida <agaida@siduction.org> Sat, 14 Feb 2015 15:59:22 +0100
|
||||
|
||||
|
||||
1
debian/compat
vendored
1
debian/compat
vendored
@ -1 +0,0 @@
|
||||
12
|
||||
24
debian/control
vendored
24
debian/control
vendored
@ -6,17 +6,17 @@ Uploaders: Alf Gaida <agaida@siduction.org>,
|
||||
Andrew Lee (李健秋) <ajqlee@debian.org>
|
||||
Section: libs
|
||||
Priority: optional
|
||||
Build-Depends: debhelper (>= 12),
|
||||
libkf5windowsystem-dev,
|
||||
Build-Depends: debhelper-compat (= 12),
|
||||
dh-exec,
|
||||
libpolkit-qt5-1-dev,
|
||||
libqt5svg5-dev,
|
||||
libqt5x11extras5-dev,
|
||||
libqt5xdg-dev (>= 3.3.1),
|
||||
libqt5xdgiconloader-dev (>= 3.3.1),
|
||||
libqt5xdg-dev (>= 3.3.1~),
|
||||
libqt5xdgiconloader-dev (>= 3.3.1~),
|
||||
libx11-dev,
|
||||
libxss-dev,
|
||||
lxqt-build-tools (>= 0.6.0)
|
||||
Standards-Version: 4.3.0
|
||||
Standards-Version: 4.5.0
|
||||
Vcs-Browser: https://phab.lubuntu.me/source/liblxqt/
|
||||
Vcs-Git: https://phab.lubuntu.me/source/liblxqt.git
|
||||
XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/liblxqt
|
||||
@ -66,3 +66,17 @@ Breaks: liblxqt0 (<< 0.11.0), liblxqt-l10n (<< 0.14.0)
|
||||
Replaces: liblxqt0 (<< 0.11.0), liblxqt-l10n (<< 0.14.0)
|
||||
Description: Language package for liblxqt
|
||||
This package contains the l10n files needed by the liblxqt.
|
||||
|
||||
|
||||
# Package: lxqt-backlight-helper
|
||||
# Architecture: linux-any
|
||||
# Depends: ${shlibs:Depends},
|
||||
# ${misc:Depends}
|
||||
# Description: LXQt backlight helper for linux
|
||||
# LXQt is an advanced, easy-to-use, and fast desktop environment based on Qt
|
||||
# technologies. It has been tailored for users who value simplicity, speed, and
|
||||
# an intuitive interface. Unlike most desktop environments, LXQt also works
|
||||
# fine with less powerful machines.
|
||||
# .
|
||||
# This package contains the backlight helper files needed by the linux LXQt
|
||||
# desktop environment.
|
||||
|
||||
25
debian/copyright
vendored
25
debian/copyright
vendored
@ -3,19 +3,12 @@ Upstream-Name: liblxqt
|
||||
Source: https://github.com/lxqt/liblxqt
|
||||
|
||||
Files: *
|
||||
Copyright: 2012-2018 LXQt team
|
||||
Copyright: 2012-2019 LXQt team
|
||||
2010-2012 Razor team
|
||||
2012 Alec Moskvin <alecm@gmx.com>
|
||||
2018 Luís Pereira <luis.artur.pereira@gmail.com>
|
||||
License: LGPL-2.1+
|
||||
|
||||
Files: lxqtbacklight.*
|
||||
lxqtbacklight/*
|
||||
Copyright: 2016, 2018 P.L. Lucas
|
||||
License: GPL-2+
|
||||
|
||||
Files: debian/*
|
||||
Copyright: 2014-2018 Alf Gaida <agaida@siduction.org>
|
||||
Copyright: 2014-2019 Alf Gaida <agaida@siduction.org>
|
||||
License: LGPL-2.1+
|
||||
|
||||
License: LGPL-2.1+
|
||||
@ -31,17 +24,3 @@ License: LGPL-2.1+
|
||||
.
|
||||
On Debian systems, the complete text of the GNU Lesser General
|
||||
Public License version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1".
|
||||
|
||||
License: GPL-2+
|
||||
This program or library is free software; you can redistribute it
|
||||
and/or modify it under the terms of the GNU General Public License
|
||||
as published by the Free Software Foundation; either version 2 of
|
||||
the License, or (at your option) any later version.
|
||||
.
|
||||
This library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
.
|
||||
On Debian systems, the complete text of the GNU General Public
|
||||
License version 2 can be found in "/usr/share/common-licenses/GPL-2".
|
||||
|
||||
1
debian/liblxqt0-dev.install
vendored
1
debian/liblxqt0-dev.install
vendored
@ -1,4 +1,5 @@
|
||||
usr/include/lxqt/
|
||||
usr/lib/*/liblxqt.so
|
||||
usr/lib/*/pkgconfig/lxqt.pc
|
||||
|
||||
usr/share/cmake/lxqt/lxqt-*.cmake
|
||||
|
||||
4
debian/liblxqt0.install
vendored
4
debian/liblxqt0.install
vendored
@ -1,4 +1,6 @@
|
||||
usr/bin/lxqt-backlight_backend
|
||||
#!/usr/bin/dh-exec
|
||||
|
||||
usr/lib/*/liblxqt.so.*
|
||||
usr/share/lxqt/power.conf
|
||||
usr/share/polkit-1/actions/org.lxqt.backlight.pkexec.policy
|
||||
usr/bin/lxqt-backlight_backend
|
||||
|
||||
1
debian/liblxqt0.lintian-overrides
vendored
1
debian/liblxqt0.lintian-overrides
vendored
@ -3,3 +3,4 @@ liblxqt0: application-in-library-section libs usr/bin/lxqt-backlight_backend
|
||||
|
||||
# there will be no manpage for lxqt-backlight_backend
|
||||
liblxqt0: binary-without-manpage usr/bin/lxqt-backlight_backend
|
||||
|
||||
|
||||
1
debian/liblxqt0.symbols
vendored
1
debian/liblxqt0.symbols
vendored
@ -36,6 +36,7 @@ liblxqt.so.0 liblxqt0 #MINVER#
|
||||
(c++)"LXQt::ConfigDialog::addPage(QWidget*, QString const&, QStringList const&)@Base" 0.9.0+20150911
|
||||
(c++)"LXQt::ConfigDialog::clicked(QDialogButtonBox::StandardButton)@Base" 0.9.0+20150911
|
||||
(c++)"LXQt::ConfigDialog::closeEvent(QCloseEvent*)@Base" 0.9.0+20150911
|
||||
(c++)"LXQt::ConfigDialog::enableButton(QDialogButtonBox::StandardButton, bool)@Base" 0.14.1~
|
||||
(c++)"LXQt::ConfigDialog::event(QEvent*)@Base" 0.11.0
|
||||
(c++)"LXQt::ConfigDialog::metaObject() const@Base" 0.9.0+20150911
|
||||
(c++)"LXQt::ConfigDialog::qt_metacall(QMetaObject::Call, int, void**)@Base" 0.9.0+20150911
|
||||
|
||||
131
debian/patches/fix-hurd-ftbfs.patch
vendored
Normal file
131
debian/patches/fix-hurd-ftbfs.patch
vendored
Normal file
@ -0,0 +1,131 @@
|
||||
From 0b50e60a67ef51b07edc6fc8d9e9be1075dda12f Mon Sep 17 00:00:00 2001
|
||||
From: Paul Sonnenschein <paul@sonnenschein.ruhr>
|
||||
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);
|
||||
}
|
||||
|
||||
190
debian/patches/fix-osx-ftbfs.patch
vendored
Normal file
190
debian/patches/fix-osx-ftbfs.patch
vendored
Normal file
@ -0,0 +1,190 @@
|
||||
From 5bb1354a1e9a6fe35fb2ed09911d3d480f7bbfe9 Mon Sep 17 00:00:00 2001
|
||||
From: Chih-Hsuan Yen <yan12125@gmail.com>
|
||||
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 <KWindowSystem/KWindowSystem>
|
||||
-#include <KWindowSystem/NETWM>
|
||||
#include <QDBusMessage>
|
||||
#include <QWidget>
|
||||
#include <QDebug>
|
||||
@@ -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())
|
||||
2
debian/patches/series
vendored
Normal file
2
debian/patches/series
vendored
Normal file
@ -0,0 +1,2 @@
|
||||
fix-osx-ftbfs.patch
|
||||
fix-hurd-ftbfs.patch
|
||||
16
debian/rules
vendored
16
debian/rules
vendored
@ -5,6 +5,16 @@ export LC_ALL=C.UTF-8
|
||||
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
|
||||
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
|
||||
|
||||
WHICH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null)
|
||||
|
||||
ifeq ($(WHICH_OS), hurd)
|
||||
NOT_LINUX := -DBUILD_BACKLIGHT_LINUX_BACKEND=NO
|
||||
endif
|
||||
|
||||
ifeq ($(WHICH_OS), kfreebsd)
|
||||
NOT_LINUX := -DBUILD_BACKLIGHT_LINUX_BACKEND=NO
|
||||
endif
|
||||
|
||||
%:
|
||||
dh ${@} --buildsystem cmake
|
||||
|
||||
@ -13,6 +23,6 @@ override_dh_missing:
|
||||
|
||||
override_dh_auto_configure:
|
||||
dh_auto_configure -- \
|
||||
-DPULL_TRANSLATIONS=OFF\
|
||||
-DUPDATE_TRANSLATIONS=OFF\
|
||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo
|
||||
-DUPDATE_TRANSLATIONS=OFF \
|
||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
||||
$(NOT_LINUX)
|
||||
|
||||
6
debian/upstream/metadata
vendored
Normal file
6
debian/upstream/metadata
vendored
Normal file
@ -0,0 +1,6 @@
|
||||
Name: liblxqt
|
||||
Bug-Database: https://github.com/lxqt/liblxqt/issues
|
||||
Bug-Submit: https://github.com/lxqt/liblxqt/issues/new
|
||||
Changelog: https://github.com/lxqt/liblxqt/blob/master/CHANGELOG
|
||||
Repository: https://github.com/lxqt/liblxqt
|
||||
Repository-Browser: https://github.com/lxqt/liblxqt
|
||||
Loading…
x
Reference in New Issue
Block a user