Date: Monday, August 24, 2015 @ 19:57:38 Author: arojas Revision: 244769
Use new patch Modified: umbrello/trunk/PKGBUILD umbrello/trunk/qwindowtitle.patch --------------------+ PKGBUILD | 3 ++- qwindowtitle.patch | 39 ++++++++++++++++++++++++--------------- 2 files changed, 26 insertions(+), 16 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-08-24 17:49:28 UTC (rev 244768) +++ PKGBUILD 2015-08-24 17:57:38 UTC (rev 244769) @@ -16,7 +16,8 @@ groups=(kde-applications kdesdk) source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz" 'qwindowtitle.patch') install=$pkgname.install -md5sums=('8eab51485322ddbc69543e0b9ab0624f') +md5sums=('8eab51485322ddbc69543e0b9ab0624f' + '60ba68da3e335751d761033a2ef5a091') prepare() { mkdir -p build Modified: qwindowtitle.patch =================================================================== --- qwindowtitle.patch 2015-08-24 17:49:28 UTC (rev 244768) +++ qwindowtitle.patch 2015-08-24 17:57:38 UTC (rev 244769) @@ -1,23 +1,32 @@ From: Ralf Habacker <ralf.habac...@freenet.de> -Date: Sun, 23 Aug 2015 08:48:27 +0000 -Subject: Fix 'KF5 version can't be launched from the menu'. -X-Git-Url: http://quickgit.kde.org/?p=umbrello.git&a=commitdiff&h=947d7f4651a8b2478435796795036fa3ec8f0b7f +Date: Sun, 23 Aug 2015 19:13:20 +0000 +Subject: Fix 'KF5 version can't be launched from the menu' in a frameworks independent way. +X-Git-Url: http://quickgit.kde.org/?p=umbrello.git&a=commitdiff&h=2968078e03c9fa330a97bdeca0219e45d8dad2d8 --- -Fix 'KF5 version can't be launched from the menu'. +Fix 'KF5 version can't be launched from the menu' in a frameworks independent way. +FIXED-IN:2.17.1 (KDE Applications 15.08.1) BUG:351621 +(cherry picked from commit d31cae83987600e16aa14c48e071a56fcd9c580e) + +Conflicts: +umbrello/CMakeLists.txt --- ---- a/umbrello/umbrello.desktop -+++ b/umbrello/umbrello.desktop -@@ -1,7 +1,7 @@ - # KDE Config File - [Desktop Entry] - Type=Application --Exec=umbrello %u -caption %c -+Exec=umbrello %u -qwindowtitle %c - Icon=umbrello - X-DocPath=umbrello/index.html - Terminal=false +--- a/umbrello/CMakeLists.txt ++++ b/umbrello/CMakeLists.txt +@@ -556,7 +556,11 @@ + umbrelloui.rc + DESTINATION ${DATA_INSTALL_DIR}/umbrello ) + else() +- install( PROGRAMS umbrello.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} RENAME org.kde.umbrello.desktop) ++ file(READ umbrello.desktop UMBRELLO_DESKTOP) ++ string(REPLACE "-caption" "-qwindowtitle" UMBRELLO_DESKTOP_OUT "${UMBRELLO_DESKTOP}") ++ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/umbrello.desktop "${UMBRELLO_DESKTOP_OUT}") ++ install( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/umbrello.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} RENAME org.kde.umbrello.desktop) ++ install( FILES org.kde.umbrello.appdata.xml DESTINATION ${CMAKE_INSTALL_METAINFODIR}) + install( FILES + umbrelloui.rc + DESTINATION ${KXMLGUI_INSTALL_DIR}/umbrello )