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

kde-kf5: remove cross cmake-lib usages

Browse Source 
With oe-core's:
commit c03b32bd71dbe04f2f239556fea0b53215e403d7
Author: Thomas Witt <Thomas.Witt@bmw.de>
Date:   Mon Aug 22 16:27:11 2016 +0200

    cmake.bbclass: call cmake with a relative path

    CMake wants a relative path for CMAKE_INSTALL_*DIR, an absolute path
    breaks cross-compilation. This fact is documented in the following
    ticket: https://cmake.org/Bug/view.php?id=14367

    $sysconfdir and $localstatedir are not relative to $prefix, so they are
    still set as absolute paths. With his change ${PROJECT}Targets.cmake
    that are generated by cmakes "export" function will contain relative
    paths instead of absolute ones.

    Signed-off-by: Thomas Witt <Thomas.Witt@bmw.de>
    Signed-off-by: Clemens Lang <clemens.lang@bmw-carit.de>
    Signed-off-by: Ross Burton <ross.burton@intel.com>

the hacky sysroot replacements are no more necessary.

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
2016-08-30 18:31:43 +02:00
parent 81162a93a1
commit 73bf6f0742
65 changed files with 63 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
recipes-kde/kf5/porting-aids-tier1/kjs/kjs.bb
View File

@@ -1,9 +1,3 @@
require ${BPN}.inc
inherit cmake-lib
DEPENDS += "${BPN}-native libpcre"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5JS, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5JS, -S${includedir}, -S${STAGING_INCDIR}"

6
recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb
View File

@@ -46,12 +46,8 @@ do_configure_append() {
sed -i 's:${STAGING_LIBDIR_NATIVE}:${libdir}:g' ${B}/src/config-kstandarddirs.h
}
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KDELibs4, -S${includedir}, -S${STAGING_INCDIR}"
CMAKE_ALIGN_SYSROOT[2] = "KDELibs4, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
# native executables
CMAKE_ALIGN_SYSROOT[3] = "KF5KDELibs4Support, -S${bindir}, -S${STAGING_BINDIR_NATIVE}"
CMAKE_ALIGN_SYSROOT[1] = "KF5KDELibs4Support, -S${bindir}, -S${STAGING_BINDIR_NATIVE}"
FILES_${PN} += " \
${datadir}/k*5 \

5
recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb
View File

@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = " \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
"
inherit kde-kf5-porting-aids cmake-lib perlnative
inherit kde-kf5-porting-aids perlnative
DEPENDS += " \
karchive \
@@ -35,9 +35,6 @@ PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "e9b1763b2649d7e21e6cda3e0c5773bf"
SRC_URI[sha256sum] = "95af84cde953f9ddbff9e6237e7ac395877f0e8b753f8c5473070ecd1329ad5e"
CMAKE_ALIGN_SYSROOT[1] = "KF5KHtml, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5KHtml, -S${includedir}, -S${STAGING_INCDIR}"
FILES_${PN} += " \
${datadir}/k*5 \
${OE_QMAKE_PATH_PLUGINS} \

6
recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed.bb
View File

@@ -19,9 +19,5 @@ PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "f1d0c9a46be19e69a493f75fc8af54e7"
SRC_URI[sha256sum] = "d83f78bd15491d55f17d33f48c051cd3f6e37dcad382c7b460fb8132aadce1a9"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5JsEmbed, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5JsEmbed, -S${includedir}, -S${STAGING_INCDIR}"
# kjsembed's kjscmd5 is not required for build -> point to native dummy to make cmake happy
CMAKE_ALIGN_SYSROOT[3] = "KF5JsEmbed, -S${bindir}/kjscmd5, -S${STAGING_BINDIR_NATIVE}/kjscmd5"
CMAKE_ALIGN_SYSROOT[1] = "KF5JsEmbed, -S${bindir}/kjscmd5, -S${STAGING_BINDIR_NATIVE}/kjscmd5"

5
recipes-kde/kf5/porting-aids-tier3/kross/kross.bb
View File

@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
"
inherit kde-kf5-porting-aids cmake-lib
inherit kde-kf5-porting-aids
DEPENDS += " \
kcompletion \
@@ -23,9 +23,6 @@ PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "bb96fd634617bcac31974f9b63f41252"
SRC_URI[sha256sum] = "84681930bbaa248e524651f95c3abce20a3b320c48a2df086675688974bb893f"
CMAKE_ALIGN_SYSROOT[1] = "KF5Kross, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5Kross, -S${includedir}, -S${STAGING_INCDIR}"
FILES_${PN} += " \
${OE_QMAKE_PATH_PLUGINS} \
"

6
recipes-kde/kf5/tier1/attica/attica.bb
View File

@@ -4,13 +4,9 @@ LIC_FILES_CHKSUM = " \
file://COPYING;md5=be254b9345b1c2ff33e1a6a96768f2fb \
"
inherit kde-kf5 cmake-lib
inherit kde-kf5
SRC_URI[md5sum] = "000a8c34e6c4e548f53493c4519c3c1c"
SRC_URI[sha256sum] = "951af772a83237d2c0c9a7fede2608101041d2cc13716221c97d9c79cc79e5be"
PV = "${KF5_VERSION}"
CMAKE_ALIGN_SYSROOT[1] = "KF5Attica, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5Attica, -S${includedir}, -S${STAGING_INCDIR}"

6
recipes-kde/kf5/tier1/bluez-qt/bluez-qt.bb
View File

@@ -2,7 +2,7 @@ SUMMARY = "Qt wrapper for BlueZ 5 DBus AP"
LICENSE = "LGPLv2"
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
inherit kde-kf5 cmake-lib
inherit kde-kf5
DEPENDS += "qtdeclarative"
@@ -14,7 +14,3 @@ EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
FILES_${PN} += "${OE_QMAKE_PATH_QML}"
FILES_${PN}-dbg += "${OE_QMAKE_PATH_QML}/org/kde/bluezqt/.debug"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5BluezQt, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5BluezQt, -S${includedir}, -S${STAGING_INCDIR}"

