sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Florian Franzmann (c9983ea4379c6e0612826dc60a9ea88fd06f38e4)

From: Florian Franzmann <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (c9983ea4379c6e0612826dc60a9ea88fd06f38e4)
Date: Thu, 24 Jan 2013 13:09:32 -0600

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

graphics/darktable/0001-fix-gettext-dependency.patch | 25
+++++++++++++++++++
graphics/darktable/BUILD | 1
graphics/darktable/DEPENDS | 16 +++++++++---
graphics/darktable/DETAILS | 4 +--
graphics/darktable/HISTORY | 11 ++++++++
graphics/darktable/PRE_BUILD | 3 ++
graphics/imagemagick/DETAILS | 4 +--
graphics/imagemagick/HISTORY | 3 ++
8 files changed, 60 insertions(+), 7 deletions(-)

New commits:
commit c9983ea4379c6e0612826dc60a9ea88fd06f38e4
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

graphics/imagemagick: version 6.8.1-10

commit 0d4bc840fad48cd0b1666150153b0d70515df7b2
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

graphics/darktable: version 1.1.2

diff --git a/graphics/darktable/0001-fix-gettext-dependency.patch
b/graphics/darktable/0001-fix-gettext-dependency.patch
new file mode 100644
index 0000000..2321116
--- /dev/null
+++ b/graphics/darktable/0001-fix-gettext-dependency.patch
@@ -0,0 +1,25 @@
+From e5ff7c27ba4652aeeef461cad6ecf0de08c8a864 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Thu, 24 Jan 2013 19:02:13 +0100
+Subject: [PATCH] fix gettext dependency
+
+---
+ src/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 6157d69..ef50bf3 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -154,7 +154,7 @@ if(USE_NLS)
+ find_package(Gettext)
+ if(Gettext_FOUND)
+ include_directories(${Gettext_INCLUDE_DIRS})
+- list(APPEND LIBS ${Gettext_LIBRARIES})
++ list(APPEND LIBS ${Gettext_LIBRARIES} -lintl)
+ add_definitions("-DUSE_GETTEXT")
+ message(STATUS "Internationalization: Enabled")
+ else()
+--
+1.8.1
+
diff --git a/graphics/darktable/BUILD b/graphics/darktable/BUILD
index 131a11c..4ec405e 100755
--- a/graphics/darktable/BUILD
+++ b/graphics/darktable/BUILD
@@ -3,5 +3,6 @@ OPTS+=" -DDONT_INSTALL_GCONF_SCHEMAS=1" &&
OPTS+=" -DINSTALL_IOP_LEGACY=1" &&
OPTS+=" -DINSTALL_IOP_EXPERIMENTAL=1" &&
OPTS+=" -DBINARY_PACKAGE_BUILD=1" &&
+OPTS+=" -DBUILD_SLIDESHOW=off" &&
CFLAGS="${CFLAGS} -Wno-error=deprecated-declarations" \
CXXFLAGS="${CXXFLAGS} -Wno-error=deprecated-declarations" cmake_build
diff --git a/graphics/darktable/DEPENDS b/graphics/darktable/DEPENDS
index f52e525..dba7ee6 100755
--- a/graphics/darktable/DEPENDS
+++ b/graphics/darktable/DEPENDS
@@ -1,3 +1,4 @@
+depends JPEG &&
depends cairo &&
depends cmake &&
depends curl &&
@@ -5,15 +6,18 @@ depends dbus-glib &&
depends exiv2 &&
depends fop &&
depends gconf2 &&
+depends gdk-pixbuf2 &&
depends glade2 &&
-depends gphoto2 &&
+depends glib2 &&
depends gtk+2 &&
-depends JPEG &&
depends lcms2 &&
depends lensfun &&
depends libpng &&
depends libraw &&
+depends librsvg2 &&
+depends libxslt &&
depends openexr &&
+depends pango &&
depends sdl &&
depends sqlite &&
depends tiff &&
@@ -22,4 +26,10 @@ if [[ "$DARKTABLE_BRANCH" == "scm" ]]; then
fi &&
optional_depends gnome-keyring "-DUSE_GNOME_KEYRING=ON"
"-DUSE_GNOME_KEYRING=OFF" "build gnome-keyring password storage backend" &&
optional_depends flickurl "-DUSE_FLICKR=ON" "-DUSE_FLICKR=OFF"
"support for flickr" &&
-optional_depends kwallet "-DUSE_KWALLET=ON" "-DUSE_KWALLET=OFF"
"use kwallet as password storage backend"
+optional_depends kwallet "-DUSE_KWALLET=ON" "-DUSE_KWALLET=OFF"
"use kwallet as password storage backend" &&
+optional_depends libxml2 "-DUSE_XMLLINT=ON" "-DUSE_XMLLINT=OFF"
"use xmllint" &&
+optional_depends gettext "-DUSE_NLS=ON" "-DUSE_NLS=OFF"
"for native language support" &&
+optional_depends gphoto2 "-DUSE_CAMERA_SUPPORT=ON"
"-DUSE_CAMERA_SUPPORT=OFF" "for camera support" &&
+optional_depends json-glib "-DUSE_JSON_GLIB=ON"
"-DUSE_JSON_GLIB=OFF" "for glib json support" &&
+optional_depends colord "-DUSE_COLORD=ON" "-DUSE_COLORD=OFF"
"for colord support" &&
+optional_depends libsoup "-DUSE_GEO=ON" "-DUSE_GEO=OFF"
"for OSM GPS mapping support"
diff --git a/graphics/darktable/DETAILS b/graphics/darktable/DETAILS
index 1bcb2bb..bc2c0b2 100755
--- a/graphics/darktable/DETAILS
+++ b/graphics/darktable/DETAILS
@@ -1,9 +1,9 @@
SPELL=darktable
if [[ "$DARKTABLE_BRANCH" == "stable" ]]; then
- VERSION=1.1.1
+ VERSION=1.1.2
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=$SOURCEFORGE_URL/project/${SPELL}/${SPELL}/$(echo
$VERSION|cut -f1 -d.).$(echo $VERSION|cut -f2 -d.)/${SOURCE}
-
SOURCE_HASH=sha512:7a525adce3b6bf97c1c7a4fc1553854fb822f6ef80d4487c5ea919f3d78e5dbe8f0c0c3bb8d01b6a6220e91e1aa5055fcf8deb0adfa771b2c9bb6a900299c297
+
SOURCE_HASH=sha512:d4c9edd0e0a6962776e38dbcb58ebcad806f745c5a4938052df0e52cad242318bdb9d747b060b76cafb6c549198506af6e1c71956681c0afbbd2bb1fef609584
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
else
if [[ "$DARKTABLE_AUTOUPDATE" == "y" ]]; then
diff --git a/graphics/darktable/HISTORY b/graphics/darktable/HISTORY
index 0adeb24..97df81e 100644
--- a/graphics/darktable/HISTORY
+++ b/graphics/darktable/HISTORY
@@ -1,3 +1,14 @@
+2013-01-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.1.2
+ * DEPENDS: added dependencies on gdk-pixbuf2, glib2, librsvg2,
+ libxslt and pango, made the dependency on gphoto2 optional,
+ added optional dependencies on libxml2, gettext, json-glib,
+ colord and libsoup
+ * PRE_BUILD, 0001-fix-gettext-dependency.patch: fix link error
+ related to gettext
+ * BUILD: deactivate slideshow view to avoid linker error related
+ to libGLU
+
2012-12-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.1.1

