kde-apps: update to 16.08.0

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
2016-08-25 23:57:54 +02:00
parent 00b0d154a6
commit d12a1bd0d2
32 changed files with 96 additions and 114 deletions

View File

@@ -1,6 +1,6 @@
inherit kde-base
KDE_APP_VERSION = "16.04.3"
KDE_APP_VERSION = "16.08.0"
SRC_URI = "${KDE_MIRROR}/stable/applications/${PV}/src/${BPN}-${PV}.tar.xz"

View File

@@ -24,13 +24,14 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "210ae6fb726a99f94ba4a18db0d582aa"
SRC_URI[sha256sum] = "799c2272ddb66439a04ebae5d24fe6113aa67678eb296225b20168a2e0c42b10"
SRC_URI[md5sum] = "0b2adfbb6472002fdb8be34f52a3314d"
SRC_URI[sha256sum] = "7233351e127950451d4ca7528117f4cbcebf6c052ce8624c0a439779379d0aa9"
SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
FILES_${PN} += " \
${datadir}/config.kcfg \
${datadir}/icons \
${datadir}/mime \
${datadir}/k*5 \
${OE_QMAKE_PATH_PLUGINS} \
"

View File

@@ -18,8 +18,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "65813195eb4ecc012a4f9741b7419c2d"
SRC_URI[sha256sum] = "f717b88dc1510b530cdb2c1deea18bd22382906542e37d36c37868d6c864d11a"
SRC_URI[md5sum] = "19fff67b67df658d9c5ee6258e431d92"
SRC_URI[sha256sum] = "ed389a98418fd8faa796421c1529fe810bcf600b398c73a813e892f027074e35"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5BalooWidgets, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"

View File

@@ -17,8 +17,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "57bbb719d5f45663186810c853c8b55e"
SRC_URI[sha256sum] = "5167e9bfbaf450db0c47549072e9ffdab79e1771c5dd114b516ed2fb29f61231"
SRC_URI[md5sum] = "9262b8a7a75331feb81730fd54e789e7"
SRC_URI[sha256sum] = "f4f37d9443a48e140db14410a72bdefbc1ee0a5137881961ba5ae5b95c3090a0"
FILES_${PN} += " \
${datadir}/kxmlgui5 \

View File

@@ -13,8 +13,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "a9b841d538a1f08b9f8e7319061f9241"
SRC_URI[sha256sum] = "ef63b312eb6fe98617767c876256e0201d809e9b07078a9b3676c71dd30a98e3"
SRC_URI[md5sum] = "14f9f0fb5931f823f1c3a304b1060466"
SRC_URI[sha256sum] = "82fe9093d4808f1283ad81453c6bbd603e5a51805037936b6af3dbff77e1fd8a"
FILES_${PN} += " \
${datadir}/config.kcfg \

View File

@@ -33,8 +33,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "96439ddce5220e3a90e1373d24c35e48"
SRC_URI[sha256sum] = "201f42d2f709c359a2f7b0974b1e35b6f22034a165540fd2af12b146b1a58599"
SRC_URI[md5sum] = "790e9ca54f352f3c38e2e34e8a7f6985"
SRC_URI[sha256sum] = "72c008b174a648c2bcc8b5e9f1e5b2bc7426524fda4fdecfd529bcde70581e77"
SRC_URI += " \
file://0001-align-paths-to-phonon.patch \
file://0002-fix-build-for-qtbase-without-session-management.patch \

View File

@@ -27,8 +27,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "2c0a3e8a3d8ef098930da4fe9668b672"
SRC_URI[sha256sum] = "749f31ac966a97329c05b9b2e68fee216d0ee3cd0a90a8957171385907cc10b5"
SRC_URI[md5sum] = "8d30ca23a475e758e696fe04ddbc4811"
SRC_URI[sha256sum] = "f1d7c328239f054c7d93f20678f9525e3b101b0ddb587f2269f934a87dcb506e"
CXXFLAGS += "-isystem ${STAGING_INCDIR}/phonon4qt5/KDE"

