Index: head/graphics/mirage/Makefile =================================================================== --- head/graphics/mirage/Makefile (revision 401902) +++ head/graphics/mirage/Makefile (revision 401903) @@ -1,37 +1,37 @@ # Created by: Andrew Pantyukhin # $FreeBSD$ PORTNAME= mirage PORTVERSION= 0.9.5.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}iv MAINTAINER= pawel@FreeBSD.org COMMENT= Fast and simple image viewer LICENSE= GPLv3 USES= desktop-file-utils gettext python tar:bzip2 USE_GNOME= gtk20 pygtk2 USE_PYTHON= distutils PYDISTUTILS_PKGNAME= Mirage PORTDOCS= CHANGELOG README TODO TRANSLATORS PORT_VERBS= ${PORTNAME} imgfuncs OPTIONS_DEFINE= DOCS GNOME GNOME_USE= GNOME=pygnome2 post-patch: @${REINPLACE_CMD} -e \ 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/setup.py post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} (cd ${STAGEDIR}${PYTHON_SITELIBDIR} && ${STRIP_CMD} \ imgfuncs.so xmouse.so) .include Index: head/graphics/mirage/files/patch-setyp.py =================================================================== --- head/graphics/mirage/files/patch-setyp.py (revision 401902) +++ head/graphics/mirage/files/patch-setyp.py (nonexistent) @@ -1,14 +0,0 @@ ---- setup.py.orig 2008-03-27 13:05:28.000000000 +0900 -+++ setup.py 2009-07-24 05:13:46.000000000 +0900 -@@ -56,9 +56,9 @@ - ], - py_modules = ['mirage'], - ext_modules = [Extension(name='imgfuncs', sources=['imgfuncs.c']), -- Extension(name='xmouse', sources=['xmouse.c'], libraries=['X11'])], -+ Extension(name='xmouse', sources=['xmouse.c'], include_dirs=['%%LOCALBASE%%/include'], library_dirs=['%%LOCALBASE%%/lib'], libraries=['X11'])], - scripts = ['mirage'], -- data_files=[('share/mirage', ['README', 'COPYING', 'CHANGELOG', 'TODO', 'TRANSLATORS', 'stock_shuffle.png', 'stock_leave-fullscreen.png', 'stock_fullscreen.png', 'mirage_blank.png']), -+ data_files=[('share/mirage', ['stock_shuffle.png', 'stock_leave-fullscreen.png', 'stock_fullscreen.png', 'mirage_blank.png']), - ('share/applications', ['mirage.desktop']), - ('share/pixmaps', ['mirage.png']), - ('share/locale/ru/LC_MESSAGES', ['mo/ru/mirage.mo']), Property changes on: head/graphics/mirage/files/patch-setyp.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/mirage/files/patch-mirage.py =================================================================== --- head/graphics/mirage/files/patch-mirage.py (revision 401902) +++ head/graphics/mirage/files/patch-mirage.py (revision 401903) @@ -1,31 +1,31 @@ ---- 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 @@ +--- mirage.py.orig 2011-02-13 22:40:05 UTC ++++ mirage.py +@@ -71,7 +71,7 @@ class Base: 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 @@ +@@ -841,9 +841,7 @@ class Base: 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 thumbpane_create_dir(self): if not os.path.exists(os.path.expanduser('~/.thumbnails/')): -@@ -4579,6 +4577,6 @@ +@@ -4579,6 +4577,6 @@ class Base: if __name__ == "__main__": base = Base() - gtk.gdk.threads_enter() + #gtk.gdk.threads_enter() base.main() - gtk.gdk.threads_leave() + #gtk.gdk.threads_leave() Index: head/graphics/mirage/files/patch-setup.py =================================================================== --- head/graphics/mirage/files/patch-setup.py (nonexistent) +++ head/graphics/mirage/files/patch-setup.py (revision 401903) @@ -0,0 +1,14 @@ +--- setup.py.orig 2011-02-13 22:40:05 UTC ++++ setup.py +@@ -58,9 +58,9 @@ setup(name='Mirage', + ], + py_modules = ['mirage'], + ext_modules = [Extension(name='imgfuncs', sources=['imgfuncs.c']), +- Extension(name='xmouse', sources=['xmouse.c'], libraries=['X11'])], ++ Extension(name='xmouse', sources=['xmouse.c'], include_dirs=['%%LOCALBASE%%/include'], library_dirs=['%%LOCALBASE%%/lib'], libraries=['X11'])], + scripts = ['mirage'], +- data_files=[('share/mirage', ['README', 'COPYING', 'CHANGELOG', 'TODO', 'TRANSLATORS', 'stock_shuffle.png', 'stock_leave-fullscreen.png', 'stock_fullscreen.png', 'mirage_blank.png']), ++ data_files=[('share/mirage', ['stock_shuffle.png', 'stock_leave-fullscreen.png', 'stock_fullscreen.png', 'mirage_blank.png']), + ('share/applications', ['mirage.desktop']), + ('share/pixmaps', ['mirage.png']), + ('share/locale/ru/LC_MESSAGES', ['mo/ru/mirage.mo']), Property changes on: head/graphics/mirage/files/patch-setup.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/mirage/files/patch-xmouse.c =================================================================== --- head/graphics/mirage/files/patch-xmouse.c (nonexistent) +++ head/graphics/mirage/files/patch-xmouse.c (revision 401903) @@ -0,0 +1,12 @@ +--- xmouse.c.orig 2007-11-27 14:26:18 UTC ++++ xmouse.c +@@ -37,7 +37,8 @@ PyObject* xmouse_geometry(PyObject* self + + PyMethodDef methods[] = + { +- {"geometry", xmouse_geometry, METH_VARARGS}, ++ {"geometry", xmouse_geometry, METH_VARARGS, NULL}, ++ {NULL, NULL, 0, NULL} + }; + + void initxmouse(void) Property changes on: head/graphics/mirage/files/patch-xmouse.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property