[arch-commits] Commit in umbrello/trunk (PKGBUILD)

2020-09-07 Thread Antonio Rojas via arch-commits
Date: Monday, September 7, 2020 @ 17:44:39
  Author: arojas
Revision: 395558

kdevelop 5.6 rebuild

Modified:
  umbrello/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-09-07 17:37:50 UTC (rev 395557)
+++ PKGBUILD2020-09-07 17:44:39 UTC (rev 395558)
@@ -4,7 +4,7 @@
 
 pkgname=umbrello
 pkgver=20.08.1
-pkgrel=1
+pkgrel=2
 pkgdesc='UML modeller'
 arch=(x86_64)
 url='https://kde.org/applications/development/umbrello'


[arch-commits] Commit in umbrello/trunk (PKGBUILD)

2020-02-02 Thread Antonio Rojas via arch-commits
Date: Sunday, February 2, 2020 @ 21:03:05
  Author: arojas
Revision: 374510

kdevelop 5.5 rebuild

Modified:
  umbrello/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-02-02 20:58:02 UTC (rev 374509)
+++ PKGBUILD2020-02-02 21:03:05 UTC (rev 374510)
@@ -4,7 +4,7 @@
 
 pkgname=umbrello
 pkgver=19.12.1
-pkgrel=2
+pkgrel=3
 pkgdesc='UML modeller'
 arch=(x86_64)
 url='https://kde.org/applications/development/umbrello'


[arch-commits] Commit in umbrello/trunk (PKGBUILD)

2020-01-09 Thread Antonio Rojas via arch-commits
Date: Thursday, January 9, 2020 @ 19:03:47
  Author: arojas
Revision: 373087

Rebuild with kdevelop 5.4.6-2

Modified:
  umbrello/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-01-09 18:57:19 UTC (rev 373086)
+++ PKGBUILD2020-01-09 19:03:47 UTC (rev 373087)
@@ -4,7 +4,7 @@
 
 pkgname=umbrello
 pkgver=19.12.1
-pkgrel=1
+pkgrel=2
 pkgdesc='UML modeller'
 arch=(x86_64)
 url='https://kde.org/applications/development/umbrello'


[arch-commits] Commit in umbrello/trunk (PKGBUILD)

2019-08-26 Thread Antonio Rojas via arch-commits
Date: Monday, August 26, 2019 @ 07:02:51
  Author: arojas
Revision: 361196

kdevelop 5.4 rebuild

Modified:
  umbrello/trunk/PKGBUILD

--+
 PKGBUILD |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-08-26 06:56:48 UTC (rev 361195)
+++ PKGBUILD2019-08-26 07:02:51 UTC (rev 361196)
@@ -4,7 +4,7 @@
 
 pkgname=umbrello
 pkgver=19.08.0
-pkgrel=1
+pkgrel=2
 pkgdesc='UML modeller'
 arch=(x86_64)
 url='https://kde.org/applications/development/umbrello'