View File

@@ -18,8 +18,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "5c8cf220a125630867cd8ad6692824f8"
SRC_URI[sha256sum] = "09c85042babcada372a97892f7f05e42dc534a4120071f52de23ef8417f524d2"
SRC_URI[md5sum] = "8a8189949f62fa294316b87e036f6742"
SRC_URI[sha256sum] = "97240391dba32c30c7566259ceca376386e372956b693f845618dd4d56a2d6b7"
SRC_URI += " \
file://0001-do-not-build-docs.patch \
file://0002-fix-build-for-qtbase-build-without-session-support-Q.patch \

View File

@@ -19,8 +19,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "20774653ecf548ceeeae6b0fcdccd87b"
SRC_URI[sha256sum] = "146aa96420d3af800371ec37964e35484309db975d71761ac3bb2ff9c95f9209"
SRC_URI[md5sum] = "bb7b1709ea33dba876b45095f6fe61b6"
SRC_URI[sha256sum] = "81071902de333d762bf2823d0f41e6115f0dc9177a36529bb67a9082b506c146"
SRC_URI += " \
file://0001-Fix-package-name.patch \

View File

@@ -24,8 +24,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "07a0c30b5c5b7077887af0761c23655e"
SRC_URI[sha256sum] = "118a05d2f654114e6d2318c8cf65df7e247ea7cc4bdd36bf1369d540ce5ced43"
SRC_URI[md5sum] = "b990a0eedda877d9c66cd963072d8044"
SRC_URI[sha256sum] = "857ed7a0e88f253142a9c069e9e0f2ccfacd4cbc1507c75f80867498e2e611ca"
FILES_${PN} += " \
${datadir}/kxmlgui5 \

View File

@@ -30,8 +30,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "85d9b0c9f7f297211a41d8fa3892128e"
SRC_URI[sha256sum] = "8df0040326469361d1f163616810c9c1a89dad675a81144dc3b5d3ae3f3f15a9"
SRC_URI[md5sum] = "69707677147488952da3c9a6a452bd3a"
SRC_URI[sha256sum] = "1bdf4081dfe8bd0766a1a98254efd0829acd40ab106a7921f025d0384ec32e7c"
SRC_URI += " \
file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch \

View File

@@ -25,8 +25,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "1a3f75807de16e780ba27e5a0427e3b3"
SRC_URI[sha256sum] = "b3e65f4a5d9d0d4672776584f8555be6b565c52c256a7eabd36ba990be238bc9"
SRC_URI[md5sum] = "8391c9391306d7dc3ea38c02a068bf84"
SRC_URI[sha256sum] = "1429c66afff68c3a0d98a4e6a375878af5087feb7efc22b8b3fcd2da7d74e091"
SRC_URI += "file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch"
FILES_${PN} += " \

View File

@@ -26,8 +26,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "579011c3c934e577274a22c865433f9c"
SRC_URI[sha256sum] = "832be0c6fd32ab01cac45f384c8d962f1e0cdbb26ac04fd64e4ecf1c939d1f5c"
SRC_URI[md5sum] = "ee4d754bf2f27fbcbf604f29dbeeae63"
SRC_URI[sha256sum] = "1d987b08e30f2c97acfeade491401ea16f648362b22b38e6ee5998eae7ef428d"
SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
FILES_${PN} += " \

View File

@@ -20,8 +20,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "94a956d4b312fe641a6615eee431b591"
SRC_URI[sha256sum] = "a6f2e4efbaa7b987057986c065d9fd00903292edfb3090907ff00ae6a52b68ad"
SRC_URI[md5sum] = "f2bcba4386e7de9a084268d9cbed5129"
SRC_URI[sha256sum] = "ab433097f5a5a5ab85f41e8c947e68ac49203074faa65afcbd0fb5c8cc1465de"
FILES_SOLIBSDEV = ""

View File

