diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2010-09-27 10:47:49 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2010-09-27 10:47:49 (GMT) |
| commit | 21f3f5bb9dfa5e070bc362e6ba5ad9cda6c7fefc (patch) | |
| tree | cbd39b65808330f3be4e7167a0431f03fe5f7354 | |
| parent | 305f023d2957448e8ec338a9bf6fd78593fcef1f (diff) | |
| download | mxe-21f3f5bb9dfa5e070bc362e6ba5ad9cda6c7fefc.zip mxe-21f3f5bb9dfa5e070bc362e6ba5ad9cda6c7fefc.tar.gz mxe-21f3f5bb9dfa5e070bc362e6ba5ad9cda6c7fefc.tar.bz2 | |
upgrade package librsvg
| -rw-r--r-- | src/librsvg-1-fixes.patch | 44 | ||||
| -rw-r--r-- | src/librsvg.mk | 8 |
2 files changed, 47 insertions, 5 deletions
diff --git a/src/librsvg-1-fixes.patch b/src/librsvg-1-fixes.patch new file mode 100644 index 0000000..7ff2dce --- /dev/null +++ b/src/librsvg-1-fixes.patch @@ -0,0 +1,44 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +commit 1ff5a73bee660f1d61f9cdd7c8d7aff29e959c4c +Author: Mark Brand <mabrand@mabrand.nl> +Date: Mon Sep 27 12:00:52 2010 +0200 + + fix .pc requirements + +diff --git a/librsvg.pc.in b/librsvg.pc.in +index 372f199..b6ee7a9 100644 +--- a/librsvg.pc.in ++++ b/librsvg.pc.in +@@ -9,7 +9,7 @@ css_supported=@CSS_SUPPORTED@ + Name: librsvg + Description: library that renders svg files + Version: @VERSION@ +-Requires: glib-2.0 gio-2.0 gdk-pixbuf-2.0 cairo ++Requires: glib-2.0 gio-2.0 gdk-pixbuf-2.0 cairo libgsf-1 pangocairo libcroco-0.6 + Requires.private: + Libs: -L${libdir} -lrsvg-@RSVG_API_MAJOR_VERSION@ -lm + Cflags: -I${includedir}/librsvg-@RSVG_API_VERSION@ + +commit 9a7e7ebee9aab83659b9aced51fb53de5427138d +Author: Mark Brand <mabrand@mabrand.nl> +Date: Mon Sep 27 12:02:45 2010 +0200 + + fix stray comma + + Taken from https://bugzilla.gnome.org/show_bug.cgi?id=630714 + +diff --git a/rsvg.h b/rsvg.h +index 37e7930..41c4127 100644 +--- a/rsvg.h ++++ b/rsvg.h +@@ -139,7 +139,7 @@ gboolean rsvg_handle_has_sub (RsvgHandle * handle, const char *id); + /* GIO APIs */ + + typedef enum { +- RSVG_HANDLE_FLAGS_NONE = 0, ++ RSVG_HANDLE_FLAGS_NONE = 0 + } RsvgHandleFlags; + + void rsvg_handle_set_base_gfile (RsvgHandle *handle, diff --git a/src/librsvg.mk b/src/librsvg.mk index 2cee754..9654269 100644 --- a/src/librsvg.mk +++ b/src/librsvg.mk @@ -4,8 +4,8 @@ # librsvg PKG := librsvg $(PKG)_IGNORE := -$(PKG)_VERSION := 2.26.3 -$(PKG)_CHECKSUM := ef0063eaa9e638364cc8ff142aadef8a267b7af5 +$(PKG)_VERSION := 2.32.0 +$(PKG)_CHECKSUM := 252727b948a29b36dae0022e0c620538bcb158f8 $(PKG)_SUBDIR := librsvg-$($(PKG)_VERSION) $(PKG)_FILE := librsvg-$($(PKG)_VERSION).tar.bz2 $(PKG)_WEBSITE := http://librsvg.sourceforge.net/ @@ -14,14 +14,12 @@ $(PKG)_DEPS := gcc glib libgsf cairo pango gtk libcroco define $(PKG)_UPDATE wget -q -O- 'http://git.gnome.org/browse/librsvg/refs/tags' | \ - $(SED) -n 's,.*<a[^>]*>LIBRSVG_\([0-9][0-9_]*\)<.*,\1,p' | \ - $(SED) 's,_,.,g' | \ + $(SED) -n 's,.*<a[^>]*>\([0-9][0-9.]*\)<.*,\1,p' | \ head -1 endef define $(PKG)_BUILD $(SED) -i 's,glib-mkenums,$(PREFIX)/$(TARGET)/bin/glib-mkenums,g' '$(1)'/Makefile.in - $(SED) -i 's,^\(Requires:.*\),\1 libgsf-1 pangocairo libcroco-0.6,' '$(1)'/librsvg-2.0.pc.in cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ |