Date: Friday, March 21, 2014 @ 18:27:14 Author: giovanni Revision: 108042
upgpkg: gtkglextmm 1.2.0-10 Fixed FS39436 Added: gtkglextmm/trunk/fix_ftbfs_gtk_2_20.patch gtkglextmm/trunk/fix_ftbfs_gtk_2_36.patch gtkglextmm/trunk/fix_ftbfs_gtk_2_37.patch gtkglextmm/trunk/gtkglextmm-1.2.0-aclocal.patch Modified: gtkglextmm/trunk/PKGBUILD Deleted: gtkglextmm/trunk/gdkspanfunc.patch --------------------------------+ PKGBUILD | 27 +++++--- fix_ftbfs_gtk_2_20.patch | 28 +++++++++ fix_ftbfs_gtk_2_36.patch | 121 +++++++++++++++++++++++++++++++++++++++ fix_ftbfs_gtk_2_37.patch | 24 +++++++ gdkspanfunc.patch | 13 ---- gtkglextmm-1.2.0-aclocal.patch | 11 +++ 6 files changed, 202 insertions(+), 22 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-03-21 16:52:18 UTC (rev 108041) +++ PKGBUILD 2014-03-21 17:27:14 UTC (rev 108042) @@ -5,26 +5,35 @@ pkgname=gtkglextmm pkgver=1.2.0 -pkgrel=9 +pkgrel=10 pkgdesc="Cpp C++ bindings for gtkglext" arch=('i686' 'x86_64') url="http://gtkglext.sourceforge.net/" +license=('GPL') depends=('gtkmm' 'gtkglext') makedepends=('mesa') -license=('GPL') source=("http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2" - 'gdkspanfunc.patch') + 'gtkglextmm-1.2.0-aclocal.patch' + 'fix_ftbfs_gtk_2_20.patch' + 'fix_ftbfs_gtk_2_36.patch' + 'fix_ftbfs_gtk_2_37.patch') md5sums=('27c05f4d45c5fd07b6fb0f044add3056' - 'd7c8ea33c748a6857ee629c16b2d9bff') + '1f331ecdaa6ea3f9eaec8f0e54d6cd82' + '60a2e7518a148ea3be59669770ee5aaa' + 'dd08d68c5e076dfa3293b00dd4150633' + 'c39860d898a9ce24af3762fd351c5266') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - # FS#24706 - patch -Np1 -i "${srcdir}/gdkspanfunc.patch" + patch -Np1 -i "${srcdir}/gtkglextmm-1.2.0-aclocal.patch" + patch -Np1 -i "${srcdir}/fix_ftbfs_gtk_2_20.patch" + patch -Np1 -i "${srcdir}/fix_ftbfs_gtk_2_36.patch" + patch -Np1 -i "${srcdir}/fix_ftbfs_gtk_2_37.patch" +} - # automake 1.8 fix - sed -i "s|\(AC_DEFUN(\)\(AC_.*_MULTIHEAD\)|\1[\2]|" m4macros/gtkglextmm.m4 +build() { + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ --disable-gtkglext-test \ Added: fix_ftbfs_gtk_2_20.patch =================================================================== --- fix_ftbfs_gtk_2_20.patch (rev 0) +++ fix_ftbfs_gtk_2_20.patch 2014-03-21 17:27:14 UTC (rev 108042) @@ -0,0 +1,28 @@ +Description: Fix FTBFS due to missing GdkSpanFunc definition + . + The sequence of #include directives is important - if gtk/gtkglwidget.h + is included first, before widget.h, it includes gdk.h without undefing + GDK_DISABLE_DEPRECATED - this leads to GdkSpanFunc not being defined + and compilation errors. + The fix is to first include widget.h which includes the right gdkmm header + which defines GDK_DISABLE_DEPRECATED before including gdk.h. +Forwarded: no +Bug-Ubuntu: http://launchpad.net/bugs/662572 + +Index: gtkglextmm-1.2.0/gtkglext/gtkmm/gl/widget.cc +=================================================================== +--- gtkglextmm-1.2.0.orig/gtkglext/gtkmm/gl/widget.cc 2010-12-08 13:31:59.651270000 +0100 ++++ gtkglextmm-1.2.0/gtkglext/gtkmm/gl/widget.cc 2010-12-08 13:32:10.871270000 +0100 +@@ -17,10 +17,10 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ + +-#include <gtk/gtkglwidget.h> +- + #include "widget.h" + ++#include <gtk/gtkglwidget.h> ++ + namespace Gtk + { + namespace GL Added: fix_ftbfs_gtk_2_36.patch =================================================================== --- fix_ftbfs_gtk_2_36.patch (rev 0) +++ fix_ftbfs_gtk_2_36.patch 2014-03-21 17:27:14 UTC (rev 108042) @@ -0,0 +1,121 @@ +Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/wrap_init.cc +=================================================================== +--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/wrap_init.cc 2013-05-16 23:40:48.363207736 +0200 ++++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/wrap_init.cc 2013-05-16 23:42:40.193801834 +0200 +@@ -1,15 +1,8 @@ +- +-#include <glib.h> +- + // Disable the 'const' function attribute of the get_type() functions. + // GCC would optimize them out because we don't use the return value. + #undef G_GNUC_CONST + #define G_GNUC_CONST /* empty */ + +-#include <gdkmm/gl/wrap_init.h> +-#include <glibmm/error.h> +-#include <glibmm/object.h> +- + // #include the widget headers so that we can call the get_type() static methods: + + #include "tokens.h" +@@ -19,6 +12,12 @@ + #include "pixmap.h" + #include "window.h" + ++#include <glib.h> ++ ++#include <gdkmm/gl/wrap_init.h> ++#include <glibmm/error.h> ++#include <glibmm/object.h> ++ + extern "C" + { + +Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/query.cc +=================================================================== +--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/query.cc 2013-05-16 23:40:48.363207736 +0200 ++++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/query.cc 2013-05-16 23:42:40.193801834 +0200 +@@ -17,10 +17,10 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ + +-#include <gdk/gdkglquery.h> +- + #include "query.h" + ++#include <gdk/gdkglquery.h> ++ + namespace Gdk + { + namespace GL +Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/pixmapext.cc +=================================================================== +--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/pixmapext.cc 2013-05-16 23:40:48.363207736 +0200 ++++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/pixmapext.cc 2013-05-16 23:42:40.193801834 +0200 +@@ -17,11 +17,11 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ + ++#include "pixmapext.h" ++ + #include <gdk/gdkgldrawable.h> + #include <gdk/gdkglpixmap.h> + +-#include "pixmapext.h" +- + namespace Gdk + { + namespace GL +Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/windowext.cc +=================================================================== +--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/windowext.cc 2013-05-16 23:40:48.363207736 +0200 ++++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/windowext.cc 2013-05-16 23:42:40.193801834 +0200 +@@ -17,11 +17,11 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ + ++#include "windowext.h" ++ + #include <gdk/gdkgldrawable.h> + #include <gdk/gdkglwindow.h> + +-#include "windowext.h" +- + namespace Gdk + { + namespace GL +Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/font.cc +=================================================================== +--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/font.cc 2004-05-18 08:01:49.000000000 +0200 ++++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/font.cc 2013-05-16 23:43:07.637456821 +0200 +@@ -17,10 +17,10 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ + +-#include <gdk/gdkglfont.h> +- + #include "font.h" + ++#include <gdk/gdkglfont.h> ++ + namespace Gdk + { + namespace GL +Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/init.cc +=================================================================== +--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/init.cc 2003-02-27 10:49:24.000000000 +0100 ++++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/init.cc 2013-05-16 23:44:38.320316782 +0200 +@@ -19,11 +19,11 @@ + + #include <cstdlib> + +-#include <gdk/gdkglinit.h> +- + #include "wrap_init.h" + #include "init.h" + ++#include <gdk/gdkglinit.h> ++ + namespace Gdk + { + namespace GL Added: fix_ftbfs_gtk_2_37.patch =================================================================== --- fix_ftbfs_gtk_2_37.patch (rev 0) +++ fix_ftbfs_gtk_2_37.patch 2014-03-21 17:27:14 UTC (rev 108042) @@ -0,0 +1,24 @@ +diff --git a/gtkglext/gtkmm/gl/drawingarea.cc b/gtkglext/gtkmm/gl/drawingarea.cc +index 82bb7f4..5a8c5e3 100644 +--- a/gtkglext/gtkmm/gl/drawingarea.cc ++++ b/gtkglext/gtkmm/gl/drawingarea.cc +@@ -17,6 +17,7 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ + ++#include <glibmm.h> + #include "drawingarea.h" + + namespace Gtk +diff --git a/gtkglext/gtkmm/gl/widget.cc b/gtkglext/gtkmm/gl/widget.cc +index 598d6e2..2d6833b 100644 +--- a/gtkglext/gtkmm/gl/widget.cc ++++ b/gtkglext/gtkmm/gl/widget.cc +@@ -17,6 +17,7 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ + ++#include <glibmm.h> + #include "widget.h" + + #include <gtk/gtkglwidget.h> Deleted: gdkspanfunc.patch =================================================================== --- gdkspanfunc.patch 2014-03-21 16:52:18 UTC (rev 108041) +++ gdkspanfunc.patch 2014-03-21 17:27:14 UTC (rev 108042) @@ -1,13 +0,0 @@ ---- a/gtkglext/gtkmm/gl/widget.cc 2004-05-18 03:01:50.000000000 -0300 -+++ b/gtkglext/gtkmm/gl/widget.cc 2011-06-12 17:57:13.075541070 -0300 -@@ -17,9 +17,8 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - */ - --#include <gtk/gtkglwidget.h> -- - #include "widget.h" -+#include <gtk/gtkglwidget.h> - - namespace Gtk - { Added: gtkglextmm-1.2.0-aclocal.patch =================================================================== --- gtkglextmm-1.2.0-aclocal.patch (rev 0) +++ gtkglextmm-1.2.0-aclocal.patch 2014-03-21 17:27:14 UTC (rev 108042) @@ -0,0 +1,11 @@ +--- a/m4macros/gtkglextmm.m4 2004-05-18 08:29:34.000000000 +0200 ++++ b/m4macros/gtkglextmm.m4 2006-05-31 16:46:09.000000000 +0200 +@@ -222,7 +222,7 @@ + dnl AC_GTKGLEXTMM_SUPPORTS_MULTIHEAD([ACTION-IF-SUPPORTED [, ACTION-IF-NOT-SUPPORTED]]) + dnl Checks whether gtkglextmm supports multihead. + dnl +-AC_DEFUN(AC_GTKGLEXTMM_SUPPORTS_MULTIHEAD, ++AC_DEFUN([AC_GTKGLEXTMM_SUPPORTS_MULTIHEAD], + [ AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_CACHE_CHECK([whether gtkglextmm supports multihead],