[arch-commits] Commit in mirage/trunk (2 files)

[Evangelos Foutras]

    Date: Thursday, October 9, 2014 @ 18:53:47
  Author: foutrelis
Revision: 224154

upgpkg: mirage 0.9.5.2-3

- Update url and download link to point to SourceForge (FS#41242)
- Add patch from Fedora to fix crash with glib >= 2.41 (FS#42189)

Added:
  mirage/trunk/mirage-0.9.5.2-glib241-init-workaround.patch
Modified:
  mirage/trunk/PKGBUILD

----------------------------------------------+
 PKGBUILD                                     |   18 ++++++++++++++----
 mirage-0.9.5.2-glib241-init-workaround.patch |   13 +++++++++++++
 2 files changed, 27 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-10-09 15:55:03 UTC (rev 224153)
+++ PKGBUILD	2014-10-09 16:53:47 UTC (rev 224154)
@@ -4,16 +4,26 @@
 # Contributor: Scott Horowitz <stonecrest at gmail.com>
 pkgname=mirage
 pkgver=0.9.5.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A simple GTK+ Image Viewer"
-url="http://mirageiv.berlios.de"
+url="https://sourceforge.net/projects/mirageiv.berlios/"
 license=("GPL")
 depends=('pygtk' 'desktop-file-utils')
 arch=('i686' 'x86_64')
-md5sums=('92191a4496b0a50486ed7299baf6729f')
-source=("http://pkgs.fedoraproject.org/repo/pkgs/mirage/mirage-$pkgver.tar.bz2/$md5sums/mirage-$pkgver.tar.bz2")
+md5sums=('92191a4496b0a50486ed7299baf6729f'
+         '1315594c262c23079e46d0b6a9896bfd')
+source=(http://downloads.sourceforge.net/project/mirageiv.berlios/${pkgname}-${pkgver}.tar.bz2
+        mirage-0.9.5.2-glib241-init-workaround.patch)
 install=$pkgname.install
 
+prepare() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+
+    # Don't call gtk.gdk.threads_init() on GLib >= 2.41 (patch from Fedora)
+    # https://bugs.archlinux.org/task/42189
+    patch -Np1 -i ../mirage-0.9.5.2-glib241-init-workaround.patch
+}
+
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
     python2 setup.py build

Added: mirage-0.9.5.2-glib241-init-workaround.patch
===================================================================
--- mirage-0.9.5.2-glib241-init-workaround.patch	                        (rev 0)
+++ mirage-0.9.5.2-glib241-init-workaround.patch	2014-10-09 16:53:47 UTC (rev 224154)
@@ -0,0 +1,13 @@
+--- mirage-0.9.5.2/mirage.py.glib241	2014-08-12 17:55:57.000000000 +0900
++++ mirage-0.9.5.2/mirage.py	2014-08-12 17:52:18.000000000 +0900
+@@ -71,7 +71,9 @@
+ 
+ 	def __init__(self):
+ 		
+-		gtk.gdk.threads_init()
++		import glib
++		if glib.glib_version < (2, 41, 0):
++			gtk.gdk.threads_init()
+ 		
+ 		# FIX THIS! Does not work on windows and what happens if mo-files exists
+ 		# in both dirs?