5
recipes-kde/kf5/tier1/karchive/karchive.bb
View File

@@ -1,8 +1,3 @@
require ${BPN}.inc
DEPENDS += "${BPN}-native"
inherit cmake-lib
CMAKE_ALIGN_SYSROOT[1] = "KF5Archive, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5Archive, -S${includedir}, -S${STAGING_INCDIR}"

8
recipes-kde/kf5/tier1/kcodecs/kcodecs.bb
View File

@@ -5,14 +5,8 @@ LIC_FILES_CHKSUM = " \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
"
inherit kde-kf5 cmake-lib
inherit kde-kf5
PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "089c46445618fbc36c11de7eccd61256"
SRC_URI[sha256sum] = "d5bef19f3575784e93b55db76bbaea7f8dba2bed4ffd9b9fbbb52db6d85f4ea5"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5Codecs, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5Codecs, -S${includedir}, -S${STAGING_INCDIR}"

5
recipes-kde/kf5/tier1/kconfig/kconfig.bb
View File

@@ -6,11 +6,8 @@ DEPENDS += "${BPN}-native"
SRC_URI += "file://0004-kconf_update-fix-paths.patch"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5Config, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5Config, -S${includedir}, -S${STAGING_INCDIR}"
# native executables
CMAKE_ALIGN_SYSROOT[3] = "KF5Config, -S${libexecdir}/kf5, -S${STAGING_LIBEXECDIR_NATIVE}/kf5"
CMAKE_ALIGN_SYSROOT[3] = "KF5Config, -s${_IMPORT_PREFIX}/libexec/kf5, -S${STAGING_LIBEXECDIR_NATIVE}/kf5"
PACKAGES =+ "${PN}-bin"

5
recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.bb
View File

@@ -4,11 +4,8 @@ inherit cmake-lib
DEPENDS += "${BPN}-native"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5CoreAddons, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5CoreAddons, -S${includedir}, -S${STAGING_INCDIR}"
# native executables
CMAKE_ALIGN_SYSROOT[3] = "KF5CoreAddons, -S${bindir}, -S${STAGING_BINDIR_NATIVE}"
CMAKE_ALIGN_SYSROOT[1] = "KF5CoreAddons, -s${_IMPORT_PREFIX}/bin, -S${STAGING_BINDIR_NATIVE}"
PACKAGES =+ "${PN}-bin"

6
recipes-kde/kf5/tier1/kdbusaddons/kdbusaddons.bb
View File

@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
"
inherit kde-kf5 cmake-lib
inherit kde-kf5
DEPENDS += " \
${@bb.utils.contains("DISTRO_FEATURES", "x11", "qtx11extras", "", d)} \
@@ -13,7 +13,3 @@ DEPENDS += " \
PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "cd6d6dbfc47cb82a7fb0b81adc24aad7"
SRC_URI[sha256sum] = "3db7b90f37ac78c813e2554ce48591b3535732207b1c94deed3a13aea554132e"
CMAKE_ALIGN_SYSROOT[1] = "KF5DBusAddons, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5DBusAddons, -S${includedir}, -S${STAGING_INCDIR}"

6
recipes-kde/kf5/tier1/kdnssd/kdnssd.bb
View File

@@ -5,14 +5,10 @@ LIC_FILES_CHKSUM = " \
file://COPYING-CMAKE-SCRIPTS;md5=54c7042be62e169199200bc6477f04d1 \
"
inherit kde-kf5 cmake-lib
inherit kde-kf5
DEPENDS += "avahi"
PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "31c35cb2b97f150d103484501cc55aca"
SRC_URI[sha256sum] = "256a5c9c1598b0b4f55730efc198e5c6d27aea38bd245725b204e29dc0a517de"
CMAKE_ALIGN_SYSROOT[1] = "KF5DNSSD, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5DNSSD, -S${includedir}, -S${STAGING_INCDIR}"

6
recipes-kde/kf5/tier1/kguiaddons/kguiaddons.bb
View File

@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = " \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
"
inherit kde-kf5 cmake-lib
inherit kde-kf5
DEPENDS += " \
${@bb.utils.contains("DISTRO_FEATURES", "x11", "qtx11extras", "", d)} \
@@ -14,7 +14,3 @@ DEPENDS += " \
PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "bfba32b6ee6f1288fef0d7156bf81961"
SRC_URI[sha256sum] = "136cb22285eeb7e15a02cdcc8e8bc65edc777dd923125bd64695eb10c9ff5d9f"
CMAKE_ALIGN_SYSROOT[1] = "KF5GuiAddons, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5GuiAddons, -S${includedir}, -S${STAGING_INCDIR}"

5
recipes-kde/kf5/tier1/ki18n/ki18n.bb
View File

@@ -1,10 +1,7 @@
require ${BPN}.inc
inherit cmake-lib pythonnative
inherit pythonnative
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5I18n, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5I18n, -S${includedir}, -S${STAGING_INCDIR}"
# revisit python?
DEPENDS += "${BPN}-native qtscript qtdeclarative"

6
recipes-kde/kf5/tier1/kidletime/kidletime.bb
View File

@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = " \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
"
inherit kde-kf5 cmake-lib
inherit kde-kf5
DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "libxcb qtx11extras libxscrnsaver", "", d)}"
@@ -17,7 +17,3 @@ SRC_URI += "file://0001-Do-not-search-for-Qt5X11Extras-in-x-less-environment.pat
FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}"
FILES_${PN}-dbg += "${OE_QMAKE_PATH_PLUGINS}/*/*/.debug"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5IdleTime, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5IdleTime, -S${includedir}, -S${STAGING_INCDIR}"

6
recipes-kde/kf5/tier1/kitemmodels/kitemmodels.bb
View File

