GNU bug report logs - #34482
[PATCH 1/3] gnu: Add sdl2-gfx.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 34482 in the body.
You can then email your comments to 34482 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Kei Kebreau <kkebreau <at> posteo.net>
To: guix-patches <at> gnu.org
Cc: Kei Kebreau <kkebreau <at> posteo.net>
Subject: [PATCH 1/3] gnu: Add sdl2-gfx.
Date: Fri, 15 Feb 2019 01:35:30 -0500

* gnu/packages/sdl.scm (sdl2-gfx): New variable.
---
 gnu/packages/sdl.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index a1522792a7..30b48a5215 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -7,6 +7,7 @@
 ;;; Copyright © 2017, 2018 Rutger Helling <rhelling <at> mykolab.com>
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me <at> tobias.gr>
 ;;; Copyright © 2018 Ricardo Wurmus <rekado <at> elephly.net>
+;;; Copyright © 2019 Kei Kebreau <kkebreau <at> posteo.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -348,6 +349,21 @@ directory.")
          (other other))
        (package-propagated-inputs package)))
 
+(define-public sdl2-gfx
+  (package (inherit sdl-gfx)
+    (name "sdl2-gfx")
+    (version "1.0.4")
+    (source (origin
+              (method url-fetch)
+              (uri
+               (string-append "http://www.frezkopp.net/Software/SDL2_gfx/SDL2_gfx-"
+                              version ".tar.gz"))
+              (sha256
+               (base32
+                "0qk2ax7f7grlxb13ba0ll3zlm8780s7j8fmrhlpxzjgdvldf1q33"))))
+    (propagated-inputs
+     (propagated-inputs-with-sdl2 sdl-gfx))))
+
 (define-public sdl2-image
   (package (inherit sdl-image)
     (name "sdl2-image")
-- 
2.20.1

Message #8 received at 34482 <at> debbugs.gnu.org (full text, mbox):

From: Kei Kebreau <kkebreau <at> posteo.net>
To: 34482 <at> debbugs.gnu.org
Cc: Kei Kebreau <kkebreau <at> posteo.net>
Subject: [PATCH 2/3] gnu: Add cxxtest.
Date: Fri, 15 Feb 2019 07:26:23 -0500

* gnu/packages/check.scm (cxxtest): New variable.
---
 gnu/packages/check.scm | 47 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index d689c96648..6f4ba579eb 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -22,7 +22,7 @@
 ;;; Copyright © 2017, 2018 Arun Isaac <arunisaac <at> systemreboot.net>
 ;;; Copyright © 2017 Frederick M. Muriithi <fredmanglis <at> gmail.com>
 ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe <at> gmail.com>
-;;; Copyright © 2017 Kei Kebreau <kkebreau <at> posteo.net>
+;;; Copyright © 2017, 2019 Kei Kebreau <kkebreau <at> posteo.net>
 ;;; Copyright © 2017 Nils Gillmann <ng0 <at> n0.is>
 ;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus <rekado <at> elephly.net>
 ;;; Copyright © 2016, 2017, 2018 Marius Bakke <mbakke <at> fastmail.com>
@@ -324,6 +324,51 @@ normally do not detect.  The goal is to detect only real errors in the code
 (i.e. have zero false positives).")
     (license license:gpl3+)))
 
