annotate 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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1204
71ff7a06339f upgrade package librsvg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
1 This file is part of mingw-cross-env.
71ff7a06339f upgrade package librsvg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
2 See doc/index.html for further information.
71ff7a06339f upgrade package librsvg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
3
1219
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1204
diff changeset
4 Contains ad hoc patches for cross building.
1204
71ff7a06339f upgrade package librsvg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
5
1219
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1204
diff changeset
6 From 1ff5a73bee660f1d61f9cdd7c8d7aff29e959c4c Mon Sep 17 00:00:00 2001
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1204
diff changeset
7 From: mingw-cross-env
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1204
diff changeset
8 Date: Mon, 27 Sep 2010 12:00:52 +0200
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1204
diff changeset
9 Subject: [PATCH 1/2] fix .pc requirements
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1204
diff changeset
10
1204
71ff7a06339f upgrade package librsvg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
11
71ff7a06339f upgrade package librsvg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
12 diff --git a/librsvg.pc.in b/librsvg.pc.in
71ff7a06339f upgrade package librsvg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
13 index 372f199..b6ee7a9 100644
71ff7a06339f upgrade package librsvg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
14 --- a/librsvg.pc.in
71ff7a06339f upgrade package librsvg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
15 +++ b/librsvg.pc.in
71ff7a06339f upgrade package librsvg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
16 @@ -9,7 +9,7 @@ css_supported=@CSS_SUPPORTED@
71ff7a06339f upgrade package librsvg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
17 Name: librsvg
71ff7a06339f upgrade package librsvg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
18 Description: library that renders svg files
71ff7a06339f upgrade package librsvg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
19 Version: @VERSION@
71ff7a06339f upgrade package librsvg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
20 -Requires: glib-2.0 gio-2.0 gdk-pixbuf-2.0 cairo
71ff7a06339f upgrade package librsvg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
21 +Requires: glib-2.0 gio-2.0 gdk-pixbuf-2.0 cairo libgsf-1 pangocairo libcroco-0.6
71ff7a06339f upgrade package librsvg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
22 Requires.private:
71ff7a06339f upgrade package librsvg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
23 Libs: -L${libdir} -lrsvg-@RSVG_API_MAJOR_VERSION@ -lm
71ff7a06339f upgrade package librsvg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
24 Cflags: -I${includedir}/librsvg-@RSVG_API_VERSION@
1219
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1204
diff changeset
25 --
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1204
diff changeset
26 1.7.1
1204
71ff7a06339f upgrade package librsvg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
27
71ff7a06339f upgrade package librsvg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
28
1219
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1204
diff changeset
29 From 9a7e7ebee9aab83659b9aced51fb53de5427138d Mon Sep 17 00:00:00 2001
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1204
diff changeset
30 From: mingw-cross-env
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1204
diff changeset
31 Date: Mon, 27 Sep 2010 12:02:45 +0200
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1204
diff changeset
32 Subject: [PATCH 2/2] fix stray comma
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1204
diff changeset
33
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1204
diff changeset
34 Taken from https://bugzilla.gnome.org/show_bug.cgi?id=630714
1204
71ff7a06339f upgrade package librsvg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
35
71ff7a06339f upgrade package librsvg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
36 diff --git a/rsvg.h b/rsvg.h
71ff7a06339f upgrade package librsvg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
37 index 37e7930..41c4127 100644
71ff7a06339f upgrade package librsvg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
38 --- a/rsvg.h
71ff7a06339f upgrade package librsvg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
39 +++ b/rsvg.h
71ff7a06339f upgrade package librsvg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
40 @@ -139,7 +139,7 @@ gboolean rsvg_handle_has_sub (RsvgHandle * handle, const char *id);
71ff7a06339f upgrade package librsvg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
41 /* GIO APIs */
71ff7a06339f upgrade package librsvg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
42
71ff7a06339f upgrade package librsvg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
43 typedef enum {
71ff7a06339f upgrade package librsvg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
44 - RSVG_HANDLE_FLAGS_NONE = 0,
71ff7a06339f upgrade package librsvg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
45 + RSVG_HANDLE_FLAGS_NONE = 0
71ff7a06339f upgrade package librsvg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
46 } RsvgHandleFlags;
71ff7a06339f upgrade package librsvg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
47
71ff7a06339f upgrade package librsvg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
48 void rsvg_handle_set_base_gfile (RsvgHandle *handle,
1219
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1204
diff changeset
49 --
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1204
diff changeset
50 1.7.1
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1204
diff changeset
51