@@ -4,14 +4,10 @@ LIC_FILES_CHKSUM = " \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
"
inherit kde-kf5 cmake-lib
inherit kde-kf5
DEPENDS += "qtdeclarative"
PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "83b9a034bbfaedf0cc12191157899006"
SRC_URI[sha256sum] = "e44a5c4ba997993057e8ebda6df400c3f1b97bf81d11bb02af27950ff1cd749d"
CMAKE_ALIGN_SYSROOT[1] = "KF5ItemModels, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5ItemModels, -S${includedir}, -S${STAGING_INCDIR}"

6
recipes-kde/kf5/tier1/kitemviews/kitemviews.bb
View File

@@ -5,12 +5,8 @@ LIC_FILES_CHKSUM = " \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
"
inherit kde-kf5 cmake-lib
inherit kde-kf5
PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "324c058163bb418b26d9cba403e5133d"
SRC_URI[sha256sum] = "98078899862514cc16ceff0275fe5eab43bc14e8f361af11a8e3c45a2fc5a284"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5ItemViews, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5ItemViews, -S${includedir}, -S${STAGING_INCDIR}"

6
recipes-kde/kf5/tier1/kplotting/kplotting.bb
View File

@@ -2,12 +2,8 @@ SUMMARY = "Lightweight plotting framework"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
inherit kde-kf5 cmake-lib
inherit kde-kf5
PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "6906f6da8a6d680cd86d1ee96f80bf2b"
SRC_URI[sha256sum] = "4a960a0bbeb364702dfecd4cff61c4082bc7a04736ed76d4deef821f7b246676"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5Plotting, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5Plotting, -S${includedir}, -S${STAGING_INCDIR}"

9
recipes-kde/kf5/tier1/kwayland/kwayland.bb
View File

@@ -4,17 +4,10 @@ LIC_FILES_CHKSUM = " \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
"
inherit kde-kf5 cmake-lib
inherit kde-kf5
DEPENDS += "wayland wayland-native"
PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "d70abca43cbf6e6a6eba9d79830bf1a1"
SRC_URI[sha256sum] = "756c711c2796629090169ae5b348bf3e1bdd03011f89f5b8bc71cbfd8d4f1d61"
SRC_URI += "file://0001-do-not-perform-runtime-tests.patch"
CMAKE_ALIGN_SYSROOT[1] = "KF5Wayland, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5Wayland, -S${includedir}, -S${STAGING_INCDIR}"

6
recipes-kde/kf5/tier1/kwidgetsaddons/kwidgetsaddons.bb
View File

@@ -5,14 +5,10 @@ LIC_FILES_CHKSUM = " \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
"
inherit kde-kf5 cmake-lib
inherit kde-kf5
DEPENDS += "qttools"
PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "c4b6185dac9cecd6af6eea3b56f2271f"
SRC_URI[sha256sum] = "1e099d9e021dc44fdee54220b30d3f48a72900fa88e8273ee7fea2895946a8bd"
CMAKE_ALIGN_SYSROOT[1] = "KF5WidgetsAddons, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5WidgetsAddons, -S${includedir}, -S${STAGING_INCDIR}"

6
recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb
View File

@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
"
inherit kde-kf5 cmake-lib cmake-auto-align-paths
inherit kde-kf5 cmake-auto-align-paths
DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver qtx11extras", "", d)}"
@@ -14,7 +14,3 @@ SRC_URI[sha256sum] = "b8228dddcc6487e234f81239bea7ca7ae261af8fef7b9e5d7a8b49aa3a
FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}"
FILES_${PN}-dbg += "${OE_QMAKE_PATH_PLUGINS}/*/*/.debug"
CMAKE_ALIGN_SYSROOT[1] = "KF5WindowSystem, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5WindowSystem, -S${includedir}, -S${STAGING_INCDIR}"

6
recipes-kde/kf5/tier1/modemmanager-qt/modemmanager-qt.bb
View File

@@ -2,7 +2,7 @@ SUMMARY = "Qt wrapper for ModemManager API"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
inherit kde-kf5 cmake-lib pkgconfig cmake-auto-align-paths
inherit kde-kf5 pkgconfig cmake-auto-align-paths
DEPENDS += "modemmanager"
@@ -10,10 +10,6 @@ PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "df3b50fe7df5b7c409d80b83beb0337f"
SRC_URI[sha256sum] = "1cae698fe3624db365443bba099ab2b1e606a36466a9518b87383b1641ffac94"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5ModemManagerQt, -S${includedir}, -S${STAGING_INCDIR}"
CMAKE_ALIGN_SYSROOT[2] = "KF5ModemManagerQt, -S${libdir}, -S${STAGING_LIBDIR}"
RPROVIDES_${PN} += "libmm-qt"
RREPLACES_${PN} += "libmm-qt"
RCONFLICTS_${PN} += "libmm-qt"

7
recipes-kde/kf5/tier1/networkmanager-qt/networkmanager-qt.bb
View File

@@ -2,15 +2,10 @@ SUMMARY = "Qt wrapper for NetworkManager API"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
inherit kde-kf5 pkgconfig cmake-lib cmake-auto-align-paths
inherit kde-kf5 pkgconfig cmake-auto-align-paths
DEPENDS += "networkmanager"
PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "45b8586afc97200ea687996fc5ce2327"
SRC_URI[sha256sum] = "3c5473e9fda6d2978deb602c42a4af84529578d2971a7c54d224e17867e95a54"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5NetworkManagerQt, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5NetworkManagerQt, -S${includedir}, -S${STAGING_INCDIR}"
CMAKE_ALIGN_SYSROOT[3] = "KF5NetworkManagerQt, -S${libdir}/glib-2.0/include, -S${STAGING_LIBDIR}/glib-2.0/include"

5
recipes-kde/kf5/tier1/solid/solid.bb
View File