@@ -25,7 +25,6 @@
 build() { 
   cd build
   cmake ../$pkgname-$pkgver \
--DCMAKE_INSTALL_PREFIX=/usr \
 -DCMAKE_INSTALL_LIBDIR=lib \
 -DBUILD_TESTING=OFF \
 -DBUILD_UNITTESTS=OFF \


[arch-commits] Commit in umbrello/trunk (PKGBUILD)

2019-05-01 Thread Antonio Rojas via arch-commits
Date: Wednesday, May 1, 2019 @ 12:18:41
  Author: arojas
Revision: 352358

Fix loading xmi files with KF 5.57

Modified:
  umbrello/trunk/PKGBUILD

--+
 PKGBUILD |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-05-01 12:18:31 UTC (rev 352357)
+++ PKGBUILD2019-05-01 12:18:41 UTC (rev 352358)
@@ -4,7 +4,7 @@
 
 pkgname=umbrello
 pkgver=19.04.0
-pkgrel=1
+pkgrel=2
 pkgdesc='UML modeller'
 arch=(x86_64)
 url='https://kde.org/applications/development/umbrello'
@@ -12,14 +12,19 @@
 depends=(kdelibs4support kdevelop qt5-webkit)
 makedepends=(extra-cmake-modules kdoctools kdesignerplugin kdevelop-pg-qt)
 groups=(kde-applications kdesdk)
-source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig})
+source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}
+
kdebug-406574.patch::"https://cgit.kde.org/umbrello.git/patch/?id=04580cac;)
 sha256sums=('7c37363a92bd91f2a515438068ba6f1c8747269ddaf2eda5a7998539ece4468d'
-'SKIP')
+'SKIP'
+'2d714687c043c9907f098f78de8821fae01b48c34a955f1299432cecd635a7dd')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid 

   F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck 

 
 prepare() {
   mkdir -p build
+
+  cd $pkgname-$pkgver
+  patch -p1 -i ../kdebug-406574.patch # Fix loading xmi files
 }
 
 build() { 


[arch-commits] Commit in umbrello/trunk (PKGBUILD)

2018-10-31 Thread Antonio Rojas via arch-commits
Date: Wednesday, October 31, 2018 @ 07:28:28
  Author: arojas
Revision: 337608

kdevelop 5.3 rebuild

Modified:
  umbrello/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-10-31 07:25:41 UTC (rev 337607)
+++ PKGBUILD2018-10-31 07:28:28 UTC (rev 337608)
@@ -4,7 +4,7 @@
 
 pkgname=umbrello
 pkgver=18.08.2
-pkgrel=1
+pkgrel=2
 pkgdesc='UML modeller'
 arch=(x86_64)
 url='https://kde.org/applications/development/umbrello'


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

2018-01-07 Thread Antonio Rojas via arch-commits
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
===
--- PKGBUILD2018-01-07 19:33:10 UTC (rev 314247)
+++ PKGBUILD2018-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 

   F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck 

 

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 
+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
+


[arch-commits] Commit in umbrello/trunk (PKGBUILD)

2018-01-07 Thread Antonio Rojas via arch-commits
Date: Sunday, January 7, 2018 @ 16:50:14
  Author: arojas
Revision: 314217

Fix starting from applications menu (FS#56954)

Modified:
  umbrello/trunk/PKGBUILD

--+
 PKGBUILD |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-01-07 16:18:00 UTC (rev 314216)
+++ PKGBUILD2018-01-07 16:50:14 UTC (rev 314217)
@@ -4,7 +4,7 @@
 
 pkgname=umbrello
 pkgver=17.12.0
-pkgrel=1
+pkgrel=2
 pkgdesc='UML modeller'
 arch=(x86_64)
 url='https://kde.org/applications/development/umbrello'
@@ -12,14 +12,19 @@
 depends=(hicolor-icon-theme ktexteditor kdelibs4support qt5-webkit)
 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})
