diff --git a/portage/testing/glib-src/glib-2.29.14-20110723.diff b/portage/testing/glib-src/glib-2.29.14-20121010.diff
similarity index 69%
rename from portage/testing/glib-src/glib-2.29.14-20110723.diff
rename to portage/testing/glib-src/glib-2.29.14-20121010.diff
index 6dd023e3a..d93683b9a 100644
--- a/portage/testing/glib-src/glib-2.29.14-20110723.diff
+++ b/portage/testing/glib-src/glib-2.29.14-20121010.diff
@@ -1,110 +1,141 @@
diff -Nru glib-2.29.14.orig/build/win32/vs10/gio.vcxproj glib-2.29.14/build/win32/vs10/gio.vcxproj
---- glib-2.29.14.orig/build/win32/vs10/gio.vcxproj 2011-07-22 09:13:19.000000000 +0200
-+++ glib-2.29.14/build/win32/vs10/gio.vcxproj 2011-07-23 16:39:12.713856200 +0200
+--- glib-2.29.14.orig/build/win32/vs10/gio.vcxproj 2011-07-22 08:13:19.000000000 +0100
++++ glib-2.29.14/build/win32/vs10/gio.vcxproj 2012-10-10 02:02:23.166508800 +0100
@@ -82,7 +82,7 @@
CompileAsC
- zdll.lib;ws2_32.lib;shlwapi.lib;dnsapi.lib;%(AdditionalDependencies)
++ zlib.lib;ws2_32.lib;shlwapi.lib;dnsapi.lib;%(AdditionalDependencies)
+ $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll
+ $(IntDir)gio.def
+ true
+@@ -106,7 +106,7 @@
+ CompileAsC
+
+
+- zdll.lib;ws2_32.lib;shlwapi.lib;dnsapi.lib;%(AdditionalDependencies)
++ zlib.lib;ws2_32.lib;shlwapi.lib;dnsapi.lib;%(AdditionalDependencies)
+ $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll
+ $(IntDir)gio.def
+ true
+@@ -135,7 +135,7 @@
+ CompileAsC
+
+
+- zdll.lib;ws2_32.lib;shlwapi.lib;dnsapi.lib;%(AdditionalDependencies)
++ zlib.lib;ws2_32.lib;shlwapi.lib;dnsapi.lib;%(AdditionalDependencies)
+ $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll
+ $(IntDir)gio.def
+ true
+@@ -159,7 +159,7 @@
+ CompileAsC
+
+
+- zdll.lib;ws2_32.lib;shlwapi.lib;dnsapi.lib;%(AdditionalDependencies)
+ zlib.lib;ws2_32.lib;shlwapi.lib;dnsapi.lib;%(AdditionalDependencies)
$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll
$(IntDir)gio.def
true
diff -Nru glib-2.29.14.orig/build/win32/vs10/glib.props glib-2.29.14/build/win32/vs10/glib.props
--- glib-2.29.14.orig/build/win32/vs10/glib.props 2011-07-13 11:34:24.000000000 +0200
+++ glib-2.29.14/build/win32/vs10/glib.props 2011-07-23 16:39:12.716856300 +0200
@@ -1,7 +1,7 @@
- ..\..\..\..\..\vs10\$(Platform)
-+ %INSTALLDIR%
++ $(INSTALLDIR)
$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\
2.0
-@@ -467,7 +467,7 @@
- -2-vs10
+@@ -464,10 +464,10 @@
+ lib
+ -2.0-0
+
+- -2-vs10
++
$(GlibSeparateVS10DllPrefix)
$(GlibSeparateVS10DllSuffix)
- ..\..\..\..\..\vs10\$(Platform)
-+ %KDEROOT%
++ $(KDEROOT)
<_PropertySheetDisplayName>glibprops
@@ -481,7 +481,7 @@
msvc_recommended_pragmas.h;%(ForcedIncludeFiles)
- intl.lib;%(AdditionalDependencies)
+ libintl.lib;%(AdditionalDependencies)
$(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories)
diff -Nru glib-2.29.14.orig/gio/gdbusconnection.c glib-2.29.14/gio/gdbusconnection.c
--- glib-2.29.14.orig/gio/gdbusconnection.c 2011-07-22 08:29:32.000000000 +0200
+++ glib-2.29.14/gio/gdbusconnection.c 2011-07-23 16:41:00.377014100 +0200
@@ -4970,9 +4970,7 @@
guint32 serial;
GVariant *value;
-#ifdef G_OS_UNIX
GUnixFDList *fd_list;
-#endif
} CallState;
static void
@@ -5071,7 +5069,9 @@
g_return_if_fail (method_name != NULL && g_dbus_is_member_name (method_name));
g_return_if_fail (timeout_msec >= 0 || timeout_msec == -1);
g_return_if_fail ((parameters == NULL) || g_variant_is_of_type (parameters, G_VARIANT_TYPE_TUPLE));
+#ifdef G_OS_UNIX
g_return_if_fail (fd_list == NULL || G_IS_UNIX_FD_LIST (fd_list));
+#endif
state = g_slice_new0 (CallState);
state->simple = g_simple_async_result_new (G_OBJECT (connection),
@@ -5182,7 +5182,9 @@
g_return_val_if_fail (method_name != NULL && g_dbus_is_member_name (method_name), NULL);
g_return_val_if_fail (timeout_msec >= 0 || timeout_msec == -1, NULL);
g_return_val_if_fail ((parameters == NULL) || g_variant_is_of_type (parameters, G_VARIANT_TYPE_TUPLE), NULL);
+#ifdef G_OS_UNIX
g_return_val_if_fail (fd_list == NULL || G_IS_UNIX_FD_LIST (fd_list), NULL);
+#endif
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
if (reply_type == NULL)
diff -Nru glib-2.29.14.orig/gio/gdbusproxy.c glib-2.29.14/gio/gdbusproxy.c
--- glib-2.29.14.orig/gio/gdbusproxy.c 2011-07-22 08:29:32.000000000 +0200
+++ glib-2.29.14/gio/gdbusproxy.c 2011-07-23 16:39:12.734857400 +0200
@@ -2461,7 +2461,9 @@
g_return_if_fail (g_dbus_is_member_name (method_name) || g_dbus_is_interface_name (method_name));
g_return_if_fail (parameters == NULL || g_variant_is_of_type (parameters, G_VARIANT_TYPE_TUPLE));
g_return_if_fail (timeout_msec == -1 || timeout_msec >= 0);
+#ifdef G_OS_UNIX
g_return_if_fail (fd_list == NULL || G_IS_UNIX_FD_LIST (fd_list));
+#endif
reply_type = NULL;
split_interface_name = NULL;
@@ -2590,7 +2592,9 @@
g_return_val_if_fail (g_dbus_is_member_name (method_name) || g_dbus_is_interface_name (method_name), NULL);
g_return_val_if_fail (parameters == NULL || g_variant_is_of_type (parameters, G_VARIANT_TYPE_TUPLE), NULL);
g_return_val_if_fail (timeout_msec == -1 || timeout_msec >= 0, NULL);
+#ifdef G_OS_UNIX
g_return_val_if_fail (fd_list == NULL || G_IS_UNIX_FD_LIST (fd_list), NULL);
+#endif
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
reply_type = NULL;
diff -Nru glib-2.29.14.orig/gio/glocalfile.c glib-2.29.14/gio/glocalfile.c
--- glib-2.29.14.orig/gio/glocalfile.c 2011-07-21 08:37:26.000000000 +0200
+++ glib-2.29.14/gio/glocalfile.c 2011-07-23 16:39:12.737857500 +0200
@@ -1001,8 +1001,6 @@
#elif defined(USE_STATVFS) && defined(HAVE_STRUCT_STATVFS_F_BASETYPE)
fstype = g_strdup(statfs_buffer.f_basetype);
-#else
- fstype = NULL;
#endif
#ifndef G_OS_WIN32
diff --git a/portage/testing/glib-src/glib-src-2.29.14.py b/portage/testing/glib-src/glib-src-2.29.14.py
index b558beb8f..dde1e7721 100644
--- a/portage/testing/glib-src/glib-src-2.29.14.py
+++ b/portage/testing/glib-src/glib-src-2.29.14.py
@@ -1,43 +1,55 @@
from Package.CMakePackageBase import *
import info
class subinfo(info.infoclass):
def setTargets( self ):
self.targets["2.29.14"] = "http://ftp.acc.umu.se/pub/GNOME/sources/glib/2.29/glib-2.29.14.tar.bz2"
self.targetInstSrc["2.29.14"] = "glib-2.29.14"
- self.patchToApply["2.29.14"] = ('glib-2.29.14-20110723.diff', '1')
+ self.patchToApply["2.29.14"] = ('glib-2.29.14-20121010.diff', '1')
self.targetDigests['2.29.14'] = 'bd993994e9d6262c19d241f6a6f781f11b840831'
self.shortDescription = "The Glib libraries: glib, gio, gthread, gmodule, gobject"
self.defaultTarget = "2.29.14"
def setDependencies( self ):
self.buildDependencies['virtual/bin-base'] = 'default'
self.dependencies['testing/libffi-src'] = 'default'
self.dependencies['win32libs-bin/gettext'] = 'default'
class Package(CMakePackageBase):
def __init__(self):
self.subinfo = subinfo()
CMakePackageBase.__init__( self )
def configure( self ):
return True
def make( self ):
return True
def compile( self ):
self.enterSourceDir()
- cmd = "msbuild build\\win32\\vs10\\glib.sln"
+ os.putenv( "INSTALLDIR", self.imageDir() )
+ configuration = "Release"
+ if self.buildType() == "Debug":
+ configuration = "Debug"
+ platform = "Win32"
+ if self.buildArchitecture() == "x64":
+ platform = "x64"
+ cmd = "msbuild /p:configuration=\""+configuration+"\" /p:platform=\""+platform+"\" build\\win32\\vs10\\glib.sln"
return self.system( cmd )
def install( self ):
self.enterSourceDir()
- os.putenv("INSTALLDIR", self.imageDir() )
- print(self.imageDir())
- cmd = "msbuild /target:install build\\win32\\vs10\\glib.sln"
+ os.putenv( "INSTALLDIR", self.imageDir() )
+ configuration = "Release"
+ if self.buildType() == "Debug":
+ configuration = "Debug"
+ platform = "Win32"
+ if self.buildArchitecture() == "x64":
+ platform = "x64"
+ cmd = "msbuild /p:configuration=\""+configuration+"\" /p:platform=\""+platform+"\" /t:install build\\win32\\vs10\\glib.sln"
return self.system( cmd )
if __name__ == '__main__':
Package().execute()