bump gtk2-version, some minor changes

SVN-Revision: 18020

diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile
index d3b18198d7a70acf573097f665491e8fa56c2e29..3105a0b377d667da1ffd0d25859f8ca040d19a46 100644 (file)
--- a/libs/glib2/Makefile
+++ b/libs/glib2/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=glib2
-PKG_VERSION:=2.20.3
+PKG_VERSION:=2.22.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=glib-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR:=$(BUILD_DIR)/glib-$(PKG_VERSION)
-PKG_SOURCE_URL:=@GNOME/glib/2.20
-PKG_MD5SUM:=1173688c58b4b62809c83bb07a2cf71a
+PKG_SOURCE_URL:=@GNOME/glib/2.22
+PKG_MD5SUM:=846a86c74b74d5b16826aa5508940f9b
 
 PKG_FIXUP:=libtool
 PKG_BUILD_DEPENDS:=glib2/host

diff --git a/libs/glib2/patches/020-dont-build-tests.patch b/libs/glib2/patches/020-dont-build-tests.patch
index 8d53514c3e6d5e326e917e63437ef51224176803..d7ca0a4d7cd9cc6533450c5984f95925ad3233f6 100644 (file)
--- a/libs/glib2/patches/020-dont-build-tests.patch
+++ b/libs/glib2/patches/020-dont-build-tests.patch
@@ -1,19 +1,28 @@
-diff -urN glib-2.18.1.orig/gio/Makefile.in glib-2.18.1/gio/Makefile.in
---- glib-2.18.1.orig/gio/Makefile.in   2008-10-03 23:13:00.000000000 +0200
-+++ glib-2.18.1/gio/Makefile.in        2008-10-03 23:15:25.000000000 +0200
-@@ -180,7 +180,7 @@
-   distclean-recursive maintainer-clean-recursive
- ETAGS = etags
+diff -ruN glib-2.22.2.orig/gio/Makefile.in glib-2.22.2/gio/Makefile.in
+--- glib-2.22.2.orig/gio/Makefile.in   2009-10-07 15:56:29.000000000 +0200
++++ glib-2.22.2/gio/Makefile.in        2009-10-10 17:22:22.000000000 +0200
+@@ -242,7 +242,7 @@
  CTAGS = ctags
--DIST_SUBDIRS = xdgmime inotify fen win32 . fam tests
-+DIST_SUBDIRS = xdgmime inotify fen . fam
+ am__tty_colors = \
+ red=; grn=; lgn=; blu=; std=
+-DIST_SUBDIRS = libasyncns xdgmime inotify fen win32 . fam tests
++DIST_SUBDIRS = libasyncns xdgmime inotify fen . fam
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- ALLOCA = @ALLOCA@
-diff -urN glib-2.18.1.orig/glib/Makefile.in glib-2.18.1/glib/Makefile.in
---- glib-2.18.1.orig/glib/Makefile.in  2008-10-03 23:12:28.000000000 +0200
-+++ glib-2.18.1/glib/Makefile.in       2008-10-03 23:14:46.000000000 +0200
-@@ -412,8 +412,8 @@
+ am__relativize = \
+   dir0=`pwd`; \
+@@ -489,7 +489,7 @@
+ TEST_PROGS = 
+ NULL = 
+ SUBDIRS = $(am__append_1) $(am__append_2) $(am__append_6) \
+-      $(am__append_9) . $(am__append_12) tests
++      $(am__append_9) . $(am__append_12)
+ @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@noinst_DATA = gio-2.0.lib
+ @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir)
+ @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gio-2.0.lib
+diff -ruN glib-2.22.2.orig/glib/Makefile.in glib-2.22.2/glib/Makefile.in
+--- glib-2.22.2.orig/glib/Makefile.in  2009-10-07 15:56:30.000000000 +0200
++++ glib-2.22.2/glib/Makefile.in       2009-10-10 17:22:49.000000000 +0200
+@@ -483,8 +483,8 @@
  @ENABLE_REGEX_TRUE@gregex_c = gregex.c
  @ENABLE_REGEX_FALSE@gregex_h = 
  @ENABLE_REGEX_TRUE@gregex_h = gregex.h
@@ -24,10 +33,10 @@ diff -urN glib-2.18.1.orig/glib/Makefile.in glib-2.18.1/glib/Makefile.in
  AM_CPPFLAGS = \
        -I$(top_srcdir)                 \
        $(pcre_inc)                     \
-diff -urN glib-2.18.1.orig/gobject/Makefile.in glib-2.18.1/gobject/Makefile.in
---- glib-2.18.1.orig/gobject/Makefile.in       2008-10-03 23:12:46.000000000 +0200
-+++ glib-2.18.1/gobject/Makefile.in    2008-10-03 23:16:12.000000000 +0200
-@@ -341,7 +341,7 @@
+diff -ruN glib-2.22.2.orig/gobject/Makefile.in glib-2.22.2/gobject/Makefile.in
+--- glib-2.22.2.orig/gobject/Makefile.in       2009-10-07 15:56:31.000000000 +0200
++++ glib-2.22.2/gobject/Makefile.in    2009-10-10 17:23:31.000000000 +0200
+@@ -413,7 +413,7 @@
  # GObject - GLib Type, Object, Parameter and Signal Library
  # Copyright (C) 1997,98,99,2000 Tim Janik and Red Hat, Inc.
  #
@@ -36,15 +45,15 @@ diff -urN glib-2.18.1.orig/gobject/Makefile.in glib-2.18.1/gobject/Makefile.in
  AM_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"GLib-GObject\"         \
        -I$(top_srcdir)                         \
-diff -urN glib-2.18.1.orig/Makefile.in glib-2.18.1/Makefile.in
---- glib-2.18.1.orig/Makefile.in       2008-10-03 23:12:28.000000000 +0200
-+++ glib-2.18.1/Makefile.in    2008-10-03 23:14:14.000000000 +0200
-@@ -340,7 +340,7 @@
+diff -ruN glib-2.22.2.orig/Makefile.in glib-2.22.2/Makefile.in
+--- glib-2.22.2.orig/Makefile.in       2009-10-07 15:56:32.000000000 +0200
++++ glib-2.22.2/Makefile.in    2009-10-10 17:23:49.000000000 +0200
+@@ -398,7 +398,7 @@
        gio-2.0-uninstalled.pc.in gio-unix-2.0-uninstalled.pc.in
  TEST_PROGS = 
  AUTOMAKE_OPTIONS = 1.7
 -SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs
-+SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs
++SUBDIRS = . m4macros glib gmodule gthread gobject gio po
  DIST_SUBDIRS = $(SUBDIRS) build
  bin_SCRIPTS = glib-gettextize
  AM_CPPFLAGS = \