Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (0aabc94d345240fa4a4dd641b3cb6d67df18cc67)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (0aabc94d345240fa4a4dd641b3cb6d67df18cc67)
  • Date: Sun, 7 Apr 2013 06:12:21 -0500

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/0001-remove-Werror-from-CXXFLAGS.patch | 29
--------------
graphics/darktable/DEPENDS | 10 +++-
graphics/darktable/DETAILS | 4 -
graphics/darktable/HISTORY | 8 +++
graphics/darktable/PRE_BUILD | 4 -
6 files changed, 17 insertions(+), 63 deletions(-)

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

graphics/darktable: version 1.2

diff --git a/graphics/darktable/0001-fix-gettext-dependency.patch
b/graphics/darktable/0001-fix-gettext-dependency.patch
deleted file mode 100644
index 2321116..0000000
--- a/graphics/darktable/0001-fix-gettext-dependency.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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/0001-remove-Werror-from-CXXFLAGS.patch
b/graphics/darktable/0001-remove-Werror-from-CXXFLAGS.patch
deleted file mode 100644
index fb93c20..0000000
--- a/graphics/darktable/0001-remove-Werror-from-CXXFLAGS.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From ab9d6a3eca3a5a17aa5016d53b050ae1da9ed7ff Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
-Date: Fri, 22 Mar 2013 18:19:24 +0100
-Subject: [PATCH] remove -Werror from CXXFLAGS
-
----
- src/CMakeLists.txt | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index a43d2e6..30ac41d 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -277,12 +277,6 @@ endif(NOT WIN32)
-
- if(NOT CUSTOM_CFLAGS)
-
--if(NOT APPLE AND NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")
-- # apple build fails on deprecated warnings..
-- # and too many warnings reported by Clang for now
-- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
--endif(NOT APPLE AND NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")
--
- if(NOT BINARY_PACKAGE_BUILD)
- MESSAGE("-- Checking for -march=native support")
- CHECK_C_COMPILER_FLAG("-march=native" MARCHNATIVE)
---
-1.8.1.3
-
diff --git a/graphics/darktable/DEPENDS b/graphics/darktable/DEPENDS
index e752d40..984fbe8 100755
--- a/graphics/darktable/DEPENDS
+++ b/graphics/darktable/DEPENDS
@@ -2,7 +2,6 @@ depends JPEG &&
depends cairo &&
depends cmake &&
depends curl &&
-depends dbus-glib &&
depends exiv2 &&
depends gconf2 &&
depends gdk-pixbuf2 &&
@@ -20,15 +19,20 @@ depends pango &&
depends sdl &&
depends sqlite &&
depends tiff &&
+if spell_installed kdelibs4; then
+ depends kdelibs4 &&
+ depends kwallet
+fi &&
if [[ "$DARKTABLE_BRANCH" == "scm" ]]; then
depends git
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 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"
+optional_depends libsoup "-DUSE_GEO=ON" "-DUSE_GEO=OFF"
"for OSM GPS mapping support" &&
+optional_depends openjpeg "-DUSE_OPENJPEG=ON" "-DUSE_OPENJPEG=OFF"
"for JPEG2000 support" &&
+optional_depends graphicsmagick "-DUSE_GRAPHICSMAGICK=ON"
"-DUSE_GRAPHICSMAGICK=OFF" "use GraphicsMagick for image import"
diff --git a/graphics/darktable/DETAILS b/graphics/darktable/DETAILS
index b5e6b62..f72f216 100755
--- a/graphics/darktable/DETAILS
+++ b/graphics/darktable/DETAILS
@@ -1,9 +1,9 @@
SPELL=darktable
if [[ "$DARKTABLE_BRANCH" == "stable" ]]; then
- VERSION=1.1.4
+ VERSION=1.2
SOURCE="${SPELL}-${VERSION}.tar.xz"
SOURCE_URL[0]=$SOURCEFORGE_URL/project/${SPELL}/${SPELL}/$(echo
$VERSION|cut -f1 -d.).$(echo $VERSION|cut -f2 -d.)/${SOURCE}
-
SOURCE_HASH=sha512:6ab94c4d49697fc32727ab6f62a37ea56b40968e29a737863640b486054116e21596c440432a81e41368957d9b2eca34ff466b1e0ba494091f4fee97c6350b80
+
SOURCE_HASH=sha512:3a0e10bfeeade0225c7f07a0419a7c7f6f99d6e6a81618e63edf42a00ba3ffa1699c221ade61626f2a1c49e66d275b4351f6dcdb4db8786e6d28b36b68c5758e
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
else
if [[ "$DARKTABLE_AUTOUPDATE" == "y" ]]; then
diff --git a/graphics/darktable/HISTORY b/graphics/darktable/HISTORY
index 2d8961e..8abf073 100644
--- a/graphics/darktable/HISTORY
+++ b/graphics/darktable/HISTORY
@@ -1,3 +1,11 @@
+2013-04-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.2
+ * DEPENDS: added optional dependencies on openjpeg, graphicsmagick,
+ removed optional dependency on kwallet, glib-dbus, added dependency
+ on kdelibs4 and kwallet if kdelibs4 is installed
+ * 0001-fix-gettext-dependency.patch,
0001-remove-Werror-from-CXXFLAGS.patch,
+ PRE_BUILD: removed
+
2013-03-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, 0001-remove-Werror-from-CXXFLAGS.patch:
remove -Werror from FLAGS
diff --git a/graphics/darktable/PRE_BUILD b/graphics/darktable/PRE_BUILD
deleted file mode 100755
index 8125dca..0000000
--- a/graphics/darktable/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-patch -p1 < $SPELL_DIRECTORY/0001-fix-gettext-dependency.patch &&
-patch -p1 < $SPELL_DIRECTORY/0001-remove-Werror-from-CXXFLAGS.patch



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (0aabc94d345240fa4a4dd641b3cb6d67df18cc67), Florian Franzmann, 04/07/2013

Archive powered by MHonArc 2.6.24.

Top of Page