+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;)
 sha256sums=('8979d3bec788f7ba02934469afb7bb5c33480f6ae18554e57dc684795fdfd9c4'
-'SKIP')
+'SKIP'
+'3f9f3b48b2686d992bde7575dae7aac1311188178a17489222a4e80c91ab0cfe')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid 

   F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck 

 
 prepare() {
   mkdir -p build
+
+  cd $pkgname-$pkgver
+  patch -p1 -i ../umbrello-fix-launch.patch # Fix launching from application 
menu https://bugs.kde.org/show_bug.cgi?id=388549
 }
 
 build() { 


[arch-commits] Commit in umbrello/trunk (PKGBUILD)

2017-11-18 Thread Antonio Rojas
Date: Saturday, November 18, 2017 @ 13:13:54
  Author: arojas
Revision: 310374

Fix data dir in dot generator (FS#56368)

Modified:
  umbrello/trunk/PKGBUILD

--+
 PKGBUILD |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-11-18 13:09:48 UTC (rev 310373)
+++ PKGBUILD2017-11-18 13:13:54 UTC (rev 310374)
@@ -4,7 +4,7 @@
 
 pkgname=umbrello
 pkgver=17.08.3
-pkgrel=1
+pkgrel=2
 pkgdesc='UML modeller'
 arch=(x86_64)
 url='https://kde.org/applications/development/umbrello'
@@ -12,14 +12,19 @@
 depends=(hicolor-icon-theme ktexteditor qt5-webkit)
 makedepends=(extra-cmake-modules kdoctools python kdelibs4support 
kdesignerplugin)
 groups=(kde-applications kdesdk)
-source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig})
+source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}
+
umbrello-data-dir.patch::"https://cgit.kde.org/umbrello.git/patch/?id=cbd0a043027d2a7bc3fc00cb054b891ee19b97bd;)
 sha256sums=('e0c8845e03c251c9e8b33f9d3e09d312c5e8f6b8200f84f5d3610970a74d24bc'
-'SKIP')
+'SKIP'
+'88ef917cc660563754fbc9bf5019db579daa6470a13d8850a3d7787b9c98b3ad')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid 

   F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck 

 
 prepare() {
   mkdir -p build
+
+  cd $pkgname-$pkgver
+  patch -p1 -i ../umbrello-data-dir.patch # Fix data dir in dot generator
 }
 
 build() { 


[arch-commits] Commit in umbrello/trunk (PKGBUILD)

2017-06-23 Thread Antonio Rojas
Date: Friday, June 23, 2017 @ 18:52:49
  Author: arojas
Revision: 299170

Fix exec line in desktop file (FS#53994)

Modified:
  umbrello/trunk/PKGBUILD

--+
 PKGBUILD |   12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-23 10:58:55 UTC (rev 299169)
+++ PKGBUILD2017-06-23 18:52:49 UTC (rev 299170)
@@ -4,7 +4,7 @@
 
 pkgname=umbrello
 pkgver=17.04.2
-pkgrel=1
+pkgrel=2
 pkgdesc='UML modeller'
 arch=(i686 x86_64)
 url='https://kde.org/applications/development/umbrello'
@@ -14,13 +14,19 @@
 conflicts=(kdesdk-umbrello)
 replaces=(kdesdk-umbrello)
 groups=(kde-applications kdesdk)
-source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig})
+source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}
+
umbrello-exec-line.patch::"https://cgit.kde.org/umbrello.git/patch/?id=54f5b361;)
 sha256sums=('618a90643d2041b57a0d1efeef1fa22a73174052946ef1ccbb40258db68b1d4a'
-'SKIP')
+'SKIP'
+'56d1f1a6c20b607f6332a060bfcb591ad4aa3658821af380ac4f96252694ac69')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid 

 
 prepare() {
   mkdir -p build
+
+  cd $pkgname-$pkgver
+# Fix desktop exec line
+  patch -p1 -i ../umbrello-exec-line.patch
 }
 
 build() { 


[arch-commits] Commit in umbrello/trunk (PKGBUILD)

2016-06-14 Thread Antonio Rojas
Date: Tuesday, June 14, 2016 @ 08:36:48
  Author: arojas
Revision: 269486

Test

Modified:
  umbrello/trunk/PKGBUILD

--+
 PKGBUILD |1 +
 1 file changed, 1 insertion(+)

Modified: PKGBUILD
===
--- PKGBUILD2016-06-14 08:35:24 UTC (rev 269485)
+++ PKGBUILD2016-06-14 08:36:48 UTC (rev 269486)
@@ -36,3 +36,4 @@
   cd build
   make DESTDIR="$pkgdir" install
 }
+


[arch-commits] Commit in umbrello/trunk (PKGBUILD)

2016-06-14 Thread Antonio Rojas
Date: Tuesday, June 14, 2016 @ 08:35:24
  Author: arojas
