Date: Sat, 21 Dec 2002 16:02:57 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/46436: Update port: x11-toolkits/gtkglarea-- Message-ID: <20021221160257.68cdf52b.tkato@prontomail.com>
next in thread | raw e-mail | index | archive | help
>Number: 46436
>Category: ports
>Synopsis: Update port: x11-toolkits/gtkglarea--
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Dec 20 23:10:12 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.7-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
- Fix build on 5-current
New file:
files/patch-examples::extra::events.cc
files/patch-examples::extra::glpixmap.cc
files/patch-examples::pickmm::pick.cc
files/patch-examples::planetmm::planet.cc
files/patch-gtkgl--::gdkgl.cc
Remove file:
files/patch-events.cc
files/patch-gdkgl.cc
files/patch-glpixmap.cc
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/x11-toolkits/gtkglarea--/Makefile x11-toolkits/gtkglarea--/Makefile
--- /usr/ports/x11-toolkits/gtkglarea--/Makefile Mon Nov 11 19:01:38 2002
+++ x11-toolkits/gtkglarea--/Makefile Fri Dec 20 09:38:17 2002
@@ -13,15 +13,20 @@
MAINTAINER= ports@FreeBSD.org
+BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
LIB_DEPENDS= gtkmm.2:${PORTSDIR}/x11-toolkits/gtk-- \
gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
+USE_MESA= yes
USE_GNOMENG= yes
USE_GNOME= gtk12
-USE_MESA= yes
USE_LIBTOOL= yes
-CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-lib-GL
INSTALLS_SHLIB= yes
+
+CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib -lGL -lGLU -lglut \
+ ${PTHREAD_LIBS}
.include <bsd.port.mk>
diff -urN /usr/ports/x11-toolkits/gtkglarea--/files/patch-events.cc x11-toolkits/gtkglarea--/files/patch-events.cc
--- /usr/ports/x11-toolkits/gtkglarea--/files/patch-events.cc Wed Aug 28 15:16:21 2002
+++ x11-toolkits/gtkglarea--/files/patch-events.cc Thu Jan 1 09:00:00 1970
@@ -1,10 +0,0 @@
---- examples/extra/events.cc.orig Wed Aug 28 14:04:59 2002
-+++ examples/extra/events.cc Wed Aug 28 14:05:23 2002
-@@ -28,6 +28,7 @@
- #include <GL/gl.h>
- #include <GL/glu.h>
-
-+using namespace std;
-
- void gl() {
- static int displaylist=-1;
diff -urN /usr/ports/x11-toolkits/gtkglarea--/files/patch-examples::extra::events.cc x11-toolkits/gtkglarea--/files/patch-examples::extra::events.cc
--- /usr/ports/x11-toolkits/gtkglarea--/files/patch-examples::extra::events.cc Thu Jan 1 09:00:00 1970
+++ x11-toolkits/gtkglarea--/files/patch-examples::extra::events.cc Fri Dec 20 09:45:33 2002
@@ -0,0 +1,19 @@
+--- examples/extra/events.cc.orig Thu Jan 27 09:15:24 2000
++++ examples/extra/events.cc Fri Dec 20 09:45:21 2002
+@@ -18,7 +18,7 @@
+ *********************************************************************/
+
+ #include <string>
+-#include <iostream.h>
++#include <iostream>
+ #include <GL/glx.h>
+ #include <glib.h>
+ #include <gdk/gdk.h>
+@@ -28,6 +28,7 @@
+ #include <GL/gl.h>
+ #include <GL/glu.h>
+
++using namespace std;
+
+ void gl() {
+ static int displaylist=-1;
diff -urN /usr/ports/x11-toolkits/gtkglarea--/files/patch-examples::extra::glpixmap.cc x11-toolkits/gtkglarea--/files/patch-examples::extra::glpixmap.cc
--- /usr/ports/x11-toolkits/gtkglarea--/files/patch-examples::extra::glpixmap.cc Thu Jan 1 09:00:00 1970
+++ x11-toolkits/gtkglarea--/files/patch-examples::extra::glpixmap.cc Fri Dec 20 09:38:00 2002
@@ -0,0 +1,10 @@
+--- examples/extra/glpixmap.cc.orig Wed Aug 28 14:02:08 2002
++++ examples/extra/glpixmap.cc Wed Aug 28 14:02:29 2002
+@@ -27,6 +27,7 @@
+ #include <gdk--.h>
+ #include <gtkgl--/gdkgl.h>
+
++using namespace std;
+
+ int visual_attributes[] = { GDK_GL_RGBA,
+ GDK_GL_NONE };
diff -urN /usr/ports/x11-toolkits/gtkglarea--/files/patch-examples::pickmm::pick.cc x11-toolkits/gtkglarea--/files/patch-examples::pickmm::pick.cc
--- /usr/ports/x11-toolkits/gtkglarea--/files/patch-examples::pickmm::pick.cc Thu Jan 1 09:00:00 1970
+++ x11-toolkits/gtkglarea--/files/patch-examples::pickmm::pick.cc Fri Dec 20 09:43:15 2002
@@ -0,0 +1,20 @@
+--- examples/pickmm/pick.cc.orig Thu Jan 27 09:15:24 2000
++++ examples/pickmm/pick.cc Fri Dec 20 09:42:57 2002
+@@ -16,7 +16,7 @@
+ Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+ *********************************************************************/
+-#include <iostream.h>
++#include <iostream>
+
+ #include <GL/gl.h>
+ #include <GL/glu.h>
+@@ -28,6 +28,8 @@
+ #include <gtk--.h>
+
+ #include <gtkgl--/glarea.h>
++
++using namespace std;
+
+ // WARNING: Verbosity level set to maximum, prepare to get an ear full
+
diff -urN /usr/ports/x11-toolkits/gtkglarea--/files/patch-examples::planetmm::planet.cc x11-toolkits/gtkglarea--/files/patch-examples::planetmm::planet.cc
--- /usr/ports/x11-toolkits/gtkglarea--/files/patch-examples::planetmm::planet.cc Thu Jan 1 09:00:00 1970
+++ x11-toolkits/gtkglarea--/files/patch-examples::planetmm::planet.cc Fri Dec 20 09:44:24 2002
@@ -0,0 +1,20 @@
+--- examples/planetmm/planet.cc.orig Thu Jan 27 09:15:25 2000
++++ examples/planetmm/planet.cc Fri Dec 20 09:43:57 2002
+@@ -16,7 +16,7 @@
+ Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+ *********************************************************************/
+-#include <iostream.h>
++#include <iostream>
+ #include <GL/glx.h>
+ #include <glib.h>
+ #include <gdk/gdk.h>
+@@ -27,6 +27,8 @@
+ #include <GL/gl.h>
+ #include <math.h>
+ #include "globeGL.hh"
++
++using namespace std;
+
+ // WARNING: Verbosity level set to maximum, prepare to get an ear full
+
diff -urN /usr/ports/x11-toolkits/gtkglarea--/files/patch-gdkgl.cc x11-toolkits/gtkglarea--/files/patch-gdkgl.cc
--- /usr/ports/x11-toolkits/gtkglarea--/files/patch-gdkgl.cc Wed Aug 28 15:16:21 2002
+++ x11-toolkits/gtkglarea--/files/patch-gdkgl.cc Thu Jan 1 09:00:00 1970
@@ -1,20 +0,0 @@
---- gtkgl--/gdkgl.cc.orig Wed Aug 28 13:56:43 2002
-+++ gtkgl--/gdkgl.cc Wed Aug 28 13:58:35 2002
-@@ -69,7 +69,7 @@
-
- Gdk_GL::Context::Context(const Gdk_Visual &visual,
- Context &share,
-- bool direct=FALSE)
-+ bool direct)
- :Gdk_Handle<GdkGLContext>(0)
- {create(visual,share,direct);}
-
-@@ -98,7 +98,7 @@
- ref();
- }
-
--void Gdk_GL::Context::create(const Gdk_Visual &visual,Context &share,bool direct=FALSE)
-+void Gdk_GL::Context::create(const Gdk_Visual &visual,Context &share,bool direct)
- {
- unref();
- obj_ = gdk_gl_context_share_new(gdk_const_cast(visual),share,direct);
diff -urN /usr/ports/x11-toolkits/gtkglarea--/files/patch-glpixmap.cc x11-toolkits/gtkglarea--/files/patch-glpixmap.cc
--- /usr/ports/x11-toolkits/gtkglarea--/files/patch-glpixmap.cc Wed Aug 28 15:16:21 2002
+++ x11-toolkits/gtkglarea--/files/patch-glpixmap.cc Thu Jan 1 09:00:00 1970
@@ -1,10 +0,0 @@
---- examples/extra/glpixmap.cc.orig Wed Aug 28 14:02:08 2002
-+++ examples/extra/glpixmap.cc Wed Aug 28 14:02:29 2002
-@@ -27,6 +27,7 @@
- #include <gdk--.h>
- #include <gtkgl--/gdkgl.h>
-
-+using namespace std;
-
- int visual_attributes[] = { GDK_GL_RGBA,
- GDK_GL_NONE };
diff -urN /usr/ports/x11-toolkits/gtkglarea--/files/patch-gtkgl--::gdkgl.cc x11-toolkits/gtkglarea--/files/patch-gtkgl--::gdkgl.cc
--- /usr/ports/x11-toolkits/gtkglarea--/files/patch-gtkgl--::gdkgl.cc Thu Jan 1 09:00:00 1970
+++ x11-toolkits/gtkglarea--/files/patch-gtkgl--::gdkgl.cc Fri Dec 20 09:38:00 2002
@@ -0,0 +1,20 @@
+--- gtkgl--/gdkgl.cc.orig Wed Aug 28 13:56:43 2002
++++ gtkgl--/gdkgl.cc Wed Aug 28 13:58:35 2002
+@@ -69,7 +69,7 @@
+
+ Gdk_GL::Context::Context(const Gdk_Visual &visual,
+ Context &share,
+- bool direct=FALSE)
++ bool direct)
+ :Gdk_Handle<GdkGLContext>(0)
+ {create(visual,share,direct);}
+
+@@ -98,7 +98,7 @@
+ ref();
+ }
+
+-void Gdk_GL::Context::create(const Gdk_Visual &visual,Context &share,bool direct=FALSE)
++void Gdk_GL::Context::create(const Gdk_Visual &visual,Context &share,bool direct)
+ {
+ unref();
+ obj_ = gdk_gl_context_share_new(gdk_const_cast(visual),share,direct);
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20021221160257.68cdf52b.tkato>