diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-03 13:57:40 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-03 13:57:40 -0300 |
commit | cdd88c937bb1fd3bf6de0b847101524a2d5c9022 (patch) | |
tree | 3eeb67878db60db79eb21dc2232377e6b56a3add /extra/poppler | |
parent | b2e7dca27f9de046feecd59ecfc93cd17bca8356 (diff) | |
parent | b618c3d0693aec564c6746238fd05d94e31d3b76 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/asciijump/PKGBUILD
community/cairo-compmgr/PKGBUILD
community/cwiid/PKGBUILD
community/darcs/PKGBUILD
community/gadmin-samba/PKGBUILD
community/gstm/PKGBUILD
community/haskell-dbus/PKGBUILD
community/haskell-mmap/PKGBUILD
community/lastfm-client/PKGBUILD
community/libtar/PKGBUILD
community/mget/PKGBUILD
community/nexuiz/PKGBUILD
community/pstreams/PKGBUILD
community/pyglet/PKGBUILD
community/python-html5lib/PKGBUILD
community/python-pychm/PKGBUILD
community/qoauth/PKGBUILD
community/quilt/PKGBUILD
community/stormbaancoureur/PKGBUILD
community/winegame/PKGBUILD
community/winestuff/PKGBUILD
community/xdg-user-dirs/PKGBUILD
core/libfetch/PKGBUILD
extra/acpi/PKGBUILD
extra/alex/PKGBUILD
extra/allegro/PKGBUILD
extra/capi4k-utils/PKGBUILD
extra/erlang/PKGBUILD
extra/ettercap/PKGBUILD
extra/gftp/PKGBUILD
extra/gimp-refocus/PKGBUILD
extra/happy/PKGBUILD
extra/haskell-cgi/PKGBUILD
extra/haskell-deepseq/PKGBUILD
extra/haskell-fgl/PKGBUILD
extra/haskell-glut/PKGBUILD
extra/haskell-haskell-src/PKGBUILD
extra/haskell-html/PKGBUILD
extra/haskell-hunit/PKGBUILD
extra/haskell-opengl/PKGBUILD
extra/haskell-parallel/PKGBUILD
extra/haskell-platform/PKGBUILD
extra/haskell-quickcheck/PKGBUILD
extra/haskell-regex-base/PKGBUILD
extra/haskell-regex-compat/PKGBUILD
extra/haskell-regex-posix/PKGBUILD
extra/haskell-stm/PKGBUILD
extra/haskell-syb/PKGBUILD
extra/haskell-xhtml/PKGBUILD
extra/libnet/PKGBUILD
extra/linux_logo/PKGBUILD
extra/mailman/PKGBUILD
extra/midori/PKGBUILD
extra/ntrack/PKGBUILD
extra/pwgen/PKGBUILD
extra/qtcurve-gtk2/PKGBUILD
extra/qtcurve-kde4/PKGBUILD
extra/ristretto/PKGBUILD
extra/rxvt-unicode/PKGBUILD
extra/telepathy-sofiasip/PKGBUILD
extra/tightvnc/PKGBUILD
extra/vsftpd/PKGBUILD
extra/windowmaker-crm-git/PKGBUILD
libre/aufs2-libre/PKGBUILD
libre/calibre-libre/PKGBUILD
libre/calibre-libre/calibre-mount-helper
libre/calibre-libre/calibre.install
libre/calibre-libre/desktop_integration.patch
libre/ffmpeg-libre/PKGBUILD
mozilla-testing/iceweasel-libre/PKGBUILD
mozilla-testing/iceweasel-libre/libre.patch
mozilla-testing/iceweasel-libre/mozconfig
~lukeshu/openni-unstable/PKGBUILD
Diffstat (limited to 'extra/poppler')
-rw-r--r-- | extra/poppler/git-fixes.patch | 110 |
1 files changed, 0 insertions, 110 deletions
diff --git a/extra/poppler/git-fixes.patch b/extra/poppler/git-fixes.patch deleted file mode 100644 index 24a66b84f..000000000 --- a/extra/poppler/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 |