Attachment 164562 Details for Bug 205550 – Update patch

[patch] Update patch

zathura.diff (text/plain), 3.32 KB, created by Guido Falsi on 2015-12-23 19:56:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guido Falsi

Created: 2015-12-23 19:56:33 UTC

Size: 3.32 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 404305)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	zathura
>-PORTVERSION=	0.3.3
>+PORTVERSION=	0.3.4
> CATEGORIES=	graphics print
> MASTER_SITES=	http://pwmt.org/projects/zathura/download/
> 
>@@ -19,7 +19,7 @@
> BUILD_DEPENDS+=	rst2html:${PORTSDIR}/textproc/py-docutils
> 
> USE_GNOME=	glib20 gtk30
>-USES=		gmake pkgconfig
>+USES=		compiler:c11 gmake pkgconfig
> MAKE_ENV=	SFLAGS="${STRIP}" \
> 		RSTTOMAN=${LOCALBASE}/bin/rst2man \
> 		ZLIB_INC= \
>@@ -33,8 +33,6 @@
> SQLITE_MAKE_ENV_OFF=	WITH_SQLITE=0
> NLS_USES=		gettext
> 
>-.include <bsd.port.options.mk>
>-
> post-patch:	.SILENT
> 	${REINPLACE_CMD} -e 's|man[15]|man/&|g' \
> 		-e 's|$${LIBDIR}/pkgconfig|${PREFIX}/libdata/pkgconfig|g'\
>@@ -43,10 +41,6 @@
> 		${WRKSRC}/config.mk
> 	${REINPLACE_CMD} -e '/^CC  /d'\
> 		${WRKSRC}/colors.mk
>-.if ! ${PORT_OPTIONS:MNLS}
>-	${REINPLACE_CMD} -e '/-C po/d'\
>-		${WRKSRC}/Makefile
>-.endif
> 	${REINPLACE_CMD} -e 's|/usr/include|${LOCALBASE}/include|' \
> 		-e 's/-lc//' \
> 		-e 's/DL_LIB /#&/' \
>@@ -56,4 +50,8 @@
> 		${WRKSRC}/doc/man/zathurarc.5.rst
> 	(cd ${WRKSRC}; ${RM} -f zathura.1 zathurarc.5)
> 
>+post-patch-NLS-off: .SILENT
>+	${REINPLACE_CMD} -e '/-C po/d'\
>+		${WRKSRC}/Makefile
>+
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 404305)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (zathura-0.3.3.tar.gz) = 3347decfc8d4b918a6bca1d44657c3b97d4afcea3c8c1f162c57198b13e8dce7
>-SIZE (zathura-0.3.3.tar.gz) = 203604
>+SHA256 (zathura-0.3.4.tar.gz) = 52c4a3efc5843ce7c720ea7357667699363c809fd34ada4cb350d0e1031d0234
>+SIZE (zathura-0.3.4.tar.gz) = 167584
>Index: files/patch-zathura_main.c
>===================================================================
>--- files/patch-zathura_main.c	(nonexistent)
>+++ files/patch-zathura_main.c	(working copy)
>@@ -0,0 +1,36 @@
>+--- zathura/main.c.orig	2015-12-21 10:19:18 UTC
>++++ zathura/main.c
>+@@ -85,10 +85,13 @@ run_synctex_forward(const char* synctex_
>+ static zathura_t*
>+ init_zathura(const char* config_dir, const char* data_dir,
>+     const char* cache_dir, const char* plugin_path, char** argv,
>++#ifdef WITH_SYNCTEX
>++    char* synctex_editor,
>++#endif
>+ #ifdef GDK_WINDOWING_X11
>+-    char* synctex_editor, Window embed)
>++    Window embed)
>+ #else
>+-    char* synctex_editor)
>++    )
>+ #endif
>+ {
>+   /* create zathura session */
>+@@ -249,11 +252,14 @@ main(int argc, char* argv[])
>+   gtk_init(&argc, &argv);
>+ 
>+   /* Create zathura session */
>+-  zathura_t* zathura = init_zathura(config_dir, data_dir, cache_dir,
>++  zathura_t* zathura = init_zathura(config_dir, data_dir, cache_dir, plugin_path, argv,
>++#ifdef WITH_SYNCTEX
>++      synctex_editor,
>++#endif
>+ #ifdef GDK_WINDOWING_X11
>+-      plugin_path, argv, synctex_editor, embed);
>++      embed);
>+ #else
>+-      plugin_path, argv, synctex_editor);
>++      );
>+ #endif
>+   if (zathura == NULL) {
>+     girara_error("Could not initialize zathura.");
>
>Property changes on: files/patch-zathura_main.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

Flags:

madpilot: maintainer-approval? (quentin.stievenart)

Actions: View | Diff

Attachments on bug 205550: 164562 | 164710 | 164711