[arch-commits] Commit in ukui-menu/trunk (PKGBUILD fix-installation.patch)

[Felix Yan]

    Date: Friday, March 20, 2020 @ 13:52:38
  Author: felixonmars
Revision: 601649

upgpkg: ukui-menu 2.0.2-2

Added:
  ukui-menu/trunk/fix-installation.patch
Modified:
  ukui-menu/trunk/PKGBUILD

------------------------+
 PKGBUILD               |   15 +++++++++++----
 fix-installation.patch |   29 +++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-20 13:52:13 UTC (rev 601648)
+++ PKGBUILD	2020-03-20 13:52:38 UTC (rev 601649)
@@ -2,7 +2,7 @@
 
 pkgname=ukui-menu
 pkgver=2.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Start menu development library and advanced graphical user interface for UKUI"
 arch=('x86_64')
 license=('GPL')
@@ -10,9 +10,16 @@
 groups=('ukui')
 depends=('qt5-svg')
 makedepends=('qt5-tools')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/ukui/ukui-menu/archive/v$pkgver.tar.gz")
-sha512sums=('9bf09b97f39119d45325fa5b296ab2e36a6304365f79189ff9fc71c9ee163cdce82242f65d079ad4effa733fc1d61f0b2d92c37a98cc6ae3240de7f7b02ee625')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/ukui/ukui-menu/archive/v$pkgver.tar.gz"
+        fix-installation.patch)
+sha512sums=('9bf09b97f39119d45325fa5b296ab2e36a6304365f79189ff9fc71c9ee163cdce82242f65d079ad4effa733fc1d61f0b2d92c37a98cc6ae3240de7f7b02ee625'
+            'eb22d4cb171ee9ca46f55a6802515e3ed0c8ba4160a3dc975b6ec43ccb4e7e00e7321d071013491accb8f7c3842c7aa4f0370af4c9e902d9f1a7405836309a90')
 
+prepare() {
+  cd ukui-menu-$pkgver
+  patch -p1 -i ../fix-installation.patch
+}
+
 build() {
   cd ukui-menu-$pkgver
   qmake-qt5 PREFIX=/usr
@@ -21,5 +28,5 @@
 
 package() {
   cd ukui-menu-$pkgver
-  install -Dm755 ukui-menu -t "$pkgdir"/usr/bin/
+  make INSTALL_ROOT="$pkgdir" install
 }

Added: fix-installation.patch
===================================================================
--- fix-installation.patch	                        (rev 0)
+++ fix-installation.patch	2020-03-20 13:52:38 UTC (rev 601649)
@@ -0,0 +1,29 @@
+commit e55fcfa8e9a343aba4d146aba5d1a262f79c2be0
+Author: Felix Yan <felixonmars at archlinux.org>
+Date:   Fri Mar 20 21:48:25 2020 +0800
+
+    Fix installation target
+
+diff --git a/ukui-menu.pro b/ukui-menu.pro
+index c666653..f4eb67e 100644
+--- a/ukui-menu.pro
++++ b/ukui-menu.pro
+@@ -13,6 +13,8 @@ QMAKE_CXXFLAGS += -g
+ TARGET = ukui-menu
+ TEMPLATE = app
+ 
++target.path = /usr/bin
++
+ TRANSLATIONS+=\
+     ukui_menu_ch.ts
+ 
+@@ -95,3 +97,9 @@ RESOURCES += \
+ 
+ PKGCONFIG+=glib-2.0
+ CONFIG += no_keywords link_pkgconfig
++
++desktop_file.files = ukui-menu.desktop
++desktop_file.path = /etc/xdg/autostart
++
++INSTALLS += \
++    target desktop_file