@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
"
inherit kde-kf5 cmake-lib
inherit kde-kf5
DEPENDS += "qtdeclarative"
@@ -12,9 +12,6 @@ PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "3ca487d5660ee83d0b2165e525ea5795"
SRC_URI[sha256sum] = "bd60b642389d5acb0fafb204663ee92a6c44992cb3bb5df7fd34432c32ad04f2"
CMAKE_ALIGN_SYSROOT[1] = "KF5Solid, -S${libdir}, -S${STAGING_LIBDIR}"
CMAKE_ALIGN_SYSROOT[2] = "KF5Solid, -S${includedir}, -S${STAGING_INCDIR}"
FILES_${PN} += "${OE_QMAKE_PATH_QML}"
FILES_${PN}-dbg += "${OE_QMAKE_PATH_QML}/org/kde/${BPN}/.debug"

4
recipes-kde/kf5/tier1/sonnet/sonnet.bb
View File

@@ -19,9 +19,7 @@ FILES_${PN}-dbg += " \
${OE_QMAKE_PATH_PLUGINS}/kf5/sonnet/.debug \
"
CMAKE_ALIGN_SYSROOT[1] = "KF5Sonnet, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5Sonnet, -S${includedir}, -S${STAGING_INCDIR}"
CMAKE_ALIGN_SYSROOT[3] = "KF5Sonnet, -S${bindir}, -S${STAGING_BINDIR_NATIVE}"
CMAKE_ALIGN_SYSROOT[1] = "KF5Sonnet, -s${_IMPORT_PREFIX}/bin, -S${STAGING_BINDIR_NATIVE}"
PACKAGECONFIG ??= "hunspell"
PACKAGECONFIG[hunspell] = "-DBUILD_HUNSPELL=ON,-DBUILD_HUNSPELL=OFF, hunspell"

6
recipes-kde/kf5/tier1/threadweaver/threadweaver.bb
View File

@@ -2,12 +2,8 @@ SUMMARY = "High-level multithreading framework"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
inherit kde-kf5 cmake-lib
inherit kde-kf5
PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "6e0e0668f25d508aca4c527f762e7701"
SRC_URI[sha256sum] = "7804df4d88c909cb6496d36cb2762e811454849d4a9092ac07b9096cbf5fe92e"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5ThreadWeaver, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5ThreadWeaver, -S${includedir}, -S${STAGING_INCDIR}"

6
recipes-kde/kf5/tier2/kactivities-stats/kactivities-stats.bb
View File

@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = " \
file://COPYING.LGPL-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
"
inherit kde-kf5 cmake-lib
inherit kde-kf5
DEPENDS += " \
boost \
@@ -17,7 +17,3 @@ DEPENDS += " \
PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "fbda904a579120cc23eb6ec9bc660f67"
SRC_URI[sha256sum] = "8f27195f4245a726f682e51c15a8b526dd38cca515c65ef1ab4e85479fcf5348"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5ActivitiesStats, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5ActivitiesStats, -S${includedir}, -S${STAGING_INCDIR}"

6
recipes-kde/kf5/tier2/kauth/kauth.bb
View File

@@ -6,12 +6,8 @@ DEPENDS += "${BPN}-native kcoreaddons polkit-qt-1"
EXTRA_OECMAKE += "-DKAUTH_BACKEND_NAME=POLKITQT5-1"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5Auth, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5Auth, -S${includedir}, -S${STAGING_INCDIR}"
# executables
CMAKE_ALIGN_SYSROOT[3] = "KF5Auth, -S${libexecdir}/kauth-policy-gen, -S${STAGING_LIBEXECDIR_NATIVE}/kauth-policy-gen"
CMAKE_ALIGN_SYSROOT[1] = "KF5Auth, -s${_IMPORT_PREFIX}/libexec/kauth-policy-gen, -S${STAGING_LIBEXECDIR_NATIVE}/kauth-policy-gen"
FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}"
FILES_${PN}-dbg += "${OE_QMAKE_PATH_PLUGINS}/*/*/.debug"

6
recipes-kde/kf5/tier2/kcompletion/kcompletion.bb
View File

@@ -4,14 +4,10 @@ LIC_FILES_CHKSUM = " \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
"
inherit kde-kf5 cmake-lib
inherit kde-kf5
DEPENDS += "kconfig kwidgetsaddons"
PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "ce3839d146dc522a3595085833bf10ea"
SRC_URI[sha256sum] = "6a8af0a084ce697f57382f16157b0c21e4287c809819611fb7e6171e7e149d4a"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5Completion, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5Completion, -S${includedir}, -S${STAGING_INCDIR}"

6
recipes-kde/kf5/tier2/kcrash/kcrash.bb
View File

@@ -4,14 +4,10 @@ LIC_FILES_CHKSUM = " \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
"
inherit kde-kf5 cmake-lib
inherit kde-kf5
DEPENDS += "kcoreaddons kwindowsystem"
PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "ecf5dde757c1cf5e3d00d3cfe661474d"
SRC_URI[sha256sum] = "a84a9a5b73c51678d84cfe9d87a945f992e6035a9dbd29040bbe5dbcfd38ba6e"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5Crash, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5Crash, -S${includedir}, -S${STAGING_INCDIR}"

7
recipes-kde/kf5/tier2/kdoctools/kdoctools.bb
View File

@@ -17,13 +17,10 @@ do_configure_append() {
sed -i 's:${STAGING_DIR_TARGET}::g' ${B}/config-kdoctools.h
}
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5DocTools, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5DocTools, -S${includedir}, -S${STAGING_INCDIR}"
# native binaries
CMAKE_ALIGN_SYSROOT[3] = "KF5DocTools, -S${bindir}, -S${STAGING_BINDIR_NATIVE}"
CMAKE_ALIGN_SYSROOT[1] = "KF5DocTools, -s${_IMPORT_PREFIX}/bin, -S${STAGING_BINDIR_NATIVE}"
# make meinproc5 find kdoctools data
CMAKE_ALIGN_SYSROOT[4] = "KF5DocToolsMacros.cmake, -sCOMMAND ${KDOCTOOLS_MEINPROC_EXECUTABLE}, -SCOMMAND ${KDOCTOOLS_MEINPROC_EXECUTABLE} --srcdir ${STAGING_DATADIR}/kf5/kdoctools"
CMAKE_ALIGN_SYSROOT[2] = "KF5DocToolsMacros.cmake, -sCOMMAND ${KDOCTOOLS_MEINPROC_EXECUTABLE}, -SCOMMAND ${KDOCTOOLS_MEINPROC_EXECUTABLE} --srcdir ${STAGING_DATADIR}/kf5/kdoctools"
FILES_${PN}-dev += "${datadir}/kf5/kdoctools/customization"

