zepto-forks/meta-qt5-extra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

liblxqt: update to latest sources

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
2015-07-24 16:15:30 +02:00
parent fc838ce8ba
commit 343004e715
2 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
recipes-lxqt/liblxqt/files/0001-remove-Qt5X11Extras-dependency-it-is-not-required.patch
View File

@@ -1,6 +1,6 @@
From 4afe7826aa00727ee333100870679155b1e01f72 Mon Sep 17 00:00:00 2001
From e26d2f89d4eb2030fb23b1a54ee6fd92dd1c2c8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Sun, 31 May 2015 00:48:29 +0200
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
@@ -12,51 +12,51 @@ Upstream-Status: Inappropriate [configuration]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
CMakeLists.txt | 4 +---
cmake/lxqt_use.cmake.in | 1 -
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 8adf523..692ca83 100644
index 4725834..122b5fd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -136,7 +136,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(CMAKE_AUTOMOC ON)
@@ -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)
@@ -157,7 +156,7 @@ QT5_ADD_DBUS_ADAPTOR(SRCS
@@ -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 "Qt5Widgets Qt5Xml Qt5DBus Qt5X11Extras")
+set(LXQT_PKG_CONFIG_REQUIRES "Qt5Widgets Qt5Xml Qt5DBus")
-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")
include(${QTXDG_USE_FILE})
@@ -310,7 +309,6 @@ target_link_libraries(${LXQT_LIBRARY_NAME}
KF5::WindowSystem
Qt5::Widgets
Qt5::DBus
- Qt5::X11Extras
${QTXDG_LIBRARIES}
# 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_use.cmake.in b/cmake/lxqt_use.cmake.in
index 55df65e..be5d634 100644
--- a/cmake/lxqt_use.cmake.in
+++ b/cmake/lxqt_use.cmake.in
@@ -56,7 +56,6 @@ if (LXQT_QT_VERSION EQUAL "4")
elseif(LXQT_QT_VERSION EQUAL "5")
find_package(Qt5Widgets REQUIRED QUIET)
find_package(Qt5DBus REQUIRED QUIET)
- find_package(Qt5X11Extras REQUIRED QUIET)
find_package(Qt5LinguistTools REQUIRED QUIET)
find_package(Qt5Xdg REQUIRED)
find_package(KF5WindowSystem REQUIRED QUIET)
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

4
recipes-lxqt/liblxqt/liblxqt_git.bb
View File

@@ -7,8 +7,8 @@ inherit lxqt cmake-lib
DEPENDS += "libqtxdg kwindowsystem"
SRC_URI += "file://0001-remove-Qt5X11Extras-dependency-it-is-not-required.patch"
SRCREV = "64d1e6c1076aea2783138e9d5ce4bb30b58c77b4"
PV = "0.9.0"
SRCREV = "8fcfb6f5ed33b437f0e17f0bece46c6467ab4085"
PV = "0.9.0+git${SRCPV}"
EXTRA_OECMAKE += "-DCMAKE_INSTALL_DATAROOTDIR=share -DLXQT_ETC_XDG_DIR=${sysconfdir}/xdg"