[arch-commits] Commit in umbrello/trunk (PKGBUILD umbrello-fix-launch.patch)

[Antonio Rojas]

    Date: Sunday, January 7, 2018 @ 19:51:28
  Author: arojas
Revision: 314248

Fix the upstream fix

Added:
  umbrello/trunk/umbrello-fix-launch.patch
Modified:
  umbrello/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |    6 +++---
 umbrello-fix-launch.patch |   27 +++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-07 19:33:10 UTC (rev 314247)
+++ PKGBUILD	2018-01-07 19:51:28 UTC (rev 314248)
@@ -4,7 +4,7 @@
 
 pkgname=umbrello
 pkgver=17.12.0
-pkgrel=2
+pkgrel=3
 pkgdesc='UML modeller'
 arch=(x86_64)
 url='https://kde.org/applications/development/umbrello'
@@ -13,10 +13,10 @@
 makedepends=(extra-cmake-modules kdoctools python kdesignerplugin)
 groups=(kde-applications kdesdk)
 source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}
-        umbrello-fix-launch.patch::"https://cgit.kde.org/umbrello.git/patch/?id=b4a20d4f")
+        umbrello-fix-launch.patch)
 sha256sums=('8979d3bec788f7ba02934469afb7bb5c33480f6ae18554e57dc684795fdfd9c4'
             'SKIP'
-            '3f9f3b48b2686d992bde7575dae7aac1311188178a17489222a4e80c91ab0cfe')
+            '5fc9b318ad6e3614e121e8ee683e7fcd785e51f9c4befd64138326a8aa6193fd')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
               F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck at kde.org>
 

Added: umbrello-fix-launch.patch
===================================================================
--- umbrello-fix-launch.patch	                        (rev 0)
+++ umbrello-fix-launch.patch	2018-01-07 19:51:28 UTC (rev 314248)
@@ -0,0 +1,27 @@
+From b4a20d4fb517033533244f14d8370e87f3c6483b Mon Sep 17 00:00:00 2001
+From: Ralf Habacker <ralf.habacker at freenet.de>
+Date: Sun, 7 Jan 2018 12:08:19 +0100
+Subject: Fix 'Cannot start umbrello from applications menu'
+
+BUG:388549
+FIXED-IN:2.24.2 (KDE Applications 17.12.2)
+---
+ umbrello/CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/umbrello/CMakeLists.txt b/umbrello/CMakeLists.txt
+index 55a1885..8f010c6 100644
+--- a/umbrello/CMakeLists.txt
++++ b/umbrello/CMakeLists.txt
+@@ -631,7 +631,6 @@ if(NOT BUILD_KF5)
+         DESTINATION ${UMBRELLO_DATA_INSTALL_DIR} )
+ else()
+-    file(READ umbrello.desktop UMBRELLO_DESKTOP)
+-    string(REPLACE "-caption" "-qwindowtitle" UMBRELLO_DESKTOP_OUT "${UMBRELLO_DESKTOP}")
++    file(READ umbrello.desktop UMBRELLO_DESKTOP_OUT)
+     string(REPLACE "Exec=umbrello" "Exec=umbrello5" UMBRELLO_DESKTOP_OUT "${UMBRELLO_DESKTOP_OUT}")
+     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)
+-- 
+cgit v0.11.2
+