+(define-public cxxtest
+  (package
+    (name "cxxtest")
+    (version "4.4")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://sourceforge/cxxtest/cxxtest/"
+                                  version "/cxxtest-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1n7pbj4z9ivx005hqvivj9ddhq8awynzg6jishfbypf6j7ply58w"))))
+    (build-system python-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'chdir-to-source
+           (lambda _
+             (chdir "python")
+             #t))
+         (add-after 'install 'install-headers
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (include-dir (string-append out "/include/cxxtest")))
+               (for-each (lambda (header-file)
+                           (install-file header-file include-dir))
+                         (find-files "../cxxtest"))
+               #t)))
+         (add-after 'install 'install-doc
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (doc-dir (string-append out "/share/doc/cxxtest")))
+               (install-file "../README" doc-dir)
+               (install-file "../doc/guide.txt" doc-dir)
+               (copy-recursively "../sample" (string-append doc-dir "/sample"))
+               #t))))))
+    (propagated-inputs
+     `(("python-ply" ,python-ply)))
+    (home-page "https://cxxtest.com/")
+    (synopsis "Unit testing framework for C++")
+    (description "CxxTest is a unit testing framework for C++ that is similar
+in spirit to JUnit, CppUnit, and xUnit.  CxxTest does not require precompiling
+a CxxTest testing library, it employs no advanced features of C++ (e.g. RTTI)
+and it supports a very flexible form of test discovery.")
+    (license license:lgpl3+)))
+
 (define-public go-gopkg.in-check.v1
   (let ((commit "20d25e2804050c1cd24a7eea1e7a6447dd0e74ec")
         (revision "0"))
-- 
2.20.1

Message #11 received at 34482 <at> debbugs.gnu.org (full text, mbox):

From: Kei Kebreau <kkebreau <at> posteo.net>
To: 34482 <at> debbugs.gnu.org
Cc: Kei Kebreau <kkebreau <at> posteo.net>
Subject: [PATCH 3/3] gnu: freedink-engine: Update to 109.4.
Date: Fri, 15 Feb 2019 07:26:24 -0500

* gnu/packages/games.scm (freedink-engine): Update to 109.4.
[arguments]: Add 'disable-graphical-tests' phase.
[native-inputs]: Add autoconf, automake and cxxtest.  Remove check.
[inputs]: Add glm and sdl-union of sdl2, sdl2-image, sdl2-mixer, sdl2-ttf and
sdl2-gfx.  Remove sdl, sdl-image, sdl-mixer, sdl-ttf and sdl-gfx.
---
 gnu/packages/games.scm | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 6d9e63c4e9..980bf872e7 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -112,6 +112,7 @@
   #:use-module (gnu packages linux)
   #:use-module (gnu packages lua)
   #:use-module (gnu packages haskell)
+  #:use-module (gnu packages maths)
   #:use-module (gnu packages mp3)
   #:use-module (gnu packages music)
   #:use-module (gnu packages multiprecision)
@@ -1401,25 +1402,34 @@ interface or via an external visual interface such as GNU XBoard.")
 (define freedink-engine
   (package
     (name "freedink-engine")
-    (version "108.4")
+    (version "109.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnu/freedink/freedink-" version
                                   ".tar.gz"))
               (sha256
                (base32
-                "08c51imfjfcydm7h0va09z8qfw5nc837bi2x754ni2z737hb5kw2"))))
+                "0iaagwnyfgm3mqzkj550q60hrsjr13gykg5vfn2nz2ia520bb52g"))))
     (build-system gnu-build-system)
-    (arguments `(#:configure-flags '("--disable-embedded-resources")))
-    (native-inputs `(("gettext" ,gettext-minimal)
-                     ("pkg-config" ,pkg-config)))
-    (inputs `(("sdl" ,sdl)
-              ("sdl-image" ,sdl-image)
-              ("sdl-mixer" ,sdl-mixer)
-              ("sdl-ttf" ,sdl-ttf)
-              ("sdl-gfx" ,sdl-gfx)
+    (arguments
+     `(#:configure-flags '("--disable-embedded-resources")
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'disable-graphical-tests
+           (lambda _
+             ;; These tests require a graphical interface.
+             (substitute* "src/Makefile.am"
+               (("test_gfx_fonts TestIOGfxDisplay") ""))
+             #t)))))
+    (native-inputs `(("autoconf" ,autoconf)
+                     ("automake" ,automake)
+                     ("gettext" ,gettext-minimal)
+                     ("pkg-config" ,pkg-config)
+                     ("cxxtest" ,cxxtest)))
+    (inputs `(("sdl-union" ,(sdl-union (list sdl2 sdl2-image sdl2-mixer
+                                             sdl2-ttf sdl2-gfx)))
               ("fontconfig" ,fontconfig)
-              ("check" ,check)))
+              ("glm" ,glm)))
     (properties '((ftp-directory . "/freedink")
                   (upstream-name . "freedink")))
     (home-page "https://www.gnu.org/software/freedink/")
-- 
2.20.1

Message #14 received at 34482 <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: Kei Kebreau <kkebreau <at> posteo.net>
Cc: 34482 <at> debbugs.gnu.org
Subject: Re: [bug#34482] [PATCH 1/3] gnu: Add sdl2-gfx.
Date: Fri, 15 Feb 2019 11:39:09 -0500

[Message part 1 (text/plain, inline)]

On Fri, Feb 15, 2019 at 01:35:30AM -0500, Kei Kebreau wrote:
> * gnu/packages/sdl.scm (sdl2-gfx): New variable.

> +               (string-append "http://www.frezkopp.net/Software/SDL2_gfx/SDL2_gfx-"
> +                              version ".tar.gz"))

I think there is a typo in this URL.

s/frez/ferz

[signature.asc (application/pgp-signature, inline)]

Message #17 received at 34482 <at> debbugs.gnu.org (full text, mbox):

From: Kei Kebreau <kkebreau <at> posteo.net>
To: Leo Famulari <leo <at> famulari.name>
Cc: 34482 <at> debbugs.gnu.org
Subject: Re: [bug#34482] [PATCH 1/3] gnu: Add sdl2-gfx.
Date: Fri, 15 Feb 2019 14:32:13 -0500

[Message part 1 (text/plain, inline)]

Leo Famulari <leo <at> famulari.name> writes:

> On Fri, Feb 15, 2019 at 01:35:30AM -0500, Kei Kebreau wrote:
>> * gnu/packages/sdl.scm (sdl2-gfx): New variable.
>
>> + (string-append
>> "http://www.frezkopp.net/Software/SDL2_gfx/SDL2_gfx-"
>> +                              version ".tar.gz"))
>
> I think there is a typo in this URL.
>
> s/frez/ferz

Yes, thanks.  I've attached a working patch.

[0001-gnu-Add-sdl2-gfx.patch (text/plain, attachment)]

[signature.asc (application/pgp-signature, inline)]

Message #20 received at 34482 <at> debbugs.gnu.org (full text, mbox):

From: Efraim Flashner <efraim <at> flashner.co.il>
To: Leo Famulari <leo <at> famulari.name>
Cc: Kei Kebreau <kkebreau <at> posteo.net>, 34482 <at> debbugs.gnu.org
Subject: Re: [bug#34482] [PATCH 1/3] gnu: Add sdl2-gfx.
Date: Sun, 17 Feb 2019 12:22:35 +0200

[Message part 1 (text/plain, inline)]

On Fri, Feb 15, 2019 at 11:39:09AM -0500, Leo Famulari wrote:
> On Fri, Feb 15, 2019 at 01:35:30AM -0500, Kei Kebreau wrote:
> > * gnu/packages/sdl.scm (sdl2-gfx): New variable.
> 
> > +               (string-append "http://www.frezkopp.net/Software/SDL2_gfx/SDL2_gfx-"
> > +                              version ".tar.gz"))
> 
> I think there is a typo in this URL.
> 
> s/frez/ferz

Is the url even still valid? I though they got a domain squatter there
now


-- 
Efraim Flashner   <efraim <at> flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[signature.asc (application/pgp-signature, inline)]

Message #23 received at 34482 <at> debbugs.gnu.org (full text, mbox):

From: Kei Kebreau <kkebreau <at> posteo.net>
To: Efraim Flashner <efraim <at> flashner.co.il>
Cc: 34482 <at> debbugs.gnu.org, Leo Famulari <leo <at> famulari.name>
Subject: Re: [bug#34482] [PATCH 1/3] gnu: Add sdl2-gfx.
Date: Sun, 17 Feb 2019 12:15:57 -0500

[Message part 1 (text/plain, inline)]

Efraim Flashner <efraim <at> flashner.co.il> writes:

> On Fri, Feb 15, 2019 at 11:39:09AM -0500, Leo Famulari wrote:
>> On Fri, Feb 15, 2019 at 01:35:30AM -0500, Kei Kebreau wrote:
>> > * gnu/packages/sdl.scm (sdl2-gfx): New variable.
>> 
>> > + (string-append
>> > "http://www.frezkopp.net/Software/SDL2_gfx/SDL2_gfx-"
>> > +                              version ".tar.gz"))
>> 
>> I think there is a typo in this URL.
>> 
>> s/frez/ferz
>
> Is the url even still valid? I though they got a domain squatter there
> now

I navigated through the website to get to the SDL2_gfx tarball which was
last updated about a year ago, so I think it's still valid. Below is the
relevant page:

http://www.ferzkopp.net/wordpress/2016/01/02/sdl_gfx-sdl2_gfx/

[signature.asc (application/pgp-signature, inline)]

Message #28 received at 34482-done <at> debbugs.gnu.org (full text, mbox):

From: Kei Kebreau <kkebreau <at> posteo.net>
To: Efraim Flashner <efraim <at> flashner.co.il>
Cc: 34482-done <at> debbugs.gnu.org, Leo Famulari <leo <at> famulari.name>
Subject: Re: [bug#34482] [PATCH 1/3] gnu: Add sdl2-gfx.
Date: Fri, 22 Feb 2019 20:41:38 -0500

Since there have been no further corrections, I've pushed a slightly
modified version of this patch to master. Thanks to all involved for
reviewing!

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.