@@ -13,8 +13,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "adacf0f8dd552dc23dc7f0b04b5030d7"
SRC_URI[sha256sum] = "f7f46ac20b36047a6065643daac831a5e10458a0563d3bc7627af82e9a4f01ce"
SRC_URI[md5sum] = "2df7dc5e14fe9f41bec39a643e10cf58"
SRC_URI[sha256sum] = "3f120385ecd5ad7b40d9a84b7d802c209b5e8373a842a988a0f36fd085133a49"
FILES_${PN} += " \
${datadir}/icons \

View File

@@ -32,8 +32,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "79982708bd27e58855fa4af2ee23302b"
SRC_URI[sha256sum] = "d5af3f96c1d43c3f0a28844b0c56dd3951f07cd6a48355096cb6272d1dbba40c"
SRC_URI[md5sum] = "007ba69109b1775e7bce2b23b7dbf89c"
SRC_URI[sha256sum] = "0da715aee25b5662ecb524e2a4b026cc541e37c333296520bd83feced5c2b0e2"
SRC_URI += " \
file://0001-CMakeLists.txt-make-MLT_PREFIX-configurable.patch \

View File

@@ -25,8 +25,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "129e12704d62511ba10b97ae12e80e7e"
SRC_URI[sha256sum] = "fc4bdddbbc2640b73229e9e23cf28bd2729a07f1af986c5f5bef8b7b4ba4318f"
SRC_URI[md5sum] = "57474f99c76e84c450b2ac4668ce63da"
SRC_URI[sha256sum] = "a3709c4cdb807c8d229382ff4cb7ab6c1a0a95ef39a7359e7a13f1dfdc7cf23a"
SRC_URI+="file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
FILES_${PN} += " \

View File

@@ -26,8 +26,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "2d07fa5ab16b5a2cbca815f446b30e6d"
SRC_URI[sha256sum] = "a981321de2652c30dd53de9b13b115911a55dd14ee8417fdd792b7a0a4a29cc2"
SRC_URI[md5sum] = "27ac904511726b9b6e4c88bcfcd44225"
SRC_URI[sha256sum] = "018242124842cfc234c68650c7a0adc1e513b4440924ddc78f81131b559748cb"
SRC_URI += " \
file://0001-fix-build-for-qtbase-without-session-management.patch \

View File

@@ -44,8 +44,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "d4af7bc86b6e767e910a84f2a6e6c61d"
SRC_URI[sha256sum] = "100e69d7ad0df39ee8a2789dce0b02601097cce903a902f4e1aa633a953cafeb"
SRC_URI[md5sum] = "d9be861f92a9b7d090ba07341e680fcc"
SRC_URI[sha256sum] = "d6c60ca0066d62ed898e50e36254f49c02bbf6ea9dd94add976d1d972cc45d0d"
FILES_${PN} += " \
${datadir}/kio_bookmarks \

View File

@@ -26,8 +26,8 @@ PACKAGECONFIG = "pulseaudio"
PACKAGECONFIG[pulseaudio] = ",,pulseaudio"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "e601e4b4c188c08c475e32432dec0f41"
SRC_URI[sha256sum] = "edda5a766b901dbda6404f8c995ba0d489751f6a65f8d546f18d851db0861847"
SRC_URI[md5sum] = "727df82729e42b57602fac6619cdd8da"
SRC_URI[sha256sum] = "6cb48281a8e689ce058d6fa6739f1f366868615e6d9b43a81e0b863efd42616a"
SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"

View File

