From nobody@FreeBSD.org  Sat Sep 22 21:30:40 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 7F9DD106564A
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 22 Sep 2012 21:30:40 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 6B88F8FC0C
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 22 Sep 2012 21:30:40 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id q8MLUevr023999
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 22 Sep 2012 21:30:40 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id q8MLUeCZ023998;
	Sat, 22 Sep 2012 21:30:40 GMT
	(envelope-from nobody)
Message-Id: <201209222130.q8MLUeCZ023998@red.freebsd.org>
Date: Sat, 22 Sep 2012 21:30:40 GMT
From: Boris Samorodov <bsam@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] graphics/popper: unify poppler-config.h includes in core "installed" headers (bug 52193)
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         171877
>Category:       ports
>Synopsis:       [patch] graphics/popper: unify poppler-config.h includes in core "installed" headers (bug 52193)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    gnome
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Sep 22 21:40:02 UTC 2012
>Closed-Date:    Tue Sep 25 22:07:32 UTC 2012
>Last-Modified:  Tue Sep 25 22:10:12 UTC 2012
>Originator:     Boris Samorodov
>Release:        FreeBSD 9-STABLE
>Organization:
BSDprint
>Environment:
FreeBSD srv.bb.tel.ru 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #3 r239192: Sat Aug 11 16:39:57 SAMT 2012     bsam@srv.bb.tel.ru:/usr/obj/usr/src/sys/BB  i386
>Description:

>How-To-Repeat:

>Fix:
The result is similar to http://lists.freedesktop.org/archives/poppler/2012-July/009417.html

Patch attached with submission follows:

Index: Makefile
===================================================================
--- Makefile	(revision 304714)
+++ Makefile	(working copy)
@@ -8,7 +8,7 @@
 
 PORTNAME=	poppler
 PORTVERSION=	0.18.4
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	graphics print
 MASTER_SITES=	http://poppler.freedesktop.org/
 
@@ -110,6 +110,8 @@
 .if defined(SLAVEPORT) && ${SLAVEPORT}=="qt4"
 	@${REINPLACE_CMD} -e 's|MOCQT4=`.*|MOCQT4="${LOCALBASE}/bin/moc-qt4"|' \
 		${WRKSRC}/configure
