diff options
Diffstat (limited to 'dev-libs/g-wrap/files')
| -rw-r--r-- | dev-libs/g-wrap/files/1.9.8-fix-ffi-build-issue.patch | 15 | ||||
| -rw-r--r-- | dev-libs/g-wrap/files/1.9.8-fix-gcc-4.2.0-libffi.patch | 21 | ||||
| -rw-r--r-- | dev-libs/g-wrap/files/g-wrap-1.3.4-direntry.patch | 57 | ||||
| -rw-r--r-- | dev-libs/g-wrap/files/g-wrap-1.3.4-m4.patch | 20 | ||||
| -rw-r--r-- | dev-libs/g-wrap/files/g-wrap-1.9.6_glib_automagic.patch | 13 | ||||
| -rw-r--r-- | dev-libs/g-wrap/files/g-wrap-1.9.7_glib_automagic.patch | 16 | ||||
| -rw-r--r-- | dev-libs/g-wrap/files/glib_automagic.patch | 16 | ||||
| -rw-r--r-- | dev-libs/g-wrap/files/libffi_automagic.patch | 11 |
8 files changed, 169 insertions, 0 deletions
diff --git a/dev-libs/g-wrap/files/1.9.8-fix-ffi-build-issue.patch b/dev-libs/g-wrap/files/1.9.8-fix-ffi-build-issue.patch new file mode 100644 index 000000000000..c9ba466e9016 --- /dev/null +++ b/dev-libs/g-wrap/files/1.9.8-fix-ffi-build-issue.patch @@ -0,0 +1,15 @@ +diff -urN g-wrap-1.9.8.orig/guile/examples/Makefile.am g-wrap-1.9.8/guile/examples/Makefile.am +--- g-wrap-1.9.8.orig/guile/examples/Makefile.am 2007-05-31 15:07:17.000000000 -0700 ++++ g-wrap-1.9.8/guile/examples/Makefile.am 2007-06-01 10:07:32.000000000 -0700 +@@ -5,7 +5,10 @@ + + lib_LTLIBRARIES += libgw-guile-miscutils.la + libgw_guile_miscutils_la_SOURCES = miscutils-guile.c miscutils-guile.h gw-miscutils.c +-libgw_guile_miscutils_la_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/guile ++libgw_guile_miscutils_la_CFLAGS = \ ++ -I$(top_srcdir) \ ++ -I$(top_srcdir)/guile \ ++ $(LIBFFI_CFLAGS) + libgw_guile_miscutils_la_LDFLAGS = -module + libgw_guile_miscutils_la_LIBADD = libmiscutils.la \ + $(top_builddir)/guile/g-wrap/libgwrap-guile-runtime.la \ diff --git a/dev-libs/g-wrap/files/1.9.8-fix-gcc-4.2.0-libffi.patch b/dev-libs/g-wrap/files/1.9.8-fix-gcc-4.2.0-libffi.patch new file mode 100644 index 000000000000..e2a2abc645d6 --- /dev/null +++ b/dev-libs/g-wrap/files/1.9.8-fix-gcc-4.2.0-libffi.patch @@ -0,0 +1,21 @@ +diff -urN g-wrap-1.9.8.orig/libffi/configure.ac g-wrap-1.9.8/libffi/configure.ac +--- g-wrap-1.9.8.orig/libffi/configure.ac 2007-06-03 21:50:15.000000000 -0700 ++++ g-wrap-1.9.8/libffi/configure.ac 2007-06-03 21:50:31.000000000 -0700 +@@ -5,7 +5,7 @@ + AC_INIT([libffi], [2.1], [http://gcc.gnu.org/bugs.html]) + AC_CONFIG_HEADERS([fficonfig.h]) + +-AM_ENABLE_MULTILIB(, ..) ++#AM_ENABLE_MULTILIB(, ..) + + AC_CANONICAL_SYSTEM + target_alias=${target_alias-$host_alias} +diff -urN g-wrap-1.9.8.orig/libffi/include/Makefile.am g-wrap-1.9.8/libffi/include/Makefile.am +--- g-wrap-1.9.8.orig/libffi/include/Makefile.am 2007-06-03 21:50:15.000000000 -0700 ++++ g-wrap-1.9.8/libffi/include/Makefile.am 2007-06-03 21:50:47.000000000 -0700 +@@ -9,4 +9,4 @@ + gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) + toollibffidir := $(libdir)/gcc/$(target_alias)/$(gcc_version)/include + +-toollibffi_HEADERS = ffi.h ffitarget.h ++include_HEADERS = ffi.h ffitarget.h diff --git a/dev-libs/g-wrap/files/g-wrap-1.3.4-direntry.patch b/dev-libs/g-wrap/files/g-wrap-1.3.4-direntry.patch new file mode 100644 index 000000000000..dd040741a3d7 --- /dev/null +++ b/dev-libs/g-wrap/files/g-wrap-1.3.4-direntry.patch @@ -0,0 +1,57 @@ +diff -u g-wrap-1.3.4-vanilla/doc/g-wrap.info g-wrap-1.3.4/doc/g-wrap.info +--- g-wrap-1.3.4-vanilla/doc/g-wrap.info 2004-04-19 13:16:18.584411000 -0700 ++++ g-wrap-1.3.4/doc/g-wrap.info 2004-04-19 13:17:49.384608248 -0700 +@@ -1,5 +1,10 @@ + This is g-wrap.info, produced by makeinfo version 4.2 from g-wrap.texi. + ++INFO-DIR-SECTION The Algorithmic Language Scheme ++START-INFO-DIR-ENTRY ++* G-wrap: (g-wrap). Export C libraries into Scheme. ++END-INFO-DIR-ENTRY ++ + + Indirect: + g-wrap.info-1: 73 +diff -u g-wrap-1.3.4-vanilla/doc/g-wrap.info-1 g-wrap-1.3.4/doc/g-wrap.info-1 +--- g-wrap-1.3.4-vanilla/doc/g-wrap.info-1 2004-04-19 13:16:28.147958000 -0700 ++++ g-wrap-1.3.4/doc/g-wrap.info-1 2004-04-19 13:17:52.254172008 -0700 +@@ -1,5 +1,10 @@ + This is g-wrap.info, produced by makeinfo version 4.2 from g-wrap.texi. + ++INFO-DIR-SECTION The Algorithmic Language Scheme ++START-INFO-DIR-ENTRY ++* G-wrap: (g-wrap). Export C libraries into Scheme. ++END-INFO-DIR-ENTRY ++ + + File: g-wrap.info, Node: Top, Next: Copying, Prev: (dir), Up: (dir) + +diff -u g-wrap-1.3.4-vanilla/doc/g-wrap.info-2 g-wrap-1.3.4/doc/g-wrap.info-2 +--- g-wrap-1.3.4-vanilla/doc/g-wrap.info-2 2004-04-19 13:16:33.402159000 -0700 ++++ g-wrap-1.3.4/doc/g-wrap.info-2 2004-04-19 13:17:55.048747168 -0700 +@@ -1,5 +1,10 @@ + This is g-wrap.info, produced by makeinfo version 4.2 from g-wrap.texi. + ++INFO-DIR-SECTION The Algorithmic Language Scheme ++START-INFO-DIR-ENTRY ++* G-wrap: (g-wrap). Export C libraries into Scheme. ++END-INFO-DIR-ENTRY ++ + + File: g-wrap.info, Node: Accessing the wrapped API from the target language, Next: Coping With Old Guile Versions, Prev: Generating the glue code, Up: Generating and using the glue code + +diff -r -u g-wrap-1.3.4-vanilla/doc/g-wrap.texi g-wrap-1.3.4/doc/g-wrap.texi +--- g-wrap-1.3.4-vanilla/doc/g-wrap.texi 2002-11-07 09:23:43.000000000 -0800 ++++ g-wrap-1.3.4/doc/g-wrap.texi 2004-04-19 13:30:50.391877096 -0700 +@@ -7,6 +7,11 @@ + @paragraphindent 0 + @c %**end of header + ++@dircategory The Algorithmic Language Scheme ++@direntry ++* G-wrap: (g-wrap). Export C libraries into Scheme. ++@end direntry ++ + @iftex + @finalout + @c DL: lose the egregious vertical whitespace, esp. around examples diff --git a/dev-libs/g-wrap/files/g-wrap-1.3.4-m4.patch b/dev-libs/g-wrap/files/g-wrap-1.3.4-m4.patch new file mode 100644 index 000000000000..b1a3861f4c35 --- /dev/null +++ b/dev-libs/g-wrap/files/g-wrap-1.3.4-m4.patch @@ -0,0 +1,20 @@ +--- g-wrap.m4.orig 2004-07-10 13:26:07.000000000 -0500 ++++ g-wrap.m4 2005-05-10 13:45:31.000000000 -0500 +@@ -4,7 +4,7 @@ + + dnl check whether we use the old or new guile smobs + +-AC_DEFUN(AC_GWRAP_CHECK_GUILE, ++AC_DEFUN([AC_GWRAP_CHECK_GUILE], + [if test x$GUILE = x ; then + AC_PATH_PROG(GUILE, guile, no) + fi +@@ -20,7 +20,7 @@ + dnl tests for minimum version of g-wrap. + dnl sets G_WRAP_CONFIG and GWRAP_OLD_GUILE_SMOB if needed. + +-AC_DEFUN(AM_PATH_GWRAP, ++AC_DEFUN([AM_PATH_GWRAP], + [dnl + dnl + dnl diff --git a/dev-libs/g-wrap/files/g-wrap-1.9.6_glib_automagic.patch b/dev-libs/g-wrap/files/g-wrap-1.9.6_glib_automagic.patch new file mode 100644 index 000000000000..cf4f4b36c139 --- /dev/null +++ b/dev-libs/g-wrap/files/g-wrap-1.9.6_glib_automagic.patch @@ -0,0 +1,13 @@ +--- configure.ac.old 2007-01-20 10:54:27.000000000 +0100 ++++ configure.ac 2007-01-20 10:55:49.000000000 +0100 +@@ -95,7 +95,9 @@ + AM_CONDITIONAL(HAVE_SRFI_35, test "$HAVE_SRFI_35" = yes) + + dnl Check for optional libraries +-PKG_CHECK_MODULES(GLIB, glib, [have_glib=yes], [have_glib=no]) ++if test "x$with_glib" != "xno"; then ++ PKG_CHECK_MODULES([GLIB], [glib-2.0], [have_glib=yes], [have_glib=no]) ++fi + AM_CONDITIONAL(HAVE_GLIB, test "$have_glib" = yes) + + dnl Check for compiler flags and warnings. This should be last, since diff --git a/dev-libs/g-wrap/files/g-wrap-1.9.7_glib_automagic.patch b/dev-libs/g-wrap/files/g-wrap-1.9.7_glib_automagic.patch new file mode 100644 index 000000000000..676fb4a589b4 --- /dev/null +++ b/dev-libs/g-wrap/files/g-wrap-1.9.7_glib_automagic.patch @@ -0,0 +1,16 @@ +--- configure.ac.old 2007-01-18 17:54:08.000000000 +0100 ++++ configure.ac 2007-01-18 17:57:38.000000000 +0100 +@@ -119,11 +119,8 @@ + AC_SUBST(GW_LANGUAGES) + + dnl Check for optional libraries +-AC_CHECK_PROG(have_glib, glib-config, yes, no) +-if test "$have_glib" = yes; then +- PKG_CHECK_MODULES(GLIB, glib, [echo building GLib 1.2 support]) +-else +- echo Not building Glib 1.2 support ++if test "x$with_glib" != "xno"; then ++ PKG_CHECK_MODULES([GLIB], [glib-2.0], [have_glib=yes], [have_glib=no]) + fi + AM_CONDITIONAL(HAVE_GLIB, test "$have_glib" = yes) + diff --git a/dev-libs/g-wrap/files/glib_automagic.patch b/dev-libs/g-wrap/files/glib_automagic.patch new file mode 100644 index 000000000000..676fb4a589b4 --- /dev/null +++ b/dev-libs/g-wrap/files/glib_automagic.patch @@ -0,0 +1,16 @@ +--- configure.ac.old 2007-01-18 17:54:08.000000000 +0100 ++++ configure.ac 2007-01-18 17:57:38.000000000 +0100 +@@ -119,11 +119,8 @@ + AC_SUBST(GW_LANGUAGES) + + dnl Check for optional libraries +-AC_CHECK_PROG(have_glib, glib-config, yes, no) +-if test "$have_glib" = yes; then +- PKG_CHECK_MODULES(GLIB, glib, [echo building GLib 1.2 support]) +-else +- echo Not building Glib 1.2 support ++if test "x$with_glib" != "xno"; then ++ PKG_CHECK_MODULES([GLIB], [glib-2.0], [have_glib=yes], [have_glib=no]) + fi + AM_CONDITIONAL(HAVE_GLIB, test "$have_glib" = yes) + diff --git a/dev-libs/g-wrap/files/libffi_automagic.patch b/dev-libs/g-wrap/files/libffi_automagic.patch new file mode 100644 index 000000000000..1cb6b1535225 --- /dev/null +++ b/dev-libs/g-wrap/files/libffi_automagic.patch @@ -0,0 +1,11 @@ +--- configure.ac.old 2007-03-02 15:20:54.000000000 +0100 ++++ configure.ac 2007-03-02 15:21:08.000000000 +0100 +@@ -55,7 +55,7 @@ + dnl + + dnl libffi +-ar_WITH_LIB_LIBFFI([have_libffi=yes], [have_libffi=no]) ++ar_WITH_LIB_LIBFFI([have_libffi=no], [have_libffi=no]) + LIBFFI_CFLAGS_INSTALLED="$LIBFFI_CFLAGS" + LIBFFI_LIBS_INSTALLED="$LIBFFI_LIBS" + if test "$have_libffi" = no; then |