Drop patches, they are not needed anymore.

This commit is contained in:
ajacoutot 2013-06-28 10:03:46 +00:00
parent aeae4adc3e
commit 968f98664e
4 changed files with 9 additions and 36 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.9 2013/05/31 15:35:13 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.10 2013/06/28 10:03:46 ajacoutot Exp $
COMMENT = C++ bindings for gtkglext
DISTNAME = gtkglextmm-1.2.0
REVISION = 5
REVISION = 6
SHARED_LIBS += gdkglextmm-x11-1.2 0.0 # 0.0
SHARED_LIBS += gtkglextmm-x11-1.2 0.0 # 0.0
@ -21,16 +21,15 @@ WANTLIB += cairo cairomm-1.0 drm expat ffi fontconfig freetype
WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gdkglext-x11-1.0 gdkmm-2.4
WANTLIB += gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 gmodule-2.0 gobject-2.0
WANTLIB += graphite2 gthread-2.0 gtk-x11-2.0 gtkglext-x11-1.0
WANTLIB += gtkmm-2.4 harfbuzz m pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pangomm-1.4 pangox-1.0
WANTLIB += pcre pixman-1 png pthread pthread-stubs sigc-2.0 stdc++
WANTLIB += xcb xcb-render xcb-shm z
WANTLIB += gtkmm-2.4 harfbuzz m pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pangomm-1.4 pangox-1.0 pcre pixman-1 png pthread pthread-stubs
WANTLIB += sigc-2.0 stdc++ xcb xcb-render xcb-shm z
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=gtkglext/}
MODULES = devel/gettext
LIB_DEPENDS = x11/gtk2mm \
LIB_DEPENDS = x11/gtk2mm>=2.24.4 \
x11/gtkglext
USE_GMAKE = Yes

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-gtkglext_gtkmm_gl_drawingarea_h,v 1.1 2013/04/08 13:58:16 ajacoutot Exp $
Fix build with gtkmm>=2.24.3
--- gtkglext/gtkmm/gl/drawingarea.h.orig Mon Apr 8 15:54:44 2013
+++ gtkglext/gtkmm/gl/drawingarea.h Mon Apr 8 15:54:57 2013
@@ -20,6 +20,7 @@
#ifndef _GTKMM_GL_DRAWINGAREA_H
#define _GTKMM_GL_DRAWINGAREA_H
+#include <glibmm/thread.h>
#include <gtkmm/drawingarea.h>
#include <gtkmm/gl/widget.h>

View File

@ -1,6 +1,8 @@
$OpenBSD: patch-gtkglext_gtkmm_gl_widget_cc,v 1.1.1.1 2012/05/28 09:13:23 bentley Exp $
$OpenBSD: patch-gtkglext_gtkmm_gl_widget_cc,v 1.2 2013/06/28 10:03:46 ajacoutot Exp $
avoid "error: 'GdkSpanFunc' has not been declared" by including
gtk/gtkglwidget.h before widget.h.
--- gtkglext/gtkmm/gl/widget.cc.orig Sun May 13 23:49:14 2012
+++ gtkglext/gtkmm/gl/widget.cc Sun May 13 23:49:20 2012
@@ -17,9 +17,9 @@

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-gtkglext_gtkmm_gl_widget_h,v 1.1 2013/04/08 13:58:16 ajacoutot Exp $
Fix build with gtkmm>=2.24.3
--- gtkglext/gtkmm/gl/widget.h.orig Mon Apr 8 15:53:17 2013
+++ gtkglext/gtkmm/gl/widget.h Mon Apr 8 15:54:18 2013
@@ -20,6 +20,7 @@
#ifndef _GTKMM_GL_WIDGET_H
#define _GTKMM_GL_WIDGET_H
+#include <glibmm/thread.h>
#include <gtkmm/widget.h>
#include <gdkmm/gl/tokens.h>