[tlbuild] Build problem using system poppler library (0.20.1)

[Ken Brown]

When I build TeX Live 2012 for the Cygwin distribution using 	 
--with-system-poppler and --with-system-xpdf, the build fails as follows:

g++ -DHAVE_CONFIG_H -I. 
-I/home/kbrown/src/cygtexlive/texlive/texlive-20120611-1/src/texlive-20120611-source/texk/web2c 
-I./w2c 
-I/home/kbrown/src/cygtexlive/texlive/texlive-20120611-1/build/texk 
-I/home/kbrown/src/cygtexlive/texlive/texlive-20120611-1/src/texlive-20120611-source/texk 
  -I/usr/include/libpng14    -DPOPPLER_VERSION=\"0.20.1\" 
-I/usr/include/poppler 
-I/home/kbrown/src/cygtexlive/texlive/texlive-20120611-1/build/libs/obsdcompat 
-I/home/kbrown/src/cygtexlive/texlive/texlive-20120611-1/src/texlive-20120611-source/libs/obsdcompat 
-I/home/kbrown/src/cygtexlive/texlive/texlive-20120611-1/src/texlive-20120611-source/texk/web2c/libmd5 
 
-I/home/kbrown/src/cygtexlive/texlive/texlive-20120611-1/src/texlive-20120611-source/texk/web2c/pdftexdir 
   -g -O2 -pipe  -MT pdftosrc-pdftosrc.o -MD -MP -MF 
.deps/pdftosrc-pdftosrc.Tpo -c -o pdftosrc-pdftosrc.o `test -f 
'pdftexdir/pdftosrc.cc' || echo 
'/home/kbrown/src/cygtexlive/texlive/texlive-20120611-1/src/texlive-20120611-source/texk/web2c/'`pdftexdir/pdftosrc.cc

[...]

/home/kbrown/src/cygtexlive/texlive/texlive-20120611-1/src/texlive-20120611-source/texk/web2c/pdftexdir/pdftosrc.cc:137:26: 
error: ‘class XRef’ has no member named ‘getSize’

This is due to the following poppler change:

http://cgit.freedesktop.org/poppler/poppler/commit/?h=poppler-0.20&id=33aded82fbd98832eaab7cb7487fe6a1c7ef15f5

The attached patch seems to fix the problem, but I don't know if it's 
the right fix or if it would cause problems for the native TL build.

The problem didn't occur with the native TL build, because that build 
included libs/xpdf/xpdf-3.03/xpdf/XRef.h instead of 
libs/poppler/poppler-0.20.0/poppler/XRef.h.

Is it intentional that the native TL build prefers the xpdf version over 
the poppler version?

Ken
-------------- next part --------------
--- origsrc/texlive-20120611-source/texk/web2c/pdftexdir/pdftosrc.cc	2012-04-15 14:08:10.000000000 -0400
+++ src/texlive-20120611-source/texk/web2c/pdftexdir/pdftosrc.cc	2012-06-18 07:37:41.400472700 -0400
@@ -134,7 +134,7 @@ int main(int argc, char *argv[])
         exit(1);
     }
     if (extract_xref_table) {
-        int size = xref->getSize();
+        int size = xref->getNumObjects();
         int i;
         for (i = 0; i < size; i++) {
             if (xref->getEntry(i)->offset == 0xffffffff)