From 3ca41ef733e26f7f769a883c7a35fd2cd9a1c5fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Fri, 24 Apr 2015 11:49:03 +0200 Subject: [PATCH] kde-apps: update to 15.04 / add filelight / have apps packagegroup 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/filelight/filelight.bb | 36 ++++++++++++++++ .../files/0001-do-not-build-docs.patch | 41 +++++++++++++++++++ ...base-build-without-session-support-Q.patch | 40 ++++++++++++++++++ recipes-kde/apps/kate/kate.bb | 6 ++- recipes-kde/apps/oxygen-icons/oxygen-icons.bb | 4 +- recipes-kde/packagegroups/kde-apps-world.bb | 11 +++++ recipes-kde/packagegroups/kde-world.bb | 5 +-- 8 files changed, 136 insertions(+), 9 deletions(-) create mode 100644 recipes-kde/apps/filelight/filelight.bb create mode 100644 recipes-kde/apps/filelight/files/0001-do-not-build-docs.patch create mode 100644 recipes-kde/apps/filelight/files/0002-fix-build-for-qtbase-build-without-session-support-Q.patch create mode 100644 recipes-kde/packagegroups/kde-apps-world.bb diff --git a/classes/kde-apps.bbclass b/classes/kde-apps.bbclass index b80780fa..fa8b5108 100644 --- a/classes/kde-apps.bbclass +++ b/classes/kde-apps.bbclass @@ -1,5 +1,5 @@ inherit kde-base -KDE_APP_VERSION = "14.12.2" +KDE_APP_VERSION = "15.04.0" SRC_URI = "http://download.kde.org/stable/applications/${KDE_APP_VERSION}/src/${BPN}-${PV}.tar.xz" diff --git a/recipes-kde/apps/filelight/filelight.bb b/recipes-kde/apps/filelight/filelight.bb new file mode 100644 index 00000000..c2b8f102 --- /dev/null +++ b/recipes-kde/apps/filelight/filelight.bb @@ -0,0 +1,36 @@ +SUMMARY = "KDE graphical diskspace analyser" +LICENSE = "GPLv2 && GFDLv1.2" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=e098acff086ea3d1264fc89b51242144 \ + file://COPYING-DOCS;md5=ad1419ecc56e060eccf8184a87c4285f \ +" + +inherit kde-apps + +DEPENDS += "\ + kio \ + kparts \ + solid \ + kxmlgui \ + kcoreaddons \ + kdoctools \ + ki18n \ +" + +PV = "${KDE_APP_VERSION}" +SRC_URI[md5sum] = "159a593a6a6e4097f4ec5b069a87c028" +SRC_URI[sha256sum] = "1a583320ca0c187e51c9d0ebdcd42e374684d73c5b52e62986803e8e1caa6ca3" +SRC_URI += " \ + file://0001-do-not-build-docs.patch \ + file://0002-fix-build-for-qtbase-build-without-session-support-Q.patch \ +" + +FILES_${PN} += " \ + ${datadir}/k*5 \ + ${datadir}/icons \ + ${libdir}/plugins \ +" + +FILES_${PN}-dbg += " \ + ${libdir}/plugins/.debug \ +" diff --git a/recipes-kde/apps/filelight/files/0001-do-not-build-docs.patch b/recipes-kde/apps/filelight/files/0001-do-not-build-docs.patch new file mode 100644 index 00000000..d7aa38ce --- /dev/null +++ b/recipes-kde/apps/filelight/files/0001-do-not-build-docs.patch @@ -0,0 +1,41 @@ +From 517853035c99b29006a7b757651161859c6e9db5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Fri, 24 Apr 2015 11:26:38 +0200 +Subject: [PATCH] do not build docs +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +docs creation fails with + +index.docbook:2: element para: validity error : ID gnu-fdl already defined +... +element div: validity error : ID header already defined +element div: validity error : ID header_content already defined +element div: validity error : ID header_left already defined +element div: validity error : ID header_right already defined +element div: validity error : ID header already defined +element div: validity error : ID header_content already defined +... + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Andreas Müller +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 834282f..35e51b6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -60,5 +60,5 @@ include_directories(src/) + + add_subdirectory(src) + add_subdirectory(misc) +-add_subdirectory(doc) ++#add_subdirectory(doc) + feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) +-- +1.9.3 + diff --git a/recipes-kde/apps/filelight/files/0002-fix-build-for-qtbase-build-without-session-support-Q.patch b/recipes-kde/apps/filelight/files/0002-fix-build-for-qtbase-build-without-session-support-Q.patch new file mode 100644 index 00000000..c92874b1 --- /dev/null +++ b/recipes-kde/apps/filelight/files/0002-fix-build-for-qtbase-build-without-session-support-Q.patch @@ -0,0 +1,40 @@ +From d83637a54457d77687088f45a9036b9a2a7bcf11 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Fri, 24 Apr 2015 11:35:45 +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 +--- + src/app/main.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/app/main.cpp b/src/app/main.cpp +index 2463a29..1709717 100644 +--- a/src/app/main.cpp ++++ b/src/app/main.cpp +@@ -78,6 +78,7 @@ int main(int argc, char *argv[]) + options.process(app); + about.processCommandLine(&options); + ++#ifndef QT_NO_SESSIONMANAGER + if (!app.isSessionRestored()) { + MainWindow *mw = new MainWindow(); + +@@ -89,7 +90,9 @@ int main(int argc, char *argv[]) + + mw->show(); + } +- else RESTORE(MainWindow); ++ else ++#endif ++ RESTORE(MainWindow); + + return app.exec(); + } +-- +1.9.3 + diff --git a/recipes-kde/apps/kate/kate.bb b/recipes-kde/apps/kate/kate.bb index 3e739e75..41b1d5e4 100644 --- a/recipes-kde/apps/kate/kate.bb +++ b/recipes-kde/apps/kate/kate.bb @@ -26,11 +26,12 @@ DEPENDS += " \ threadweaver \ plasma-framework \ knewstuff \ + kiconthemes \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "8a26f6de18caddceec3d997e77137070" -SRC_URI[sha256sum] = "ceb95148543b89b799a1dff9ee45b0a14c2883965853d7537f4890e5992ccb58" +SRC_URI[md5sum] = "044d039d1a49f8502c42f1c18b21703d" +SRC_URI[sha256sum] = "215b294b37ff8739620b1b76d36c4ec4bc274a8b7ea2db73b76dd5525a828dbc" SRC_URI += " \ file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch \ @@ -45,6 +46,7 @@ FILES_${PN} += " \ ${datadir}/plasma \ ${datadir}/katexmltools \ ${datadir}/icons \ + ${datadir}/appdata \ \ ${libdir}/libkdeinit5*.so \ ${libdir}/plugins \ diff --git a/recipes-kde/apps/oxygen-icons/oxygen-icons.bb b/recipes-kde/apps/oxygen-icons/oxygen-icons.bb index ea852f5e..355222d1 100644 --- a/recipes-kde/apps/oxygen-icons/oxygen-icons.bb +++ b/recipes-kde/apps/oxygen-icons/oxygen-icons.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = " \ inherit kde-apps allarch fontcache PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "c15b889622986ff4740c5a216efd577c" -SRC_URI[sha256sum] = "9f0f1130f6677b3405c813af48f022e6a22aa3c54f1cb78b632fee78e8fc8035" +SRC_URI[md5sum] = "ebf12a35e36fb633f6251cb3dbdc92a8" +SRC_URI[sha256sum] = "2dd9ad91cdfee785f61389d756dc1777a9f4b552c9486e4b6dc1a6acb8405efb" FILES_${PN} += " \ ${datadir}/icons/oxygen \ diff --git a/recipes-kde/packagegroups/kde-apps-world.bb b/recipes-kde/packagegroups/kde-apps-world.bb new file mode 100644 index 00000000..52dd1684 --- /dev/null +++ b/recipes-kde/packagegroups/kde-apps-world.bb @@ -0,0 +1,11 @@ +SUMMARY = "All KDE applications packages - just for build test" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690" + +inherit packagegroup distro_features_check + +RDEPENDS_${PN} = " \ + filelight \ + kate \ + oxygen-icons \ +" diff --git a/recipes-kde/packagegroups/kde-world.bb b/recipes-kde/packagegroups/kde-world.bb index a9434157..8b8575ad 100644 --- a/recipes-kde/packagegroups/kde-world.bb +++ b/recipes-kde/packagegroups/kde-world.bb @@ -7,13 +7,10 @@ inherit packagegroup distro_features_check RDEPENDS_${PN} = " \ kf5-world \ plasma-world \ + kde-apps-world \ \ - extra-cmake-modules \ phonon \ polkit-qt-1 \ - \ - kate \ - oxygen-icons \ "