Source: derivations
Version: 0.53.20120414-1.1
Severity: normal
Tags: patch

Hi,

libextractor uses the private poppler core API, and thus is likely to
break on new upstream releases.
With poppler >= 0.20.x (should be since 0.20.3, to be precise),
compiling stuff using the private core headers really needs the poppler
include path added to the CFLAGS/CXXFLAGS; this causes derivations to
not compile.

It seems derivations has no way to add/set CXXFLAGS while building,
so the fix is in two parts:
* cflags:
  a patch to pass CXXFLAGS, if set, to g++
* Makefile:
  a real makefile which should replace the symlink btool/PDF/Makefile;
  what it does is just including ../Makefile-subdir (the makefile it
  was a symlink to), but setting CXXFLAGS first with the flags for
  poppler, got using pkg-config (which must be added to the build
  dependencies)
* debian.diff:
  following what said above, add pkg-config to the build-depends-indep

(Note that poppler 0.20 or greater is not for Wheezy, but for Jessie,
so this fix can wait after the release.)

Thanks,
-- 
Pino
--- a/btool/Makefile
+++ b/btool/Makefile
@@ -33,7 +33,7 @@
 allobj: $(allobj)
 $(foreach dir, $(srcdir), $(dir)/%): FORCE; $(MAKE) -C $(@D) $(@F)
 %.d: %.cc; g++ -MM $< | sed -e 's/:/ $*.d:/' >$@
-%.o: %.cc; g++ $(warn) $(optim) -c $< -o $*.o
+%.o: %.cc; g++ $(warn) $(optim) $(CXXFLAGS) -c $< -o $*.o
 
 complete-pdf: complete-pdf.o $(allobj)
 	g++ $(warn) $(optim) $^ -lpoppler -o $@
--- a/btool/Makefile-subdir
+++ b/btool/Makefile-subdir
@@ -15,7 +15,7 @@
   include $(alld)
 endif
 %.d: %.cc; g++ -MM $< | sed -e 's/:/ $*.d:/' >$@
-%.o:; g++ $(warn) $(optim) -c $< -o $*.o
+%.o:; g++ $(warn) $(optim) $(CXXFLAGS) -c $< -o $*.o
 
 cleanless:
 	rm -fv *.d *.o *.gch a.out
CXXFLAGS += $(shell pkg-config --cflags poppler)

include ../Makefile-subdir
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: doc
 Priority: optional
 Maintainer: Thaddeus H. Black <t...@debian.org>
 Build-Depends: debhelper (>= 5)
-Build-Depends-Indep: texlive-latex-base, texlive-pstricks, lmodern (>= 1.00), rubber (>= 1.1), ghostscript (>= 8.62), libpoppler-private-dev (>= 0.8.7)
+Build-Depends-Indep: texlive-latex-base, texlive-pstricks, lmodern (>= 1.00), rubber (>= 1.1), ghostscript (>= 8.62), libpoppler-private-dev (>= 0.8.7), pkg-config
 Standards-Version: 3.8.4
 
 Package: derivations

Reply via email to