diff --git a/graphics/darktable/PRE_BUILD b/graphics/darktable/PRE_BUILD
new file mode 100755
index 0000000..8ebe455
--- /dev/null
+++ b/graphics/darktable/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < $SPELL_DIRECTORY/0001-fix-gettext-dependency.patch
diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index c7eddab..94313ac 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -1,5 +1,5 @@
SPELL=imagemagick
- VERSION=6.8.1-7
+ VERSION=6.8.1-10
SECURITY_PATCH=1
SOURCE=ImageMagick-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
SOURCE_URL[1]=ftp://ftp.surfnet.nl/pub/ImageMagick/$SOURCE
SOURCE_URL[2]=ftp://ftp.nluug.nl/pub/ImageMagick/$SOURCE
SOURCE_URL[3]=http://image_magick.veidrodis.com/image_magick/$SOURCE
-
SOURCE_HASH=sha512:9ed22301eb920e3f7e9bfecde2b84346709b3ae2321a21c014c4134c70e18496bf2335eec5a9b89bf140ef224544b8554a329b3a443efd7a329904188e4ccd43
+
SOURCE_HASH=sha512:e096e5d19b940643c2eb61215ef41ef4bdc3debadd5e5c5bcbddc2fda329b77f2988781cde85634a2801e16d5113635d03342a6333aef56bb1c80e14aaf6bfda
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
CCACHE="off"
WEB_SITE=http://www.imagemagick.org/
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index da9b215..fc2c793 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,6 @@
+2013-01-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 6.8.1-10
+
2013-01-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 6.8.1-7

[SM-Commit] GIT changes to master grimoire by Florian Franzmann (c9983ea4379c6e0612826dc60a9ea88fd06f38e4), Florian Franzmann, 01/24/2013