diff options
Diffstat (limited to 'media-gfx/gliv/files')
-rw-r--r-- | media-gfx/gliv/files/gliv-1.9.7-as-needed.patch | 87 | ||||
-rw-r--r-- | media-gfx/gliv/files/gliv-1.9.7-destdir.patch | 15 |
2 files changed, 0 insertions, 102 deletions
diff --git a/media-gfx/gliv/files/gliv-1.9.7-as-needed.patch b/media-gfx/gliv/files/gliv-1.9.7-as-needed.patch deleted file mode 100644 index 6998e5fd988d..000000000000 --- a/media-gfx/gliv/files/gliv-1.9.7-as-needed.patch +++ /dev/null @@ -1,87 +0,0 @@ ---- gliv-1.9.7.orig/configure.ac -+++ gliv-1.9.7/configure.ac -@@ -17,18 +17,17 @@ - # Checks for programs. - AC_PROG_CC - AC_PROG_RANLIB -- -+AC_USE_SYSTEM_EXTENSIONS - - # Default CFLAGS. --if test "x$GCC" = "xyes" && test "$DEFAULT_CFLAGS" = "yes"; then -- CFLAGS="-Wall -O2 -fomit-frame-pointer -ffast-math" --fi --CFLAGS="$CFLAGS -I${srcdir}/../lib" -+#if test "x$GCC" = "xyes" && test "$DEFAULT_CFLAGS" = "yes"; then -+# CFLAGS="-Wall -O2 -fomit-frame-pointer -ffast-math" -+#fi -+#CFLAGS="$CFLAGS -I${srcdir}/../lib" - - # Checks for LFS flags, we may not handle big files, but it doesn't hurt. - AC_SYS_LARGEFILE - -- - AC_DEFUN([CHECK_MATH], - [OLD_CFLAGS="$CFLAGS"] - [CFLAGS="$CFLAGS -w"] -@@ -128,35 +127,22 @@ - - # Checks for X. - AC_PATH_XTRA --CFLAGS="$X_CFLAGS $CFLAGS" --LDFLAGS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS $LDFLAGS" - - # Checks for GtkGLExt. - PKG_CHECK_MODULES(GTKGLEXT, [gtkglext-1.0 >= 0.7.0]) --CFLAGS="$GTKGLEXT_CFLAGS $CFLAGS" --LDFLAGS="$GTKGLEXT_LIBS $LDFLAGS" - GTKGL_VERSION="$($PKG_CONFIG --modversion gtkglext-1.0)" - - # Checks for OpenGL. --AC_TRY_LINK([#include "GL/gl.h"], -- [glBegin(GL_QUADS);], -- [ogl="yes"], -- [ogl="no"]) -- -+AC_SEARCH_LIBS([glBegin],[GL],[ogl="yes"],[ogl="no"],) - if test "x$ogl" = "xno"; then - AC_MSG_NOTICE([maybe libGL requires libpthread...]) -- OLD_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -lpthread" -- AC_TRY_LINK([#include "GL/gl.h"], -- [glBegin(GL_QUADS);], -- [], -- AC_MSG_ERROR([cannot use -lGL])) -+ AC_SEARCH_LIBS([glBegin],[GL],[ogl="yes"],[ogl="no"],[-lpthread]) - fi - - # Checks for gtk. - AM_PATH_GTK_2_0([2.6.0], [ - CFLAGS="$GTK_CFLAGS $CFLAGS" -- LDFLAGS="$GTK_LIBS $LDFLAGS" -+ LIBS="$LIBS $GTK_LIBS" - GTK_VERSION="$($PKG_CONFIG --modversion gtk+-2.0)" - ], [exit 1], [gthread]) - -@@ -164,9 +150,6 @@ - ALL_LINGUAS=$(echo po/*.po | sed -e 's|\.po||g' -e 's|po/||g') - AM_GNU_GETTEXT_VERSION - AM_GNU_GETTEXT --CFLAGS="$CFLAGS -I../${srcdir}/intl" --LIBS="$LIBS $LIBINTL" -- - - AC_CONFIG_FILES([ intl/Makefile - Makefile ---- gliv-1.9.7.orig/src/Makefile.am -+++ gliv-1.9.7/src/Makefile.am -@@ -64,6 +64,9 @@ - gliv_LDADD = -L../lib -lreplacements - endif - -+gliv_CFLAGS = @GTKGLEXT_CFLAGS@ -+gliv_LDADD = @GTKGLEXT_LIBS@ -+ - AM_CPPFLAGS = -I$(srcdir)/include -D_REENTRANT -D_THREAD_SAFE \ - -DSYSCONFDIR=\"$(sysconfdir)\" - diff --git a/media-gfx/gliv/files/gliv-1.9.7-destdir.patch b/media-gfx/gliv/files/gliv-1.9.7-destdir.patch deleted file mode 100644 index 827c6adb10d8..000000000000 --- a/media-gfx/gliv/files/gliv-1.9.7-destdir.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- gliv-1.9.7/Makefile.am.orig -+++ gliv-1.9.7/Makefile.am -@@ -31,9 +31,9 @@ - @echo - @if desktop-file-install --help > /dev/null 2>&1; then \ - echo "Installing the GLiv desktop file with desktop-file-install"; \ -- mkdir -p $(datadir)/{pixmaps,applications} || true; \ -- cp gliv.png $(datadir)/pixmaps/gliv.png || true; \ -- desktop-file-install --vendor=gnome --dir=$(datadir)/applications \ -+ mkdir -p $(DESTDIR)$(datadir)/{pixmaps,applications} || true; \ -+ cp gliv.png $(DESTDIR)$(datadir)/pixmaps/gliv.png || true; \ -+ desktop-file-install --vendor=gnome --dir=$(DESTDIR)$(datadir)/applications \ - gliv.desktop || true; \ - else \ - echo "No desktop-file-install(1), skipping gliv.desktop"; \ |