update package gtk2 and dependencies

This commit is contained in:
Niels Kristian Bech Jensen 2013-11-10 15:18:56 +11:00 committed by Tony Theodore
parent 364dc94e42
commit 02091d821a
9 changed files with 106 additions and 90 deletions

View File

@ -3,8 +3,8 @@
PKG := atk
$(PKG)_IGNORE :=
$(PKG)_VERSION := 2.8.0
$(PKG)_CHECKSUM := e8a9dacd22b31a6cb733ce66fb1c220cc6720970
$(PKG)_VERSION := 2.10.0
$(PKG)_CHECKSUM := 9b7f09a31f3781d5af4eb02ec0e2b289cf077a49
$(PKG)_SUBDIR := atk-$($(PKG)_VERSION)
$(PKG)_FILE := atk-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/atk/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)

View File

@ -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/3] s,DllMain,static _disabled_DllMain,
Subject: [PATCH 1/4] 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/3] add libtiff to required.private in .pc
Subject: [PATCH 2/4] 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/3] allow static
Subject: [PATCH 3/4] allow static
diff --git a/configure.ac b/configure.ac
@ -95,3 +95,36 @@ 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);

View File

@ -3,8 +3,8 @@
PKG := gdk-pixbuf
$(PKG)_IGNORE :=
$(PKG)_VERSION := 2.28.2
$(PKG)_CHECKSUM := 9876d0a20f592f8fb2a52d4a86ec43d607661beb
$(PKG)_VERSION := 2.30.0
$(PKG)_CHECKSUM := df660501febeae79753cb289d0861b0d3950d2de
$(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)

View File

