[arch-commits] Commit in lokalize/repos (8 files)

Antonio Rojas arojas at archlinux.org
Tue Jun 14 17:18:18 UTC 2016


    Date: Tuesday, June 14, 2016 @ 17:18:18
  Author: arojas
Revision: 269915

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  lokalize/repos/extra-i686/PKGBUILD
    (from rev 269914, lokalize/trunk/PKGBUILD)
  lokalize/repos/extra-i686/fix-python2-path.patch
    (from rev 269914, lokalize/trunk/fix-python2-path.patch)
  lokalize/repos/extra-x86_64/PKGBUILD
    (from rev 269914, lokalize/trunk/PKGBUILD)
  lokalize/repos/extra-x86_64/fix-python2-path.patch
    (from rev 269914, lokalize/trunk/fix-python2-path.patch)
Deleted:
  lokalize/repos/extra-i686/PKGBUILD
  lokalize/repos/extra-i686/fix-python2-path.patch
  lokalize/repos/extra-x86_64/PKGBUILD
  lokalize/repos/extra-x86_64/fix-python2-path.patch

-------------------------------------+
 /PKGBUILD                           |   80 ++++++++++++++++++++++++++++++++++
 /fix-python2-path.patch             |   44 ++++++++++++++++++
 extra-i686/PKGBUILD                 |   41 -----------------
 extra-i686/fix-python2-path.patch   |   22 ---------
 extra-x86_64/PKGBUILD               |   41 -----------------
 extra-x86_64/fix-python2-path.patch |   22 ---------
 6 files changed, 124 insertions(+), 126 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2016-06-14 17:18:02 UTC (rev 269914)
+++ extra-i686/PKGBUILD	2016-06-14 17:18:18 UTC (rev 269915)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=lokalize
-pkgver=16.04.1
-pkgrel=1
-pkgdesc='Computer-Aided Translation System'
-url='http://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=("http://download.kde.org/stable/applications/${pkgver}/src/lokalize-${pkgver}.tar.xz")
-sha1sums=('6579482c06479393f922f54f4aee2b576bd9492e')
-
-prepare() {
-  mkdir -p build
-}
-
-build() {
-  cd build
-  cmake ../lokalize-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DBUILD_TESTING=OFF \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
-  make
-}
-
-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
-}

Copied: lokalize/repos/extra-i686/PKGBUILD (from rev 269914, lokalize/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2016-06-14 17:18:18 UTC (rev 269915)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=lokalize
+pkgver=16.04.2
+pkgrel=1
+pkgdesc='Computer-Aided Translation System'
+url='http://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=("http://download.kde.org/stable/applications/${pkgver}/src/lokalize-${pkgver}.tar.xz")
+sha1sums=('7d3f91e5175581e110b2c943b23490ec78dafbbb')
+
+prepare() {
+  mkdir -p build
+}
+
+build() {
+  cd build
+  cmake ../lokalize-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_TESTING=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+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
+}

Deleted: extra-i686/fix-python2-path.patch
===================================================================
--- extra-i686/fix-python2-path.patch	2016-06-14 17:18:02 UTC (rev 269914)
+++ extra-i686/fix-python2-path.patch	2016-06-14 17:18:18 UTC (rev 269915)
@@ -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'

Copied: lokalize/repos/extra-i686/fix-python2-path.patch (from rev 269914, lokalize/trunk/fix-python2-path.patch)
===================================================================
--- extra-i686/fix-python2-path.patch	                        (rev 0)
+++ extra-i686/fix-python2-path.patch	2016-06-14 17:18:18 UTC (rev 269915)
@@ -0,0 +1,22 @@
+--- 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'

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2016-06-14 17:18:02 UTC (rev 269914)
+++ extra-x86_64/PKGBUILD	2016-06-14 17:18:18 UTC (rev 269915)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=lokalize
-pkgver=16.04.1
-pkgrel=1
-pkgdesc='Computer-Aided Translation System'
-url='http://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=("http://download.kde.org/stable/applications/${pkgver}/src/lokalize-${pkgver}.tar.xz")
-sha1sums=('6579482c06479393f922f54f4aee2b576bd9492e')
-
-prepare() {
-  mkdir -p build
-}
-
-build() {
-  cd build
-  cmake ../lokalize-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DBUILD_TESTING=OFF \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
-  make
-}
-
-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
-}

Copied: lokalize/repos/extra-x86_64/PKGBUILD (from rev 269914, lokalize/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2016-06-14 17:18:18 UTC (rev 269915)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=lokalize
+pkgver=16.04.2
+pkgrel=1
+pkgdesc='Computer-Aided Translation System'
+url='http://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=("http://download.kde.org/stable/applications/${pkgver}/src/lokalize-${pkgver}.tar.xz")
+sha1sums=('7d3f91e5175581e110b2c943b23490ec78dafbbb')
+
+prepare() {
+  mkdir -p build
+}
+
+build() {
+  cd build
+  cmake ../lokalize-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_TESTING=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+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
+}

Deleted: extra-x86_64/fix-python2-path.patch
===================================================================
--- extra-x86_64/fix-python2-path.patch	2016-06-14 17:18:02 UTC (rev 269914)
+++ extra-x86_64/fix-python2-path.patch	2016-06-14 17:18:18 UTC (rev 269915)
@@ -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'

Copied: lokalize/repos/extra-x86_64/fix-python2-path.patch (from rev 269914, lokalize/trunk/fix-python2-path.patch)
===================================================================
--- extra-x86_64/fix-python2-path.patch	                        (rev 0)
+++ extra-x86_64/fix-python2-path.patch	2016-06-14 17:18:18 UTC (rev 269915)
@@ -0,0 +1,22 @@
+--- 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'



More information about the arch-commits mailing list