[arch-commits] CVS update of extra/office/xpdf (PKGBUILD xpdf-3.01-resizefix.patch)

[Tobias Kieslich]

    Date: Thursday, November 8, 2007 @ 13:52:32
  Author: tobias
    Path: /home/cvs-extra/extra/office/xpdf

Modified: PKGBUILD (1.32 -> 1.33)
 Removed: xpdf-3.01-resizefix.patch (1.1)

bumped to upstream patchlevel 2
remove old patch vrom cvs


---------------------------+
 PKGBUILD                  |   11 ++++---
 xpdf-3.01-resizefix.patch |   62 --------------------------------------------
 2 files changed, 6 insertions(+), 67 deletions(-)


Index: extra/office/xpdf/PKGBUILD
diff -u extra/office/xpdf/PKGBUILD:1.32 extra/office/xpdf/PKGBUILD:1.33
--- extra/office/xpdf/PKGBUILD:1.32	Wed Aug  1 15:32:55 2007
+++ extra/office/xpdf/PKGBUILD	Thu Nov  8 13:52:32 2007
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD,v 1.32 2007/08/01 19:32:55 tobias Exp $
+# $Id: PKGBUILD,v 1.33 2007/11/08 18:52:32 tobias Exp $
 # Maintainer: tobias <tobias at archlinux.org>
 # Contributor Sarah Hay <sarahhay at mb.sympatico.ca>
 
 pkgname=xpdf
 _srcver=3.02
-_patchlevel=pl1
+_patchlevel=pl2
 pkgver=${_srcver}_${_patchlevel}
 #pkgver=${_srcver}
 pkgrel=1
@@ -17,14 +17,15 @@
 options=('force')
 install=${pkgname}.install
 source=(ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${_srcver}.tar.gz \
+        ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${_srcver}pl1.patch \
         ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${_srcver}${_patchlevel}.patch \
         ${pkgname}.desktop)
-md5sums=('599dc4cc65a07ee868cf92a667a913d2' \
-         '877118786dfe27d1b7aa5a6759cc6e45' \
-         '6c606eeca046cc9f32835f98f635c084')
+md5sums=('599dc4cc65a07ee868cf92a667a913d2' '877118786dfe27d1b7aa5a6759cc6e45' \
+         '3a5cb165ae66781e0b21e6219ae06795' '6c606eeca046cc9f32835f98f635c084')
 
 build() {
   cd ${startdir}/src/${pkgname}-${_srcver}
+  patch -Np1 -i ../${pkgname}-${_srcver}pl1.patch || return 1
   patch -Np1 -i ../${pkgname}-${_srcver}${_patchlevel}.patch || return 1
   sed -i 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:' xpdf/GlobalParams.cc || return 1
   ./configure                                                  \
Index: extra/office/xpdf/xpdf-3.01-resizefix.patch
diff -u extra/office/xpdf/xpdf-3.01-resizefix.patch:1.1 extra/office/xpdf/xpdf-3.01-resizefix.patch:removed
--- extra/office/xpdf/xpdf-3.01-resizefix.patch:1.1	Sun Oct 15 09:32:40 2006
+++ extra/office/xpdf/xpdf-3.01-resizefix.patch	Thu Nov  8 13:52:32 2007
@@ -1,62 +0,0 @@
-diff -u -r xpdf-3.01/fofi/FoFiType1.cc xpdf-3.01-resizefix/fofi/FoFiType1.cc
---- xpdf-3.01/fofi/FoFiType1.cc	2005-08-17 08:34:30.000000000 +0300
-+++ xpdf-3.01-resizefix/fofi/FoFiType1.cc	2006-10-15 14:04:13.000000000 +0300
-@@ -190,9 +190,14 @@
- 	    }
- 	  }
- 	} else {
--	  if (strtok(buf, " \t") &&
--	      (p = strtok(NULL, " \t\n\r")) && !strcmp(p, "def")) {
--	    break;
-+	  p = strtok(buf, " \t\n\r");
-+	  if (p)
-+	  {
-+	    if (!strcmp(p, "def")) break;
-+	    if (!strcmp(p, "readonly")) break;
-+	    // the spec does not says this but i'm mantaining old xpdf behaviour that accepts "foo def" as end of the encoding array
-+	    p = strtok(buf, " \t\n\r");
-+	    if (p && !strcmp(p, "def")) break;
- 	  }
- 	}
-       }
-diff -u -r xpdf-3.01/splash/Splash.cc xpdf-3.01-resizefix/splash/Splash.cc
---- xpdf-3.01/splash/Splash.cc	2005-08-17 08:34:30.000000000 +0300
-+++ xpdf-3.01-resizefix/splash/Splash.cc	2006-10-15 14:04:19.000000000 +0300
-@@ -822,6 +822,11 @@
-   }
-   xPath = new SplashXPath(path, state->flatness, gTrue);
-   xPath->sort();
-+  if (!&xPath->segs[0])
-+  {
-+    delete xPath;
-+    return splashErrEmptyPath;
-+  }
-   scanner = new SplashXPathScanner(xPath, eo);
- 
-   // get the min and max x and y values
-diff -u -r xpdf-3.01/xpdf/XPDFCore.cc xpdf-3.01-resizefix/xpdf/XPDFCore.cc
---- xpdf-3.01/xpdf/XPDFCore.cc	2005-08-17 08:34:31.000000000 +0300
-+++ xpdf-3.01-resizefix/xpdf/XPDFCore.cc	2006-10-15 14:03:47.000000000 +0300
-@@ -975,6 +975,9 @@
-   XPDFCore *core = (XPDFCore *)ptr;
-   XEvent event;
-   Widget top;
-+  Window rootWin;
-+  int x1, y1;
-+  Guint w1, h1, bw1, depth1;
-   Arg args[2];
-   int n;
-   Dimension w, h;
-@@ -990,7 +993,11 @@
-   if (XCheckTypedWindowEvent(core->display, XtWindow(top),
- 			     ConfigureNotify, &event)) {
-     XPutBackEvent(core->display, &event);
--    return;
-+    XGetGeometry(core->display, event.xconfigure.window,
-+		                  &rootWin, &x1, &y1, &w1, &h1, &bw1, &depth1);
-+   if ((Guint)event.xconfigure.width != w1 ||
-+       (Guint)event.xconfigure.height != h1) 
-+	   return;
-   }
- 
-   n = 0;