From 21432669e7b2545af3b0fefc30fafbb828c85569 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Mon, 27 Apr 2015 23:46:26 +0200 Subject: [PATCH] New package: gtkglextmm-1.2.0 --- common/shlibs | 3 + srcpkgs/gtkglextmm-devel | 1 + .../patches/fix_ftbfs_gtk_2_20.patch | 28 ++++ .../patches/fix_ftbfs_gtk_2_36.patch | 121 ++++++++++++++++++ .../patches/fix_ftbfs_gtk_2_37.patch | 24 ++++ .../patches/gtkglextmm-1.2.0-aclocal.patch | 11 ++ srcpkgs/gtkglextmm/template | 28 ++++ 7 files changed, 216 insertions(+) create mode 120000 srcpkgs/gtkglextmm-devel create mode 100644 srcpkgs/gtkglextmm/patches/fix_ftbfs_gtk_2_20.patch create mode 100644 srcpkgs/gtkglextmm/patches/fix_ftbfs_gtk_2_36.patch create mode 100644 srcpkgs/gtkglextmm/patches/fix_ftbfs_gtk_2_37.patch create mode 100644 srcpkgs/gtkglextmm/patches/gtkglextmm-1.2.0-aclocal.patch create mode 100644 srcpkgs/gtkglextmm/template diff --git a/common/shlibs b/common/shlibs index aa67ff8a385..e0098822c2f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1996,3 +1996,6 @@ libbitcoinconsensus.so.0 litecoin-0.10.1.2_1 libnfc.so.0 libnfc-1.7.1_1 libfuzzy.so.2 libfuzzy-2.12_1 libSDL_gfx.so.15 SDL_gfx-2.0.25_2 +libgdkglextmm-x11-1.2.so.0 gtkglextmm-1.2.0_1 +libgtkglextmm-x11-1.2.so.0 gtkglextmm-1.2.0_1 + diff --git a/srcpkgs/gtkglextmm-devel b/srcpkgs/gtkglextmm-devel new file mode 120000 index 00000000000..d514cfcb39d --- /dev/null +++ b/srcpkgs/gtkglextmm-devel @@ -0,0 +1 @@ +gtkglextmm \ No newline at end of file diff --git a/srcpkgs/gtkglextmm/patches/fix_ftbfs_gtk_2_20.patch b/srcpkgs/gtkglextmm/patches/fix_ftbfs_gtk_2_20.patch new file mode 100644 index 00000000000..acf7c1b4fea --- /dev/null +++ b/srcpkgs/gtkglextmm/patches/fix_ftbfs_gtk_2_20.patch @@ -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 +=================================================================== +--- gtkglext/gtkmm/gl/widget.cc 2010-12-08 13:31:59.651270000 +0100 ++++ 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 +- + #include "widget.h" + ++#include ++ + namespace Gtk + { + namespace GL diff --git a/srcpkgs/gtkglextmm/patches/fix_ftbfs_gtk_2_36.patch b/srcpkgs/gtkglextmm/patches/fix_ftbfs_gtk_2_36.patch new file mode 100644 index 00000000000..8156bae16b8 --- /dev/null +++ b/srcpkgs/gtkglextmm/patches/fix_ftbfs_gtk_2_36.patch @@ -0,0 +1,121 @@ +Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/wrap_init.cc +=================================================================== +--- gdkglext/gdkmm/gl/wrap_init.cc 2013-05-16 23:40:48.363207736 +0200 ++++ gdkglext/gdkmm/gl/wrap_init.cc 2013-05-16 23:42:40.193801834 +0200 +@@ -1,15 +1,8 @@ +- +-#include +- + // 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 +-#include +-#include +- + // #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 ++ ++#include ++#include ++#include ++ + extern "C" + { + +Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/query.cc +=================================================================== +--- gdkglext/gdkmm/gl/query.cc 2013-05-16 23:40:48.363207736 +0200 ++++ 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 +- + #include "query.h" + ++#include ++ + namespace Gdk + { + namespace GL +Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/pixmapext.cc +=================================================================== +--- gdkglext/gdkmm/gl/pixmapext.cc 2013-05-16 23:40:48.363207736 +0200 ++++ 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 + #include + +-#include "pixmapext.h" +- + namespace Gdk + { + namespace GL +Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/windowext.cc +=================================================================== +--- gdkglext/gdkmm/gl/windowext.cc 2013-05-16 23:40:48.363207736 +0200 ++++ 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 + #include + +-#include "windowext.h" +- + namespace Gdk + { + namespace GL +Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/font.cc +=================================================================== +--- gdkglext/gdkmm/gl/font.cc 2004-05-18 08:01:49.000000000 +0200 ++++ 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 +- + #include "font.h" + ++#include ++ + namespace Gdk + { + namespace GL +Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/init.cc +=================================================================== +--- gdkglext/gdkmm/gl/init.cc 2003-02-27 10:49:24.000000000 +0100 ++++ gdkglext/gdkmm/gl/init.cc 2013-05-16 23:44:38.320316782 +0200 +@@ -19,11 +19,11 @@ + + #include + +-#include +- + #include "wrap_init.h" + #include "init.h" + ++#include ++ + namespace Gdk + { + namespace GL diff --git a/srcpkgs/gtkglextmm/patches/fix_ftbfs_gtk_2_37.patch b/srcpkgs/gtkglextmm/patches/fix_ftbfs_gtk_2_37.patch new file mode 100644 index 00000000000..59cbd7763f9 --- /dev/null +++ b/srcpkgs/gtkglextmm/patches/fix_ftbfs_gtk_2_37.patch @@ -0,0 +1,24 @@ +diff --git a/gtkglext/gtkmm/gl/drawingarea.cc b/gtkglext/gtkmm/gl/drawingarea.cc +index 82bb7f4..5a8c5e3 100644 +--- gtkglext/gtkmm/gl/drawingarea.cc ++++ gtkglext/gtkmm/gl/drawingarea.cc +@@ -17,6 +17,7 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ + ++#include + #include "drawingarea.h" + + namespace Gtk +diff --git a/gtkglext/gtkmm/gl/widget.cc b/gtkglext/gtkmm/gl/widget.cc +index 598d6e2..2d6833b 100644 +--- gtkglext/gtkmm/gl/widget.cc ++++ gtkglext/gtkmm/gl/widget.cc +@@ -17,6 +17,7 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ + ++#include + #include "widget.h" + + #include diff --git a/srcpkgs/gtkglextmm/patches/gtkglextmm-1.2.0-aclocal.patch b/srcpkgs/gtkglextmm/patches/gtkglextmm-1.2.0-aclocal.patch new file mode 100644 index 00000000000..25c319645fc --- /dev/null +++ b/srcpkgs/gtkglextmm/patches/gtkglextmm-1.2.0-aclocal.patch @@ -0,0 +1,11 @@ +--- m4macros/gtkglextmm.m4 2004-05-18 08:29:34.000000000 +0200 ++++ 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], diff --git a/srcpkgs/gtkglextmm/template b/srcpkgs/gtkglextmm/template new file mode 100644 index 00000000000..355e1eed624 --- /dev/null +++ b/srcpkgs/gtkglextmm/template @@ -0,0 +1,28 @@ +# Template file for 'gtkglextmm' +pkgname=gtkglextmm +version=1.2.0 +revision=1 +build_style=gnu-configure +hostmakedepends="pkg-config" +makedepends="gtkglext-devel gtkmm2-devel pangomm-devel" +short_desc="C++ bindings for gtkglext" +maintainer="Andrea Brancaleoni " +license="LGPL-2.1" +homepage="https://projects.gnome.org/gtkglext/" +distfiles="${SOURCEFORGE_SITE}/gtkglext/${pkgname}-${version}.tar.bz2" +checksum=6cd4bd2a240e5eb1e3a24c5a3ebbf7ed905b522b888439778043fdeb58771fea +nocross=yes + +gtkglextmm-devel_package() { + depends="${makedepends} ${sourcepkg}-${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + vmove usr/share/doc + vmove usr/share/aclocal + vmove usr/lib/gtkglextmm-1.2 + } +}