From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andreas Enge Subject: [PATCH] Add einstein. Date: Sat, 27 Feb 2016 19:06:09 +0100 Message-ID: <20160227180609.GA1450@solar> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="d6Gm4EdcadzBjdND" Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:48515) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZjFy-0000DI-Gm for guix-devel@gnu.org; Sat, 27 Feb 2016 13:06:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aZjFv-0002AV-7v for guix-devel@gnu.org; Sat, 27 Feb 2016 13:06:18 -0500 Received: from mailrelay6.public.one.com ([91.198.169.200]:18993) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZjFu-00028F-Ks for guix-devel@gnu.org; Sat, 27 Feb 2016 13:06:15 -0500 Content-Disposition: inline List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org --d6Gm4EdcadzBjdND Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hello, the attached patch adds a game the source code of which has almost disappeared... So lots of annoying little things to change. I do it (mostly) in a build phase right now; should I rather use a patch? The one thing that bothers me is the lack of license: Debian claims it is gpl2+ and included the package in previous editions; the source code itself has no hint of a license, the website from archive.org speaks of "free cross- platform open source" without further detail. Actually Debian at http://metadata.ftp-master.debian.org/changelogs/main/e/einstein/unstable_copyright also gives an author; so at some point in time in some galaxy, more information must have been available... There is actually more info in a Debian bug report! https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=289339 It points to the following page: http://www.babichev.info/en/projects/index.html Looking at: http://web.archive.org/web/20150222180355/http://www.babichev.info/en/projects/index.html "(...) Einstein (...) All software published under the terms of GNU General Public License." Following the link leads to here: http://web.archive.org/web/20150221145051/http://www.gnu.org/licenses/gpl.html So is this okay to include under gpl3+? (In which case I would update the patch and also add a pointer to http://web.archive.org/web/20150222180355/http://www.babichev.info/en/projects/index.html). Andreas --d6Gm4EdcadzBjdND Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: attachment; filename="0001-gnu-Add-einstein.patch" Content-Transfer-Encoding: 8bit >From 0261d4b0a587f402f76d83ccddf97b2cf70a03e0 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sat, 27 Feb 2016 17:21:04 +0100 Subject: [PATCH] gnu: Add einstein. * gnu/packages/games.scm (einstein): New variable. * gnu/packages/patches/einstein-install.patch: New file. * gnu-system.am (dist_patch_DATA): Register patch. --- gnu-system.am | 1 + gnu/packages/games.scm | 68 ++++++++++++++++++++++++++++- gnu/packages/patches/einstein-install.patch | 21 +++++++++ 3 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/einstein-install.patch diff --git a/gnu-system.am b/gnu-system.am index 6ccca12..5fff3e8 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -454,6 +454,7 @@ dist_patch_DATA = \ gnu/packages/patches/doxygen-test.patch \ gnu/packages/patches/duplicity-piped-password.patch \ gnu/packages/patches/duplicity-test_selection-tmp.patch \ + gnu/packages/patches/einstein-install.patch \ gnu/packages/patches/elfutils-tests-ptrace.patch \ gnu/packages/patches/emacs-constants-lisp-like.patch \ gnu/packages/patches/emacs-exec-path.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 991fa24..0fe669d 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2014, 2015 Ludovic Courtès ;;; Copyright © 2014, 2015 Sou Bunnbu ;;; Copyright © 2014, 2015 Mark H Weaver -;;; Copyright © 2015 Andreas Enge +;;; Copyright © 2015, 2016 Andreas Enge ;;; Copyright © 2015 David Hashe ;;; Copyright © 2015 Christopher Allan Webber ;;; Copyright © 2015 Ricardo Wurmus @@ -47,6 +47,7 @@ #:use-module (gnu packages audio) #:use-module (gnu packages avahi) #:use-module (gnu packages boost) + #:use-module (gnu packages fonts) #:use-module (gnu packages fribidi) #:use-module (gnu packages game-development) #:use-module (gnu packages gettext) @@ -1917,3 +1918,68 @@ Catan. It can be played on a local network, on the internet, and with AI players.") (home-page "http://pio.sourceforge.net/") (license license:gpl2+))) + +(define-public einstein + (package + (name "einstein") + (version "2.0") + (source (origin + (method url-fetch) + (uri (string-append "http://http.debian.net/debian/pool/main/e/" + "einstein/einstein_2.0.dfsg.2.orig.tar.gz")) + (sha256 + (base32 + "1hxrlv6n8py48j487i6wbb4n4vd55w0na69r7ccmmr9vmrsw5mlk")) + (patches (list (search-patch "einstein-install.patch"))))) + (build-system gnu-build-system) + (inputs + `(("freetype" ,freetype) + ("sdl" ,sdl) + ("sdl-mixer" ,sdl-mixer) + ("sdl-ttf" ,sdl-ttf) + ("zlib" ,zlib))) + (native-inputs + `(("font-dejavu" ,font-dejavu))) + (arguments + `(#:tests? #f ; no check target + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs inputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (dejavu (string-append (assoc-ref inputs "font-dejavu") + "/share/fonts/truetype/DejaVuSans.ttf"))) + (substitute* "Makefile" + (("PREFIX=/usr/local") (string-append "PREFIX=" out))) + ;; Replace proprietary fonts by free one. + ;; The font is copied during the compile phase into a resources + ;; file, so we need to make the ttf file available. + (symlink dejavu "res/DejaVuSans.ttf") + (substitute* (find-files "." "\\.(cpp|descr)$") + (("laudcn2.ttf") "DejaVuSans.ttf") + (("luximb.ttf") "DejaVuSans.ttf") + (("nova.ttf") "DejaVuSans.ttf")) + ;; Fix compilation with current gcc. + (substitute* (find-files "." "\\.(cpp|h)$") + (("SDL_mixer.h") "SDL/SDL_mixer.h") + (("SDL_ttf.h") "SDL/SDL_ttf.h")) + (substitute* + '("convert.h" "mkres/convert.h") + (("iostream") "iostream>\n#include /dev/null + -- 2.6.3 --d6Gm4EdcadzBjdND--