update packages gdk-pixbuf pango

4 files changed, 8 insertions, 41 deletions

diff --git a/src/gdk-pixbuf-1-fixes.patch b/src/gdk-pixbuf-1-fixes.patch
index d48c21f..c52778f 100644
--- a/src/gdk-pixbuf-1-fixes.patch
+++ b/src/gdk-pixbuf-1-fixes.patch
@@ -6,7 +6,7 @@ Contains ad hoc patches for cross building.
 From 38f4e914e458de6963a3fddbb57dbf8cd0fb83b4 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Fri, 24 Sep 2010 23:31:24 +0200
-Subject: [PATCH 1/4] s,DllMain,static _disabled_DllMain,
+Subject: [PATCH 1/3] s,DllMain,static _disabled_DllMain,
 
 
 diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c
@@ -35,7 +35,7 @@ index 411ceb6..64db155 100644
 From 0903d316c228bf2a6ba9fe11188851a357cde43e Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Fri, 12 Oct 2012 12:24:51 +0200
-Subject: [PATCH 2/4] add libtiff to required.private in .pc
+Subject: [PATCH 2/3] add libtiff to required.private in .pc
 
 
 diff --git a/gdk-pixbuf-2.0.pc.in b/gdk-pixbuf-2.0.pc.in
@@ -58,7 +58,7 @@ index 7addefc..a07a46f 100644
 From 1e76ff73dcd6f191584bb05c8ccc9b0a16394a0d Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Fri, 12 Oct 2012 12:25:27 +0200
-Subject: [PATCH 3/4] allow static
+Subject: [PATCH 3/3] allow static
 
 
 diff --git a/configure.ac b/configure.ac
@@ -95,36 +95,3 @@ index a5224f8..a1fc2d0 100644
 -- 
 1.7.10.4
 
-
-[PATCH 4/4] pixbuf-randomly-modified.c includes sys/resource.h which does not
-exist in MXE.
-
-
-diff -ur a/tests/pixbuf-randomly-modified.c b/tests/pixbuf-randomly-modified.c
---- a/tests/pixbuf-randomly-modified.c	2013-09-23 15:06:17.000000000 +0200
-+++ b/tests/pixbuf-randomly-modified.c	2013-11-09 09:57:29.838931133 +0100
-@@ -26,7 +26,9 @@
- #include <time.h>
- #include <string.h>
- #include <sys/time.h>
-+#ifndef __MINGW32__
- #include <sys/resource.h>
-+#endif
- 
- static void
- disaster (const char *what)
-@@ -104,12 +106,14 @@
-   gboolean got_seed = FALSE;
-   GPtrArray *files = g_ptr_array_new ();
-   int l, iterations;
-+#ifndef __MINGW32__
-   struct rlimit max_mem_size;
- 
-   max_mem_size.rlim_cur = 100 * 1024 * 1024; /* 100M */
-   max_mem_size.rlim_max = max_mem_size.rlim_cur;
-   setrlimit (RLIMIT_DATA, &max_mem_size);
-   setrlimit (RLIMIT_AS, &max_mem_size);
-+#endif
- 
-   g_test_init (&argc, &argv, NULL);
- 
diff --git a/src/gdk-pixbuf.mk b/src/gdk-pixbuf.mk
index f8480c1..cfe2834 100644
--- a/src/gdk-pixbuf.mk
+++ b/src/gdk-pixbuf.mk
@@ -3,8 +3,8 @@
 
 PKG             := gdk-pixbuf
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.30.0
-$(PKG)_CHECKSUM := df660501febeae79753cb289d0861b0d3950d2de
+$(PKG)_VERSION  := 2.30.1
+$(PKG)_CHECKSUM := c3494a68f1bd72c3eaaeaf5e5c638e4051a31075
 $(PKG)_SUBDIR   := gdk-pixbuf-$($(PKG)_VERSION)
 $(PKG)_FILE     := gdk-pixbuf-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
diff --git a/src/pango-1-fixes.patch b/src/pango-1-fixes.patch
index ca5f093..39397f2 100644
--- a/src/pango-1-fixes.patch
+++ b/src/pango-1-fixes.patch
@@ -166,7 +166,7 @@ index ac62a89..96837d6 100644
 -   fi
 -fi
 -
--GTK_DOC_CHECK([1.0])
+-GTK_DOC_CHECK([1.15], [--flavour no-tmpl])
 +enable_gtk_doc=no
  
  AC_ARG_ENABLE(man,
diff --git a/src/pango.mk b/src/pango.mk
index 1797a2d..d120ee1 100644
--- a/src/pango.mk
+++ b/src/pango.mk
@@ -3,8 +3,8 @@
 
 PKG             := pango
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.36.0
-$(PKG)_CHECKSUM := 8b67b99c8757c8f83b1944f26d1cdf826279b7a0
+$(PKG)_VERSION  := 1.36.1
+$(PKG)_CHECKSUM := 8800fc023f0be07190b2a6708af4f064568a4710
 $(PKG)_SUBDIR   := pango-$($(PKG)_VERSION)
 $(PKG)_FILE     := pango-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://ftp.gnome.org/pub/gnome/sources/pango/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)