quick backup commit - take time for commit messages later
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
@@ -1,14 +0,0 @@
|
||||
EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=Release"
|
||||
|
||||
# REVISIT: dirty hack to avoid libraries using me to fail at configuraton/compilation
|
||||
do_install_append() {
|
||||
# libpath
|
||||
for file in $(find ${D}${libdir}/cmake -name '*Targets-release.cmake') ; do
|
||||
sed -i 's:\"${libdir}:\"${STAGING_DIR_TARGET}${libdir}:' $file
|
||||
done
|
||||
# incpath
|
||||
for file in $(find ${D}${libdir}/cmake -name '*Targets.cmake') ; do
|
||||
sed -i 's:INTERFACE_INCLUDE_DIRECTORIES \":INTERFACE_INCLUDE_DIRECTORIES \"${STAGING_DIR_TARGET}:' $file
|
||||
done
|
||||
|
||||
}
|
||||
17
classes/kde.bbclass
Normal file
17
classes/kde.bbclass
Normal file
@@ -0,0 +1,17 @@
|
||||
KDE_BRANCH ?= "master"
|
||||
|
||||
SRC_URI = "git://anongit.kde.org/${BPN};protocol=git;branch=${KDE_BRANCH}"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
DEPENDS += "qtbase extra-cmake-modules-native"
|
||||
|
||||
# extra-cmake-modules cause dependent to check for python
|
||||
inherit cmake_qt5 pythonnative
|
||||
|
||||
FILES_${PN} += "${libdir}/plugins/kf5"
|
||||
FILES_${PN}-dev += "${libdir}/cmake"
|
||||
FILES_${PN}-dbg += "${libdir}/plugins/kf5/.debug"
|
||||
|
||||
EXTRA_OECMAKE += "-DECM_MKSPECS_INSTALL_DIR=${libdir}/${QT_DIR_NAME}/mkspecs/modules"
|
||||
FILES_${PN}-dev += "${libdir}/${QT_DIR_NAME}/mkspecs"
|
||||
@@ -1,43 +0,0 @@
|
||||
From 62881dca93f20e3381cc3292b9e887b889bcd46e Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Mon, 13 Jan 2014 13:58:15 +0100
|
||||
Subject: [PATCH 2/2] greenislandcompositor: fix build
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
src/libgreenisland/greenislandcompositor.cpp | 2 +-
|
||||
src/libgreenisland/greenislandcompositor.h | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/libgreenisland/greenislandcompositor.cpp b/src/libgreenisland/greenislandcompositor.cpp
|
||||
index 2f1e7ed..5324a4d 100644
|
||||
--- a/src/libgreenisland/greenislandcompositor.cpp
|
||||
+++ b/src/libgreenisland/greenislandcompositor.cpp
|
||||
@@ -147,7 +147,7 @@ void CompositorPrivate::_q_shellAboutToClose()
|
||||
* Compositor
|
||||
*/
|
||||
|
||||
-Compositor::Compositor(const char *socketName, ExtensionFlags extensions)
|
||||
+Compositor::Compositor(const char *socketName, ExtensionFlag extensions)
|
||||
: QWaylandCompositor(this, socketName, extensions)
|
||||
, d_ptr(new CompositorPrivate(this))
|
||||
{
|
||||
diff --git a/src/libgreenisland/greenislandcompositor.h b/src/libgreenisland/greenislandcompositor.h
|
||||
index d273aa8..791e549 100644
|
||||
--- a/src/libgreenisland/greenislandcompositor.h
|
||||
+++ b/src/libgreenisland/greenislandcompositor.h
|
||||
@@ -62,7 +62,7 @@ public:
|
||||
};
|
||||
|
||||
explicit Compositor(const char *socketName = 0,
|
||||
- ExtensionFlags extensions = DefaultExtensions | SubSurfaceExtension);
|
||||
+ ExtensionFlag extensions = DefaultExtensions | SubSurfaceExtension);
|
||||
~Compositor();
|
||||
|
||||
State state() const;
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
@@ -2,16 +2,13 @@ DESCRIPTION = "Support library to make Qt-based Wayland compositors development
|
||||
LICENSE = "LGPLv2.1"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c"
|
||||
|
||||
inherit cmake_qt5 hawaii-target
|
||||
inherit kde pkgconfig
|
||||
|
||||
DEPENDS = "qtbase qtdeclarative qtwayland"
|
||||
DEPENDS = "qtbase qtdeclarative qtwayland extra-cmake-modules-native ki18n"
|
||||
|
||||
SRC_URI = " \
|
||||
git://github.com/mauios/${BPN}.git;protocol=git;branch=dev \
|
||||
file://0001-greenislandcompositor-fix-build.patch \
|
||||
"
|
||||
SRCREV = "0fe1296b51ac6633c7c5072c8ed2f74556e4b96e"
|
||||
PV = "0.2.90+git${SRCPV}"
|
||||
SRC_URI = "git://github.com/mauios/${BPN}.git;protocol=git;branch=master"
|
||||
SRCREV = "0fa9de031987630b2abde5290bac72322d20340b"
|
||||
PV = "0.5.90+git${SRCPV}"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ DESCRIPTION = "Library shared among Hawaii Shell and other applications"
|
||||
LICENSE = "LGPLv2.1"
|
||||
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4b54a1fd55a448865a0b32d41598759d"
|
||||
|
||||
inherit cmake_qt5 hawaii-target
|
||||
inherit cmake_qt5 cmake-lib
|
||||
|
||||
DEPENDS = "qtbase qtdeclarative extra-cmake-modules-native"
|
||||
|
||||
@@ -12,6 +12,8 @@ PV = "0.2.90+git${SRCPV}"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
CMAKE_HIDE_ERROR[dir1] = "Hawaii/HawaiiTargets.cmake, -cccoutforoe filecheckloop"
|
||||
|
||||
FILES_${PN} += "${libdir}/hawaii"
|
||||
FILES_${PN}-dev += "${libdir}/cmake"
|
||||
FILES_${PN}-dbg += "${libdir}/hawaii/qml/Hawaii/Shell/Applications/.debug ${libdir}/hawaii/qml/Hawaii/Shell/Core/.debug"
|
||||
|
||||
@@ -2,7 +2,7 @@ DESCRIPTION = "Qt-style API to use freedesktop.org's AccountsService DBus servic
|
||||
LICENSE = "LGPLv2.1"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c"
|
||||
|
||||
inherit cmake_qt5 pkgconfig hawaii-target
|
||||
inherit cmake_qt5 pkgconfig
|
||||
|
||||
DEPENDS = "qtbase qtdeclarative"
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \
|
||||
file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c \
|
||||
"
|
||||
|
||||
inherit cmake_qt5 pkgconfig hawaii-target
|
||||
inherit cmake_qt5 pkgconfig cmake-lib
|
||||
|
||||
DEPENDS = "qtbase qtdeclarative dconf"
|
||||
|
||||
@@ -17,6 +17,10 @@ PV = "0.3.0+git${SRCPV}"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
CMAKE_HIDE_ERROR[dir1] = "QtConfiguration/QtConfigurationTargets.cmake, -cccoutforoe filecheckloop"
|
||||
|
||||
FILES_${PN} += "${libdir}/hawaii/qml/Hawaii/Configuration"
|
||||
FILES_${PN}-dbg += "${libdir}/hawaii/qml/Hawaii/Configuration/.debug"
|
||||
FILES_${PN}-dev += "${libdir}/cmake"
|
||||
|
||||
|
||||
|
||||
@@ -5,17 +5,14 @@ LIC_FILES_CHKSUM = " \
|
||||
file://COPYING.LIB;md5=4b54a1fd55a448865a0b32d41598759d \
|
||||
"
|
||||
|
||||
inherit cmake_qt5 systemd
|
||||
inherit cmake_qt5 systemd cmake-lib
|
||||
|
||||
DEPENDS = "qtbase qtdeclarative qtwayland qtwayland-native qtscript libhawaii fluid greenisland polkit-qt-1 qtconfiguration qtaccountsservice pixman wayland weston systemd alsa-lib"
|
||||
RRECOMMENDS_${PN} += "hawaii-wallpapers"
|
||||
|
||||
SRC_URI = " \
|
||||
git://github.com/mauios/${BPN}.git;protocol=git;branch=dev \
|
||||
file://0001-GetGitRevision.cmake-call-git-directly-it-is-not-fou.patch \
|
||||
"
|
||||
SRCREV = "2edcfa2c2118104367429c317e848e59f4b033e2"
|
||||
PV = "0.2.90+git${SRCPV}"
|
||||
SRC_URI = "git://github.com/mauios/${BPN}.git;protocol=git;branch=master"
|
||||
SRCREV = "55bb4e9f5b861eff7e552cc27b61969fb1f7b728"
|
||||
PV = "0.5.90"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
@@ -26,6 +23,8 @@ EXTRA_OECMAKE += " \
|
||||
-DADDITIONAL_PATH=${bindir}/${QT_DIR_NAME} \
|
||||
"
|
||||
|
||||
CMAKE_HIDE_ERROR[dir1] = "HawaiiShell/HawaiiShellTargets.cmake, -cccoutforoe filecheckloop"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/hawaii \
|
||||
${datadir}/wayland-sessions \
|
||||
|
||||
@@ -7,11 +7,11 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
inherit cmake_qt5
|
||||
|
||||
DEPENDS = "qtbase qtdeclarative qtquickcontrols polkit-qt-1 qtconfiguration libhawaii qtaccountsservice qttools-native extra-cmake-modules-native"
|
||||
DEPENDS = "qtbase qtdeclarative qtquickcontrols polkit-qt-1 qtconfiguration libhawaii hawaii-shell qtaccountsservice qttools-native extra-cmake-modules-native"
|
||||
|
||||
SRC_URI = "git://github.com/mauios/${BPN}.git;protocol=git;branch=dev"
|
||||
SRCREV = "71e2f960ad254e065c2c10fe034443ca34bb9bd4"
|
||||
PV = "0.2.0.git${SRCPV}"
|
||||
SRC_URI = "git://github.com/mauios/${BPN}.git;protocol=git;branch=master"
|
||||
SRCREV = "4f7aaed8fe5ace9d5efcdec160c963ff101c845f"
|
||||
PV = "0.3.0.git${SRCPV}"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
|
||||
@@ -2,16 +2,15 @@ DESCRIPTION = "Extra modules and scripts for CMake"
|
||||
LICENSE = "BSD"
|
||||
LIC_FILES_CHKSUM = "file://COPYING-CMAKE-SCRIPTS;md5=54c7042be62e169199200bc6477f04d1"
|
||||
|
||||
inherit cmake
|
||||
inherit cmake_qt5
|
||||
|
||||
SRC_URI = " \
|
||||
git://anongit.kde.org/extra-cmake-modules;protocol=git \
|
||||
"
|
||||
SRCREV = "dea1b8759f37d1462236ddd43ee9dfb47670817a"
|
||||
PV = "0.0.13+git${SRCPV}"
|
||||
SRC_URI = "git://anongit.kde.org/extra-cmake-modules;protocol=git"
|
||||
|
||||
SRCREV = "7e535b93cdbb7420d241c00cb9c0abf462ff59d8"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
BBCLASSEXTEND = "native"
|
||||
DEPENDS = "qttools-native"
|
||||
|
||||
FILES_${PN} += "${datadir}/ECM"
|
||||
|
||||
BBCLASSEXTEND = "native"
|
||||
@@ -16,13 +16,10 @@ SRC_URI = " \
|
||||
SRCREV = "f7901cf4201a603fef641d6266578c9447f7d40b"
|
||||
PV = "4.95.0+git${SRCPV}"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
EXTRA_OECMAKE += " \
|
||||
-DQt5LinguistTools_DIR=${STAGING_LIBDIR_NATIVE}/cmake/Qt5LinguistTools \
|
||||
-DCMAKE_INSTALL_PREFIX=${prefix}"
|
||||
|
||||
FILES_${PN}-dev += " \
|
||||
${libdir}/cmake \
|
||||
${libdir}/qt5 \
|
||||
"
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
From 87a5d75ec4e9a804850bd8e2b3a69e364a9603fc Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Wed, 15 Jan 2014 23:10:05 +0100
|
||||
Subject: [PATCH] set mkspec path as set in meta-qt5
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [config]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
src/CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 683a5b9..2cf079a 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -111,7 +111,7 @@ QT.@PRI_TARGET_BASENAME@.depends = @PRI_TARGET_QTDEPS@"
|
||||
|
||||
# This default value makes "installing qt and kf5 into the same prefix" work out of the box.
|
||||
# Packagers who use -DCMAKE_INSTALL_PREFIX=/usr will certainly want to set ECM_MKSPECS_INSTALL_DIR to something like share/qt5/mkspecs/modules
|
||||
-set(ECM_MKSPECS_INSTALL_DIR mkspecs/modules CACHE PATH "The directory where mkspecs will be installed to.")
|
||||
+set(ECM_MKSPECS_INSTALL_DIR lib/qt5/mkspecs/modules CACHE PATH "The directory where mkspecs will be installed to.")
|
||||
|
||||
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qt_${PRI_TARGET_BASENAME}.pri DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
|
||||
#### end of qmake support
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
14
recipes-kde/ki18n/ki18n_5.5.0.bb
Normal file
14
recipes-kde/ki18n/ki18n_5.5.0.bb
Normal file
@@ -0,0 +1,14 @@
|
||||
DESCRIPTION = "Reading, creating, and manipulating file archives"
|
||||
LICENSE = "BSD & LGPLv2.1"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://COPYING-CMAKE-SCRIPTS;md5=3775480a712fc46a69647678acb234cb \
|
||||
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
|
||||
"
|
||||
|
||||
inherit kde cmake-lib
|
||||
|
||||
CMAKE_HIDE_ERROR[dir1] = "KF5I18n/KF5I18nTargets.cmake, -cccoutforoe filecheckloop"
|
||||
|
||||
DEPENDS += "qtscript"
|
||||
|
||||
SRCREV = "0e762b47c1132e311d200d3d7e9b3e6c37750aa6"
|
||||
@@ -0,0 +1,31 @@
|
||||
From 87a5d75ec4e9a804850bd8e2b3a69e364a9603fc Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Wed, 15 Jan 2014 23:10:05 +0100
|
||||
Subject: [PATCH] set mkspec path as set in meta-qt5
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [config]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
src/CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 683a5b9..2cf079a 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -111,7 +111,7 @@ QT.@PRI_TARGET_BASENAME@.depends = @PRI_TARGET_QTDEPS@"
|
||||
|
||||
# This default value makes "installing qt and kf5 into the same prefix" work out of the box.
|
||||
# Packagers who use -DCMAKE_INSTALL_PREFIX=/usr will certainly want to set ECM_MKSPECS_INSTALL_DIR to something like share/qt5/mkspecs/modules
|
||||
-set(ECM_MKSPECS_INSTALL_DIR mkspecs/modules CACHE PATH "The directory where mkspecs will be installed to.")
|
||||
+set(ECM_MKSPECS_INSTALL_DIR lib/qt5/mkspecs/modules CACHE PATH "The directory where mkspecs will be installed to.")
|
||||
|
||||
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qt_${PRI_TARGET_BASENAME}.pri DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
|
||||
#### end of qmake support
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
15
recipes-kde/kservice/kservice_5.5.0.bb
Normal file
15
recipes-kde/kservice/kservice_5.5.0.bb
Normal file
@@ -0,0 +1,15 @@
|
||||
DESCRIPTION = "Reading, creating, and manipulating file archives"
|
||||
LICENSE = "BSD & LGPLv2.1"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://COPYING-CMAKE-SCRIPTS;md5=3775480a712fc46a69647678acb234cb \
|
||||
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
|
||||
"
|
||||
|
||||
inherit kde
|
||||
#cmake-lib
|
||||
|
||||
#CMAKE_HIDE_ERROR[dir1] = "KF5I18n/KF5I18nTargets.cmake, -cccoutforoe filecheckloop"
|
||||
|
||||
#DEPENDS += "qtscript"
|
||||
|
||||
SRCREV = "91311e0b348f73713b5b2d5721c46b75207a5a7b"
|
||||
@@ -0,0 +1,39 @@
|
||||
From 1949fa04bef188d67f655cca13c4f8adb7f2c991 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Fri, 21 Nov 2014 08:39:28 +0100
|
||||
Subject: [PATCH] CMakeLists.txt: add pkg-config as fallback for Wayland
|
||||
lacking cmake-files
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
fixes:
|
||||
|
||||
| -- The following REQUIRED packages have not been found:
|
||||
|
|
||||
| * Wayland (required version >= 1.3) , C library implementation of the Wayland protocol: a protocol for a compositor to talk to its clients , <http://wayland.freedesktop.org>
|
||||
|
||||
Upstream-Status: Submitted [1]
|
||||
|
||||
[1] https://bugs.kde.org/show_bug.cgi?id=341149
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
CMakeLists.txt | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index b981b66..340c123 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -28,6 +28,7 @@ ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KWAYLAND
|
||||
set(REQUIRED_QT_VERSION 5.3.0)
|
||||
find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui)
|
||||
|
||||
+find_package(PkgConfig)
|
||||
find_package(Wayland 1.3 COMPONENTS Client Server)
|
||||
set_package_properties(Wayland PROPERTIES
|
||||
TYPE REQUIRED
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
1
recipes-kde/kwayland/files/KF5WaylandTargetSnippet
Normal file
1
recipes-kde/kwayland/files/KF5WaylandTargetSnippet
Normal file
@@ -0,0 +1 @@
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${includedir}/KF5/KWayland/Client;${includedir}/KF5;${includedir}/KF5"
|
||||
20
recipes-kde/kwayland/kwayland_git.bb
Normal file
20
recipes-kde/kwayland/kwayland_git.bb
Normal file
@@ -0,0 +1,20 @@
|
||||
DESCRIPTION = "Reading, creating, and manipulating file archives"
|
||||
LICENSE = "LGPLv2.1"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
|
||||
"
|
||||
|
||||
inherit kde cmake-lib
|
||||
|
||||
SRC_URI += " \
|
||||
file://0001-CMakeLists.txt-add-pkg-config-as-fallback-for-Waylan.patch \
|
||||
"
|
||||
SRCREV = "fe9ba06a103015b6964c1f4ed322b78bf41acaec"
|
||||
PV = "5.1.90+git${SRCPV}"
|
||||
|
||||
DEPENDS += "wayland wayland-native"
|
||||
|
||||
CMAKE_HIDE_ERROR[dir1] = "KF5Wayland/KF5WaylandTargets.cmake, -cccoutforoe filecheckloop"
|
||||
CMAKE_HIDE_ERROR[dir2] = "KF5Wayland/KF5WaylandTargets.cmake, -S${includedir}/KF5/KWayland/Client;${includedir}/KF5;${includedir}/KF5, -S${includedir}, -S${STAGING_INCDIR}"
|
||||
|
||||
|
||||
@@ -0,0 +1,91 @@
|
||||
From 5df7b81d8908f5d745d248d859d14a482637808a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Fri, 21 Nov 2014 09:25:11 +0100
|
||||
Subject: [PATCH] fix configuration on x-less systems
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
CMakeLists.txt | 31 +++++++++++++++----------------
|
||||
backends/CMakeLists.txt | 9 +++++----
|
||||
2 files changed, 20 insertions(+), 20 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 93c1f1e..4d9387b 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -14,9 +14,6 @@ include(ECMGenerateHeaders)
|
||||
include(FeatureSummary)
|
||||
include(CheckCXXCompilerFlag)
|
||||
|
||||
-set(REQUIRED_QT_VERSION 5.2.0)
|
||||
-find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core Gui Test X11Extras)
|
||||
-
|
||||
find_package(Wayland 1.2 COMPONENTS Client Cursor)
|
||||
set_package_properties(Wayland PROPERTIES
|
||||
TYPE OPTIONAL
|
||||
@@ -30,25 +27,27 @@ set_package_properties(KF5Wayland PROPERTIES
|
||||
)
|
||||
add_feature_info("KF5Wayland" KF5Wayland_FOUND "Required for building libkscreen's Wayland backend")
|
||||
|
||||
+set(REQUIRED_QT_VERSION 5.2.0)
|
||||
if(Wayland_Client_FOUND AND KF5Wayland_FOUND)
|
||||
+ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core Gui Test)
|
||||
set(ENABLE_WAYLAND TRUE)
|
||||
else()
|
||||
+ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core Gui Test X11Extras)
|
||||
set(ENABLE_WAYLAND FALSE)
|
||||
+ find_package(XCB COMPONENTS XCB RANDR)
|
||||
+ set_package_properties(XCB PROPERTIES
|
||||
+ TYPE OPTIONAL
|
||||
+ PURPOSE "Required for building XRandR 1.1 backend"
|
||||
+ )
|
||||
+
|
||||
+ find_package(X11)
|
||||
+ set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
|
||||
+ URL "http://www.x.org"
|
||||
+ TYPE OPTIONAL
|
||||
+ PURPOSE "Required for building XRandR 1.2 backend"
|
||||
+ )
|
||||
endif()
|
||||
|
||||
-find_package(XCB COMPONENTS XCB RANDR)
|
||||
-set_package_properties(XCB PROPERTIES
|
||||
- TYPE OPTIONAL
|
||||
- PURPOSE "Required for building XRandR 1.1 backend"
|
||||
-)
|
||||
-
|
||||
-find_package(X11)
|
||||
-set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
|
||||
- URL "http://www.x.org"
|
||||
- TYPE OPTIONAL
|
||||
- PURPOSE "Required for building XRandR 1.2 backend"
|
||||
-)
|
||||
-
|
||||
set(KF5_VERSION "5.0.91") #When we are happy with the api, we can sync with frameworks
|
||||
ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KSCREEN
|
||||
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kscreen_version.h"
|
||||
diff --git a/backends/CMakeLists.txt b/backends/CMakeLists.txt
|
||||
index ba0cc74..a4e0faa 100644
|
||||
--- a/backends/CMakeLists.txt
|
||||
+++ b/backends/CMakeLists.txt
|
||||
@@ -6,9 +6,10 @@ if(ENABLE_WAYLAND)
|
||||
add_subdirectory(wayland)
|
||||
else()
|
||||
message(STATUS "Not building Wayland backend")
|
||||
+ add_subdirectory(xrandr)
|
||||
+ # if (XCB_FOUND AND X11_XCB_FOUND)
|
||||
+ add_subdirectory(xrandr1.1)
|
||||
+ # endif(XCB_FOUND AND X11_XCB_FOUND)
|
||||
endif()
|
||||
|
||||
-add_subdirectory(xrandr)
|
||||
-# if (XCB_FOUND AND X11_XCB_FOUND)
|
||||
- add_subdirectory(xrandr1.1)
|
||||
-# endif(XCB_FOUND AND X11_XCB_FOUND)
|
||||
+
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
22
recipes-kde/libkscreen/libkscreen_5.1.1.bb
Normal file
22
recipes-kde/libkscreen/libkscreen_5.1.1.bb
Normal file
@@ -0,0 +1,22 @@
|
||||
DESCRIPTION = "Reading, creating, and manipulating file archives"
|
||||
LICENSE = "GPLv2"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
||||
file://COPYING.LIB;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
||||
"
|
||||
|
||||
KDE_BRANCH = "${@base_contains("DISTRO_FEATURES", "wayland", "sebas/wayland", "Plasma/5.1",d)}"
|
||||
SRCREV = "${@base_contains("DISTRO_FEATURES", "wayland", "7927dea10f9435cc39addfa9e7920c8ec0bc7d6e", "be5d2aed3cbfd7bef9741a8aa6f52a0eadb04b19",d)}"
|
||||
inherit kde
|
||||
|
||||
SRC_URI += "file://0001-fix-configuration-on-x-less-systems.patch"
|
||||
|
||||
DEPENDS += "${@base_contains("DISTRO_FEATURES", "wayland", "kwayland", "qtx11extras", d)}"
|
||||
|
||||
#cmake-lib
|
||||
|
||||
#CMAKE_HIDE_ERROR[dir1] = "KF5I18n/KF5I18nTargets.cmake, -cccoutforoe filecheckloop"
|
||||
|
||||
#DEPENDS += "qtscript"
|
||||
|
||||
|
||||
@@ -2,25 +2,11 @@ DESCRIPTION = "PolicyKit Qt wrapper"
|
||||
LICENSE = "LGPLv2.1"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=7dbc59dc445b2261c4fb2f9466e3446a"
|
||||
|
||||
inherit cmake_qt5 hawaii-target
|
||||
inherit kde cmake-lib
|
||||
|
||||
DEPENDS = "qtbase polkit glib-2.0 extra-cmake-modules-native"
|
||||
CMAKE_HIDE_ERROR[dir1] = "PolkitQt5-1/PolkitQt5-1Targets.cmake, -cccoutforoe filecheckloop"
|
||||
|
||||
SRC_URI = "git://anongit.kde.org/polkit-qt-1.git;protocol=git;branch=master"
|
||||
SRCREV = "bac771e69887c9253f2b0973f6310810db0061f8"
|
||||
PV = "0.103.0+git${SRCPV}"
|
||||
DEPENDS+ = "polkit glib-2.0"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
EXTRA_OECMAKE += "-DLIB_INSTALL_DIR=${libdir}"
|
||||
|
||||
# REVISIT: dirty hack to avoid libraries using me to fail at configuraton/compilation
|
||||
do_install_append() {
|
||||
# libpath
|
||||
for file in $(find ${D}${libdir}/cmake -name '*Config.cmake') ; do
|
||||
sed -i 's:\"${libdir}:\"${STAGING_DIR_TARGET}${libdir}:' $file
|
||||
sed -i 's:\"include/polkit-qt5-1:\"${STAGING_DIR_TARGET}/usr/include/polkit-qt5-1:' $file
|
||||
done
|
||||
}
|
||||
|
||||
FILES_${PN}-dev += "${libdir}/cmake"
|
||||
SRCREV = "40afa675bfa4cacd95487ce8b0544654c5f34e21"
|
||||
PV = "0.112.0+git${SRCPV}"
|
||||
|
||||
Reference in New Issue
Block a user