From c3da8a9cc6c9ec1a18a889f4d1cff4bcc59a0659 Mon Sep 17 00:00:00 2001 From: David Leverton Date: Tue, 2 Sep 2008 18:26:02 +0100 Subject: [PATCH] Add glktermw. --- dev-games/glkloader/Manifest | 2 +- ...r-0.3.2-r1.ebuild => glkloader-0.3.2-r2.ebuild} | 2 +- dev-games/glktermw/Manifest | 6 +++ .../glktermw/files/glktermw-0.8.0-Makefile.am | 20 +++++++++ .../glktermw/files/glktermw-0.8.0-configure.ac | 11 +++++ .../files/glktermw-0.8.0-garglk-extensions.patch | 44 +++++++++++++++++++ dev-games/glktermw/glktermw-0.8.0.ebuild | 51 ++++++++++++++++++++++ dev-games/glktermw/metadata.xml | 8 ++++ virtual/glk/Manifest | 2 +- virtual/glk/glk-0.ebuild | 1 + 10 files changed, 144 insertions(+), 3 deletions(-) rename dev-games/glkloader/{glkloader-0.3.2-r1.ebuild => glkloader-0.3.2-r2.ebuild} (97%) create mode 100644 dev-games/glktermw/Manifest create mode 100644 dev-games/glktermw/files/glktermw-0.8.0-Makefile.am create mode 100644 dev-games/glktermw/files/glktermw-0.8.0-configure.ac create mode 100644 dev-games/glktermw/files/glktermw-0.8.0-garglk-extensions.patch create mode 100644 dev-games/glktermw/glktermw-0.8.0.ebuild create mode 100644 dev-games/glktermw/metadata.xml diff --git a/dev-games/glkloader/Manifest b/dev-games/glkloader/Manifest index 4308908..b424b8a 100644 --- a/dev-games/glkloader/Manifest +++ b/dev-games/glkloader/Manifest @@ -7,5 +7,5 @@ AUX glkloader-0.3.2-no-rdynamic.patch 813 RMD160 c109187f08f31ffa55e4f7ee6ba7846 AUX glkloader-0.3.2-r1-Makefile.am 693 RMD160 cd245740204dd38ea6cd597c9acd1e9f579fbc7f SHA1 5fd04be03efe145d53ad396eaf21606cc2288e0e SHA256 71ac0caf4a57c62f8269712e6afcf88d1738f4cbb7a6a23bccd94cff9d722982 AUX glkloader-0.3.2-r1-garglk-extensions.patch 461 RMD160 335e33241c94d38165dae93504f4ce088c649daa SHA1 bdc8477d087b53840fed453e4e206abb2f75947b SHA256 cb6c107ce95aa5f584b0a91b946dea4f57d7871083c2813a91bf2372683f3df2 DIST glkloader-0.3.2.tar.gz 179678 RMD160 7e060fca1ebbbc7154b4077700b74c124a4fa9ca SHA1 b8de6cfe47c656dbd32ecad79d5253ade6c5cb50 SHA256 aef6e3d39da8219cf8c9a66dd4133048af828128f76115088ecf7c86fbf519d4 -EBUILD glkloader-0.3.2-r1.ebuild 1986 RMD160 e5a4c1a7a9c1807c9b69744efa34e155b2aa8e8d SHA1 526ae62c5e87ad3068fffe0b09ba77a25f84b29e SHA256 8ae122202c07e6cacf9136fb15261a8af04463083d95343e6277f182477b5b72 +EBUILD glkloader-0.3.2-r2.ebuild 1992 RMD160 06f1d782d9ea90196161ecfc284f3a995301666b SHA1 5ea91ca60880cc582d27e5b2c81152ba4b02a2e9 SHA256 a12da5bbc616185b1c599ad6971d35853bf29bfd8f2f13b4bb48be84e2fddaae MISC metadata.xml 229 RMD160 05d41c316709d6fff71eaf40e582bb77d06eafc3 SHA1 e00aca92ab168425a0557b4aea5fa07777d8cea6 SHA256 a45114b45eed9371b0a54391c22c5242cf2ba9d78a8d2d07c043331240471655 diff --git a/dev-games/glkloader/glkloader-0.3.2-r1.ebuild b/dev-games/glkloader/glkloader-0.3.2-r2.ebuild similarity index 97% rename from dev-games/glkloader/glkloader-0.3.2-r1.ebuild rename to dev-games/glkloader/glkloader-0.3.2-r2.ebuild index 633cbec..20e9476 100644 --- a/dev-games/glkloader/glkloader-0.3.2-r1.ebuild +++ b/dev-games/glkloader/glkloader-0.3.2-r2.ebuild @@ -59,7 +59,7 @@ src_install() { insinto /etc cat >"${T}"/glkloaderrc <<-EOF [Default] - libs = Gtk Gargoyle X Term Cheap + libs = Gtk Gargoyle X TermW Term Cheap EOF doins "${T}"/glkloaderrc || die "doins glkloaderrc failed" } diff --git a/dev-games/glktermw/Manifest b/dev-games/glktermw/Manifest new file mode 100644 index 0000000..36368ea --- /dev/null +++ b/dev-games/glktermw/Manifest @@ -0,0 +1,6 @@ +AUX glktermw-0.8.0-Makefile.am 680 RMD160 a5c01234e8cfea4bd1693acb8d769acd9d959be9 SHA1 b34e6dc7b61b983baa37273e1d2dcf619d11caab SHA256 f2853f531e953a3e8f65848a77385061c0bec4b0390207a6758c9ab4422c24fb +AUX glktermw-0.8.0-configure.ac 249 RMD160 1c13cb7a3901239654691191edcd08b0bafa05b4 SHA1 53d8775fb1acc123270d92c6708090a109c10bc5 SHA256 b07bd5b3555106c5c77110cbaa7025aa98f57f4ce8cc23921371934cc26f1984 +AUX glktermw-0.8.0-garglk-extensions.patch 984 RMD160 7e1d96acbc3c39c587ab7a9c6444085d4754ce78 SHA1 bd434f78ceb520ed904a9f50187feb40afcb1218 SHA256 2232fc88c5cf4769b5e6cf1c7570ed5661da3ccd262fb44da9602832a2d79f82 +DIST glktermw-080.tar.gz 97574 RMD160 c897e9e29b95f40fab674d2ea1c8ef0783fc06d5 SHA1 8769963d181860295f5c8b0dfe54d7b9904c0424 SHA256 c5dee0676a182f7b557535dff79f67af5f66728eeaf3aaba4fb9eb73d6e9bf71 +EBUILD glktermw-0.8.0.ebuild 1366 RMD160 84745a8a98aebe826f49dd68d1134428a3bc54f3 SHA1 7a59de25679a296df99e2d73a2aa8eed6af62ffa SHA256 84c37a0cbb46927b1c07f373b69f9c0fcc32c943c2bc6dbf7232c49a24b74d9a +MISC metadata.xml 229 RMD160 05d41c316709d6fff71eaf40e582bb77d06eafc3 SHA1 e00aca92ab168425a0557b4aea5fa07777d8cea6 SHA256 a45114b45eed9371b0a54391c22c5242cf2ba9d78a8d2d07c043331240471655 diff --git a/dev-games/glktermw/files/glktermw-0.8.0-Makefile.am b/dev-games/glktermw/files/glktermw-0.8.0-Makefile.am new file mode 100644 index 0000000..2dbfac1 --- /dev/null +++ b/dev-games/glktermw/files/glktermw-0.8.0-Makefile.am @@ -0,0 +1,20 @@ +# Source: dleverton +# Upstream: is aware; unknown whether he wants to do anything with it +# Reason: use autotools to build a proper shared library on amd64 + +lib_LTLIBRARIES = libglktermw.la +libglktermw_la_SOURCES = \ + main.c gtevent.c gtfref.c gtgestal.c gtinput.c \ + gtmessag.c gtmessin.c gtmisc.c gtstream.c gtstyle.c \ + gtw_blnk.c gtw_buf.c gtw_grid.c gtw_pair.c gtwindow.c \ + gtschan.c gtblorb.c cgunicod.c gi_dispa.c gi_blorb.c \ + gtncursesw.c +libglktermw_la_LIBADD = -lncursesw + +glk_includedir = $(includedir)/glk +glk_include_HEADERS = Make.glktermw +AM_CPPFLAGS = -I$(glk_includedir) + +Make.glktermw: + echo LINKLIBS = >Make.glktermw + echo GLKLIB = -lglktermw >>Make.glktermw diff --git a/dev-games/glktermw/files/glktermw-0.8.0-configure.ac b/dev-games/glktermw/files/glktermw-0.8.0-configure.ac new file mode 100644 index 0000000..44f6401 --- /dev/null +++ b/dev-games/glktermw/files/glktermw-0.8.0-configure.ac @@ -0,0 +1,11 @@ +# Source: dleverton +# Upstream: is aware; unknown whether he wants to do anything with it +# Reason: use autotools to build a proper shared library on amd64 + +AC_INIT(glktermw, @PV@) +AM_INIT_AUTOMAKE + +AC_PROG_LIBTOOL +AC_PROG_CC + +AC_OUTPUT([Makefile]) diff --git a/dev-games/glktermw/files/glktermw-0.8.0-garglk-extensions.patch b/dev-games/glktermw/files/glktermw-0.8.0-garglk-extensions.patch new file mode 100644 index 0000000..4499f71 --- /dev/null +++ b/dev-games/glktermw/files/glktermw-0.8.0-garglk-extensions.patch @@ -0,0 +1,44 @@ +Source: dleverton +Upstream: Gentoo-specific hack +Reason: allows Glk apps to use Gargoyle extensions without breaking + compatibility with other Glk libraries + +--- glktermw/gtfref.c~ 2008-07-25 08:01:37.000000000 +0100 ++++ glktermw/gtfref.c 2008-09-02 18:11:13.000000000 +0100 +@@ -438,6 +438,11 @@ + unlink(fref->filename); + } + ++char* garglk_fileref_get_name(fileref_t *fref) ++{ ++ return fref->filename; ++} ++ + /* This should only be called from startup code. */ + void glkunix_set_base_file(char *filename) + { +--- glktermw/gtmisc.c~ 2008-09-02 18:11:13.000000000 +0100 ++++ glktermw/gtmisc.c 2008-09-02 18:12:04.000000000 +0100 +@@ -143,6 +143,22 @@ + return char_toupper_table[ch]; + } + ++void garglk_set_program_name(const char *name) ++{ ++} ++ ++void garglk_set_program_info(const char *info) ++{ ++} ++ ++void garglk_set_story_name(const char *name) ++{ ++} ++ ++void garglk_set_config(const char *name) ++{ ++} ++ + #ifdef NO_MEMMOVE + + void *memmove(void *destp, void *srcp, int n) diff --git a/dev-games/glktermw/glktermw-0.8.0.ebuild b/dev-games/glktermw/glktermw-0.8.0.ebuild new file mode 100644 index 0000000..883c126 --- /dev/null +++ b/dev-games/glktermw/glktermw-0.8.0.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit eutils autotools + +MY_P=${P//./} +DESCRIPTION="An ncurses implementation of the Glk API with Unicode support" +HOMEPAGE="http://www.eblong.com/zarf/glk/" +SRC_URI="mirror://ifarchive/programming/glk/implementations/${MY_P}.tar.gz" + +LICENSE="Zarf" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="sys-libs/ncurses" +DEPEND="${RDEPEND} + dev-games/glk-headers" + +S=${WORKDIR}/${PN} + +pkg_setup() { + built_with_use sys-libs/ncurses unicode || die "you need to build sys-libs/ncurses with USE=unicode" +} + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/glktermw-0.8.0-garglk-extensions.patch + + cp "${FILESDIR}"/glktermw-0.8.0-configure.ac configure.ac || die "cp configure.ac failed" + cp "${FILESDIR}"/glktermw-0.8.0-Makefile.am Makefile.am || die "cp Makefile.am failed" + sed -i -e "s,@PV@,${PV}," configure.ac || die "sed failed" + eautoreconf + + rm glk.h gi_blorb.h gi_dispa.h glkstart.h || die "rm glk headers failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc readme.txt readme-orig.txt || die "dodoc failed" + + insinto /etc/glkloader.d + cat >"${T}"/glktermw.rc <<-EOF + [TermW] + path = /usr/$(get_libdir)/libglktermw.so + EOF + doins "${T}"/glktermw.rc || die "doins glktermw.rc failed" +} diff --git a/dev-games/glktermw/metadata.xml b/dev-games/glktermw/metadata.xml new file mode 100644 index 0000000..2a11af9 --- /dev/null +++ b/dev-games/glktermw/metadata.xml @@ -0,0 +1,8 @@ + + + +no-herd + + levertond@googlemail.com + + diff --git a/virtual/glk/Manifest b/virtual/glk/Manifest index d13b1b9..9cfe586 100644 --- a/virtual/glk/Manifest +++ b/virtual/glk/Manifest @@ -1,2 +1,2 @@ -EBUILD glk-0.ebuild 326 RMD160 c90e5917c02b506acd2643c2c0cdf795a6305bfb SHA1 e9e66caac6c429015b0c0d17c5fad9d6c9a0374d SHA256 b8e1622edef53ae2e1787bd03892be43793ffdec6e53647e64f4188bd1749f96 +EBUILD glk-0.ebuild 346 RMD160 5eb6f5f3e82d593a9be24e6b5e00d2e4885373d8 SHA1 f1c2c7da5e799777a4722552f18f63fc220d0bd0 SHA256 a49657b1d5760edcc6176c343110d5cf3ada46e36aa9fe3a3ac718e71617bd9b MISC metadata.xml 229 RMD160 05d41c316709d6fff71eaf40e582bb77d06eafc3 SHA1 e00aca92ab168425a0557b4aea5fa07777d8cea6 SHA256 a45114b45eed9371b0a54391c22c5242cf2ba9d78a8d2d07c043331240471655 diff --git a/virtual/glk/glk-0.ebuild b/virtual/glk/glk-0.ebuild index fa846dc..9b15905 100644 --- a/virtual/glk/glk-0.ebuild +++ b/virtual/glk/glk-0.ebuild @@ -14,5 +14,6 @@ IUSE="" DEPEND="" RDEPEND="|| ( dev-games/garglk dev-games/xglk + dev-games/glktermw dev-games/glkterm dev-games/cheapglk )" -- 2.11.4.GIT