dev-games/gnome-inform7/files/gnome-inform7-6E72-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-6E72/configure.ac~    2010-07-04 20:50:44.000000000 +0100
   7 +++ gnome-inform7-6E72/configure.ac     2010-07-06 22:59:59.000000000 +0100
   8 @@ -13,28 +13,6 @@
   9  # Initialize automake; $(MKDIR_P) was introduced in 1.10
  10  AM_INIT_AUTOMAKE([1.10 -Wall])
  11
  12 -### CHECK FOR PROPER NI EXECUTABLE #############################################
  13 -
  14 -# Grep is required for these tests.
  15 -AC_PROG_GREP
  16 -AC_PROG_EGREP
  17 -
  18 -AC_CHECK_FILE([src/ni/ni], [], [
  19 -       AC_MSG_ERROR([ni not found in src/ni.
  20 -       IMPORTANT NOTE! You must download version $VERSION of the appropriate
  21 -       compiler package from inform7.org and put the file `ni' into the
  22 -       directory `$(pwd)/src/ni'.])
  23 -])
  24 -AC_MSG_CHECKING([the version of src/ni/ni])
  25 -AS_IF([src/ni/ni | $GREP $VERSION > /dev/null], [AC_MSG_RESULT([$VERSION])], [
  26 -       AC_MSG_ERROR([You have version
  27 -       [$(src/ni/ni | $EGREP -o '[0-9][A-Z][0-9]{2}')] of ni in src/ni. This version of Inform 7 will only work with
  28 -       version $VERSION.
  29 -       IMPORTANT NOTE! You must download version $VERSION of the appropriate
  30 -       compiler package from inform7.org and put the file `ni' into the
  31 -       directory `$(pwd)/src/ni'.])
  32 -])
  33 -
  34  ### DECLARE OPTIONS ############################################################
  35
  36  # Test is required for these option checks
  37 @@ -113,6 +91,7 @@
  38  ### DECLARE PROGRAMS ###########################################################
  39
  40  # Programs that Autoconf has built-in checks for
  41 +AC_PROG_LIBTOOL
  42  AC_PROG_CC                        # C compiler
  43  AM_PROG_CC_C_O                    # Automake requires this for per-target CFLAGS
  44  AC_PROG_INSTALL                   # Install
  45 --- gnome-inform7-6E72/src/gtkterp/garglk/Makefile.am~  2010-06-23 22:26:48.000000000 +0100
  46 +++ gnome-inform7-6E72/src/gtkterp/garglk/Makefile.am   2010-07-06 23:09:23.000000000 +0100
  47 @@ -1,17 +1,19 @@
  48  dist_sysconf_DATA = gtkterp.ini
  49
  50 -noinst_LIBRARIES = libgarglk.a
  51 -libgarglk_a_SOURCES = gi_blorb.c gi_dispa.c cggestal.c cgblorb.c cgfref.c \
  52 +lib_LTLIBRARIES = libgtkterp-garglk.la
  53 +libgtkterp_garglk_la_SOURCES = gi_blorb.c gi_dispa.c cggestal.c cgblorb.c cgfref.c \
  54         cgmisc.c cgstyle.c cgstream.c cgunicod.c window.c winblank.c winpair.c \
  55         wingrid.c wintext.c wingfx.c event.c draw.c config.c imgload.c imgscale.c \
  56         fontdata.c sndsdl.c sysgtk.c main.c garglk.h garversion.h gi_blorb.h \
  57         gi_dispa.h glk.h glkstart.h garglk-plug.h garglk-plug.c sysgtk.h winmask.c \
  58         uthash.h fontgtk.c
  59 -libgarglk_a_CPPFLAGS = -DBUNDLED_FONTS \
  60 +libgtkterp_garglk_la_CPPFLAGS = -DBUNDLED_FONTS \
  61         -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
  62         -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
  63 -       -DPACKAGE_DATA_DIR=\""$(datadir)"\"
  64 -libgarglk_a_CFLAGS = @GTKTERP_CFLAGS@
  65 +       -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
  66 +       -I/usr/include/glk
  67 +libgtkterp_garglk_la_CFLAGS = @GTKTERP_CFLAGS@
  68 +libgtkterp_garglk_la_LIBADD = @GTKTERP_LIBS@
  69
  70  noinst_HEADERS = dbus-server.h
  71  BUILT_SOURCES = $(noinst_HEADERS)
  72 --- gnome-inform7-5Z71/src/gtkterp/gtkterp.c~   2009-04-16 21:10:11.000000000 +0100
  73 +++ gnome-inform7-5Z71/src/gtkterp/gtkterp.c    2009-04-27 22:47:02.000000000 +0100
  74 @@ -440,20 +440,21 @@
  75         gchar *terpname;
  76      switch(format) {
  77          case GTK_TERP_GLULXE:
  78 -            terpname = g_strdup("gtkterp-glulxe");
  79 +            terpname = g_strdup("glulxe");
  80              break;
  81          case GTK_TERP_FROTZ:
  82 -            terpname = g_strdup("gtkterp-frotz");
  83 +            terpname = g_strdup("glkfrotz");
  84                         break;
  85                 case GTK_TERP_GIT:
  86                 default:
  87 -                       terpname = g_strdup("gtkterp-git");
  88 +                       terpname = g_strdup("glulxgit");
  89      }
  90 -       gchar *args[3];
  91 -       args[0] = g_build_filename(PACKAGE_LIBEXEC_DIR, terpname, NULL);
  92 -       g_free(terpname);
  93 -    args[1] = g_strdup(terp->priv->filename);
  94 -    args[2] = NULL;
  95 +       gchar *args[5];
  96 +       args[0] = terpname;
  97 +    args[1] = g_strdup("-glk");
  98 +    args[2] = g_strdup("libgtkterp-garglk.so");
  99 +    args[3] = g_strdup(terp->priv->filename);
 100 +    args[4] = NULL;
 101      GPid child_pid;
 102         if(!g_spawn_async(NULL, /* working directory */
 103                        args, /* command to spawn */
 104 --- gnome-inform7-5Z71/src/gtkterp/Makefile.am~ 2009-04-06 20:48:28.000000000 +0100
 105 +++ gnome-inform7-5Z71/src/gtkterp/Makefile.am  2009-04-27 21:38:56.000000000 +0100
 106 @@ -1,4 +1,4 @@
 107 -SUBDIRS = garglk frotz glulxe git
 108 +SUBDIRS = garglk
 109
 110  # This line won't be necessary anymore in Automake 1.10a
 111  pkglibexecdir = $(libexecdir)/$(PACKAGE)
 112 --- gnome-inform7-5Z71/src/Makefile.am~ 2009-04-05 14:12:13.000000000 +0100
 113 +++ gnome-inform7-5Z71/src/Makefile.am  2009-04-27 21:33:32.000000000 +0100
 114 @@ -1,4 +1,4 @@
 115 -SUBDIRS = inweb cBlorb inform6 gtkterp ni
 116 +SUBDIRS = gtkterp
 117
 118  AM_CFLAGS = -Wall
 119