kde-apps: upgrade 18.08.3 -> 18.12.0
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
inherit kde-base
|
||||
|
||||
KDE_APP_VERSION = "18.08.3"
|
||||
KDE_APP_VERSION = "18.12.0"
|
||||
|
||||
SRC_URI = "${KDE_MIRROR}/stable/applications/${PV}/src/${BPN}-${PV}.tar.xz"
|
||||
|
||||
|
||||
@@ -28,8 +28,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "623c3feaea00c573dbe2308f85ed0cfb"
|
||||
SRC_URI[sha256sum] = "aeb735ad332514d284b2bad9e6dd41261a81f901ff896001ef9e5b986620b3fb"
|
||||
SRC_URI[md5sum] = "54946702f3254fe1cae106f56b6ad49e"
|
||||
SRC_URI[sha256sum] = "2f50e6f5b0973e6e760499c680d9c54aeef0d93c9440db4805401399148ad59a"
|
||||
SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
|
||||
|
||||
FILES_${PN} += " \
|
||||
|
||||
@@ -19,8 +19,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "8535ac3f5f3443dc4ad0bd0606c3b811"
|
||||
SRC_URI[sha256sum] = "3a8583adbd9bf9f1c38918c11972ef8aa2db5e94bee36695823c1360a7d47d1c"
|
||||
SRC_URI[md5sum] = "355a3e9643baefd4dae0afd5ec13f00c"
|
||||
SRC_URI[sha256sum] = "8fb291d02eb13315f1544d2523d50a9107f8ea5a564f7611e7e2b5240a0507eb"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kservices5 \
|
||||
|
||||
@@ -19,8 +19,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "e44a1626281a33d17ecbc6b7e818c752"
|
||||
SRC_URI[sha256sum] = "a5ce1d7adadfb19585e440191083ad7d4df8498e3ab7c81ce0c7c668f9582330"
|
||||
SRC_URI[md5sum] = "eccd654f5f77cc0d5591273fd80f5a27"
|
||||
SRC_URI[sha256sum] = "3ca6818cef966ebe2e05699a96b1a50eb6b7905bf9f053c33221f6f5c7e454bb"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kxmlgui5 \
|
||||
|
||||
@@ -19,8 +19,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "ea42d71187245acdf204aa03610b41f5"
|
||||
SRC_URI[sha256sum] = "8324e4552d896970c90f9c63f202979b6520f18f291f4fa8b9baf33c25105e42"
|
||||
SRC_URI[md5sum] = "cda075981571d51e0c20607f58c84fe4"
|
||||
SRC_URI[sha256sum] = "3cca26bc0064b4babb4b8f524b521ba1fa257f42c8cb0f06188072053bd5f31e"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/config.kcfg \
|
||||
|
||||
@@ -36,8 +36,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "55aa66c77b94e52582e09366aaae5a5b"
|
||||
SRC_URI[sha256sum] = "2bb4560979f8b3fe970bfdebea51b784cc3088ee4c3919bc5d9bf5eb5dfd916c"
|
||||
SRC_URI[md5sum] = "b69d59ae2de93fe9213acca858d6a83d"
|
||||
SRC_URI[sha256sum] = "837f8a43f09ef0e74e634cc5c1538cd5230f63c2a55675b3ae93f412d36cbf82"
|
||||
SRC_URI += " \
|
||||
file://0001-fix-build-for-qtbase-without-session-management.patch \
|
||||
file://0002-Revert-Make-target_link_libraries-for-kdeinit_dolphi.patch \
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From b9abe385e2563d7178fbf982ec6977b9f3e625bf Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Fri, 28 Aug 2015 23:22:18 +0200
|
||||
Subject: [PATCH 2/2] fix build for qtbase without session management
|
||||
Subject: [PATCH] fix build for qtbase without session management
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
@@ -16,7 +16,7 @@ diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
|
||||
index f7a7613..127cd85 100644
|
||||
--- a/src/dolphinmainwindow.cpp
|
||||
+++ b/src/dolphinmainwindow.cpp
|
||||
@@ -346,9 +346,11 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event)
|
||||
@@ -386,9 +386,11 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event)
|
||||
// Find out if Dolphin is closed directly by the user or
|
||||
// by the session manager because the session is closed
|
||||
bool closedByUser = true;
|
||||
@@ -32,7 +32,7 @@ diff --git a/src/main.cpp b/src/main.cpp
|
||||
index b4ca2c6..5c058a9 100644
|
||||
--- a/src/main.cpp
|
||||
+++ b/src/main.cpp
|
||||
@@ -134,6 +134,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
|
||||
@@ -156,6 +156,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
|
||||
|
||||
mainWindow->show();
|
||||
|
||||
@@ -40,7 +40,7 @@ index b4ca2c6..5c058a9 100644
|
||||
if (app.isSessionRestored()) {
|
||||
const QString className = KXmlGuiWindow::classNameOfToplevel(1);
|
||||
if (className == QLatin1String("DolphinMainWindow")) {
|
||||
@@ -142,6 +143,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
|
||||
@@ -164,6 +165,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
|
||||
qCWarning(DolphinDebug) << "Unknown class " << className << " in session saved data!";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -21,7 +21,4 @@ index 5aff4b0fa..9dc77c3da 100644
|
||||
+target_link_libraries(kdeinit_dolphin
|
||||
dolphinstatic
|
||||
dolphinprivate
|
||||
)
|
||||
--
|
||||
2.14.4
|
||||
|
||||
KF5::Crash
|
||||
|
||||
@@ -29,8 +29,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "8ebe9af5816d17a84094da963f77b3ef"
|
||||
SRC_URI[sha256sum] = "e202596ffc56e6d45fbd42d0259be2ebe148c29c940c9d87282e2998dac7448e"
|
||||
SRC_URI[md5sum] = "8e38c3c28338792910798eed0861f88a"
|
||||
SRC_URI[sha256sum] = "44fcaed4c46d9d377f1d3121e32c1fdc51d5971a7b03aa4ca509567f92426d48"
|
||||
|
||||
CXXFLAGS += "-isystem ${STAGING_INCDIR}/phonon4qt5/KDE"
|
||||
|
||||
|
||||
@@ -21,8 +21,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "8339ad56f0ac0348ed0c1f8fe67e548c"
|
||||
SRC_URI[sha256sum] = "c24203ad84f109a831cfe970d4e524a0c883d3a31a58aef3cf00c149914ab042"
|
||||
SRC_URI[md5sum] = "87bff9a22dd0026d4a9a5fccc87c91e3"
|
||||
SRC_URI[sha256sum] = "5da7a635a5fcd70e790fc420c3d121a72c94427448953ec9f033e0a29fce5eed"
|
||||
SRC_URI += " \
|
||||
file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch \
|
||||
"
|
||||
|
||||
@@ -24,8 +24,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "66550efd554c665cf5e64ccc560a709c"
|
||||
SRC_URI[sha256sum] = "377ee8f1dcd9cf996e9727e58dc424611a35d851851c2bd2b54dd2b028a9b327"
|
||||
SRC_URI[md5sum] = "a46aeb08db2c6134f730a5d722ca9929"
|
||||
SRC_URI[sha256sum] = "bfd2c091dece26d3bef8b45208c4072d5403aa8cad5c6637fde255be0f24bf90"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/config.kcfg \
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
From 06f07a9b331bec4ff51c2a5174e758b1bffba10c Mon Sep 17 00:00:00 2001
|
||||
From: "Luis Gustavo S. Barreto" <gustavo@ossystems.com.br>
|
||||
Date: Wed, 6 Apr 2016 19:23:55 +0000
|
||||
Subject: [PATCH 2/3] Set Kipi package properties
|
||||
|
||||
This change make Kipi optional.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Luis Gustavo S. Barreto <gustavo@ossystems.com.br>
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index a18ca16..d855192 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -75,7 +75,7 @@ find_package(KF5Kipi)
|
||||
if (KF5Kipi_FOUND)
|
||||
set(KIPI_FOUND true)
|
||||
endif()
|
||||
-# set_package_properties(Kipi PROPERTIES URL"http://www.kipi-plugins.org" DESCRIPTION "Provides various image manipulation and export features" TYPE OPTIONAL)
|
||||
+set_package_properties(KF5Kipi PROPERTIES URL "http://www.kipi-plugins.org" DESCRIPTION "Provides various image manipulation and export features" TYPE OPTIONAL)
|
||||
|
||||
find_package(LCMS2)
|
||||
set_package_properties(LCMS2 PROPERTIES URL "http://www.littlecms.com" DESCRIPTION "Color management engine" TYPE REQUIRED)
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@@ -25,12 +25,11 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "75eb27efb8710a063bb4b7f247f0ddff"
|
||||
SRC_URI[sha256sum] = "0c95452ad82e2a5e7bc6bdb4464e7be44b6af9c75a972678f8925e2a6bb15671"
|
||||
SRC_URI[md5sum] = "fc5d489f79e1f666ca8cadcca9657c65"
|
||||
SRC_URI[sha256sum] = "2e8bab23346cbc7ca8561e8ea88a8d9f73b017948b87348199ab2bb70a362fdd"
|
||||
|
||||
SRC_URI += " \
|
||||
file://0001-Set-Kipi-package-properties.patch \
|
||||
file://0002-Avoid-try_run.patch \
|
||||
file://0001-Avoid-try_run.patch \
|
||||
"
|
||||
|
||||
CXXFLAGS += "-isystem ${STAGING_INCDIR}/phonon4qt5/KDE"
|
||||
|
||||
@@ -26,8 +26,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "b76e38cc2a5549373b06836fe56b60b2"
|
||||
SRC_URI[sha256sum] = "15a74129d53133b4b771060875c2c0f2fda92db8361a273dd38553e019e38878"
|
||||
SRC_URI[md5sum] = "86e94a0054acaad049ba8fba09a3629f"
|
||||
SRC_URI[sha256sum] = "9177ccb87e2ad7cfe8cefa2553d7e35681be7c7cec8816f14b5df6e8e442186a"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kxmlgui5 \
|
||||
|
||||
@@ -34,8 +34,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "fb20d04f0807ddce9fd6d73bac379f30"
|
||||
SRC_URI[sha256sum] = "d0a95d777f7638ffb6ba4e6b064c1eee79f291d01945e93286e708d7a05fd811"
|
||||
SRC_URI[md5sum] = "79e3b0ad727c17e93274f4003411199b"
|
||||
SRC_URI[sha256sum] = "14991164207cededb14c778837969a391d117eb484a871666598867ae3366696"
|
||||
|
||||
SRC_URI += " \
|
||||
file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch \
|
||||
|
||||
@@ -27,8 +27,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "b0cba325c112a036cac704b8dc8a3964"
|
||||
SRC_URI[sha256sum] = "21672c61fd741b9d8263990a3e82837394e0500044892bb6418efb3d251b68fb"
|
||||
SRC_URI[md5sum] = "9f6b9cd11dd9408c2ab93ad004d320b0"
|
||||
SRC_URI[sha256sum] = "1f3376ce8c63edfd790fd49926a8d139b99f59a994a8ffe888f5c37bcf7a77a0"
|
||||
SRC_URI += "file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch"
|
||||
|
||||
FILES_${PN} += " \
|
||||
|
||||
@@ -22,8 +22,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "9fabc1bf53bca51a7545a65bb12ae07a"
|
||||
SRC_URI[sha256sum] = "fcc0659ee97fb17106cfe6d52c5152104af64294b43e001f3e8a1550410829f7"
|
||||
SRC_URI[md5sum] = "423b180ca0de447bdedc9ec9e2eefb49"
|
||||
SRC_URI[sha256sum] = "ca9d8d21747d694d786c9f0be3390c223b9dd88318989974f1b1bf63fa551538"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/config.kcfg \
|
||||
|
||||
@@ -28,8 +28,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "630d379236843bcf68acdebfb5053386"
|
||||
SRC_URI[sha256sum] = "4150f85ffdabe06a2989f50cb6dc8dacf4da32187b350346af9d9b8eb564ecd1"
|
||||
SRC_URI[md5sum] = "991df33a858011a174593cf4d1d68e82"
|
||||
SRC_URI[sha256sum] = "88ac2c263e0f3604be06197ed74799e8c047cf0ec8ca5a89e509dda43285b9e4"
|
||||
SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
|
||||
|
||||
FILES_${PN} += " \
|
||||
|
||||
@@ -22,8 +22,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "b49543a80b664189298529b88a84cd98"
|
||||
SRC_URI[sha256sum] = "35d72e101e481306fdfc64d07c36e006feb99fcaeeb76ce703a9d964991ccc71"
|
||||
SRC_URI[md5sum] = "0695d02d462422609cecbf87b2fd9de8"
|
||||
SRC_URI[sha256sum] = "e078a0eb4becd00fef3b7c02b55468e4a2ef5f256106925555a9d9a7cbf68d97"
|
||||
|
||||
FILES_SOLIBSDEV = ""
|
||||
|
||||
|
||||
@@ -16,8 +16,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "0cf04a5362610c84fae2b930896466f6"
|
||||
SRC_URI[sha256sum] = "8d17463c72325d1f39490052ca9efb45441355ccc3bf683716e53057ce16bae3"
|
||||
SRC_URI[md5sum] = "a8c0c85d21beb2e96ee956619a3f5155"
|
||||
SRC_URI[sha256sum] = "0bbaa954d2eba84766aa3106152dffda29b5036fdc995d6c756ad577958e497d"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/icons \
|
||||
|
||||
@@ -36,8 +36,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "40824d0309f2f7a467812cbc1901dc13"
|
||||
SRC_URI[sha256sum] = "587941cccff85ff87063dbb70fe1a67f140fce207a46e35ce136cbf104e35d15"
|
||||
SRC_URI[md5sum] = "28e8c79216d3393eb50d90dd8d36e019"
|
||||
SRC_URI[sha256sum] = "978327f841b352d8b879a44b6f1f98eb76b8fb0acb02b9ee1185e277b4bb764a"
|
||||
|
||||
SRC_URI += " \
|
||||
file://0001-CMakeLists.txt-make-MLT_PREFIX-configurable.patch \
|
||||
|
||||
@@ -22,8 +22,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "5e356db415380418e94ab0d1ee53d0d4"
|
||||
SRC_URI[sha256sum] = "cf43e4002d18a1ce0b1463aa80dbe30e004796ec9962f47d00a474bda35c1439"
|
||||
SRC_URI[md5sum] = "f5c6377b5c51368c91f8a2af7995923c"
|
||||
SRC_URI[sha256sum] = "777b1d5903bc24981987e225350e454a008c83194ee0e517ac5f29df14f944b7"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/k*5 \
|
||||
|
||||
@@ -26,8 +26,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "96f1b75d6ba0a9f6eb190ddd24faa915"
|
||||
SRC_URI[sha256sum] = "a374cc40d03148acd8384d00af8dc256ffce6e2830a8781ec8d337db3a781eab"
|
||||
SRC_URI[md5sum] = "e92089339179355ca026d75791658de7"
|
||||
SRC_URI[sha256sum] = "5a4ef12361e87ffe9e9499806f2fe7f9625aa8440157044b78947678d8d82130"
|
||||
SRC_URI+="file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
|
||||
|
||||
FILES_${PN} += " \
|
||||
|
||||
@@ -28,8 +28,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "43166f3d90e7ffb75d5cae074276f97f"
|
||||
SRC_URI[sha256sum] = "c724fbbea161432ac627c86809ff2dc97cc645ab76ac4ed68a984b17a1d96f2a"
|
||||
SRC_URI[md5sum] = "9e6e51807c0d58b863e095cb7cb6d380"
|
||||
SRC_URI[sha256sum] = "956f1c2878e98ae409809d6aa7ff97e9a69b10ec4cdf1f8a27ad1a37aa719d33"
|
||||
|
||||
SRC_URI += " \
|
||||
file://0001-fix-build-for-qtbase-without-session-management.patch \
|
||||
|
||||
@@ -12,7 +12,6 @@ LIC_FILES_CHKSUM = " \
|
||||
inherit kde-apps gettext
|
||||
|
||||
DEPENDS += " \
|
||||
libssh \
|
||||
qtsvg \
|
||||
qtwebengine \
|
||||
\
|
||||
@@ -40,6 +39,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
# REVISIT optionals
|
||||
# libssh \
|
||||
# openslp
|
||||
# openssh <-> dropbear
|
||||
DEPENDS += " \
|
||||
@@ -49,8 +49,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "2a34d890b3b6d6ea52ae9ac8023816fa"
|
||||
SRC_URI[sha256sum] = "450d69b16a873da51190c9397b2b0ecb08bc0dcae0d2a07f7ab1d2efcd02c280"
|
||||
SRC_URI[md5sum] = "3b6666cb471cbb913f9cc84a89f48b94"
|
||||
SRC_URI[sha256sum] = "c5ac845efcc37f1710d3a5204181bbb27f9bd06429ec95d018c63bc2503d74e9"
|
||||
|
||||
# gperf creates hard #line links
|
||||
do_install_prepend() {
|
||||
|
||||
@@ -19,8 +19,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "472a879705318277832afa03a53f2ff0"
|
||||
SRC_URI[sha256sum] = "6c42ea93e8f4251360af0340bb89489868520f9b0c990260be8464df6ae38d63"
|
||||
SRC_URI[md5sum] = "a28d279ead36124c41902397513b0afd"
|
||||
SRC_URI[sha256sum] = "a75e1130b3b49e16077a109cfb509bd8a98efc9733b8bb04934344cc095b2c56"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kxmlgui5 \
|
||||
|
||||
@@ -23,8 +23,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "7cc1a3e0817e6a6d1c95c87e013cf51d"
|
||||
SRC_URI[sha256sum] = "aadef9680a0a8670f9996c498adb609b287e5f016b83e44b5b1458d239db5782"
|
||||
SRC_URI[md5sum] = "8e1e8e80cd1a170a4abe934e573999c2"
|
||||
SRC_URI[sha256sum] = "9de21f54f6e72bbdde8e5557736b33b0ed1bedfddeb2e06b87240639256d64ff"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/config.kcfg \
|
||||
|
||||
@@ -23,8 +23,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "9b0891a00e9f696b264625d91142c270"
|
||||
SRC_URI[sha256sum] = "09ba45ca7f934753c1bf4e3113b00174cbb71a332eb3ceb0bc5fc404d1534092"
|
||||
SRC_URI[md5sum] = "88f76540e4a957dde2f2b92235247524"
|
||||
SRC_URI[sha256sum] = "dcd47af2c6ca366a74fda1dfb741530f4f256c52609a809b3c00bda46e80ff51"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/icons \
|
||||
|
||||
@@ -32,8 +32,8 @@ PACKAGECONFIG = "pulseaudio"
|
||||
PACKAGECONFIG[pulseaudio] = ",,pulseaudio"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "5437e003e452efe4c3154c25d6fb42db"
|
||||
SRC_URI[sha256sum] = "2d27ad00533188d55f01c4d98b1ca91a22e0cdcd1f3f77bae9005a2a357e1214"
|
||||
SRC_URI[md5sum] = "7e84451af562bf4b599c083919e973e1"
|
||||
SRC_URI[sha256sum] = "49311a4043acaba2ee58ce3b715334aef11a19338b1c84b2f15484c48569a126"
|
||||
|
||||
SRC_URI += "file://0001-Fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
|
||||
|
||||
|
||||
@@ -29,8 +29,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "d21f754ae2749503e610dc486161fb89"
|
||||
SRC_URI[sha256sum] = "207d344db75e13f1d72050e329dba3d8a48227c22c93e916741f76ae742fb44b"
|
||||
SRC_URI[md5sum] = "44465542ec2e954157aa0a06167a8cde"
|
||||
SRC_URI[sha256sum] = "ec71422232340c38a331480cd2f5620d453f46ede7db1ac34413c2ccda0212d4"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/k*5 \
|
||||
|
||||
@@ -41,8 +41,8 @@ DEPENDS += " \
|
||||
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "c6fd2099ffd9129290c6d201f5430e76"
|
||||
SRC_URI[sha256sum] = "a0c8535f0260c67c86c2563cb224f57da53a8800ba8388dfa14e326b5050f7d3"
|
||||
SRC_URI[md5sum] = "6e51d07c71cd4b07cf3648e392210d2f"
|
||||
SRC_URI[sha256sum] = "235ba8939cd0169c4ac35b6f50e1361f45e71e10db9af25be31283e57ea31513"
|
||||
|
||||
# do not move so-libs to -dev package
|
||||
FILES_SOLIBSDEV = ""
|
||||
|
||||
@@ -27,8 +27,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "90094d62dd7307a337b4b8e9e020e1e2"
|
||||
SRC_URI[sha256sum] = "bbead384a9c9d81656595c4bc5952ea9f4399f633fb7b9bb50d497789087f2e6"
|
||||
SRC_URI[md5sum] = "bd536047eb93c004830a6ddf84a2db6a"
|
||||
SRC_URI[sha256sum] = "fc8d329a8c3d4b72b6384613f834deca6f2bae3a3becf1987c53caa888ba00a3"
|
||||
|
||||
FILES_SOLIBSDEV = ""
|
||||
|
||||
|
||||
@@ -30,8 +30,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "7596e73feee142e8f642ef46f88bbe65"
|
||||
SRC_URI[sha256sum] = "3d58f74334c2c3634e6b9ac1c466f0c31c1e42076402eb594e35df3dcc46b15c"
|
||||
SRC_URI[md5sum] = "bd77a8ac7f869052773672235f99fd7e"
|
||||
SRC_URI[sha256sum] = "eb4a3bd0653bdd0707b4f1f58e4bc80be0df8b4d7fbe4c17a2272b8ad49db712"
|
||||
SRC_URI+="file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
|
||||
|
||||
FILES_${PN} += " \
|
||||
|
||||
@@ -29,8 +29,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "a5e853dd976fcb069aea1ecbf20dc30a"
|
||||
SRC_URI[sha256sum] = "6c3a13d816a567228fa06f1b48ce2f8f3b4d84596b3af6b1160c7720dacac6ec"
|
||||
SRC_URI[md5sum] = "e514458e74868c28e8a102f57774a6e1"
|
||||
SRC_URI[sha256sum] = "26befaaa4238927a0953660e6a1146e708f846ec5c7cdcfccb6d34c24ba7a4ae"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/icons \
|
||||
|
||||
@@ -22,7 +22,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "98b642b64d0bf5047f753d964ae6a3fa"
|
||||
SRC_URI[sha256sum] = "0aeacf783e465f84934359f41c5afda487a8f7d1ff9cdd4dd3687df11d732583"
|
||||
SRC_URI[md5sum] = "6d1248d0144a2df8ec9b476a398278bb"
|
||||
SRC_URI[sha256sum] = "d54276839b68aa7c72c73f3cea822a0f1588a7642b37f14885cd039f601c083e"
|
||||
|
||||
FILES_${PN} += "${datadir}/kxmlgui5"
|
||||
|
||||
@@ -24,8 +24,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "bfb9fcf08b2200a37c9938c708a9aaad"
|
||||
SRC_URI[sha256sum] = "50d74198e98debef6409c8f7e3e90261e2f7ff6955dcaaa753f426edea741762"
|
||||
SRC_URI[md5sum] = "31ac821f95c32685818909fe095ac39e"
|
||||
SRC_URI[sha256sum] = "093ca5902064a7a745e113c9d24969b8228bf5216ca53b7cf2539e09c3cdcb7e"
|
||||
SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
|
||||
|
||||
FILES_${PN} += " \
|
||||
|
||||
@@ -32,8 +32,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "659fd24acdccbb4603b7e6db6f6657ce"
|
||||
SRC_URI[sha256sum] = "e18d8a08c9df73e6d38c7d3200fb177f070943fb472f4d437e193edfee9a5992"
|
||||
SRC_URI[md5sum] = "ec01e9ed6bd6f5480abfebd3a243c8f4"
|
||||
SRC_URI[sha256sum] = "10661106435de26f2cd1e2b9fb83f966e7722ed99b87c36f3a0da6ae22880502"
|
||||
SRC_URI += "file://0001-FIND_REQUIRED_PROGRAM-is-broken-use-the-tools-direct.patch"
|
||||
|
||||
# Aagh: To select a soundcard we need to select another type - so keep oss in as dummy
|
||||
|
||||
@@ -13,5 +13,5 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "c7f10236316f103a6d9527db7b0838d3"
|
||||
SRC_URI[sha256sum] = "6c40db4ec7c3c1978650fdc5ce36ea78e85d5efb76061df451fdde2e533fc926"
|
||||
SRC_URI[md5sum] = "1469c04c37616e556f7094af2786f4f5"
|
||||
SRC_URI[sha256sum] = "bf28ee6aa87b5bf865f418bfa60e0a4a995b9358975e0fd1702f0cd5e82a6b58"
|
||||
|
||||
@@ -43,8 +43,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "df1e09cb399a166fa24f9387fd7b92f5"
|
||||
SRC_URI[sha256sum] = "3fca47c6d08081b44f184813b9fea3b5b47157da4dcba18d62eb04fb02b1546d"
|
||||
SRC_URI[md5sum] = "2cbf29311479021b84bb50c2d77ce3cc"
|
||||
SRC_URI[sha256sum] = "7b414075f135b93e1e332bbadf207f81c96c78d448b1f254d6015fc988052006"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/carddecks \
|
||||
|
||||
@@ -13,5 +13,5 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "1110a0f82f138d082078dfef1fd41a33"
|
||||
SRC_URI[sha256sum] = "18dbe07aa8bfc2529f62d81d5c36699b2da897d12279477bdf9b87e6f12b4546"
|
||||
SRC_URI[md5sum] = "9a54efc78ff4ebb1a720754a4f90f079"
|
||||
SRC_URI[sha256sum] = "0a862feb9d9238f1b8b8a6c95d2ee7744145605239bfba024376021323eb77f4"
|
||||
|
||||
@@ -19,8 +19,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "46dc849ed8901349227a80463e68a902"
|
||||
SRC_URI[sha256sum] = "2e73db1ee52d5805e341f0ea2163482554bd5d534e13c9b89f07d67612bca1c6"
|
||||
SRC_URI[md5sum] = "73524f4ed1fb475e1f681a962e3bb776"
|
||||
SRC_URI[sha256sum] = "fd11f7dac545b2a294298ee3a2f237c71018c46717dac63983116d36218af38a"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kmahjongglib \
|
||||
|
||||
@@ -26,8 +26,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "67aee04577deda43565b4fb5220a759b"
|
||||
SRC_URI[sha256sum] = "ec996691a9198e344fdd6f2c2b23ed0032733f3421be304a4b74219591dcfd94"
|
||||
SRC_URI[md5sum] = "af0703cefee572b3130d26a20ba88c13"
|
||||
SRC_URI[sha256sum] = "d8541a738737b2628c09d4cdf579e55ed9b7598e77b3859b65b69b8100e9361f"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/config.kcfg \
|
||||
|
||||
@@ -31,8 +31,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "1d4f5bbcbce52716370bdab6656e23f0"
|
||||
SRC_URI[sha256sum] = "a81c9047a9596922671eca91007dc066cbe10e4424e44f3980673494c839b331"
|
||||
SRC_URI[md5sum] = "eded2e2c97bec61e605e65e463d0b66d"
|
||||
SRC_URI[sha256sum] = "db39df148d327a61fd6080d4b3e55c8734762e4042c98386229fe3fbbcd85f52"
|
||||
|
||||
EXTRA_OECMAKE += " \
|
||||
-DMARBLE_PRI_INSTALL_DIR=${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/modules \
|
||||
|
||||
@@ -21,8 +21,9 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "4303d7a3c8ab93632859e0ac5a3ff1e4"
|
||||
SRC_URI[sha256sum] = "a16507d8a5302f3314ae371217eaca0eeb36c0fb48bdc728cb98b7279b03c797"
|
||||
SRC_URI[md5sum] = "a6a4b037e75c1e601921c89f05ebb3d5"
|
||||
SRC_URI[sha256sum] = "270fa35862a7f612a36adb9535f73b4105ad57eb8c71d0ee1368ccf34736aac2"
|
||||
SRC_URI += "file://0001-Do-not-try-to-find-qtquick-compiler.patch"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kxmlgui5 \
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
From 08d1d50a8e9433a0fe163d7b1251dafc66bcc40e Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Fri, 14 Dec 2018 01:41:47 +0100
|
||||
Subject: [PATCH] Do not try to find qtquick-compiler
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
we do not have qtdeclarative-native and even if we would: is output target
|
||||
binary compatible?
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index f13838b..9788aeb 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -41,7 +41,7 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
|
||||
Svg
|
||||
)
|
||||
|
||||
-find_package(Qt5 CONFIG QUIET OPTIONAL_COMPONENTS QuickCompiler)
|
||||
+#find_package(Qt5 CONFIG QUIET OPTIONAL_COMPONENTS QuickCompiler)
|
||||
|
||||
IF(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Android")
|
||||
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
|
||||
--
|
||||
2.14.5
|
||||
|
||||
@@ -36,8 +36,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "0fbf8eba9b6017239bea13596b31769d"
|
||||
SRC_URI[sha256sum] = "343cb0984453329b1b838a049753ae41c98ff6629fb5dde7db6aa40141a2efe2"
|
||||
SRC_URI[md5sum] = "fc356a501f08cc3c83fd685faf9a18c7"
|
||||
SRC_URI[sha256sum] = "915643d16b26c352cfa8461647a08701b50b7802c7e628ff303d74af313599a0"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/k*5 \
|
||||
|
||||
@@ -31,8 +31,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "0474c1e7018de398ddc9b95f8cfdfd00"
|
||||
SRC_URI[sha256sum] = "e9f7d09e2b1eb4d8d919a57b461e37e3f5b8d0ef152206e55deef28af2aa7946"
|
||||
SRC_URI[md5sum] = "3aaf01af687554eb0ec966487d012ce2"
|
||||
SRC_URI[sha256sum] = "ac10857ef87ea81147ad039d8632ec915960ebc3d69c3cdc86bd5f243cd8da5a"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/dbus-1 \
|
||||
|
||||
@@ -32,9 +32,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI += "file://0001-Fix-KDE-CI-compile-error-with-Qt-5.10-on-linux.patch"
|
||||
SRC_URI[md5sum] = "9be3855aecacc7566c400b03d9054e1a"
|
||||
SRC_URI[sha256sum] = "80d24252b958dea167d10ee97b969f85cfa86e3f95f4a9d94c6e368a3e9d667e"
|
||||
SRC_URI[md5sum] = "e4998fc4e92d2b1420b5fee4fc33e1ce"
|
||||
SRC_URI[sha256sum] = "6ed4c5021fe96d89000dfe56a1401a939da00d42845541c9ed8eb730c1e62597"
|
||||
|
||||
EXTRA_OECMAKE += "-DBUILD_KF5=1"
|
||||
|
||||
|
||||
@@ -1,37 +0,0 @@
|
||||
From 62a9e5e6afdd920779f1211afb0381857659e578 Mon Sep 17 00:00:00 2001
|
||||
From: Ralf Habacker <ralf.habacker@freenet.de>
|
||||
Date: Thu, 6 Dec 2018 13:36:34 +0100
|
||||
Subject: [PATCH] Fix KDE CI compile error with Qt 5.10 on linux
|
||||
|
||||
The error was "specialization of template<class T>
|
||||
struct QMetaTypeId in different namespace [-fpermissive]"
|
||||
|
||||
The Qt 5.10 related issue is fixed by using another approach
|
||||
to exclude KF5 class KAboutData.
|
||||
|
||||
Upstream-Status: Backport [1]
|
||||
|
||||
[1] https://cgit.kde.org/umbrello.git/commit/?id=62a9e5e6afdd920779f1211afb0381857659e578
|
||||
---
|
||||
umbrello/main.cpp | 5 ++---
|
||||
1 file changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/umbrello/main.cpp b/umbrello/main.cpp
|
||||
index e3315fa09..9d2acd820 100644
|
||||
--- a/umbrello/main.cpp
|
||||
+++ b/umbrello/main.cpp
|
||||
@@ -19,9 +19,8 @@
|
||||
|
||||
// kde includes
|
||||
#if QT_VERSION > 0x050000
|
||||
-namespace dummy {
|
||||
-#include <kaboutdata.h>
|
||||
-}
|
||||
+// prevent including of <kaboutdata.h>
|
||||
+#define KABOUTDATA_H
|
||||
#include <k4aboutdata.h>
|
||||
#define KAboutData K4AboutData
|
||||
#include <KCrash>
|
||||
--
|
||||
2.14.5
|
||||
|
||||
Reference in New Issue
Block a user