From: Elan Ruusamäe <glen@delfi.ee>
Date: Sat, 1 Sep 2012 20:35:10 +0000 (+0300)
Subject: fix librsvg header deprecation
X-Git-Tag: auto/th/darktable-1.0.5-2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fdarktable.git;a=commitdiff_plain;h=697e7ae405adfa046a270cb8c1b925311ed8ffef;hp=71e703283e88c4f3c2293bc5d9166be0978af9e3

fix librsvg header deprecation

Including <librsvg/rsvg-cairo.h> directly is deprecated.
---

diff --git a/darktable.spec b/darktable.spec
index 133e3b1..710d72f 100644
--- a/darktable.spec
+++ b/darktable.spec
@@ -6,12 +6,13 @@ Summary:	darktable is a virtual lighttable and darkroom for photographers
 Summary(pl.UTF-8):	darktable to wirtualny podświetlany stół i ciemnia dla fotografów
 Name:		darktable
 Version:	1.0.5
-Release:	1
+Release:	2
 License:	GPL v3
 Group:		X11/Applications/Graphics
 Source0:	http://downloads.sourceforge.net/darktable/%{name}-%{version}.tar.gz
 # Source0-md5:	9ad88a1a6b9761fce28c8073d8f47941
 Patch0:		cmake-glib.patch
+Patch1:		librsvg-headers.patch
 URL:		http://darktable.sourceforge.net/
 BuildRequires:	GConf2
 BuildRequires:	GConf2-devel
@@ -60,6 +61,7 @@ darktable to wirtualny podświetlany stół i ciemnia dla fotografów
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 install -d build
diff --git a/librsvg-headers.patch b/librsvg-headers.patch
new file mode 100644
index 0000000..bd11baa
--- /dev/null
+++ b/librsvg-headers.patch
@@ -0,0 +1,11 @@
+--- darktable-1.0.5/src/iop/watermark.c~	2012-07-21 13:44:08.000000000 +0300
++++ darktable-1.0.5/src/iop/watermark.c	2012-09-01 23:32:58.391794753 +0300
+@@ -38,7 +38,7 @@
+ #include <inttypes.h>
+ 
+ #include <librsvg/rsvg.h>
+-#include <librsvg/rsvg-cairo.h>
++#include <cairo.h>
+ 
+ #include "common/metadata.h"
+ #include "common/utility.h"