Bug 170793 - [patch] graphics/zathura-pdf-poppler update to 0.2.0
Summary: [patch] graphics/zathura-pdf-poppler update to 0.2.0
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Guido Falsi
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-08-20 21:40 UTC by quentin.stievenart
Modified: 2012-09-14 17:10 UTC (History)
0 users

See Also:


Attachments
file.diff (2.37 KB, patch)
2012-08-20 21:40 UTC, quentin.stievenart
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description quentin.stievenart 2012-08-20 21:40:13 UTC
Patch is attached. This update needs to be done once graphics/zathura has been updated to 0.2.0 (the PR has been submitted just now)

Fix: Patch attached with submission follows:
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2012-08-20 21:40:37 UTC
Class Changed
From-To: maintainer-update->change-request

Fix category (submitter is not maintainer) (via the GNATS Auto Assign 
Tool)
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2012-08-20 21:40:39 UTC
Maintainer of graphics/zathura-pdf-poppler,

Please note that PR ports/170793 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/170793

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 3 Edwin Groothuis freebsd_committer freebsd_triage 2012-08-20 21:40:41 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 4 Guido Falsi freebsd_committer freebsd_triage 2012-08-21 14:06:56 UTC
Responsible Changed
From-To: freebsd-ports-bugs->madpilot

I'll take it.
Comment 5 Guido Falsi freebsd_committer freebsd_triage 2012-09-14 16:59:50 UTC
State Changed
From-To: feedback->open

Maintainer timeout.
Comment 6 dfilter service freebsd_committer freebsd_triage 2012-09-14 17:06:48 UTC
Author: madpilot
Date: Fri Sep 14 16:06:31 2012
New Revision: 304276
URL: http://svn.freebsd.org/changeset/ports/304276

Log:
  - Update zathura, zathura-djvu and zathura-pdf-poppler to 0.2.0
  - Remove unnecessary ABI versions from LIB_DEPENDS
  
  PR:		ports/170780 [1], ports/170792 [2], ports/170793 [3]
  Submitted by:	Alexander <alexander.4mail@gmail.com> [1],
  		Quentin Stievenart <quentin.stievenart@gmail.com> [2] [3]
  Approved by:	maintainer timeout [3] (graphics/zathura-pdf-poppler)
  Approved by:	tabthorpe (mentor)

Added:
  head/graphics/zathura-djvu/files/
  head/graphics/zathura-djvu/files/patch-config.mk   (contents, props changed)
Deleted:
  head/graphics/zathura/files/
Modified:
  head/graphics/zathura-djvu/Makefile   (contents, props changed)
  head/graphics/zathura-djvu/distinfo   (contents, props changed)
  head/graphics/zathura-pdf-poppler/Makefile   (contents, props changed)
  head/graphics/zathura-pdf-poppler/distinfo   (contents, props changed)
  head/graphics/zathura-pdf-poppler/files/patch-config.mk   (contents, props changed)
  head/graphics/zathura/Makefile   (contents, props changed)
  head/graphics/zathura/distinfo   (contents, props changed)
  head/graphics/zathura/pkg-plist   (contents, props changed)

Modified: head/graphics/zathura-djvu/Makefile
==============================================================================
--- head/graphics/zathura-djvu/Makefile	Fri Sep 14 16:01:36 2012	(r304275)
+++ head/graphics/zathura-djvu/Makefile	Fri Sep 14 16:06:31 2012	(r304276)
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	zathura-djvu
-PORTVERSION=	0.1.1
+PORTVERSION=	0.2.0
 CATEGORIES=	graphics
 MASTER_SITES=	http://pwmt.org/projects/zathura/plugins/download/
 

Modified: head/graphics/zathura-djvu/distinfo
==============================================================================
--- head/graphics/zathura-djvu/distinfo	Fri Sep 14 16:01:36 2012	(r304275)
+++ head/graphics/zathura-djvu/distinfo	Fri Sep 14 16:06:31 2012	(r304276)
@@ -1,2 +1,2 @@
-SHA256 (zathura-djvu-0.1.1.tar.gz) = 04adad7bf1bb392eae4b7b856fe7d40a137f8185ac274289df922758ae827172
-SIZE (zathura-djvu-0.1.1.tar.gz) = 8392
+SHA256 (zathura-djvu-0.2.0.tar.gz) = c276cdb3901fbb8c76f070d69a590181992eea2cb48f09589e4fda9e67e1f813
+SIZE (zathura-djvu-0.2.0.tar.gz) = 10034

