diff options
| -rw-r--r-- | src/gtkglext-1-remove-pangox-dependency.patch | 23 | ||||
| -rw-r--r-- | src/gtkglext-2-use-correct-glib-mkenums.patch | 48 | ||||
| -rw-r--r-- | src/gtkglext.mk | 7 |
3 files changed, 73 insertions, 5 deletions
diff --git a/src/gtkglext-1-remove-pangox-dependency.patch b/src/gtkglext-1-remove-pangox-dependency.patch new file mode 100644 index 0000000..ef8497f --- /dev/null +++ b/src/gtkglext-1-remove-pangox-dependency.patch @@ -0,0 +1,23 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +diff -r 4a787346ab72 configure.in +--- a/configure.in Fri May 14 10:07:05 2010 +0200 ++++ b/configure.in Fri May 14 10:08:26 2010 +0200 +@@ -349,7 +349,6 @@ + gtk_pkg >= gtk_required_version \ + gdk_pkg >= gdk_required_version \ + pango_pkg >= pango_required_version \ +-pangox_pkg >= pangox_required_version \ + gmodule_pkg >= gmodule_required_version \ + ]) + +@@ -794,7 +793,7 @@ + # CFLAGS and LIBS + ################################################## + +-GDKGLEXT_PACKAGES="gdk_pkg pango_pkg pangox_pkg gmodule_pkg" ++GDKGLEXT_PACKAGES="gdk_pkg pango_pkg gmodule_pkg" + GDKGLEXT_EXTRA_CFLAGS="$GL_CFLAGS $GDKGLEXT_WIN_CFLAGS" + GDKGLEXT_EXTRA_LIBS="$GL_LIBS $GDKGLEXT_WIN_LIBS" + GDKGLEXT_DEP_CFLAGS="$GDKGLEXT_EXTRA_CFLAGS `$PKG_CONFIG --cflags $GDKGLEXT_PACKAGES`" diff --git a/src/gtkglext-2-use-correct-glib-mkenums.patch b/src/gtkglext-2-use-correct-glib-mkenums.patch new file mode 100644 index 0000000..32bae02 --- /dev/null +++ b/src/gtkglext-2-use-correct-glib-mkenums.patch @@ -0,0 +1,48 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +This patch has been taken from: +https://bugzilla.gnome.org/show_bug.cgi?id=618599 + +diff -r 4a787346ab72 gdk/Makefile.am +--- a/gdk/Makefile.am Fri May 14 10:07:05 2010 +0200 ++++ b/gdk/Makefile.am Fri May 14 10:16:08 2010 +0200 +@@ -157,7 +157,7 @@ + $(srcdir)/gdkglenumtypes.h: stamp-gdkglenumtypes-h + @true + stamp-gdkglenumtypes-h: @REBUILD@ $(gdkglext_public_h_sources) Makefile +- ( cd $(srcdir) && glib-mkenums \ ++ ( cd $(srcdir) && $(GLIB_MKENUMS) \ + --fhead "#ifndef __GDK_GL_ENUM_TYPES_H__\n#define __GDK_GL_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ + --fprod "/* enumerations from \"@filename@\" */\n" \ + --vhead "GType @enum_name@_get_type (void);\n#define GDK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ +@@ -167,7 +167,7 @@ + && rm -f xgen-geth \ + && echo timestamp > $(@F) + $(srcdir)/gdkglenumtypes.c: @REBUILD@ $(gdkglext_public_h_sources) Makefile +- ( cd $(srcdir) && glib-mkenums \ ++ ( cd $(srcdir) && $(GLIB_MKENUMS) \ + --fhead "#include \"gdkgl.h\"" \ + --fprod "\n/* enumerations from \"@filename@\" */" \ + --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ +diff -r 4a787346ab72 gdk/Makefile.in +--- a/gdk/Makefile.in Fri May 14 10:07:05 2010 +0200 ++++ b/gdk/Makefile.in Fri May 14 10:28:03 2010 +0200 +@@ -844,7 +844,7 @@ + $(srcdir)/gdkglenumtypes.h: stamp-gdkglenumtypes-h + @true + stamp-gdkglenumtypes-h: @REBUILD@ $(gdkglext_public_h_sources) Makefile +- ( cd $(srcdir) && glib-mkenums \ ++ ( cd $(srcdir) && $(GLIB_MKENUMS) \ + --fhead "#ifndef __GDK_GL_ENUM_TYPES_H__\n#define __GDK_GL_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ + --fprod "/* enumerations from \"@filename@\" */\n" \ + --vhead "GType @enum_name@_get_type (void);\n#define GDK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ +@@ -854,7 +854,7 @@ + && rm -f xgen-geth \ + && echo timestamp > $(@F) + $(srcdir)/gdkglenumtypes.c: @REBUILD@ $(gdkglext_public_h_sources) Makefile +- ( cd $(srcdir) && glib-mkenums \ ++ ( cd $(srcdir) && $(GLIB_MKENUMS) \ + --fhead "#include \"gdkgl.h\"" \ + --fprod "\n/* enumerations from \"@filename@\" */" \ + --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ diff --git a/src/gtkglext.mk b/src/gtkglext.mk index 76e0a7e..bdbaba3 100644 --- a/src/gtkglext.mk +++ b/src/gtkglext.mk @@ -21,19 +21,16 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' - # don't require x backend for pango - $(SED) -i 's,pangox >= 1.0.0,,' '$(1)/configure' + cd '$(1)' && autoconf cd '$(1)' && ./configure \ --host='$(TARGET)' \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-shared \ --without-x \ + --with-gdktarget=win32 \ --disable-gtk-doc \ --disable-man \ --disable-glibtest - $(SED) -i 's, glib-mkenums, $$(GLIB_MKENUMS),' '$(1)/gdk/Makefile' $(MAKE) -C '$(1)' -j '$(JOBS)' install \ bin_PROGRAMS= \ sbin_PROGRAMS= \ |