Attachment #131433 for bug #175513




# $FreeBSD$

PORTNAME=	zathura
PORTVERSION=	0.2.2
PORTREVISION=	1
CATEGORIES=	graphics print
MASTER_SITES=	http://pwmt.org/projects/zathura/download/


COMMENT=	Customizable lightweight pdf viewer

LIB_DEPENDS=	cairo:${PORTSDIR}/graphics/cairo \
		girara-gtk2:${PORTSDIR}/x11-toolkits/girara

USE_GNOME=	glib20 gtk20
USE_GMAKE=	yes
MAKE_ENV=	SFLAGS="${STRIP}"
FETCH_ARGS=	-Fpr

OPTIONS_DEFINE=	DOCS NLS SQLITE

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MSQLITE}
LIB_DEPENDS+=	sqlite3:${PORTSDIR}/databases/sqlite3
MAKE_ENV+=	WITH_SQLITE=1
.else
MAKE_ENV+=	WITH_SQLITE=0
.endif

.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 ${PORT_OPTIONS:MNLS}
USE_GETTEXT=	yes
PLIST_SUB+=	NLS=""
.else

		${WRKSRC}/Makefile
	${REINPLACE_CMD} -e 's|PLUGINDIR ?= .*$$|PLUGINDIR ?= ${PREFIX}/lib/zathura|'\
		${WRKSRC}/config.mk
.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 ! ${PORT_OPTIONS:MNLS}
	${REINPLACE_CMD} -e '/-C po/d'\
		${WRKSRC}/Makefile
.endif

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (zathura-0.2.1.tar.gz) = 075b9def201c77ca738dc9e15b252bc23c085b7c4671a1810d1d962e8d0bd790	1	SHA256 (zathura-0.2.2.tar.gz) = 6506237ba76ce1611dc24ddd870853d753b5e70e5200d75d2a2257ff7c9242c9
2	SIZE (zathura-0.2.1.tar.gz) = 95179	2	SIZE (zathura-0.2.2.tar.gz) = 108240




--- 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);
 }

Return to bug 175513

Lines 2-9 Link Here

