[arch-commits] Commit in shadowsocks-qt5/trunk (PKGBUILD disable-appindicator.patch)

[Felix Yan]

    Date: Sunday, August 20, 2017 @ 18:52:56
  Author: felixonmars
Revision: 252780

upgpkg: shadowsocks-qt5 2.9.0-2

Modified:
  shadowsocks-qt5/trunk/PKGBUILD
Deleted:
  shadowsocks-qt5/trunk/disable-appindicator.patch

----------------------------+
 PKGBUILD                   |   21 +++++++++++----------
 disable-appindicator.patch |   12 ------------
 2 files changed, 11 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-08-20 18:38:57 UTC (rev 252779)
+++ PKGBUILD	2017-08-20 18:52:56 UTC (rev 252780)
@@ -4,32 +4,33 @@
 
 pkgname=shadowsocks-qt5
 pkgver=2.9.0
-pkgrel=1
+_commit=ba961cd962e5adf00a2ca34b93e3210440a366f4
+pkgrel=2
 pkgdesc="A fast, reliable and cross-platform GUI fronted for Shadowsocks."
 arch=("i686" "x86_64")
-url="http://github.com/shadowsocks/shadowsocks-qt5"
+url="https://github.com/shadowsocks/shadowsocks-qt5"
 license=("GPL")
 depends=('qrencode' 'libqtshadowsocks' 'zbar')
-makedepends=('git')
-source=("$pkgname-$pkgver.tar.gz::http://github.com/shadowsocks/shadowsocks-qt5/archive/v$pkgver.tar.gz"
-        "disable-appindicator.patch")
-sha512sums=('2fb9662844fb9e6ff4806999059516f75477ac66802452d528979d501a4aafdb2df36789b8a97c7bc013d7021b49aec9eb3a99b0115ae812b2d2d9bdb3a4d295'
-            '7869dec8cc0ebc637ac75e65fbeeaa8af513877d1c8a8e2b4f6390859e8aa15cc82bbb7e2e83b4b1b29d439893c0fb428f83c897ad16bcf2e51f047e3927136f')
+makedepends=('cmake')
+source=("$pkgname-$_commit.tar.gz::https://github.com/shadowsocks/shadowsocks-qt5/archive/$_commit.tar.gz")
+sha512sums=('8eca22b9cf2c764d4b825cb4d403346704ba12f00f08bb67ad4097ca8452b3986e78fc4e8f36edf1de07a3e804155d054daaa7538e2794933e7c52c5e66c9f06')
 
 prepare() {
+  mv $pkgname-$_commit $pkgname-$pkgver
+
   cd shadowsocks-qt5-$pkgver
 
   # Disable appindicator (was needed for Qt < 5.4.2)
-  patch -Np1 -i ../disable-appindicator.patch
+  sed -i '/APPINDICATOR/d' CMakeLists.txt
 }
 
 build() {
   cd shadowsocks-qt5-$pkgver
-  qmake INSTALL_PREFIX=/usr
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .
   make
 }
 
 package() {
   cd shadowsocks-qt5-$pkgver
-  make INSTALL_ROOT="$pkgdir" install
+  make DESTDIR="$pkgdir" install
 }

Deleted: disable-appindicator.patch
===================================================================
--- disable-appindicator.patch	2017-08-20 18:38:57 UTC (rev 252779)
+++ disable-appindicator.patch	2017-08-20 18:52:56 UTC (rev 252780)
@@ -1,12 +0,0 @@
-diff -Naur shadowsocks-qt5-2.8.0.orig/src/ss-qt5.pri shadowsocks-qt5-2.8.0/src/ss-qt5.pri
---- shadowsocks-qt5-2.8.0.orig/src/ss-qt5.pri	2016-12-14 22:56:30.000000000 +0100
-+++ shadowsocks-qt5-2.8.0/src/ss-qt5.pri	2017-01-25 04:42:25.227070273 +0100
-@@ -68,8 +68,4 @@
- unix: {
-     CONFIG    += link_pkgconfig
-     PKGCONFIG += libqrencode QtShadowsocks botan-$$BOTAN_VER zbar
--    !macx: {
--        PKGCONFIG += gtk+-2.0 appindicator-0.1
--        DEFINES   += USE_APP_INDICATOR
--    }
- }