diff options
| -rw-r--r-- | libraries/gtkglext/README | 4 | ||||
| -rw-r--r-- | libraries/gtkglext/gtkglext-no-deprecated-flags.patch | 132 | ||||
| -rw-r--r-- | libraries/gtkglext/gtkglext.SlackBuild | 11 |
3 files changed, 139 insertions, 8 deletions
diff --git a/libraries/gtkglext/README b/libraries/gtkglext/README index c47351f39cd0..73b0d3a460f3 100644 --- a/libraries/gtkglext/README +++ b/libraries/gtkglext/README @@ -1,6 +1,6 @@ GtkGLExt is an OpenGL extension to GTK. This package is composed of GdkGLExt library and GtkGLExt library. -GdkGLExt library provides the GDK objects which support OpenGL -rendering in GTK. GtkGLExt library provides the GtkWidget API +The GdkGLExt library provides the GDK objects, which support OpenGL +rendering in GTK. The GtkGLExt library provides the GtkWidget API add-ons to make GTK+ widgets OpenGL-capable. diff --git a/libraries/gtkglext/gtkglext-no-deprecated-flags.patch b/libraries/gtkglext/gtkglext-no-deprecated-flags.patch new file mode 100644 index 000000000000..a74f2816e27b --- /dev/null +++ b/libraries/gtkglext/gtkglext-no-deprecated-flags.patch @@ -0,0 +1,132 @@ +Index: gtkglext-1.2.0/examples/Makefile.am +=================================================================== +--- gtkglext-1.2.0.orig/examples/Makefile.am ++++ gtkglext-1.2.0/examples/Makefile.am +@@ -17,11 +17,7 @@ INCLUDES = \ + -I$(top_builddir)/gdk \ + -I$(top_builddir)/gtk \ + $(GTKGLEXT_DEBUG_FLAGS) \ +- $(EXAMPLES_DEP_CFLAGS) \ +- -DG_DISABLE_DEPRECATED \ +- -DGDK_DISABLE_DEPRECATED \ +- -DGDK_PIXBUF_DISABLE_DEPRECATED \ +- -DGTK_DISABLE_DEPRECATED ++ $(EXAMPLES_DEP_CFLAGS) + + DEPS = \ + $(top_builddir)/gdk/$(gdkglext_targetlib) \ +Index: gtkglext-1.2.0/examples/Makefile.in +=================================================================== +--- gtkglext-1.2.0.orig/examples/Makefile.in ++++ gtkglext-1.2.0/examples/Makefile.in +@@ -233,11 +233,7 @@ INCLUDES = \ + -I$(top_builddir)/gdk \ + -I$(top_builddir)/gtk \ + $(GTKGLEXT_DEBUG_FLAGS) \ +- $(EXAMPLES_DEP_CFLAGS) \ +- -DG_DISABLE_DEPRECATED \ +- -DGDK_DISABLE_DEPRECATED \ +- -DGDK_PIXBUF_DISABLE_DEPRECATED \ +- -DGTK_DISABLE_DEPRECATED ++ $(EXAMPLES_DEP_CFLAGS) + + + DEPS = \ +Index: gtkglext-1.2.0/gdk/Makefile.am +=================================================================== +--- gtkglext-1.2.0.orig/gdk/Makefile.am ++++ gtkglext-1.2.0/gdk/Makefile.am +@@ -43,10 +43,7 @@ common_includes = \ + -DGDK_GL_COMPILATION \ + -I$(top_srcdir) \ + $(GTKGLEXT_DEBUG_FLAGS) \ +- $(GDKGLEXT_DEP_CFLAGS) \ +- -DG_DISABLE_DEPRECATED \ +- -DGDK_DISABLE_DEPRECATED \ +- -DGDK_PIXBUF_DISABLE_DEPRECATED ++ $(GDKGLEXT_DEP_CFLAGS) + + common_ldflags = \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ +Index: gtkglext-1.2.0/gdk/Makefile.in +=================================================================== +--- gtkglext-1.2.0.orig/gdk/Makefile.in ++++ gtkglext-1.2.0/gdk/Makefile.in +@@ -238,10 +238,7 @@ common_includes = \ + -DGDK_GL_COMPILATION \ + -I$(top_srcdir) \ + $(GTKGLEXT_DEBUG_FLAGS) \ +- $(GDKGLEXT_DEP_CFLAGS) \ +- -DG_DISABLE_DEPRECATED \ +- -DGDK_DISABLE_DEPRECATED \ +- -DGDK_PIXBUF_DISABLE_DEPRECATED ++ $(GDKGLEXT_DEP_CFLAGS) + + + common_ldflags = \ +Index: gtkglext-1.2.0/gdk/x11/Makefile.am +=================================================================== +--- gtkglext-1.2.0.orig/gdk/x11/Makefile.am ++++ gtkglext-1.2.0/gdk/x11/Makefile.am +@@ -10,10 +10,7 @@ INCLUDES = \ + -I$(top_builddir)/gdk \ + $(GTKGLEXT_DEBUG_FLAGS) \ + $(GDKGLEXT_DEP_CFLAGS) \ +- $(GDKGLEXT_WIN_EXTRA_DEFS) \ +- -DG_DISABLE_DEPRECATED \ +- -DGDK_DISABLE_DEPRECATED \ +- -DGDK_PIXBUF_DISABLE_DEPRECATED ++ $(GDKGLEXT_WIN_EXTRA_DEFS) + + LDADDS = \ + $(GDKGLEXT_DEP_LIBS) +Index: gtkglext-1.2.0/gdk/x11/Makefile.in +=================================================================== +--- gtkglext-1.2.0.orig/gdk/x11/Makefile.in ++++ gtkglext-1.2.0/gdk/x11/Makefile.in +@@ -225,10 +225,7 @@ INCLUDES = \ + -I$(top_builddir)/gdk \ + $(GTKGLEXT_DEBUG_FLAGS) \ + $(GDKGLEXT_DEP_CFLAGS) \ +- $(GDKGLEXT_WIN_EXTRA_DEFS) \ +- -DG_DISABLE_DEPRECATED \ +- -DGDK_DISABLE_DEPRECATED \ +- -DGDK_PIXBUF_DISABLE_DEPRECATED ++ $(GDKGLEXT_WIN_EXTRA_DEFS) + + + LDADDS = \ +Index: gtkglext-1.2.0/gtk/Makefile.am +=================================================================== +--- gtkglext-1.2.0.orig/gtk/Makefile.am ++++ gtkglext-1.2.0/gtk/Makefile.am +@@ -36,11 +36,7 @@ common_includes = \ + -I$(top_srcdir) \ + -I$(top_builddir)/gdk \ + $(GTKGLEXT_DEBUG_FLAGS) \ +- $(GTKGLEXT_DEP_CFLAGS) \ +- -DG_DISABLE_DEPRECATED \ +- -DGDK_DISABLE_DEPRECATED \ +- -DGDK_PIXBUF_DISABLE_DEPRECATED \ +- -DGTK_DISABLE_DEPRECATED ++ $(GTKGLEXT_DEP_CFLAGS) + + common_ldflags = \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ +Index: gtkglext-1.2.0/gtk/Makefile.in +=================================================================== +--- gtkglext-1.2.0.orig/gtk/Makefile.in ++++ gtkglext-1.2.0/gtk/Makefile.in +@@ -234,11 +234,7 @@ common_includes = \ + -I$(top_srcdir) \ + -I$(top_builddir)/gdk \ + $(GTKGLEXT_DEBUG_FLAGS) \ +- $(GTKGLEXT_DEP_CFLAGS) \ +- -DG_DISABLE_DEPRECATED \ +- -DGDK_DISABLE_DEPRECATED \ +- -DGDK_PIXBUF_DISABLE_DEPRECATED \ +- -DGTK_DISABLE_DEPRECATED ++ $(GTKGLEXT_DEP_CFLAGS) + + + common_ldflags = \ diff --git a/libraries/gtkglext/gtkglext.SlackBuild b/libraries/gtkglext/gtkglext.SlackBuild index ae4acc658069..4478018e96d6 100644 --- a/libraries/gtkglext/gtkglext.SlackBuild +++ b/libraries/gtkglext/gtkglext.SlackBuild @@ -24,15 +24,13 @@ PRGNAM=gtkglext VERSION=1.2.0 -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -72,6 +70,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Don't disable deprecated stuff +patch -p1 < $CWD/gtkglext-no-deprecated-flags.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -92,9 +93,7 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a AUTHORS COPYING* ChangeLog NEWS README TODO \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -( cd $PKG/usr/doc/$PRGNAM-$VERSION - ln -s /usr/share/gtk-doc/html/gtkglext html -) +(cd $PKG/usr/doc/$PRGNAM-$VERSION; ln -s /usr/share/gtk-doc/html/gtkglext html) mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc |