[arch-commits] Commit in kdesdk/trunk (3 files)

[Andrea Scarpino]

    Date: Thursday, January 27, 2011 @ 08:34:30
  Author: andrea
Revision: 107901

add missing patch and missing okteta.install

Added:
  kdesdk/trunk/fix-python2-path.patch
  kdesdk/trunk/kdesdk-okteta.install
Modified:
  kdesdk/trunk/PKGBUILD

------------------------+
 PKGBUILD               |    6 ++--
 fix-python2-path.patch |   64 +++++++++++++++++++++++++++++++++++++++++++++++
 kdesdk-okteta.install  |   12 ++++++++
 3 files changed, 80 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2011-01-27 13:31:57 UTC (rev 107900)
+++ PKGBUILD    2011-01-27 13:34:30 UTC (rev 107901)
@@ -31,8 +31,10 @@
 groups=('kde' 'kdesdk')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdepim-runtime' 
'subversion'
         'docbook-xsl' 'antlr2' 'kdebase-konqueror')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2";)
-sha1sums=('af8d67b1823f72b759ac604a1be15d8ec91b2b2c')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2";
+        'fix-python2-path.patch')
+sha1sums=('af8d67b1823f72b759ac604a1be15d8ec91b2b2c'
+        'd05ca0231869c484fd3861955d960a60aff7dcfb')
 
 build() {
        cd ${srcdir}/${pkgbase}-${pkgver}

Added: fix-python2-path.patch
===================================================================
--- fix-python2-path.patch                              (rev 0)
+++ fix-python2-path.patch      2011-01-27 13:34:30 UTC (rev 107901)
@@ -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 <fa...@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.

Added: kdesdk-okteta.install
===================================================================
--- kdesdk-okteta.install                               (rev 0)
+++ kdesdk-okteta.install       2011-01-27 13:34:30 UTC (rev 107901)
@@ -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
+}