Added: head/graphics/zathura-djvu/files/patch-config.mk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/zathura-djvu/files/patch-config.mk	Fri Sep 14 16:06:31 2012	(r304276)
@@ -0,0 +1,22 @@
+--- config.mk.orig	2012-06-09 23:37:36.000000000 +0200
++++ config.mk	2012-08-20 18:26:30.000000000 +0200
+@@ -11,7 +11,7 @@
+ 
+ # paths
+ PREFIX ?= /usr
+-LIBDIR ?= ${PREFIX}/lib
++LIBDIR = ${PREFIX}/lib
+ 
+ # libs
+ CAIRO_INC ?= $(shell pkg-config --cflags cairo)
+@@ -27,10 +27,7 @@
+ GIRARA_LIB ?= $(shell pkg-config --libs girara-gtk2)
+ 
+ ZATHURA_INC ?= $(shell pkg-config --cflags zathura)
+-PLUGINDIR ?= $(shell pkg-config --variable=plugindir zathura)
+-ifeq (,${PLUGINDIR})
+ PLUGINDIR = ${LIBDIR}/zathura
+-endif
+ 
+ INCS = ${GIRARA_INC} ${GLIB_INC} ${DJVU_INC} ${ZATHURA_INC}
+ LIBS = ${GIRARA_LIB} ${GLIB_LIB} ${DJVU_LIB}

Modified: head/graphics/zathura-pdf-poppler/Makefile
==============================================================================
--- head/graphics/zathura-pdf-poppler/Makefile	Fri Sep 14 16:01:36 2012	(r304275)
+++ head/graphics/zathura-pdf-poppler/Makefile	Fri Sep 14 16:06:31 2012	(r304276)
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	zathura-pdf-poppler
-PORTVERSION=	0.1.1
-PORTREVISION=	1
+PORTVERSION=	0.2.0
 CATEGORIES=	graphics
 MASTER_SITES=	http://pwmt.org/projects/zathura/plugins/download/
 
 MAINTAINER=	neko@takino.org
 COMMENT=	Poppler render PDF plugin for Zathura PDF viewer
 
-LIB_DEPENDS=	poppler-glib.8:${PORTSDIR}/graphics/poppler-glib
+LIB_DEPENDS=	poppler-glib:${PORTSDIR}/graphics/poppler-glib
 BUILD_DEPENDS=	zathura:${PORTSDIR}/graphics/zathura
 RUN_DEPENDS=	zathura:${PORTSDIR}/graphics/zathura
 

Modified: head/graphics/zathura-pdf-poppler/distinfo
==============================================================================
--- head/graphics/zathura-pdf-poppler/distinfo	Fri Sep 14 16:01:36 2012	(r304275)
+++ head/graphics/zathura-pdf-poppler/distinfo	Fri Sep 14 16:06:31 2012	(r304276)
@@ -1,2 +1,2 @@
-SHA256 (zathura-pdf-poppler-0.1.1.tar.gz) = bec5fee721fcaee9f4b53d3882908b19efa82815393aa8c3619ff948b909d4a7
-SIZE (zathura-pdf-poppler-0.1.1.tar.gz) = 7584
+SHA256 (zathura-pdf-poppler-0.2.0.tar.gz) = a3ee96405e31d049111f351cb69626e67a8ab6fbfb53bb8a3e3e5f79240d0ed7
+SIZE (zathura-pdf-poppler-0.2.0.tar.gz) = 8168

Modified: head/graphics/zathura-pdf-poppler/files/patch-config.mk
==============================================================================
--- head/graphics/zathura-pdf-poppler/files/patch-config.mk	Fri Sep 14 16:01:36 2012	(r304275)
+++ head/graphics/zathura-pdf-poppler/files/patch-config.mk	Fri Sep 14 16:06:31 2012	(r304276)
@@ -1,13 +1,22 @@
---- config.mk.orig	2012-05-18 21:08:57.000000000 +0200
-+++ config.mk	2012-05-18 21:09:17.000000000 +0200
-@@ -20,10 +20,7 @@
+--- config.mk.orig	2012-06-09 23:37:36.000000000 +0200
++++ config.mk	2012-08-20 18:26:30.000000000 +0200
+@@ -11,7 +11,7 @@
+ 
+ # paths
+ PREFIX ?= /usr
+-LIBDIR ?= ${PREFIX}/lib
++LIBDIR = ${PREFIX}/lib
+ 
+ # libs
+ CAIRO_INC ?= $(shell pkg-config --cflags cairo)
+@@ -27,10 +27,7 @@
  GIRARA_LIB ?= $(shell pkg-config --libs girara-gtk2)
  
  ZATHURA_INC ?= $(shell pkg-config --cflags zathura)
 -PLUGINDIR ?= $(shell pkg-config --variable=plugindir zathura)
 -ifeq (,${PLUGINDIR})
- PLUGINDIR = ${PREFIX}/lib/zathura
+ PLUGINDIR = ${LIBDIR}/zathura
 -endif
  
