[arch-commits] Commit in kdesdk/repos (9 files)
Andrea Scarpino
andrea at archlinux.org
Wed Sep 7 17:42:51 UTC 2011
Date: Wednesday, September 7, 2011 @ 13:42:51
Author: andrea
Revision: 137487
db-move: moved kdesdk from [staging] to [extra] (x86_64)
Added:
kdesdk/repos/extra-x86_64/PKGBUILD
(from rev 137485, kdesdk/repos/staging-x86_64/PKGBUILD)
kdesdk/repos/extra-x86_64/fix-python2-path.patch
(from rev 137485, kdesdk/repos/staging-x86_64/fix-python2-path.patch)
kdesdk/repos/extra-x86_64/kdesdk-okteta.install
(from rev 137485, kdesdk/repos/staging-x86_64/kdesdk-okteta.install)
kdesdk/repos/extra-x86_64/kdesdk.install
(from rev 137485, kdesdk/repos/staging-x86_64/kdesdk.install)
Deleted:
kdesdk/repos/extra-x86_64/PKGBUILD
kdesdk/repos/extra-x86_64/fix-python2-path.patch
kdesdk/repos/extra-x86_64/kdesdk-okteta.install
kdesdk/repos/extra-x86_64/kdesdk.install
kdesdk/repos/staging-x86_64/
------------------------+
PKGBUILD | 494 +++++++++++++++++++++++------------------------
fix-python2-path.patch | 128 ++++++------
kdesdk-okteta.install | 24 +-
kdesdk.install | 22 +-
4 files changed, 334 insertions(+), 334 deletions(-)
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2011-09-07 17:42:49 UTC (rev 137486)
+++ extra-x86_64/PKGBUILD 2011-09-07 17:42:51 UTC (rev 137487)
@@ -1,247 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgbase=kdesdk
-pkgname=('kdesdk-cervisia'
- 'kdesdk-dolphin-plugins'
- 'kdesdk-kapptemplate'
- 'kdesdk-kcachegrind'
- 'kdesdk-kdeaccounts-plugin'
- 'kdesdk-kdepalettes'
- 'kdesdk-kioslave'
- 'kdesdk-kmtrace'
- 'kdesdk-kompare'
- 'kdesdk-kpartloader'
- 'kdesdk-kprofilemethod'
-# 'kdesdk-kspy'
- 'kdesdk-kstartperf'
- 'kdesdk-kuiviewer'
- 'kdesdk-lokalize'
- 'kdesdk-okteta'
- 'kdesdk-poxml'
-# 'kdesdk-scheck'
- 'kdesdk-scripts'
- 'kdesdk-strigi-analyzer'
- 'kdesdk-umbrello')
-pkgver=4.7.0
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdesdk')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'subversion' 'antlr2'
- 'kdepimlibs' 'kdebase-lib')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
- 'fix-python2-path.patch')
-sha1sums=('619e9e6255888c989997fa02a1b6b97220ae9f11'
- 'd05ca0231869c484fd3861955d960a60aff7dcfb')
-
-build() {
- cd ${srcdir}/${pkgbase}-${pkgver}
-
- # Fix python2 path
- patch -Np1 -i ${srcdir}/fix-python2-path.patch
- sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
- -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
- $(find . -name '*.py')
-
- cd ${srcdir}
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package_kdesdk-cervisia() {
- pkgdesc='CVS Frontend'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/development/cervisia/"
- install='kdesdk.install'
- cd $srcdir/build/cervisia
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/cervisia
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-dolphin-plugins() {
- pkgdesc='Extra Dolphin plugins'
- depends=('kdebase-dolphin' 'subversion' 'git' 'kdesdk-kompare')
- install='kdesdk.install'
- cd $srcdir/build/dolphin-plugins/git
- make DESTDIR=$pkgdir install
- cd $srcdir/build/dolphin-plugins/svn
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kapptemplate() {
- pkgdesc='KDE Template Generator'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/development/kapptemplate/"
- install='kdesdk.install'
- cd $srcdir/build/kapptemplate
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kapptemplate
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kcachegrind() {
- pkgdesc='Visualization of Performance Profiling Data'
- depends=('kdebase-runtime' 'python2')
- optdepends=('php: PHP support')
- url="http://kde.org/applications/development/kcachegrind/"
- install='kdesdk.install'
- cd $srcdir/build/kcachegrind
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kcachegrind
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kdeaccounts-plugin() {
- pkgdesc='KDE Repository Accounts'
- depends=('kdepim-runtime')
- cd $srcdir/build/kdeaccounts-plugin
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kdepalettes() {
- pkgdesc='Palettes for the Gimp that match the KDE standard color palette'
- optdepends=('gimp')
- install -D -m644 $srcdir/${pkgbase}-${pkgver}/kdepalettes/KDE_Gimp \
- $pkgdir/usr/share/gimp/2.0/palettes/KDE.gpl
-}
-
-package_kdesdk-kioslave() {
- pkgdesc='KDED Subversion Module'
- depends=('kdebase-runtime' 'subversion')
- cd $srcdir/build/kioslave
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kmtrace() {
- pkgdesc='A KDE tool to assist with malloc debugging using glibc´s "mtrace" functionality'
- depends=('kdebase-runtime')
- cd $srcdir/build/kmtrace
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kmtrace
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kompare() {
- pkgdesc='Diff/Patch Frontend'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/development/kompare/"
- install='kdesdk.install'
- cd $srcdir/build/kompare
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kompare
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kpartloader() {
- pkgdesc='A test application for KParts'
- depends=('kdebase-runtime')
- install='kdesdk.install'
- cd $srcdir/build/kpartloader
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kprofilemethod() {
- pkgdesc='Macros helping to profile'
- cd $srcdir/build/kprofilemethod
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kspy() {
- pkgdesc='An Object Inspector for Qt/KDE applications'
- depends=('kdebase-runtime')
- cd $srcdir/build/kspy
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kstartperf() {
- pkgdesc='Startup time measurement tool for KDE applications'
- depends=('kdebase-runtime')
- cd $srcdir/build/kstartperf
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kuiviewer() {
- pkgdesc='Qt Designer UI File Viewer'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/development/kuiviewer/"
- install='kdesdk.install'
- cd $srcdir/build/kuiviewer
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-lokalize() {
- pkgdesc='Computer-Aided Translation System'
- depends=('kdebase-runtime' 'kdebindings-python')
- url="http://kde.org/applications/development/lokalize/"
- optdepends=('translate-toolkit: enable extra python script')
- install='kdesdk.install'
- cd $srcdir/build/lokalize
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/lokalize
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-okteta() {
- pkgdesc='Hex Editor'
- depends=('kdebase-runtime')
- replaces=('kdeutils-okteta')
- conflicts=('kdeutils-okteta')
- url="http://kde.org/applications/utilities/okteta"
- install='kdesdk-okteta.install'
- cd $srcdir/build/okteta
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/okteta
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-poxml() {
- pkgdesc='Translates DocBook XML files using gettext po files'
- depends=('qt' 'antlr2')
- cd $srcdir/build/poxml
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/poxml
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-scheck() {
- pkgdesc='An interface style to highlight accel and style guide conflicts'
- depends=('kdebase-runtime')
- cd $srcdir/build/scheck
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-scripts() {
- pkgdesc='KDE SDK scripts'
- depends=('python2')
- cd $srcdir/build/scripts
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/scripts
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-strigi-analyzer() {
- pkgdesc='Strigi-Analyzer for KDE SDK'
- depends=('kdelibs')
- cd $srcdir/build/strigi-analyzer
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-umbrello() {
- pkgdesc='UML Modeller'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/development/umbrello/"
- install='kdesdk.install'
- cd $srcdir/build/umbrello
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/umbrello
- make DESTDIR=$pkgdir install
-}
Copied: kdesdk/repos/extra-x86_64/PKGBUILD (from rev 137485, kdesdk/repos/staging-x86_64/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2011-09-07 17:42:51 UTC (rev 137487)
@@ -0,0 +1,247 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgbase=kdesdk
+pkgname=('kdesdk-cervisia'
+ 'kdesdk-dolphin-plugins'
+ 'kdesdk-kapptemplate'
+ 'kdesdk-kcachegrind'
+ 'kdesdk-kdeaccounts-plugin'
+ 'kdesdk-kdepalettes'
+ 'kdesdk-kioslave'
+ 'kdesdk-kmtrace'
+ 'kdesdk-kompare'
+ 'kdesdk-kpartloader'
+ 'kdesdk-kprofilemethod'
+# 'kdesdk-kspy'
+ 'kdesdk-kstartperf'
+ 'kdesdk-kuiviewer'
+ 'kdesdk-lokalize'
+ 'kdesdk-okteta'
+ 'kdesdk-poxml'
+# 'kdesdk-scheck'
+ 'kdesdk-scripts'
+ 'kdesdk-strigi-analyzer'
+ 'kdesdk-umbrello')
+pkgver=4.7.1
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdesdk')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'subversion' 'antlr2'
+ 'kdepimlibs' 'kdebase-lib')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
+ 'fix-python2-path.patch')
+sha1sums=('0c47d62a32e737c6ff576843d5b5c7f9bceeccbd'
+ 'd05ca0231869c484fd3861955d960a60aff7dcfb')
+
+build() {
+ cd ${srcdir}/${pkgbase}-${pkgver}
+
+ # Fix python2 path
+ patch -Np1 -i ${srcdir}/fix-python2-path.patch
+ sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
+ -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
+ $(find . -name '*.py')
+
+ cd ${srcdir}
+ mkdir build
+ cd build
+ cmake ../${pkgbase}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package_kdesdk-cervisia() {
+ pkgdesc='CVS Frontend'
+ depends=('kdebase-runtime')
+ url="http://kde.org/applications/development/cervisia/"
+ install='kdesdk.install'
+ cd $srcdir/build/cervisia
+ make DESTDIR=$pkgdir install
+ cd $srcdir/build/doc/cervisia
+ make DESTDIR=$pkgdir install
+}
+
+package_kdesdk-dolphin-plugins() {
+ pkgdesc='Extra Dolphin plugins'
+ depends=('kdebase-dolphin' 'subversion' 'git' 'kdesdk-kompare')
+ install='kdesdk.install'
+ cd $srcdir/build/dolphin-plugins/git
+ make DESTDIR=$pkgdir install
+ cd $srcdir/build/dolphin-plugins/svn
+ make DESTDIR=$pkgdir install
+}
+
+package_kdesdk-kapptemplate() {
+ pkgdesc='KDE Template Generator'
+ depends=('kdebase-runtime')
+ url="http://kde.org/applications/development/kapptemplate/"
+ install='kdesdk.install'
+ cd $srcdir/build/kapptemplate
+ make DESTDIR=$pkgdir install
+ cd $srcdir/build/doc/kapptemplate
+ make DESTDIR=$pkgdir install
+}
+
+package_kdesdk-kcachegrind() {
+ pkgdesc='Visualization of Performance Profiling Data'
+ depends=('kdebase-runtime' 'python2')
+ optdepends=('php: PHP support')
+ url="http://kde.org/applications/development/kcachegrind/"
+ install='kdesdk.install'
+ cd $srcdir/build/kcachegrind
+ make DESTDIR=$pkgdir install
+ cd $srcdir/build/doc/kcachegrind
+ make DESTDIR=$pkgdir install
+}
+
+package_kdesdk-kdeaccounts-plugin() {
+ pkgdesc='KDE Repository Accounts'
+ depends=('kdepim-runtime')
+ cd $srcdir/build/kdeaccounts-plugin
+ make DESTDIR=$pkgdir install
+}
+
+package_kdesdk-kdepalettes() {
+ pkgdesc='Palettes for the Gimp that match the KDE standard color palette'
+ optdepends=('gimp')
+ install -D -m644 $srcdir/${pkgbase}-${pkgver}/kdepalettes/KDE_Gimp \
+ $pkgdir/usr/share/gimp/2.0/palettes/KDE.gpl
+}
+
+package_kdesdk-kioslave() {
+ pkgdesc='KDED Subversion Module'
+ depends=('kdebase-runtime' 'subversion')
+ cd $srcdir/build/kioslave
+ make DESTDIR=$pkgdir install
+}
+
+package_kdesdk-kmtrace() {
+ pkgdesc='A KDE tool to assist with malloc debugging using glibc´s "mtrace" functionality'
+ depends=('kdebase-runtime')
+ cd $srcdir/build/kmtrace
+ make DESTDIR=$pkgdir install
+ cd $srcdir/build/doc/kmtrace
+ make DESTDIR=$pkgdir install
+}
+
+package_kdesdk-kompare() {
+ pkgdesc='Diff/Patch Frontend'
+ depends=('kdebase-runtime')
+ url="http://kde.org/applications/development/kompare/"
+ install='kdesdk.install'
+ cd $srcdir/build/kompare
+ make DESTDIR=$pkgdir install
+ cd $srcdir/build/doc/kompare
+ make DESTDIR=$pkgdir install
+}
+
+package_kdesdk-kpartloader() {
+ pkgdesc='A test application for KParts'
+ depends=('kdebase-runtime')
+ install='kdesdk.install'
+ cd $srcdir/build/kpartloader
+ make DESTDIR=$pkgdir install
+}
+
+package_kdesdk-kprofilemethod() {
+ pkgdesc='Macros helping to profile'
+ cd $srcdir/build/kprofilemethod
+ make DESTDIR=$pkgdir install
+}
+
+package_kdesdk-kspy() {
+ pkgdesc='An Object Inspector for Qt/KDE applications'
+ depends=('kdebase-runtime')
+ cd $srcdir/build/kspy
+ make DESTDIR=$pkgdir install
+}
+
+package_kdesdk-kstartperf() {
+ pkgdesc='Startup time measurement tool for KDE applications'
+ depends=('kdebase-runtime')
+ cd $srcdir/build/kstartperf
+ make DESTDIR=$pkgdir install
+}
+
+package_kdesdk-kuiviewer() {
+ pkgdesc='Qt Designer UI File Viewer'
+ depends=('kdebase-runtime')
+ url="http://kde.org/applications/development/kuiviewer/"
+ install='kdesdk.install'
+ cd $srcdir/build/kuiviewer
+ make DESTDIR=$pkgdir install
+}
+
+package_kdesdk-lokalize() {
+ pkgdesc='Computer-Aided Translation System'
+ depends=('kdebase-runtime' 'kdebindings-python')
+ url="http://kde.org/applications/development/lokalize/"
+ optdepends=('translate-toolkit: enable extra python script')
+ install='kdesdk.install'
+ cd $srcdir/build/lokalize
+ make DESTDIR=$pkgdir install
+ cd $srcdir/build/doc/lokalize
+ make DESTDIR=$pkgdir install
+}
+
+package_kdesdk-okteta() {
+ pkgdesc='Hex Editor'
+ depends=('kdebase-runtime')
+ replaces=('kdeutils-okteta')
+ conflicts=('kdeutils-okteta')
+ url="http://kde.org/applications/utilities/okteta"
+ install='kdesdk-okteta.install'
+ cd $srcdir/build/okteta
+ make DESTDIR=$pkgdir install
+ cd $srcdir/build/doc/okteta
+ make DESTDIR=$pkgdir install
+}
+
+package_kdesdk-poxml() {
+ pkgdesc='Translates DocBook XML files using gettext po files'
+ depends=('qt' 'antlr2')
+ cd $srcdir/build/poxml
+ make DESTDIR=$pkgdir install
+ cd $srcdir/build/doc/poxml
+ make DESTDIR=$pkgdir install
+}
+
+package_kdesdk-scheck() {
+ pkgdesc='An interface style to highlight accel and style guide conflicts'
+ depends=('kdebase-runtime')
+ cd $srcdir/build/scheck
+ make DESTDIR=$pkgdir install
+}
+
+package_kdesdk-scripts() {
+ pkgdesc='KDE SDK scripts'
+ depends=('python2')
+ cd $srcdir/build/scripts
+ make DESTDIR=$pkgdir install
+ cd $srcdir/build/doc/scripts
+ make DESTDIR=$pkgdir install
+}
+
+package_kdesdk-strigi-analyzer() {
+ pkgdesc='Strigi-Analyzer for KDE SDK'
+ depends=('kdelibs')
+ cd $srcdir/build/strigi-analyzer
+ make DESTDIR=$pkgdir install
+}
+
+package_kdesdk-umbrello() {
+ pkgdesc='UML Modeller'
+ depends=('kdebase-runtime')
+ url="http://kde.org/applications/development/umbrello/"
+ install='kdesdk.install'
+ cd $srcdir/build/umbrello
+ make DESTDIR=$pkgdir install
+ cd $srcdir/build/doc/umbrello
+ make DESTDIR=$pkgdir install
+}
Deleted: extra-x86_64/fix-python2-path.patch
===================================================================
--- extra-x86_64/fix-python2-path.patch 2011-09-07 17:42:49 UTC (rev 137486)
+++ extra-x86_64/fix-python2-path.patch 2011-09-07 17:42:51 UTC (rev 137487)
@@ -1,64 +0,0 @@
---- kdesdk-4.5.80/kcachegrind/converters/hotshot2calltree~ 2010-11-24 11:53:38.586666671 +0100
-+++ kdesdk-4.5.80/kcachegrind/converters/hotshot2calltree 2010-11-24 11:53:38.623333337 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- # _*_ coding: latin1 _*_
-
- #
---- 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'
---- kdesdk-4.5.80/scripts/rename_source_files~ 2010-11-24 11:45:41.040000004 +0100
-+++ kdesdk-4.5.80/scripts/rename_source_files 2010-11-24 11:45:41.093333336 +0100
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#! /usr/bin/env python2
- #
- # Copyright David Faure <faure at kde.org>, License LGPL v2
- #
---- kdesdk-4.5.80/scripts/svn2log.sh~ 2010-11-24 11:46:24.863333337 +0100
-+++ kdesdk-4.5.80/scripts/svn2log.sh 2010-11-24 11:46:24.896666669 +0100
-@@ -17,6 +17,6 @@
- svn cat svn://anonsvn.kde.org/home/kde/trunk/kde-common/accounts > /tmp/accounts.$PPID
-
- echo "Creating changelog...";
--svn log -v --xml $1 | python $CURRENT/svn2log.py --users=/tmp/accounts.$PPID --users-charset=UTF8
-+svn log -v --xml $1 | python2 $CURRENT/svn2log.py --users=/tmp/accounts.$PPID --users-charset=UTF8
-
- rm /tmp/accounts.$PPID
---- kdesdk-4.5.80/scripts/kde_generate_export_header~ 2010-11-24 11:48:49.696666669 +0100
-+++ kdesdk-4.5.80/scripts/kde_generate_export_header 2010-11-24 11:48:49.753333338 +0100
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#! /usr/bin/env python2
-
- import os, sys, string
-
---- kdesdk-4.5.80/scripts/reviewboarddiff~ 2010-11-24 11:49:37.686666670 +0100
-+++ kdesdk-4.5.80/scripts/reviewboarddiff 2010-11-24 11:49:37.740000003 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- # encoding: utf-8
- #
- # Generates reviewboard compatible diffs from git-svn repositories.
Copied: kdesdk/repos/extra-x86_64/fix-python2-path.patch (from rev 137485, kdesdk/repos/staging-x86_64/fix-python2-path.patch)
===================================================================
--- extra-x86_64/fix-python2-path.patch (rev 0)
+++ extra-x86_64/fix-python2-path.patch 2011-09-07 17:42:51 UTC (rev 137487)
@@ -0,0 +1,64 @@
+--- kdesdk-4.5.80/kcachegrind/converters/hotshot2calltree~ 2010-11-24 11:53:38.586666671 +0100
++++ kdesdk-4.5.80/kcachegrind/converters/hotshot2calltree 2010-11-24 11:53:38.623333337 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ # _*_ coding: latin1 _*_
+
+ #
+--- 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'
+--- kdesdk-4.5.80/scripts/rename_source_files~ 2010-11-24 11:45:41.040000004 +0100
++++ kdesdk-4.5.80/scripts/rename_source_files 2010-11-24 11:45:41.093333336 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#! /usr/bin/env python2
+ #
+ # Copyright David Faure <faure at kde.org>, License LGPL v2
+ #
+--- kdesdk-4.5.80/scripts/svn2log.sh~ 2010-11-24 11:46:24.863333337 +0100
++++ kdesdk-4.5.80/scripts/svn2log.sh 2010-11-24 11:46:24.896666669 +0100
+@@ -17,6 +17,6 @@
+ svn cat svn://anonsvn.kde.org/home/kde/trunk/kde-common/accounts > /tmp/accounts.$PPID
+
+ echo "Creating changelog...";
+-svn log -v --xml $1 | python $CURRENT/svn2log.py --users=/tmp/accounts.$PPID --users-charset=UTF8
++svn log -v --xml $1 | python2 $CURRENT/svn2log.py --users=/tmp/accounts.$PPID --users-charset=UTF8
+
+ rm /tmp/accounts.$PPID
+--- kdesdk-4.5.80/scripts/kde_generate_export_header~ 2010-11-24 11:48:49.696666669 +0100
++++ kdesdk-4.5.80/scripts/kde_generate_export_header 2010-11-24 11:48:49.753333338 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#! /usr/bin/env python2
+
+ import os, sys, string
+
+--- kdesdk-4.5.80/scripts/reviewboarddiff~ 2010-11-24 11:49:37.686666670 +0100
++++ kdesdk-4.5.80/scripts/reviewboarddiff 2010-11-24 11:49:37.740000003 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ # encoding: utf-8
+ #
+ # Generates reviewboard compatible diffs from git-svn repositories.
Deleted: extra-x86_64/kdesdk-okteta.install
===================================================================
--- extra-x86_64/kdesdk-okteta.install 2011-09-07 17:42:49 UTC (rev 137486)
+++ extra-x86_64/kdesdk-okteta.install 2011-09-07 17:42:51 UTC (rev 137487)
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: kdesdk/repos/extra-x86_64/kdesdk-okteta.install (from rev 137485, kdesdk/repos/staging-x86_64/kdesdk-okteta.install)
===================================================================
--- extra-x86_64/kdesdk-okteta.install (rev 0)
+++ extra-x86_64/kdesdk-okteta.install 2011-09-07 17:42:51 UTC (rev 137487)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: extra-x86_64/kdesdk.install
===================================================================
--- extra-x86_64/kdesdk.install 2011-09-07 17:42:49 UTC (rev 137486)
+++ extra-x86_64/kdesdk.install 2011-09-07 17:42:51 UTC (rev 137487)
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: kdesdk/repos/extra-x86_64/kdesdk.install (from rev 137485, kdesdk/repos/staging-x86_64/kdesdk.install)
===================================================================
--- extra-x86_64/kdesdk.install (rev 0)
+++ extra-x86_64/kdesdk.install 2011-09-07 17:42:51 UTC (rev 137487)
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
More information about the arch-commits
mailing list