6
recipes-kde/kf5/tier2/kfilemetadata/kfilemetadata.bb
View File

@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \
"
inherit kde-kf5 cmake-lib pkgconfig
inherit kde-kf5 pkgconfig
PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "12517175cb2a93341bea3c60de105d07"
@@ -24,10 +24,6 @@ DEPENDS += " \
exiv2 \
"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5FileMetaData, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5FileMetaData, -S${includedir}, -S${STAGING_INCDIR}"
FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}/kf5"
FILES_${PN}-dbg += " \
${OE_QMAKE_PATH_PLUGINS}/kf5/.debug \

6
recipes-kde/kf5/tier2/kjobwidgets/kjobwidgets.bb
View File

@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
"
inherit kde-kf5 cmake-lib
inherit kde-kf5
DEPENDS += "kcoreaddons kwidgetsaddons ${@bb.utils.contains("DISTRO_FEATURES", "x11", "qtx11extras", "", d)}"
@@ -12,8 +12,4 @@ PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "edbdaa821afa328331e46e3d959924ca"
SRC_URI[sha256sum] = "4ecd09af1df430110da6607fabb0aa5231f89b3cff0b1477438c899d5d4204d8"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5JobWidgets, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5JobWidgets, -S${includedir}, -S${STAGING_INCDIR}"
FILES_${PN} += "${datadir}/dbus-1"

6
recipes-kde/kf5/tier2/knotifications/knotifications.bb
View File

@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = " \
file://COPYING-CMAKE-SCRIPTS;md5=54c7042be62e169199200bc6477f04d1 \
"
inherit kde-kf5 cmake-lib
inherit kde-kf5
DEPENDS += " \
kwindowsystem \
@@ -23,8 +23,4 @@ PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "4ef30449b46b701ddf6482d36378e1ec"
SRC_URI[sha256sum] = "b7810e42938331cd5f7f9f358362b3eb1221186c62762cd28860fdb66b6665bf"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5Notifications, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5Notifications, -S${includedir}, -S${STAGING_INCDIR}"
FILES_${PN} += "${datadir}/dbus-1 ${datadir}/kservicetypes5"

5
recipes-kde/kf5/tier2/kpackage/kpackage.bb
View File

@@ -4,9 +4,6 @@ inherit cmake-lib
DEPENDS += "${BPN}-native karchive ki18n kcoreaddons kconfig kdoctools"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5Package, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5Package, -S${includedir}, -S${STAGING_INCDIR}"
CMAKE_ALIGN_SYSROOT[3] = "KF5Package, -S${bindir}, -S${STAGING_BINDIR_NATIVE}"
CMAKE_ALIGN_SYSROOT[1] = "KF5Package, -s${_IMPORT_PREFIX}/bin, -S${STAGING_BINDIR_NATIVE}"
FILES_${PN} += "${datadir}/k*5"

5
recipes-kde/kf5/tier2/kpty/kpty.bb
View File

@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = " \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
"
inherit kde-kf5 cmake-lib
inherit kde-kf5
DEPENDS += "kcoreaddons ki18n"
@@ -13,6 +13,3 @@ PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "904db48ad9e21de2df42738775261b23"
SRC_URI[sha256sum] = "4bca7c6ceb870f028a37077ee50ed53b63403575baae36dd80c81a96b34cf23d"
CMAKE_ALIGN_SYSROOT[1] = "KF5Pty, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5Pty, -S${includedir}, -S${STAGING_INCDIR}"

6
recipes-kde/kf5/tier2/kunitconversion/kunitconversion.bb
View File

@@ -2,14 +2,10 @@ SUMMARY = "Support for unit conversion"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
inherit kde-kf5 cmake-lib
inherit kde-kf5
DEPENDS += "ki18n"
PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "e4a9229d95ae7ebaa094d104eb8bc633"
SRC_URI[sha256sum] = "c3c2248b82aae17ff14b5c64ffbee40f5418450a26baa9f8fab3110ae88d7895"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5UnitConversion, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5UnitConversion, -S${includedir}, -S${STAGING_INCDIR}"

6
recipes-kde/kf5/tier3/baloo/baloo.bb
View File

@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = " \
file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
"
inherit kde-kf5 cmake-lib cmake-auto-align-paths gtk-icon-cache
inherit kde-kf5 cmake-auto-align-paths gtk-icon-cache
DEPENDS += " \
ki18n \
@@ -31,10 +31,6 @@ SRC_URI += " \
file://0002-Baloo.pc.cmake-fix-paths-for-Libs-and-Cflags.patch \
"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5Baloo, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5Baloo, -S${includedir}, -S${STAGING_INCDIR}"
FILES_${PN} += " \
${datadir}/dbus-1 \
${datadir}/icons \

6
recipes-kde/kf5/tier3/kactivities/kactivities.bb
View File

@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = " \
file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
"
inherit kde-kf5 cmake-lib
inherit kde-kf5
DEPENDS += "boost kconfig kcoreaddons ki18n kservice kwindowsystem kglobalaccel kxmlgui kio kdbusaddons kdeclarative kcmutils"
@@ -19,10 +19,6 @@ do_compile_prepend() {
export XDG_DATA_HOME=${STAGING_DATADIR}
}
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5Activities, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5Activities, -S${includedir}, -S${STAGING_INCDIR}"
FILES_${PN} += " \
${datadir}/k*5 \
${OE_QMAKE_PATH_QML}/org/kde \

6
recipes-kde/kf5/tier3/kbookmarks/kbookmarks.bb
View File

