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

kde-extra-cmake-modules: rename to extra-cmake-modules and bump to latest revision

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
2014-05-08 23:30:36 +02:00
parent 65fe36ea27
commit 25c60c2d8a
3 changed files with 3 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
recipes-kde/kde-extra-cmake-modules/kde-extra-cmake-modules_git.bb → recipes-kde/extra-cmake-modules/extra-cmake-modules_git.bb
View File

@@ -6,10 +6,9 @@ inherit cmake
SRC_URI = " \
git://anongit.kde.org/extra-cmake-modules;protocol=git \
file://0001-do-not-use-KDE-default-dirs.patch \
"
SRCREV = "6e5dd4943be1200f9f7f6620d69f140428abff45"
PV = "0.0.9+git${SRCPV}"
SRCREV = "dea1b8759f37d1462236ddd43ee9dfb47670817a"
PV = "0.0.13+git${SRCPV}"
S = "${WORKDIR}/git"

2
recipes-kde/karchive/karchive_git.bb
View File

@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \
inherit cmake_qt5
DEPENDS = "qtbase kde-extra-cmake-modules-native bzip2 xz"
DEPENDS = "qtbase extra-cmake-modules-native bzip2 xz"
SRC_URI = " \
git://anongit.kde.org/karchive;protocol=git;branch=master \

44
recipes-kde/kde-extra-cmake-modules/files/0001-do-not-use-KDE-default-dirs.patch
View File

@@ -1,44 +0,0 @@
From d615eebbf57c1715bf0d16924c0e973b567b06da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Tue, 14 Jan 2014 16:36:53 +0100
Subject: [PATCH] do not use KDE default dirs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
kde-modules/KDEInstallDirs.cmake | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
index 838a523..2bf438b 100644
--- a/kde-modules/KDEInstallDirs.cmake
+++ b/kde-modules/KDEInstallDirs.cmake
@@ -17,7 +17,7 @@
# LOCALE_INSTALL_DIR - the directory where translations will be installed
# MAN_INSTALL_DIR - the directory where man pages will be installed (default prefix/man/)
# QT_PLUGIN_INSTALL_DIR - the directory where Qt plugins will be installed (default is {LIB_INSTALL_DIR}/plugins)
-# PLUGIN_INSTALL_DIR - the directory where KDE plugins will be installed (default is ${QT_PLUGIN_INSTALL_DIR}/kf5)
+# PLUGIN_INSTALL_DIR - the directory where KDE plugins will be installed (default is ${QT_PLUGIN_INSTALL_DIR})
# IMPORTS_INSTALL_DIR - the directory where QML imports will be installed (default is ${QT_PLUGIN_INSTALL_DIR}/imports)
# QML_INSTALL_DIR - the directory where QML2 imports will be installed (default is ${LIB_INSTALL_DIR}/qml)
# SERVICES_INSTALL_DIR - the directory where service (desktop, protocol, ...) files will be installed
@@ -128,10 +128,10 @@ if(WIN32)
else()
_set_fancy(LIBEXEC_INSTALL_DIR "${LIB_INSTALL_DIR}/kde5/libexec" "The install dir for libexec executables (default is ${LIB_INSTALL_DIR}/kde5/libexec)")
endif()
-_set_fancy(INCLUDE_INSTALL_DIR "include/KF5" "The install dir for header files")
+_set_fancy(INCLUDE_INSTALL_DIR "include" "The install dir for header files")
_set_fancy(QT_PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/plugins" "The install dir where Qt plugins will be installed (default is ${LIB_INSTALL_DIR}/plugins)")
-_set_fancy(PLUGIN_INSTALL_DIR "${QT_PLUGIN_INSTALL_DIR}/kf5" "The install dir where plugins (loaded via KPluginLoader) will be installed (default is ${LIB_INSTALL_DIR}/plugins/kf5)")
+_set_fancy(PLUGIN_INSTALL_DIR "${QT_PLUGIN_INSTALL_DIR}" "The install dir where plugins (loaded via KPluginLoader) will be installed (default is ${LIB_INSTALL_DIR}/plugins)")
_set_fancy(IMPORTS_INSTALL_DIR "${QT_PLUGIN_INSTALL_DIR}/imports" "The install dir where QtQuick1 imports will be installed")
_set_fancy(QML_INSTALL_DIR "${LIB_INSTALL_DIR}/qml" "The install dir where QtQuick2 imports will be installed")
_set_fancy(CMAKECONFIG_INSTALL_PREFIX "${LIB_INSTALL_DIR}/cmake" "The prefix under which packages will create their own subdirectory for their CMake configuration files")
--
1.8.3.1