Revision: 269485

Test

Modified:
  umbrello/trunk/PKGBUILD


[arch-commits] Commit in umbrello/trunk (PKGBUILD umbrello.install)

2016-04-27 Thread Felix Yan
Date: Wednesday, April 27, 2016 @ 19:54:38
  Author: fyan
Revision: 266297

upgpkg: umbrello 16.04.0-2

Hooks rebuild (part 1)

Modified:
  umbrello/trunk/PKGBUILD
Deleted:
  umbrello/trunk/umbrello.install

--+
 PKGBUILD |3 +--
 umbrello.install |   13 -
 2 files changed, 1 insertion(+), 15 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-27 17:47:40 UTC (rev 266296)
+++ PKGBUILD2016-04-27 17:54:38 UTC (rev 266297)
@@ -4,7 +4,7 @@
 
 pkgname=umbrello
 pkgver=16.04.0
-pkgrel=1
+pkgrel=2
 pkgdesc='UML modeller'
 arch=(i686 x86_64)
 url='http://kde.org/applications/development/umbrello'
@@ -15,7 +15,6 @@
 replaces=(kdesdk-umbrello)
 groups=(kde-applications kdesdk)
 
source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz;)
-install=$pkgname.install
 md5sums=('b4180a6f3d41748a04685d4105f338b1')
 
 prepare() {

Deleted: umbrello.install
===
--- umbrello.install2016-04-27 17:47:40 UTC (rev 266296)
+++ umbrello.install2016-04-27 17:54:38 UTC (rev 266297)
@@ -1,13 +0,0 @@
-post_install() {
-xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-update-desktop-database -q
-}
-
-post_upgrade() {
-post_install
-}
-
-post_remove() {
-post_install
-}
-


[arch-commits] Commit in umbrello/trunk (PKGBUILD)

2015-12-20 Thread Antonio Rojas
Date: Sunday, December 20, 2015 @ 17:42:01
  Author: arojas
Revision: 257044

Fix KF5 build (FS#47456)

Modified:
  umbrello/trunk/PKGBUILD

--+
 PKGBUILD |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-20 14:43:18 UTC (rev 257043)
+++ PKGBUILD2015-12-20 16:42:01 UTC (rev 257044)
@@ -4,7 +4,7 @@
 
 pkgname=umbrello
 pkgver=15.12.0
-pkgrel=1
+pkgrel=2
 pkgdesc='UML modeller'
 arch=(i686 x86_64)
 url='http://kde.org/applications/development/umbrello'
@@ -14,12 +14,17 @@
 conflicts=(kdesdk-umbrello)
 replaces=(kdesdk-umbrello)
 groups=(kde-applications kdesdk)
-source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz;)
+source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz;
+   
fix-build.patch::"https://quickgit.kde.org/?p=umbrello.git=commitdiff=f18143=plain;)
 install=$pkgname.install
-md5sums=('1056ec261ec2b05b775e7995abdfab72')
+md5sums=('1056ec261ec2b05b775e7995abdfab72'
+ '446a933b6447db14659c92b6f23345c8')
 
 prepare() {
   mkdir -p build
+
+  cd $pkgname-$pkgver
+  patch -p1 -i ../fix-build.patch
 }
 
 build() { 


[arch-commits] Commit in umbrello/trunk (PKGBUILD)

2015-12-08 Thread Bartłomiej Piotrowski
Date: Tuesday, December 8, 2015 @ 13:17:28
  Author: bpiotrowski
Revision: 253751

C++11 ABI rebuild

Modified:
  umbrello/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-08 12:17:25 UTC (rev 253750)
+++ PKGBUILD2015-12-08 12:17:28 UTC (rev 253751)
@@ -4,7 +4,7 @@
 
 pkgname=umbrello
 pkgver=15.08.3
-pkgrel=1
+pkgrel=2
 pkgdesc='UML modeller'
 arch=(i686 x86_64)
 url='http://kde.org/applications/development/umbrello'


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

2015-08-24 Thread Antonio Rojas
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
===
--- PKGBUILD2015-08-24 17:49:28 UTC (rev 244768)
+++ PKGBUILD2015-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 +
-Subject: Fix 'KF5 version can't be launched from the menu'.
-X-Git-Url: 
http://quickgit.kde.org/?p=umbrello.gita=commitdiffh=947d7f4651a8b2478435796795036fa3ec8f0b7f
+Date: Sun, 23 Aug 2015 19:13:20 +
+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.gita=commitdiffh=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 )
 


[arch-commits] Commit in umbrello/trunk (PKGBUILD)

2015-08-23 Thread Antonio Rojas
Date: Sunday, August 23, 2015 @ 12:05:15
  Author: arojas
Revision: 244732

Fix launching umbrello from the menu

Modified:
  umbrello/trunk/PKGBUILD

--+
 PKGBUILD |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-08-23 09:37:26 UTC (rev 244731)
+++ PKGBUILD2015-08-23 10:05:15 UTC (rev 244732)
@@ -4,7 +4,7 @@
 
 pkgname=umbrello
 pkgver=15.08.0
-pkgrel=1
+pkgrel=2
 pkgdesc='UML modeller'
 arch=(i686 x86_64)
 url='http://kde.org/applications/development/umbrello'
@@ -37,5 +37,8 @@
 package() {
   cd build
   make DESTDIR=$pkgdir install
+
+# Fix launching umbrello from the desktop file
+  sed -e 's|caption|qwindowtitle|g' -i 
$pkgdir/usr/share/applications/org.kde.umbrello.desktop
 }
 


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

2015-08-23 Thread Antonio Rojas
Date: Sunday, August 23, 2015 @ 13:21:45
  Author: arojas
Revision: 244737

Use upstream patch

Added:
  umbrello/trunk/qwindowtitle.patch
Modified:
  umbrello/trunk/PKGBUILD

+
 PKGBUILD   |9 +
 qwindowtitle.patch |   23 +++
 2 files changed, 28 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-08-23 11:07:00 UTC (rev 244736)
+++ PKGBUILD2015-08-23 11:21:45 UTC (rev 244737)
@@ -14,12 +14,16 @@
 conflicts=(kdesdk-umbrello)
 replaces=(kdesdk-umbrello)
 groups=(kde-applications kdesdk)
-source=(http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz;)
+source=(http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz;
 'qwindowtitle.patch')
 install=$pkgname.install
 md5sums=('8eab51485322ddbc69543e0b9ab0624f')
 
 prepare() {
   mkdir -p build
+
+  cd $pkgname-$pkgver
+# Fix launching umbrello from the desktop file
+  patch -p1 -i ../qwindowtitle.patch
 }
 
 build() { 
@@ -37,8 +41,5 @@
 package() {
   cd build
   make DESTDIR=$pkgdir install
-
-# Fix launching umbrello from the desktop file
-  sed -e 's|caption|qwindowtitle|g' -i 
$pkgdir/usr/share/applications/org.kde.umbrello.desktop
 }
 

Added: qwindowtitle.patch
===
--- qwindowtitle.patch  (rev 0)
+++ qwindowtitle.patch  2015-08-23 11:21:45 UTC (rev 244737)
@@ -0,0 +1,23 @@
+From: Ralf Habacker ralf.habac...@freenet.de
+Date: Sun, 23 Aug 2015 08:48:27 +
+Subject: Fix 'KF5 version can't be launched from the menu'.
+X-Git-Url: 
http://quickgit.kde.org/?p=umbrello.gita=commitdiffh=947d7f4651a8b2478435796795036fa3ec8f0b7f
+---
+Fix 'KF5 version can't be launched from the menu'.
+
+BUG:351621
+---
+
+
+--- 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
+