Mercurial > mxe-octave

annotate src/gtkglextmm-1-fixes.patch @ 1222:6f81712a503b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
new package gtkglextmm
author Martin Gerhardy <martin.gerhardy@gmail.com>
date Wed, 29 Sep 2010 23:23:12 +0200
parents
children 58ea60dca393
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1222
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
1 This file is part of mingw-cross-env.
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
2 See doc/index.html for further information.
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
3
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
4 Contains ad hoc patches for cross building.
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
5
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
6 From c71783745127d3af9ab40f6a4cb95ac13ad2707b Mon Sep 17 00:00:00 2001
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
7 From: mingw-cross-env
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
8 Date: Wed, 29 Sep 2010 23:08:44 +0200
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
9 Subject: [PATCH 1/2] allow deprecated GdkSpanFunc
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
10
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
11
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
12 diff --git a/gtkglext/gtkmm/gl/Makefile.in b/gtkglext/gtkmm/gl/Makefile.in
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
13 index 13afa02..152f930 100644
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
14 --- a/gtkglext/gtkmm/gl/Makefile.in
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
15 +++ b/gtkglext/gtkmm/gl/Makefile.in
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
16 @@ -209,7 +209,6 @@ sublib_cflags = \
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
17 $(GTKGLEXTMM_DEP_CFLAGS) \
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
18 -DGTKMM_GL_COMPILATION \
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
19 -DG_DISABLE_DEPRECATED \
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
20 - -DGDK_DISABLE_DEPRECATED \
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
21 -DGDK_PIXBUF_DISABLE_DEPRECATED \
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
22 -DGTK_DISABLE_DEPRECATED
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
23
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
24 --
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
25 1.7.1
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
26
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
27
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
28 From b3a26572b965ada869cc388b6bfce5c54b6ab704 Mon Sep 17 00:00:00 2001
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
29 From: mingw-cross-env
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
30 Date: Wed, 29 Sep 2010 23:18:40 +0200
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
31 Subject: [PATCH 2/2] wine workaround: s,cross_compiling=no,cross_compiling=yes,
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
32
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
33
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
34 diff --git a/configure b/configure
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
35 index 508d229..65f61fb 100755
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
36 --- a/configure
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
37 +++ b/configure
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
38 @@ -409,7 +409,7 @@ exec 6>&1
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
39 #
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
40 ac_default_prefix=/usr/local
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
41 ac_config_libobj_dir=.
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
42 -cross_compiling=no
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
43 +cross_compiling=yes
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
44 subdirs=
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
45 MFLAGS=
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
46 MAKEFLAGS=
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
47 @@ -2486,7 +2486,7 @@ if test "$cross_compiling" != yes; then
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
48 ac_status=$?
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
49 echo "$as_me:$LINENO: \$? = $ac_status" >&5
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
50 (exit $ac_status); }; }; then
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
51 - cross_compiling=no
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
52 + cross_compiling=yes
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
53 else
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
54 if test "$cross_compiling" = maybe; then
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
55 cross_compiling=yes
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
56 --
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
57 1.7.1
6f81712a503b new package gtkglextmm
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff changeset
58