[arch-commits] Commit in ukui-media/repos/community-x86_64 (3 files)

[Felix Yan]

    Date: Friday, March 20, 2020 @ 13:45:47
  Author: felixonmars
Revision: 601634

archrelease: copy trunk to community-x86_64

Added:
  ukui-media/repos/community-x86_64/PKGBUILD
    (from rev 601633, ukui-media/trunk/PKGBUILD)
  ukui-media/repos/community-x86_64/fix-installation.patch
    (from rev 601633, ukui-media/trunk/fix-installation.patch)
Deleted:
  ukui-media/repos/community-x86_64/PKGBUILD

------------------------+
 PKGBUILD               |   70 ++++++++++++++++++++++++++---------------------
 fix-installation.patch |   46 ++++++++++++++++++++++++++++++
 2 files changed, 86 insertions(+), 30 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-20 13:45:35 UTC (rev 601633)
+++ PKGBUILD	2020-03-20 13:45:47 UTC (rev 601634)
@@ -1,30 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgname=ukui-media
-pkgver=2.0.0
-pkgrel=1
-pkgdesc="UKUI media utilities"
-arch=('x86_64')
-license=('GPL')
-url="https://github.com/ukui/ukui-media"
-groups=('ukui')
-depends=('libmatemixer' 'mate-desktop')
-makedepends=('autoconf-archive' 'intltool' 'mate-common')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/ukui/ukui-media/archive/v$pkgver.tar.gz")
-sha512sums=('d741e96e2961135913d65108839722d81d414ddd1094c41707bd149b7bc26d4d9d96208bdface885acb5abf252a4fe6e9412c9316c24ae3a3a5eab8e0bca78c8')
-
-prepare() {
-  cd $pkgname-$pkgver
-  NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}

Copied: ukui-media/repos/community-x86_64/PKGBUILD (from rev 601633, ukui-media/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-03-20 13:45:47 UTC (rev 601634)
@@ -0,0 +1,40 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=ukui-media
+pkgver=2.0.0
+pkgrel=2
+pkgdesc="UKUI media utilities"
+arch=('x86_64')
+license=('GPL')
+url="https://github.com/ukui/ukui-media"
+groups=('ukui')
+depends=('gsettings-qt' 'libmatemixer' 'libqtxdg' 'mate-desktop' 'qt5-svg')
+makedepends=('autoconf-archive' 'intltool' 'mate-common' 'qt5-tools')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/ukui/ukui-media/archive/v$pkgver.tar.gz"
+        fix-installation.patch)
+sha512sums=('d741e96e2961135913d65108839722d81d414ddd1094c41707bd149b7bc26d4d9d96208bdface885acb5abf252a4fe6e9412c9316c24ae3a3a5eab8e0bca78c8'
+            'f8feb25ae30a7ab04663641da94bbd611ecf3914d34e8abb3a459d14719b80bd7cf721eaf0119f742dbee14cca9504be81cb3158f7f2ef59055ac1b0379f1682')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../fix-installation.patch
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname --sysconfdir=/etc
+  make
+
+  cd ukui-volume-control-applet-qt
+  qmake PREFIX=/usr
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  cd ukui-volume-control-applet-qt
+  make INSTALL_ROOT="$pkgdir" install
+}

Copied: ukui-media/repos/community-x86_64/fix-installation.patch (from rev 601633, ukui-media/trunk/fix-installation.patch)
===================================================================
--- fix-installation.patch	                        (rev 0)
+++ fix-installation.patch	2020-03-20 13:45:47 UTC (rev 601634)
@@ -0,0 +1,46 @@
+commit 49702aec5da73fb874483a3246299cfb304c55cd
+Author: Felix Yan <felixonmars at archlinux.org>
+Date:   Fri Mar 20 21:41:34 2020 +0800
+
+    Properly include resource files in installation
+
+diff --git a/ukui-volume-control-applet-qt/ukui-volume-control-applet-qt.pro b/ukui-volume-control-applet-qt/ukui-volume-control-applet-qt.pro
+index a1790a3..917b789 100644
+--- a/ukui-volume-control-applet-qt/ukui-volume-control-applet-qt.pro
++++ b/ukui-volume-control-applet-qt/ukui-volume-control-applet-qt.pro
+@@ -10,6 +10,8 @@ TEMPLATE = app
+ TARGET = ukui-volume-control-applet-qt
+ INCLUDEPATH += .
+ 
++PREFIX = /usr/share/ukui-media
++
+ include(QtSingleApplication/qtsingleapplication.pri)
+ 
+ DEFINES += QT_DEPRECATED_WARNINGS
+@@ -26,9 +28,6 @@ target.path = /usr/bin
+ #inst.files += translations/ukui-media-volume-control-applet-qt_zh_CN.qm
+ #              translations/1
+ 
+-INSTALLS += \
+-    target
+-
+ CONFIG += \
+     c++11 \
+     no_keywords link_pkgconfig \
+@@ -66,4 +65,15 @@ RESOURCES += \
+     res.qrc
+ 
+ TRANSLATIONS += \
+-    translations/ukui-volume-control-applet-qt-zh_CN.ts
++    translations/*.ts
++
++system("lrelease translations/*.ts")
++
++qm_file.files = translations/*.qm
++qm_file.path = $${PREFIX}/translations/
++
++data_files.files = data/*
++data_files.path = $${PREFIX}/
++
++INSTALLS += \
++    target qm_file data_files