From 1c45cb84d09c2aecf68f39b8163497c4ce1e4a23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Fri, 18 Dec 2015 00:33:45 +0100 Subject: [PATCH] kde-apps: update to 15.12.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- classes/kde-apps.bbclass | 2 +- recipes-kde/apps/ark/ark.bb | 4 ++-- recipes-kde/apps/baloo-widgets/baloo-widgets.bb | 4 ++-- recipes-kde/apps/dolphin-plugins/dolphin-plugins.bb | 4 ++-- recipes-kde/apps/dolphin/dolphin.bb | 4 ++-- recipes-kde/apps/filelight/filelight.bb | 4 ++-- recipes-kde/apps/kapman/kapman.bb | 4 ++-- ...-for-qtbase-build-without-session-support-Q.patch | 12 ++++++------ .../0002-fix-build-for-sessionless-kconfig.patch | 10 +++++----- recipes-kde/apps/kate/kate.bb | 4 ++-- recipes-kde/apps/katomic/katomic.bb | 4 ++-- recipes-kde/apps/kbounce/kbounce.bb | 4 ++-- recipes-kde/apps/kdenlive/kdenlive.bb | 4 ++-- recipes-kde/apps/kdiamond/kdiamond.bb | 4 ++-- recipes-kde/apps/kio-extras/kio-extras.bb | 4 ++-- recipes-kde/apps/konsole/konsole.bb | 4 ++-- recipes-kde/apps/kwalletmanager/kwalletmanager.bb | 4 ++-- ...s.txt-add-an-option-BUILD_KGDECLARATIVE-dis.patch | 4 ++-- recipes-kde/apps/libkdegames/libkdegames.bb | 4 ++-- .../files/0001-align-path-of-designer-plugins.patch | 2 +- recipes-kde/apps/marble/marble.bb | 4 ++-- 21 files changed, 47 insertions(+), 47 deletions(-) diff --git a/classes/kde-apps.bbclass b/classes/kde-apps.bbclass index 060b1771..0a81bec8 100644 --- a/classes/kde-apps.bbclass +++ b/classes/kde-apps.bbclass @@ -1,6 +1,6 @@ inherit kde-base -KDE_APP_VERSION = "15.08.3" +KDE_APP_VERSION = "15.12.0" SRC_URI = "${KDE_MIRROR}/stable/applications/${PV}/src/${BPN}-${PV}.tar.xz" diff --git a/recipes-kde/apps/ark/ark.bb b/recipes-kde/apps/ark/ark.bb index f4d75fe2..5e526000 100644 --- a/recipes-kde/apps/ark/ark.bb +++ b/recipes-kde/apps/ark/ark.bb @@ -24,8 +24,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "84cd97d4147620b31956ccb35878aa2e" -SRC_URI[sha256sum] = "417057004e4f6c4a46178cc83f3891128172d4245f639fbbcdd76cc89b8bc170" +SRC_URI[md5sum] = "2fe131a931d51603eff33b80d45a73b7" +SRC_URI[sha256sum] = "c3a67c3a1c377989d567dc9c0228b684dc475612405d3c4638f40d0dbd87bd7c" SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch" FILES_${PN} += " \ diff --git a/recipes-kde/apps/baloo-widgets/baloo-widgets.bb b/recipes-kde/apps/baloo-widgets/baloo-widgets.bb index 0dcbad2e..192afc5c 100644 --- a/recipes-kde/apps/baloo-widgets/baloo-widgets.bb +++ b/recipes-kde/apps/baloo-widgets/baloo-widgets.bb @@ -18,8 +18,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "94b6e609427ca2aacec03d1958ba945d" -SRC_URI[sha256sum] = "ea4f60c59c9fc912b51df46425fc9ca0947320bffed8deaeb38ea17436be5b51" +SRC_URI[md5sum] = "2ffa70cbc5259a2f502c6853fb45e240" +SRC_URI[sha256sum] = "e17e97a5989b0ccfc68a65b093db340bc4962a23ebbcc825f93c975916b77251" # cross libs / headers CMAKE_ALIGN_SYSROOT[1] = "KF5BalooWidgets, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib" diff --git a/recipes-kde/apps/dolphin-plugins/dolphin-plugins.bb b/recipes-kde/apps/dolphin-plugins/dolphin-plugins.bb index 66a15ab7..af94ea77 100644 --- a/recipes-kde/apps/dolphin-plugins/dolphin-plugins.bb +++ b/recipes-kde/apps/dolphin-plugins/dolphin-plugins.bb @@ -13,8 +13,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "4edc47123a9cb121d475d9aa34706518" -SRC_URI[sha256sum] = "fe346cd5f292f7c9dae28b0f7c1d28c7cfc6551e16043e2701e889735120f8c9" +SRC_URI[md5sum] = "b91bdc4a0883bbcecb34bedee59ae142" +SRC_URI[sha256sum] = "7baa4a65398925032e852e3cc1bb09ab7b4c2232f837cd6d0f71e25236f8e450" FILES_${PN} += " \ ${datadir}/config.kcfg \ diff --git a/recipes-kde/apps/dolphin/dolphin.bb b/recipes-kde/apps/dolphin/dolphin.bb index 8470b7fb..13f325b4 100644 --- a/recipes-kde/apps/dolphin/dolphin.bb +++ b/recipes-kde/apps/dolphin/dolphin.bb @@ -33,8 +33,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "14cfa16663881b27a6db452c6af49948" -SRC_URI[sha256sum] = "f5eda2eb0cf3900787013ac7425e89f2f9274f19a2a0a520443c8f34a13f0aa1" +SRC_URI[md5sum] = "30f452fd08914cd302b37c29143428f9" +SRC_URI[sha256sum] = "0a2a7a265fb542e1ed461d9111143fdc61559a398e4fa0c47e1e0b822ccf73a5" SRC_URI += " \ file://0001-align-paths-to-phonon.patch \ file://0002-fix-build-for-qtbase-without-session-management.patch \ diff --git a/recipes-kde/apps/filelight/filelight.bb b/recipes-kde/apps/filelight/filelight.bb index f8db3ad9..99df9366 100644 --- a/recipes-kde/apps/filelight/filelight.bb +++ b/recipes-kde/apps/filelight/filelight.bb @@ -18,8 +18,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "51e78d053455252af722c508cd9019d4" -SRC_URI[sha256sum] = "428c4c3d8b422edfa5af3025d5b5d1fbc1a27a4c0c6111b8f0c1b1e5fbddcb50" +SRC_URI[md5sum] = "19cf21112e411c4adda7cc89c9630240" +SRC_URI[sha256sum] = "a67164444e7056f1fcdaa4c781f128e0da09e657a0fa621d71e5aa6545e49d60" SRC_URI += " \ file://0001-do-not-build-docs.patch \ file://0002-fix-build-for-qtbase-build-without-session-support-Q.patch \ diff --git a/recipes-kde/apps/kapman/kapman.bb b/recipes-kde/apps/kapman/kapman.bb index a8866dde..0ed83bcc 100644 --- a/recipes-kde/apps/kapman/kapman.bb +++ b/recipes-kde/apps/kapman/kapman.bb @@ -21,8 +21,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "6eb06a41df706219647b4a632b87314c" -SRC_URI[sha256sum] = "4d40d6ea745e4e37f64e3620370e005ed151226d5d6e06e95742d234a72b22c4" +SRC_URI[md5sum] = "fc9a511409d12da3273ca040a9802ac3" +SRC_URI[sha256sum] = "340d5f206705f955990f1d5742ac37adb2874e6ee6529df6f8e4ade3aefeedd4" FILES_${PN} += " \ ${datadir}/kxmlgui5 \ diff --git a/recipes-kde/apps/kate/files/0001-fix-build-for-qtbase-build-without-session-support-Q.patch b/recipes-kde/apps/kate/files/0001-fix-build-for-qtbase-build-without-session-support-Q.patch index 1921abe9..450ee457 100644 --- a/recipes-kde/apps/kate/files/0001-fix-build-for-qtbase-build-without-session-support-Q.patch +++ b/recipes-kde/apps/kate/files/0001-fix-build-for-qtbase-build-without-session-support-Q.patch @@ -9,15 +9,15 @@ Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- - kate/src/kateapp.cpp | 5 ++++- - kate/src/katemainwindow.cpp | 2 ++ + kate/kateapp.cpp | 5 ++++- + kate/katemainwindow.cpp | 2 ++ kwrite/main.cpp | 5 ++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/kate/src/kateapp.cpp b/kate/src/kateapp.cpp index 4c26f33..03fd159 100644 ---- a/kate/src/kateapp.cpp -+++ b/kate/src/kateapp.cpp +--- a/kate/kateapp.cpp ++++ b/kate/kateapp.cpp @@ -99,10 +99,13 @@ bool KateApp::init() // set KATE_PID for use in child processes qputenv("KATE_PID", QString::fromLatin1("%1").arg(QCoreApplication::applicationPid()).toLatin1().constData()); @@ -35,8 +35,8 @@ index 4c26f33..03fd159 100644 if (!startupKate()) { diff --git a/kate/src/katemainwindow.cpp b/kate/src/katemainwindow.cpp index 464e20c..8efc401 100644 ---- a/kate/src/katemainwindow.cpp -+++ b/kate/src/katemainwindow.cpp +--- a/kate/katemainwindow.cpp ++++ b/kate/katemainwindow.cpp @@ -467,9 +467,11 @@ bool KateMainWindow::queryClose() { // session saving, can we close all views ? diff --git a/recipes-kde/apps/kate/files/0002-fix-build-for-sessionless-kconfig.patch b/recipes-kde/apps/kate/files/0002-fix-build-for-sessionless-kconfig.patch index a6dbf7fc..c4812978 100644 --- a/recipes-kde/apps/kate/files/0002-fix-build-for-sessionless-kconfig.patch +++ b/recipes-kde/apps/kate/files/0002-fix-build-for-sessionless-kconfig.patch @@ -8,14 +8,14 @@ Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- - kate/src/kateapp.cpp | 2 ++ - kwrite/kwrite.cpp | 2 ++ + kate/kateapp.cpp | 2 ++ + kwrite/kwrite.cpp | 2 ++ 2 files changed, 4 insertions(+) -diff --git a/kate/src/kateapp.cpp b/kate/src/kateapp.cpp +diff --git a/kate/kateapp.cpp b/kate/kateapp.cpp index 03fd159..ae2c793 100644 ---- a/kate/src/kateapp.cpp -+++ b/kate/src/kateapp.cpp +--- a/kate/kateapp.cpp ++++ b/kate/kateapp.cpp @@ -121,6 +121,7 @@ bool KateApp::init() void KateApp::restoreKate() diff --git a/recipes-kde/apps/kate/kate.bb b/recipes-kde/apps/kate/kate.bb index 39f2a5f0..7b5ca1ea 100644 --- a/recipes-kde/apps/kate/kate.bb +++ b/recipes-kde/apps/kate/kate.bb @@ -30,8 +30,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "7064ffcac129354bf244592c5437dc3e" -SRC_URI[sha256sum] = "4810c20a8dc520344ebad86809a4e6f964300c3ff23a6f00b275a03608bc6134" +SRC_URI[md5sum] = "80a3a02c3ab25f614e523b881e5483b8" +SRC_URI[sha256sum] = "ae979ac3b5c18ddb2a9701e59cf0e70b9e366c1fa08325bb771a95de3a12526f" SRC_URI += " \ file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch \ diff --git a/recipes-kde/apps/katomic/katomic.bb b/recipes-kde/apps/katomic/katomic.bb index e43bd28d..6bf5bc83 100644 --- a/recipes-kde/apps/katomic/katomic.bb +++ b/recipes-kde/apps/katomic/katomic.bb @@ -24,8 +24,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "00c098f0a1d32279bd87c338d3bf876e" -SRC_URI[sha256sum] = "c68996c4515ca9669b4e9812003d7652803b455fcafe001379cf021d21649b90" +SRC_URI[md5sum] = "3af891e3527a254a901fa1ca88412f63" +SRC_URI[sha256sum] = "1a85acea5ce335cb111bf34f1f4f281e08e737698795eaf3f05a148c9721fa69" SRC_URI += "file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch" FILES_${PN} += " \ diff --git a/recipes-kde/apps/kbounce/kbounce.bb b/recipes-kde/apps/kbounce/kbounce.bb index f709ff2f..08d344ff 100644 --- a/recipes-kde/apps/kbounce/kbounce.bb +++ b/recipes-kde/apps/kbounce/kbounce.bb @@ -25,8 +25,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "13b117bb1f140a40243778b600bd8f5a" -SRC_URI[sha256sum] = "31396361ead8f9ca33814580e84044ac957a441555c560a69901f8456a8ec0e6" +SRC_URI[md5sum] = "87eb036391a6cd78e1ea1a70f995cac3" +SRC_URI[sha256sum] = "47904cc34aeff65b1340a5371b3e81ccc7959b6d0bb66d6a0ed298948f94ed49" SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch" FILES_${PN} += " \ diff --git a/recipes-kde/apps/kdenlive/kdenlive.bb b/recipes-kde/apps/kdenlive/kdenlive.bb index c0951399..a5eca186 100644 --- a/recipes-kde/apps/kdenlive/kdenlive.bb +++ b/recipes-kde/apps/kdenlive/kdenlive.bb @@ -29,8 +29,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "b1ebd1924f1dafdca818ddb1d046dbc0" -SRC_URI[sha256sum] = "13be7e16d16aa78c448b5922b20759633b69ed5a26442248132f377b231f1d4d" +SRC_URI[md5sum] = "62fc024bc9616756b5ad6444308e636f" +SRC_URI[sha256sum] = "5a6f4ae4bd07c64b90a3ebe88775b457c9c1d8b3a23820203d86df114183fbf8" SRC_URI += " \ file://0001-CMakeLists.txt-make-MLT_PREFIX-configurable.patch \ diff --git a/recipes-kde/apps/kdiamond/kdiamond.bb b/recipes-kde/apps/kdiamond/kdiamond.bb index 2a9671e0..8f377750 100644 --- a/recipes-kde/apps/kdiamond/kdiamond.bb +++ b/recipes-kde/apps/kdiamond/kdiamond.bb @@ -24,8 +24,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "e96fb1a392ac83cfaf17efd2ddafce66" -SRC_URI[sha256sum] = "0bcc923827741555ce1215297053dfbea126b79dd9992a50941a45cc1cc85cc4" +SRC_URI[md5sum] = "7c94647e942d75ff1b10bf83cdc6973d" +SRC_URI[sha256sum] = "e504c5b15e55f80afcc3da7ea4cec1efb5a56b906d8badf0db39382604d38713" SRC_URI+="file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch" FILES_${PN} += " \ diff --git a/recipes-kde/apps/kio-extras/kio-extras.bb b/recipes-kde/apps/kio-extras/kio-extras.bb index d86c8f82..0841cce9 100644 --- a/recipes-kde/apps/kio-extras/kio-extras.bb +++ b/recipes-kde/apps/kio-extras/kio-extras.bb @@ -42,8 +42,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "dec5984045d2da1bfc2f7e72338746bc" -SRC_URI[sha256sum] = "aeb527fc1290a000b7614e846a478d0096b4ab4a4f24f57aa2c1249d2444515f" +SRC_URI[md5sum] = "819bf5ec77953460993529076e0b9023" +SRC_URI[sha256sum] = "e7409ae4b788d0484f8d026580ae821487993d791a48bd14f435b447e93fc950" FILES_${PN} += " \ ${datadir}/kio_bookmarks \ diff --git a/recipes-kde/apps/konsole/konsole.bb b/recipes-kde/apps/konsole/konsole.bb index d5be08fd..4d18befc 100644 --- a/recipes-kde/apps/konsole/konsole.bb +++ b/recipes-kde/apps/konsole/konsole.bb @@ -36,8 +36,8 @@ DEPENDS += " \ PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "3d142d632695450674c52e73c1ccf58a" -SRC_URI[sha256sum] = "197eb232c66df725ae27dc32f5f65162739877cdd26266a32ee2f23d26fff14e" +SRC_URI[md5sum] = "4051b1535fb79632951f6dfbc3c2de6a" +SRC_URI[sha256sum] = "90eb9c6635f067ab7236be472a5051366b18a0b9533e910a2a25957a47864bd5" SRC_URI += "file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch" # do not move so-libs to -dev package diff --git a/recipes-kde/apps/kwalletmanager/kwalletmanager.bb b/recipes-kde/apps/kwalletmanager/kwalletmanager.bb index 1ca82ceb..a5f41eb4 100644 --- a/recipes-kde/apps/kwalletmanager/kwalletmanager.bb +++ b/recipes-kde/apps/kwalletmanager/kwalletmanager.bb @@ -23,8 +23,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "7359076a3f81aa5c345ba4982636fa5e" -SRC_URI[sha256sum] = "50ab15b0d7c0fce52b8e30bc6b018272a97c502aa3120c4ac70380eff17c04f2" +SRC_URI[md5sum] = "9d78904e2038b0f01f9d84d6b4545826" +SRC_URI[sha256sum] = "ce269540a3c7330f7bf8b8b7bd6722dcc5585a0190355165adc0ef670f6e61e9" SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch" FILES_${PN} += " \ diff --git a/recipes-kde/apps/libkdegames/files/0001-CMakeLists.txt-add-an-option-BUILD_KGDECLARATIVE-dis.patch b/recipes-kde/apps/libkdegames/files/0001-CMakeLists.txt-add-an-option-BUILD_KGDECLARATIVE-dis.patch index 0d087d82..854b3f2d 100644 --- a/recipes-kde/apps/libkdegames/files/0001-CMakeLists.txt-add-an-option-BUILD_KGDECLARATIVE-dis.patch +++ b/recipes-kde/apps/libkdegames/files/0001-CMakeLists.txt-add-an-option-BUILD_KGDECLARATIVE-dis.patch @@ -33,7 +33,7 @@ index b5d8ffe..538d7c8 100644 - DBusAddons DNSSD Declarative + DBusAddons DNSSD I18n GuiAddons Service ConfigWidgets ItemViews IconThemes Completion JobWidgets TextWidgets GlobalAccel XmlGui Crash - Bookmarks KIO NewStuff KDELibs4Support) + Bookmarks KIO NewStuff) +if(BUILD_KGDECLARATIVE) + find_package(KF5 REQUIRED COMPONENTS Declarative) @@ -81,5 +81,5 @@ index b5d8ffe..538d7c8 100644 set(KDEGAMES_VERSION 7.0.0) -- -2.1.0 +2.5.0 diff --git a/recipes-kde/apps/libkdegames/libkdegames.bb b/recipes-kde/apps/libkdegames/libkdegames.bb index 691ee54e..ee5ff49a 100644 --- a/recipes-kde/apps/libkdegames/libkdegames.bb +++ b/recipes-kde/apps/libkdegames/libkdegames.bb @@ -40,8 +40,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "067d8b657ab6e67aac83c3c2bbc73631" -SRC_URI[sha256sum] = "c4c259e83af119550769f0b660ddc6603509b22ea041b1429e323ee530f9e6c9" +SRC_URI[md5sum] = "9483bc4120eb0199614fa44c024dd5ff" +SRC_URI[sha256sum] = "7b5300e46a179be477c737eac75b964aaca0318554137957812be879e90063f4" SRC_URI += "file://0001-CMakeLists.txt-add-an-option-BUILD_KGDECLARATIVE-dis.patch" PACKAGECONFIG[kgdeclarative] = "-DBUILD_KGDECLARATIVE=Yes,-DBUILD_KGDECLARATIVE=No, kdeclarative" diff --git a/recipes-kde/apps/marble/files/0001-align-path-of-designer-plugins.patch b/recipes-kde/apps/marble/files/0001-align-path-of-designer-plugins.patch index 714c1d7f..6c2f5f65 100644 --- a/recipes-kde/apps/marble/files/0001-align-path-of-designer-plugins.patch +++ b/recipes-kde/apps/marble/files/0001-align-path-of-designer-plugins.patch @@ -20,7 +20,7 @@ index 68b3d78..57c4792 100644 @@ -199,7 +199,7 @@ add_feature_info("Qt Designer plugins" WITH_DESIGNER_PLUGIN "Marble widget suppo set(EXEC_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Base directory for executables and libraries" FORCE) - if (QT5BUILD) + if (NOT QT_PLUGINS_DIR) - set(QT_PLUGINS_DIR ${CMAKE_INSTALL_LIBDIR}/plugins) + set(QT_PLUGINS_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/qt5/plugins) endif() diff --git a/recipes-kde/apps/marble/marble.bb b/recipes-kde/apps/marble/marble.bb index 6db22fe4..0a844d91 100644 --- a/recipes-kde/apps/marble/marble.bb +++ b/recipes-kde/apps/marble/marble.bb @@ -28,8 +28,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "98f8a4392897da9a475076ccd106c0b2" -SRC_URI[sha256sum] = "743131cd37e6c42b178497fa3cda012b926587b4ebc094bb7276e02fb4e62844" +SRC_URI[md5sum] = "a7a481936281a7d584b9168d98fcd5d5" +SRC_URI[sha256sum] = "6aa7f939a3221e2a40f62548d8af0718c10b6253a28472b233aeccc062b30d06" SRC_URI += "file://0001-align-path-of-designer-plugins.patch" PACKAGES =+ " \