]>
Commit | Line | Data |
---|---|---|
1c5396b1 JB |
1 | --- gtkglextmm-1.2.0/configure.in.orig 2006-02-28 02:40:33.000000000 +0100 |
2 | +++ gtkglextmm-1.2.0/configure.in 2013-07-23 17:40:34.026825455 +0200 | |
3 | @@ -290,9 +290,8 @@ | |
4 | LIBS="$save_LIBS" | |
5 | ||
6 | # gmmproc | |
7 | -GLIBMM_CHECK_PERL([5.6.0]) | |
8 | -GLIBMM_PREFIX=`$PKG_CONFIG --variable=prefix glibmm_pkg` | |
9 | -GMMPROC_DIR=$GLIBMM_PREFIX/lib/glibmm_pkg/proc | |
10 | +MM_CHECK_PERL([5.6.0]) | |
11 | +GMMPROC_DIR="`$PKG_CONFIG --variable=gmmprocdir glibmm_pkg`" | |
12 | AC_SUBST(GMMPROC_DIR) | |
13 | GMMPROC=$GMMPROC_DIR/gmmproc | |
14 | AC_SUBST(GMMPROC) | |
15 | --- gtkglextmm-1.2.0/gdkglext/gdkmm/gl/wrap_init.cc.orig 2006-02-28 02:46:15.000000000 +0100 | |
16 | +++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/wrap_init.cc 2013-07-23 20:34:58.809719624 +0200 | |
17 | @@ -1,5 +1,9 @@ | |
18 | ||
19 | +#undef G_DISABLE_DEPRECATED | |
20 | +#define GLIB_DISABLE_DEPRECATION_WARNINGS 1 | |
21 | #include <glib.h> | |
22 | +#undef GLIB_DISABLE_DEPRECATION_WARNINGS | |
23 | +#define G_DISABLE_DEPRECATED | |
24 | ||
25 | // Disable the 'const' function attribute of the get_type() functions. | |
26 | // GCC would optimize them out because we don't use the return value. | |
27 | --- gtkglextmm-1.2.0/gdkglext/gdkmm/gl/query.cc.orig 2003-02-27 10:49:24.000000000 +0100 | |
28 | +++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/query.cc 2013-07-23 20:41:29.083036578 +0200 | |
29 | @@ -17,10 +17,10 @@ | |
30 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. | |
31 | */ | |
32 | ||
33 | -#include <gdk/gdkglquery.h> | |
34 | - | |
35 | #include "query.h" | |
36 | ||
37 | +#include <gdk/gdkglquery.h> | |
38 | + | |
39 | namespace Gdk | |
40 | { | |
41 | namespace GL | |
42 | --- gtkglextmm-1.2.0/gdkglext/gdkmm/gl/pixmapext.cc.orig 2004-05-18 08:01:49.000000000 +0200 | |
43 | +++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/pixmapext.cc 2013-07-23 20:42:02.043035194 +0200 | |
44 | @@ -17,11 +17,11 @@ | |
45 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. | |
46 | */ | |
47 | ||
48 | +#include "pixmapext.h" | |
49 | + | |
50 | #include <gdk/gdkgldrawable.h> | |
51 | #include <gdk/gdkglpixmap.h> | |
52 | ||
53 | -#include "pixmapext.h" | |
54 | - | |
55 | namespace Gdk | |
56 | { | |
57 | namespace GL | |
58 | --- gtkglextmm-1.2.0/gdkglext/gdkmm/gl/windowext.cc.orig 2004-05-18 08:01:49.000000000 +0200 | |
59 | +++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/windowext.cc 2013-07-23 20:50:45.153013240 +0200 | |
60 | @@ -17,11 +17,11 @@ | |
61 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. | |
62 | */ | |
63 | ||
64 | +#include "windowext.h" | |
65 | + | |
66 | #include <gdk/gdkgldrawable.h> | |
67 | #include <gdk/gdkglwindow.h> | |
68 | ||
69 | -#include "windowext.h" | |
70 | - | |
71 | namespace Gdk | |
72 | { | |
73 | namespace GL | |
74 | --- gtkglextmm-1.2.0/gdkglext/gdkmm/gl/font.cc.orig 2004-05-18 08:01:49.000000000 +0200 | |
75 | +++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/font.cc 2013-07-23 20:51:44.989677398 +0200 | |
76 | @@ -17,10 +17,10 @@ | |
77 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. | |
78 | */ | |
79 | ||
80 | -#include <gdk/gdkglfont.h> | |
81 | - | |
82 | #include "font.h" | |
83 | ||
84 | +#include <gdk/gdkglfont.h> | |
85 | + | |
86 | namespace Gdk | |
87 | { | |
88 | namespace GL |