pool/darktable
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 137571 from graphics

Browse Source 
- 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
This commit is contained in:
Stephan Kulow 2012-10-10 07:18:28 +00:00 committed by Git OBS Bridge
parent 102a571d04
commit 45281794ee
3 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
darktable.changes
View File

@ -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

5
darktable.spec
View File

@ -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

32
rsvg_cairo.patch Normal file
View File

@ -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) ;
}