Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Tommy Boatman (c62bc1b8f616f66c2506bcd9ccf0285724b15495)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Tommy Boatman <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Tommy Boatman (c62bc1b8f616f66c2506bcd9ccf0285724b15495)
  • Date: Tue, 10 Jul 2012 10:06:20 -0500

GIT changes to master grimoire by Tommy Boatman <tboatman AT sourcemage.org>:

dev/null |binary
x11-toolkits/gtk-sharp-2/DETAILS | 8 -
x11-toolkits/gtk-sharp-2/HISTORY | 7 +
x11-toolkits/gtk-sharp-2/PRE_BUILD | 1
x11-toolkits/gtk-sharp-2/glib_fix.patch | 117
+++++++++++++++++
x11-toolkits/gtk-sharp-2/gtk-sharp-2.12.10.tar.bz2.sig | 0
6 files changed, 128 insertions(+), 5 deletions(-)

New commits:
commit c62bc1b8f616f66c2506bcd9ccf0285724b15495
Author: Tommy Boatman <tboatman AT sourcemage.org>
Commit: Tommy Boatman <tboatman AT sourcemage.org>

gtk-sharp-2: issue #407 - fix build with glib2 >= 2.31

diff --git a/x11-toolkits/gtk-sharp-2/DETAILS
b/x11-toolkits/gtk-sharp-2/DETAILS
index 7e785f6..bf4c228 100755
--- a/x11-toolkits/gtk-sharp-2/DETAILS
+++ b/x11-toolkits/gtk-sharp-2/DETAILS
@@ -1,11 +1,9 @@
SPELL=gtk-sharp-2
- VERSION=2.12.10
- BRANCH=`echo $VERSION|cut -d . -f 1,2`
+ VERSION=2.12.11
SOURCE=gtk-sharp-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/gtk-sharp-${VERSION}
- SOURCE_URL[0]=${GNOME_URL}/sources/gtk-sharp/${BRANCH}/$SOURCE
-# SOURCE_URL[1]=http://ftp.novell.com/pub/mono/sources/gtk-sharp212/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+
SOURCE_URL[0]=http://download.mono-project.com/sources/gtk-sharp212/$SOURCE
+
SOURCE_HASH=sha512:870ddc559bcac3071f13ddb9e04a02022e2eea5f7a8335b574a747b726c0e5ecd005847f726069c555b64a289d625071f4b319c1b1242d6d1c05e62a46b7db88
WEB_SITE=http://www.mono-project.com/
LICENSE[0]=LGPL
ENTERED=20050611
diff --git a/x11-toolkits/gtk-sharp-2/HISTORY
b/x11-toolkits/gtk-sharp-2/HISTORY
index c53f694..8a0b7a9 100644
--- a/x11-toolkits/gtk-sharp-2/HISTORY
+++ b/x11-toolkits/gtk-sharp-2/HISTORY
@@ -1,3 +1,10 @@
+2012-07-10 Tommy Boatman <tboatman AT sourcemage.org>
+ * DETAILS: 2.12.11, changed SOURCE_URL to reflect new home
+ at mono-project
+ * glib_fix.patch: created to address build failure with newer
+ versions of glib2 (bug #407)
+ * PRE_BUILD: patch application before libtoolize
+
2010-03-20 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: commented out SOURCE_URL[1], same content but different
size
* gtk-sharp-2.12.10.tar.bz2.sig: updated to SOURCE_URL[0] tarball
diff --git a/x11-toolkits/gtk-sharp-2/PRE_BUILD
b/x11-toolkits/gtk-sharp-2/PRE_BUILD
index ac2a160..266664a 100755
--- a/x11-toolkits/gtk-sharp-2/PRE_BUILD
+++ b/x11-toolkits/gtk-sharp-2/PRE_BUILD
@@ -1,5 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
touch INSTALL &&
+patch -p1 < $SCRIPT_DIRECTORY/glib_fix.patch &&
libtoolize -f &&
autoreconf -f
diff --git a/x11-toolkits/gtk-sharp-2/glib_fix.patch
b/x11-toolkits/gtk-sharp-2/glib_fix.patch
new file mode 100644
index 0000000..5825f27
--- /dev/null
+++ b/x11-toolkits/gtk-sharp-2/glib_fix.patch
@@ -0,0 +1,117 @@
+diff -urN old/configure.in new/configure.in
+--- old/configure.in 2012-07-08 14:43:54.333939345 -0500
++++ new/configure.in 2012-07-08 14:39:06.505947046 -0500
+@@ -223,6 +223,16 @@
+ AM_CONDITIONAL(ENABLE_MSI, test "x$enable_msi" = "xyes")
+ AM_CONDITIONAL(ENABLE_MONOGETOPTIONS, test "x$has_mono" = "xtrue")
+
++PKG_CHECK_MODULES(GLIB_2_31,
++ glib-2.0 >= 2.31,
++ HAVE_GLIB_2_31_OR_HIGHER=yes, HAVE_GLIB_2_31_OR_HIGHER=no)
++
++if test "x$HAVE_GLIB_2_31_OR_HIGHER" = "xyes" ; then
++ CFLAGS="$CFLAGS -DDISABLE_GTHREAD_CHECK"
++ CSFLAGS="$CSFLAGS -define:DISABLE_GTHREAD_CHECK"
++fi
++
++AC_SUBST(CSFLAGS)
+ AC_SUBST(CFLAGS)
+
+ AC_OUTPUT([
+diff -urN old/glib/Thread.cs new/glib/Thread.cs
+--- old/glib/Thread.cs 2012-07-08 14:44:51.373937819 -0500
++++ new/glib/Thread.cs 2012-07-08 14:46:02.825935908 -0500
+@@ -21,29 +21,42 @@
+
+ namespace GLib
+ {
+- using System;
+- using System.Runtime.InteropServices;
++ using System;
++ using System.Runtime.InteropServices;
+
+- public class Thread
+- {
+- private Thread () {}
+-
+- [DllImport("libgthread-2.0-0.dll")]
+- static extern void g_thread_init (IntPtr i);
+-
+- public static void Init ()
+- {
+- g_thread_init (IntPtr.Zero);
+- }
+-
+- [DllImport("glibsharpglue-2")]
+- static extern bool glibsharp_g_thread_supported ();
+-
+- public static bool Supported
+- {
+- get {
+- return glibsharp_g_thread_supported ();
+- }
+- }
+- }
+-}
++ public class Thread
++ {
++ private Thread () {}
++
++#if DISABLE_GTHREAD_CHECK
++ public static void Init ()
++ {
++ // GLib automatically inits threads in 2.31 and above
++ //
http://developer.gnome.org/glib/unstable/glib-Deprecated-Thread-APIs.html#g-thread-init
++ }
++
++ public static bool Supported {
++ get { return true; }
++ }
++#else
++ [DllImport("libgthread-2.0-0.dll")]
++ static extern void g_thread_init (IntPtr i);
++
++ public static void Init ()
++ {
++ g_thread_init (IntPtr.Zero);
++ }
++
++ [DllImport("glibsharpglue-2")]
++ static extern bool glibsharp_g_thread_supported ();
++
++ public static bool Supported
++ {
++ get {
++ return glibsharp_g_thread_supported ();
++ }
++ }
++#endif
++
++ }
++}
+\ No newline at end of file
+diff -urN old/glib/glue/thread.c new/glib/glue/thread.c
+--- old/glib/glue/thread.c 2012-07-07 18:38:18.693593075 -0500
++++ new/glib/glue/thread.c 2012-07-07 20:19:22.973430852 -0500
+@@ -19,14 +19,21 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
+-
++#ifdef DISABLE_GTHREAD_CHECK
++#include <glib.h>
++#else
+ #include <glib/gthread.h>
++#endif
+
+ gboolean glibsharp_g_thread_supported (void);
+
+ gboolean
+ glibsharp_g_thread_supported ()
+ {
++#ifdef DISABLE_GTHREAD_CHECK
++ return TRUE;
++#else
+ return g_thread_supported ();
++#endif
+ }
diff --git a/x11-toolkits/gtk-sharp-2/gtk-sharp-2.12.10.tar.bz2.sig
b/x11-toolkits/gtk-sharp-2/gtk-sharp-2.12.10.tar.bz2.sig
deleted file mode 100644
index cd3c880..0000000
Binary files a/x11-toolkits/gtk-sharp-2/gtk-sharp-2.12.10.tar.bz2.sig and
/dev/null differ



  • [SM-Commit] GIT changes to master grimoire by Tommy Boatman (c62bc1b8f616f66c2506bcd9ccf0285724b15495), Tommy Boatman, 07/10/2012

Archive powered by MHonArc 2.6.24.

Top of Page