@ -578,8 +578,8 @@ Subject: [PATCH 8/8] kill docs and gtk-doc dependence (mxe-specific)
diff -urN a/autogen.sh b/autogen.sh
--- a/autogen.sh 2012-08-18 19:32:04.000000000 +0200
+++ b/autogen.sh 2013-06-29 05:50:43.972750651 +0200
--- a/autogen.sh 2013-05-07 20:26:07.000000000 +0200
+++ b/autogen.sh 2013-11-09 06:17:50.014630402 +0100
@@ -7,18 +7,6 @@
olddir=`pwd`
cd "$srcdir"
@ -600,9 +600,9 @@ diff -urN a/autogen.sh b/autogen.sh
if test -z $AUTORECONF; then
echo "*** No autoreconf found, please install it ***"
diff -urN a/configure.ac b/configure.ac
--- a/configure.ac 2013-06-10 00:53:13.000000000 +0200
+++ b/configure.ac 2013-06-29 05:52:05.224754174 +0200
@@ -2645,13 +2645,6 @@
--- a/configure.ac 2013-10-15 21:14:26.000000000 +0200
+++ b/configure.ac 2013-11-09 06:18:17.274631022 +0100
@@ -2710,13 +2710,6 @@
dnl **************************
dnl *** Checks for gtk-doc ***
dnl **************************
@ -617,25 +617,25 @@ diff -urN a/configure.ac b/configure.ac
AC_ARG_ENABLE(man,
[AS_HELP_STRING([--enable-man],
diff -urN a/docs/Makefile.am b/docs/Makefile.am
--- a/docs/Makefile.am 2013-06-10 00:03:17.000000000 +0200
--- a/docs/Makefile.am 2013-08-08 12:00:40.000000000 +0200
+++ b/docs/Makefile.am 1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
@@ -1,12 +0,0 @@
-## Process this file with automake to produce Makefile.in
-include $(top_srcdir)/Makefile.decl
-
-SUBDIRS = reference
-
-EXTRA_DIST += debugging.txt macros.txt
-EXTRA_DIST = debugging.txt macros.txt
-
-files:
- @files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
- echo $$p; \
- done
-
-.PHONY: test test-report perf-report full-report
diff -urN a/docs/reference/gio/gdbus-object-manager-example/Makefile.am b/docs/reference/gio/gdbus-object-manager-example/Makefile.am
--- a/docs/reference/gio/gdbus-object-manager-example/Makefile.am 2013-06-10 00:03:17.000000000 +0200
--- a/docs/reference/gio/gdbus-object-manager-example/Makefile.am 2013-08-08 12:00:40.000000000 +0200
+++ b/docs/reference/gio/gdbus-object-manager-example/Makefile.am 1970-01-01 01:00:00.000000000 +0100
@@ -1,68 +0,0 @@
-include $(top_srcdir)/Makefile.decl
@@ -1,67 +0,0 @@
-NULL =
-
-# The name of the module.
@ -704,10 +704,9 @@ diff -urN a/docs/reference/gio/gdbus-object-manager-example/Makefile.am b/docs/r
-install-data-hook :
- rm -rf $(DESTDIR)$(datadir)/gtk-doc/html/gdbus-object-manager-example
diff -urN a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
--- a/docs/reference/gio/Makefile.am 2013-06-10 00:03:17.000000000 +0200
--- a/docs/reference/gio/Makefile.am 2013-08-08 12:00:40.000000000 +0200
+++ b/docs/reference/gio/Makefile.am 1970-01-01 01:00:00.000000000 +0100
@@ -1,179 +0,0 @@
-include $(top_srcdir)/Makefile.decl
@@ -1,178 +0,0 @@
-NULL =
-
-SUBDIRS = gdbus-object-manager-example
@ -887,11 +886,10 @@ diff -urN a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
-gio-docs-clean: clean
- cd $(srcdir) && rm -rf xml html
diff -urN a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am
--- a/docs/reference/glib/Makefile.am 2013-06-10 00:03:17.000000000 +0200
--- a/docs/reference/glib/Makefile.am 2013-08-08 12:00:40.000000000 +0200
+++ b/docs/reference/glib/Makefile.am 1970-01-01 01:00:00.000000000 +0100
@@ -1,128 +0,0 @@
@@ -1,127 +0,0 @@
-## Process this file with automake to produce Makefile.in
-include $(top_srcdir)/Makefile.decl
-
-AUTOMAKE_OPTIONS = 1.6
-
@ -1019,11 +1017,10 @@ diff -urN a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am
-glib-docs-clean: clean
- cd $(srcdir) && rm -rf xml html
diff -urN a/docs/reference/gobject/Makefile.am b/docs/reference/gobject/Makefile.am
--- a/docs/reference/gobject/Makefile.am 2013-06-10 00:03:17.000000000 +0200
--- a/docs/reference/gobject/Makefile.am 2013-08-08 12:00:40.000000000 +0200
+++ b/docs/reference/gobject/Makefile.am 1970-01-01 01:00:00.000000000 +0100
@@ -1,104 +0,0 @@
@@ -1,103 +0,0 @@
-## Process this file with automake to produce Makefile.in
-include $(top_srcdir)/Makefile.decl
-
-AUTOMAKE_OPTIONS = 1.6
-
@ -1127,31 +1124,43 @@ diff -urN a/docs/reference/gobject/Makefile.am b/docs/reference/gobject/Makefile
-gobject-docs-clean: clean
- cd $(srcdir) && rm -rf xml html
diff -urN a/docs/reference/Makefile.am b/docs/reference/Makefile.am
--- a/docs/reference/Makefile.am 2013-06-10 00:03:17.000000000 +0200
--- a/docs/reference/Makefile.am 2013-08-08 12:00:40.000000000 +0200
+++ b/docs/reference/Makefile.am 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
@@ -1 +0,0 @@
-SUBDIRS = glib gobject gio
diff -urN a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am
--- a/gio/tests/gdbus-object-manager-example/Makefile.am 2013-08-08 12:00:40.000000000 +0200
+++ b/gio/tests/gdbus-object-manager-example/Makefile.am 2013-11-09 06:20:32.858634115 +0100
@@ -25,12 +25,6 @@
test_ltlibraries = libgdbus-example-objectmanager.la
-if ENABLE_GTK_DOC
-# The docs pull these in, so we need them even if not doing 'make check'
-BUILT_SOURCES += $(GDBUS_GENERATED)
-noinst_LTLIBRARIES += libgdbus-example-objectmanager.la
-endif
-
nodist_libgdbus_example_objectmanager_la_SOURCES = \
gdbus-example-objectmanager-generated.h \
gdbus-example-objectmanager-generated.c
diff -urN a/Makefile.am b/Makefile.am
--- a/Makefile.am 2013-06-10 00:03:17.000000000 +0200
+++ b/Makefile.am 2013-06-29 05:50:18.224749533 +0200
--- a/Makefile.am 2013-09-17 20:47:14.000000000 +0200
+++ b/Makefile.am 2013-11-09 06:16:23.310628423 +0100
@@ -6,7 +6,7 @@
ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
-SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs
+SUBDIRS = . m4macros glib gmodule gthread gobject gio po
-SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs tests
+SUBDIRS = . m4macros glib gmodule gthread gobject gio po tests
DIST_SUBDIRS = $(SUBDIRS) build
if BUILD_MODULAR_TESTS
SUBDIRS += tests
@@ -71,8 +71,7 @@
README \
INSTALL \
ChangeLog \
- config.h.win32 \
- gtk-doc.make
+ config.h.win32
CONFIGURE_DEPENDENCIES = acglib.m4
bin_SCRIPTS = glib-gettextize
@@ -61,7 +61,6 @@
gio-unix-2.0.pc.in \
gio-windows-2.0.pc.in \
check-abis.sh \
- gtk-doc.make \
$(NULL)

View File

@ -3,8 +3,8 @@
PKG := glib
$(PKG)_IGNORE :=
$(PKG)_VERSION := 2.36.4
$(PKG)_CHECKSUM := ae189818c9f4ae8e404cc17c195f3e1c644fd97a
$(PKG)_VERSION := 2.38.1
$(PKG)_CHECKSUM := b43d07528dc97f093ce5f37dfa2a8976c7b3a1f1
$(PKG)_SUBDIR := glib-$($(PKG)_VERSION)
$(PKG)_FILE := glib-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/glib/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)

View File

@ -6,7 +6,7 @@ Contains ad hoc patches for cross building.
From 374c56944944128d57b33b3b5c1be978a02d3dbb Mon Sep 17 00:00:00 2001
From: MXE
Date: Fri, 24 Sep 2010 14:43:43 +0200
Subject: [PATCH 01/11] s,DllMain,static _disabled_DllMain,
Subject: [PATCH 01/10] s,DllMain,static _disabled_DllMain,
diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c
@ -42,7 +42,7 @@ index 56c92db..655f575 100644
From 8e08b42e368166814289abf32958c979d8d480c6 Mon Sep 17 00:00:00 2001
From: MXE
Date: Fri, 24 Sep 2010 14:46:20 +0200
Subject: [PATCH 02/11] s,__declspec(dllimport),,
Subject: [PATCH 02/10] s,__declspec(dllimport),,
diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h
@ -104,7 +104,7 @@ index c624aea..b792ea5 100644
From 59408e4752be8277c26f9ae458a086874844ab2b Mon Sep 17 00:00:00 2001
From: MXE
Date: Fri, 24 Sep 2010 15:03:28 +0200
Subject: [PATCH 03/11] s,__declspec(dllexport),,
Subject: [PATCH 03/10] s,__declspec(dllexport),,
diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h
@ -166,7 +166,7 @@ index b792ea5..f382a64 100644
From 15527e24127117bbaf24dec513daa6fb67a00a8c Mon Sep 17 00:00:00 2001
From: MXE
Date: Fri, 24 Sep 2010 14:17:22 +0200
Subject: [PATCH 04/11] fix gtk+-2.0.pc.in
Subject: [PATCH 04/10] fix gtk+-2.0.pc.in
diff --git a/gtk+-2.0.pc.in b/gtk+-2.0.pc.in
@ -187,7 +187,7 @@ index 46853e1..7f3eb22 100644
From 165597a3bbe73e830d79dbd2d109e3b075ea2985 Mon Sep 17 00:00:00 2001
From: MXE
Date: Fri, 24 Sep 2010 14:48:31 +0200
Subject: [PATCH 05/11] disable gtkbuiltincache
Subject: [PATCH 05/10] disable gtkbuiltincache
diff --git a/gtk/Makefile.in b/gtk/Makefile.in
@ -210,7 +210,7 @@ index 54200e7..e984933 100644
From 465171f3b0ebba7760719c0ee86a0d0f216fe51e Mon Sep 17 00:00:00 2001
From: MXE
Date: Fri, 24 Sep 2010 14:49:50 +0200
Subject: [PATCH 06/11] disable test-inline-pixbufs.h
Subject: [PATCH 06/10] disable test-inline-pixbufs.h
diff --git a/demos/Makefile.in b/demos/Makefile.in
@ -233,7 +233,7 @@ index 97e9536..abf0f14 100644
From 417065a8b000250f6553c2801a26eae4491041dd Mon Sep 17 00:00:00 2001
From: MXE
Date: Fri, 24 Sep 2010 14:51:04 +0200
Subject: [PATCH 07/11] permit static building
Subject: [PATCH 07/10] permit static building
diff --git a/configure b/configure
@ -334,7 +334,7 @@ index c61e096..34a116d 100755
From 907f9831f56004a322d785f34417e99735de3109 Mon Sep 17 00:00:00 2001
From: MXE
Date: Fri, 24 Sep 2010 14:53:18 +0200
Subject: [PATCH 08/11] no -Wl
Subject: [PATCH 08/10] no -Wl
diff --git a/configure b/configure
@ -357,7 +357,7 @@ index 34a116d..3c12234 100755
From 1e02f2e984433a899bc642af5622bea971a06a3a Mon Sep 17 00:00:00 2001
From: MXE
Date: Fri, 24 Sep 2010 14:54:15 +0200
Subject: [PATCH 09/11] gio not gio-unix
Subject: [PATCH 09/10] gio not gio-unix
diff --git a/configure b/configure
@ -383,7 +383,7 @@ index 3c12234..ce40ad1 100755
From b9bd33ba09c0297b874b7e6955864e6a76b83364 Mon Sep 17 00:00:00 2001
From: MXE
Date: Fri, 24 Sep 2010 15:30:49 +0200
Subject: [PATCH 10/11] removed duplicate _gtk_marshal_OBJECT__VOID()
Subject: [PATCH 10/10] removed duplicate _gtk_marshal_OBJECT__VOID()
diff --git a/perf/marshalers.c b/perf/marshalers.c
@ -437,29 +437,3 @@ index 9a8c715..14f5ab1 100644
--
1.8.2.2
From e232e6602e7476fbc72521892a69c636b63a6f14 Mon Sep 17 00:00:00 2001
From: MXE
Date: Thu, 23 May 2013 20:53:44 +1000
Subject: [PATCH 11/11] fix for mingw-w64 uuid
diff --git a/gdk/win32/gdkdnd-win32.c b/gdk/win32/gdkdnd-win32.c
index a41a0e7..05c60b8 100644
--- a/gdk/win32/gdkdnd-win32.c
+++ b/gdk/win32/gdkdnd-win32.c
@@ -69,8 +69,10 @@
* the current Windows code page. See gdkim-win32.c for more info on that.
*
*/
-
+
+#ifndef __MINGW64_VERSION_MAJOR
#define INITGUID
+#endif
#include "gdkdnd.h"
#include "gdkproperty.h"
--
1.8.2.2

View File

@ -3,8 +3,8 @@
PKG := gtk2
$(PKG)_IGNORE :=
$(PKG)_VERSION := 2.24.20
$(PKG)_CHECKSUM := 89315bf05dd3d626a50bae5417942ee4428012c9
$(PKG)_VERSION := 2.24.22
$(PKG)_CHECKSUM := 2175e25041244dc321e35dbdcf9cb5c371b455da
$(PKG)_SUBDIR := gtk+-$($(PKG)_VERSION)
$(PKG)_FILE := gtk+-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/gtk+/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)

View File

@ -3,8 +3,8 @@
PKG := pango
$(PKG)_IGNORE :=
$(PKG)_VERSION := 1.35.3
$(PKG)_CHECKSUM := ca439b3947854bf7bf8b8235c29427f357fb6e8c
$(PKG)_VERSION := 1.36.0
$(PKG)_CHECKSUM := 8b67b99c8757c8f83b1944f26d1cdf826279b7a0
$(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)

View File

@ -3,8 +3,8 @@
PKG := pixman
$(PKG)_IGNORE :=
$(PKG)_VERSION := 0.29.4
$(PKG)_CHECKSUM := de11c690f2aa0ffb4d98db9d8735888a72a510d2
$(PKG)_VERSION := 0.31.2
$(PKG)_CHECKSUM := 0246796a1220a52e8e98110dd1460b64e7f2476c
$(PKG)_SUBDIR := pixman-$($(PKG)_VERSION)
$(PKG)_FILE := pixman-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := http://cairographics.org/snapshots/$($(PKG)_FILE)