From 45281794ee39faa29e430c7382ef8f7fd61b98deca268e3a305737271f7fd6ae Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Wed, 10 Oct 2012 07:18:28 +0000
Subject: [PATCH] Accepting request 137571 from graphics

- Add rsvg_cairo.patch: Fixes Build for factory because of deprecated
  use of  librsvg (from git) (forwarded request 137570 from toganm)

OBS-URL: https://build.opensuse.org/request/show/137571
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/darktable?expand=0&rev=18
---
 darktable.changes |  6 ++++++
 darktable.spec    |  5 +++++
 rsvg_cairo.patch  | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+)
 create mode 100644 rsvg_cairo.patch

diff --git a/darktable.changes b/darktable.changes
index fd70892..8dd4e00 100644
--- a/darktable.changes
+++ b/darktable.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct  9 10:40:40 UTC 2012 - toganm@opensuse.org
+
+- Add rsvg_cairo.patch: Fixes Build for factory because of deprecated
+  use of  librsvg (from git)
+
 -------------------------------------------------------------------
 Sun Aug  5 16:44:24 UTC 2012 - fcrozat@suse.com
 
diff --git a/darktable.spec b/darktable.spec
index 9632631..fd85f02 100644
--- a/darktable.spec
+++ b/darktable.spec
@@ -22,6 +22,8 @@ Release:        0
 Url:            http://darktable.sourceforge.net
 Source0:        https://downloads.sourceforge.net/project/darktable/darktable/1.0/darktable-%{version}.tar.gz
 Patch0:         update-curves.patch
+# PATCH-FIX-UPSTREAM Tobias Ellinghaus me@houz.org -- rsvg_cairo.patch fix build for deprecated use of librsvg error
+Patch1:         rsvg_cairo.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  Mesa-devel
 BuildRequires:  OpenEXR-devel
@@ -60,6 +62,9 @@ lighttable. it also enables you to develop raw images and enhance them.
 %prep
 %setup -q
 %patch0 -p1
+%if 0%{?suse_version} > 1220
+%patch1 -p1
+%endif
 
 %build
 [ ! -d "build" ] && mkdir  build
diff --git a/rsvg_cairo.patch b/rsvg_cairo.patch
new file mode 100644
index 0000000..d9253bb
--- /dev/null
+++ b/rsvg_cairo.patch
@@ -0,0 +1,32 @@
+commit 343df29553a126f29b5379fefeb7c2cfd1adc073
+Author: Tobias Ellinghaus <me@houz.org>
+Date:   Sat Sep 15 11:53:25 2012 +0200
+
+    Hopefully fix #8931 with an ugly hack
+
+---
+ src/iop/watermark.c |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/src/iop/watermark.c
++++ b/src/iop/watermark.c
+@@ -38,7 +38,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"
+@@ -708,7 +711,7 @@ static void refresh_watermarks( dt_iop_m
+       snprintf(filename, 2048, "%s/%s", configdir, d_name);
+       gtk_combo_box_append_text( g->combobox1, d_name );
+       count++;
+-    } 
++    }
+     g_dir_close(dir) ;
+   }
+