Bug 171877 - [patch] graphics/popper: unify poppler-config.h includes in core "installed" headers (bug 52193)
Summary: [patch] graphics/popper: unify poppler-config.h includes in core "installed" ...
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: freebsd-gnome (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-09-22 22:40 UTC by Boris Samorodov
Modified: 2012-09-25 23:10 UTC (History)
0 users

See Also:

Attachments
file.diff (668 bytes, patch)
2012-09-22 22:40 UTC, Boris Samorodov 		no flags Details | Diff
poppler.diff.txt (646 bytes, text/plain; charset=UTF-8)
2012-09-24 14:34 UTC, Boris Samorodov 		no flags Details
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Boris Samorodov freebsd_committer freebsd_triage 2012-09-22 22:40:02 UTC 

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

Patch attached with submission follows:
Comment 1 Boris Samorodov freebsd_committer freebsd_triage 2012-09-23 06:37:02 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->gnome

Over to the maintainer.
Comment 2 Boris Samorodov 2012-09-23 08:53:00 UTC 
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.
Comment 3 Boris Samorodov 2012-09-24 14:34:55 UTC 
The reinplace command should be unconditioned. The correct patch is 
attached.
Comment 4 dfilter service freebsd_committer freebsd_triage 2012-09-25 23:06:53 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"
Comment 5 Koop Mast freebsd_committer freebsd_triage 2012-09-25 23:07:21 UTC 
State Changed
From-To: open->closed

Committed thanks!