sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (72d250b1879488116253c5a31d145f83eca742d2)

From: Vlad Glagolev <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (72d250b1879488116253c5a31d145f83eca742d2)
Date: Sat, 23 Feb 2013 13:01:14 -0600

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

audio-soft/easytag/BUILD | 2 -
audio-soft/easytag/DEPENDS | 42 ++++++++++++++---------
audio-soft/easytag/DETAILS | 12 +++---
audio-soft/easytag/HISTORY | 5 ++
devel/patch/DEPENDS | 7 +++
devel/patch/HISTORY | 3 +
graphics-libs/poppler/DEPENDS | 4 +-
graphics-libs/poppler/DETAILS | 8 ++--
graphics-libs/poppler/HISTORY | 4 ++
http/siege/DETAILS | 5 +-
http/siege/HISTORY | 3 +
printer/cups-filters/DEPENDS | 11 +++++-
printer/cups-filters/DETAILS | 4 +-
printer/cups-filters/HISTORY | 6 +++
printer/cups-filters/PRE_BUILD | 4 ++
printer/cups-filters/poppler-022.patch | 60
+++++++++++++++++++++++++++++++++
x11-libs/cairo/DETAILS | 8 ++--
x11-libs/cairo/HISTORY | 3 +
18 files changed, 151 insertions(+), 40 deletions(-)

New commits:
commit 72d250b1879488116253c5a31d145f83eca742d2
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

cups-filters: => 1.0.29

commit 45b1b76d578f16b06232f60c994d6d54a50ce27b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

poppler: switched to lcms2

commit 5ac33197d197c00ff9aa70a775dcd560f6643f9b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

Revert "galculator: => 2.1"

This reverts commit 0f5bd47063bce9b72ace33f53c2b2264535bcc6b.

It segfaults too much

commit 82559999c9cd1eed1d4f6dd742156864b1202b7d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

poppler: => 0.22.1

commit 1913c9e433c45e28790b2041b9902cca4d99079b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

cairo: => 1.12.14

commit 0f5bd47063bce9b72ace33f53c2b2264535bcc6b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

galculator: => 2.1

commit f97af48fad14fa98fcdd22734b9718454902035e
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

siege: => 2.74

commit dce5735075b4bb649892b6fc3d55c6a06c07fdbd
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

easytag: => 2.1.8

commit 365394b48b38876a8cb11afb3e4ba23840e94657
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

patch: added attr optional dependency

diff --git a/audio-soft/easytag/BUILD b/audio-soft/easytag/BUILD
deleted file mode 100755
index de21441..0000000
--- a/audio-soft/easytag/BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-OPTS="$OPTS --disable-gtktest"
-default_build
diff --git a/audio-soft/easytag/DEPENDS b/audio-soft/easytag/DEPENDS
index e684b70..b5a7d52 100755
--- a/audio-soft/easytag/DEPENDS
+++ b/audio-soft/easytag/DEPENDS
@@ -1,38 +1,51 @@
depends glib2 &&
depends gtk+2 &&
-depends id3lib &&
+
+optional_depends libid3tag \
+ "--enable-mp3" \
+ "--disable-mp3" \
+ "for MP3 files support" &&
+
+if is_depends_enabled $SPELL libid3tag; then
+ optional_depends id3lib \
+ "--enable-id3v23" \
+ "--disable-id3v23" \
+ "for writing id3v2.3 tags support" &&
+
+ if is_depends_enabled $SPELL id3lib; then
+ depends -sub CXX gcc
+ fi
+fi &&

optional_depends flac \
"--enable-flac" \
"--disable-flac" \
"Enable Flac support" &&

-optional_depends libvorbis \
+optional_depends libogg \
"--enable-ogg" \
"--disable-ogg" \
"Enable Ogg/Vorbis support" &&

+if is_depends_enabled $SPELL libogg; then
+ depends libvorbis
+fi &&
+
optional_depends gettext \
"--enable-nls" \
"--disable-nls" \
"Enable nls support" &&

+optional_depends taglib \
+ "--enable-mp4" \
+ "--disable-mp4" \
+ "for MP4 files support" &&
+
optional_depends wavpack \
"--enable-wavpack" \
"--disable-wavpack" \
"Enable Wavpack support" &&