+	# A fix for bug 52193 (fixed upstream at poppler-0.20)
+	${REINPLACE_CMD} -e 's:poppler/poppler-config.h:poppler-config.h:' ${WRKSRC}/goo/*.h ${WRKSRC}/splash/*.h
 .endif
 
 post-install:


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->gnome 
Responsible-Changed-By: bsam 
Responsible-Changed-When: Sun Sep 23 05:37:02 UTC 2012 
Responsible-Changed-Why:  
Over to the maintainer. 

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

From: Boris Samorodov <bsam@passap.ru>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/171877: [patch] graphics/popper: unify poppler-config.h
 includes in core &quot;installed&quot; headers (bug 52193)
Date: Sun, 23 Sep 2012 11:53:00 +0400

 I've get in touch with this bug while testing PR/171571. The errror
 message is:
 -----
 /usr/local/include/poppler/goo/gmem.h:29:36: error:
 poppler/poppler-config.h: No such file or directory
 -----
 
 The code of gmem.h:29:
 -----
 #include "poppler/poppler-config.h"
 -----
 
 And poppler.pc has this line:
 -----
 % tail -1 /usr/local/libdata/pkgconfig/poppler.pc
 
 
 Cflags: -I${includedir}/poppler
 -----
 
 From poppler.pc it is clear that includedir already contains subdir
 "poppler" and it should not be used at gmem.h header. Clearly it's
 a bug and it was fixed at poppler-0.20.

From: =?UTF-8?B?0JHQvtGA0LjRgSDQodCw0LzQvtGA0L7QtNC+0LI=?=
 <bsam@passap.ru>
To: bug-followup@FreeBSD.org, bsam@FreeBSD.org
Cc:  
Subject: Re: ports/171877: [patch] graphics/popper: unify poppler-config.h
 includes in core &quot;installed&quot; headers (bug 52193)
Date: Mon, 24 Sep 2012 17:34:55 +0400

 This is a multi-part message in MIME format.
 --------------040309050800080307080309
 Content-Type: text/plain; charset=UTF-8; format=flowed
 Content-Transfer-Encoding: 7bit
 
 The reinplace command should be unconditioned. The correct patch is 
 attached.
 
 --------------040309050800080307080309
 Content-Type: text/plain; charset=UTF-8;
  name="poppler.diff.txt"
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment;
  filename="poppler.diff.txt"
 
 SW5kZXg6IE1ha2VmaWxlCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIE1ha2VmaWxlCShyZXZpc2lvbiAz
 MDQ3NzcpCisrKyBNYWtlZmlsZQkod29ya2luZyBjb3B5KQpAQCAtOCw3ICs4LDcgQEAKIAog
 UE9SVE5BTUU9CXBvcHBsZXIKIFBPUlRWRVJTSU9OPQkwLjE4LjQKLVBPUlRSRVZJU0lPTj89
 CTEKK1BPUlRSRVZJU0lPTj89CTIKIENBVEVHT1JJRVM9CWdyYXBoaWNzIHByaW50CiBNQVNU
 RVJfU0lURVM9CWh0dHA6Ly9wb3BwbGVyLmZyZWVkZXNrdG9wLm9yZy8KIApAQCAtMTExLDYg
 KzExMSw4IEBACiAJQCR7UkVJTlBMQUNFX0NNRH0gLWUgJ3N8TU9DUVQ0PWAuKnxNT0NRVDQ9
 IiR7TE9DQUxCQVNFfS9iaW4vbW9jLXF0NCJ8JyBcCiAJCSR7V1JLU1JDfS9jb25maWd1cmUK
 IC5lbmRpZgorCSMgQSBmaXggZm9yIGJ1ZyA1MjE5MyAoZml4ZWQgdXBzdHJlYW0gYXQgcG9w
 cGxlci0wLjIwKQorCSR7UkVJTlBMQUNFX0NNRH0gLWUgJ3M6cG9wcGxlci9wb3BwbGVyLWNv
 bmZpZy5oOnBvcHBsZXItY29uZmlnLmg6JyAke1dSS1NSQ30vZ29vLyouaCAke1dSS1NSQ30v
 c3BsYXNoLyouaAogCiBwb3N0LWluc3RhbGw6CiAuaWYgZGVmaW5lZChTTEFWRVBPUlQpCg==
 --------------040309050800080307080309--
State-Changed-From-To: open->closed 
State-Changed-By: kwm 
State-Changed-When: Tue Sep 25 22:07:21 UTC 2012 
State-Changed-Why:  
Committed thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/171877: commit references a PR
Date: Tue, 25 Sep 2012 22:06:53 +0000 (UTC)

 Author: kwm
 Date: Tue Sep 25 22:06:42 2012
 New Revision: 304864
 URL: http://svn.freebsd.org/changeset/ports/304864
 
 Log:
   Unify poppler-config.h includes in poppler header.
   
   PR:		ports/171877
   Submitted by:	bsam@
   Obtained from:	poppler upstream, Bug 52193
 
 Modified:
   head/graphics/poppler/Makefile
 
 Modified: head/graphics/poppler/Makefile
 ==============================================================================
 --- head/graphics/poppler/Makefile	Tue Sep 25 21:57:13 2012	(r304863)
 +++ head/graphics/poppler/Makefile	Tue Sep 25 22:06:42 2012	(r304864)
 @@ -8,7 +8,7 @@
  
  PORTNAME=	poppler
  PORTVERSION=	0.18.4
 -PORTREVISION?=	1
 +PORTREVISION?=	2
  CATEGORIES=	graphics print
  MASTER_SITES=	http://poppler.freedesktop.org/
  
 @@ -111,6 +111,9 @@ post-patch:
  	@${REINPLACE_CMD} -e 's|MOCQT4=`.*|MOCQT4="${LOCALBASE}/bin/moc-qt4"|' \
  		${WRKSRC}/configure
  .endif
 +	# A fix for bug 52193 (fixed upstream at poppler-0.20)
 +	@${REINPLACE_CMD} -e 's:poppler/poppler-config.h:poppler-config.h:' \
 +		${WRKSRC}/goo/*.h ${WRKSRC}/splash/*.h
  
  post-install:
  .if defined(SLAVEPORT)
 _______________________________________________
 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"
 
>Unformatted:
