git » poppler.git » commit b042e08

diff --git a/PKGBUILD b/PKGBUILD
index 3ee3115..201877f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 pkgbase=poppler
 pkgname=('poppler' 'poppler-glib' 'poppler-qt')
-pkgver=0.18.3
-pkgrel=2
+pkgver=0.18.4
+pkgrel=1
 arch=(i686 x86_64)
 license=('GPL')
 makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection')
@@ -11,16 +11,13 @@ options=('!libtool' '!emptydirs')
 url="http://poppler.freedesktop.org/"
 _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a
 source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz
-        http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2
-        git-fixes.patch)
-md5sums=('d70d2d63d8acd29c97185f7e5f09c9b4'
-         '9dc64c254a31e570507bdd4ad4ba629a'
-         'af56b7b1b24a08f7498a0c7f5e862b93')
+        http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2)
+md5sums=('12658f3308597e57f3faff538cc73baf'
+         '9dc64c254a31e570507bdd4ad4ba629a')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
   sed -i -e '/AC_PATH_XTRA/d' configure.ac
-  #patch -Np1 -i "${srcdir}/git-fixes.patch"
 
   autoreconf -fi
 
diff --git a/git-fixes.patch b/git-fixes.patch
deleted file mode 100644
index 24a66b8..0000000
--- a/git-fixes.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From 74f4299e8f9e2d204979479f6579dd784db678a4 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Sun, 04 Dec 2011 16:29:45 +0000
-Subject: Do not fail if we are trying to save a file with Encrypt but that we have not modified at all
-
-Fixes KDE bug #288045
-(cherry picked from commit 63c942a45227ef28fb94ef4765171d9812fffafa)
----
-diff --git a/poppler/PDFDoc.cc b/poppler/PDFDoc.cc
-index 01d2759..2758206 100644
---- a/poppler/PDFDoc.cc
-+++ b/poppler/PDFDoc.cc
-@@ -707,35 +707,44 @@ int PDFDoc::saveAs(GooString *name, PDFWriteMode mode) {
- 
- int PDFDoc::saveAs(OutStream *outStr, PDFWriteMode mode) {
- 
--  // we don't support files with Encrypt at the moment
-+  // find if we have updated objects
-+  GBool updated = gFalse;
-+  for(int i=0; i<xref->getNumObjects(); i++) {
-+    if (xref->getEntry(i)->updated) {
-+      updated = gTrue;
-+      break;
-+    }
-+  }
-+
-+  // we don't support rewriting files with Encrypt at the moment
-   Object obj;
-   xref->getTrailerDict()->getDict()->lookupNF("Encrypt", &obj);
-   if (!obj.isNull())
-   {
-     obj.free();
--    return errEncrypted;
-+    if (!updated && mode == writeStandard) {
-+      // simply copy the original file
-+      saveWithoutChangesAs (outStr);
-+    } else {
-+      return errEncrypted;
-+    }
-   }
--  obj.free();
-+  else
-+  {
-+    obj.free();
- 
--  if (mode == writeForceRewrite) {
--    saveCompleteRewrite(outStr);
--  } else if (mode == writeForceIncremental) {
--    saveIncrementalUpdate(outStr); 
--  } else { // let poppler decide
--    // find if we have updated objects
--    GBool updated = gFalse;
--    for(int i=0; i<xref->getNumObjects(); i++) {
--      if (xref->getEntry(i)->updated) {
--        updated = gTrue;
--        break;
-+    if (mode == writeForceRewrite) {
-+      saveCompleteRewrite(outStr);
-+    } else if (mode == writeForceIncremental) {
-+      saveIncrementalUpdate(outStr); 
-+    } else { // let poppler decide
-+      if(updated) { 
-+        saveIncrementalUpdate(outStr);
-+      } else {
-+        // simply copy the original file
-+        saveWithoutChangesAs (outStr);
-       }
-     }
--    if(updated) { 
--      saveIncrementalUpdate(outStr);
--    } else {
--      // simply copy the original file
--      saveWithoutChangesAs (outStr);
--    }
-   }
- 
-   return errNone;
---
-cgit v0.9.0.2-2-gbebe
-From 03544e2f602319f0b381f5f357e14cc2cc77d2c1 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Tue, 06 Dec 2011 22:21:15 +0000
-Subject: include strings.h as we use memcpy
-
-Fixes bug 43558
-(cherry picked from commit 388d72ac27ae98fe3a1ebd21760f2b0fa0249a9b)
----
-diff --git a/goo/PNGWriter.cc b/goo/PNGWriter.cc
-index f88c3a7..1fb8cab 100644
---- a/goo/PNGWriter.cc
-+++ b/goo/PNGWriter.cc
-@@ -6,7 +6,7 @@
- //
- // Copyright (C) 2009 Warren Toomey <wkt@tuhs.org>
- // Copyright (C) 2009 Shen Liang <shenzhuxi@gmail.com>
--// Copyright (C) 2009 Albert Astals Cid <aacid@kde.org>
-+// Copyright (C) 2009, 2011 Albert Astals Cid <aacid@kde.org>
- // Copyright (C) 2009 Stefan Thomas <thomas@eload24.com>
- // Copyright (C) 2010, 2011 Adrian Johnson <ajohnson@redneon.com>
- // Copyright (C) 2011 Thomas Klausner <wiz@danbala.tuwien.ac.at>
-@@ -19,6 +19,7 @@
- 
- #include <zlib.h>
- #include <stdlib.h>
-+#include <string.h>
- 
- #include "poppler/Error.h"
- #include "goo/gmem.h"
---
-cgit v0.9.0.2-2-gbebe