From 8f36c2a6f4503a6e1a9b7368feea758f05fd7b86 Mon Sep 17 00:00:00 2001 From: Marijn van Vliet Date: Mon, 30 Nov 2009 13:25:39 +0000 Subject: [PATCH] * On a second thought: rename client to player * Added the player to the RPM and DEB packages * Added out patch to Froz to the repository git-svn-id: http://lassie.dyndns-server.com/svn/gargoyle-gtk@193 ddfedd41-794f-dd11-ae45-00112f111e67 --- Makefile.am | 4 ++-- chimara.spec.in | 14 ++++++++++++++ configure.ac | 1 + debian/control | 12 ++++++++++++ debian/copyright | 2 +- debian/libchimara-player.install | 1 + interpreters/frotz.patch | 33 ++++++++++++++++++++++++++++++++ {client => player}/.svnignore | 0 {client => player}/Makefile.am | 0 {client => player}/callbacks.c | 0 {client => player}/chimara.menus | 0 {client => player}/chimara.ui | 0 {client => player}/error.c | 0 {client => player}/error.h | 0 {client => player}/iliad.c | 0 {client => player}/main.c | 0 16 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 debian/libchimara-player.install create mode 100644 interpreters/frotz.patch rename {client => player}/.svnignore (100%) rename {client => player}/Makefile.am (100%) rename {client => player}/callbacks.c (100%) rename {client => player}/chimara.menus (100%) rename {client => player}/chimara.ui (100%) rename {client => player}/error.c (100%) rename {client => player}/error.h (100%) rename {client => player}/iliad.c (100%) rename {client => player}/main.c (100%) diff --git a/Makefile.am b/Makefile.am index 2ce4185..ac912e7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in ## Created by Anjuta -SUBDIRS = libchimara interpreters tests docs po +SUBDIRS = libchimara interpreters tests docs po player chimaradocdir = ${prefix}/doc/chimara dist_chimaradoc_DATA = \ @@ -35,4 +35,4 @@ rpm: @$(ECHO) \ "To build an RPM package, you must run configure with --enable-rpm."; \ exit 1 -endif \ No newline at end of file +endif diff --git a/chimara.spec.in b/chimara.spec.in index cd41347..fbde406 100644 --- a/chimara.spec.in +++ b/chimara.spec.in @@ -40,6 +40,15 @@ Requires: %{name} = %{version}-%{release} The %{name}-devel package contains libraries and header files for developing applications that use %{name}. +%package player +Summary: The default IF player using %{name} +Group: Games +Requires: %{name} = %{version}-%{release} + +%description player +The %{name}-player package contains the default interactive fiction player using %{name}. +developing applications that use %{name}. + %prep %setup -q @@ -77,6 +86,11 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/chimara/libchimara/*.h %{_libdir}/pkgconfig/*.pc +%files player +%{_bindir}/chimara + %changelog +* Mon Nov 30 2009 W. M. van Vliet +- Added Chimara player to the package. * Wed Nov 25 2009 P. F. Chimento - Created specfile. diff --git a/configure.ac b/configure.ac index 5b2501d..787fef9 100644 --- a/configure.ac +++ b/configure.ac @@ -147,6 +147,7 @@ interpreters/nitfol/Makefile interpreters/glulxe/Makefile interpreters/git/Makefile tests/Makefile +player/Makefile docs/Makefile docs/reference/Makefile docs/reference/version.xml diff --git a/debian/control b/debian/control index 2cdf307..8070f24 100644 --- a/debian/control +++ b/debian/control @@ -46,4 +46,16 @@ Description: Documentation for the Chimara Glk library . This package contains the Chimara reference manual. +Package: libchimara-player +Section: games +Architecture: any +Depends: ${misc:Depends} + libchimara0 (= ${binary:Version}), + libglib2.0-dev, + libgtk2.0-dev +Description: Interactive fiction player using the Chimara Glk library + Chimara is a GTK+ widget that loads and runs Glk programs as plugins. Glk is an + input/output specification specifically designed for interactive fiction. + . + This package contains a default interactive fiction player that uses Chimara. diff --git a/debian/copyright b/debian/copyright index 0087586..31b5d85 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,7 +5,7 @@ It was downloaded from Upstream Author(s): - Marijn van Vliet + Marijn van Vliet Philip Chimento Copyright: diff --git a/debian/libchimara-player.install b/debian/libchimara-player.install new file mode 100644 index 0000000..0e4f65a --- /dev/null +++ b/debian/libchimara-player.install @@ -0,0 +1 @@ +debian/tmp/usr/bin/chimara diff --git a/interpreters/frotz.patch b/interpreters/frotz.patch new file mode 100644 index 0000000..a40dcec --- /dev/null +++ b/interpreters/frotz.patch @@ -0,0 +1,33 @@ +--- frotz/glkscreen.c 2009-11-14 17:44:15.617976131 +0100 ++++ frotz/glkscreen.c.new 2009-11-14 17:44:10.367194781 +0100 +@@ -305,13 +305,6 @@ + return; + } + +- if (gos_upper && gos_curwin == gos_upper) { +- if (cury > mach_status_ht) { +- mach_status_ht = cury; +- reset_status_ht(); +- } +- } +- + /* check fixed flag in header, game can change it at whim */ + if (gos_curwin == gos_lower) + { +@@ -583,8 +576,15 @@ + { + cury = zargs[0]; + curx = zargs[1]; +- if (gos_upper) ++ ++ if (gos_upper) { ++ if (cury > mach_status_ht) { ++ mach_status_ht = cury; ++ reset_status_ht(); ++ } ++ + glk_window_move_cursor(gos_upper, curx - 1, cury - 1); ++ } + } + + /* diff --git a/client/.svnignore b/player/.svnignore similarity index 100% rename from client/.svnignore rename to player/.svnignore diff --git a/client/Makefile.am b/player/Makefile.am similarity index 100% rename from client/Makefile.am rename to player/Makefile.am diff --git a/client/callbacks.c b/player/callbacks.c similarity index 100% rename from client/callbacks.c rename to player/callbacks.c diff --git a/client/chimara.menus b/player/chimara.menus similarity index 100% rename from client/chimara.menus rename to player/chimara.menus diff --git a/client/chimara.ui b/player/chimara.ui similarity index 100% rename from client/chimara.ui rename to player/chimara.ui diff --git a/client/error.c b/player/error.c similarity index 100% rename from client/error.c rename to player/error.c diff --git a/client/error.h b/player/error.h similarity index 100% rename from client/error.h rename to player/error.h diff --git a/client/iliad.c b/player/iliad.c similarity index 100% rename from client/iliad.c rename to player/iliad.c diff --git a/client/main.c b/player/main.c similarity index 100% rename from client/main.c rename to player/main.c -- 2.30.2