-# easytag can use either faad2 or libmp4v2 for MP4
-# support, no --disable options to have that work
-optional_depends faad2 \
- "--enable-mp4" \
- "" \
- "Enable Mp4 container support" &&
-optional_depends mp4v2 \
- "--enable-mp4" \
- "" \
- "Use libmp4v2 for Mp4 support" &&
-
optional_depends speex \
"--enable-speex" \
"--disable-speex" \
@@ -44,12 +57,9 @@ depends cairo &&
depends expat &&
depends fontconfig &&
depends freetype2 &&
-depends -sub CXX gcc &&
depends gdk-pixbuf2 &&
depends harfbuzz &&
depends libffi &&
-depends libid3tag &&
-depends libogg &&
depends libpng &&
depends libx11 &&
depends libxau &&
diff --git a/audio-soft/easytag/DETAILS b/audio-soft/easytag/DETAILS
index 9f35aa2..1b32d9e 100755
--- a/audio-soft/easytag/DETAILS
+++ b/audio-soft/easytag/DETAILS
@@ -1,10 +1,10 @@
SPELL=easytag
- VERSION=2.1.7
- PATCHLEVEL=1
- SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:e98b0d407ed37a4ede6891e1998a6c158b308b9f462dc2b810b21b21b00fbecd9eef74a29552cdf037bf654f208340fa83b3b625f6ac0fcb5bd08413c17d3c88
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+ VERSION=2.1.8
+ BRANCH=`echo $VERSION|cut -d . -f 1,2`
+ SOURCE=$SPELL-$VERSION.tar.xz
+ SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
+
SOURCE_HASH=sha512:cf5d92902276b8d462c695aaa0d1072684d60cbfc45d07fb2ac7b345907a775b94665612088b33f3272db22d4b4eb78f4a4e36f2caf6e151a08f640841208e48
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
LICENSE[0]=GPL
WEB_SITE=http://projects.gnome.org/easytag/
KEYWORDS="tools audio"
diff --git a/audio-soft/easytag/HISTORY b/audio-soft/easytag/HISTORY
index c7cca2b..8131d50 100644
--- a/audio-soft/easytag/HISTORY
+++ b/audio-soft/easytag/HISTORY
@@ -1,3 +1,8 @@
+2013-02-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.1.8; quoting paths
+ * DEPENDS: fixed dependencies
+ * BUILD: dropped
+
2013-02-10 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: new website, moved to gnome

diff --git a/devel/patch/DEPENDS b/devel/patch/DEPENDS
index 18594eb..92c212f 100755
--- a/devel/patch/DEPENDS
+++ b/devel/patch/DEPENDS
@@ -1,2 +1,7 @@
depends gnupg &&
-depends smgl-fhs
+depends smgl-fhs &&
+
+optional_depends attr \
+ "--enable-xattr" \
+ "--disable-xattr" \
+ "for extended attributes support"
diff --git a/devel/patch/HISTORY b/devel/patch/HISTORY
index a93813a..2e48e34 100644
--- a/devel/patch/HISTORY
+++ b/devel/patch/HISTORY
@@ -1,3 +1,6 @@
+2013-02-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added attr optional dependency
+
2012-09-28 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.7.1

diff --git a/graphics-libs/poppler/DEPENDS b/graphics-libs/poppler/DEPENDS
index 698a800..5111668 100755
--- a/graphics-libs/poppler/DEPENDS
+++ b/graphics-libs/poppler/DEPENDS
@@ -16,8 +16,8 @@ optional_depends tiff \
"--disable-libtiff" \
"for TIFF support" &&

-optional_depends lcms \
- "--enable-cms" \
+optional_depends lcms2 \
+ "--enable-cms=lcms2" \
"--disable-cms" \
"for color management" &&

diff --git a/graphics-libs/poppler/DETAILS b/graphics-libs/poppler/DETAILS
index 5c1e8a2..2576b87 100755
--- a/graphics-libs/poppler/DETAILS
+++ b/graphics-libs/poppler/DETAILS
@@ -12,11 +12,11 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
SOURCE_IGNORE=volatile
else
if [[ $POPPLER_BRANCH == devel ]]; then
- VERSION=0.20.5
-
SOURCE_HASH=sha512:2c9245d8a43c1daedcedc7916540cb5e9def8429382e9b3f3992d4a1fad081c035a9fc07d63998e210257d3dfd0b3b754e31be8f75fd2d94a8e50c7efbd1bb01
+ VERSION=0.22.1
+
SOURCE_HASH=sha512:038729dbdba8800f4944613fe40c6925cf424ee86e88048ffe50c72c5e86650dfd79fe39296480c837873dbf8f2c0acee8d803721c24203d9e355858a10ef9e2
else
- VERSION=0.20.5
-
SOURCE_HASH=sha512:2c9245d8a43c1daedcedc7916540cb5e9def8429382e9b3f3992d4a1fad081c035a9fc07d63998e210257d3dfd0b3b754e31be8f75fd2d94a8e50c7efbd1bb01
+ VERSION=0.22.1
+
SOURCE_HASH=sha512:038729dbdba8800f4944613fe40c6925cf424ee86e88048ffe50c72c5e86650dfd79fe39296480c837873dbf8f2c0acee8d803721c24203d9e355858a10ef9e2
fi
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY
index 9b3c81c..ab585fc 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,3 +1,7 @@
+2013-02-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.22.1
+ * DEPENDS: switched to lcms2 by default
+
2013-01-25 Pol Vinogradov <vin.public AT gmail.com>
* PRE_BUILD: added automake related fixes to the scm branch

