[arch-commits] Commit in lokalize/trunk (PKGBUILD fix-python2-path.patch)

[Antonio Rojas]

    Date: Saturday, August 26, 2017 @ 19:14:48
  Author: arojas
Revision: 304080

Add kross-interpreters optdepend, drop python2 fix

Modified:
  lokalize/trunk/PKGBUILD
Deleted:
  lokalize/trunk/fix-python2-path.patch

------------------------+
 PKGBUILD               |   26 ++++++++++++--------------
 fix-python2-path.patch |   22 ----------------------
 2 files changed, 12 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-08-26 18:32:18 UTC (rev 304079)
+++ PKGBUILD	2017-08-26 19:14:48 UTC (rev 304080)
@@ -1,5 +1,6 @@
 # $Id$
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=lokalize
@@ -7,14 +8,15 @@
 pkgrel=1
 pkgdesc='Computer-Aided Translation System'
 url='https://kde.org/applications/development/lokalize/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde-applications' 'kdesdk')
-depends=('kross' 'hunspell' 'hicolor-icon-theme')
-makedepends=('extra-cmake-modules' 'python' 'kdoctools')
-conflicts=('kdesdk-lokalize')
-replaces=('kdesdk-lokalize')
-source=("https://download.kde.org/stable/applications/${pkgver}/src/lokalize-${pkgver}.tar.xz"{,.sig})
+arch=(i686 x86_64)
+license=(GPL LGPL FDL)
+groups=(kde-applications kdesdk)
+depends=(kross hunspell hicolor-icon-theme)
+makedepends=(extra-cmake-modules python kdoctools)
+optdepends=('kross-interpreters: for msgmerge')
+conflicts=(kdesdk-lokalize)
+replaces=(kdesdk-lokalize)
+source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig})
 sha256sums=('16b8d53351973d486ce910113af245799ec783888bbb669f7541c9f58a1efa2a'
             'SKIP')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
@@ -26,7 +28,7 @@
 
 build() {
   cd build
-  cmake ../lokalize-${pkgver} \
+  cmake ../$pkgname-$pkgver \
     -DCMAKE_BUILD_TYPE=Release \
     -DBUILD_TESTING=OFF \
     -DCMAKE_INSTALL_PREFIX=/usr
@@ -35,9 +37,5 @@
 
 package() {
   cd build
-  make DESTDIR=$pkgdir install
-
-  # Fix python 2 path
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-    "${pkgdir}"/usr/share/lokalize/scripts/odf/xliffmerge.py
+  make DESTDIR="$pkgdir" install
 }

Deleted: fix-python2-path.patch
===================================================================
--- fix-python2-path.patch	2017-08-26 18:32:18 UTC (rev 304079)
+++ fix-python2-path.patch	2017-08-26 19:14:48 UTC (rev 304080)
@@ -1,22 +0,0 @@
---- kdesdk-4.5.80/lokalize/scripts/msgmerge.py~	2010-11-24 11:22:42.120000002 +0100
-+++ kdesdk-4.5.80/lokalize/scripts/msgmerge.py	2010-11-24 11:22:42.146666670 +0100
-@@ -114,7 +114,7 @@
-         print >>sys.stderr, "Execution failed:", e
- 
-     cmd='%s/odf/xliffmerge.py -i %s -t %s -o %s' % (ourPath,xliffpathname,xlifftemplatepathname,xliffpathname)
--    if os.name!='nt': cmd='python '+cmd
-+    if os.name!='nt': cmd='python2 '+cmd
-     else: cmd=cmd.replace('/','\\')
-     os.system(cmd)
-
---- kdesdk-4.5.80/lokalize/scripts/xliff2odf.py~	2010-11-24 11:24:10.853333336 +0100
-+++ kdesdk-4.5.80/lokalize/scripts/xliff2odf.py	2010-11-24 11:24:10.883333336 +0100
-@@ -42,7 +42,7 @@
-     xliff2odf.convertxliff(xliffinput, translatedodfpathname, odf)
- 
-     ourpath=([p for p in sys.path if os.path.exists(p+'/xliff2odf.py')]+[''])[0]
--    os.system('python "'+ourpath+'/xliff2odf-standalone.py" "%s" "%s" &'%(translatedodfpathname, Editor.currentEntryId()))
-+    os.system('python2 "'+ourpath+'/xliff2odf-standalone.py" "%s" "%s" &'%(translatedodfpathname, Editor.currentEntryId()))
- 
- try: convert()
- except: print 'error occured'