dev-games/gnome-inform7/files/gnome-inform7-5U92.1-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-5U92/data/Makefile.am~        2008-05-03 23:13:21.000000000 +0100
   7 +++ gnome-inform7-5U92/data/Makefile.am 2008-09-15 17:22:34.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-5U92/configure.in~    2008-09-14 11:22:23.000000000 +0100
  15 +++ gnome-inform7-5U92/configure.in     2008-09-15 17:22:34.000000000 +0100
  16 @@ -6,6 +6,7 @@
  17  AM_CONFIG_HEADER(config.h)
  18
  19  AC_ISC_POSIX
  20 +AC_PROG_LIBTOOL
  21  AC_PROG_CC
  22  AM_PROG_CC_STDC
  23  AM_PROG_CC_C_O
  24 --- gnome-inform7-5U92/src/gtkterp/garglk/Makefile.am~  2008-07-09 22:09:31.000000000 +0100
  25 +++ gnome-inform7-5U92/src/gtkterp/garglk/Makefile.am   2008-09-15 17:22:34.000000000 +0100
  26 @@ -8,17 +8,19 @@
  27         -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
  28         -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
  29         -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
  30 +       -I/usr/include/glk \
  31         $(GTKTERP_CFLAGS)
  32
  33  AM_CFLAGS = -Wall
  34
  35 -noinst_LIBRARIES = libgarglk.a
  36 +lib_LTLIBRARIES = libgtkterp-garglk.la
  37
  38 -libgarglk_a_SOURCES = gi_blorb.c gi_dispa.c nohyper.c cggestal.c cgblorb.c \
  39 +libgtkterp_garglk_la_SOURCES = gi_blorb.c gi_dispa.c nohyper.c cggestal.c cgblorb.c \
  40         cgfref.c cgmisc.c cgstyle.c cgstream.c cgunicod.c window.c winblank.c \
  41         winpair.c wingrid.c wintext.c wingfx.c event.c draw.c config.c imgload.c \
  42         imgscale.c fontdata.c sndsdl.c sysgtk.c main.c garglk.h garversion.h \
  43         gi_blorb.h gi_dispa.h glk.h glkstart.h garglk-plug.h garglk-plug.c sysgtk.h
  44 +libgtkterp_garglk_la_LIBADD = @GTKTERP_LIBS@
  45
  46  BUILT_SOURCES = dbus-server.h
  47  noinst_HEADERS = $(BUILT_SOURCES)
  48 --- gnome-inform7-5U92/src/gtkterp/gtkterp.c~   2008-05-11 17:46:20.000000000 +0100
  49 +++ gnome-inform7-5U92/src/gtkterp/gtkterp.c    2008-09-15 17:22:34.000000000 +0100
  50 @@ -447,14 +447,16 @@
  51         gchar *args[3];
  52      switch(format) {
  53          case GTK_TERP_GLULXE:
  54 -            args[0] = g_strdup("gtkterp-glulxe");
  55 +            args[0] = g_strdup("glulxe");
  56              break;
  57          case GTK_TERP_FROTZ:
  58          default:
  59 -            args[0] = g_strdup("gtkterp-frotz");
  60 +            args[0] = g_strdup("glkfrotz");
  61      }
  62 -    args[1] = g_strdup(terp->priv->filename);
  63 -    args[2] = NULL;
  64 +    args[1] = g_strdup("-glk");
  65 +    args[2] = g_strdup("libgtkterp-garglk.so");
  66 +    args[3] = g_strdup(terp->priv->filename);
  67 +    args[4] = NULL;
  68      GPid child_pid;
  69         if(!g_spawn_async(NULL, /* working directory */
  70                        args, /* command to spawn */
  71 --- gnome-inform7-5U92/src/gtkterp/Makefile.am~ 2008-07-09 22:10:42.000000000 +0100
  72 +++ gnome-inform7-5U92/src/gtkterp/Makefile.am  2008-09-15 17:22:34.000000000 +0100
  73 @@ -2,14 +2,7 @@
  74
  75  ## Created by Anjuta
  76
  77 -SUBDIRS = garglk frotz glulxe
  78 -
  79 -componentdocdir = ${datadir}/doc/gtkterp
  80 -componentdoc_DATA = \
  81 -       AUTHORS-frotz README-frotz COPYING-frotz TODO-frotz \
  82 -       README-glulxe TODO-garglk \
  83 -       CharterBT.txt LuxiMono.txt \
  84 -       License-gargoyle.txt
  85 +SUBDIRS = garglk
  86
  87  EXTRA_DIST = $(componentdoc_DATA)
  88