[arch-commits] Commit in gdesklets/repos (3 files)

[Eric Bélanger]

    Date: Saturday, December 6, 2008 @ 17:27:59
  Author: eric
Revision: 20798

fixed svn conflict

Added:
  gdesklets/repos/extra-x86_64/no-import-overide.patch
    (from rev 20797, gdesklets/trunk/no-import-overide.patch)
Modified:
  gdesklets/repos/extra-x86_64/	(properties)
  gdesklets/repos/extra-x86_64/PKGBUILD

-------------------------+
 PKGBUILD                |   23 +++++++++++++----------
 no-import-overide.patch |   38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 10 deletions(-)


Property changes on: gdesklets/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /gdesklets/trunk:1
   + /gdesklets/trunk:1-20797

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-12-06 22:25:22 UTC (rev 20797)
+++ extra-x86_64/PKGBUILD	2008-12-06 22:27:59 UTC (rev 20798)
@@ -3,7 +3,7 @@
 # Maintainer: Roman Kyrylych <roman at archlinux.org>
 
 pkgname=gdesklets
-pkgver=0.36.0
+pkgver=0.36.1
 pkgrel=1
 pkgdesc="gDesklets provides an advanced architecture for desktop applets."
 arch=('i686' 'x86_64')
@@ -12,21 +12,24 @@
 depends=('libgtop>=2.14.8-2' 'librsvg>=2.16.0' 'libgnomeui>=2.18.1-2'
          'gnome-python>=2.18.0' 'gconf>=2.18.0.1-4' 'desktop-file-utils')
 makedepends=('perlxml' 'swig')
+options=('!libtool' '!makeflags')
 install=gdesklets.install
-source=(http://gdesklets.de/files/gdesklets-0.36.tar.bz2)
-md5sums=('766727f18f904968b622e7696fc9199b')
-options=('!libtool' '!makeflags')
+source=(http://gdesklets.zencomputer.ca/gDesklets/gDesklets-$pkgver.tar.bz2
+        no-import-overide.patch)
+md5sums=('425625a63280c15d084d92317720d8d5' '9190f9c8406e3c5ad5c0ab2bd95b71ff')
 
 build() {
-  cd $startdir/src/gdesklets-0.36
+  cd $srcdir/gDesklets-$pkgver
+  patch -Np1 -i $srcdir/no-import-overide.patch
+  
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
   make || return 1
 
   make UPDATE_MIME_DATABASE=/bin/true UPDATE_DESKTOP_DATABASE=/bin/true \
-    GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
+    GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=$pkgdir install
 
-  mkdir -p ${startdir}/pkg/usr/share/gconf/schemas
-  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas \
-    ${startdir}/pkg/etc/gconf/schemas/*.schemas
-  rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
+  mkdir -p $pkgdir/usr/share/gconf/schemas
+  gconf-merge-schema $pkgdir/usr/share/gconf/schemas/$pkgname.schemas \
+    $pkgdir/etc/gconf/schemas/*.schemas
+  rm -f $pkgdir/etc/gconf/schemas/*.schemas
 }

Copied: gdesklets/repos/extra-x86_64/no-import-overide.patch (from rev 20797, gdesklets/trunk/no-import-overide.patch)
===================================================================
--- extra-x86_64/no-import-overide.patch	                        (rev 0)
+++ extra-x86_64/no-import-overide.patch	2008-12-06 22:27:59 UTC (rev 20798)
@@ -0,0 +1,38 @@
+diff -Naur gDesklets-0.36.1-old/utils/ErrorFormatter.py gDesklets-0.36.1/utils/ErrorFormatter.py
+--- gDesklets-0.36.1-old/utils/ErrorFormatter.py	2008-03-20 09:00:59.000000000 +1000
++++ gDesklets-0.36.1/utils/ErrorFormatter.py	2008-12-07 03:08:41.000000000 +1000
+@@ -112,20 +112,20 @@
+ # available. Therefore, we have to extend the import handler in order to always
+ # give us an absolute path.
+ #
+-_old_imp = __import__
+-def _new_imp(name, globs = {}, locls = {}, fromlist = []):
+-
+-    module = _old_imp(name, globs, locls, fromlist)
+-    # builtin modules have no "__file__" attribute, so we have to check for it
+-    if (module):
+-        if (hasattr(module, "__file__")):
+-            module.__file__ = os.path.abspath(module.__file__)
+-        return module
+-    else:
+-        return ""
+-
+-import __builtin__
+-__builtin__.__import__ = _new_imp
++#_old_imp = __import__
++#def _new_imp(name, globs = {}, locls = {}, fromlist = []):
++#
++#    module = _old_imp(name, globs, locls, fromlist)
++#    # builtin modules have no "__file__" attribute, so we have to check for it
++#    if (module):
++#        if (hasattr(module, "__file__")):
++#            module.__file__ = os.path.abspath(module.__file__)
++#        return module
++#    else:
++#        return ""
++#
++#import __builtin__
++#__builtin__.__import__ = _new_imp
+ 
+ 
+