Bump
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@3030 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
@@ -1,49 +0,0 @@
|
||||
Patch from upstream trunk for xextproto >= 7.0.99.1 compability.
|
||||
|
||||
--- configure.in
|
||||
+++ configure.in
|
||||
@@ -2192,6 +2192,11 @@
|
||||
[ X_LIBS="-lXext $X_LIBS";
|
||||
LINK_X_LIBS="-lXext $LINK_X_LIBS"],,$X_LIBS)
|
||||
|
||||
+ PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
|
||||
+ HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
|
||||
+ HAVE_XEXTPROTO_71="no")
|
||||
+ AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
|
||||
+
|
||||
AC_MSG_CHECKING(for X11/extensions/Xvlib.h)
|
||||
AC_TRY_LINK([#include <X11/Xlib.h>
|
||||
#include <X11/extensions/Xvlib.h>],
|
||||
@@ -2391,6 +2396,11 @@
|
||||
AC_DEFINE(HAS_TRANSLATION,,[Enable internationalization support])
|
||||
fi
|
||||
|
||||
+dnl Handle the xextproto conditinal for the systems that don't use it
|
||||
+if test x"$is_unix_x11" != "xyes" -o x"$enable_sdlui" = "xyes" -o x"$enable_gnomeui" = "xyes"; then
|
||||
+ AM_CONDITIONAL(HAVE_XEXTPROTO_71, false)
|
||||
+fi
|
||||
+
|
||||
dnl CBM4Linux/OpenCBM
|
||||
AC_MSG_CHECKING([for OpenCBM support])
|
||||
if test x"$enable_realdevice" != "xno"; then
|
||||
--- src/arch/unix/x11/xaw/x11video.c
|
||||
+++ src/arch/unix/x11/xaw/x11video.c
|
||||
@@ -56,6 +56,7 @@
|
||||
#include "vice.h"
|
||||
|
||||
#include <X11/Xlib.h>
|
||||
+#include <X11/Xlibint.h>
|
||||
#include <X11/Xutil.h>
|
||||
#include <X11/Intrinsic.h>
|
||||
#include <X11/cursorfont.h>
|
||||
@@ -95,6 +96,10 @@
|
||||
#endif
|
||||
|
||||
#ifdef USE_MITSHM
|
||||
+#ifdef HAVE_XEXTPROTO_71
|
||||
+#include <X11/extensions/shmproto.h>
|
||||
+#include <X11/extensions/XShm.h>
|
||||
+#endif
|
||||
extern int shmhandler(Display* display, XErrorEvent* err);
|
||||
extern int mitshm_failed; /* will be set to true if XShmAttach() failed */
|
||||
extern int shmmajor; /* major number of MITSHM error codes */
|
||||
17
app-emulation/vice/files/vice-2.3-notexi.patch
Normal file
17
app-emulation/vice/files/vice-2.3-notexi.patch
Normal file
@@ -0,0 +1,17 @@
|
||||
--- doc/Makefile.am.orig
|
||||
+++ doc/Makefile.am
|
||||
@@ -48,14 +48,7 @@
|
||||
$(srcdir)/vice.txt: vice.texi
|
||||
$(MAKEINFO) -o $(srcdir)/vice.txt --no-headers $(srcdir)/vice.texi
|
||||
|
||||
-if BUILD_PDF
|
||||
-$(srcdir)/vice.pdf: vice.texi
|
||||
- $(TEXI2DVI) -q --clean --pdf -o $(srcdir)/vice.pdf $(srcdir)/vice.texi
|
||||
-
|
||||
-PDF_DEPS=$(srcdir)/vice.pdf
|
||||
-else
|
||||
PDF_DEPS=
|
||||
-endif
|
||||
|
||||
if BUILD_AMIGAGUIDE
|
||||
$(srcdir)/vice.guide: vice.texi
|
||||
Reference in New Issue
Block a user