Mercurial > mxe-octave
diff src/gtkglextmm-1-fixes.patch @ 2154:58ea60dca393
packages gtk2 gtkglextmm pango: replace wine workaround patches
| author | Mark Brand <mabrand@mabrand.nl> |
|---|---|
| date | Mon, 28 Nov 2011 10:41:34 +0100 |
| parents | 6f81712a503b |
| children | f653602a0500 |
line wrap: on
line diff
--- a/src/gtkglextmm-1-fixes.patch Mon Nov 28 09:51:56 2011 +0100 +++ b/src/gtkglextmm-1-fixes.patch Mon Nov 28 10:41:34 2011 +0100 @@ -3,10 +3,10 @@ Contains ad hoc patches for cross building. -From c71783745127d3af9ab40f6a4cb95ac13ad2707b Mon Sep 17 00:00:00 2001 +From 865936e91293bdc59c2e9c47e5a4b54fb6f1629e Mon Sep 17 00:00:00 2001 From: mingw-cross-env Date: Wed, 29 Sep 2010 23:08:44 +0200 -Subject: [PATCH 1/2] allow deprecated GdkSpanFunc +Subject: [PATCH] allow deprecated GdkSpanFunc diff --git a/gtkglext/gtkmm/gl/Makefile.in b/gtkglext/gtkmm/gl/Makefile.in @@ -22,37 +22,5 @@ -DGTK_DISABLE_DEPRECATED -- -1.7.1 - - -From b3a26572b965ada869cc388b6bfce5c54b6ab704 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env -Date: Wed, 29 Sep 2010 23:18:40 +0200 -Subject: [PATCH 2/2] wine workaround: s,cross_compiling=no,cross_compiling=yes, - +1.7.7.3 -diff --git a/configure b/configure -index 508d229..65f61fb 100755 ---- a/configure -+++ b/configure -@@ -409,7 +409,7 @@ exec 6>&1 - # - ac_default_prefix=/usr/local - ac_config_libobj_dir=. --cross_compiling=no -+cross_compiling=yes - subdirs= - MFLAGS= - MAKEFLAGS= -@@ -2486,7 +2486,7 @@ if test "$cross_compiling" != yes; then - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- cross_compiling=no -+ cross_compiling=yes - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes --- -1.7.1 -