[csw-devel] SF.net SVN: gar:[9969] csw/mgar/pkg/glib2/trunk

[dmichelsen at users.sourceforge.net]

Revision: 9969
          http://gar.svn.sourceforge.net/gar/?rev=9969&view=rev
Author:   dmichelsen
Date:     2010-05-25 14:54:26 +0000 (Tue, 25 May 2010)

Log Message:
-----------
glib2: Update to 2.25.7, needs updated dbus first

Modified Paths:
--------------
    csw/mgar/pkg/glib2/trunk/Makefile
    csw/mgar/pkg/glib2/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/glib2/trunk/files/0001-Make-sure-we-have-the-include-for-major-minor.patch

Modified: csw/mgar/pkg/glib2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glib2/trunk/Makefile	2010-05-25 14:39:46 UTC (rev 9968)
+++ csw/mgar/pkg/glib2/trunk/Makefile	2010-05-25 14:54:26 UTC (rev 9969)
@@ -1,5 +1,5 @@
 GARNAME = glib
-GARVERSION = 2.23.5
+GARVERSION = 2.25.7
 CATEGORIES = lib
 
 DESCRIPTION = The GLib library of C routines.
@@ -27,8 +27,14 @@
 
 # Bug reported upstream:
 #   https://bugzilla.gnome.org/show_bug.cgi?id=612300
-PATCHFILES += 0001-Use-G_STRFUNC-instead-of-explicit-gcc-only-__PRETTY_.patch
+# PATCHFILES += 0001-Use-G_STRFUNC-instead-of-explicit-gcc-only-__PRETTY_.patch
 
+PATCHFILES += 0001-Make-sure-we-have-the-include-for-major-minor.patch
+
+# We don't need it and if defined the test breaks
+LD_OPTIONS =
+EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
+
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-libiconv=gnu
 CONFIGURE_ARGS += --enable-static
@@ -48,9 +54,7 @@
 RUNTIME_DEP_PKGS_CSWglib2devel += CSWpython
 RUNTIME_DEP_PKGS_CSWglib2devel += CSWzlib
 
-#TEST_TARGET = check
-TEST_TARGET = 
-SKIPTEST ?= 0
+TEST_TARGET = check
 
 #provided by iconv
 MERGE_EXCLUDE_FILES = .*/charset.alias

Modified: csw/mgar/pkg/glib2/trunk/checksums
===================================================================
--- csw/mgar/pkg/glib2/trunk/checksums	2010-05-25 14:39:46 UTC (rev 9968)
+++ csw/mgar/pkg/glib2/trunk/checksums	2010-05-25 14:54:26 UTC (rev 9969)
@@ -1,6 +1,5 @@
-a87638e0505b6ff29efd8130450003c5  0001-Use-G_STRFUNC-instead-of-explicit-gcc-only-__PRETTY_.patch
 9f66027a275eb34d80a68ec8927bf66e  CMSG_LEN.patch
 f1f3c182f64be06ab57d8b01016af074  FIXED_STR.patch
-f249a94e8da086fd5d6e24dd4c1a1324  glib-2.23.5.tar.bz2
+ac4867b9450f8bf5f1075336a32a1a88  glib-2.25.7.tar.bz2
 8f683820d9ecab1abd9dbe81997ab9eb  glib-typedetect.patch
 bb2fb8eef43c995fea6c08563487ace6  gsize.patch

Added: csw/mgar/pkg/glib2/trunk/files/0001-Make-sure-we-have-the-include-for-major-minor.patch
===================================================================
--- csw/mgar/pkg/glib2/trunk/files/0001-Make-sure-we-have-the-include-for-major-minor.patch	                        (rev 0)
+++ csw/mgar/pkg/glib2/trunk/files/0001-Make-sure-we-have-the-include-for-major-minor.patch	2010-05-25 14:54:26 UTC (rev 9969)
@@ -0,0 +1,28 @@
+From 475c9fd0ca749f581c59260b8efe87633b083d0a Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 25 May 2010 16:12:45 +0200
+Subject: [PATCH] Make sure we have the include for major()/minor()
+
+---
+ gio/gdbusmessage.c |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c
+index eabe171..bb8cad1 100644
+--- a/gio/gdbusmessage.c
++++ b/gio/gdbusmessage.c
+@@ -30,6 +30,11 @@
+ #include <unistd.h>
+ #endif
+ 
++#ifdef __sun
++/* For defines of major() and minor() */
++#include <sys/mkdev.h>
++#endif
++
+ #include "gdbusutils.h"
+ #include "gdbusmessage.h"
+ #include "gdbuserror.h"
+-- 
+1.7.1
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.