@@ -4,14 +4,10 @@ LIC_FILES_CHKSUM = " \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
"
inherit kde-kf5 cmake-lib
inherit kde-kf5
DEPENDS += "kconfigwidgets kconfig kiconthemes kxmlgui"
PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "73827857016fb3444101929fbd9fcd83"
SRC_URI[sha256sum] = "0190db136a1d2c8d6065aa3e01fc64a9753c1f7a6a6fd43c3250ea9831097137"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5Bookmarks, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5Bookmarks, -S${includedir}, -S${STAGING_INCDIR}"

6
recipes-kde/kf5/tier3/kcmutils/kcmutils.bb
View File

@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
"
inherit kde-kf5 cmake-lib
inherit kde-kf5
DEPENDS += "kitemviews kconfigwidgets kcoreaddons ki18n kiconthemes kservice kxmlgui kdeclarative"
@@ -12,8 +12,4 @@ PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "139af7a01a29e7dbd81f25adae1df9b2"
SRC_URI[sha256sum] = "f58a89543d52c82b0a9ae527b2a73141ef9f970d7cf6393a47f0b42f61696931"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5KCMUtils, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5KCMUtils, -S${includedir}, -S${STAGING_INCDIR}"
FILES_${PN} += "${datadir}/kservicetypes5"

6
recipes-kde/kf5/tier3/kconfigwidgets/kconfigwidgets.bb
View File

@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
"
inherit kde-kf5 cmake-lib
inherit kde-kf5
DEPENDS += "kauth kconfig kcodecs kdoctools kguiaddons kwidgetsaddons"
@@ -12,8 +12,4 @@ PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "03bc05f0c72386a143d1b002178f95f6"
SRC_URI[sha256sum] = "f394366fb3d3e65b2c4ea49428113c5081f8a05d2e6cc945cb2b910b55d691fe"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5ConfigWidgets, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5ConfigWidgets, -S${includedir}, -S${STAGING_INCDIR}"
RDEPENDS_${PN} += "perl"

6
recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb
View File

@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = " \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
"
inherit kde-kf5 cmake-lib
inherit kde-kf5
DEPENDS += "qtdeclarative kconfig ki18n kiconthemes kio kwidgetsaddons kwindowsystem kglobalaccel kguiaddons kpackage libepoxy"
@@ -15,10 +15,6 @@ PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "c76d293ffa8bcae4771b78e553d26f53"
SRC_URI[sha256sum] = "c470e239b5dc7c42ed94a39d0d88fdb05e6c65eb49727985379f39504d269623"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5Declarative, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5Declarative, -S${includedir}, -S${STAGING_INCDIR}"
FILES_${PN} += "${OE_QMAKE_PATH_QML}/org/kde"
FILES_${PN}-dbg += " \
${OE_QMAKE_PATH_QML}/org/kde/*/.debug \

6
recipes-kde/kf5/tier3/kded/kded.bb
View File

@@ -13,12 +13,8 @@ SRC_URI[md5sum] = "f859f8818fd5f81645bdfb2cf89ee020"
SRC_URI[sha256sum] = "69128b448e542a68911cdfcc82c566e31d5c9af0e20c051490223719953f5ed8"
SRC_URI += "file://0001-hardcode-path-to-kconf_update.patch"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KDED, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KDED, -S${includedir}, -S${STAGING_INCDIR}"
# kded's kded5 is not required for build -> point to native dummy to make cmake happy
CMAKE_ALIGN_SYSROOT[3] = "KDED, -S${bindir}/kded5, -S${STAGING_BINDIR_NATIVE}/kded5"
CMAKE_ALIGN_SYSROOT[1] = "KDED, -S${bindir}/kded5, -S${STAGING_BINDIR_NATIVE}/kded5"
FILES_${PN} += "${datadir}/dbus-1 ${datadir}/k*5 ${libdir}/libkdeinit5_kded5.so"
FILES_${PN}-dev = "${libdir}/cmake"

5
recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin.bb
View File

@@ -30,11 +30,8 @@ PACKAGECONFIG ??= ""
PACKAGECONFIG[kplotting] = "-DWITH_KPLOTTING=ON,,kplotting"
PACKAGECONFIG[kdewebkit] = "-DWITH_KDEWEBKIT=ON,,kdewebkit"
# cross headers
CMAKE_ALIGN_SYSROOT[1] = "KF5DesignerPlugin, -S${includedir}, -S${STAGING_INCDIR}"
# native binaries
CMAKE_ALIGN_SYSROOT[2] = "KF5DesignerPlugin, -S${bindir}, -S${STAGING_BINDIR_NATIVE}"
CMAKE_ALIGN_SYSROOT[1] = "KF5DesignerPlugin, -S${bindir}, -S${STAGING_BINDIR_NATIVE}"
FILES_${PN} += "${libdir}/plugins/designer"
FILES_${PN}-dbg += "${libdir}/plugins/designer/.debug"

6
recipes-kde/kf5/tier3/kdesu/kdesu.bb
View File

@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
"
inherit kde-kf5 cmake-lib
inherit kde-kf5
DEPENDS += " \
kcoreaddons \
@@ -17,8 +17,4 @@ PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "f85faafcbdbf994bdb8b4cbcd7c85f03"
SRC_URI[sha256sum] = "13c94cb501fc3abdeec23bd133ef1f7c875f6c56951e8755593a791b6a24e305"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5Su, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5Su, -S${includedir}, -S${STAGING_INCDIR}"
FILES_${PN}-dbg += "${libdir}/kdesu/kf5/.debug"

6
recipes-kde/kf5/tier3/kdewebkit/kdewebkit.bb
View File

@@ -2,7 +2,7 @@ SUMMARY = "KDE Integration for QtWebKit"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
inherit kde-kf5 cmake-lib
inherit kde-kf5
DEPENDS += " \
qtwebkit \
@@ -18,7 +18,3 @@ DEPENDS += " \
PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "2ca6d2a1377adfe68b3fe2560537616f"
SRC_URI[sha256sum] = "e9ac02938ff50967503c2c60f55b01ed74223b9de95f96b4fde12dcd10553cfc"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5WebKit, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5WebKit, -S${includedir}, -S${STAGING_INCDIR}"

