GNU bug report logs - #42462
[PATCH 0/2] freedink: fix build

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 42462 in the body.
You can then email your comments to 42462 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: Jesse Gibbons <jgibbons2357 <at> gmail.com>
To: guix-patches <at> gnu.org
Subject: [PATCH 0/2] freedink: fix build
Date: Tue, 21 Jul 2020 00:40:15 -0600

This patch series fixes the problems with freedink. In particular, it 
adds a phase that takes care of the outdated autotools files in the 
source, and adds a patch to fix an SDL mismatch.

-Jesse

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

From: Jesse Gibbons <jgibbons2357 <at> gmail.com>
To: 42462 <at> debbugs.gnu.org
Subject: [PATCH 1/2] gnu: freedink-engine: Call autoreconf.
Date: Tue, 21 Jul 2020 00:42:11 -0600

* gnu/packages/games.scm: freedink-engine (phases): add 'autoreconf
---
gnu/packages/games.scm | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index dc0511e55a..835c8c5f52 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -2743,7 +2743,16 @@ interface or via an external visual interface 
such as GNU XBoard.")
;; These tests require a graphical interface.
(substitute* "src/Makefile.am"
(("test_gfx_fonts TestIOGfxDisplay") ""))
- #t)))))
+ #t))
+ (add-before 'bootstrap 'autoreconf
+ (lambda _
+ ;; automake is out of date in the source
+ ;; autoreconf updates the automake scripts
+ (invoke "autoreconf")
+ ;; Build fails when autom4te.cache exists.
+ (delete-file-recursively "autom4te.cache")
+ #t))
+ )))
(native-inputs `(("autoconf" ,autoconf)
("automake" ,automake)
("cxxtest" ,cxxtest)

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

From: Jesse Gibbons <jgibbons2357 <at> gmail.com>
To: 42462 <at> debbugs.gnu.org
Subject: [PATCH 2/2] gnu: freedink-engine: Fix sdl hints.
Date: Tue, 21 Jul 2020 00:42:41 -0600

* gnu/packages/games.scm: freedink: [patches]: Add fix.
* gnu/packages/patches/freedink-engine-fix-sdl-hints.patch: New file.
* gnu/local.mk: Add it.
---
gnu/local.mk | 1 +
gnu/packages/games.scm | 1 +
.../freedink-engine-fix-sdl-hints.patch | 33 +++++++++++++++++++
3 files changed, 35 insertions(+)
create mode 100644 gnu/packages/patches/freedink-engine-fix-sdl-hints.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index fc68786ab6..b468ee237a 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -950,6 +950,7 @@ dist_patch_DATA = \
%D%/packages/patches/foomatic-filters-CVE-2015-8327.patch \
%D%/packages/patches/foomatic-filters-CVE-2015-8560.patch \
%D%/packages/patches/fontconfig-hurd-path-max.patch \
+ %D%/packages/patches/freedink-engine-fix-sdl-hints.patch \
%D%/packages/patches/freeimage-unbundle.patch \
%D%/packages/patches/fuse-overlapping-headers.patch \
%D%/packages/patches/ganeti-deterministic-manual.patch \
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 835c8c5f52..2efbb3964e 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -2730,6 +2730,7 @@ interface or via an external visual interface such 
as GNU XBoard.")
(method url-fetch)
(uri (string-append "mirror://gnu/freedink/freedink-" version
".tar.gz"))
+ (patches (search-patches "freedink-engine-fix-sdl-hints.patch"))
(sha256
(base32
"00hhk1bjdrc1np2qz44sa5n1mb62qzwxbvsnws3vpms6iyn3a2sy"))))
diff --git a/gnu/packages/patches/freedink-engine-fix-sdl-hints.patch 
b/gnu/packages/patches/freedink-engine-fix-sdl-hints.patch
new file mode 100644
index 0000000000..ce37ab4870
--- /dev/null
+++ b/gnu/packages/patches/freedink-engine-fix-sdl-hints.patch
@@ -0,0 +1,33 @@
+From 85f8dda6de28ef86e58f26c8aa863a26524f6ce0 Mon Sep 17 00:00:00 2001
+From: Jesse Gibbons <jgibbons2357+freedink <at> gmail.com>
+Date: Sun, 9 Feb 2020 21:46:26 -0700
+Subject: [PATCH] Fix mouse/touch event hints for SDL 2.0.10.
+
+This fixes the bug reported at
+<https://lists.gnu.org/archive/html/bug-freedink/2019-08/msg00000.html>.
+
+It should remain backwards compatible with releases of SDL prior to 2.0.10.
+---
+ src/input.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/input.cpp b/src/input.cpp
+index b5ae21e..153d349 100644
+--- a/src/input.cpp
++++ b/src/input.cpp
+@@ -91,7 +91,12 @@ void input_init(void)
+ + // TODO: don't attempt to simulate mouse events from touch events -
+ // fake mouse events often are de-centered
++#ifdef SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH
+ SDL_SetHint(SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH, "0");
++#elif defined SDL_HINT_MOUSE_TOUCH_EVENTS && defined 
SDL_HINT_TOUCH_MOUSE_EVENTS
++ SDL_SetHint(SDL_HINT_MOUSE_TOUCH_EVENTS, "0");
++ SDL_SetHint(SDL_HINT_TOUCH_MOUSE_EVENTS, "0");
++#endif
+ + /* Touch devices */
+ {
+-- +2.25.0
+

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

From: iyzsong <at> member.fsf.org (宋文武)
To: Jesse Gibbons <jgibbons2357 <at> gmail.com>
Cc: 42462 <at> debbugs.gnu.org
Subject: Re: [bug#42462] [PATCH 0/2] freedink: fix build
Date: Sat, 25 Jul 2020 16:24:51 +0800

Jesse Gibbons <jgibbons2357 <at> gmail.com> writes:

> This patch series fixes the problems with freedink. In particular, it
> adds a phase that takes care of the outdated autotools files in the
> source, and adds a patch to fix an SDL mismatch.
>
> -Jesse

Hello, your patches doesn't apply (with 'git am'), as the alignment
(leading spaces) is wrong.  Can you send them again as proper
attachments (inline or external) or via 'git send-email'?

Thank you!

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

From: Jesse Gibbons <jgibbons <at> byui.edu>
To: 42462 <at> debbugs.gnu.org
Subject: (re-send) [PATCH 0/2] freedink: fix build
Date: Tue, 28 Jul 2020 15:43:32 -0600

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

The patches were mangled, and I didn't get the reply saying they were 
mangled. Attached are the patch files.

[0002-gnu-freedink-engine-Fix-sdl-hints.patch (text/x-patch, attachment)]

[0001-gnu-freedink-engine-Call-autoreconf.patch (text/x-patch, attachment)]

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

From: Jesse Gibbons <jgibbons2357 <at> gmail.com>
To: 42462 <at> debbugs.gnu.org
Subject: (re-send) [PATCH 0/2] freedink: fix build
Date: Tue, 28 Jul 2020 16:56:10 -0600

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

The patches were mangled, and I didn't get the reply saying they were 
mangled. Attached are the patch files.

[0002-gnu-freedink-engine-Fix-sdl-hints.patch (text/x-patch, attachment)]

[0001-gnu-freedink-engine-Call-autoreconf.patch (text/x-patch, attachment)]

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

From: Jesse Gibbons <jgibbons2357 <at> gmail.com>
To: 42462 <at> debbugs.gnu.org
Subject: bump: [PATCH 0/2] freedink: fix build
Date: Wed, 5 Aug 2020 11:30:03 -0600

This is just a friendly bump!

https://issues.guix.gnu.org/42462

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

From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
To: Jesse Gibbons <jgibbons2357 <at> gmail.com>
Cc: 42462-done <at> debbugs.gnu.org
Subject: Re: [bug#42462] bump: [PATCH 0/2] freedink: fix build
Date: Wed, 12 Aug 2020 17:12:35 +0200

Hello,

Jesse Gibbons <jgibbons2357 <at> gmail.com> writes:

> This is just a friendly bump!
>
> https://issues.guix.gnu.org/42462

Applied. Thank you.

Regards,
-- 
Nicolas Goaziou

Previous Next

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