@@ -1,53 +0,0 @@
From 1cf0d1c36834d7c326c8fd1c51f9f075f0785fcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Tue, 5 May 2015 15:19:52 +0200
Subject: [PATCH] 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 <schnitzeltony@googlemail.com>
---
src/Application.cpp | 7 ++++++-
src/main.cpp | 2 ++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/Application.cpp b/src/Application.cpp
index 0857eaf..6abaa84 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -100,7 +100,12 @@ int Application::newInstance()
KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
// handle session management
- if ((args->count() != 0) || !firstInstance || !isSessionRestored()) {
+ if ((args->count() != 0) || !firstInstance
+#ifndef QT_NO_SESSIONMANAGER
+ || !isSessionRestored()) {
+#else
+ ) {
+#endif
// check for arguments to print help or other information to the
// terminal, quit if such an argument was found
if (processHelpArgs(args))
diff --git a/src/main.cpp b/src/main.cpp
index b6ba2dc..90bdbe1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -288,10 +288,12 @@ void fillAboutData(K4AboutData& aboutData)
void restoreSession(Application& app)
{
+#ifndef QT_NO_SESSIONMANAGER
if (app.isSessionRestored()) {
int n = 1;
while (KMainWindow::canBeRestored(n))
app.newMainWindow()->restore(n++);
}
+#endif
}
--
1.9.3

View File

@@ -36,9 +36,8 @@ DEPENDS += " \
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "53d3d26f125cd8d42fe08942aa7c939c"
SRC_URI[sha256sum] = "f650ee9f27769ae5f97e1809e6530b525f4c2cc30a4fb7ed85fc63447d170bb6"
SRC_URI += "file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch"
SRC_URI[md5sum] = "bfcfdbb33ab470ce44b793e2bffdd2c1"
SRC_URI[sha256sum] = "cfd5628b68e14db7b6228099b9e45eb35f8a04bfea05bf9c61bae0bf2803c8ce"
# do not move so-libs to -dev package
FILES_SOLIBSDEV = ""

View File

@@ -20,7 +20,7 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "d095f506f375d0e7fae65d4ec2d4237b"
SRC_URI[sha256sum] = "3bc1571e8aae59ae7738aa1ff3b2d363895a359711363f18e4bf20c9172df9bb"
SRC_URI[md5sum] = "6f616feddc885ddae1099196b55f9108"
SRC_URI[sha256sum] = "26616e40595f64c3af774c5c74bb404e1af315d6a3f0d6a7ec3efe6a6d4457cf"
FILES_${PN} += "${datadir}/kxmlgui5"

View File

@@ -23,8 +23,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "15d01c679a4f497b589dce91b98e93c2"
SRC_URI[sha256sum] = "98bfbb19d0710d36565e2e81e2bd3fdd55e67daf18c18a234508afdbe2c7ddcd"
SRC_URI[md5sum] = "e865e455ae7029726a6db4297bef2971"
SRC_URI[sha256sum] = "e0a5d3a34ff9a68a5bf29ac22f2198349e35f0cfb6640b479a2d634f5a6a999c"
SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
FILES_${PN} += " \

View File

@@ -40,8 +40,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "578f37a9a68b41226be5e650d9a19f6e"
SRC_URI[sha256sum] = "ed23972888170c88985b42cd9f6e351e1bd1d7e705c6e119915e398966f8d2e7"
SRC_URI[md5sum] = "12cd4bdbe3dc4851bf301b6b4572df3d"
SRC_URI[sha256sum] = "ce27ed4912157c976d70ac7b3e668f98c461f9b7f09b870fb571e76607b7087e"
SRC_URI += "file://0001-CMakeLists.txt-add-an-option-BUILD_KGDECLARATIVE-dis.patch"
PACKAGECONFIG[kgdeclarative] = "-DBUILD_KGDECLARATIVE=Yes,-DBUILD_KGDECLARATIVE=No, kdeclarative"

View File

@@ -25,8 +25,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "49f6fa5154669c16082312df312d3dfa"
SRC_URI[sha256sum] = "21561303223a0f8ebc45ba985f3fe77d01921973f2284dbd8f0b2626d6f7c3b8"
SRC_URI[md5sum] = "23dd2a1156023f817585b4916c9bae65"
SRC_URI[sha256sum] = "ba978f6c3e3ffd3bab5f86589d3d5612c8768cf1b6a820af7803c651e48dfa54"
FILES_${PN} += " \
${datadir}/config.kcfg \

View File

@@ -28,8 +28,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "e2e6315ba8277027f03ee2b5fe9c84a6"
SRC_URI[sha256sum] = "5a3dabcf0a28b5446030ab1831be13f0d0d4589d57da9f3a2e71e53629f331cb"
SRC_URI[md5sum] = "6e2a88dc46331ce1200dfc341a598506"
SRC_URI[sha256sum] = "ce309c827f60f389a012fb8ea8ccccf5d5925e0c5de8ae41f2ac981c1fe1c5a8"
SRC_URI += "file://0001-align-path-of-designer-plugins.patch"
PACKAGES =+ " \

View File

@@ -0,0 +1,33 @@
From 146ee93e703db9620e668228a8db39cf31dac01f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Thu, 25 Aug 2016 20:15:00 +0200
Subject: [PATCH] reduce minimim version of Qt to 5.6.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
tested with qtquickcontrols2 5.6.1.1 which reports 5.6.1
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1bada27..1c304a2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ set (KDE_APPLICATIONS_VERSION_MICRO "70")
set (KDE_APPLICATIONS_VERSION "0.1.70")
set(ECM_MIN_VERSION "5.15.0")
-set(QT_MIN_VERSION "5.7.0")
+set(QT_MIN_VERSION "5.6.1")
set(KF5_MIN_VERSION "5.15.0")
find_package(ECM ${ECM_MIN_VERSION} CONFIG REQUIRED)
--
2.5.5

View File

@@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = " \
inherit kde-apps gtk-icon-cache
DEPENDS += "\
fluidsynth \
drumstick \
ki18n \
kxmlgui \
@@ -17,12 +18,13 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "785934edebfeaa7fef125f489cf42d3a"
SRC_URI[sha256sum] = "84270171fec23544b991715d8e29dbfba04d65a9304d575ae24347af8a025f8f"
SRC_URI[md5sum] = "0e714f8ab026d7580000c5d6e332a086"
SRC_URI[sha256sum] = "a02466662750768339cbd30154dcea39c8483d8cdca4c42be785de19e72f061e"
SRC_URI += "file://0001-reduce-minimim-version-of-Qt-to-5.6.1.patch"
FILES_${PN} += " \
${datadir}/kxmlgui5 \
${datadir}/icons \
"
RDEPENDS_${PN} += "timidity++"
RDEPENDS_${PN} += "timidity++ qtquickcontrols2-qmlplugins"

View File

@@ -28,8 +28,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "823fa7de994492b29b9cadfe9983621c"
SRC_URI[sha256sum] = "b034e0ab9f6989012437f790c346deaec2511e764c939a9774fa0fa5bc6bd563"
SRC_URI[md5sum] = "f562023d98b9979c3f8daa6ac9f2d340"
SRC_URI[sha256sum] = "daa4078a1dd924c7e67c4bebbfc68ec0189d16d50ab8afcf37409c44ce0dd0d6"
FILES_${PN} += " \
${OE_QMAKE_PATH_PLUGINS} \

View File

@@ -28,8 +28,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "55a2f8617913306d78307bbedee343b2"
SRC_URI[sha256sum] = "9c5cd301359159c46ee0ba897e1e96c797677ccf283d823a2092979b92a6aa5f"
SRC_URI[md5sum] = "5476a3336ebda139befdff5f6799c6d6"
SRC_URI[sha256sum] = "f823b11c9324646eb99c49153ea6165b0ace1a6b9ecdbb8e95b89133517fcc09"
FILES_${PN} += " \
${datadir}/dbus-1 \

View File

@@ -25,8 +25,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "a8a8de6d313c5dffd38ba91e8586a3c8"
SRC_URI[sha256sum] = "11802523002b809ed5ba10bcb341b9dfc579dbc53b1df70442c4c5329684f715"
SRC_URI[md5sum] = "89c4d6a458448d4d1ce791e31bf0721f"
SRC_URI[sha256sum] = "f4359999289624d91b85dd42347a3cc212a06b2403c4f9a5f17336ae506b0c4a"
EXTRA_OECMAKE += "-DBUILD_KF5=1"