Mercurial > mxe-octave
comparison src/librsvg-1-fixes.patch @ 1219:ffb6a86b8f9a
improved patch layout
Use "git format-patch" instead of "git log -p --reverse"
to generate patches which can be imported with with "git am".
Also set author/from to "mingw-cross-env" since attribution
is done in the mingw-cross-env repository.
author | Mark Brand <mabrand@mabrand.nl> |
---|---|
date | Wed, 29 Sep 2010 19:42:33 +0200 |
parents | 71ff7a06339f |
children | 8d43a215ea43 |
comparison
equal
deleted
inserted
replaced
1218:e8e0dd3ce3e7 | 1219:ffb6a86b8f9a |
---|---|
1 This file is part of mingw-cross-env. | 1 This file is part of mingw-cross-env. |
2 See doc/index.html for further information. | 2 See doc/index.html for further information. |
3 | 3 |
4 commit 1ff5a73bee660f1d61f9cdd7c8d7aff29e959c4c | 4 Contains ad hoc patches for cross building. |
5 Author: Mark Brand <mabrand@mabrand.nl> | |
6 Date: Mon Sep 27 12:00:52 2010 +0200 | |
7 | 5 |
8 fix .pc requirements | 6 From 1ff5a73bee660f1d61f9cdd7c8d7aff29e959c4c Mon Sep 17 00:00:00 2001 |
7 From: mingw-cross-env | |
8 Date: Mon, 27 Sep 2010 12:00:52 +0200 | |
9 Subject: [PATCH 1/2] fix .pc requirements | |
10 | |
9 | 11 |
10 diff --git a/librsvg.pc.in b/librsvg.pc.in | 12 diff --git a/librsvg.pc.in b/librsvg.pc.in |
11 index 372f199..b6ee7a9 100644 | 13 index 372f199..b6ee7a9 100644 |
12 --- a/librsvg.pc.in | 14 --- a/librsvg.pc.in |
13 +++ b/librsvg.pc.in | 15 +++ b/librsvg.pc.in |
18 -Requires: glib-2.0 gio-2.0 gdk-pixbuf-2.0 cairo | 20 -Requires: glib-2.0 gio-2.0 gdk-pixbuf-2.0 cairo |
19 +Requires: glib-2.0 gio-2.0 gdk-pixbuf-2.0 cairo libgsf-1 pangocairo libcroco-0.6 | 21 +Requires: glib-2.0 gio-2.0 gdk-pixbuf-2.0 cairo libgsf-1 pangocairo libcroco-0.6 |
20 Requires.private: | 22 Requires.private: |
21 Libs: -L${libdir} -lrsvg-@RSVG_API_MAJOR_VERSION@ -lm | 23 Libs: -L${libdir} -lrsvg-@RSVG_API_MAJOR_VERSION@ -lm |
22 Cflags: -I${includedir}/librsvg-@RSVG_API_VERSION@ | 24 Cflags: -I${includedir}/librsvg-@RSVG_API_VERSION@ |
25 -- | |
26 1.7.1 | |
23 | 27 |
24 commit 9a7e7ebee9aab83659b9aced51fb53de5427138d | |
25 Author: Mark Brand <mabrand@mabrand.nl> | |
26 Date: Mon Sep 27 12:02:45 2010 +0200 | |
27 | 28 |
28 fix stray comma | 29 From 9a7e7ebee9aab83659b9aced51fb53de5427138d Mon Sep 17 00:00:00 2001 |
29 | 30 From: mingw-cross-env |
30 Taken from https://bugzilla.gnome.org/show_bug.cgi?id=630714 | 31 Date: Mon, 27 Sep 2010 12:02:45 +0200 |
32 Subject: [PATCH 2/2] fix stray comma | |
33 | |
34 Taken from https://bugzilla.gnome.org/show_bug.cgi?id=630714 | |
31 | 35 |
32 diff --git a/rsvg.h b/rsvg.h | 36 diff --git a/rsvg.h b/rsvg.h |
33 index 37e7930..41c4127 100644 | 37 index 37e7930..41c4127 100644 |
34 --- a/rsvg.h | 38 --- a/rsvg.h |
35 +++ b/rsvg.h | 39 +++ b/rsvg.h |
40 - RSVG_HANDLE_FLAGS_NONE = 0, | 44 - RSVG_HANDLE_FLAGS_NONE = 0, |
41 + RSVG_HANDLE_FLAGS_NONE = 0 | 45 + RSVG_HANDLE_FLAGS_NONE = 0 |
42 } RsvgHandleFlags; | 46 } RsvgHandleFlags; |
43 | 47 |
44 void rsvg_handle_set_base_gfile (RsvgHandle *handle, | 48 void rsvg_handle_set_base_gfile (RsvgHandle *handle, |
49 -- | |
50 1.7.1 | |
51 |