(-)Makefile (-10 / +8 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= zathura	4	PORTNAME= zathura
5	PORTVERSION= 0.2.1	5	PORTVERSION= 0.2.2
6	PORTREVISION= 1
7	CATEGORIES= graphics print	6	CATEGORIES= graphics print
8	MASTER_SITES= http://pwmt.org/projects/zathura/download/	7	MASTER_SITES= http://pwmt.org/projects/zathura/download/
9		8
Lines 11-42 Link Here
11	COMMENT= Customizable lightweight pdf viewer	10	COMMENT= Customizable lightweight pdf viewer
12		11
13	LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo \	12	LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo \
14	girara-gtk2.1:${PORTSDIR}/x11-toolkits/girara	13	girara-gtk2:${PORTSDIR}/x11-toolkits/girara
15		14
16	USE_GNOME= glib20 gtk20	15	USE_GNOME= glib20 gtk20
17	USE_GMAKE= yes	16	USE_GMAKE= yes
18	MAKE_ENV= SFLAGS="${STRIP}"	17	MAKE_ENV= SFLAGS="${STRIP}"
19	FETCH_ARGS= -Fpr
20		18
21	OPTIONS= SQLITE "Support sqlite database backend" off	19	OPTIONS_DEFINE= DOCS NLS SQLITE
22		20
23	.include <bsd.port.options.mk>	21	.include <bsd.port.options.mk>
24		22
25	.if !defined(WITHOUT_SQLITE)	23	.if ${PORT_OPTIONS:MSQLITE}
26	LIB_DEPENDS+= sqlite3:${PORTSDIR}/databases/sqlite3	24	LIB_DEPENDS+= sqlite3:${PORTSDIR}/databases/sqlite3
27	MAKE_ENV+= WITH_SQLITE=1	25	MAKE_ENV+= WITH_SQLITE=1
28	.else	26	.else
29	MAKE_ENV+= WITH_SQLITE=0	27	MAKE_ENV+= WITH_SQLITE=0
30	.endif	28	.endif
31		29
32	.if !defined(NOPORTDOCS)	30	.if ${PORT_OPTIONS:MDOCS}
33	BUILD_DEPENDS+= rst2html:${PORTSDIR}/textproc/py-docutils	31	BUILD_DEPENDS+= rst2html:${PORTSDIR}/textproc/py-docutils
34	MAN1+= zathura.1	32	MAN1+= zathura.1
35	MAN5+= zathurarc.5	33	MAN5+= zathurarc.5
36	MAKE_ENV+= RSTTOMAN=${LOCALBASE}/bin/rst2man	34	MAKE_ENV+= RSTTOMAN=${LOCALBASE}/bin/rst2man
37	.endif	35	.endif
38		36
39	.if !defined(WITHOUT_NLS)	37	.if ${PORT_OPTIONS:MNLS}
40	USE_GETTEXT= yes	38	USE_GETTEXT= yes
41	PLIST_SUB+= NLS=""	39	PLIST_SUB+= NLS=""
42	.else	40	.else
Lines 49-61 Link Here
49	${WRKSRC}/Makefile	47	${WRKSRC}/Makefile
50	${REINPLACE_CMD} -e 's\|PLUGINDIR ?= .*$$\|PLUGINDIR ?= ${PREFIX}/lib/zathura\|'\	48	${REINPLACE_CMD} -e 's\|PLUGINDIR ?= .*$$\|PLUGINDIR ?= ${PREFIX}/lib/zathura\|'\
51	${WRKSRC}/config.mk	49	${WRKSRC}/config.mk
52	.if defined(NOPORTDOCS)	50	.if ! ${PORT_OPTIONS:MDOCS}
53	${REINPLACE_CMD} -e 's\|install-manpages$$\|\|'\	51	${REINPLACE_CMD} -e 's\|install-manpages$$\|\|'\
54	${WRKSRC}/Makefile	52	${WRKSRC}/Makefile
55	${REINPLACE_CMD} -e 's\|RSTTOMAN ?= /usr/bin/rst2man\|RSTTOMAN ?= ""\|'\	53	${REINPLACE_CMD} -e 's\|RSTTOMAN ?= /usr/bin/rst2man\|RSTTOMAN ?= ""\|'\
56	${WRKSRC}/config.mk	54	${WRKSRC}/config.mk
57	.endif	55	.endif
58	.if defined(WITHOUT_NLS)	56	.if ! ${PORT_OPTIONS:MNLS}
59	${REINPLACE_CMD} -e '/-C po/d'\	57	${REINPLACE_CMD} -e '/-C po/d'\
60	${WRKSRC}/Makefile	58	${WRKSRC}/Makefile
61	.endif	59	.endif

Line 0 Link Here

(-)files/patch-render.c (+36 lines)
	1	--- render.c.orig 2013-01-22 17:23:39.000000000 +0100
	2	+++ render.c 2013-01-22 17:23:03.000000000 +0100
	3	@@ -19,7 +19,7 @@
	4
	5	struct render_thread_s {
	6	GThreadPool* pool; /*< Pool of threads /
	7	- GMutex mutex; /*< Render lock /
	8	+ GStaticMutex mutex; /*< Render lock /
	9	bool about_to_close; /*< Render thread is to be freed /
	10	};
	11
	12	@@ -51,7 +51,7 @@
	13
	14	render_thread->about_to_close = false;
	15	g_thread_pool_set_sort_function(render_thread->pool, render_thread_sort, zathura);
	16	- g_mutex_init(&render_thread->mutex);
	17	+ g_static_mutex_init(&render_thread->mutex);
	18
	19	return render_thread;
	20
	21	@@ -328,7 +328,7 @@
	22	return;
	23	}
	24
	25	- g_mutex_lock(&render_thread->mutex);
	26	+ g_static_mutex_lock(&render_thread->mutex);
	27	}
	28
	29	void
	30	@@ -338,5 +338,5 @@
	31	return;
	32	}
	33
	34	- g_mutex_unlock(&render_thread->mutex);
	35	+ g_static_mutex_unlock(&render_thread->mutex);
	36	}