6
recipes-kde/kf5/tier3/kemoticons/kemoticons.bb
View File

@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = " \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
"
inherit kde-kf5 cmake-lib
inherit kde-kf5
DEPENDS += "karchive kconfig kservice kcoreaddons"
@@ -13,10 +13,6 @@ PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "7a38172342fa120969b73d868e2b4211"
SRC_URI[sha256sum] = "072bdcfb2437f25e2d4bcc02bef7d80de200953bdd7f822c2649c005a40abb9d"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5Emoticons, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5Emoticons, -S${includedir}, -S${STAGING_INCDIR}"
FILES_${PN} += " \
${datadir}/emoticons \
${datadir}/k*5 \

6
recipes-kde/kf5/tier3/kglobalaccel/kglobalaccel.bb
View File

@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
"
inherit kde-kf5 cmake-lib
inherit kde-kf5
DEPENDS += " \
kconfig \
@@ -19,10 +19,6 @@ PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "8b2a252d99308aece33663cf9522c43a"
SRC_URI[sha256sum] = "687a063cd8c390c0d0a99bacb1ef9c589a0720fbfb499668a3845026ab0f9c70"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5GlobalAccel, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5GlobalAccel, -S${includedir}, -S${STAGING_INCDIR}"
FILES_${PN} += " \
${datadir}/dbus-1 \
${datadir}/kservices5 \

6
recipes-kde/kf5/tier3/kiconthemes/kiconthemes.bb
View File

@@ -4,14 +4,10 @@ LIC_FILES_CHKSUM = " \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
"
inherit kde-kf5 cmake-lib
inherit kde-kf5
DEPENDS += "qtsvg ki18n kconfig kconfigwidgets kwidgetsaddons kitemviews"
PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "45eb7f6ad57eca1f2f5ad3d58a56bef8"
SRC_URI[sha256sum] = "dfea9b4da835c028b62faec6550d279a3a75874ff88d996d2b603be4f9b228b5"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5IconThemes, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5IconThemes, -S${includedir}, -S${STAGING_INCDIR}"

6
recipes-kde/kf5/tier3/kio/kio.bb
View File

@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
"
inherit kde-kf5 cmake-lib cmake-auto-align-paths
inherit kde-kf5 cmake-auto-align-paths
DEPENDS += " \
qttools-native \
@@ -41,10 +41,6 @@ do_configure_append() {
sed -i 's:${STAGING_BINDIR_NATIVE}:${bindir}:g' ${B}/src/ioslaves/help/config-help.h
}
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5KIO, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5KIO, -S${includedir}, -S${STAGING_INCDIR}"
FILES_${PN} += " \
${datadir}/dbus-1 \
${datadir}/k*5 \

6
recipes-kde/kf5/tier3/knewstuff/knewstuff.bb
View File

@@ -2,7 +2,7 @@ SUMMARY = "Support for downloading application assets from the network"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
inherit kde-kf5 cmake-lib
inherit kde-kf5
DEPENDS += " \
karchive \
@@ -22,7 +22,3 @@ DEPENDS += " \
PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "2ea7e17162776681193f67d66821182d"
SRC_URI[sha256sum] = "a1a3c5b096e24afd40284256449f797e1656663a91d175a2ad3cd4aa6bfd9ca8"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5NewStuff, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5NewStuff, -S${includedir}, -S${STAGING_INCDIR}"

6
recipes-kde/kf5/tier3/knotifyconfig/knotifyconfig.bb
View File

@@ -2,7 +2,7 @@ SUMMARY = "Configuration system for KNotify"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
inherit kde-kf5 cmake-lib
inherit kde-kf5
DEPENDS += " \
phonon \
@@ -20,7 +20,3 @@ DEPENDS += " \
PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "61f5e3d3095a7b0cb87d1693c9b1ad05"
SRC_URI[sha256sum] = "f3e0a3d1217370f8bec645c84730057f17df400fe284c45c2feb89e6820afbca"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5NotifyConfig, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5NotifyConfig, -S${includedir}, -S${STAGING_INCDIR}"

6
recipes-kde/kf5/tier3/kparts/kparts.bb
View File

@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
"
inherit kde-kf5 cmake-lib
inherit kde-kf5
DEPENDS += " \
kconfig \
@@ -24,10 +24,6 @@ PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "52ddaccaa5848bdfb39b241adf32b63a"
SRC_URI[sha256sum] = "ea187dc45376b53818bf76ed794c988b7793ae21f2683ce010cba995a31b92e3"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5Parts, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5Parts, -S${includedir}, -S${STAGING_INCDIR}"
FILES_${PN} += " \
${datadir}/k*5 \
${OE_QMAKE_PATH_PLUGINS} \

6
recipes-kde/kf5/tier3/kpeople/kpeople.bb
View File

@@ -2,7 +2,7 @@ SUMMARY = "Provides access to all contacts"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
inherit kde-kf5 cmake-lib
inherit kde-kf5
DEPENDS += "kcoreaddons kconfig kservice kwidgetsaddons ki18n kitemviews "
@@ -10,10 +10,6 @@ PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "dc439cc6a4b3093cbee780cac616d1b4"
SRC_URI[sha256sum] = "a4a98ed9e1ca1fb68d6b3113d0580a6d7f97a528ade6be896cd6c57dd260d5d3"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5People, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5People, -S${includedir}, -S${STAGING_INCDIR}"
FILES_${PN} += " \
${datadir}/k*5 \
${OE_QMAKE_PATH_QML} \

5
recipes-kde/kf5/tier3/krunner/krunner.bb
View File

