[arch-commits] Commit in umbrello/repos/extra-x86_64 (3 files)

[Antonio Rojas]

    Date: Thursday, January 11, 2018 @ 17:46:58
  Author: arojas
Revision: 314581

archrelease: copy trunk to extra-x86_64

Added:
  umbrello/repos/extra-x86_64/PKGBUILD
    (from rev 314580, umbrello/trunk/PKGBUILD)
Deleted:
  umbrello/repos/extra-x86_64/PKGBUILD
  umbrello/repos/extra-x86_64/umbrello-fix-launch.patch

---------------------------+
 PKGBUILD                  |   87 ++++++++++++++++++++------------------------
 umbrello-fix-launch.patch |   27 -------------
 2 files changed, 41 insertions(+), 73 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-11 17:46:35 UTC (rev 314580)
+++ PKGBUILD	2018-01-11 17:46:58 UTC (rev 314581)
@@ -1,46 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org> 
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=umbrello
-pkgver=17.12.0
-pkgrel=3
-pkgdesc='UML modeller'
-arch=(x86_64)
-url='https://kde.org/applications/development/umbrello'
-license=(GPL)
-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}
-        umbrello-fix-launch.patch)
-sha256sums=('8979d3bec788f7ba02934469afb7bb5c33480f6ae18554e57dc684795fdfd9c4'
-            'SKIP'
-            '5fc9b318ad6e3614e121e8ee683e7fcd785e51f9c4befd64138326a8aa6193fd')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
-              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck at kde.org>
-
-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() { 
-  cd build
-  cmake ../$pkgname-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -DBUILD_TESTING=OFF \
-    -DBUILD_UNITTESTS=OFF \
-    -DBUILD_KF5=ON
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-}
-

Copied: umbrello/repos/extra-x86_64/PKGBUILD (from rev 314580, umbrello/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-01-11 17:46:58 UTC (rev 314581)
@@ -0,0 +1,41 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org> 
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=umbrello
+pkgver=17.12.1
+pkgrel=1
+pkgdesc='UML modeller'
+arch=(x86_64)
+url='https://kde.org/applications/development/umbrello'
+license=(GPL)
+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})
+sha256sums=('29c84549c5b09edf749826e67e33ffc0c65a2ef1aaf14f4e861910f4be5c798e'
+            'SKIP')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
+              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck at kde.org>
+
+prepare() {
+  mkdir -p build
+}
+
+build() { 
+  cd build
+  cmake ../$pkgname-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DBUILD_TESTING=OFF \
+    -DBUILD_UNITTESTS=OFF \
+    -DBUILD_KF5=ON
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}
+

Deleted: umbrello-fix-launch.patch
===================================================================
--- umbrello-fix-launch.patch	2018-01-11 17:46:35 UTC (rev 314580)
+++ umbrello-fix-launch.patch	2018-01-11 17:46:58 UTC (rev 314581)
@@ -1,27 +0,0 @@
-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
-