diff --git a/http/siege/DETAILS b/http/siege/DETAILS
index 228186a..d9ea07b 100755
--- a/http/siege/DETAILS
+++ b/http/siege/DETAILS
@@ -1,9 +1,10 @@
SPELL=siege
- VERSION=2.72
+ VERSION=2.74
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://www.joedog.org/pub/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:831e3eeded85823b5c0e1a54db2b1c91f94a4900e309d3797a827a44f861fe7cb8ab617c33d1008de35f066a3f3ff72a0bb3900a79a47846a8acd61887b0d563
+
SOURCE_HASH=sha512:cd551beb79ac69c97b89b7ba4603dfe41190f0a65befbea53c096161e74dff33ea8f41a3d383d75fbec9535fcc229542da91a80c89a50beb7526a0748558835d
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ DOC_DIRS=""
WEB_SITE=http://www.joedog.org/index/siege-home
LICENSE[0]=GPL
ENTERED=20091017
diff --git a/http/siege/HISTORY b/http/siege/HISTORY
index b9763f3..5b8ed8e 100644
--- a/http/siege/HISTORY
+++ b/http/siege/HISTORY
@@ -1,3 +1,6 @@
+2013-02-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.74; don't gather makefiles for documents
+
2012-02-18 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.72; renewed source url

diff --git a/printer/cups-filters/DEPENDS b/printer/cups-filters/DEPENDS
index 601429d..3c16940 100755
--- a/printer/cups-filters/DEPENDS
+++ b/printer/cups-filters/DEPENDS
@@ -9,17 +9,26 @@ depends freetype2 &&
depends fontconfig &&
depends ijs &&
depends shared-mime-info &&
+
+# required for pstopdf script
runtime_depends bc &&
+
+optional_depends avahi \
+ "--enable-avahi" \
+ "--disable-avahi" \
+ "for DNS Service Discovery support using Avahi" &&
+
optional_depends JPEG \
'--with-jpeg' \
'--without-jpeg' \
'Support for JPEG filter' &&
+
optional_depends tiff \
'--with-tiff' \
'--without-tiff' \
'Support for TIFF filter' &&
+
optional_depends libpng \
'--with-png' \
'--without-png'\
'Support PNG filter'
-
diff --git a/printer/cups-filters/DETAILS b/printer/cups-filters/DETAILS
index 67599f2..2f2e1e6 100755
--- a/printer/cups-filters/DETAILS
+++ b/printer/cups-filters/DETAILS
@@ -1,6 +1,6 @@
SPELL=cups-filters
- VERSION=1.0.24
-
SOURCE_HASH=sha512:cdb9062009799197f5e79bdabd8dc73c4e17d88c8398262da8f7de031c79eca4677329ac8b182fe48733e1be57a4c150ba1bb523ea7201c84183e08b62dd59db
+ VERSION=1.0.29
+
SOURCE_HASH=sha512:a53ea0a4cc1673e0a4ec7da1273f3a750f006eb418cef708eea19ddcd66d134cd8c1e304b44b0c1d8ef7dd293f163947c5c8a7e9a890d1bd1f4a91d9508a0c4a
# 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..f2ac5f0 100644
--- a/printer/cups-filters/HISTORY
+++ b/printer/cups-filters/HISTORY
@@ -1,3 +1,9 @@
+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
+ * PRE_BUILD: added, to apply patch
+ * poppler-022.patch: added, to fix build with poppler >=0.22
+
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..ffc98e6
--- /dev/null
+++ b/printer/cups-filters/PRE_BUILD
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 0000000..4d20533
--- /dev/null
+++ b/printer/cups-filters/poppler-022.patch
@@ -0,0 +1,60 @@
+=== 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);
+ }
diff --git a/x11-libs/cairo/DETAILS b/x11-libs/cairo/DETAILS
index 2cc099f..ecf5ae6 100755
--- a/x11-libs/cairo/DETAILS
+++ b/x11-libs/cairo/DETAILS
@@ -1,13 +1,13 @@
SPELL=cairo
if [[ $CAIRO_DEVEL == y ]]; then
- VERSION=1.12.12
-
SOURCE_HASH=sha512:bde93913895116b80d857b965e34af969bee42d30d3e2d94edc6bc9af93ebb8f1124328a280f9d1b955d811e671e9d339e990669f30d5d861145b6bcc86e3f86
+ VERSION=1.12.14
+
SOURCE_HASH=sha512:c676973ab98e018291aeced53bcda9b192202f1a7d65c845798decfaee015f40600f4db32c8977ba4a3e6ff8dc10478f6fd06e83be7e6cca610be8aafd125ee0
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=http://cairographics.org/releases/$SOURCE
# SOURCE_GPG=gurus.gpg:$SOURCE.sig
else
- VERSION=1.12.12
-
SOURCE_HASH=sha512:bde93913895116b80d857b965e34af969bee42d30d3e2d94edc6bc9af93ebb8f1124328a280f9d1b955d811e671e9d339e990669f30d5d861145b6bcc86e3f86
+ VERSION=1.12.14
+
SOURCE_HASH=sha512:c676973ab98e018291aeced53bcda9b192202f1a7d65c845798decfaee015f40600f4db32c8977ba4a3e6ff8dc10478f6fd06e83be7e6cca610be8aafd125ee0
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=http://cairographics.org/releases/$SOURCE
fi
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index db659ac..503fe9c 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,6 @@
+2013-02-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.12.14
+
2013-02-01 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.12.12

[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (72d250b1879488116253c5a31d145f83eca742d2), Vlad Glagolev, 02/23/2013