Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

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

 dev/null                            |binary
 gnome2-libs/librsvg2/DEPENDS        |    4 +--
 gnome2-libs/librsvg2/HISTORY        |    3 ++
 libs/podofo/DEPENDS                 |    2 +
 libs/podofo/DETAILS                 |    6 ++--
 libs/podofo/HISTORY                 |    4 +++
 libs/podofo/podofo-0.9.1.tar.gz.sig |    0 
 printer/cups-filters/DEPENDS        |    4 +++
 printer/cups-filters/DETAILS        |    5 ++--
 printer/cups-filters/HISTORY        |    5 ++++
 printer/cups-filters/PRE_BUILD      |    3 ++
 printer/cups-filters/poppler.patch  |   44 
++++++++++++++++++++++++++++++++++++
 12 files changed, 73 insertions(+), 7 deletions(-)

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

    podofo: => 0.9.2

commit 78e74114c3046d804021f471eac860930c4c0360
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    cups-filters: => 1.0.29

commit d18794d28d0fdcc58655fdf06bcb32f3bd80485f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    librsvg2 - gtk-{2,3} are optional

diff --git a/gnome2-libs/librsvg2/DEPENDS b/gnome2-libs/librsvg2/DEPENDS
index 332ee57..f7bb212 100755
--- a/gnome2-libs/librsvg2/DEPENDS
+++ b/gnome2-libs/librsvg2/DEPENDS
@@ -38,8 +38,8 @@ optional_depends gdk-pixbuf2                           \
 
 
 depends atk &&
-depends gtk+2 &&
-depends gtk+3 &&
+optional_depends gtk+2 '' '' 'GTK2 support' &&
+optional_depends gtk+3 '' '' 'GTK3 support' &&
 depends harfbuzz &&
 depends libpng &&
 depends pixman
diff --git a/gnome2-libs/librsvg2/HISTORY b/gnome2-libs/librsvg2/HISTORY
index 2abcc24..04012c0 100644
--- a/gnome2-libs/librsvg2/HISTORY
+++ b/gnome2-libs/librsvg2/HISTORY
@@ -1,3 +1,6 @@
+2013-02-23 Treeve Jelbert <treeve AT sourcemage.org>
+       * DEPENDS: gtk+2, gtk+3 are optional
+
 2012-12-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS: made dependencies on vala and gdk-pixbuf2 optional,
          removed dependencies on libxau, libxcb, libxdmcp, libxext, 
libxrender
diff --git a/libs/podofo/DEPENDS b/libs/podofo/DEPENDS
index 76badfb..b398a80 100755
--- a/libs/podofo/DEPENDS
+++ b/libs/podofo/DEPENDS
@@ -1,3 +1,5 @@
+depends cmake     &&
+depends openssl   &&
 depends freetype2 &&
 depends zlib &&
 depends fontconfig &&
diff --git a/libs/podofo/DETAILS b/libs/podofo/DETAILS
index 05a098a..c84d81a 100755
--- a/libs/podofo/DETAILS
+++ b/libs/podofo/DETAILS
@@ -1,8 +1,8 @@
            SPELL=podofo
-         VERSION=0.9.1
+         VERSION=0.9.2
+     
SOURCE_HASH=sha512:e0bda743b192edfd42f381498edc56f30e6d89f45e7abd2b4351e15fd672a432d07f067ab8ed5cf378b0ecbab6d98abb32c22c1ce860c0021e31235fc5683a21
           SOURCE="${SPELL}-${VERSION}.tar.gz"
-   SOURCE_URL[0]=http://prdownloads.sourceforge.net/${SPELL}/${SOURCE}
-      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+   SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://podofo.sourceforge.net/";
       LICENSE[0]="GPL, LGPL"
diff --git a/libs/podofo/HISTORY b/libs/podofo/HISTORY
index 0fc98ae..0955da1 100644
--- a/libs/podofo/HISTORY
+++ b/libs/podofo/HISTORY
@@ -1,3 +1,7 @@
+2013-02-23 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 0.9.2
+       * DEPENDS: add openssl, cmake
+
 2013-02-16 Robin Cook <rcook AT wyrms.net>
        * DETAILS: updated VERSION to 0.9.1
 
diff --git a/libs/podofo/podofo-0.9.1.tar.gz.sig 
b/libs/podofo/podofo-0.9.1.tar.gz.sig
deleted file mode 100644
index eba26c5..0000000
Binary files a/libs/podofo/podofo-0.9.1.tar.gz.sig and /dev/null differ
diff --git a/printer/cups-filters/DEPENDS b/printer/cups-filters/DEPENDS
index 601429d..6d1cb7a 100755
--- a/printer/cups-filters/DEPENDS
+++ b/printer/cups-filters/DEPENDS
@@ -10,6 +10,10 @@ depends fontconfig  &&
 depends ijs         &&
 depends shared-mime-info &&
 runtime_depends bc  &&
+optional_depends  avahi \
+                  '--enable-avahi' \
+                  '--disable-avahi' \
+                  'Avahi support' &&
 optional_depends  JPEG  \
                   '--with-jpeg'  \
                   '--without-jpeg' \
diff --git a/printer/cups-filters/DETAILS b/printer/cups-filters/DETAILS
index 67599f2..ff76c66 100755
--- a/printer/cups-filters/DETAILS
+++ b/printer/cups-filters/DETAILS
@@ -1,6 +1,7 @@
            SPELL=cups-filters
-         VERSION=1.0.24
-     
SOURCE_HASH=sha512:cdb9062009799197f5e79bdabd8dc73c4e17d88c8398262da8f7de031c79eca4677329ac8b182fe48733e1be57a4c150ba1bb523ea7201c84183e08b62dd59db
+         VERSION=1.0.29
+     
SOURCE_HASH=sha512:a53ea0a4cc1673e0a4ec7da1273f3a750f006eb418cef708eea19ddcd66d134cd8c1e304b44b0c1d8ef7dd293f163947c5c8a7e9a890d1bd1f4a91d9508a0c4a
+      PATCHLEVEL=1
 #      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 682951d..8448592 100644
--- a/printer/cups-filters/HISTORY
+++ b/printer/cups-filters/HISTORY
@@ -1,3 +1,8 @@
+2013-01-02 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.0.29
+       * PRE_BUILD, poppler.patch: added
+       * DEPENDS: add optional avahi
+
 2012-09-14 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.0.24
        * DEPENDS: add qpdf
diff --git a/printer/cups-filters/PRE_BUILD b/printer/cups-filters/PRE_BUILD
new file mode 100755
index 0000000..6e6fd2d
--- /dev/null
+++ b/printer/cups-filters/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch  -p0 < $SPELL_DIRECTORY/poppler.patch
diff --git a/printer/cups-filters/poppler.patch 
b/printer/cups-filters/poppler.patch
new file mode 100644
index 0000000..2ebf8bf
--- /dev/null
+++ b/printer/cups-filters/poppler.patch
@@ -0,0 +1,44 @@
+--- 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);
+     }
+