liblxqt: update to 0.11.0
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
@@ -1,62 +0,0 @@
|
||||
From e26d2f89d4eb2030fb23b1a54ee6fd92dd1c2c8b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Fri, 24 Jul 2015 15:30:10 +0200
|
||||
Subject: [PATCH] remove Qt5X11Extras dependency - it is not required
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
For building in x11-less environments
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
CMakeLists.txt | 4 +---
|
||||
cmake/lxqt-config.cmake.in | 1 -
|
||||
2 files changed, 1 insertion(+), 4 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 4725834..122b5fd 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -143,7 +143,6 @@ set(CMAKE_AUTOUIC ON)
|
||||
|
||||
find_package(Qt5Widgets REQUIRED QUIET)
|
||||
find_package(Qt5DBus REQUIRED QUIET)
|
||||
-find_package(Qt5X11Extras REQUIRED QUIET)
|
||||
find_package(Qt5LinguistTools REQUIRED QUIET)
|
||||
find_package(Qt5Xdg REQUIRED QUIET)
|
||||
find_package(KF5WindowSystem REQUIRED QUIET)
|
||||
@@ -162,7 +161,7 @@ QT5_ADD_DBUS_ADAPTOR(SRCS
|
||||
set(LXQT_QT_VERSION "5")
|
||||
|
||||
# KF5WindowSystem is missing here. KF5WindowSystem doesn't provide an .pc file.
|
||||
-set(LXQT_PKG_CONFIG_REQUIRES "Qt5Xdg >= 1.2.0, Qt5Widgets, Qt5Xml, Qt5DBus, Qt5X11Extras")
|
||||
+set(LXQT_PKG_CONFIG_REQUIRES "Qt5Xdg >= 1.2.0, Qt5Widgets, Qt5Xml, Qt5DBus")
|
||||
|
||||
|
||||
# Standard directories for installation
|
||||
@@ -288,7 +287,6 @@ target_link_libraries(${LXQT_LIBRARY_NAME}
|
||||
KF5::WindowSystem
|
||||
Qt5::Widgets
|
||||
Qt5::DBus
|
||||
- Qt5::X11Extras
|
||||
Qt5Xdg
|
||||
)
|
||||
|
||||
diff --git a/cmake/lxqt-config.cmake.in b/cmake/lxqt-config.cmake.in
|
||||
index 944155c..52cda1b 100644
|
||||
--- a/cmake/lxqt-config.cmake.in
|
||||
+++ b/cmake/lxqt-config.cmake.in
|
||||
@@ -56,7 +56,6 @@ list(APPEND CMAKE_MODULE_PATH "${LXQT_CMAKE_MODULES_DIR}")
|
||||
|
||||
find_dependency(Qt5Widgets)
|
||||
find_dependency(Qt5DBus)
|
||||
-find_dependency(Qt5X11Extras)
|
||||
find_dependency(Qt5LinguistTools)
|
||||
find_dependency(Qt5Xdg)
|
||||
find_dependency(KF5WindowSystem)
|
||||
--
|
||||
1.9.3
|
||||
|
||||
@@ -2,14 +2,20 @@ SUMMARY = "Core utility library for all LXQt components"
|
||||
LICENSE = "LGPLv2.1"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=435ed639f84d4585d93824e7da3d85da"
|
||||
|
||||
inherit lxqt cmake_lib
|
||||
inherit lxqt cmake_lib distro_features_check
|
||||
|
||||
DEPENDS += "libqtxdg kwindowsystem"
|
||||
SRC_URI += "file://0001-remove-Qt5X11Extras-dependency-it-is-not-required.patch"
|
||||
REQUIRED_DISTRO_FEATURES = "x11"
|
||||
|
||||
SRCREV = "3cf7384336628043971e6f43df8573563c8a6129"
|
||||
PV = "0.10.0"
|
||||
DEPENDS += "libqtxdg kwindowsystem libxscrnsaver"
|
||||
|
||||
EXTRA_OECMAKE += "-DCMAKE_INSTALL_DATAROOTDIR=share -DLXQT_ETC_XDG_DIR=${sysconfdir}/xdg"
|
||||
SRCREV = "24c1c943b87ffc4492ca0db1747691534ce3e77e"
|
||||
PV = "0.11.0"
|
||||
|
||||
EXTRA_OECMAKE += " \
|
||||
-DPULL_TRANSLATIONS=Off \
|
||||
-DCLEAN_TRANSLATIONS=Off \
|
||||
-DCMAKE_INSTALL_DATAROOTDIR=share \
|
||||
-DLXQT_ETC_XDG_DIR=${sysconfdir}/xdg \
|
||||
"
|
||||
|
||||
CMAKE_ALIGN_SYSROOT[1] = "lxqt, -S${datadir}/cmake, -S${STAGING_DATADIR}/cmake"
|
||||
|
||||
Reference in New Issue
Block a user