← Back to branch summary

~ubuntu-branches/ubuntu/utopic/texlive-bin/utopic

« back to all changes in this revision

Viewing changes to debian/patches/ubuntu_libpoppler-0.12

  • Committer: Bazaar Package Importer
  • Author(s): Norbert Preining
  • Date: 2009-10-22 01:42:18 UTC
  • Revision ID: james.westby@ubuntu.com-20091022014218-0p5bwtzpz4i8ga6j
Tags: 2007.dfsg.2-8
http://bugs.debian.org/548878
https://launchpad.net/bugs/383825
* Include patches from Ubuntu for libpoppler 0.0.12 support 
  (Closes: #548878) (LP: #383825)
* Add another patch fix-getline-libc10-horror that fixes another
  unreported FTBFS because libc now exports getline

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/ubuntu_libpoppler-0.12
 
1
Fix a FTBFS with libpoppler 0.12: use getPDFMinorVersion instead of getPDFVersion
 
2
Index: texlive-bin-2007.dfsg.2/build/source/texk/web2c/pdftexdir/pdftoepdf.cc
 
3
===================================================================
 
4
--- texlive-bin-2007.dfsg.2.orig/build/source/texk/web2c/pdftexdir/pdftoepdf.cc 2009-09-28 10:25:18.000000000 +0000
 
5
+++ texlive-bin-2007.dfsg.2/build/source/texk/web2c/pdftexdir/pdftoepdf.cc      2009-09-28 10:59:33.000000000 +0000
 
6
@@ -673,6 +673,7 @@
 
7
     Page *page;
 
8
     int rotate;
 
9
     PDFRectangle *pagebox;
 
10
+    int minor_pdf_version_found, major_pdf_version_found;
 
11
     float pdf_version_found, pdf_version_wanted;
 
12
     // initialize
 
13
     if (!isInit) {
 
14
@@ -688,8 +689,11 @@
 
15
     // this works only for PDF 1.x -- but since any versions of PDF newer
 
16
     // than 1.x will not be backwards compatible to PDF 1.x, pdfTeX will
 
17
     // then have to changed drastically anyway.
 
18
-    pdf_version_found = pdf_doc->doc->getPDFVersion();
 
19
+    minor_pdf_version_found = pdf_doc->doc->getPDFMinorVersion();
 
20
+    major_pdf_version_found = pdf_doc->doc->getPDFMajorVersion();
 
21
+    pdf_version_found = major_pdf_version_found + (minor_pdf_version_found * 0.1);
 
22
     pdf_version_wanted = 1 + (minor_pdf_version_wanted * 0.1);
 
23
+
 
24
     if (pdf_version_found > pdf_version_wanted) {
 
25
         char msg[] =
 
26
             "PDF inclusion: found PDF version <%.1f>, but at most version <%.1f> allowed";