Date: Thursday, March 9, 2017 @ 17:27:48 Author: arojas Revision: 290422
archrelease: copy trunk to extra-i686, extra-x86_64 Added: lokalize/repos/extra-i686/PKGBUILD (from rev 290421, lokalize/trunk/PKGBUILD) lokalize/repos/extra-i686/fix-python2-path.patch (from rev 290421, lokalize/trunk/fix-python2-path.patch) lokalize/repos/extra-x86_64/PKGBUILD (from rev 290421, lokalize/trunk/PKGBUILD) lokalize/repos/extra-x86_64/fix-python2-path.patch (from rev 290421, 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 | 84 ++++++++++++++++++++++++++++++++++ /fix-python2-path.patch | 44 +++++++++++++++++ extra-i686/PKGBUILD | 42 ----------------- extra-i686/fix-python2-path.patch | 22 -------- extra-x86_64/PKGBUILD | 42 ----------------- extra-x86_64/fix-python2-path.patch | 22 -------- 6 files changed, 128 insertions(+), 128 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2017-03-09 17:27:31 UTC (rev 290421) +++ extra-i686/PKGBUILD 2017-03-09 17:27:48 UTC (rev 290422) @@ -1,42 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> - -pkgname=lokalize -pkgver=16.12.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"{,.sig}) -sha1sums=('5c8abc570a5729727d8b5a50fa97fdc0f6d5ea9e' - 'SKIP') -validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aa...@kde.org> - -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 -} Copied: lokalize/repos/extra-i686/PKGBUILD (from rev 290421, lokalize/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2017-03-09 17:27:48 UTC (rev 290422) @@ -0,0 +1,42 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> + +pkgname=lokalize +pkgver=16.12.3 +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}) +sha256sums=('a02347b7f9f3704817cc979858cbf5b68fb808543fdb57d2fe520264129a339e' + 'SKIP') +validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aa...@kde.org> + +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 2017-03-09 17:27:31 UTC (rev 290421) +++ extra-i686/fix-python2-path.patch 2017-03-09 17:27:48 UTC (rev 290422) @@ -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 290421, lokalize/trunk/fix-python2-path.patch) =================================================================== --- extra-i686/fix-python2-path.patch (rev 0) +++ extra-i686/fix-python2-path.patch 2017-03-09 17:27:48 UTC (rev 290422) @@ -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 2017-03-09 17:27:31 UTC (rev 290421) +++ extra-x86_64/PKGBUILD 2017-03-09 17:27:48 UTC (rev 290422) @@ -1,42 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> - -pkgname=lokalize -pkgver=16.12.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"{,.sig}) -sha1sums=('5c8abc570a5729727d8b5a50fa97fdc0f6d5ea9e' - 'SKIP') -validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aa...@kde.org> - -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 -} Copied: lokalize/repos/extra-x86_64/PKGBUILD (from rev 290421, lokalize/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2017-03-09 17:27:48 UTC (rev 290422) @@ -0,0 +1,42 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> + +pkgname=lokalize +pkgver=16.12.3 +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}) +sha256sums=('a02347b7f9f3704817cc979858cbf5b68fb808543fdb57d2fe520264129a339e' + 'SKIP') +validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aa...@kde.org> + +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 2017-03-09 17:27:31 UTC (rev 290421) +++ extra-x86_64/fix-python2-path.patch 2017-03-09 17:27:48 UTC (rev 290422) @@ -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 290421, lokalize/trunk/fix-python2-path.patch) =================================================================== --- extra-x86_64/fix-python2-path.patch (rev 0) +++ extra-x86_64/fix-python2-path.patch 2017-03-09 17:27:48 UTC (rev 290422) @@ -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'