From 27892e9c541c410609c69bec784ea246d1dac3e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Wed, 28 Oct 2015 19:51:01 +0100 Subject: [PATCH] kde/apps: update to 15.08.2 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 +- .../apps/baloo-widgets/baloo-widgets.bb | 4 +- .../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 +- recipes-kde/apps/kate/kate.bb | 4 +- recipes-kde/apps/katomic/katomic.bb | 4 +- recipes-kde/apps/kbounce/kbounce.bb | 4 +- ...-as-long-as-there-is-no-common-solut.patch | 80 ------------------- recipes-kde/apps/kdenlive/kdenlive.bb | 5 +- recipes-kde/apps/kdiamond/kdiamond.bb | 4 +- recipes-kde/apps/kio-extras/kio-extras.bb | 4 +- recipes-kde/apps/konsole/konsole.bb | 4 +- .../apps/kwalletmanager/kwalletmanager.bb | 4 +- recipes-kde/apps/libkdegames/libkdegames.bb | 4 +- recipes-kde/apps/marble/marble.bb | 4 +- 18 files changed, 33 insertions(+), 114 deletions(-) delete mode 100644 recipes-kde/apps/kdenlive/files/0002-add-FindOpenGLES-as-long-as-there-is-no-common-solut.patch diff --git a/classes/kde-apps.bbclass b/classes/kde-apps.bbclass index 4e3c423d..a7fc0cff 100644 --- a/classes/kde-apps.bbclass +++ b/classes/kde-apps.bbclass @@ -1,6 +1,6 @@ inherit kde-base -KDE_APP_VERSION = "15.08.1" +KDE_APP_VERSION = "15.08.2" SRC_URI = "http://download.kde.org/stable/applications/${KDE_APP_VERSION}/src/${BPN}-${PV}.tar.xz" diff --git a/recipes-kde/apps/ark/ark.bb b/recipes-kde/apps/ark/ark.bb index f3818676..d2714e69 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] = "b868106c24b5cecb98a18d09d7039943" -SRC_URI[sha256sum] = "1496e70b0295054cfca217f6a80737c693be952bfa3873954fdb10d7708ab852" +SRC_URI[md5sum] = "c6d7b37d6a8de0335c297c01fcadb143" +SRC_URI[sha256sum] = "9baaba7b07e4fd54568fc1f9a9891d98d4f9fa3e943cd9237fb5dc467da9c914" 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 cd7f3349..cd074c7f 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] = "8be76053816d783e41c1975c8ec85219" -SRC_URI[sha256sum] = "6ced28e631afcfbf72b2af8fa9d933d179ffec26aff15a96680aaa8a777c3408" +SRC_URI[md5sum] = "f85ee9180b47dd89db9883c50c83fc50" +SRC_URI[sha256sum] = "f293e95e67fd819766228af50a78a68130b335c2bff70860acbb26c750ba36e5" # 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 71363289..b85a47e3 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] = "adc6747af60921c379c82b592867d2c0" -SRC_URI[sha256sum] = "3d8cfcea959a5ac14569fcd22c09afa898c8f1326e1b76d98e9f0bdd585ffaba" +SRC_URI[md5sum] = "10e98427d09a11d648d3a1e84d1e3f13" +SRC_URI[sha256sum] = "c2474dd5793282ee5b5739c97cdf037fe3b71731f9bddb81acb0ce239dedc99a" FILES_${PN} += " \ ${datadir}/config.kcfg \ diff --git a/recipes-kde/apps/dolphin/dolphin.bb b/recipes-kde/apps/dolphin/dolphin.bb index c636637c..ea0abf74 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] = "8df0dc7c04a78e8358dd269b7766a328" -SRC_URI[sha256sum] = "5a5e895a1ccd6e423af2a349572658c34469102305c4d6469b047bbf3e29b926" +SRC_URI[md5sum] = "a8a9847cf8b3929257833c19e9f1e986" +SRC_URI[sha256sum] = "4d9c62b80c2d2041818aeabdcd83848a31679dca41963cb104a87f53e611a1fd" 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 fd145286..f39ffe6a 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] = "e228bba5ed566f205e6d69ece80cecd8" -SRC_URI[sha256sum] = "826b160be37e002d323568f44f9e40c72bf77a5b650092bd80ffd622c301b620" +SRC_URI[md5sum] = "c0b7ba58494d2e75590df4e4fe6cc58d" +SRC_URI[sha256sum] = "565150b265a34632bdf2c0723784b16869b4f898f0798218ef70033a41af9081" 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 c77e8a92..58d97e96 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] = "9aaa561bb4cc736b13f77d3062ffcc47" -SRC_URI[sha256sum] = "ff39c93cd02d7a3aee37e566fd8ac6fd7b1ad72be5ee1cc00b759daad5641f1c" +SRC_URI[md5sum] = "53d2b5f15de57ea0a03177fe70d8c664" +SRC_URI[sha256sum] = "c1a32c78e3a75448cc9d681b66b2f4168cddd0b8647fb68bcab0d9ce223443a5" FILES_${PN} += " \ ${datadir}/kxmlgui5 \ diff --git a/recipes-kde/apps/kate/kate.bb b/recipes-kde/apps/kate/kate.bb index 8bb7ab64..7d619514 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] = "abcb7bc53caeae3f3c5d28936e7c4474" -SRC_URI[sha256sum] = "3f96756f7f4c6d178d2310a9fd1b63e816348d49cb4d53907e10fc6a29c92b43" +SRC_URI[md5sum] = "e50b3f8d72288f7f15b233d94f39079d" +SRC_URI[sha256sum] = "c804ee703667960779aabce9d4ede23d66d36e28479f44a1c0f151165c91430f" 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 149121e8..e1e3bfea 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] = "569270d0d624bfca4cbc729904a06e0c" -SRC_URI[sha256sum] = "3e51d4228542645b808d19eddd40b7c314ce7a9a116eb9b03ba5a38de0d34666" +SRC_URI[md5sum] = "675fe9af82d8b7e9c6192e4ab783237e" +SRC_URI[sha256sum] = "284d999ddd2685269c68eb3fb0d95468e4c51cbed61ae6df52f606a31712ce5c" 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 e5874174..ef31c174 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] = "c10f40a9a04c1283ce2d9827c529c7c9" -SRC_URI[sha256sum] = "640c26efd332f6599d44e5004c37937ca7495269877a0ca325e0cf9b093beb88" +SRC_URI[md5sum] = "2e9064127a5503ae614ad8fc93b567c5" +SRC_URI[sha256sum] = "87e04670cdca46cf9b5c61431e6d73567ad723d9234843e39d43ffc8413d2f3d" SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch" FILES_${PN} += " \ diff --git a/recipes-kde/apps/kdenlive/files/0002-add-FindOpenGLES-as-long-as-there-is-no-common-solut.patch b/recipes-kde/apps/kdenlive/files/0002-add-FindOpenGLES-as-long-as-there-is-no-common-solut.patch deleted file mode 100644 index ef92cfc3..00000000 --- a/recipes-kde/apps/kdenlive/files/0002-add-FindOpenGLES-as-long-as-there-is-no-common-solut.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 2f311675d0574985dea35bbc477e7046812a7028 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Sat, 19 Sep 2015 15:16:24 +0200 -Subject: [PATCH] add FindOpenGLES as long as there is no common solution for - this -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -FindOpenGLES.cmake was taken from kinfocenter - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller ---- - cmake/modules/FindOpenGLES.cmake | 52 ++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 52 insertions(+) - create mode 100644 cmake/modules/FindOpenGLES.cmake - -diff --git a/cmake/modules/FindOpenGLES.cmake b/cmake/modules/FindOpenGLES.cmake -new file mode 100644 -index 0000000..60b07e2 ---- /dev/null -+++ b/cmake/modules/FindOpenGLES.cmake -@@ -0,0 +1,52 @@ -+# - Try to find OpenGLES -+# Once done this will define -+# -+# OPENGLES_FOUND - system has OpenGLES and EGL -+# OPENGL_EGL_FOUND - system has EGL -+# OPENGLES_INCLUDE_DIR - the GLES include directory -+# OPENGLES_LIBRARY - the GLES library -+# OPENGLES_EGL_INCLUDE_DIR - the EGL include directory -+# OPENGLES_EGL_LIBRARY - the EGL library -+# OPENGLES_LIBRARIES - all libraries needed for OpenGLES -+# OPENGLES_INCLUDES - all includes needed for OpenGLES -+ -+FIND_PATH(OPENGLES_INCLUDE_DIR GLES2/gl2.h -+ /usr/openwin/share/include -+ /opt/graphics/OpenGL/include /usr/X11R6/include -+ /usr/include -+) -+ -+FIND_LIBRARY(OPENGLES_LIBRARY -+ NAMES GLESv2 -+ PATHS /opt/graphics/OpenGL/lib -+ /usr/openwin/lib -+ /usr/shlib /usr/X11R6/lib -+ /usr/lib -+) -+ -+FIND_PATH(OPENGLES_EGL_INCLUDE_DIR EGL/egl.h -+ /usr/openwin/share/include -+ /opt/graphics/OpenGL/include /usr/X11R6/include -+ /usr/include -+) -+ -+FIND_LIBRARY(OPENGLES_EGL_LIBRARY -+ NAMES EGL -+ PATHS /usr/shlib /usr/X11R6/lib -+ /usr/lib -+) -+ -+SET(OPENGL_EGL_FOUND "NO") -+IF(OPENGLES_EGL_LIBRARY AND OPENGLES_EGL_INCLUDE_DIR) -+ SET(OPENGL_EGL_FOUND "YES") -+ENDIF() -+ -+SET(OPENGLES_FOUND "NO") -+IF(OPENGLES_LIBRARY AND OPENGLES_INCLUDE_DIR AND -+ OPENGLES_EGL_LIBRARY AND OPENGLES_EGL_INCLUDE_DIR) -+ SET(OPENGLES_LIBRARIES ${OPENGLES_LIBRARY} ${OPENGLES_LIBRARIES} -+ ${OPENGLES_EGL_LIBRARY}) -+ SET(OPENGLES_INCLUDES ${OPENGLES_INCLUDE_DIR} ${OPENGLES_EGL_INCLUDE_DIR}) -+ SET(OPENGLES_FOUND "YES") -+ENDIF() -+ --- -2.1.0 - diff --git a/recipes-kde/apps/kdenlive/kdenlive.bb b/recipes-kde/apps/kdenlive/kdenlive.bb index 3639ca36..51052c2e 100644 --- a/recipes-kde/apps/kdenlive/kdenlive.bb +++ b/recipes-kde/apps/kdenlive/kdenlive.bb @@ -29,12 +29,11 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "a3fbabe1108f0c1c7e76f61527d9c28e" -SRC_URI[sha256sum] = "2fc251b4d5bce703451c25ca504a31f3dafb23f3fc346d16cff7d325079d2b0f" +SRC_URI[md5sum] = "34d1a693951b4d227e393379d2298f37" +SRC_URI[sha256sum] = "8a2f73f2c9a8c7babe95ae9894f2956f95b4a5c2884906871b7d39f801477bfa" SRC_URI += " \ file://0001-CMakeLists.txt-make-MLT_PREFIX-configurable.patch \ - file://0002-add-FindOpenGLES-as-long-as-there-is-no-common-solut.patch \ " EXTRA_OECMAKE += "-DMLT_PREFIX=${prefix}" diff --git a/recipes-kde/apps/kdiamond/kdiamond.bb b/recipes-kde/apps/kdiamond/kdiamond.bb index df020554..acd00237 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] = "1bfc2a77d358a34aa84202bdf09ac9c0" -SRC_URI[sha256sum] = "f53f152c9891a1e6de29f0d74b29806d36518868ec5ab0cbcaf1666eafa101b9" +SRC_URI[md5sum] = "534b873818e4a82392d7fc1ee629bad0" +SRC_URI[sha256sum] = "28bef6af0bdaa8d193264a225da560714ffd31ae6c7197cc8c0a9f982feb8a17" 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 a7f2bcce..cfc80558 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] = "b2f48f8a2545b87273fa1caa50e4cf00" -SRC_URI[sha256sum] = "d888c693f7143102238501c3980c1e1febb057e8b88d2f57d18fd4a140c8761b" +SRC_URI[md5sum] = "e4f8104669785b3651f30cecbd4ec2b0" +SRC_URI[sha256sum] = "ba8483eb649c0f7f0b06c8bbf0ed4249daa747d15db65f0b5ed90e81cca22065" FILES_${PN} += " \ ${datadir}/kio_bookmarks \ diff --git a/recipes-kde/apps/konsole/konsole.bb b/recipes-kde/apps/konsole/konsole.bb index 41de3077..a6848bdd 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] = "89da8e7f1a1146241866931855157272" -SRC_URI[sha256sum] = "32f8d989c8f5dfdae2965b2ee10d45bc68f6833bf63ec3a4d3a841dc7b00a495" +SRC_URI[md5sum] = "4b041dc73f8eb296642ae6c7544c3cb8" +SRC_URI[sha256sum] = "e850bfe10e979f73fd95e294c5a9b6e8e053b0f30ceb4888810d726a743cb5a4" 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 b9d6379f..5e48f9e9 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] = "93e4ef5baa2c95cbb49c3adeb2baefd7" -SRC_URI[sha256sum] = "6713ee6fc37e50061be3caef2adae5fe4fb0a96717b9d0abb61d3f4e9f8a6ec5" +SRC_URI[md5sum] = "4be661c2aca54ac101354a583c550e73" +SRC_URI[sha256sum] = "ec9fc58176b60ddf710cd3b22186a5a64b716faf5067914ead9ce4f350cdf32c" SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch" FILES_${PN} += " \ diff --git a/recipes-kde/apps/libkdegames/libkdegames.bb b/recipes-kde/apps/libkdegames/libkdegames.bb index 1d360531..f7adf5e5 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] = "9838af12efbc5c4879fdfa25777d883c" -SRC_URI[sha256sum] = "d8a6689200507a08997a075658fc84fdd290056b7b368113dc62fb01631e194e" +SRC_URI[md5sum] = "1227b0fc824834e9ed4fc899a4a6c6cd" +SRC_URI[sha256sum] = "b9de55aec10aca575592805d1da8160d04c247636d8f2b0f82085ab9282a1508" 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/marble.bb b/recipes-kde/apps/marble/marble.bb index d6eee675..459c90df 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] = "07d2986ff88fbf21ddba94614288a14e" -SRC_URI[sha256sum] = "7248b2f1dcaac1f6819f2749654c10c44e790a578f03aeebaec33a2661c8a037" +SRC_URI[md5sum] = "85c1b7b07c9fc8952a1a221f4d45c88e" +SRC_URI[sha256sum] = "a3c4630fbf598caf54ee7c04500e9476462bc5c53105ffcb170d71c8f7361b02" SRC_URI += "file://0001-align-path-of-designer-plugins.patch" PACKAGES =+ " \