@@ -2,7 +2,7 @@ SUMMARY = "Framework for providing different actions given a string query"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://src/abstractrunner.h;endline=18;md5=a6a49d7635ef149bcddf8c46f0eae999"
inherit kde-kf5 cmake-lib
inherit kde-kf5
DEPENDS += "qtdeclarative kconfig kcoreaddons ki18n kio kservice plasma-framework solid threadweaver"
@@ -10,9 +10,6 @@ PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "427349a763c831796b3de0be4b17a019"
SRC_URI[sha256sum] = "d52f36b4cd1aca71ca6bae2a3c147ff826aa45bb90e9d6d5536c8a4ddc85ac27"
CMAKE_ALIGN_SYSROOT[1] = "KF5Runner, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5Runner, -S${includedir}, -S${STAGING_INCDIR}"
FILES_${PN} += " \
${datadir}/k*5 \
${datadir}/kdevappwizard \

5
recipes-kde/kf5/tier3/kservice/kservice.bb
View File

@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = " \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
"
inherit kde-kf5 cmake-lib
inherit kde-kf5
DEPENDS += "kconfig kcoreaddons kcrash kdbusaddons ki18n kdoctools"
@@ -14,9 +14,6 @@ PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "3cc65c5082a9bdaa2c93ea01323fb814"
SRC_URI[sha256sum] = "a75a5c8780dbb4e5ef7e5f1d3cc91808f44a640f1ac6b788418df261379ee32c"
CMAKE_ALIGN_SYSROOT[1] = "KF5Service, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5Service, -S${includedir}, -S${STAGING_INCDIR}"
FILES_${PN} += "${datadir}/kservicetypes5"

6
recipes-kde/kf5/tier3/ktexteditor/ktexteditor.bb
View File

@@ -1,13 +1,7 @@
require ${BPN}.inc
inherit cmake-lib
DEPENDS += "${BPN}-native qtxmlpatterns"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5TextEditor, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5TextEditor, -S${includedir}, -S${STAGING_INCDIR}"
FILES_${PN} += " \
${datadir}/k*5 \
${OE_QMAKE_PATH_PLUGINS} \

6
recipes-kde/kf5/tier3/ktextwidgets/ktextwidgets.bb
View File

@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
"
inherit kde-kf5 cmake-lib
inherit kde-kf5
DEPENDS += "kcompletion kconfig kconfigwidgets ki18n kiconthemes kservice kwidgetsaddons kwindowsystem sonnet"
@@ -12,8 +12,4 @@ PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "b7455b06e270b9e057f1ebe137676687"
SRC_URI[sha256sum] = "4b2d9b999ba9fbd7f79105d15f0c8bcc3f3f4982d0b71b1c06e4ade6d63eb614"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5TextWidgets, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5TextWidgets, -S${includedir}, -S${STAGING_INCDIR}"
FILES_${PN} += "${datadir}/kservicetypes5"

6
recipes-kde/kf5/tier3/kwallet/kwallet.bb
View File

@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
"
inherit kde-kf5 cmake-lib
inherit kde-kf5
DEPENDS += " \
libgcrypt \
@@ -28,8 +28,4 @@ SRC_URI[sha256sum] = "def7a27d609b79f41775093d5ff2629146396010610ce7d0ff9a52ffed
SRC_URI += "file://0001-add-NO_CMAKE_FIND_ROOT_PATH-in-find-to-org.kde.KWall.patch"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5Wallet, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5Wallet, -S${includedir}, -S${STAGING_INCDIR}"
FILES_${PN} += "${datadir}"

6
recipes-kde/kf5/tier3/kxmlgui/kxmlgui.bb
View File

@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = " \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
"
inherit kde-kf5 cmake-lib
inherit kde-kf5
DEPENDS += " \
kitemviews \
@@ -32,9 +32,5 @@ SRC_URI += " \
EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5XmlGui, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5XmlGui, -S${includedir}, -S${STAGING_INCDIR}"
# evt. put ksendbugmail to separate package later
FILES_${PN}-dbg += "${libdir}/kxmlgui/kf5/.debug/"

8
recipes-kde/kf5/tier3/kxmlrpcclient/kxmlrpcclient.bb
View File

@@ -4,16 +4,10 @@ LIC_FILES_CHKSUM = " \
file://COPYING.BSD;md5=5c262c13b60ebefe3060aed37d334ab6 \
"
inherit kde-kf5 cmake-lib
inherit kde-kf5
DEPENDS += "ki18n kio"
PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "c4295e2ebab459374b5570d2164a8279"
SRC_URI[sha256sum] = "3fce1446ae6799ac45e76680475b3a084ed49ae4637b6d6ab7cc637d24e8dbf1"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5XmlRpcClient, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5XmlRpcClient, -S${includedir}, -S${STAGING_INCDIR}"

6
recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb
View File

@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = " \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
"
inherit kde-kf5 cmake-lib
inherit kde-kf5
DEPENDS += " \
qtdeclarative \
@@ -34,10 +34,6 @@ PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "b67b2fc56b005b9fd47a9b64cc39bc40"
SRC_URI[sha256sum] = "1209805e4f62b251360193f4912b06a7d4c86296f4a926bc5d523e7a26d6a087"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5Plasma, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5Plasma, -S${includedir}, -S${STAGING_INCDIR}"
FILES_${PN} += " \
${datadir}/kdevappwizard \
${datadir}/dbus-1 \

6
recipes-kde/kf5/tier4/frameworkintegration/frameworkintegration.bb
View File

@@ -2,7 +2,7 @@ SUMMARY = "Workspace and cross-framework integration plugins"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
inherit kde-kf5 cmake-lib
inherit kde-kf5
DEPENDS += " \
kconfig \
@@ -20,10 +20,6 @@ PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "d63e9454ee42955c44cad1cc78a98d44"
SRC_URI[sha256sum] = "ea9ccb564aa1cebdd7ad3dbd5168cb1ae750f20122918864d846990828057653"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5FrameworkIntegration, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5FrameworkIntegration, -S${includedir}, -S${STAGING_INCDIR}"
FILES_${PN} += " \
${datadir}/knotifications5 \
${datadir}/kconf_update \