From jbeich@tormail.org  Tue May 22 21:07:06 2012
Return-Path: <jbeich@tormail.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B65F4106566B
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 22 May 2012 21:07:06 +0000 (UTC)
	(envelope-from jbeich@tormail.org)
Received: from server2.allsitecontrol.com (server2.allsitecontrol.com [63.143.36.210])
	by mx1.freebsd.org (Postfix) with ESMTP id 7BA8B8FC17
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 22 May 2012 21:07:06 +0000 (UTC)
Received: from wau.torservers.net ([109.163.233.200]:26148 helo=internal.tormail.org)
	by server2.allsitecontrol.com with esmtpsa (TLSv1:RC4-SHA:128)
	(Exim 4.77)
	(envelope-from <jbeich@tormail.org>)
	id 1SWpO5-002wng-W5
	for FreeBSD-gnats-submit@freebsd.org; Tue, 22 May 2012 09:44:35 -0400
Received: from jbeich by internal.tormail.org with local (Exim 4.63)
	(envelope-from <jbeich@tormail.org>)
	id 1SWpN9-000HBW-J4
	for FreeBSD-gnats-submit@freebsd.org; Tue, 22 May 2012 13:43:38 +0000
Message-Id: <1SWpN9-000HBW-J4@internal.tormail.org>
Date: Tue, 22 May 2012 15:23:39 +0200
From: Jan Beich <jbeich@tormail.org>
To: FreeBSD-gnats-submit@freebsd.org
Subject: [patch] graphics/zathura{,-pdf-poppler}: move poppler-glib dep to pdf plugin

>Number:         168240
>Category:       ports
>Synopsis:       [patch] graphics/zathura{,-pdf-poppler}: move poppler-glib dep to pdf plugin
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pawel
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 22 21:10:04 UTC 2012
>Closed-Date:    Wed May 23 21:35:54 UTC 2012
>Last-Modified:  Wed May 23 21:35:54 UTC 2012
>Originator:     Jan Beich
>Release:        FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
>Description:
Main zathura port has no dependency on poppler.
>How-To-Repeat:
$ cd graphics/zathura; make patch
$ fgrep -ir poppler $(make -V WRKSRC)/
Exit 1

$ cd graphics/zathura-pdf-poppler; make patch
$ fgrep -irh --exclude \*.orig pkg-config.\*poppler $(make -V WRKSRC)/
PDF_INC ?= $(shell pkg-config --cflags poppler-glib)
PDF_LIB ?= $(shell pkg-config --libs poppler-glib)
>Fix:
--- poppler.diff begins here ---
Index: graphics/zathura/Makefile
===================================================================
RCS file: /a/.csup/ports/graphics/zathura/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- graphics/zathura/Makefile	19 May 2012 10:16:25 -0000	1.12
+++ graphics/zathura/Makefile	22 May 2012 12:59:24 -0000
@@ -13,8 +13,7 @@ MASTER_SITES=	http://pwmt.org/projects/z
 MAINTAINER=	acieroid@awesom.eu
 COMMENT=	Customizable lightweight pdf viewer
 
-LIB_DEPENDS=	poppler-glib.8:${PORTSDIR}/graphics/poppler-glib \
-		cairo.2:${PORTSDIR}/graphics/cairo \
+LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
 		girara-gtk2.0:${PORTSDIR}/x11-toolkits/girara
 
 USE_GNOME=	glib20 gtk20
Index: graphics/zathura-pdf-poppler/Makefile
===================================================================
RCS file: /a/.csup/ports/graphics/zathura-pdf-poppler/Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile
--- graphics/zathura-pdf-poppler/Makefile	18 May 2012 20:16:43 -0000	1.1
+++ graphics/zathura-pdf-poppler/Makefile	22 May 2012 13:12:42 -0000
@@ -13,7 +13,7 @@ MASTER_SITES=	http://pwmt.org/projects/z
 MAINTAINER=	neko@takino.org
 COMMENT=	Poppler render PDF plugin for Zathura PDF viewer
 
-LIB_DEPENDS=	poppler.18:${PORTSDIR}/graphics/poppler
+LIB_DEPENDS=	poppler-glib.8:${PORTSDIR}/graphics/poppler
 BUILD_DEPENDS=	zathura:${PORTSDIR}/graphics/zathura
 RUN_DEPENDS=	zathura:${PORTSDIR}/graphics/zathura
 
--- poppler.diff ends here ---
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Tue May 22 21:10:18 UTC 2012 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=168240 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: acieroid@awesom.eu
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/168240: [patch] graphics/zathura{,-pdf-poppler}: move poppler-glib dep to pdf plugin
Date: Tue, 22 May 2012 21:10:16 UT

 Maintainer of graphics/zathura,
 
 Please note that PR ports/168240 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/168240
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Jan Beich <jbeich@tormail.org>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/168240: [patch] graphics/zathura{,-pdf-poppler}: move poppler-glib dep to pdf plugin
Date: Wed, 23 May 2012 03:02:45 +0300

 Jan Beich <jbeich@tormail.org> writes:
 
 > -LIB_DEPENDS=	poppler.18:${PORTSDIR}/graphics/poppler
 > +LIB_DEPENDS=	poppler-glib.8:${PORTSDIR}/graphics/poppler
                                                    ^^^^^^^^^^
 Oops, it should be graphics/poppler-glib of course.

From: Quentin Stievenart <quentin.stievenart@gmail.com>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/168240: [patch] graphics/zathura{,-pdf-poppler}: move
 poppler-glib dep to pdf plugin
Date: Wed, 23 May 2012 09:00:43 +0200

 Patch approved.
 
State-Changed-From-To: feedback->open 
State-Changed-By: linimon 
State-Changed-When: Wed May 23 07:12:02 UTC 2012 
State-Changed-Why:  
Maintainer approved. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=168240 
Responsible-Changed-From-To: freebsd-ports-bugs->pawel 
Responsible-Changed-By: pawel 
Responsible-Changed-When: Wed May 23 14:06:21 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=168240 
State-Changed-From-To: open->closed 
State-Changed-By: pawel 
State-Changed-When: Wed May 23 21:35:52 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=168240 
>Unformatted:
