kde-kf5: Upgrade 5.94.0 -> 5.97.0
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
inherit kde-base
|
||||
|
||||
KF5_VERSION = "5.94.0"
|
||||
KF5_VERSION = "5.97.0"
|
||||
|
||||
def kde_verdir(v):
|
||||
return oe.utils.trim_version(v, 2)
|
||||
|
||||
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
|
||||
inherit kde-kf5-porting-aids perlnative
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "f93e14a2deb978ccb8e7b0e7e6a2e4c3a23fe9ffe5a64d569c824302d93b3c1b"
|
||||
SRC_URI[sha256sum] = "0e59e1d757819943d76e1df8af3f2cbf586b0104aafa8ee7b8b4ea82987bdcf8"
|
||||
SRC_URI += "file://0001-create_hash_table-avoid-polution-of-files-with-build.patch"
|
||||
|
||||
DEPENDS += " \
|
||||
|
||||
@@ -9,7 +9,6 @@ DEPENDS += " \
|
||||
kcoreaddons-native \
|
||||
ki18n-native \
|
||||
liburi-perl-native \
|
||||
gettext-native \
|
||||
"
|
||||
|
||||
SRC_URI += "file://0001-only-build-kf5-config-for-native.patch"
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
require ${BPN}.inc
|
||||
|
||||
inherit gettext
|
||||
|
||||
DEPENDS += " \
|
||||
${BPN}-native \
|
||||
kauth-native \
|
||||
|
||||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \
|
||||
inherit kde-kf5-porting-aids perlnative
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "d726ebb00766d3d5ed39603601c4b9541659bebc4bb7b755eec25bffd8a76033"
|
||||
SRC_URI[sha256sum] = "1adfdd09e61dd183de1dfbd1cd24e26ef69ab6429a0cfc292992a7f240244111"
|
||||
|
||||
EXTRA_OECMAKE += " \
|
||||
-DBUILD_TESTING=OFF \
|
||||
|
||||
@@ -5,4 +5,4 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
|
||||
inherit kde-kf5-porting-aids
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "6bd051e47f3a9f301e26b876036b1a36ccf2a2c7e6747f3a96a157c0c3a78a03"
|
||||
SRC_URI[sha256sum] = "28077f1a1b416c2e19f7b8fae1a96d1bde6e4dd8c90905adbe87bb1f2df3fd20"
|
||||
|
||||
@@ -20,6 +20,6 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "9bca73e8e67ccb89a044514ff6f6c02f6e65003cb34bc7e358a44182bc710d59"
|
||||
SRC_URI[sha256sum] = "ee24fa1f7ef215d34110e10f3f27470f25f926a00c4d37024db69af3165332b6"
|
||||
|
||||
FILES:${PN} += "${libdir}/plugins"
|
||||
|
||||
@@ -37,7 +37,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "98bd2a284a2fbc1c2d93cd6719d18baeccd5258dfaa48b1fe74bb61e24fe9b79"
|
||||
SRC_URI[sha256sum] = "6c16493749a28bb76fdd2d31158a60fc02016ac3a45316581ea5824fc619bb91"
|
||||
|
||||
do_compile:append() {
|
||||
# gperf-native sets absolut debug comments/links in header
|
||||
|
||||
@@ -16,4 +16,4 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "f3ce37479d0f579feeeebc837074b3d138a37989884149b92f12b107fedef62e"
|
||||
SRC_URI[sha256sum] = "bd4f24188691631d4d42d11bd58322afd8780a149f46f3cdf496eabed9ed401f"
|
||||
|
||||
@@ -25,7 +25,7 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "1d6925bd2530ded6ea97f832fda42de0e24d1d7302e52262171fd0461f642d49"
|
||||
SRC_URI[sha256sum] = "ba60156428496628046d99d5fe33bfdfbb4d29cb1ae82dd9014202dceda18304"
|
||||
|
||||
FILES:${PN} += " \
|
||||
${OE_QMAKE_PATH_PLUGINS} \
|
||||
|
||||
@@ -10,4 +10,4 @@ inherit kde-kf5-porting-aids gettext
|
||||
DEPENDS += "ki18n kio kcoreaddons-native kconfig-native kauth-native"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "65ac95cb022d5c7ca54c1e601211969aba06858773d881feb0004628a3451f82"
|
||||
SRC_URI[sha256sum] = "495a886b6bd134be578f37c0ad169a178f95dcbfd073e95d1579a0f493fbd309"
|
||||
|
||||
@@ -8,6 +8,6 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
inherit kde-kf5
|
||||
|
||||
SRC_URI[sha256sum] = "f6293699da5794812080ba2d41b4ea05e830532678af324d8e852f508f2def65"
|
||||
SRC_URI[sha256sum] = "c5f82aac64fc59376eaca14190e7a31d3697b41f9468375f43ef0890573b3832"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
|
||||
@@ -11,7 +11,7 @@ inherit kde-kf5
|
||||
DEPENDS += "qtdeclarative"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "7e776feb095e727abea0fec4b3ae3c81d704a0527b8ff3257d799feee2cc0632"
|
||||
SRC_URI[sha256sum] = "033a9fd5f3a8bcf54649bae79dbad036f8c4cf74683809c1c908807270e6ea99"
|
||||
|
||||
EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
inherit kde-kf5
|
||||
|
||||
SRC_URI[sha256sum] = "3e0b3fd2374dba82ca304c066938345f25b0eb85dca7169267c84f62bfb3a3bb"
|
||||
SRC_URI[sha256sum] = "6eae442282779802c348e91080132d52b0229288cc8793b2aaa6f906e39171a3"
|
||||
SRC_URI += "file://0001-Force-build-of-Qt-binary-resource-files.patch"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
|
||||
@@ -10,6 +10,6 @@ inherit kde-kf5
|
||||
DEPENDS += "bzip2 xz zlib"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "55cd87a5437a649c168efbce4af132b992aa67dd9a3a8ced7cff0144f155e1e4"
|
||||
SRC_URI[sha256sum] = "1bff8249ddbb5a38916c9e145e5027de3f18a14772e7a8bdd4a954fae7ca8d92"
|
||||
|
||||
EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
|
||||
|
||||
@@ -11,4 +11,4 @@ inherit kde-kf5
|
||||
DEPENDS += "libical"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "3bab1ae2e8214fb889b742d4a4f2c6acfd0bf40a4c4933cc91c66d21d77c042b"
|
||||
SRC_URI[sha256sum] = "d8a7ae053f0620e51e36b04a29240425f293077bad5a8298ed9c09ce97f4e690"
|
||||
|
||||
@@ -15,7 +15,7 @@ inherit kde-kf5
|
||||
DEPENDS += "gperf-native"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "bcc0e9fb1c1d259f05a326de160639a46c4bb6e0cce6fbc8244c39f251b8e7f9"
|
||||
SRC_URI[sha256sum] = "63e6e517a80395faea285968fd13f5e477a7437cb28c7028e9e678fc068d2670"
|
||||
|
||||
do_compile:append() {
|
||||
# gperf-native sets absolut debug comments/links in header
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
require ${BPN}.inc
|
||||
|
||||
DEPENDS += "${BPN}-native"
|
||||
DEPENDS += " \
|
||||
${BPN}-native \
|
||||
qtdeclarative \
|
||||
"
|
||||
|
||||
PACKAGES =+ "${PN}-bin"
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \
|
||||
inherit kde-kf5 cmake_lib
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "8e6d9104f070d94f083be000ea116acae3499b0dd110fa4c9c55f51ea91cb3d7"
|
||||
SRC_URI[sha256sum] = "90fe770c7f9c3a933b4e1f3576cf70c15d1db70b86bc9cfa9e4ad289e053f62d"
|
||||
|
||||
EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
|
||||
|
||||
|
||||
@@ -19,5 +19,5 @@ LIC_FILES_CHKSUM = " \
|
||||
inherit kde-kf5 mime
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "5c10b6ce070d6aa9b15abe7483b67f8802cec175e0eaeefc18a27c0e01ce110b"
|
||||
SRC_URI[sha256sum] = "09403513873e4fc3d9d2d13fb486d9cce0bc6bd5fde0b1c7b2481e0a404202aa"
|
||||
SRC_URI += "file://0001-Remove-cross-compile-adjustments.patch"
|
||||
|
||||
@@ -13,4 +13,4 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "0a1530117ccad6f1ea7b9db653bdf99adfe7f15f3f9394c3d885028f3ff4dae8"
|
||||
SRC_URI[sha256sum] = "13c7e82914bf1e594fcaafe8a1cfdb4607bc75a58a10b5a04fead84fe412122d"
|
||||
|
||||
@@ -10,4 +10,4 @@ inherit kde-kf5
|
||||
DEPENDS += "avahi"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "28eba2ff83d92bb80eac5bb771d5d5bf40c975d4b26a74d388092b034a964863"
|
||||
SRC_URI[sha256sum] = "4d04d691c813217abc26c15654f8068687487ad6e644b57d45de19b0c8e2b452"
|
||||
|
||||
@@ -18,4 +18,4 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "f23182a7268d37cbc32eaa77bdc9dddc6429a8eff912f57841f6d96c71973873"
|
||||
SRC_URI[sha256sum] = "fb78595f0f98435f87047d662b1e124ea2cd5edd279dbccb857d4d8f06967582"
|
||||
|
||||
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
inherit kde-kf5
|
||||
|
||||
SRC_URI[sha256sum] = "e53735539c9d7658e3c18e0d8b0f81bc9ce27ff32a868bac32c19c12288a055d"
|
||||
SRC_URI[sha256sum] = "728f7a777c49b2748eac98a82fb8532a806804064bad0e1f2c17ea5cf7c9b82c"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
|
||||
|
||||
@@ -18,9 +18,9 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 95b197f..85b790a 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -75,7 +75,6 @@ option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant,
|
||||
add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)")
|
||||
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02)
|
||||
@@ -88,7 +88,6 @@ ecm_set_disabled_deprecation_versions(
|
||||
QT 5.15.2
|
||||
)
|
||||
|
||||
-ki18n_install(po)
|
||||
add_subdirectory(src)
|
||||
|
||||
@@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = " \
|
||||
file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
|
||||
"
|
||||
|
||||
inherit kde-kf5
|
||||
inherit kde-kf5 gettext
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "0c5a8332343570e8530469840d67c72a28a04a7257578e5a962c73824508944a"
|
||||
SRC_URI[sha256sum] = "032f6d6f78c815ab2630a559ebf4c4a3737147fb35f327d213a171acf6f81e1e"
|
||||
|
||||
EXTRA_OECMAKE += "DBUILD_TESTING=OFF"
|
||||
|
||||
@@ -11,6 +11,6 @@ inherit kde-kf5
|
||||
DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "libxcb qtx11extras libxscrnsaver", "", d)}"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "a61c3d545bcec8866cf6aeb8df00dc4f239f1725ace09b8ef1946839c4b4e3e8"
|
||||
SRC_URI[sha256sum] = "35a10914c694a03e2f45b969edd87dc8dc72fb30c44947dd8dfa3b45efc5042b"
|
||||
|
||||
FILES:${PN} += "${OE_QMAKE_PATH_PLUGINS}"
|
||||
|
||||
@@ -15,7 +15,7 @@ DEPENDS += " \
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
|
||||
SRC_URI[sha256sum] = "d7f27da3325feb339f4e1a3db78df44f05e4f505f36e15c7caeac04da0428e39"
|
||||
SRC_URI[sha256sum] = "449edf327ecce026443bbf30552ba86b4fe94806d2f5ce3fa19491e1aef0d604"
|
||||
|
||||
FILES:${PN} += " \
|
||||
${datadir}/kdevappwizard \
|
||||
|
||||
@@ -11,6 +11,6 @@ inherit kde-kf5
|
||||
DEPENDS += "qtdeclarative"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "705ff2b97502b2ba436f9371b559e47f2a7634bf5b06d26c8243387d6a084f89"
|
||||
SRC_URI[sha256sum] = "7c5d1bab28b864dd4f9a9cdecfbc35d90ca94965ed0f6c79eead6d8aa854b46f"
|
||||
|
||||
FILES:${PN} += "${OE_QMAKE_PATH_QML}"
|
||||
|
||||
@@ -11,6 +11,6 @@ inherit kde-kf5
|
||||
DEPENDS += "qttools"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "5b75334b719ce07f4aa33236ef4bd11829504ff381670818ef57a7526938b52e"
|
||||
SRC_URI[sha256sum] = "c59916d5f181aa5ff44f4cf4f6bf18a0f179056f00cf33d03328951f1c1dfbbd"
|
||||
|
||||
FILES:${PN} += "${OE_QMAKE_PATH_PLUGINS}/designer"
|
||||
|
||||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \
|
||||
inherit kde-kf5
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "783d6d618601d58077c4ac7920a579af7b877b26a64a6f453570da36b57606aa"
|
||||
SRC_URI[sha256sum] = "5ed2e16b632ac1dc99a1f278de3ef76f4a2e4bc8989b6876621a9b7a1716ea0e"
|
||||
|
||||
DEPENDS += "qttools"
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ inherit kde-kf5
|
||||
|
||||
DEPENDS += "qtquickcontrols2"
|
||||
|
||||
SRC_URI[sha256sum] = "3065fabdb4938b68194060794abc90feac19e73dcb7648591c58e2c9cfea9528"
|
||||
SRC_URI[sha256sum] = "c12a245bfe92b92be4a8af4c12234ee55270b3b148720097c58b6f388a9f5fec"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
|
||||
|
||||
@@ -18,4 +18,4 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "b2a4d8e1b4d81ce798c991cfb34210ba095f6406a37f4714ae3ab64abaca2636"
|
||||
SRC_URI[sha256sum] = "e571016c89cccd5ae1a455c8f2abe59f8edab787e3cd7a165059bf365130ca3c"
|
||||
|
||||
@@ -16,6 +16,6 @@ inherit kde-kf5
|
||||
DEPENDS += "qttools"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "678eed15c65d6298a5f720bc6dec1a6eed4e742431f7210a1d6bad261a003d32"
|
||||
SRC_URI[sha256sum] = "7ac0c7e429036829fb430bc762ee58cb54f35c5ef955371f74fdd42376b6ac17"
|
||||
|
||||
FILES:${PN} += "${OE_QMAKE_PATH_PLUGINS}/designer"
|
||||
|
||||
@@ -12,7 +12,7 @@ inherit kde-kf5
|
||||
DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras libxrender libxfixes libxfixes-native", "", d)}"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "52ebb7d4e9ac3f24fadfd5265ff8cc390efbccf6fa6d084e5a573c3b2aa43c78"
|
||||
SRC_URI[sha256sum] = "b822a796379a1ce03a4a9fad64aa6289ba7abd84e3b137af31d8043b9c5efef1"
|
||||
|
||||
do_configure:append() {
|
||||
# remove absolute paths from exported cmake files
|
||||
|
||||
@@ -13,7 +13,7 @@ inherit kde-kf5 pkgconfig
|
||||
DEPENDS += "modemmanager"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "7928dc36bad38a9721305d59bb6d318e35118843001c21aa8802ce11ce11bff2"
|
||||
SRC_URI[sha256sum] = "938001d0d28c9d51cbc8fcdf45aefb2028c227e33037f98fb89ed6214936e561"
|
||||
|
||||
do_configure:append() {
|
||||
# remove absolute paths from exported cmake files
|
||||
|
||||
@@ -12,7 +12,7 @@ inherit kde-kf5 pkgconfig
|
||||
DEPENDS += "networkmanager"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "12208cc319ff0e77bbc1c37437e0fde57f62aa2a4d0f9e26110e8eb27b986502"
|
||||
SRC_URI[sha256sum] = "8556ad0ee255ce2947aad623db90848f7cfb0034368b0193f86af40499fa6c81"
|
||||
|
||||
do_configure:append() {
|
||||
# remove absolute paths from exported cmake files
|
||||
|
||||
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
inherit kde-kf5 gtk-icon-cache
|
||||
|
||||
SRC_URI[sha256sum] = "203d9dbc3fb783c8c31c3d3d59624e31b502a50beea31505dcc56d8c33fcd1d0"
|
||||
SRC_URI[sha256sum] = "554b6df8204654aee941f378c941277f81998522c6c67659625f16200225f9fa"
|
||||
PV = "${KF5_VERSION}"
|
||||
|
||||
FILES:${PN} += " \
|
||||
|
||||
@@ -12,6 +12,6 @@ DEPENDS += " \
|
||||
libdmtx \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "99607978559f63dba65d796c5edaf6c54e8aee5d31882d856347ea5ada06d1cb"
|
||||
SRC_URI[sha256sum] = "a6f04ff1b9823c43881da38091a87970dba6d79a0f3a8103146fc2b03aaf531b"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
|
||||
@@ -12,7 +12,7 @@ inherit kde-kf5
|
||||
DEPENDS += "bison-native qtdeclarative"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "9d8ed401e36b6a4b9e51438c8e2d359129b9d6149deb8240cb894b1128fa1107"
|
||||
SRC_URI[sha256sum] = "84c0ad4678c2ef6563db8a1dd907a8b9c4a2e8db7afc691a24b27189d6a24c9d"
|
||||
|
||||
FILES:${PN} += "${OE_QMAKE_PATH_QML}"
|
||||
|
||||
|
||||
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
|
||||
inherit kde-kf5
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "8c570a64748d6bb6b91dff6fbf5e0cc5da7634c9a6f867944e99442066b7474c"
|
||||
SRC_URI[sha256sum] = "a392739767e7f56cc3d951f0e55f1fa1d36a9f48e1b601b825212b50a1941193"
|
||||
|
||||
@@ -1,61 +0,0 @@
|
||||
From 177c88149d083255f9484d7efdf84d64e7b59805 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Sat, 11 Jun 2022 21:55:34 +0200
|
||||
Subject: [PATCH] Revert "Simplify header install locations"
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Not prefixing can cause trouble in oe-builds when not using extra-cmake
|
||||
|
||||
This reverts commit 42a061b04c507de11b0fb240808fc65a7528d946.
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
src/lib/CMakeLists.txt | 20 +++++++++++++++++++-
|
||||
1 file changed, 19 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
|
||||
index 74ddfee8..a74dc4b7 100644
|
||||
--- a/src/lib/CMakeLists.txt
|
||||
+++ b/src/lib/CMakeLists.txt
|
||||
@@ -72,17 +72,35 @@ set(Forwarding_Header_Names
|
||||
ecm_generate_headers(CamelCase_HEADERS
|
||||
HEADER_NAMES ${Forwarding_Header_Names}
|
||||
REQUIRED_HEADERS SyntaxHighlighting_HEADERS
|
||||
+ PREFIX KSyntaxHighlighting
|
||||
)
|
||||
|
||||
install(TARGETS KF5SyntaxHighlighting EXPORT KF5SyntaxHighlightingTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
|
||||
install(FILES
|
||||
${CamelCase_HEADERS}
|
||||
+ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KSyntaxHighlighting/KSyntaxHighlighting
|
||||
+)
|
||||
+install(FILES
|
||||
${SyntaxHighlighting_HEADERS}
|
||||
${CMAKE_CURRENT_BINARY_DIR}/ksyntaxhighlighting_export.h
|
||||
- DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KSyntaxHighlighting/KSyntaxHighlighting
|
||||
+ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KSyntaxHighlighting/ksyntaxhighlighting
|
||||
)
|
||||
|
||||
+# TODO KF6: remove this, backward compatible headers location
|
||||
+if(QT_MAJOR_VERSION STREQUAL "5")
|
||||
+ ecm_generate_headers(Compat_CamelCase_HEADERS
|
||||
+ HEADER_NAMES ${Forwarding_Header_Names}
|
||||
+ REQUIRED_HEADERS Compat_SyntaxHighlighting_HEADERS
|
||||
+ )
|
||||
+ install(FILES
|
||||
+ ${Compat_CamelCase_HEADERS}
|
||||
+ ${Compat_SyntaxHighlighting_HEADERS}
|
||||
+ ${CMAKE_CURRENT_BINARY_DIR}/ksyntaxhighlighting_export.h
|
||||
+ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KSyntaxHighlighting
|
||||
+ )
|
||||
+endif()
|
||||
+
|
||||
if(BUILD_QCH)
|
||||
ecm_add_qch(
|
||||
KF5SyntaxHighlighting_QCH
|
||||
--
|
||||
2.34.3
|
||||
|
||||
@@ -6,5 +6,4 @@ DEPENDS += " \
|
||||
|
||||
SRC_URI += " \
|
||||
file://0002-Do-not-do-the-cross-dance-for-katehighlightingindexe.patch \
|
||||
file://0003-Revert-Simplify-header-install-locations.patch \
|
||||
"
|
||||
|
||||
@@ -9,6 +9,6 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
inherit kde-kf5 perlnative
|
||||
|
||||
SRC_URI[sha256sum] = "cf871332a50355836919fdd833a82c32b3d5fe7fea8fa3e58714c39c8ddde5a6"
|
||||
SRC_URI[sha256sum] = "e88b9691ffead9cbfb11ae43c497114c7695e1e455e78dad30743c90ab50a99d"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
|
||||
@@ -5,4 +5,4 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
|
||||
inherit kde-kf5
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "87d8431a62c53b7e433b49dfad4fd6cacb58356a50cfa17ac480c6bb00a8e1c5"
|
||||
SRC_URI[sha256sum] = "46975d03feea09c41ac369fd076d7b2c92ad4468a81f48c2eeff622eabfc408f"
|
||||
|
||||
@@ -24,4 +24,4 @@ DEPENDS += " \
|
||||
CXXFLAGS += "-DBOOST_DISABLE_ASSERTS"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "83fe7d109d830f348f18432949902700ee8a6a934cbaf3f89ae7bbfb28ef2340"
|
||||
SRC_URI[sha256sum] = "e8a6c3b02dc9c3d9c250d44fa4b5a2e6c553bc8c0457e23ce7664274cdb88bdb"
|
||||
|
||||
@@ -9,6 +9,6 @@ LIC_FILES_CHKSUM = " \
|
||||
inherit kde-kf5
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "9cfed0ad69a8fa5df88273a5ef340d7b6dff1cd3e9d53bda16f3cf4afdd64159"
|
||||
SRC_URI[sha256sum] = "d74dc553b3628657241d6e7129b17a38e5fd3b26b21de000390382c871ca42f5"
|
||||
|
||||
EXTRA_OECMAKE += "-DAUTOTESTS=OFF"
|
||||
|
||||
@@ -11,6 +11,6 @@ inherit kde-kf5
|
||||
DEPENDS += "kconfig kconfig-native kwidgetsaddons"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "1ad13d41650bbe352b0c2ecfd8c059015f9441cbf7534a2bcc9ed17a3bfa6ea4"
|
||||
SRC_URI[sha256sum] = "6ab1e04ed3cc83f28a88224a661e5cd6a097e1a7d305987320dd8bd0c37b9ea6"
|
||||
|
||||
FILES:${PN} += "${OE_QMAKE_PATH_PLUGINS}/designer"
|
||||
|
||||
@@ -21,4 +21,4 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "f7f317dfd9b270249cf168a699b39236490b5b21ec2ef1d186b59e29566252f8"
|
||||
SRC_URI[sha256sum] = "b8196901ec5febcbfe961eb7a57ba41f3a5ed99a74a674c0a8fb5113eb93d908"
|
||||
|
||||
@@ -11,4 +11,4 @@ REQUIRED_DISTRO_FEATURES = "x11"
|
||||
DEPENDS += "kcoreaddons kcoreaddons-native kwindowsystem virtual/libx11"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "48c7792ca8c2ad6e9b6c8e9a260cdfcee5ed8d8769c4a8a199de7bf671f03cf5"
|
||||
SRC_URI[sha256sum] = "ef71248d1d30c1848ab5f553d38c3230f1fe7b0888b2ee8eebfba72d02a8f5c6"
|
||||
|
||||
@@ -15,13 +15,13 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
1 file changed, 5 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 17bcfab..3e410ff 100644
|
||||
index a12d99a..75b9c86 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -96,12 +96,7 @@ set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5DocTools")
|
||||
add_definitions(-DTRANSLATION_DOMAIN=\"kdoctools5\")
|
||||
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02)
|
||||
add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055000)
|
||||
@@ -100,12 +100,7 @@ ecm_set_disabled_deprecation_versions(
|
||||
KF 5.95
|
||||
)
|
||||
|
||||
-if (KF5I18n_FOUND)
|
||||
- ki18n_install(po)
|
||||
- kdoctools_install(po)
|
||||
@@ -32,5 +32,5 @@ index 17bcfab..3e410ff 100644
|
||||
if (BUILD_TESTING)
|
||||
add_subdirectory(autotests)
|
||||
--
|
||||
2.30.2
|
||||
2.35.3
|
||||
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
From ea6eef2c8a33d783a39ab02942a2027448718344 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Sat, 3 Sep 2022 00:06:58 +0200
|
||||
Subject: [PATCH] Prefer bare xmllint
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Since oe-core
|
||||
commit 8159b47e7ddddaca57ade2ecf24d8ff9a0abf26a
|
||||
Author: Ross Burton <ross.burton@arm.com>
|
||||
Date: Tue Aug 23 16:37:30 2022 +0100
|
||||
|
||||
libxml2: wrap xmllint to use the correct XML catalogues
|
||||
|
||||
we fail building doctools.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
src/meinproc.cpp | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/meinproc.cpp b/src/meinproc.cpp
|
||||
index 930c77f..4e15c35 100644
|
||||
--- a/src/meinproc.cpp
|
||||
+++ b/src/meinproc.cpp
|
||||
@@ -113,7 +113,12 @@ int main(int argc, char **argv)
|
||||
QByteArray catalogs = lst.join(" ").toLocal8Bit();
|
||||
QString exe;
|
||||
#if defined(XMLLINT)
|
||||
- exe = QStringLiteral(XMLLINT);
|
||||
+ // OE-CORE's wrapped xmllint does not work here. Check for
|
||||
+ // unwrapped (created by create_wrapper) and prefer that
|
||||
+ exe = QStringLiteral(XMLLINT) + QStringLiteral(".real");
|
||||
+ if (!QFileInfo(exe).isExecutable()) {
|
||||
+ exe = QStringLiteral(XMLLINT);
|
||||
+ }
|
||||
#endif
|
||||
if (!QFileInfo(exe).isExecutable()) {
|
||||
exe = QStandardPaths::findExecutable(QStringLiteral("xmllint"));
|
||||
--
|
||||
2.35.3
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
From f312d35d8430656d6fdabafc37073864afe1fcda Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Fri, 28 Nov 2014 11:16:49 +0100
|
||||
Subject: [PATCH 3/5] set meinproc5 executable so that it can be found for us
|
||||
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>
|
||||
|
||||
---
|
||||
KF5DocToolsMacros.cmake | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/KF5DocToolsMacros.cmake b/KF5DocToolsMacros.cmake
|
||||
index 0250770..ec76429 100644
|
||||
--- a/KF5DocToolsMacros.cmake
|
||||
+++ b/KF5DocToolsMacros.cmake
|
||||
@@ -61,7 +61,7 @@
|
||||
#
|
||||
|
||||
set(KDOCTOOLS_SERIALIZE_TOOL "" CACHE STRING "Tool to serialize resource-intensive commands in parallel builds")
|
||||
-set(KDOCTOOLS_MEINPROC_EXECUTABLE "KF5::meinproc5")
|
||||
+set(KDOCTOOLS_MEINPROC_EXECUTABLE "meinproc5")
|
||||
|
||||
if(KDOCTOOLS_SERIALIZE_TOOL)
|
||||
# parallel build with many meinproc invocations can consume a huge amount of memory
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
@@ -1,42 +0,0 @@
|
||||
From 6e7cb3131acc1a066e942686d72c1d0d70ca7c4c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Fri, 6 Oct 2017 13:08:01 +0200
|
||||
Subject: [PATCH] Make our cross build find docbookl10nhelper
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
|
||||
---
|
||||
src/CMakeLists.txt | 12 ------------
|
||||
1 file changed, 12 deletions(-)
|
||||
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 7b07433..1fa68ad 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -224,18 +224,6 @@ if(INSTALL_INTERNAL_TOOLS)
|
||||
install(TARGETS docbookl10nhelper EXPORT KF5DocToolsToolsTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
endif()
|
||||
|
||||
-if(CMAKE_CROSSCOMPILING AND DOCBOOKL10NHELPER_EXECUTABLE)
|
||||
- add_executable(KF5::docbookl10nhelper IMPORTED GLOBAL)
|
||||
- set_target_properties(KF5::docbookl10nhelper PROPERTIES IMPORTED_LOCATION ${DOCBOOKL10NHELPER_EXECUTABLE})
|
||||
-else()
|
||||
- add_executable(KF5::docbookl10nhelper ALIAS docbookl10nhelper)
|
||||
-endif()
|
||||
-
|
||||
-add_custom_command( TARGET docbookl10nhelper POST_BUILD
|
||||
- COMMAND $<TARGET_FILE:KF5::docbookl10nhelper>
|
||||
- "${DOCBOOKXSL_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/customization/xsl"
|
||||
- "${CMAKE_CURRENT_BINARY_DIR}/customization/xsl"
|
||||
-)
|
||||
|
||||
# all-l10n.xml is generated by docbookl10nhelper
|
||||
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/customization/xsl/all-l10n.xml
|
||||
--
|
||||
2.9.4
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
From c4030d7fec972b950c02668f4c32a1e412be286e Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Fri, 28 Nov 2014 10:04:17 +0100
|
||||
Subject: [PATCH] Add cmdline param to help find xsl
|
||||
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@gmail.com>
|
||||
|
||||
---
|
||||
CMakeLists.txt | 2 ++
|
||||
cmake/FindDocBookXSL.cmake | 2 +-
|
||||
2 files changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 17bcfab..0e62df9 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -30,6 +30,8 @@ option(INSTALL_INTERNAL_TOOLS "Install internal tools too." OFF)
|
||||
option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF)
|
||||
add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)")
|
||||
|
||||
+# OE specific
|
||||
+set(OE_ROOT_PATH_PREFIX "" CACHE STRING "OE sysroot")
|
||||
# Dependencies
|
||||
set(REQUIRED_QT_VERSION 5.15.2)
|
||||
find_package(Qt${QT_MAJOR_VERSION}Core ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
|
||||
diff --git a/cmake/FindDocBookXSL.cmake b/cmake/FindDocBookXSL.cmake
|
||||
index 1cb222c..819da63 100644
|
||||
--- a/cmake/FindDocBookXSL.cmake
|
||||
+++ b/cmake/FindDocBookXSL.cmake
|
||||
@@ -34,7 +34,7 @@ find_path (DocBookXSL_DIR lib/lib.xsl
|
||||
if (NOT DocBookXSL_DIR)
|
||||
# hacks for systems that put the version in the stylesheet dirs
|
||||
set (STYLESHEET_PATH_LIST)
|
||||
- foreach (STYLESHEET_PREFIX_ITER ${CMAKE_SYSTEM_PREFIX_PATH})
|
||||
+ foreach (STYLESHEET_PREFIX_ITER ${CMAKE_SYSTEM_PREFIX_PATH} ${OE_ROOT_PATH_PREFIX})
|
||||
file(GLOB STYLESHEET_SUFFIX_ITER RELATIVE ${STYLESHEET_PREFIX_ITER}
|
||||
${STYLESHEET_PREFIX_ITER}/share/xml/docbook/xsl-stylesheets-*
|
||||
)
|
||||
@@ -3,14 +3,16 @@ require ${BPN}.inc
|
||||
inherit native
|
||||
|
||||
DEPENDS += " \
|
||||
libxslt-native \
|
||||
libxml2-native \
|
||||
karchive-native \
|
||||
ki18n-native \
|
||||
liburi-perl-native \
|
||||
docbook-xml-dtd4-native \
|
||||
docbook-xsl-stylesheets-native \
|
||||
libxslt-native \
|
||||
karchive-native \
|
||||
ki18n-native \
|
||||
"
|
||||
|
||||
RDEPENDS:${PN} += "gettext-native"
|
||||
|
||||
SRC_URI += "file://0001-don-t-build-documentation.patch"
|
||||
SRC_URI += " \
|
||||
file://0001-don-t-build-documentation.patch \
|
||||
file://0002-Prefer-bare-xmllint.patch \
|
||||
"
|
||||
|
||||
@@ -1,12 +1,21 @@
|
||||
require ${BPN}.inc
|
||||
|
||||
DEPENDS += "${BPN}-native gettext-native karchive ki18n libxslt libxml2"
|
||||
DEPENDS += " \
|
||||
${BPN}-native \
|
||||
docbook-xml-dtd4 \
|
||||
docbook-xsl-stylesheets \
|
||||
libxslt \
|
||||
libxml2 \
|
||||
karchive \
|
||||
ki18n \
|
||||
"
|
||||
|
||||
inherit cmake_lib
|
||||
|
||||
SRC_URI += " \
|
||||
file://0003-Make-our-cross-build-find-docbookl10nhelper.patch \
|
||||
file://0004-Add-cmdline-param-to-help-find-xsl.patch \
|
||||
EXTRA_OECMAKE = " \
|
||||
-DMEINPROC5_EXECUTABLE=${STAGING_DIR_NATIVE}/${bindir}/meinproc5 \
|
||||
-DDOCBOOKL10NHELPER_EXECUTABLE=${STAGING_DIR_NATIVE}/${bindir}/docbookl10nhelper \
|
||||
-DCHECKXML5_EXECUTABLE=${STAGING_DIR_NATIVE}/${bindir}/checkXML5 \
|
||||
"
|
||||
|
||||
do_configure:append() {
|
||||
|
||||
@@ -8,22 +8,17 @@ LIC_FILES_CHKSUM = " \
|
||||
file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
|
||||
"
|
||||
|
||||
inherit kde-kf5 perlnative
|
||||
inherit kde-kf5 perlnative gettext
|
||||
|
||||
# allarch recipes
|
||||
DEPENDS += "docbook-xml-dtd4 docbook-xsl-stylesheets liburi-perl-native"
|
||||
DEPENDS += " \
|
||||
liburi-perl-native \
|
||||
libxml2-native \
|
||||
"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "f54e61ffe8c5e634e7d6e341020b63346d40b524d4a22565c86b9147033cd2f4"
|
||||
SRC_URI += "file://0002-set-meinproc5-executable-so-that-it-can-be-found-for.patch"
|
||||
SRC_URI[sha256sum] = "61ac72b2d338cddc6da57b9097287303117e0d49ccd1c717f69f38ac01150af6"
|
||||
|
||||
# allarch packages do only install into machine sysroot
|
||||
# for xml4
|
||||
OECMAKE_EXTRA_ROOT_PATH = "${STAGING_DIR}/${MACHINE}"
|
||||
# for xsl (we have to hardcode /usr - ${prefix} is aligned by native.bbclase
|
||||
EXTRA_OECMAKE += " \
|
||||
-DOE_ROOT_PATH_PREFIX=${STAGING_DIR}/${MACHINE}/usr \
|
||||
-DCMAKE_AR:FILEPATH=${AR} \
|
||||
-DINSTALL_INTERNAL_TOOLS=ON \
|
||||
"
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = " \
|
||||
inherit kde-kf5 pkgconfig gettext
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "7f573b1a30349e331309dcf9e3374d7a304b6bdd0453a122366f7bd2574977e6"
|
||||
SRC_URI[sha256sum] = "3f2fd85176d7550de8f0af31ba90976b6b50ed277f7c881d1666e082edd07021"
|
||||
|
||||
# TODO: optionals PACKAGECONFIG (poppler-qt5 / exiv2 / ffmpeg / epub)
|
||||
DEPENDS += " \
|
||||
|
||||
@@ -15,7 +15,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "b189626c091dc9959d586a229c47ca36443b77d79706476ff89a50f9e8774e54"
|
||||
SRC_URI[sha256sum] = "eb83362fb98b2a9eba02c434fe5ab137a29f9a33101553adeb3e12d88bc05211"
|
||||
|
||||
FILES:${PN} += " \
|
||||
${OE_QMAKE_PATH_PLUGINS} \
|
||||
|
||||
@@ -12,6 +12,6 @@ DEPENDS += "kcoreaddons kcoreaddons-native kwidgetsaddons \
|
||||
${@bb.utils.contains("DISTRO_FEATURES", "x11", "qtx11extras", "", d)}"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "014f45fca82886af463956c533f5ba868700ac7ec61733f35a7fabad0042b007"
|
||||
SRC_URI[sha256sum] = "c9cd2ec18416a7b70dd2e480298bbec55c419446afa66eeb0cddfc5e97cc429b"
|
||||
|
||||
FILES:${PN} += "${datadir}/dbus-1"
|
||||
|
||||
@@ -25,7 +25,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "c8d51ce32b65f096c75da3e7bdb033202086cabaa8faad3bcdd46730b74b43bf"
|
||||
SRC_URI[sha256sum] = "e36364141e715b2b06e583f3f991fa4dcd627822d2887b76b9cc98653dc0d41f"
|
||||
|
||||
FILES:${PN} += " \
|
||||
${datadir}/dbus-1 \
|
||||
|
||||
@@ -8,6 +8,6 @@ LIC_FILES_CHKSUM = " \
|
||||
inherit kde-kf5
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "4d4c9c2920c9b10f6879f2d8a29426615e9e6b13d78c0b751ea4a656b4baf414"
|
||||
SRC_URI[sha256sum] = "2c1dd7b2ecf54a5356e89037977703f9d15970dab0e3ac455f969e6d1741410e"
|
||||
|
||||
EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
|
||||
|
||||
@@ -14,7 +14,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "569a60318b54cca6a5c5fb1e182556010d2f4c052961b125ad852ffa015746ca"
|
||||
SRC_URI[sha256sum] = "87c5a63d9d2984fa9ab439d89e5d6f51744185a3e3f5e33b5d84cc18e8280ac4"
|
||||
|
||||
EXTRA_OECMAKE += "-DUTEMPTER_EXECUTABLE=${libexecdir}/utempter/utempter"
|
||||
|
||||
|
||||
@@ -9,4 +9,4 @@ inherit kde-kf5 gettext
|
||||
DEPENDS += "ki18n"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "e4adf0f124db45134042e706b466c30e531398996f872294119887af9ca38049"
|
||||
SRC_URI[sha256sum] = "dbf85e140736132f89f01b939627aa40c40ef2f7913addd63d7e7ba3e6a957df"
|
||||
|
||||
@@ -15,4 +15,4 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "458e12e4d4898d5e660ea6a3fe0d6158c208f5d4176451e1132423df2044685b"
|
||||
SRC_URI[sha256sum] = "560262fe64af2891e457b4b123330be03bbf2bbb3b3fc29b657ee19fa3ae9d61"
|
||||
|
||||
@@ -32,7 +32,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "9dc4182e5803c32a47d6a82588f6a6b36837fb44a90fe4404750886150b9273a"
|
||||
SRC_URI[sha256sum] = "1f869c0eecca5b27bac4b51a29f5782725f2123430946e6a8f1fcc56beba5968"
|
||||
|
||||
SRC_URI += " \
|
||||
file://baloo_file.desktop \
|
||||
|
||||
@@ -29,7 +29,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "52dd5eba3daeb2a9bbb3a1865b3219277b3ca6357c2870c3570dfac10f445adf"
|
||||
SRC_URI[sha256sum] = "d12dbb6e6ff62244eb090027a00f72a4816358b1a18d7b96df8371865a06cf37"
|
||||
|
||||
do_compile:prepend() {
|
||||
# Error: Could not locate service type file kservicetypes5/ "kfileitemactionplugin.desktop" , tried ...
|
||||
|
||||
@@ -19,4 +19,4 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "8ccb99ab6f6e9babd503abd043ab183b849cfd9248d3b7d4e2805c75735f517c"
|
||||
SRC_URI[sha256sum] = "776dac6741d15dd02593891ad1b5d9ca3598df5edb3d431ed9e8c1386ae16b6a"
|
||||
|
||||
@@ -25,7 +25,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "798cef6990cdcb22e4822ea12c3c0b9aa35797806e93fb474a2f58632cd53309"
|
||||
SRC_URI[sha256sum] = "ad1907b5347a907cfa2ff0ef37432d4f1f6b6abbaac2866b75a590b8926a5a75"
|
||||
|
||||
FILES:${PN} += " \
|
||||
${OE_QMAKE_PATH_QML} \
|
||||
|
||||
@@ -25,7 +25,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "35055f637ff44b0f0e67f9b5c79307d37f5c259289bf71b2a24c0203f82fb508"
|
||||
SRC_URI[sha256sum] = "20c6016c06a0d24a97af5cd36ed319eee918af051a62265f3f51c7c1c6c58428"
|
||||
|
||||
FILES:${PN} += "${OE_QMAKE_PATH_PLUGINS}/designer"
|
||||
|
||||
|
||||
@@ -17,4 +17,4 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "8b211ec6e1009f11ae5d0769e21947a473d6ca479ea8a16701a808aa57335b3e"
|
||||
SRC_URI[sha256sum] = "d58d8435eef1f57f0e7d207d63e002e29e0067e2621c522dfcba6f5df4fca5db"
|
||||
|
||||
@@ -36,6 +36,6 @@ SRC_URI += " \
|
||||
"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "f2996ca7671994f42c9233897d10d6bc93ffc2b12865ae07e516a93812dd6b08"
|
||||
SRC_URI[sha256sum] = "be68d2983643616e257d7a4cc07f87e5e2219abc3ce9cf5500e0fc9e46185a70"
|
||||
|
||||
FILES:${PN} += "${OE_QMAKE_PATH_QML}/org/kde"
|
||||
|
||||
@@ -18,7 +18,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "2f4d61a3e8c64f81e5916558d48e381d0a3890c5ad388f27934944136c44f3c5"
|
||||
SRC_URI[sha256sum] = "4bdc348378f794aef9bc4f5dcae5a5d5a781a43bae64fdb9c8a04717e15ff6a7"
|
||||
SRC_URI += "file://0001-hardcode-path-to-kconf_update.patch"
|
||||
|
||||
FILES:${PN} += " \
|
||||
|
||||
@@ -19,4 +19,4 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "90494323ebab4c8cdd93c068c2c4fe3a8457513cee21d7887fc4473028a9dce1"
|
||||
SRC_URI[sha256sum] = "652eb62f3a1f5600b15b1e42ff4d2542ccc9786244b58b73baa4511964d64fb3"
|
||||
|
||||
@@ -13,7 +13,7 @@ inherit kde-kf5 gettext
|
||||
DEPENDS += "karchive kconfig kconfig-native kservice kcoreaddons kcoreaddons-native"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "fa7db15d75a017e75514af4361ae3dd91a22ac9d9e2daf41a8e7e33bcce31302"
|
||||
SRC_URI[sha256sum] = "e25afceabb2cd35ae6f38b9e2d40c88d6ec20077b700971cec08147a6041310a"
|
||||
|
||||
FILES:${PN} += " \
|
||||
${datadir}/emoticons \
|
||||
|
||||
@@ -18,7 +18,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "a34b00116a72d0973cdeb203a5d237da63cc307e9e294dfaedb00ff0a36835e9"
|
||||
SRC_URI[sha256sum] = "e5c4d3538228279aae7a6f3183e2a24c0c1ccabd95cdb0693eaa343599e7ab31"
|
||||
|
||||
FILES:${PN} += " \
|
||||
${datadir}/dbus-1 \
|
||||
|
||||
@@ -25,6 +25,6 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "d972d81dcd7ccb74ef4abd4db2a88512a07ea459a301b94e7a98b831ab814993"
|
||||
SRC_URI[sha256sum] = "94f1c6a8aeabfe5b3f2db4bb308546e4941afbc3ba8743c00ed746b360aa9a11"
|
||||
|
||||
FILES:${PN} += "${OE_QMAKE_PATH_PLUGINS}"
|
||||
|
||||
@@ -24,7 +24,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "ee98f909cea837dc0e8cae363fda5891fac89de388aaf75388e3ae9f3e1ebc61"
|
||||
SRC_URI[sha256sum] = "5856ac46acb27be6e5dba041d2cc24b6f430c49379cc97b116d8c0dd40444ca5"
|
||||
|
||||
FILES:${PN} += "${datadir}/dbus-1 ${libdir}/libkdeinit5_klauncher.so"
|
||||
FILES:${PN}-dev = "${libdir}/cmake"
|
||||
|
||||
@@ -36,7 +36,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "85c0bf8e49d845730d95c85c0292330a5bf03ed63a008cbf02ec9d02f990d09b"
|
||||
SRC_URI[sha256sum] = "cc9b80507a8eb49470b9352c4171ab194cc6ab3cb6e80793d6c7a05181675887"
|
||||
|
||||
PACKAGECONFIG[full] = "-DKIOCORE_ONLY=OFF,-DKIOCORE_ONLY=ON, kbookmarks kcompletion kconfigwidgets kiconthemes kitemviews kjobwidgets kwidgetsaddons kwindowsystem"
|
||||
# Note that kdeclarative fails without KIOWidgets
|
||||
|
||||
@@ -33,7 +33,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "aacd014f99ab66d40ae98333cb56257244ca552bc4df0ce04de4e29bae90336f"
|
||||
SRC_URI[sha256sum] = "d727bbddcebd49a29c2d2e8a8315e40092bf044e85c1ba6c3a0bf07efdfa894c"
|
||||
|
||||
FILES:${PN} += " \
|
||||
${OE_QMAKE_PATH_QML}/org/kde/newstuff \
|
||||
|
||||
@@ -23,4 +23,4 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "ab85989a7482ab8e2feddd1d3c6a1f2f81a16af67894bd9dea725421c3ba8910"
|
||||
SRC_URI[sha256sum] = "1bda7bb052c6316058cf93d2d6f0a79da0f71aa8ed633f5cd0e7874908738dfa"
|
||||
|
||||
@@ -26,7 +26,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "05a5120f1a97dce84f5ea85d80eb4eb50793f800ce2af055d1d73ce61ed06bba"
|
||||
SRC_URI[sha256sum] = "ef833d4a5165445c148186da0d7c977a72d1606cf07fcf6ff8e9d4c48e532551"
|
||||
|
||||
FILES:${PN} += " \
|
||||
${datadir}/k*5 \
|
||||
|
||||
@@ -18,7 +18,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "217eba378c223e3518914512fc303a106101d26fa1a8fc57495abbd0d36a5274"
|
||||
SRC_URI[sha256sum] = "7b201ab2f1dabce12d4a97041ad20b35891fc65ad7cc88c006b132b8dc6dc2bb"
|
||||
|
||||
FILES:${PN} += " \
|
||||
${datadir}/k*5 \
|
||||
|
||||
@@ -22,7 +22,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "32b0bcda190884f9de2f8a598c854ed2d29cab199dda5d341364913321b7cbd1"
|
||||
SRC_URI[sha256sum] = "295fb5f03c7c806bed68b358f4de517ad8a8758c9abd10f5761f3f0b39d8ad29"
|
||||
|
||||
FILES:${PN} += " \
|
||||
${datadir}/k*5 \
|
||||
|
||||
@@ -24,6 +24,6 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "1aad105fc0a4060b1cbe6e29f96f93a01af254159c9263c080d94e4eeae43b32"
|
||||
SRC_URI[sha256sum] = "6d0016a801edbd2989a13a3cf460b1164663c9b205ced8f9242f256a1b3e202e"
|
||||
|
||||
FILES:${PN} += "${datadir}/kservicetypes5"
|
||||
|
||||
@@ -27,7 +27,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "d82d9997167d718ab821dce40e8752205a5ab60f2e69a1bffaf2265455e1b3b6"
|
||||
SRC_URI[sha256sum] = "8b728bf715ce19725e63fa8a19171f9b61ee85425f0fd4e64669d16fc6811c0a"
|
||||
|
||||
EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ DEPENDS += "kcompletion kconfig kconfigwidgets ki18n kiconthemes kservice kwidge
|
||||
gettext-native sonnet-native"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "44fceedacb526f4c3c66c1d55257bb39881c7dcca55dae0deccefd84399ed866"
|
||||
SRC_URI[sha256sum] = "bd42fb15833fcfb4f739999d525b27b55c16eec8e5dec8a6ec2d7a1b9c288acf"
|
||||
|
||||
FILES:${PN} += " \
|
||||
${OE_QMAKE_PATH_PLUGINS}/designer \
|
||||
|
||||
@@ -13,6 +13,7 @@ inherit kde-kf5
|
||||
DEPENDS += " \
|
||||
libgcrypt \
|
||||
gpgme \
|
||||
qca \
|
||||
kconfig \
|
||||
kconfig-native \
|
||||
kcoreaddons \
|
||||
@@ -30,7 +31,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "01366b42754ee7543b67fe57deb39bc2a772923eda3e6ea70a59f8ef955e2a32"
|
||||
SRC_URI[sha256sum] = "ab9b78b0c6aba461de6247974b7e60239cd2a52a1c2c6d67b92e466c7597d821"
|
||||
SRC_URI += "file://0001-KF5WalletConfig.cmake.in-point-runtime-bindir-not-bu.patch"
|
||||
|
||||
FILES:${PN} += "${datadir}"
|
||||
|
||||
@@ -29,7 +29,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "43a31730ff0ed113320817aa35a04e53b6ec647ab94320cf3b075adc38619dd6"
|
||||
SRC_URI[sha256sum] = "baf17929d6aabc11f6c9f8ac5402388846bf7c1d65d6896008c60d953218adf5"
|
||||
|
||||
EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
|
||||
|
||||
|
||||
@@ -45,7 +45,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "6cebfb9e7b61062194119bf7c4ef0e9529cd7321c8e06fb68b68fa518815ed2a"
|
||||
SRC_URI[sha256sum] = "73987d498bd231d984dbaad9fb94e38e32441635464ffeacbfcd089a7695b527"
|
||||
|
||||
FILES:${PN} += " \
|
||||
${datadir}/kdevappwizard \
|
||||
|
||||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
inherit kde-kf5 gettext gtk-icon-cache
|
||||
|
||||
SRC_URI[sha256sum] = "73adff977f2a69624abaf6340d6609dde41f404600feb28e51e1c7db4541b3ab"
|
||||
SRC_URI[sha256sum] = "83fed8d56231a11fc1e39a04aef8caf84408c51a5806b633bf18895d5481519f"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "0b15210dbe93c22e423c876b27ca2f530f66cb72c6c5bcc7f854848ded0e7e48"
|
||||
SRC_URI[sha256sum] = "466967eec3b10a3e0eb0c2e1f09b9c23ff0f08399563d112c7bec26061f134a6"
|
||||
|
||||
FILES:${PN} += " \
|
||||
${OE_QMAKE_PATH_PLUGINS} \
|
||||
|
||||
@@ -25,7 +25,7 @@ DEPENDS += " \
|
||||
RRECCOMENDS_${PN} += "oxygen-fonts"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[sha256sum] = "9a64abebf8d242765ae759611fc9819a03403047ed56b8dd71aba7a0bbb4faa6"
|
||||
SRC_URI[sha256sum] = "3b6822538383ae4a152498c09024c02c03c97742e40a1fe3bdb08eb5ed4332eb"
|
||||
|
||||
FILES:${PN} += " \
|
||||
${datadir}/knotifications5 \
|
||||
|
||||
@@ -11,8 +11,7 @@ inherit kde-kf5
|
||||
|
||||
DEPENDS = "qttools-native"
|
||||
|
||||
SRC_URI[sha256sum] = "23548a8ce2b998cfa675fc00112bf93914ee25194f0bfdf832d283c8d678d279"
|
||||
SRC_URI += "file://0001-Temporary-workaround-gold-linker-errors.patch"
|
||||
SRC_URI[sha256sum] = "9ed235f3dad82ba67dc61eeab12536b6d5936c036d32d7e7d2f38a17b9efc50a"
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
From 372afa604264e70963d838f46ce30938d71226d2 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Thu, 23 Aug 2018 00:41:35 +0200
|
||||
Subject: [PATCH] Temporary workaround gold linker errors
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
kde-modules/KDECompilerSettings.cmake | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/kde-modules/KDECompilerSettings.cmake b/kde-modules/KDECompilerSettings.cmake
|
||||
index 44358fb..1402796 100644
|
||||
--- a/kde-modules/KDECompilerSettings.cmake
|
||||
+++ b/kde-modules/KDECompilerSettings.cmake
|
||||
@@ -344,8 +344,8 @@ if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT APPLE) OR
|
||||
(CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT APPLE) OR
|
||||
(CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND NOT WIN32))
|
||||
# Linker warnings should be treated as errors
|
||||
- set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings ${CMAKE_SHARED_LINKER_FLAGS}")
|
||||
- set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings ${CMAKE_MODULE_LINKER_FLAGS}")
|
||||
+ #set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings ${CMAKE_SHARED_LINKER_FLAGS}")
|
||||
+ #set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings ${CMAKE_MODULE_LINKER_FLAGS}")
|
||||
|
||||
# Do not allow undefined symbols, even in non-symbolic shared libraries
|
||||
set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined ${CMAKE_SHARED_LINKER_FLAGS}")
|
||||
--
|
||||
2.14.4
|
||||
|
||||
Reference in New Issue
Block a user