- INCS = ${GTK_INC} ${PDF_INC} ${ZATHURA_INC} ${GIRARA_INC}
- LIBS = ${GIRARA_LIB} ${GTK_LIB} ${PDF_LIB}
+ INCS = ${GIRARA_INC} ${GLIB_INC} ${DJVU_INC} ${ZATHURA_INC}
+ LIBS = ${GIRARA_LIB} ${GLIB_LIB} ${DJVU_LIB}

Modified: head/graphics/zathura/Makefile
==============================================================================
--- head/graphics/zathura/Makefile	Fri Sep 14 16:01:36 2012	(r304275)
+++ head/graphics/zathura/Makefile	Fri Sep 14 16:06:31 2012	(r304276)
@@ -6,16 +6,15 @@
 #
 
 PORTNAME=	zathura
-PORTVERSION=	0.1.2
-PORTREVISION=	2
+PORTVERSION=	0.2.0
 CATEGORIES=	graphics print
 MASTER_SITES=	http://pwmt.org/projects/zathura/download/
 
 MAINTAINER=	acieroid@awesom.eu
 COMMENT=	Customizable lightweight pdf viewer
 
-LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
-		girara-gtk2.0:${PORTSDIR}/x11-toolkits/girara
+LIB_DEPENDS=	cairo:${PORTSDIR}/graphics/cairo \
+		girara-gtk2.1:${PORTSDIR}/x11-toolkits/girara
 
 USE_GNOME=	glib20 gtk20
 USE_GMAKE=	yes
@@ -27,7 +26,7 @@ OPTIONS=	SQLITE "Support sqlite database
 .include <bsd.port.options.mk>
 
 .if !defined(WITHOUT_SQLITE)
-LIB_DEPENDS+=	sqlite3.8:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS+=	sqlite3:${PORTSDIR}/databases/sqlite3
 MAKE_ENV+=	WITH_SQLITE=1
 .else
 MAKE_ENV+=	WITH_SQLITE=0
@@ -52,6 +51,8 @@ post-patch:	.SILENT
 		${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e 's|PLUGINDIR ?= .*$$|PLUGINDIR ?= ${PREFIX}/lib/zathura|'\
 		${WRKSRC}/config.mk
+	${REINPLACE_CMD} -e 's|girara_debug("plugin.*$$||'\
+		${WRKSRC}/plugin.c
 .if defined(NOPORTDOCS)
 	${REINPLACE_CMD} -e 's|install-manpages$$||'\
 		${WRKSRC}/Makefile

Modified: head/graphics/zathura/distinfo
==============================================================================
--- head/graphics/zathura/distinfo	Fri Sep 14 16:01:36 2012	(r304275)
+++ head/graphics/zathura/distinfo	Fri Sep 14 16:06:31 2012	(r304276)
@@ -1,2 +1,2 @@
-SHA256 (zathura-0.1.2.tar.gz) = a496c25071e54f675b65ee5eab02fd002c04c2d7d5cf4aa8a1cb517cc13beaef
-SIZE (zathura-0.1.2.tar.gz) = 65875
+SHA256 (zathura-0.2.0.tar.gz) = fd235a44c545e929a538ebb0a3f385349a190fd86c8b044a4328a3779d5c2d2f
+SIZE (zathura-0.2.0.tar.gz) = 86951

Modified: head/graphics/zathura/pkg-plist
==============================================================================
--- head/graphics/zathura/pkg-plist	Fri Sep 14 16:01:36 2012	(r304275)
+++ head/graphics/zathura/pkg-plist	Fri Sep 14 16:06:31 2012	(r304276)
@@ -1,10 +1,25 @@
 bin/zathura
 include/zathura/document.h
+include/zathura/links.h
 include/zathura/macros.h
+include/zathura/page.h
+include/zathura/plugin-api.h
+include/zathura/types.h
 include/zathura/version.h
-include/zathura/zathura.h
+libdata/pkgconfig/zathura.pc
 share/applications/zathura.desktop
 %%NLS%%share/locale/de/LC_MESSAGES/zathura.mo
-libdata/pkgconfig/zathura.pc
-@dirrmtry share/applications
+%%NLS%%share/locale/eo/LC_MESSAGES/zathura.mo
+%%NLS%%share/locale/es/LC_MESSAGES/zathura.mo
+%%NLS%%share/locale/es_CL/LC_MESSAGES/zathura.mo
+%%NLS%%share/locale/et/LC_MESSAGES/zathura.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/zathura.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/zathura.mo
+%%NLS%%share/locale/ta_IN/LC_MESSAGES/zathura.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/zathura.mo
 @dirrm include/zathura
+@dirrmtry share/applications
+@dirrmtry share/locale/es_CL/LC_MESSAGES
+@dirrmtry share/locale/es_CL
+@dirrmtry share/locale/ta_IN/LC_MESSAGES
+@dirrmtry share/locale/ta_IN
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 7 Guido Falsi freebsd_committer freebsd_triage 2012-09-14 17:07:39 UTC
State Changed
From-To: open->closed

Committed. Thanks!