Skip to Content.
Sympa Menu

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

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 (d7b5533233dd39b09484db692d84a1ba09b23ab6)
  • Date: Wed, 10 Oct 2012 14:22:38 -0500

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

graphics/darktable/HISTORY | 4 ++++
graphics/darktable/PRE_BUILD | 5 +++++
graphics/darktable/rsvg.patch | 24 ++++++++++++++++++++++++
3 files changed, 33 insertions(+)

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

graphics/darktable: add patch to prevent compile error

diff --git a/graphics/darktable/HISTORY b/graphics/darktable/HISTORY
index 25c1ec0..462f335 100644
--- a/graphics/darktable/HISTORY
+++ b/graphics/darktable/HISTORY
@@ -1,4 +1,8 @@
2012-10-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * rsvg.patch, PRE_BUILD: add patch from upstream to prevent
+ compile error
+
+2012-10-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: fix source_url for scm version

2012-07-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
diff --git a/graphics/darktable/PRE_BUILD b/graphics/darktable/PRE_BUILD
new file mode 100755
index 0000000..4a45c23
--- /dev/null
+++ b/graphics/darktable/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+if [[ "$DARKTABLE_BRANCH" == "stable" ]]; then
+ patch -p1 < ${SPELL_DIRECTORY}/rsvg.patch
+fi
diff --git a/graphics/darktable/rsvg.patch b/graphics/darktable/rsvg.patch
new file mode 100644
index 0000000..2ad46d2
--- /dev/null
+++ b/graphics/darktable/rsvg.patch
@@ -0,0 +1,24 @@
+diff --git a/src/iop/watermark.c b/src/iop/watermark.c
+index bcd65d6..e3da730 100644
+--- a/src/iop/watermark.c
++++ b/src/iop/watermark.c
+@@ -36,7 +36,10 @@
+ #include <inttypes.h>
+
+ #include <librsvg/rsvg.h>
++// ugh, ugly hack. why do people break stuff all the time?
++#ifndef RSVG_CAIRO_H
+ #include <librsvg/rsvg-cairo.h>
++#endif
+
+ #include "common/metadata.h"
+ #include "common/utility.h"
+@@ -712,7 +715,7 @@ static void refresh_watermarks( dt_iop_module_t *self )
+ snprintf(filename, DT_MAX_PATH_LEN, "%s/%s", configdir, d_name);
+ gtk_combo_box_append_text( g->combobox1, d_name );
+ count++;
+- }
++ }
+ g_dir_close(dir) ;
+ }
+



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (d7b5533233dd39b09484db692d84a1ba09b23ab6), Florian Franzmann, 10/10/2012

Archive powered by MHonArc 2.6.24.

Top of Page