[arch-commits] Commit in ibus-sunpinyin/trunk (PKGBUILD scons-python3.patch)

[Balló György]

    Date: Monday, March 16, 2020 @ 09:49:28
  Author: bgyorgy
Revision: 599103

upgpkg: ibus-sunpinyin 3.0.0rc1+32+gf39c195-1: Update to latest git snapshot to avoid deprecated pygtk dependency

Modified:
  ibus-sunpinyin/trunk/PKGBUILD
Deleted:
  ibus-sunpinyin/trunk/scons-python3.patch

---------------------+
 PKGBUILD            |   20 +++++++++-----------
 scons-python3.patch |   31 -------------------------------
 2 files changed, 9 insertions(+), 42 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-16 09:13:22 UTC (rev 599102)
+++ PKGBUILD	2020-03-16 09:49:28 UTC (rev 599103)
@@ -3,27 +3,25 @@
 
 pkgname=ibus-sunpinyin
 _pkgname=sunpinyin
-pkgver=3.0.0rc1
-_tag=v3.0.0-rc1
-pkgrel=4
+pkgver=3.0.0rc1+32+gf39c195
+pkgrel=1
 pkgdesc="IBus Wrapper for sunpinyin"
 arch=('x86_64')
-url="http://sunpinyin.googlecode.com"
+url="https://github.com/sunpinyin/sunpinyin"
 license=('LGPL')
-depends=('sunpinyin' 'sunpinyin-data' 'ibus' 'pygtk')
+depends=('sunpinyin' 'sunpinyin-data' 'ibus' 'gtk3' 'python-gobject')
 makedepends=('git' 'scons')
-source=("git://github.com/sunpinyin/sunpinyin.git#tag=$_tag" scons-python3.patch)
-md5sums=('SKIP'
-         '73242f03ff8ec9a360021de31b903601')
+_commit=f39c195db08661e894017507842991a1ef70bedf  # master
+source=("git+https://github.com/sunpinyin/sunpinyin.git#commit=$_commit")
+md5sums=('SKIP')
 
-prepare() {
+pkgver() {
   cd $_pkgname
-  patch -p1 -i ../scons-python3.patch
+  git describe --tags | sed 's/^v//;s/-rc/rc/;s/-/+/g'
 }
 
 build() {
   cd "$srcdir/$_pkgname/wrapper/ibus"
-  sed -i -e "s|python|python2|" setup/ibus-setup-sunpinyin.in
   
   scons \
     --prefix=/usr

Deleted: scons-python3.patch
===================================================================
--- scons-python3.patch	2020-03-16 09:13:22 UTC (rev 599102)
+++ scons-python3.patch	2020-03-16 09:49:28 UTC (rev 599103)
@@ -1,31 +0,0 @@
---- sunpinyin/SConstruct.orig	2019-07-26 18:43:44.176969620 +0000
-+++ sunpinyin/SConstruct	2019-07-26 18:44:16.680683795 +0000
-@@ -227,7 +227,7 @@
- def PassVariables(envvar, env):
-     for (x, y) in envvar:
-         if x in os.environ:
--            print 'Warning: you\'ve set %s in the environmental variable!' % x
-+            print ('Warning: you\'ve set %s in the environmental variable!' % x)
-             env[y] = os.environ[x]
- 
- env = CreateEnvironment()
---- sunpinyin/wrapper/ibus/SConstruct.orig	2019-07-26 18:47:21.482881594 +0000
-+++ sunpinyin/wrapper/ibus/SConstruct	2019-07-26 18:47:44.303156268 +0000
-@@ -36,7 +36,7 @@
- def PassVariables(envvar, env):
-     for (x, y) in envvar:
-         if x in os.environ:
--            print 'Warning: you\'ve set %s in the environmental variable!' % x
-+            print ('Warning: you\'ve set %s in the environmental variable!' % x)
-             env[y] = os.environ[x]
- 
- env = Environment(ENV=os.environ,
-@@ -141,7 +141,7 @@
-     libexec_target = env.Install(bin_dir, ['ibus-engine-sunpinyin', 
-                                            'setup/ibus-setup-sunpinyin'])
-     for exec_bin in libexec_target:
--        env.AddPostAction(exec_bin, Chmod(str(exec_bin), 0755))
-+        env.AddPostAction(exec_bin, Chmod(str(exec_bin), '0755'))
-         
-     setup_target = env.Install(data_dir + '/setup',
-                                ['setup/setup.xml',