kde-apps: update to 15.08.1

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
2015-09-20 00:31:33 +02:00
parent 8b1621c26d
commit c75f2dc96d
15 changed files with 112 additions and 29 deletions

View File

@@ -1,6 +1,6 @@
inherit kde-base
KDE_APP_VERSION = "15.08.0"
KDE_APP_VERSION = "15.08.1"
SRC_URI = "http://download.kde.org/stable/applications/${KDE_APP_VERSION}/src/${BPN}-${PV}.tar.xz"

View File

@@ -18,8 +18,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "0180479093fa5b1fcd915c058d99dd37"
SRC_URI[sha256sum] = "3f42c9c6fab0fe40b42cad455800f577dc6fa45d282ccc27a26ef200abe2c967"
SRC_URI[md5sum] = "8be76053816d783e41c1975c8ec85219"
SRC_URI[sha256sum] = "6ced28e631afcfbf72b2af8fa9d933d179ffec26aff15a96680aaa8a777c3408"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5BalooWidgets, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"

View File

@@ -13,8 +13,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "800309abf7c1a2d82a97bf261b31a770"
SRC_URI[sha256sum] = "f4657968dd6a69469cbfc7ef20c4ff8b33bf670ce417ee7d5893c4c839694f89"
SRC_URI[md5sum] = "adc6747af60921c379c82b592867d2c0"
SRC_URI[sha256sum] = "3d8cfcea959a5ac14569fcd22c09afa898c8f1326e1b76d98e9f0bdd585ffaba"
FILES_${PN} += " \
${datadir}/config.kcfg \

View File

@@ -33,8 +33,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "11760d094c2c3e3fff0e89b81d4db118"
SRC_URI[sha256sum] = "7ac16d7150b7c5e1d6350cf679981d675c995303a7f68eab1290763d3fd35ad9"
SRC_URI[md5sum] = "8df0dc7c04a78e8358dd269b7766a328"
SRC_URI[sha256sum] = "5a5e895a1ccd6e423af2a349572658c34469102305c4d6469b047bbf3e29b926"
SRC_URI += " \
file://0001-align-paths-to-phonon.patch \
file://0002-fix-build-for-qtbase-without-session-management.patch \

View File

@@ -18,8 +18,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "6d11da9a7aa087483727ad4b73083be6"
SRC_URI[sha256sum] = "dbb627b001421b4f653aff005ca97bc7de1240a5bab339b3a2483a4ceea44878"
SRC_URI[md5sum] = "e228bba5ed566f205e6d69ece80cecd8"
SRC_URI[sha256sum] = "826b160be37e002d323568f44f9e40c72bf77a5b650092bd80ffd622c301b620"
SRC_URI += " \
file://0001-do-not-build-docs.patch \
file://0002-fix-build-for-qtbase-build-without-session-support-Q.patch \

View File

@@ -21,8 +21,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "986696147ec64e5d3ca96815ee3f7c73"
SRC_URI[sha256sum] = "b87a50b277c20fba2cb217bb2328e80de5e9dbdd098a0ccc87f58226c96a48b6"
SRC_URI[md5sum] = "9aaa561bb4cc736b13f77d3062ffcc47"
SRC_URI[sha256sum] = "ff39c93cd02d7a3aee37e566fd8ac6fd7b1ad72be5ee1cc00b759daad5641f1c"
FILES_${PN} += " \
${datadir}/kxmlgui5 \

View File

@@ -30,8 +30,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "fdc3f4b38f7595434d4148494f546132"
SRC_URI[sha256sum] = "834bd05c2e565d030cb58e47ae5a1bc0f487242bcca7b8d54de0fd73ace13656"
SRC_URI[md5sum] = "abcb7bc53caeae3f3c5d28936e7c4474"
SRC_URI[sha256sum] = "3f96756f7f4c6d178d2310a9fd1b63e816348d49cb4d53907e10fc6a29c92b43"
SRC_URI += " \
file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch \

View File

