Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

 printer/cups-filters/DETAILS           |    4 +-
 printer/cups-filters/HISTORY           |    4 ++
 printer/cups-filters/PRE_BUILD         |    4 --
 printer/cups-filters/poppler-022.patch |   60 
---------------------------------
 4 files changed, 6 insertions(+), 66 deletions(-)

New commits:
commit be7c6449103de7d9ea6d7111f6452818f021e431
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    cups-filters: => 1.0.33

diff --git a/printer/cups-filters/DETAILS b/printer/cups-filters/DETAILS
index 2f2e1e6..8d460e5 100755
--- a/printer/cups-filters/DETAILS
+++ b/printer/cups-filters/DETAILS
@@ -1,6 +1,6 @@
            SPELL=cups-filters
-         VERSION=1.0.29
-     
SOURCE_HASH=sha512:a53ea0a4cc1673e0a4ec7da1273f3a750f006eb418cef708eea19ddcd66d134cd8c1e304b44b0c1d8ef7dd293f163947c5c8a7e9a890d1bd1f4a91d9508a0c4a
+         VERSION=1.0.33
+     
SOURCE_HASH=sha512:3df375b2e1cce002c8711fdf6225279e625d0448bffbc5479fe7de3a51e34be0d71e28d06a7e854f39870575bd5a87eb763cf7359fa6d288f8264ac0ec823f12
 #      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
           SOURCE=$SPELL-$VERSION.tar.xz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/printer/cups-filters/HISTORY b/printer/cups-filters/HISTORY
index f2ac5f0..2f1fe84 100644
--- a/printer/cups-filters/HISTORY
+++ b/printer/cups-filters/HISTORY
@@ -1,3 +1,7 @@
+2013-04-06 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.0.33
+       * PRE_BUILD, poppler-022.patch: deleted
+
 2013-02-23 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 1.0.29
        * DEPENDS: added avahi optional dependency; added comment about bc
diff --git a/printer/cups-filters/PRE_BUILD b/printer/cups-filters/PRE_BUILD
deleted file mode 100755
index ffc98e6..0000000
--- a/printer/cups-filters/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-patch -p0 < "$SPELL_DIRECTORY/poppler-022.patch"
diff --git a/printer/cups-filters/poppler-022.patch 
b/printer/cups-filters/poppler-022.patch
deleted file mode 100644
index 4d20533..0000000
--- a/printer/cups-filters/poppler-022.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-=== modified file 'NEWS'
---- NEWS       2013-01-02 18:23:25 +0000
-+++ NEWS       2013-01-09 10:42:32 +0000
-@@ -1,6 +1,11 @@
- NEWS - OpenPrinting CUPS Filters v1.0.29 - 2013-01-02
- -----------------------------------------------------
-
-+CHANGES IN V1.0.30
-+
-+      - pdftoopvp: Let it build with Poppler 0.22.x. Thanks to Koji Otani
-+        from BBR Inc. (Bug #1089).
-+
- CHANGES IN V1.0.29
-
-       - Fixed ./configure option "--with-rcdir=no". Thanks to Jiri
-
-=== modified file 'filter/pdftoopvp/OPVPOutputDev.cxx'
---- filter/pdftoopvp/OPVPOutputDev.cxx 2012-07-20 08:32:55 +0000
-+++ filter/pdftoopvp/OPVPOutputDev.cxx 2013-01-09 10:42:32 +0000
-@@ -1804,8 +1804,14 @@
-   maskSplash = new Splash(maskBitmap, gFalse);
-   maskColor[0] = 0;
-   maskSplash->clear(maskColor);
-+#if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || 
(POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2))
-   maskSplash->drawImage(&imageSrc, &imgMaskData,
-                       splashModeMono8, gFalse, maskWidth, maskHeight, mat);
-+#else
-+  maskSplash->drawImage(&imageSrc, &imgMaskData,
-+                      splashModeMono8, gFalse, maskWidth, maskHeight,
-+                        mat,gFalse);
-+#endif
-   delete imgMaskData.imgStr;
-   maskStr->close();
-   gfree(imgMaskData.lookup);
-
-=== modified file 'filter/pdftoopvp/oprs/OPRS.cxx'
---- filter/pdftoopvp/oprs/OPRS.cxx     2012-09-10 19:56:59 +0000
-+++ filter/pdftoopvp/oprs/OPRS.cxx     2013-01-09 10:42:32 +0000
-@@ -5,6 +5,9 @@
- //========================================================================
-
- #include <config.h>
-+#ifdef HAVE_CPP_POPPLER_VERSION_H
-+#include "cpp/poppler-version.h"
-+#endif
-
- #ifdef USE_GCC_PRAGMAS
- #pragma implementation
-@@ -235,7 +238,11 @@
-                             SplashColorMode srcMode, GBool srcAlpha,
-                             int w, int h, SplashCoord *mat) {
-     if (rasterMode) {
-+#if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || 
(POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2))
-       return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat);
-+#else
-+      return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat,gFalse);
-+#endif
-     } else {
-       return opvpSplash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat);
-     }