svn commit: r318781 - in head/graphics/mirage: . files

[Pawel Pekala]

Author: pawel
Date: Wed May 22 17:42:46 2013
New Revision: 318781
URL: http://svnweb.freebsd.org/changeset/ports/318781

Log:
  - Disable threading, this should fix crashers on startup
    caused by glib's pthread FreeBSD problems reported in ports/177795
  - Convert GNOME support detection to option

Modified:
  head/graphics/mirage/Makefile
  head/graphics/mirage/files/patch-mirage.py

Modified: head/graphics/mirage/Makefile
==============================================================================
--- head/graphics/mirage/Makefile	Wed May 22 16:10:39 2013	(r318780)
+++ head/graphics/mirage/Makefile	Wed May 22 17:42:46 2013	(r318781)
@@ -3,7 +3,7 @@
 
 PORTNAME=	mirage
 PORTVERSION=	0.9.5.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	BERLIOS/mirageiv
 
@@ -14,7 +14,6 @@ LICENSE=	GPLv3
 
 USE_BZIP2=	yes
 USE_GNOME=	gtk20 pygtk2
-WANT_GNOME=	yes
 USES=		gettext
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
@@ -22,9 +21,11 @@ PYDISTUTILS_PKGNAME=	Mirage
 
 PORT_VERBS=	${PORTNAME} imgfuncs
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DOCS GNOME
 
-.if ${HAVE_GNOME:Mpygnome2}!=""
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MGNOME}
 USE_GNOME+=	pygnome2
 .endif
 
@@ -40,4 +41,4 @@ post-install:
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/graphics/mirage/files/patch-mirage.py
==============================================================================
--- head/graphics/mirage/files/patch-mirage.py	Wed May 22 16:10:39 2013	(r318780)
+++ head/graphics/mirage/files/patch-mirage.py	Wed May 22 17:42:46 2013	(r318781)
@@ -1,20 +1,31 @@
---- mirage.py.orig	2013-04-10 19:04:47.000000000 +0200
-+++ mirage.py	2013-04-10 19:05:50.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/python2
- # $HeadURL: http://svn.berlios.de/svnroot/repos/mirageiv/branches/mirage-0.9.x/mirage.py $
- # $Id: mirage.py 337 2011-02-13 22:40:05Z fredricj $
+--- mirage.py.orig	2011-02-13 23:40:05.000000000 +0100
++++ mirage.py	2013-05-22 17:56:33.000000000 +0200
+@@ -71,7 +71,7 @@
  
-@@ -4575,10 +4576,10 @@
- 				timer_screensaver = gobject.timeout_add(1000, self.disable_screensaver_in_slideshow_mode)
+ 	def __init__(self):
+ 		
+-		gtk.gdk.threads_init()
++		#gtk.gdk.threads_init()
+ 		
+ 		# FIX THIS! Does not work on windows and what happens if mo-files exists
+ 		# in both dirs?
+@@ -841,9 +841,7 @@
+ 			self.thumbpane_bottom_coord_loaded = bottom_coord
+ 		# update images:
+ 		if not self.thumbpane_updating:
+-			thread = threading.Thread(target=self.thumbpane_update_pending_images, args=(force_upto_imgnum, None))
+-			thread.setDaemon(True)
+-			thread.start()
++			self.thumbpane_update_pending_images(force_upto_imgnum, None)
  
- 	def main(self):
-+		gtk.gdk.threads_enter()
- 		gtk.main()
-+		gtk.gdk.threads_leave()
+ 	def thumbpane_create_dir(self):
+ 		if not os.path.exists(os.path.expanduser('~/.thumbnails/')):
+@@ -4579,6 +4577,6 @@
  
  if __name__ == "__main__":
  	base = Base()
 -	gtk.gdk.threads_enter()
++	#gtk.gdk.threads_enter()
  	base.main()
 -	gtk.gdk.threads_leave()
++	#gtk.gdk.threads_leave()