@@ -24,8 +24,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "5e336006d70b9786ae9d50c861af6c18"
SRC_URI[sha256sum] = "03f190d17aef394b1eeb37ff70eeaa7e7280865eb01149ebee48f2083e1663a8"
SRC_URI[md5sum] = "569270d0d624bfca4cbc729904a06e0c"
SRC_URI[sha256sum] = "3e51d4228542645b808d19eddd40b7c314ce7a9a116eb9b03ba5a38de0d34666"
SRC_URI += "file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch"
FILES_${PN} += " \

View File

@@ -0,0 +1,80 @@
From 2f311675d0574985dea35bbc477e7046812a7028 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
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 <schnitzeltony@googlemail.com>
---
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

View File

@@ -29,10 +29,13 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "3a08051a2abfbfe2343df70f06630c4a"
SRC_URI[sha256sum] = "3768ee66dc48bf1a506284e0c39f2e61ca9467a484d50987f3d9c2c1863e4274"
SRC_URI[md5sum] = "a3fbabe1108f0c1c7e76f61527d9c28e"
SRC_URI[sha256sum] = "2fc251b4d5bce703451c25ca504a31f3dafb23f3fc346d16cff7d325079d2b0f"
SRC_URI += "file://0001-CMakeLists.txt-make-MLT_PREFIX-configurable.patch"
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}"
FILES_${PN} += " \

View File

@@ -42,8 +42,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "4e2bb6dc68355e874d0a4e5fbd6c4669"
SRC_URI[sha256sum] = "b72384e7ad29a7eca7bce344cf1a8f48cd557444bd0afeced01c817826f3e074"
SRC_URI[md5sum] = "b2f48f8a2545b87273fa1caa50e4cf00"
SRC_URI[sha256sum] = "d888c693f7143102238501c3980c1e1febb057e8b88d2f57d18fd4a140c8761b"
FILES_${PN} += " \
${datadir}/kio_bookmarks \

View File

@@ -36,8 +36,8 @@ DEPENDS += " \
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "00d056cc45aa5ac06dde4f2796ac79ce"
SRC_URI[sha256sum] = "de5f504f9b036f85a771dc60fb5f161a78c99d71ecc6f3d9de1df91a56f795ce"
SRC_URI[md5sum] = "89da8e7f1a1146241866931855157272"
SRC_URI[sha256sum] = "32f8d989c8f5dfdae2965b2ee10d45bc68f6833bf63ec3a4d3a841dc7b00a495"
SRC_URI += "file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch"
# do not move so-libs to -dev package

View File

@@ -40,8 +40,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "76a75c3fa55aebb01a7fb1441cb18f7c"
SRC_URI[sha256sum] = "47f7c00b756bb37e8f04423131390f6ac8d242ce52ce788691d8d80a20028a49"
SRC_URI[md5sum] = "9838af12efbc5c4879fdfa25777d883c"
SRC_URI[sha256sum] = "d8a6689200507a08997a075658fc84fdd290056b7b368113dc62fb01631e194e"
SRC_URI += "file://0001-CMakeLists.txt-add-an-option-BUILD_KGDECLARATIVE-dis.patch"
PACKAGECONFIG[kgdeclarative] = "-DBUILD_KGDECLARATIVE=Yes,-DBUILD_KGDECLARATIVE=No, kdeclarative"

View File

@@ -17,11 +17,11 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index 68b3d78..57c4792 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -197,7 +197,7 @@ add_feature_info("Qt Designer plugins" WITH_DESIGNER_PLUGIN "Marble widget suppo
set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
@@ -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)
- set(QT_PLUGINS_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/plugins)
- set(QT_PLUGINS_DIR ${CMAKE_INSTALL_LIBDIR}/plugins)
+ set(QT_PLUGINS_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/qt5/plugins)
endif()

View File

@@ -28,8 +28,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "26bdda01bfa6b1012ff1ae5832facf16"
SRC_URI[sha256sum] = "3db6f9c8eb27c2add498797cb676e446b9fd1f470bac94b1353b4a3062ea4ba7"
SRC_URI[md5sum] = "07d2986ff88fbf21ddba94614288a14e"
SRC_URI[sha256sum] = "7248b2f1dcaac1f6819f2749654c10c44e790a578f03aeebaec33a2661c8a037"
SRC_URI += "file://0001-align-path-of-designer-plugins.patch"
PACKAGES =+ " \