From 76657194c306ac0c9dfe17f3d791de4b1e8a60ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Fri, 19 Apr 2019 18:36:27 +0200 Subject: [PATCH] kde-apps: upgrade 18.12.3 -> 19.04.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/analitza/analitza.bb | 4 +- recipes-kde/apps/ark/ark.bb | 4 +- .../apps/baloo-widgets/baloo-widgets.bb | 4 +- recipes-kde/apps/bovo/bovo.bb | 4 +- .../apps/dolphin-plugins/dolphin-plugins.bb | 4 +- recipes-kde/apps/dolphin/dolphin.bb | 4 +- recipes-kde/apps/dragon/dragon.bb | 4 +- recipes-kde/apps/filelight/filelight.bb | 4 +- recipes-kde/apps/granatier/granatier.bb | 4 +- .../gwenview/files/0001-Avoid-try_run.patch | 77 ++++++++++--------- recipes-kde/apps/gwenview/gwenview.bb | 4 +- recipes-kde/apps/kalgebra/kalgebra.bb | 4 +- recipes-kde/apps/kapman/kapman.bb | 4 +- ...base-build-without-session-support-Q.patch | 72 ----------------- ...02-fix-build-for-sessionless-kconfig.patch | 57 -------------- recipes-kde/apps/kate/kate.bb | 9 +-- recipes-kde/apps/katomic/katomic.bb | 4 +- recipes-kde/apps/kblocks/kblocks.bb | 4 +- recipes-kde/apps/kbounce/kbounce.bb | 4 +- recipes-kde/apps/kbreakout/kbreakout.bb | 4 +- recipes-kde/apps/kcachegrind/kcachegrind.bb | 4 +- recipes-kde/apps/kcalc/kcalc.bb | 4 +- .../apps/kcolorchooser/kcolorchooser.bb | 4 +- ...sts.txt-make-MLT_PREFIX-configurable.patch | 21 ++--- recipes-kde/apps/kdenlive/kdenlive.bb | 4 +- recipes-kde/apps/kdf/kdf.bb | 4 +- recipes-kde/apps/kdiamond/kdiamond.bb | 4 +- recipes-kde/apps/kfind/kfind.bb | 4 +- recipes-kde/apps/khelpcenter/khelpcenter.bb | 4 +- recipes-kde/apps/kio-extras/kio-extras.bb | 4 +- recipes-kde/apps/kmag/kmag.bb | 4 +- recipes-kde/apps/kmahjongg/kmahjongg.bb | 4 +- recipes-kde/apps/kmines/kmines.bb | 4 +- ...-build-with-QT_NO_SESSIONMANAGER-set.patch | 44 ----------- recipes-kde/apps/kmix/kmix.bb | 6 +- recipes-kde/apps/kmplot/kmplot.bb | 4 +- recipes-kde/apps/kolourpaint/kolourpaint.bb | 4 +- recipes-kde/apps/konsole/konsole.bb | 4 +- recipes-kde/apps/kpat/kpat.bb | 4 +- recipes-kde/apps/kreversi/kreversi.bb | 4 +- recipes-kde/apps/ksudoku/ksudoku.bb | 4 +- recipes-kde/apps/ksystemlog/ksystemlog.bb | 4 +- .../apps/kwalletmanager/kwalletmanager.bb | 4 +- recipes-kde/apps/kwave/kwave.bb | 4 +- recipes-kde/apps/libkdcraw/libkdcraw.bb | 4 +- recipes-kde/apps/libkdegames/libkdegames.bb | 4 +- recipes-kde/apps/libkexiv2/libkexiv2.bb | 4 +- recipes-kde/apps/libkmahjongg/libkmahjongg.bb | 4 +- recipes-kde/apps/lokalize/lokalize.bb | 4 +- recipes-kde/apps/marble/marble.bb | 4 +- recipes-kde/apps/minuet/minuet.bb | 4 +- recipes-kde/apps/okular/okular.bb | 4 +- recipes-kde/apps/spectacle/spectacle.bb | 4 +- recipes-kde/apps/umbrello/umbrello.bb | 4 +- 55 files changed, 153 insertions(+), 323 deletions(-) delete mode 100644 recipes-kde/apps/kate/files/0001-fix-build-for-qtbase-build-without-session-support-Q.patch delete mode 100644 recipes-kde/apps/kate/files/0002-fix-build-for-sessionless-kconfig.patch delete mode 100644 recipes-kde/apps/kmix/files/0001-Fix-build-with-QT_NO_SESSIONMANAGER-set.patch diff --git a/classes/kde-apps.bbclass b/classes/kde-apps.bbclass index e3f0b696..d7e5cdb5 100644 --- a/classes/kde-apps.bbclass +++ b/classes/kde-apps.bbclass @@ -1,6 +1,6 @@ inherit kde-base -KDE_APP_VERSION = "18.12.3" +KDE_APP_VERSION = "19.04.0" SRC_URI = "${KDE_MIRROR}/stable/applications/${PV}/src/${BPN}-${PV}.tar.xz" diff --git a/recipes-kde/apps/analitza/analitza.bb b/recipes-kde/apps/analitza/analitza.bb index 2b9ea553..47f495e8 100644 --- a/recipes-kde/apps/analitza/analitza.bb +++ b/recipes-kde/apps/analitza/analitza.bb @@ -15,8 +15,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "f8186958405a7ee235ba0bff76c0f126" -SRC_URI[sha256sum] = "c241b6a3d849534ccd50601c0aebd5cd785220bb7957ed7f6b1d3db35ba0f925" +SRC_URI[md5sum] = "57644ec2d435ff493669de6b6bff4b0b" +SRC_URI[sha256sum] = "ac8bf7d66f8a2fc7198238f23d82efd1021943ffe8bd5915808e31b800a802f6" FILES_${PN} += " \ ${datadir}/libanalitza \ diff --git a/recipes-kde/apps/ark/ark.bb b/recipes-kde/apps/ark/ark.bb index 1396f7a5..b81babbc 100644 --- a/recipes-kde/apps/ark/ark.bb +++ b/recipes-kde/apps/ark/ark.bb @@ -28,8 +28,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "72d72ddaa13a10cd8ed6319fe00e51be" -SRC_URI[sha256sum] = "ecf781b5d3691bb967c9170938c1133e2972ee97d71aab2de65487a952700722" +SRC_URI[md5sum] = "4f198738bf03b050d4d16d82cb27f5e9" +SRC_URI[sha256sum] = "35e8e516a8554e086264d9a9a4fa66c2b47fa227eb9e512a1d0d24172cd07a84" 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 4c0c20bd..baa3ceaa 100644 --- a/recipes-kde/apps/baloo-widgets/baloo-widgets.bb +++ b/recipes-kde/apps/baloo-widgets/baloo-widgets.bb @@ -19,8 +19,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "d131f6dec4f4e50d52657087403e4c05" -SRC_URI[sha256sum] = "b8475ba1a74f8ebc6a36029b60ac803ab0d2c81c253b8c16bd05b6249454c3e3" +SRC_URI[md5sum] = "f7492278d42d7f5e71542229d55344b1" +SRC_URI[sha256sum] = "ab3d83bb1f2007620273d1a3eb580d821e0655aaf7e3efd2dc81087a24d1c275" FILES_${PN} += " \ ${datadir}/kservices5 \ diff --git a/recipes-kde/apps/bovo/bovo.bb b/recipes-kde/apps/bovo/bovo.bb index ac1aab3a..a953b054 100644 --- a/recipes-kde/apps/bovo/bovo.bb +++ b/recipes-kde/apps/bovo/bovo.bb @@ -19,8 +19,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "340d557424fc1ae1defff10a660f39b2" -SRC_URI[sha256sum] = "7fc7ff304cf5b5bf2049fdd53fbb4a819bddefc77fde94702c5118240403d972" +SRC_URI[md5sum] = "628e5898937ac93dc40987426c258a98" +SRC_URI[sha256sum] = "2cfccb09087a32d8a75f6dd763168e2ef5928f55b58505a542bc36fdac8e141e" FILES_${PN} += " \ ${datadir}/kxmlgui5 \ diff --git a/recipes-kde/apps/dolphin-plugins/dolphin-plugins.bb b/recipes-kde/apps/dolphin-plugins/dolphin-plugins.bb index 2efd42f2..5354e20a 100644 --- a/recipes-kde/apps/dolphin-plugins/dolphin-plugins.bb +++ b/recipes-kde/apps/dolphin-plugins/dolphin-plugins.bb @@ -19,8 +19,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "f4be0f56a4935ef177375ab7f22ce25b" -SRC_URI[sha256sum] = "1bff5f828f11e9b9a527b59f12ec16745fa19fb09392ca1872d6b0c909212427" +SRC_URI[md5sum] = "2e365be4252332e4c4a136cb7d97f44f" +SRC_URI[sha256sum] = "c2898e0a64d5a9eab2a4bd661694b75805adfd0a925f1a21f894892264f96469" FILES_${PN} += " \ ${datadir}/config.kcfg \ diff --git a/recipes-kde/apps/dolphin/dolphin.bb b/recipes-kde/apps/dolphin/dolphin.bb index 696cf035..b5b66f88 100644 --- a/recipes-kde/apps/dolphin/dolphin.bb +++ b/recipes-kde/apps/dolphin/dolphin.bb @@ -36,8 +36,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "08f6009c452da25828e26608b1191d19" -SRC_URI[sha256sum] = "c4921759bdfec9a96201a5d76a67869f867ec7e3caf92f8e46fa5d853a0741b1" +SRC_URI[md5sum] = "25196e7b234e4fd55968cdd98c22d1e3" +SRC_URI[sha256sum] = "f3f45b9048c283252067eebfad8c6e1efc6bc64d43fcba78b933850ea4762375" SRC_URI += " \ file://0001-fix-build-for-qtbase-without-session-management.patch \ file://0002-Revert-Make-target_link_libraries-for-kdeinit_dolphi.patch \ diff --git a/recipes-kde/apps/dragon/dragon.bb b/recipes-kde/apps/dragon/dragon.bb index 46ba4a16..481f7839 100644 --- a/recipes-kde/apps/dragon/dragon.bb +++ b/recipes-kde/apps/dragon/dragon.bb @@ -29,8 +29,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "fcf5e0ec51b65619fcfe8c7bc59bd162" -SRC_URI[sha256sum] = "115d60bfdef498ea75bc077a7091fb738615b399b03ec2a76a4bf34f19b407f3" +SRC_URI[md5sum] = "624c5a3e26a787b2cf8233e938adff48" +SRC_URI[sha256sum] = "42bde9f6a4f3dfe7a6b2bfa35502474c2866e2649695302d602a97f00842fcf2" CXXFLAGS += "-isystem ${STAGING_INCDIR}/phonon4qt5/KDE" diff --git a/recipes-kde/apps/filelight/filelight.bb b/recipes-kde/apps/filelight/filelight.bb index dddcf72f..75f25119 100644 --- a/recipes-kde/apps/filelight/filelight.bb +++ b/recipes-kde/apps/filelight/filelight.bb @@ -21,8 +21,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "af910a156f817368d2bab2520636f320" -SRC_URI[sha256sum] = "9090bc7c7ac2586e857cdc246a94621c1453e7f65c6d491f2f374f43d3e4af1a" +SRC_URI[md5sum] = "c321d1b3adda09cdf5519590de0e0565" +SRC_URI[sha256sum] = "22eaa8f0e9e69652240554687b2cecb55449e67caac6055c2d868f3089d835ad" SRC_URI += " \ file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch \ " diff --git a/recipes-kde/apps/granatier/granatier.bb b/recipes-kde/apps/granatier/granatier.bb index f5801b6a..ff21c5dc 100644 --- a/recipes-kde/apps/granatier/granatier.bb +++ b/recipes-kde/apps/granatier/granatier.bb @@ -24,8 +24,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "e18910bb5e1605ed4c8eafe07ab2a0ad" -SRC_URI[sha256sum] = "ad065e488f9a751423d571f51449e766c625e88ca7d3c30d21ff3b9027fc04af" +SRC_URI[md5sum] = "b957d56a53be1b0c62d7a9c47d3a9aa9" +SRC_URI[sha256sum] = "d83e91a5056e4caf1e522921025cb79355c0c2d53b7f0e98444d37291d80d63a" FILES_${PN} += " \ ${datadir}/config.kcfg \ diff --git a/recipes-kde/apps/gwenview/files/0001-Avoid-try_run.patch b/recipes-kde/apps/gwenview/files/0001-Avoid-try_run.patch index 3f54c3cb..2e326558 100644 --- a/recipes-kde/apps/gwenview/files/0001-Avoid-try_run.patch +++ b/recipes-kde/apps/gwenview/files/0001-Avoid-try_run.patch @@ -2,6 +2,9 @@ From e5170c60d0443d8f50b5bf6a85bea64bea29fbc0 Mon Sep 17 00:00:00 2001 From: "Luis Gustavo S. Barreto" Date: Wed, 6 Apr 2016 19:42:07 +0000 Subject: [PATCH 3/3] Avoid try_run +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit When cross compiling, the executable compiled in the first step usually cannot be run on the build host. For this reason, we use try_compile() @@ -10,15 +13,19 @@ to determine what version of libjpeg is available. Upstream-Status: Pending Signed-off-by: Luis Gustavo S. Barreto + +Adjusted to 19.04 +Signed-off-by: Andreas Müller + --- - lib/CMakeLists.txt | 71 ++++++++++++++++++++++++++++++++---------------------- - 1 file changed, 42 insertions(+), 29 deletions(-) + lib/CMakeLists.txt | 75 ++++++++++++++++++++++++++-------------------- + 1 file changed, 42 insertions(+), 33 deletions(-) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index d51b80d..db3ac7b 100644 +index 2a6a08d..c8696ba 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt -@@ -10,42 +10,55 @@ message(STATUS "Looking for libjpeg version in ${JPEG_INCLUDE_DIR}/jpeglib.h") +@@ -12,42 +12,51 @@ message(STATUS "Looking for libjpeg version in ${JPEG_INCLUDE_DIR}/jpeglib.h") # found in (between libjpeg, libjpeg-turbo and various multilib header # forwarding schemes seen in distros), have a simple program print out the # right version. @@ -27,6 +34,16 @@ index d51b80d..db3ac7b 100644 -#include -#include -#include +- +-int main(void) { printf(\"%d\\\n\", JPEG_LIB_VERSION); return 0; } +-") +- +-try_run(JPEGLIB_RUN_RESULT JPEGLIB_COMPILE_RESULT +- ${CMAKE_CURRENT_BINARY_DIR} ${JPEGLIB_VERSION_CHECK_PATH} +- CMAKE_FLAGS -DINCLUDE_DIRECTORIES:PATH=${JPEG_INCLUDE_DIR} +- RUN_OUTPUT_VARIABLE jpeglib_version) +- +-if ((${JPEGLIB_COMPILE_RESULT} EQUAL FALSE) OR ("${JPEGLIB_RUN_RESULT}" EQUAL FAILED_TO_RUN) OR "${jpeglib_version}" STREQUAL "") +function(JPEGVersionCheck Ret Op Version) + set(JPEGLIB_VERSION_CHECK_PATH "${CMAKE_CURRENT_BINARY_DIR}/jpeglib-version-check.c") + file(WRITE ${JPEGLIB_VERSION_CHECK_PATH} " @@ -41,68 +58,58 @@ index d51b80d..db3ac7b 100644 + return 0; + } + ") - --int main(void) { printf(\"%d\\\n\", JPEG_LIB_VERSION); } --") -+try_compile(COMPILE_RESULT_VAR ++ try_compile(COMPILE_RESULT_VAR + "${CMAKE_BINARY_DIR}" "${JPEGLIB_VERSION_CHECK_PATH}" + COMPILE_DEFINITIONS "${COMPILE_DEFINITIONS}" + OUTPUT_VARIABLE COMPILE_OUT) - --try_run(JPEGLIB_RUN_RESULT JPEGLIB_COMPILE_RESULT -- ${CMAKE_CURRENT_BINARY_DIR} ${JPEGLIB_VERSION_CHECK_PATH} -- CMAKE_FLAGS -DINCLUDE_DIRECTORIES:PATH=${JPEG_INCLUDE_DIR} -- RUN_OUTPUT_VARIABLE jpeglib_version) + set(${Ret} ${COMPILE_OUT} PARENT_SCOPE) +endfunction() - --if ((${JPEGLIB_COMPILE_RESULT} EQUAL FALSE) OR ("${JPEGLIB_RUN_RESULT}" EQUAL FAILED_TO_RUN) OR "${jpeglib_version}" STREQUAL "") -- message(FATAL_ERROR "Could not find jpeglib.h. This file comes with libjpeg.") --endif() ++ +find_package(JPEG REQUIRED) +if(JPEG_FOUND) + JPEGVersionCheck(JPEG_LIB_VERSION < 80) + if (${JPEG_LIB_VERSION} MATCHES "#error") + set(GV_JPEG_DIR libjpeg-62) + endif() - --if ("${jpeglib_version}" LESS 80) -- set(GV_JPEG_DIR libjpeg-62) --endif() + JPEGVersionCheck(JPEG_LIB_VERSION == 80) + if (${JPEG_LIB_VERSION} MATCHES "#error") + set(GV_JPEG_DIR libjpeg-80) + endif() - --if ("${jpeglib_version}" EQUAL 80) -- set(GV_JPEG_DIR libjpeg-80) --endif() + JPEGVersionCheck(JPEG_LIB_VERSION == 90) + if (${JPEG_LIB_VERSION} MATCHES "#error") + set(GV_JPEG_DIR libjpeg-90) + endif() - --if ("${jpeglib_version}" EQUAL 90) -- set(GV_JPEG_DIR libjpeg-90) --endif() -- --if ("${GV_JPEG_DIR}" STREQUAL "") -- message(FATAL_ERROR "Unknown libjpeg version: ${jpeglib_version}") ++ + if ("${GV_JPEG_DIR}" STREQUAL "") + message(FATAL_ERROR "Unknown libjpeg version") + else() + message(STATUS "using ${GV_JPEG_DIR}") + endif() +else(JPEG_FOUND) -+ message(FATAL_ERROR "Could not find jpeglib.h. This file comes with libjpeg.") + message(FATAL_ERROR "Could not find jpeglib.h. This file comes with libjpeg.") endif() + +-if ("${jpeglib_version}" LESS 80) +- set(GV_JPEG_DIR libjpeg-62) +-endif() +- +-if ("${jpeglib_version}" EQUAL 80) +- set(GV_JPEG_DIR libjpeg-80) +-endif() +- +-if ("${jpeglib_version}" EQUAL 90) +- set(GV_JPEG_DIR libjpeg-90) +-endif() +- +-if ("${GV_JPEG_DIR}" STREQUAL "") +- message(FATAL_ERROR "Unknown libjpeg version: ${jpeglib_version}") +-endif() - -message(STATUS "libjpeg version: ${jpeglib_version}") - -+ add_definitions(-Dlibjpeg_EXPORTS) include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/${GV_JPEG_DIR} -- -2.5.5 +2.20.1 diff --git a/recipes-kde/apps/gwenview/gwenview.bb b/recipes-kde/apps/gwenview/gwenview.bb index 9341de06..52e4cbff 100644 --- a/recipes-kde/apps/gwenview/gwenview.bb +++ b/recipes-kde/apps/gwenview/gwenview.bb @@ -25,8 +25,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "93019f12a8b494b22d00d9489832246b" -SRC_URI[sha256sum] = "0b4ff869fc09140e258e894f5169fc6c96f1126891b8ed1a391d4624d6ab0c35" +SRC_URI[md5sum] = "d770f1f2e228c64b6a481b048e1889c0" +SRC_URI[sha256sum] = "c7d422bddf031fa9d5a23459c65ea6dbb5919e964cc194178a864ee98912b46d" SRC_URI += " \ file://0001-Avoid-try_run.patch \ diff --git a/recipes-kde/apps/kalgebra/kalgebra.bb b/recipes-kde/apps/kalgebra/kalgebra.bb index 81ec1836..1732fd10 100644 --- a/recipes-kde/apps/kalgebra/kalgebra.bb +++ b/recipes-kde/apps/kalgebra/kalgebra.bb @@ -22,8 +22,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "6357ca100f9f85ffd9fab69fa4bb9d79" -SRC_URI[sha256sum] = "a93b319c6a3fab3d3a12923f8153a6f38281887e176fffaa37ca6cc677a280b5" +SRC_URI[md5sum] = "266bcde5b2911a53043e36ab7449b774" +SRC_URI[sha256sum] = "a46c4fc2b0891183d0a3b859182eef8d49206b81cbf6d2c6ed6d5448f2663a4a" FILES_${PN} += " \ ${datadir}/icons \ diff --git a/recipes-kde/apps/kapman/kapman.bb b/recipes-kde/apps/kapman/kapman.bb index 4b48abe5..4638046f 100644 --- a/recipes-kde/apps/kapman/kapman.bb +++ b/recipes-kde/apps/kapman/kapman.bb @@ -26,8 +26,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "6fbc7241c27a158e3983e2cfb64237f5" -SRC_URI[sha256sum] = "ad4a6377d260df76d000631ab4c95e5cb82ce47d031edc9801b6ed92d856305c" +SRC_URI[md5sum] = "0afd8dd6d90a42ef575171cc4b6ee69e" +SRC_URI[sha256sum] = "f77dd3210bcdfb2d424f7a919848e25a4b4ae994d74b59111f352e41c2086324" 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 deleted file mode 100644 index 450ee457..00000000 --- a/recipes-kde/apps/kate/files/0001-fix-build-for-qtbase-build-without-session-support-Q.patch +++ /dev/null @@ -1,72 +0,0 @@ -From ac7548b52a701ad846dd0cb534440f8de7864711 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Tue, 10 Feb 2015 11:43:46 +0100 -Subject: [PATCH 1/2] fix build for qtbase build without session support - QT_NO_SESSIONMANAGER -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Andreas Müller ---- - 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/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()); - -+#ifndef QT_NO_SESSIONMANAGER - // handle restore different - if (qApp->isSessionRestored()) { - restoreKate(); -- } else { -+ } else -+#endif -+ { - // let us handle our command line args and co ;) - // we can exit here if session chooser decides - if (!startupKate()) { -diff --git a/kate/src/katemainwindow.cpp b/kate/src/katemainwindow.cpp -index 464e20c..8efc401 100644 ---- a/kate/katemainwindow.cpp -+++ b/kate/katemainwindow.cpp -@@ -467,9 +467,11 @@ bool KateMainWindow::queryClose() - { - // session saving, can we close all views ? - // just test, not close them actually -+#ifndef QT_NO_SESSIONMANAGER - if (qApp->isSavingSession()) { - return queryClose_internal(); - } -+#endif - - // normal closing of window - // allow to close all windows until the last without restrictions -diff --git a/kwrite/main.cpp b/kwrite/main.cpp -index a361527..d5738e9 100644 ---- a/kwrite/main.cpp -+++ b/kwrite/main.cpp -@@ -159,9 +159,12 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv) - */ - aboutData.processCommandLine(&parser); - -+#ifndef QT_NO_SESSIONMANAGER - if (app.isSessionRestored()) { - KWrite::restore(); -- } else { -+ } else -+#endif -+ { - bool nav = false; - int line = 0, column = 0; - --- -1.9.3 - 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 deleted file mode 100644 index c4812978..00000000 --- a/recipes-kde/apps/kate/files/0002-fix-build-for-sessionless-kconfig.patch +++ /dev/null @@ -1,57 +0,0 @@ -From d3c4d12f9168d2d1267b9732e75658866ef8bb9b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Tue, 10 Feb 2015 11:52:14 +0100 -Subject: [PATCH 2/2] fix build for sessionless kconfig -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Andreas Müller ---- - kate/kateapp.cpp | 2 ++ - kwrite/kwrite.cpp | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/kate/kateapp.cpp b/kate/kateapp.cpp -index 03fd159..ae2c793 100644 ---- a/kate/kateapp.cpp -+++ b/kate/kateapp.cpp -@@ -121,6 +121,7 @@ bool KateApp::init() - - void KateApp::restoreKate() - { -+#ifndef QT_NO_SESSIONMANAGER - KConfig *sessionConfig = KConfigGui::sessionConfig(); - - // activate again correct session!!! -@@ -142,6 +143,7 @@ void KateApp::restoreKate() - if (mainWindowsCount() == 0) { - newMainWindow(); - } -+#endif - } - - bool KateApp::startupKate() -diff --git a/kwrite/kwrite.cpp b/kwrite/kwrite.cpp -index dc54855..5693db0 100644 ---- a/kwrite/kwrite.cpp -+++ b/kwrite/kwrite.cpp -@@ -454,6 +454,7 @@ void KWrite::saveGlobalProperties(KConfig *config) //save documents - //restore session - void KWrite::restore() - { -+#ifndef QT_NO_SESSIONMANAGER - KConfig *config = KConfigGui::sessionConfig(); - - if (!config) { -@@ -483,6 +484,7 @@ void KWrite::restore() - t = new KWrite(docList.at(cg.readEntry("DocumentNumber", 0) - 1)); - t->restore(config, z); - } -+#endif - } - - void KWrite::aboutEditor() --- -1.9.3 - diff --git a/recipes-kde/apps/kate/kate.bb b/recipes-kde/apps/kate/kate.bb index 34728dcc..bedf1a21 100644 --- a/recipes-kde/apps/kate/kate.bb +++ b/recipes-kde/apps/kate/kate.bb @@ -34,13 +34,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "17e8021c1c1bf1d77cd467ca3fab3caf" -SRC_URI[sha256sum] = "f7f2cba41a4c88b65885532db6b6161c66055a6697d20ee88adb70f302d387e1" - -SRC_URI += " \ - file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch \ - file://0002-fix-build-for-sessionless-kconfig.patch \ -" +SRC_URI[md5sum] = "bfb4d4c1056f5ec6235b6b31da1e71dc" +SRC_URI[sha256sum] = "64c3c312a69d45624e3619309b86de796f67d30a864433a5c24aeb4e299bacc9" FILES_SOLIBSDEV = "" diff --git a/recipes-kde/apps/katomic/katomic.bb b/recipes-kde/apps/katomic/katomic.bb index e1430429..7ecb5fc8 100644 --- a/recipes-kde/apps/katomic/katomic.bb +++ b/recipes-kde/apps/katomic/katomic.bb @@ -27,8 +27,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "83a27f535669d9a5d4782b9355db757b" -SRC_URI[sha256sum] = "0e18087d0de067282023a98b800807632dd6a91bab51cf0d43d53bffba9b33f1" +SRC_URI[md5sum] = "c1cd7f2fd9449a1b223a702874a23fb1" +SRC_URI[sha256sum] = "ea6e6642e16f985653caf2cd9dd61248e7038fb0246e9af4d4daec20401537a2" SRC_URI += "file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch" FILES_${PN} += " \ diff --git a/recipes-kde/apps/kblocks/kblocks.bb b/recipes-kde/apps/kblocks/kblocks.bb index ab2acd34..28f3c256 100644 --- a/recipes-kde/apps/kblocks/kblocks.bb +++ b/recipes-kde/apps/kblocks/kblocks.bb @@ -22,8 +22,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "640b68db31f22b138ef0df5968e648a9" -SRC_URI[sha256sum] = "e981107096893a8078ab978c429f367432a74de1bdeffe8fb628ccc397701332" +SRC_URI[md5sum] = "d8b0805b7abfb706037620beaa4c0268" +SRC_URI[sha256sum] = "c70a60f3a2e4c8f7756a1f9b1e025f8f91ec83c4f54feedf0ba05eea36b0037e" FILES_${PN} += " \ ${datadir}/config.kcfg \ diff --git a/recipes-kde/apps/kbounce/kbounce.bb b/recipes-kde/apps/kbounce/kbounce.bb index 808a0ad7..b8dccd16 100644 --- a/recipes-kde/apps/kbounce/kbounce.bb +++ b/recipes-kde/apps/kbounce/kbounce.bb @@ -28,8 +28,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "f190c2913ba0dbcdf15c6f02be532ce8" -SRC_URI[sha256sum] = "c62cb68b4246c1aef73efb04ea883599384afbd977e8da93893346cbd835f343" +SRC_URI[md5sum] = "cb26b9d95dfcc85f621ee58bc7553d42" +SRC_URI[sha256sum] = "cd28d777db8ff1dc1437fb6456c2fdfe8b9005c0cea3ce05337fbf425803834f" SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch" FILES_${PN} += " \ diff --git a/recipes-kde/apps/kbreakout/kbreakout.bb b/recipes-kde/apps/kbreakout/kbreakout.bb index c5e046fe..ffebf673 100644 --- a/recipes-kde/apps/kbreakout/kbreakout.bb +++ b/recipes-kde/apps/kbreakout/kbreakout.bb @@ -23,8 +23,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "26c31da7a5dae51ef1a362ca3458517f" -SRC_URI[sha256sum] = "23e1cc935eab6a2520e683185cb223243c71553b1ef6059a21f09d72e8fe00af" +SRC_URI[md5sum] = "4b368347de30dffcc6750730a80c10b1" +SRC_URI[sha256sum] = "c4aa847def701be288e53ceb27c8c63c34aa527f8e64c91fb007d053b1119db8" FILES_${PN} += " \ ${datadir}/kxmlgui5 \ diff --git a/recipes-kde/apps/kcachegrind/kcachegrind.bb b/recipes-kde/apps/kcachegrind/kcachegrind.bb index e273ccd0..bb1ae1f1 100644 --- a/recipes-kde/apps/kcachegrind/kcachegrind.bb +++ b/recipes-kde/apps/kcachegrind/kcachegrind.bb @@ -22,8 +22,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "3193c9233a545e55528f68b6fb5eb6fb" -SRC_URI[sha256sum] = "48011190a0ef28998e6c96b9d644e3d06b68606b7d1467c84a8d176eeebb9adf" +SRC_URI[md5sum] = "09890b38b9270e4f114777929e38ca9e" +SRC_URI[sha256sum] = "7021ac1b133e86692dad92ff8de6a0467c2b488d7e5c2977ee4880c166e088ca" FILES_${PN} += " \ ${datadir}/kxmlgui5 \ diff --git a/recipes-kde/apps/kcalc/kcalc.bb b/recipes-kde/apps/kcalc/kcalc.bb index b35a515e..1afe9a8b 100644 --- a/recipes-kde/apps/kcalc/kcalc.bb +++ b/recipes-kde/apps/kcalc/kcalc.bb @@ -22,8 +22,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "ddd1ca9dcdb7db22f8a011e525e99963" -SRC_URI[sha256sum] = "10b3ebb5efab3731e9f12a8632546685281179881b03aae98f96a2cdbd21f02f" +SRC_URI[md5sum] = "25c064ded968b8a233bed84c68cb9191" +SRC_URI[sha256sum] = "0384ebf83c62e74a2412f71f648bad112f91ef3ec6aa64fe55e63fd88a156593" FILES_SOLIBSDEV = "" diff --git a/recipes-kde/apps/kcolorchooser/kcolorchooser.bb b/recipes-kde/apps/kcolorchooser/kcolorchooser.bb index ba587331..d9c4166f 100644 --- a/recipes-kde/apps/kcolorchooser/kcolorchooser.bb +++ b/recipes-kde/apps/kcolorchooser/kcolorchooser.bb @@ -16,8 +16,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "edc6d65d8ed5c0a7c02e2eda2b78ab4c" -SRC_URI[sha256sum] = "8defdb9450922b675dc80561a0f4bb119e621a85dd73661fc4caacef8db91228" +SRC_URI[md5sum] = "abecb96e56f4abf1e9651b200a3a3ac0" +SRC_URI[sha256sum] = "8f338ba51349cb056f25266d884ca318d3fd3933288ec96f9f17df6c842bc839" FILES_${PN} += " \ ${datadir}/icons \ diff --git a/recipes-kde/apps/kdenlive/files/0001-CMakeLists.txt-make-MLT_PREFIX-configurable.patch b/recipes-kde/apps/kdenlive/files/0001-CMakeLists.txt-make-MLT_PREFIX-configurable.patch index 10d96ee8..b931f385 100644 --- a/recipes-kde/apps/kdenlive/files/0001-CMakeLists.txt-make-MLT_PREFIX-configurable.patch +++ b/recipes-kde/apps/kdenlive/files/0001-CMakeLists.txt-make-MLT_PREFIX-configurable.patch @@ -1,7 +1,10 @@ From d7cf023376cb834f9becb63f2648c63c5ec3fd12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Thu, 15 Nov 2018 18:46:38 +0100 +Date: Fri, 19 Apr 2019 14:34:15 +0200 Subject: [PATCH] CMakeLists.txt: make MLT_PREFIX configurable +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Upstream-Status: Inappropriate [embedded specific] @@ -11,18 +14,18 @@ Signed-off-by: Andreas Müller 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index ec69e0c..0792bc3 100644 +index 05ed428..eeb0692 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -119,7 +119,7 @@ set_package_properties(MLT PROPERTIES - PURPOSE "Required to do video processing") - - if(NOT WIN32) +@@ -77,7 +77,7 @@ if(WIN32) + find_package(DrMinGW) + set(MLT_PREFIX "..") + else() - set(MLT_PREFIX ${MLT_ROOT_DIR}) + set(MLT_PREFIX ${MLT_ROOT_DIR} CACHE STRING "mlt prefix") - else() - set(MLT_PREFIX "..") endif() + + # Optional deps status -- -2.14.5 +2.20.1 diff --git a/recipes-kde/apps/kdenlive/kdenlive.bb b/recipes-kde/apps/kdenlive/kdenlive.bb index da8e47c2..50e8dc3d 100644 --- a/recipes-kde/apps/kdenlive/kdenlive.bb +++ b/recipes-kde/apps/kdenlive/kdenlive.bb @@ -36,8 +36,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "57e49c3995117945938669e24aff9352" -SRC_URI[sha256sum] = "fcfe2474bc271e730ed95edb21ae46e93c1ce773ed036f63c9fb2db02cbc7e64" +SRC_URI[md5sum] = "1386b04b1aef5832ae21525aaf4fc8b7" +SRC_URI[sha256sum] = "274ae17b4376258ef83d810cb33677ca3224e205ea8b69982dd0fc4e5ee5878a" SRC_URI += " \ file://0001-CMakeLists.txt-make-MLT_PREFIX-configurable.patch \ diff --git a/recipes-kde/apps/kdf/kdf.bb b/recipes-kde/apps/kdf/kdf.bb index eee20542..89b797da 100644 --- a/recipes-kde/apps/kdf/kdf.bb +++ b/recipes-kde/apps/kdf/kdf.bb @@ -22,8 +22,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "daa73fb65eb5b48928b3b4e4511d6e06" -SRC_URI[sha256sum] = "a8a9e8a4c2bdc1855078383f10720b4b3a388c678dee148494dc18ba5019a6ae" +SRC_URI[md5sum] = "c19edb217b875bbc2e2d3c1c09cfdc87" +SRC_URI[sha256sum] = "f1204fddefe5492c860a77ff2c343f9b885625b321a37673763d73510dd469fd" FILES_${PN} += " \ ${datadir}/k*5 \ diff --git a/recipes-kde/apps/kdiamond/kdiamond.bb b/recipes-kde/apps/kdiamond/kdiamond.bb index a2db2302..68331f3f 100644 --- a/recipes-kde/apps/kdiamond/kdiamond.bb +++ b/recipes-kde/apps/kdiamond/kdiamond.bb @@ -26,8 +26,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "fe3970879eec195f387c772e6fd6fba5" -SRC_URI[sha256sum] = "b3d959cc195b924ca877df2762c3e8ef115ac41c2355f34efbbcaabe9b02b500" +SRC_URI[md5sum] = "1c1d960c9b6280a66e4087e351f271d5" +SRC_URI[sha256sum] = "121ef36611bf7fe9a7d1d4700622a4cc8a349fe262b7c568026a4da55dfd4b26" SRC_URI+="file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch" FILES_${PN} += " \ diff --git a/recipes-kde/apps/kfind/kfind.bb b/recipes-kde/apps/kfind/kfind.bb index fe1c654a..1151c361 100644 --- a/recipes-kde/apps/kfind/kfind.bb +++ b/recipes-kde/apps/kfind/kfind.bb @@ -21,8 +21,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "fa127f073bbb0075741c12d0017b2f44" -SRC_URI[sha256sum] = "ad123b24f88e1ade5a845c16a84a483835cce31b92741107d8dbd02f462d4cd9" +SRC_URI[md5sum] = "e83609c946466d62bc0870f7243cde87" +SRC_URI[sha256sum] = "7eec5b096738bb28264bf870bdd85e24f97c62677be2d2a061f6c426ecfc3a47" FILES_${PN} += " \ ${datadir}/icons \ diff --git a/recipes-kde/apps/khelpcenter/khelpcenter.bb b/recipes-kde/apps/khelpcenter/khelpcenter.bb index bb47b52b..4f10f3c9 100644 --- a/recipes-kde/apps/khelpcenter/khelpcenter.bb +++ b/recipes-kde/apps/khelpcenter/khelpcenter.bb @@ -28,8 +28,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "7af7f7f466600d08ca11aa1f24e9c977" -SRC_URI[sha256sum] = "5b4a9ed17d0898c74cf7fd1612e2d055086d5e04148b3b17df5977255fc240b8" +SRC_URI[md5sum] = "fe6b924334b3f2dfccbd966931698375" +SRC_URI[sha256sum] = "5fc4f9553e8575055edf259baa3d0b0c663db5caf67dc392db9e519d6b85699f" SRC_URI += " \ file://0001-fix-build-for-qtbase-without-session-management.patch \ diff --git a/recipes-kde/apps/kio-extras/kio-extras.bb b/recipes-kde/apps/kio-extras/kio-extras.bb index b814b8bf..65dc7b3b 100644 --- a/recipes-kde/apps/kio-extras/kio-extras.bb +++ b/recipes-kde/apps/kio-extras/kio-extras.bb @@ -49,8 +49,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "93e86cccf0b4d4868d5b32e16fa5299f" -SRC_URI[sha256sum] = "f8879abaea6fcf31ee0bd4a55d0c24a5fded6d61abed1b059f704f797793aef2" +SRC_URI[md5sum] = "e7334b634fff1317dd806d3a74e7ec2a" +SRC_URI[sha256sum] = "0f3f2eaf40512cf4a61b09b94ca365d7d05c7b1a75f4e8afd047143a8e962d85" # gperf creates hard #line links do_install_prepend() { diff --git a/recipes-kde/apps/kmag/kmag.bb b/recipes-kde/apps/kmag/kmag.bb index 7d5b27c9..d4a93900 100644 --- a/recipes-kde/apps/kmag/kmag.bb +++ b/recipes-kde/apps/kmag/kmag.bb @@ -19,8 +19,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "f0d06288f2b55f63fd67d747f2868216" -SRC_URI[sha256sum] = "04f1357e46bb3e32c85f08c9d5655cde6351c6efd27824a17019ea8562e8d5ba" +SRC_URI[md5sum] = "033f6ec97f311bc188cb69ec77301428" +SRC_URI[sha256sum] = "c6725654846e83b383ff6c624683e4132538f2e812d8131cadefd6926316520e" FILES_${PN} += " \ ${datadir}/kxmlgui5 \ diff --git a/recipes-kde/apps/kmahjongg/kmahjongg.bb b/recipes-kde/apps/kmahjongg/kmahjongg.bb index bfe2da6a..d37b922b 100644 --- a/recipes-kde/apps/kmahjongg/kmahjongg.bb +++ b/recipes-kde/apps/kmahjongg/kmahjongg.bb @@ -23,8 +23,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "73db8ba5adba90700a3447833304341e" -SRC_URI[sha256sum] = "188a8d921b72965d4ed0f6490048cde7b9d5606cca7d3cea12463dc71a90ccf6" +SRC_URI[md5sum] = "7087e9639a970ab75e9364e9d70361d4" +SRC_URI[sha256sum] = "519bf6bb0bc098f74467d3ec9b49c82d22241dfd518d004163565e86dbc21a36" FILES_${PN} += " \ ${datadir}/config.kcfg \ diff --git a/recipes-kde/apps/kmines/kmines.bb b/recipes-kde/apps/kmines/kmines.bb index b17acae5..652a1894 100644 --- a/recipes-kde/apps/kmines/kmines.bb +++ b/recipes-kde/apps/kmines/kmines.bb @@ -23,8 +23,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "f308aa02233b191051a4da306bc4b899" -SRC_URI[sha256sum] = "40c16b57614098555c32252c75e3890922b62d7005b9059f6ae92e11c96d980f" +SRC_URI[md5sum] = "f070829f2e977e57d4a2d2f25995385b" +SRC_URI[sha256sum] = "56452ab18c74f2863efc99200a5facd53827382c06fc8534d095bffaca497566" FILES_${PN} += " \ ${datadir}/icons \ diff --git a/recipes-kde/apps/kmix/files/0001-Fix-build-with-QT_NO_SESSIONMANAGER-set.patch b/recipes-kde/apps/kmix/files/0001-Fix-build-with-QT_NO_SESSIONMANAGER-set.patch deleted file mode 100644 index f1a23541..00000000 --- a/recipes-kde/apps/kmix/files/0001-Fix-build-with-QT_NO_SESSIONMANAGER-set.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 9757ed6c44884eb7890f31e015f5788de88891ac Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Thu, 21 Dec 2017 00:22:43 +0100 -Subject: [PATCH] Fix build with QT_NO_SESSIONMANAGER set - ---- - apps/KMixApp.cpp | 4 ++++ - apps/kmix.cpp | 2 ++ - 2 files changed, 6 insertions(+) - -diff --git a/apps/KMixApp.cpp b/apps/KMixApp.cpp -index d00309b..b00f27a 100644 ---- a/apps/KMixApp.cpp -+++ b/apps/KMixApp.cpp -@@ -87,7 +87,11 @@ bool KMixApp::restoreSessionIfApplicable(bool hasArgKeepvisibility, bool reset) - */ - creationLock.lock(); - -+#ifndef QT_NO_SESSIONMANAGER - bool restore = qApp->isSessionRestored(); // && KMainWindow::canBeRestored(0); -+#else -+ bool restore = false; -+#endif - qCDebug(KMIX_LOG) << "Starting KMix using keepvisibility=" << hasArgKeepvisibility << ", failsafe=" << reset << ", sessionRestore=" << restore; - int createCount = 0; - if (restore) -diff --git a/apps/kmix.cpp b/apps/kmix.cpp -index b97852c..cd74d03 100644 ---- a/apps/kmix.cpp -+++ b/apps/kmix.cpp -@@ -99,8 +99,10 @@ KMixWindow::KMixWindow(bool invisible, bool reset) : - recreateGUI(false, QString(), true, reset); - } - -+#ifndef QT_NO_SESSIONMANAGER - if (!qApp->isSessionRestored() ) // done by the session manager otherwise - setInitialSize(); -+#endif - - fixConfigAfterRead(); - theKMixDeviceManager->initHotplug(); --- -2.9.5 - diff --git a/recipes-kde/apps/kmix/kmix.bb b/recipes-kde/apps/kmix/kmix.bb index 74ded872..87c29ec8 100644 --- a/recipes-kde/apps/kmix/kmix.bb +++ b/recipes-kde/apps/kmix/kmix.bb @@ -32,10 +32,8 @@ PACKAGECONFIG = "pulseaudio" PACKAGECONFIG[pulseaudio] = ",,pulseaudio" PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "2071a1c7b592a238bc03503e8d0f3cfc" -SRC_URI[sha256sum] = "4edf31a36a5d700cc190ba7a5a0d76789729069d48324a22bda7977cb4ed081a" - -SRC_URI += "file://0001-Fix-build-with-QT_NO_SESSIONMANAGER-set.patch" +SRC_URI[md5sum] = "9320cc1d76a7594c69cdccb477442de6" +SRC_URI[sha256sum] = "f372d50ccdb496a3bb7a3f68c84c921c12d3d535a792400e701ed7c640e45f2a" EXTRA_OECMAKE += "-DKMIX_KF5_BUILD=1" diff --git a/recipes-kde/apps/kmplot/kmplot.bb b/recipes-kde/apps/kmplot/kmplot.bb index 9b29b474..c3645c94 100644 --- a/recipes-kde/apps/kmplot/kmplot.bb +++ b/recipes-kde/apps/kmplot/kmplot.bb @@ -23,8 +23,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "6f92126fc111e28b733f458a536ac914" -SRC_URI[sha256sum] = "2dd6eec34088b5d3b591091cce41616ee310a66aa2d16e5800db56044d60dd7b" +SRC_URI[md5sum] = "087c0ec7bd057bb3230b7b22c19f3f39" +SRC_URI[sha256sum] = "fb981354dd6fea18e83003df957f65a9580d458b377adde88a838d4db9a97ee6" FILES_${PN} += " \ ${datadir}/config.kcfg \ diff --git a/recipes-kde/apps/kolourpaint/kolourpaint.bb b/recipes-kde/apps/kolourpaint/kolourpaint.bb index 0ee4b261..43d10993 100644 --- a/recipes-kde/apps/kolourpaint/kolourpaint.bb +++ b/recipes-kde/apps/kolourpaint/kolourpaint.bb @@ -29,8 +29,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "07f4861f1b09d08fc954cf2ea8c7189c" -SRC_URI[sha256sum] = "450b714f0d73b59d31c4ceda142a3496d14e51d84b8c8968548a15e05c138f98" +SRC_URI[md5sum] = "4c3e6a0fa19bcd90ccb245be049c0b20" +SRC_URI[sha256sum] = "d6cd087ba34a1a8fec9349dea06c1b71a70f6e8455adb41d4820a376eb2ed141" FILES_${PN} += " \ ${datadir}/k*5 \ diff --git a/recipes-kde/apps/konsole/konsole.bb b/recipes-kde/apps/konsole/konsole.bb index 6ceb708d..55aeffb2 100644 --- a/recipes-kde/apps/konsole/konsole.bb +++ b/recipes-kde/apps/konsole/konsole.bb @@ -40,8 +40,8 @@ DEPENDS += " \ PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "1378218f3e108403decdbc8ad846cc49" -SRC_URI[sha256sum] = "01ff3245d755a6e38207e58e50e5f82e5c681ead2ad7176d46aec00a8a562e08" +SRC_URI[md5sum] = "b48d0154622ef33a6818160e3cbe927c" +SRC_URI[sha256sum] = "62d53840f6cac4686feafa7f75d641bb56867b7dfc12e6ce95afa7e796e37cef" # do not move so-libs to -dev package FILES_SOLIBSDEV = "" diff --git a/recipes-kde/apps/kpat/kpat.bb b/recipes-kde/apps/kpat/kpat.bb index 0c746b35..d86e79fc 100644 --- a/recipes-kde/apps/kpat/kpat.bb +++ b/recipes-kde/apps/kpat/kpat.bb @@ -27,8 +27,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "d0b23b0430f650ce898a57edb7b11024" -SRC_URI[sha256sum] = "62c31d6f7a9bb49c09725722bea472811d897b149e29558ca6e248b5d2a41377" +SRC_URI[md5sum] = "63d7566dd7ae726d410e878b5aedb572" +SRC_URI[sha256sum] = "bcd295a3df422b5cfa8258bb3cd0be7e4405f44604681d98589f2982c44414a1" FILES_SOLIBSDEV = "" diff --git a/recipes-kde/apps/kreversi/kreversi.bb b/recipes-kde/apps/kreversi/kreversi.bb index 727c5db6..d549bd6d 100644 --- a/recipes-kde/apps/kreversi/kreversi.bb +++ b/recipes-kde/apps/kreversi/kreversi.bb @@ -30,8 +30,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "e05fcf9365abb666b38c963988ce040e" -SRC_URI[sha256sum] = "818ef2ded02caacf2ccf3c012e992070c3b898db319682e8a42cf5726d56b3fc" +SRC_URI[md5sum] = "ac0403ad2c14a0766fccbe64c0f636bc" +SRC_URI[sha256sum] = "a715d068eaf381a26e1f432f2d6b3f3ffffb388282b484cd8ad0833acf429d82" SRC_URI+="file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch" FILES_${PN} += " \ diff --git a/recipes-kde/apps/ksudoku/ksudoku.bb b/recipes-kde/apps/ksudoku/ksudoku.bb index a5184f00..bbad9cf3 100644 --- a/recipes-kde/apps/ksudoku/ksudoku.bb +++ b/recipes-kde/apps/ksudoku/ksudoku.bb @@ -29,8 +29,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "904d4cdab886484afb1fc90dfd522a14" -SRC_URI[sha256sum] = "4a44248f2bde9c66c911fe7ed7bd54e31956053dac18e29217a355ad2b3a05e1" +SRC_URI[md5sum] = "945971a3e47bddd5119657384ea94418" +SRC_URI[sha256sum] = "4f5cff274741326bff02108fef4996f289c56ff026fd6e2921e4a2bf492a14cb" FILES_${PN} += " \ ${datadir}/icons \ diff --git a/recipes-kde/apps/ksystemlog/ksystemlog.bb b/recipes-kde/apps/ksystemlog/ksystemlog.bb index ef0f9145..bcbbc895 100644 --- a/recipes-kde/apps/ksystemlog/ksystemlog.bb +++ b/recipes-kde/apps/ksystemlog/ksystemlog.bb @@ -22,7 +22,7 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "ce0e9290effc7ed38ab6232809843f4b" -SRC_URI[sha256sum] = "93f276698b74af654f3ed147d5c025162bd919ec6c79a7c7dd7678051c307e52" +SRC_URI[md5sum] = "fde26548d5143bc43b9e09de0179f36f" +SRC_URI[sha256sum] = "6a9f389b04fac92b0e2955e86e4a45aa73494f6dd24c9a6704826b469414fb5d" FILES_${PN} += "${datadir}/kxmlgui5" diff --git a/recipes-kde/apps/kwalletmanager/kwalletmanager.bb b/recipes-kde/apps/kwalletmanager/kwalletmanager.bb index f0acfe1a..7db2e657 100644 --- a/recipes-kde/apps/kwalletmanager/kwalletmanager.bb +++ b/recipes-kde/apps/kwalletmanager/kwalletmanager.bb @@ -24,8 +24,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "6d90a44ee14a0937bc5a1f983fc46421" -SRC_URI[sha256sum] = "78232285c08241dc06cd6da88dcdce0d850417dd73f0d07034ec6d9a6f97f478" +SRC_URI[md5sum] = "42cf72ae3d9185148c6460d6ee316c3b" +SRC_URI[sha256sum] = "5cc25daaa8511694b01ba4b0a7ca39f8f2eef9fce10e99411ae287013fc27734" SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch" FILES_${PN} += " \ diff --git a/recipes-kde/apps/kwave/kwave.bb b/recipes-kde/apps/kwave/kwave.bb index 3125919c..c6f01e73 100644 --- a/recipes-kde/apps/kwave/kwave.bb +++ b/recipes-kde/apps/kwave/kwave.bb @@ -33,8 +33,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "e9c5692d83493a4293a706c41b0762fe" -SRC_URI[sha256sum] = "4ca9a15ecd06b96e013855f8109b52fcd4a848652438b2e7a2f55a8fcb1d1c48" +SRC_URI[md5sum] = "385f903641b3def71e43036d1b5749f6" +SRC_URI[sha256sum] = "510b99740c87ade2e644b8b62ece9ac46721e636aeb83f253939d4d191d03a52" 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 diff --git a/recipes-kde/apps/libkdcraw/libkdcraw.bb b/recipes-kde/apps/libkdcraw/libkdcraw.bb index 55245870..157ca29b 100644 --- a/recipes-kde/apps/libkdcraw/libkdcraw.bb +++ b/recipes-kde/apps/libkdcraw/libkdcraw.bb @@ -13,5 +13,5 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "75999ed863aef72bcf62a40910c0ca20" -SRC_URI[sha256sum] = "c4b6541419b2ebee15d24744d10e67c9a137e616766e765c13e5056c2a37ef99" +SRC_URI[md5sum] = "889398766336bcd55e71d0ca5aad5aeb" +SRC_URI[sha256sum] = "30df02047c0f1b97a7c90c8eb5f7a3c5d322f13e0158395d3f9798ff21ed529e" diff --git a/recipes-kde/apps/libkdegames/libkdegames.bb b/recipes-kde/apps/libkdegames/libkdegames.bb index 46b58175..e340cacd 100644 --- a/recipes-kde/apps/libkdegames/libkdegames.bb +++ b/recipes-kde/apps/libkdegames/libkdegames.bb @@ -43,8 +43,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "69830d93bd7dfa8882a45a9d7a45a0a1" -SRC_URI[sha256sum] = "7c833fe476043f0492a09a52af60ee7652805cccbbb72e5f473a9d35abff9ed9" +SRC_URI[md5sum] = "f7de7938028ce760aa6d1dc6e080ef51" +SRC_URI[sha256sum] = "2965e4a313609f6408becb13e54e26bfe14b37b58e7737e051129896f6e8bcd3" FILES_${PN} += " \ ${datadir}/carddecks \ diff --git a/recipes-kde/apps/libkexiv2/libkexiv2.bb b/recipes-kde/apps/libkexiv2/libkexiv2.bb index e239a19c..2c8ce381 100644 --- a/recipes-kde/apps/libkexiv2/libkexiv2.bb +++ b/recipes-kde/apps/libkexiv2/libkexiv2.bb @@ -13,5 +13,5 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "50ef0905ed41eb586145dac0274ca226" -SRC_URI[sha256sum] = "1d14ff63af42ab7e19e2039648a95ea5dc946afbe3e3df52c17ce1618a02ebdc" +SRC_URI[md5sum] = "54dc4d67b44d562bc151fd8d472aa178" +SRC_URI[sha256sum] = "9fcafa932631429af1693642415d2f202ad29338b63949b5e8661135eb69dc19" diff --git a/recipes-kde/apps/libkmahjongg/libkmahjongg.bb b/recipes-kde/apps/libkmahjongg/libkmahjongg.bb index 5f65397f..38f2e51e 100644 --- a/recipes-kde/apps/libkmahjongg/libkmahjongg.bb +++ b/recipes-kde/apps/libkmahjongg/libkmahjongg.bb @@ -19,8 +19,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "a2ffeb6f68f7a84ad6e01c2a58b12708" -SRC_URI[sha256sum] = "25e5cea50b6c96f18efa8d013ab58abfaac7845edb969b8e63e0c297482a6be4" +SRC_URI[md5sum] = "05b19cf113d5cf21db5a0a046fcb3dfc" +SRC_URI[sha256sum] = "1ab4461ba92de0cc56bd349a859d5c647f816b20923692237e7f3098ba9dd76e" FILES_${PN} += " \ ${datadir}/kmahjongglib \ diff --git a/recipes-kde/apps/lokalize/lokalize.bb b/recipes-kde/apps/lokalize/lokalize.bb index cd11d23d..34e6c8d7 100644 --- a/recipes-kde/apps/lokalize/lokalize.bb +++ b/recipes-kde/apps/lokalize/lokalize.bb @@ -26,8 +26,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "4ae0ce5d6989aeb8f877f63e2a4ea473" -SRC_URI[sha256sum] = "cce11b9384d27006855a141d2241a67d05679baa7096db2311c49a78bd642fed" +SRC_URI[md5sum] = "317354ae1ff0bd5b7764526375135d4a" +SRC_URI[sha256sum] = "e2e8cd6f9bb0e59ffd4b88e5513b757df3b63892ce90e7000c872e896ef74266" FILES_${PN} += " \ ${datadir}/config.kcfg \ diff --git a/recipes-kde/apps/marble/marble.bb b/recipes-kde/apps/marble/marble.bb index b0384ac0..70bace66 100644 --- a/recipes-kde/apps/marble/marble.bb +++ b/recipes-kde/apps/marble/marble.bb @@ -31,8 +31,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "49b86d84d38ccc0804c922a9502a2b12" -SRC_URI[sha256sum] = "0bfd7ae576e42ebbddadc8c83c2fec5edaf462bcf284642b1002d36d751b24ee" +SRC_URI[md5sum] = "4e0b209df27f1e279426a40fce7193e6" +SRC_URI[sha256sum] = "7405c76970d6ec500e5dc99ea2926cc11571e69f29c2e79f025f0f3ec4048960" EXTRA_OECMAKE += " \ -DMARBLE_PRI_INSTALL_DIR=${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/modules \ diff --git a/recipes-kde/apps/minuet/minuet.bb b/recipes-kde/apps/minuet/minuet.bb index 3cf28613..e41bfbf2 100644 --- a/recipes-kde/apps/minuet/minuet.bb +++ b/recipes-kde/apps/minuet/minuet.bb @@ -21,8 +21,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "44c25f80973304f0d683dd7fc4a48aa9" -SRC_URI[sha256sum] = "9244ec364d031c73f9aed9568012a28b847ec4dceca61040324af7afd3d64009" +SRC_URI[md5sum] = "af29e34770994094b42b15422078ddd0" +SRC_URI[sha256sum] = "3bdf5470a154b2be4bfcd97db7374ef81ca8eefba3bb12030dd6d39f1466cc78" SRC_URI += "file://0001-Do-not-try-to-find-qtquick-compiler.patch" FILES_${PN} += " \ diff --git a/recipes-kde/apps/okular/okular.bb b/recipes-kde/apps/okular/okular.bb index 56e01679..f3811164 100644 --- a/recipes-kde/apps/okular/okular.bb +++ b/recipes-kde/apps/okular/okular.bb @@ -36,8 +36,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "6d76a028cd3c84e392326d095244bf91" -SRC_URI[sha256sum] = "d7ef9b59acb5746ebc64399f4c1a99faf0c1530bf6a818b3bfd34b73476d90ab" +SRC_URI[md5sum] = "eca428778b66166a8b4edfad57bc7b36" +SRC_URI[sha256sum] = "1947b394dfd8da9c7cc4234e308e2476ffa44dc58542d246eafc8397d8991b6e" FILES_${PN} += " \ ${datadir}/k*5 \ diff --git a/recipes-kde/apps/spectacle/spectacle.bb b/recipes-kde/apps/spectacle/spectacle.bb index 3f622358..722cb334 100644 --- a/recipes-kde/apps/spectacle/spectacle.bb +++ b/recipes-kde/apps/spectacle/spectacle.bb @@ -31,8 +31,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "39ef496c6cadd6ae308ea9cf612fa447" -SRC_URI[sha256sum] = "8abf85b85de7844c503ef84182303c47cf425f5c14d71e723e3c887ee87ce06e" +SRC_URI[md5sum] = "55d7bb72c91f7becf82c28f10e855343" +SRC_URI[sha256sum] = "2c4d891d5850e13d912ad0885086170f45178ed5fb4d0ccfef7b22a9a76c35a8" FILES_${PN} += " \ ${datadir}/dbus-1 \ diff --git a/recipes-kde/apps/umbrello/umbrello.bb b/recipes-kde/apps/umbrello/umbrello.bb index 287d2a27..125ade3b 100644 --- a/recipes-kde/apps/umbrello/umbrello.bb +++ b/recipes-kde/apps/umbrello/umbrello.bb @@ -32,8 +32,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "56d4d078d980d2133a9cc08b07006e59" -SRC_URI[sha256sum] = "2ab53b33cf1fcaea470c01b2421e911d4287b1d0421fa33e0b60043fe6943cc7" +SRC_URI[md5sum] = "afccdefd71ef4b6f21f8478fcd209fc2" +SRC_URI[sha256sum] = "7c37363a92bd91f2a515438068ba6f1c8747269ddaf2eda5a7998539ece4468d" EXTRA_OECMAKE += "-DBUILD_KF5=1"