* [bug#34482] [PATCH 1/3] gnu: Add sdl2-gfx.
@ 2019-02-15 6:35 Kei Kebreau
2019-02-15 12:26 ` [bug#34482] [PATCH 2/3] gnu: Add cxxtest Kei Kebreau
2019-02-15 16:39 ` [bug#34482] [PATCH 1/3] gnu: Add sdl2-gfx Leo Famulari
0 siblings, 2 replies; 8+ messages in thread
From: Kei Kebreau @ 2019-02-15 6:35 UTC (permalink / raw)
To: 34482; +Cc: Kei Kebreau
* 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@mykolab.com>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2019 Kei Kebreau <kkebreau@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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [bug#34482] [PATCH 2/3] gnu: Add cxxtest.
2019-02-15 6:35 [bug#34482] [PATCH 1/3] gnu: Add sdl2-gfx Kei Kebreau
@ 2019-02-15 12:26 ` Kei Kebreau
2019-02-15 12:26 ` [bug#34482] [PATCH 3/3] gnu: freedink-engine: Update to 109.4 Kei Kebreau
2019-02-15 16:39 ` [bug#34482] [PATCH 1/3] gnu: Add sdl2-gfx Leo Famulari
1 sibling, 1 reply; 8+ messages in thread
From: Kei Kebreau @ 2019-02-15 12:26 UTC (permalink / raw)
To: 34482; +Cc: Kei Kebreau
* 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@systemreboot.net>
;;; Copyright © 2017 Frederick M. Muriithi <fredmanglis@gmail.com>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
-;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net>
+;;; Copyright © 2017, 2019 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2017 Nils Gillmann <ng0@n0.is>
;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017, 2018 Marius Bakke <mbakke@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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [bug#34482] [PATCH 3/3] gnu: freedink-engine: Update to 109.4.
2019-02-15 12:26 ` [bug#34482] [PATCH 2/3] gnu: Add cxxtest Kei Kebreau
@ 2019-02-15 12:26 ` Kei Kebreau
0 siblings, 0 replies; 8+ messages in thread
From: Kei Kebreau @ 2019-02-15 12:26 UTC (permalink / raw)
To: 34482; +Cc: Kei Kebreau
* 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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [bug#34482] [PATCH 1/3] gnu: Add sdl2-gfx.
2019-02-15 6:35 [bug#34482] [PATCH 1/3] gnu: Add sdl2-gfx Kei Kebreau
2019-02-15 12:26 ` [bug#34482] [PATCH 2/3] gnu: Add cxxtest Kei Kebreau
@ 2019-02-15 16:39 ` Leo Famulari
2019-02-15 19:32 ` Kei Kebreau
2019-02-17 10:22 ` Efraim Flashner
1 sibling, 2 replies; 8+ messages in thread
From: Leo Famulari @ 2019-02-15 16:39 UTC (permalink / raw)
To: Kei Kebreau; +Cc: 34482
[-- Attachment #1: Type: text/plain, Size: 304 bytes --]
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* [bug#34482] [PATCH 1/3] gnu: Add sdl2-gfx.
2019-02-15 16:39 ` [bug#34482] [PATCH 1/3] gnu: Add sdl2-gfx Leo Famulari
@ 2019-02-15 19:32 ` Kei Kebreau
2019-02-17 10:22 ` Efraim Flashner
1 sibling, 0 replies; 8+ messages in thread
From: Kei Kebreau @ 2019-02-15 19:32 UTC (permalink / raw)
To: Leo Famulari; +Cc: 34482
[-- Attachment #1.1: Type: text/plain, Size: 393 bytes --]
Leo Famulari <leo@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.
[-- Attachment #1.2: 0001-gnu-Add-sdl2-gfx.patch --]
[-- Type: text/plain, Size: 1538 bytes --]
From fd23964fd6b563d098745d04fee0e388fb48d10a Mon Sep 17 00:00:00 2001
From: Kei Kebreau <kkebreau@posteo.net>
Date: Tue, 12 Feb 2019 21:45:03 -0500
Subject: [PATCH 1/3] gnu: Add sdl2-gfx.
* 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..e3a23dae02 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -7,6 +7,7 @@
;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2019 Kei Kebreau <kkebreau@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.ferzkopp.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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [bug#34482] [PATCH 1/3] gnu: Add sdl2-gfx.
2019-02-15 16:39 ` [bug#34482] [PATCH 1/3] gnu: Add sdl2-gfx Leo Famulari
2019-02-15 19:32 ` Kei Kebreau
@ 2019-02-17 10:22 ` Efraim Flashner
2019-02-17 17:15 ` Kei Kebreau
1 sibling, 1 reply; 8+ messages in thread
From: Efraim Flashner @ 2019-02-17 10:22 UTC (permalink / raw)
To: Leo Famulari; +Cc: Kei Kebreau, 34482
[-- Attachment #1: Type: text/plain, Size: 688 bytes --]
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@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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* [bug#34482] [PATCH 1/3] gnu: Add sdl2-gfx.
2019-02-17 10:22 ` Efraim Flashner
@ 2019-02-17 17:15 ` Kei Kebreau
2019-02-23 1:41 ` bug#34482: " Kei Kebreau
0 siblings, 1 reply; 8+ messages in thread
From: Kei Kebreau @ 2019-02-17 17:15 UTC (permalink / raw)
To: Efraim Flashner; +Cc: 34482
[-- Attachment #1: Type: text/plain, Size: 764 bytes --]
Efraim Flashner <efraim@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/
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* bug#34482: [PATCH 1/3] gnu: Add sdl2-gfx.
2019-02-17 17:15 ` Kei Kebreau
@ 2019-02-23 1:41 ` Kei Kebreau
0 siblings, 0 replies; 8+ messages in thread
From: Kei Kebreau @ 2019-02-23 1:41 UTC (permalink / raw)
To: Efraim Flashner; +Cc: 34482-done
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!
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2019-02-23 1:42 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-02-15 6:35 [bug#34482] [PATCH 1/3] gnu: Add sdl2-gfx Kei Kebreau
2019-02-15 12:26 ` [bug#34482] [PATCH 2/3] gnu: Add cxxtest Kei Kebreau
2019-02-15 12:26 ` [bug#34482] [PATCH 3/3] gnu: freedink-engine: Update to 109.4 Kei Kebreau
2019-02-15 16:39 ` [bug#34482] [PATCH 1/3] gnu: Add sdl2-gfx Leo Famulari
2019-02-15 19:32 ` Kei Kebreau
2019-02-17 10:22 ` Efraim Flashner
2019-02-17 17:15 ` Kei Kebreau
2019-02-23 1:41 ` bug#34482: " Kei Kebreau
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).