Attachment 131433 Details for Bug 175513 – zathura.diff

[patch] zathura.diff

zathura.diff (text/plain; charset=us-ascii), 3.20 KB, created by Guido Falsi on 2013-01-22 20:37:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guido Falsi

Created: 2013-01-22 20:37:32 UTC

Size: 3.20 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 310835)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	zathura
>-PORTVERSION=	0.2.1
>-PORTREVISION=	1
>+PORTVERSION=	0.2.2
> CATEGORIES=	graphics print
> MASTER_SITES=	http://pwmt.org/projects/zathura/download/
> 
>@@ -11,32 +10,31 @@
> COMMENT=	Customizable lightweight pdf viewer
> 
> LIB_DEPENDS=	cairo:${PORTSDIR}/graphics/cairo \
>-		girara-gtk2.1:${PORTSDIR}/x11-toolkits/girara
>+		girara-gtk2:${PORTSDIR}/x11-toolkits/girara
> 
> USE_GNOME=	glib20 gtk20
> USE_GMAKE=	yes
> MAKE_ENV=	SFLAGS="${STRIP}"
>-FETCH_ARGS=	-Fpr
> 
>-OPTIONS=	SQLITE "Support sqlite database backend" off
>+OPTIONS_DEFINE=	DOCS NLS SQLITE
> 
> .include <bsd.port.options.mk>
> 
>-.if !defined(WITHOUT_SQLITE)
>+.if ${PORT_OPTIONS:MSQLITE}
> LIB_DEPENDS+=	sqlite3:${PORTSDIR}/databases/sqlite3
> MAKE_ENV+=	WITH_SQLITE=1
> .else
> MAKE_ENV+=	WITH_SQLITE=0
> .endif
> 
>-.if !defined(NOPORTDOCS)
>+.if ${PORT_OPTIONS:MDOCS}
> BUILD_DEPENDS+=	rst2html:${PORTSDIR}/textproc/py-docutils
> MAN1+=		zathura.1
> MAN5+=		zathurarc.5
> MAKE_ENV+=	RSTTOMAN=${LOCALBASE}/bin/rst2man
> .endif
> 
>-.if !defined(WITHOUT_NLS)
>+.if ${PORT_OPTIONS:MNLS}
> USE_GETTEXT=	yes
> PLIST_SUB+=	NLS=""
> .else
>@@ -49,13 +47,13 @@
> 		${WRKSRC}/Makefile
> 	${REINPLACE_CMD} -e 's|PLUGINDIR ?= .*$$|PLUGINDIR ?= ${PREFIX}/lib/zathura|'\
> 		${WRKSRC}/config.mk
>-.if defined(NOPORTDOCS)
>+.if ! ${PORT_OPTIONS:MDOCS}
> 	${REINPLACE_CMD} -e 's|install-manpages$$||'\
> 		${WRKSRC}/Makefile
> 	${REINPLACE_CMD} -e 's|RSTTOMAN ?= /usr/bin/rst2man|RSTTOMAN ?= ""|'\
> 		${WRKSRC}/config.mk
> .endif
>-.if defined(WITHOUT_NLS)
>+.if ! ${PORT_OPTIONS:MNLS}
> 	${REINPLACE_CMD} -e '/-C po/d'\
> 		${WRKSRC}/Makefile
> .endif
>Index: distinfo
>===================================================================
>--- distinfo	(revision 310835)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (zathura-0.2.1.tar.gz) = 075b9def201c77ca738dc9e15b252bc23c085b7c4671a1810d1d962e8d0bd790
>-SIZE (zathura-0.2.1.tar.gz) = 95179
>+SHA256 (zathura-0.2.2.tar.gz) = 6506237ba76ce1611dc24ddd870853d753b5e70e5200d75d2a2257ff7c9242c9
>+SIZE (zathura-0.2.2.tar.gz) = 108240
>Index: files/patch-render.c
>===================================================================
>--- files/patch-render.c	(revision 0)
>+++ files/patch-render.c	(working copy)
>@@ -0,0 +1,36 @@
>+--- render.c.orig	2013-01-22 17:23:39.000000000 +0100
>++++ render.c	2013-01-22 17:23:03.000000000 +0100
>+@@ -19,7 +19,7 @@
>+ 
>+ struct render_thread_s {
>+   GThreadPool* pool; /**< Pool of threads */
>+-  GMutex mutex; /**< Render lock */
>++  GStaticMutex mutex; /**< Render lock */
>+   bool about_to_close; /**< Render thread is to be freed */
>+ };
>+ 
>+@@ -51,7 +51,7 @@
>+ 
>+   render_thread->about_to_close = false;
>+   g_thread_pool_set_sort_function(render_thread->pool, render_thread_sort, zathura);
>+-  g_mutex_init(&render_thread->mutex);
>++  g_static_mutex_init(&render_thread->mutex);
>+ 
>+   return render_thread;
>+ 
>+@@ -328,7 +328,7 @@
>+     return;
>+   }
>+ 
>+-  g_mutex_lock(&render_thread->mutex);
>++  g_static_mutex_lock(&render_thread->mutex);
>+ }
>+ 
>+ void
>+@@ -338,5 +338,5 @@
>+     return;
>+   }
>+ 
>+-  g_mutex_unlock(&render_thread->mutex);
>++  g_static_mutex_unlock(&render_thread->mutex);
>+ }

Actions: View | Diff

Attachments on bug 175513: 131432 | 131433 | 131434