[arch-commits] Commit in gramps/trunk (PKGBUILD block-changed.patch gramps.install)

[Sergej Pupykin]

    Date: Friday, July 5, 2013 @ 17:03:21
  Author: spupykin
Revision: 93552

upgpkg: gramps 2:4.0.1-1

upd

Added:
  gramps/trunk/block-changed.patch
Modified:
  gramps/trunk/PKGBUILD
  gramps/trunk/gramps.install

---------------------+
 PKGBUILD            |   26 +++++++++++++++-----------
 block-changed.patch |   42 ++++++++++++++++++++++++++++++++++++++++++
 gramps.install      |    6 +++---
 3 files changed, 60 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-07-05 14:14:34 UTC (rev 93551)
+++ PKGBUILD	2013-07-05 15:03:21 UTC (rev 93552)
@@ -5,16 +5,16 @@
 # Contributor: György Balló <ballogy at freestart.hu>
 
 pkgname=gramps
-epoch=1
-pkgver=3.4.5
+pkgver=4.0.1
 pkgrel=1
+epoch=2
 pkgdesc="A genealogy program, which helps you track your family tree"
 arch=('any')
 url="http://gramps-project.org/"
 license=('GPL')
 depends=('pygtk' 'librsvg' 'desktop-file-utils' 'shared-mime-info'
 	 'gnome-icon-theme' 'xdg-utils' 'python2-bsddb')
-makedepends=('intltool')
+makedepends=('intltool' 'python2-distribute')
 optdepends=('python2-gnomevfs: mime functions support'
             'python2-gtkspell: spellchecking support'
             'pywebkitgtk: html rendering support'
@@ -23,19 +23,23 @@
 #            'python-osmgpsmap: openstreetmap support'
 #            'pyexiv2: exif support'
 install=$pkgname.install
-source=(http://downloads.sourceforge.net/project/gramps/Stable/$pkgver/gramps-$pkgver.tar.gz)
-md5sums=('db576b40dcef5bc45390c45aa4d40367')
+source=(http://downloads.sourceforge.net/project/gramps/Stable/$pkgver/gramps-$pkgver.tar.gz
+	block-changed.patch)
+md5sums=('078ae6f9138570447081b64f8ae8a701'
+         'b2443587e08c4951f00e9401d47e1ccc')
 
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -p0 <$srcdir/block-changed.patch
+}
+
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  sed -i "s|register('preferences.use-bsddb3', False)|register('preferences.use-bsddb3', True)|" src/config.py
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-mime-install \
-              PYTHON=python2
-  make
+  python2 setup.py build
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
+  python2 setup.py install --root=$pkgdir
+  echo -n '/usr/share' >$pkgdir/usr/lib/python2.7/site-packages/gramps/gen/utils/resource-path
 }

Added: block-changed.patch
===================================================================
--- block-changed.patch	                        (rev 0)
+++ block-changed.patch	2013-07-05 15:03:21 UTC (rev 93552)
@@ -0,0 +1,42 @@
+Index: gramps/gui/widgets/validatedmaskedentry.py
+===================================================================
+--- gramps/gui/widgets/validatedmaskedentry.py	(revision 22628)
++++ gramps/gui/widgets/validatedmaskedentry.py	(revision 22630)
+@@ -235,6 +235,7 @@
+     __gtype_name__ = 'MaskedEntry'
+ 
+     def __init__(self):
++        self._block_changed = False
+         UndoableEntry.__init__(self)
+ 
+         # connect in UndoableEntry:
+@@ -253,7 +254,6 @@
+ 
+         self._completion = None
+         self._exact_completion = False
+-        self._block_changed = False
+         self.hasicon = False
+ ##        self._icon = IconEntry(self)
+ 
+@@ -1157,10 +1157,10 @@
+         self.data_type = None
+         self.mandatory = False
+         self.error_icon = error_icon
++        self._block_changed = False
+ 
+         MaskedEntry.__init__(self)
+         
+-        self._block_changed = False
+         self._valid = True
+         self._def_error_msg = None
+         self._fade = FadeOut(self, err_color)
+@@ -1171,7 +1171,8 @@
+ 
+     # Virtual methods
+     def do_changed(self):
+-        if self._block_changed:
++        block_changed = getattr(self, '_block_changed', True)
++        if block_changed:
+             self.emit_stop_by_name('changed')
+             return
+         self.emit('content-changed')

Modified: gramps.install
===================================================================
--- gramps.install	2013-07-05 14:14:34 UTC (rev 93551)
+++ gramps.install	2013-07-05 15:03:21 UTC (rev 93552)
@@ -1,7 +1,7 @@
 post_install() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime
-  xdg-icon-resource forceupdate --theme gnome
+  update-desktop-database -q &>/dev/null &
+  update-mime-database usr/share/mime &>/dev/null &
+  xdg-icon-resource forceupdate --theme gnome &>/dev/null &
 }
 
 post_upgrade() {