Fix glib2 build and increase package version number.

SVN-Revision: 12477

diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile
index 4c7cd3d7cd8fcca8e2ab71341a2eb09b3cd19fd6..21ed236506838b444fe1f5e6333b06506c1c8594 100644 (file)
--- a/libs/glib2/Makefile
+++ b/libs/glib2/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=glib2
 PKG_VERSION:=2.16.5
 
 PKG_NAME:=glib2
 PKG_VERSION:=2.16.5

-PKG_RELEASE:=1
+PKG_RELEASE:=2

 
 PKG_SOURCE:=glib-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@GNOME/glib/2.16
 
 PKG_SOURCE:=glib-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@GNOME/glib/2.16

diff --git a/libs/glib2/patches/001-no_docs_and_tests.patch b/libs/glib2/patches/001-no_docs_and_tests.patch
index d75e1f09333ea45f7222add0cab525ba50da4298..c53d7f7b031a07a801fe632c01306945c01c6000 100644 (file)
--- a/libs/glib2/patches/001-no_docs_and_tests.patch
+++ b/libs/glib2/patches/001-no_docs_and_tests.patch
@@ -1,30 +1,7 @@
-diff --git a/Makefile.in b/Makefile.in
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -338,7 +338,7 @@ EXTRA_DIST = ChangeLog.pre-2-14 ChangeLog.pre-2-12 ChangeLog.pre-2-10 \
-       gio-2.0-uninstalled.pc.in gio-unix-2.0-uninstalled.pc.in
- TEST_PROGS = 
- AUTOMAKE_OPTIONS = 1.7
--SUBDIRS = . m4macros glib gobject gmodule gthread gio tests po docs
-+SUBDIRS = . m4macros glib gobject gmodule gthread gio po
- DIST_SUBDIRS = $(SUBDIRS) build
- bin_SCRIPTS = glib-gettextize
- AM_CPPFLAGS = \
-diff -urN glib-2.15.4/gio/Makefile.am glib-2.15.4.new/gio/Makefile.am
---- glib-2.15.4/gio/Makefile.am        2008-01-28 16:03:24.000000000 +0100
-+++ glib-2.15.4.new/gio/Makefile.am    2008-07-11 15:49:27.000000000 +0200
-@@ -123,7 +123,6 @@
- platform_libadd += -lshlwapi
- endif
- 
--SUBDIRS += tests
- 
- libgio_2_0_la_SOURCES =               \
-       gappinfo.c              \
-diff -urN glib-2.15.4/gio/Makefile.in glib-2.15.4.new/gio/Makefile.in
---- glib-2.15.4/gio/Makefile.in        2008-01-28 17:54:34.000000000 +0100
-+++ glib-2.15.4.new/gio/Makefile.in    2008-07-11 15:49:20.000000000 +0200
-@@ -168,7 +168,7 @@
+diff -urN glib-2.16.5.orig/gio/Makefile.in glib-2.16.5/gio/Makefile.in
+--- glib-2.16.5.orig/gio/Makefile.in   2008-09-02 01:43:09.000000000 +0200
++++ glib-2.16.5/gio/Makefile.in        2008-09-02 01:47:01.000000000 +0200
+@@ -165,7 +165,7 @@

    distclean-recursive maintainer-clean-recursive
  ETAGS = etags
  CTAGS = ctags
    distclean-recursive maintainer-clean-recursive
  ETAGS = etags
  CTAGS = ctags


@@ -33,12 +10,50 @@ diff -urN glib-2.15.4/gio/Makefile.in glib-2.15.4.new/gio/Makefile.in
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  ACLOCAL = @ACLOCAL@
  ALLOCA = @ALLOCA@
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  ACLOCAL = @ACLOCAL@
  ALLOCA = @ALLOCA@

-@@ -379,7 +379,7 @@
+@@ -380,7 +380,7 @@

        pltcheck.sh $(NULL)
  TEST_PROGS = 
  NULL = 
 -SUBDIRS = $(am__append_1) $(am__append_2) . $(am__append_4) tests
 +SUBDIRS = $(am__append_1) $(am__append_2) . $(am__append_4)
        pltcheck.sh $(NULL)
  TEST_PROGS = 
  NULL = 
 -SUBDIRS = $(am__append_1) $(am__append_2) . $(am__append_4) tests
 +SUBDIRS = $(am__append_1) $(am__append_2) . $(am__append_4)

+ @MS_LIB_AVAILABLE_TRUE@noinst_DATA = gio-2.0.lib

  @HAVE_GNUC_VISIBILITY_TRUE@@OS_LINUX_TRUE@TESTS = abicheck.sh pltcheck.sh
  AM_CPPFLAGS = \
  @HAVE_GNUC_VISIBILITY_TRUE@@OS_LINUX_TRUE@TESTS = abicheck.sh pltcheck.sh
  AM_CPPFLAGS = \

-       -DG_LOG_DOMAIN=\"GLib-GIO\"                     \
+diff -urN glib-2.16.5.orig/glib/Makefile.in glib-2.16.5/glib/Makefile.in
+--- glib-2.16.5.orig/glib/Makefile.in  2008-09-02 01:43:17.000000000 +0200
++++ glib-2.16.5/glib/Makefile.in       2008-09-02 01:44:48.000000000 +0200
+@@ -396,8 +396,8 @@
+ @ENABLE_REGEX_TRUE@gregex_c = gregex.c
+ @ENABLE_REGEX_FALSE@gregex_h = 
+ @ENABLE_REGEX_TRUE@gregex_h = gregex.h
+-SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . tests
+-DIST_SUBDIRS = libcharset gnulib pcre update-pcre tests
++SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre .
++DIST_SUBDIRS = libcharset gnulib pcre update-pcre
+ AM_CPPFLAGS = \
+       -I$(top_srcdir)                 \
+       $(pcre_inc)                     \
+diff -urN glib-2.16.5.orig/gobject/Makefile.in glib-2.16.5/gobject/Makefile.in
+--- glib-2.16.5.orig/gobject/Makefile.in       2008-09-02 01:43:06.000000000 +0200
++++ glib-2.16.5/gobject/Makefile.in    2008-09-02 01:46:05.000000000 +0200
+@@ -343,7 +343,7 @@
+ # GObject - GLib Type, Object, Parameter and Signal Library
+ # Copyright (C) 1997,98,99,2000 Tim Janik and Red Hat, Inc.
+ #
+-SUBDIRS = . tests
++SUBDIRS = .
+ AM_CPPFLAGS = \
+       -DG_LOG_DOMAIN=\"GLib-GObject\"         \
+       -I$(top_srcdir)                         \
+diff -urN glib-2.16.5.orig/Makefile.in glib-2.16.5/Makefile.in
+--- glib-2.16.5.orig/Makefile.in       2008-09-02 01:42:56.000000000 +0200
++++ glib-2.16.5/Makefile.in    2008-09-02 01:44:05.000000000 +0200
+@@ -342,7 +342,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
+ DIST_SUBDIRS = $(SUBDIRS) build
+ bin_SCRIPTS = glib-gettextize
+ AM_CPPFLAGS = \