dev-games/gnome-inform7/files/gnome-inform7-5T18-unbundling.patch

   1 Source: dleverton
   2 Upstream: is aware, but bundling is likely more convenient for non-Gentoo users
   3 Reason: don't use the bundled copies of glulxe, glkfrotz and the
   4         platform-independent parts of I7
   5
   6 --- gnome-inform7-5T18/data/Makefile.am~        2008-05-17 00:25:11.000000000 +0100
   7 +++ gnome-inform7-5T18/data/Makefile.am 2008-05-17 00:27:23.000000000 +0100
   8 @@ -1,4 +1,4 @@
   9 -SUBDIRS = Compilers Documentation Inform7 Library map_icons scene_icons \
  10 +SUBDIRS = Documentation map_icons scene_icons \
  11  styles
  12
  13  pkgdata_DATA = Beneath.png cblorb_failed.png cblorb_succeeded.png crash.png \
  14 --- gnome-inform7-5T18/src/gtkterp/garglk/Makefile.am~  2008-05-17 00:18:56.000000000 +0100
  15 +++ gnome-inform7-5T18/src/gtkterp/garglk/Makefile.am   2008-05-17 00:25:11.000000000 +0100
  16 @@ -8,18 +8,20 @@
  17         -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
  18         -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
  19         -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
  20 +       -I/usr/include/glk \
  21         $(GTKTERP_CFLAGS)
  22
  23  AM_CFLAGS =\
  24          -Wall
  25
  26 -noinst_LIBRARIES = libgarglk.a
  27 +lib_LTLIBRARIES = libgtkterp-garglk.la
  28
  29 -libgarglk_a_SOURCES = gi_blorb.c gi_dispa.c nohyper.c cggestal.c cgblorb.c \
  30 +libgtkterp_garglk_la_SOURCES = gi_blorb.c gi_dispa.c nohyper.c cggestal.c cgblorb.c \
  31         cgfref.c cgmisc.c cgstyle.c cgstream.c window.c winblank.c winpair.c \
  32         wingrid.c wintext.c wingfx.c event.c draw.c config.c imgload.c \
  33         imgscale.c fontdata.c sndsdl.c sysgtk.c main.c garglk.h garversion.h \
  34         gi_blorb.h gi_dispa.h glk.h glkstart.h garglk-plug.h garglk-plug.c sysgtk.h
  35 +libgtkterp_garglk_la_LIBADD = @GTKTERP_LIBS@
  36
  37  BUILT_SOURCES = dbus-server.h
  38  noinst_HEADERS = $(BUILT_SOURCES)
  39 --- gnome-inform7-5T18/src/gtkterp/Makefile.am~ 2008-05-17 00:18:56.000000000 +0100
  40 +++ gnome-inform7-5T18/src/gtkterp/Makefile.am  2008-05-17 00:25:11.000000000 +0100
  41 @@ -2,14 +2,7 @@
  42
  43  ## Created by Anjuta
  44
  45 -SUBDIRS = garglk frotz glulxe
  46 -
  47 -componentdocdir = ${datadir}/doc/gtkterp
  48 -componentdoc_DATA = \
  49 -       AUTHORS-frotz README-frotz COPYING-frotz TODO-frotz \
  50 -       README-glulxe TODO-garglk \
  51 -       CharterBT.txt LuxiMono.txt \
  52 -       License-gargoyle.txt
  53 +SUBDIRS = garglk
  54
  55  EXTRA_DIST = $(componentdoc_DATA)
  56
  57 --- gnome-inform7-5T18/src/gtkterp/gtkterp.c~   2008-01-26 13:26:40.000000000 +0000
  58 +++ gnome-inform7-5T18/src/gtkterp/gtkterp.c    2008-05-17 00:25:11.000000000 +0100
  59 @@ -447,14 +447,16 @@
  60         gchar *args[3];
  61      switch(format) {
  62          case GTK_TERP_GLULXE:
  63 -            args[0] = g_strdup("gtkterp-glulxe");
  64 +            args[0] = g_strdup("glulxe");
  65              break;
  66          case GTK_TERP_FROTZ:
  67          default:
  68 -            args[0] = g_strdup("gtkterp-frotz");
  69 +            args[0] = g_strdup("glkfrotz");
  70      }
  71 -    args[1] = g_strdup(terp->priv->filename);
  72 -    args[2] = NULL;
  73 +    args[1] = g_strdup("-glk");
  74 +    args[2] = g_strdup("libgtkterp-garglk.so");
  75 +    args[3] = g_strdup(terp->priv->filename);
  76 +    args[4] = NULL;
  77      GPid child_pid;
  78         if(!g_spawn_async(NULL, /* working directory */
  79                        args, /* command to spawn */
  80 --- gnome-inform7-5T18/configure.in~    2008-04-30 16:08:16.000000000 +0100
  81 +++ gnome-inform7-5T18/configure.in     2008-05-17 00:25:11.000000000 +0100
  82 @@ -6,6 +6,7 @@
  83  AM_CONFIG_HEADER(config.h)
  84
  85  AC_ISC_POSIX
  86 +AC_PROG_LIBTOOL
  87  AC_PROG_CC
  88  AM_PROG_CC_STDC
  89  AM_PROG_CC_C_O