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

Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.

Package: guix-patches; Reported by: Jesse Gibbons <jgibbons2357@HIDDEN>; Keywords: patch; dated Tue, 21 Jul 2020 06:41:01 UTC; Maintainer for guix-patches is guix-patches@HIDDEN.

Message received at 42462 <at> debbugs.gnu.org:


Received: (at 42462) by debbugs.gnu.org; 5 Aug 2020 17:30:15 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Aug 05 13:30:15 2020
Received: from localhost ([127.0.0.1]:52178 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1k3NF1-0001wP-26
	for submit <at> debbugs.gnu.org; Wed, 05 Aug 2020 13:30:15 -0400
Received: from mail-pj1-f46.google.com ([209.85.216.46]:52719)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <jgibbons2357@HIDDEN>) id 1k3NEy-0001wB-Hd
 for 42462 <at> debbugs.gnu.org; Wed, 05 Aug 2020 13:30:13 -0400
Received: by mail-pj1-f46.google.com with SMTP id kr4so4909759pjb.2
 for <42462 <at> debbugs.gnu.org>; Wed, 05 Aug 2020 10:30:12 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
 h=to:from:subject:message-id:date:user-agent:mime-version
 :content-transfer-encoding:content-language;
 bh=dGYSXq3arOTCFVWNRNiyHkkOUjCkwmOrs741boO4ZB8=;
 b=QTYaaJVh3oxRg6gHjzSGCBCpLoSftOE9C4ePaNkc9ohK2Vy0ro/Fe/RDr0C6boqrZq
 C2M+f/DSnWSpM0s05G/u04TFAD8Iy0NEHoNaBEDd8APQecjLSi9qpnKcbZHbkJMvOYal
 T0Ya6KFKMZBw+RQH0puPb46eYUnp0yqbPu2SQHEwBvi0l4ZDR5cnV5jYUvA9QOEyCYJn
 OH2mO4X9ocM2r2GiQ23vfzXV0+gdseps7GDK7ajUUE9ppxgUgRkM1s0nqXimWQfTEUGr
 NBSg8tXf47CPiMPpZlf357cXLBbk/qwnyUHkh7zpFas79pRBPBezN96qaUJ8Ekw+CSCL
 /DTA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:to:from:subject:message-id:date:user-agent
 :mime-version:content-transfer-encoding:content-language;
 bh=dGYSXq3arOTCFVWNRNiyHkkOUjCkwmOrs741boO4ZB8=;
 b=Pir783Q5LDRYk4GAZQ3UpRRJI0F5lgwCWDYUOX8q1oIZklLHnI+C9UvmfxK+PIwypY
 8hXKcjy4zjf4D/1h8noxcSWqX4uBjdg0YT/doP1y3XiSRUMz0ukLJZe1QhuWxgypfygi
 EJfifd08DSOm9ujTjH2YR3eyX9dBnzWvypiHQ3tHcIZSdt1cgRjf2y4fP+PMDR77gwCL
 GjBmFsmof7I2wGENGdEw3w2z4gx4YGsAIEoNZaHsq5ZRmhnX3V+DvyUae3mQiPOTa5by
 sxFlNwmoKeXeuIa3ImrMlCmyOYpFpGmvfkCf+DO+Al0Say2V4v68NYFu67NptalDAKf6
 TdMQ==
X-Gm-Message-State: AOAM531x0SNXBbByXSVxsm+1UBulk/LYfFFWaWsviKXWyWPxHWJr5SHU
 /7tsZxlXCmqtyg/uw5xO3IEFMaqk
X-Google-Smtp-Source: ABdhPJxU4wO52BaALVCfT9q9trHpQ0JvoQycx64WGsOFsMKYNOF7SWp8jo33D84+om8nRMvIlVfOxg==
X-Received: by 2002:a17:90a:2e87:: with SMTP id
 r7mr4311903pjd.137.1596648606264; 
 Wed, 05 Aug 2020 10:30:06 -0700 (PDT)
Received: from [192.168.1.25] ([38.141.58.134])
 by smtp.gmail.com with ESMTPSA id 22sm3774644pgd.59.2020.08.05.10.30.04
 for <42462 <at> debbugs.gnu.org>
 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
 Wed, 05 Aug 2020 10:30:05 -0700 (PDT)
To: 42462 <at> debbugs.gnu.org
From: Jesse Gibbons <jgibbons2357@HIDDEN>
Subject: bump: [PATCH 0/2] freedink: fix build
Message-ID: <a8502da9-2b65-6864-ad36-1654d9bba7a1@HIDDEN>
Date: Wed, 5 Aug 2020 11:30:03 -0600
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Icedove/68.10.0
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
Content-Language: en-US
X-Spam-Score: 0.3 (/)
X-Debbugs-Envelope-To: 42462
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.7 (/)

This is just a friendly bump!

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





Information forwarded to guix-patches@HIDDEN:
bug#42462; Package guix-patches. Full text available.

Message received at 42462 <at> debbugs.gnu.org:


Received: (at 42462) by debbugs.gnu.org; 28 Jul 2020 22:56:28 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jul 28 18:56:28 2020
Received: from localhost ([127.0.0.1]:59419 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1k0YWG-000634-D5
	for submit <at> debbugs.gnu.org; Tue, 28 Jul 2020 18:56:28 -0400
Received: from mail-pg1-f179.google.com ([209.85.215.179]:39886)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <jgibbons2357@HIDDEN>) id 1k0YWB-00062o-Rz
 for 42462 <at> debbugs.gnu.org; Tue, 28 Jul 2020 18:56:23 -0400
Received: by mail-pg1-f179.google.com with SMTP id z5so13132435pgb.6
 for <42462 <at> debbugs.gnu.org>; Tue, 28 Jul 2020 15:56:19 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
 h=to:from:subject:message-id:date:user-agent:mime-version
 :content-language;
 bh=EtgC2+jAat/9m9WJzNb/kGamlxIDSDUDlYMMN6L53GU=;
 b=DcvR5sNOQulRRLgFFO6382Wk8JEPGDOzC82cLG6Of+/l04CqpwiUHCgOiF5ZzdoEWy
 dtCnlLOGt9LLrW/3DCn/IxhH9Hf/8+dOw/Jzxt2H8FGksHY6Nn/VhC1Ugzp2/rUJdGc/
 HrrDqmKOEQLmZ8M/hByj6BoBoG4MhzUfh7qOe1zFlIRZEZ++AmcTV625syPwdaovv93w
 a2PYzLR4JhWsTPFm+zFcWdSKWQczJq/WpS95gupMyyZpCtWPNlj6SkpJA23NhiUZnL9v
 n5buSWO+Ya2zmQJlj/0rwfnxk3xX+WrNJznGlC4owWqTi/WAFm5NwMz9hVhjWdmwEy3Q
 Ja2w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:to:from:subject:message-id:date:user-agent
 :mime-version:content-language;
 bh=EtgC2+jAat/9m9WJzNb/kGamlxIDSDUDlYMMN6L53GU=;
 b=ndu3SlOW5fFB6xJvheyp7HoW/ECPq92Y1pvqDo4zm2EES/ai1Oi/S9f4CoEqtuGRzp
 l/mSUHgHE0dT7kLauIhzp1TL/UH7fOTEXMAvSSw8txlXh8M1u12qvXQmA+yQijh3SY74
 FEwviFjxKZ8VhX9A92J20xB4NmJjItg7xkNddWRbyPSw7Oxu66ybje6iGN9D9x+DhTm0
 vbCDtHtn8ikBjCImnVV62gedUYt5GBFcdwqwE/GuIPWPKNhAe04CVXDr1BYYvNic5ZYR
 Dn85+O6DWm52qSRSNZdEirc9HrDsHZj3yW8TPWQiUPhp3OC95HXuX2d6sGRwojOzdlZ0
 m1Kw==
X-Gm-Message-State: AOAM533AG6MVEPbRXJgkcjFg3N7cjsHWyBkmQF6VT2raY/ek1TiZVy7L
 MUbix0CdUa75e5WMtEeT37+gao0b
X-Google-Smtp-Source: ABdhPJzRIAY7WEx3G84OdeQkTdtNF+bervJvwCT2gjrtp92CYIcyrDIfUkTzcOXNAdHxzfUfk/gw9A==
X-Received: by 2002:a65:5682:: with SMTP id v2mr26167124pgs.231.1595976973464; 
 Tue, 28 Jul 2020 15:56:13 -0700 (PDT)
Received: from [192.168.1.25] ([38.141.58.134])
 by smtp.gmail.com with ESMTPSA id fr16sm160704pjb.9.2020.07.28.15.56.11
 for <42462 <at> debbugs.gnu.org>
 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
 Tue, 28 Jul 2020 15:56:12 -0700 (PDT)
To: 42462 <at> debbugs.gnu.org
From: Jesse Gibbons <jgibbons2357@HIDDEN>
Subject: (re-send) [PATCH 0/2] freedink: fix build
Message-ID: <acf49a6d-5575-bdc5-6a42-883287e842d7@HIDDEN>
Date: Tue, 28 Jul 2020 16:56:10 -0600
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Icedove/68.10.0
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------51B6EB2477F01B8864784107"
Content-Language: en-US
X-Spam-Score: 0.3 (/)
X-Debbugs-Envelope-To: 42462
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.7 (/)

This is a multi-part message in MIME format.
--------------51B6EB2477F01B8864784107
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit

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


--------------51B6EB2477F01B8864784107
Content-Type: text/x-patch; charset=UTF-8;
 name="0002-gnu-freedink-engine-Fix-sdl-hints.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="0002-gnu-freedink-engine-Fix-sdl-hints.patch"

From fb4f7827cb8aab1b5db3d8837981a5c0caa2b40c Mon Sep 17 00:00:00 2001
From: Jesse Gibbons <jgibbons2357+guix@HIDDEN>
Date: Mon, 10 Feb 2020 10:18:57 -0700
Subject: [PATCH 2/2] gnu: freedink-engine: Fix sdl hints.

* 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@HIDDEN>
+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
+
-- 
2.27.0


--------------51B6EB2477F01B8864784107
Content-Type: text/x-patch; charset=UTF-8;
 name="0001-gnu-freedink-engine-Call-autoreconf.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="0001-gnu-freedink-engine-Call-autoreconf.patch"

From babb7bd41959a450ac3ab4a77e9bd36dea6d94fd Mon Sep 17 00:00:00 2001
From: Jesse Gibbons <jgibbons2357+guix@HIDDEN>
Date: Fri, 3 Jul 2020 16:54:21 -0600
Subject: [PATCH 1/2] gnu: freedink-engine: Call autoreconf.

* 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)
-- 
2.27.0


--------------51B6EB2477F01B8864784107--




Information forwarded to guix-patches@HIDDEN:
bug#42462; Package guix-patches. Full text available.

Message received at 42462 <at> debbugs.gnu.org:


Received: (at 42462) by debbugs.gnu.org; 28 Jul 2020 22:17:51 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jul 28 18:17:51 2020
Received: from localhost ([127.0.0.1]:59365 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1k0Xut-00056O-5V
	for submit <at> debbugs.gnu.org; Tue, 28 Jul 2020 18:17:50 -0400
Received: from mail-bn8nam11on2110.outbound.protection.outlook.com
 ([40.107.236.110]:63712 helo=NAM11-BN8-obe.outbound.protection.outlook.com)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <gib19014@HIDDEN>) id 1k0XNv-0004G8-0r
 for 42462 <at> debbugs.gnu.org; Tue, 28 Jul 2020 17:43:48 -0400
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
 b=XuGNA9PPgGazrNpzWdKlETlXPq69T2pBO2jZOt+zO9cFC4wniZylx6MlexFLHjcxHVogV588cApWsnm+WV57madrm5V0SyeFGnbDQNBps7jKAzOxnkuIwkiQ1/+jEMBmRGpqk3hfJeWltv/gFuU3k54V/YZL5vKmY9MMeQztm8bP4JTbOni2JGjbMEMDqdWL+7P0hV7lX45lz+eOsf5v+rVdlwSOxmsOx4YGvR/d4fg0gP2Zw1MsClrbWNDNfBPvWxDDwDrx2IB/XzwO3W9jC/7PtX57tN85R8HV++WvfcYV+tWdey1BPjzcCdv4j86mC6HTaXKT5kqafwnqWdvDZg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; 
 s=arcselector9901;
 h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
 bh=Dj30bb9tP/7N2pkbNwkuCPplQgBFwmxmNt4Axfq5ttU=;
 b=EajJPcTJNXOa09zRUglqlCXAy4STyaB7Fstb+4BFUASbSinqfzn5rGCrnVEbcRgtW3eWZ24LM7Z8YvUPSel6kH8lzxX7sRcN9Jwaa4IA50MbOxA7n1jAgpY0k8xhPL414XtMLDdHn5b7LfTMxU6vCidCglSSKPNErKY6n5bsjqkPZPDt6yxSsy0ISwE5XpNLC/MV6BGeOG0COZX0QaOHyfE8U2pR3yqOCmrqzftINnIclqeIC3cps6RAojFc3DJtQG/kOt6BWuSn2pwlZERshQWq/BhaPSiR3qRh54qxdHBeAEWHhzvI2J45WS/KJSxDypGOgsh43YpINh0fDCTNzw==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass
 smtp.mailfrom=byui.edu; dmarc=pass action=none header.from=byui.edu;
 dkim=pass header.d=byui.edu; arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=byui.edu; s=selector2; 
 h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
 bh=Dj30bb9tP/7N2pkbNwkuCPplQgBFwmxmNt4Axfq5ttU=;
 b=bN9DsFrwjQshXM/7zms+dbv3B69sPbpl1XNPXizsbS1p3reHThkPGyrSHgTUXkwylDhYyqWvK3RYtPciVeBmm6k6IHEMMbdGXM3WI4cnKAmqb7AcekL/Vw6FPUauhFDBNTGwzrGiO5Hwub9ULwM21WNY38/qBaPRR22B413/ToM=
Authentication-Results: debbugs.gnu.org; dkim=none (message not signed)
 header.d=none;debbugs.gnu.org; dmarc=none action=none header.from=byui.edu;
Received: from MWHPR0101MB2864.prod.exchangelabs.com (2603:10b6:301:30::10) by
 MWHPR0101MB2911.prod.exchangelabs.com (2603:10b6:301:2d::14) with
 Microsoft
 SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
 15.20.3216.24; Tue, 28 Jul 2020 21:43:36 +0000
Received: from MWHPR0101MB2864.prod.exchangelabs.com
 ([fe80::3cbf:d8f8:e11b:7c32]) by MWHPR0101MB2864.prod.exchangelabs.com
 ([fe80::3cbf:d8f8:e11b:7c32%6]) with mapi id 15.20.3216.031; Tue, 28 Jul 2020
 21:43:36 +0000
To: 42462 <at> debbugs.gnu.org
From: Jesse Gibbons <jgibbons@HIDDEN>
Subject: (re-send) [PATCH 0/2] freedink: fix build
Message-ID: <624a56fa-d0b3-d47a-faec-4c9bb1cb515e@HIDDEN>
Date: Tue, 28 Jul 2020 15:43:32 -0600
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Icedove/68.10.0
Content-Type: multipart/mixed; boundary="------------402EDDFB4AD2DD8BE10F8CBB"
Content-Language: en-US
X-ClientProxiedBy: CY4PR22CA0046.namprd22.prod.outlook.com
 (2603:10b6:903:ed::32) To MWHPR0101MB2864.prod.exchangelabs.com
 (2603:10b6:301:30::10)
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from [192.168.1.25] (38.141.58.134) by
 CY4PR22CA0046.namprd22.prod.outlook.com (2603:10b6:903:ed::32) with Microsoft
 SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
 15.20.3216.24 via Frontend Transport; Tue, 28 Jul 2020 21:43:35 +0000
X-Originating-IP: [38.141.58.134]
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 050a3a0b-fc64-4776-0d0f-08d8333f4808
X-MS-TrafficTypeDiagnostic: MWHPR0101MB2911:
X-Microsoft-Antispam-PRVS: <MWHPR0101MB2911A74E9525873CF44676FBF6730@HIDDEN>
X-MS-Oob-TLC-OOBClassifiers: OLM:5236;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: uifdyZWzixqGiF319JxYswHp1w9kNiIYuIk2uh1Pz5fRtLBmi8e0COb/SNE3w9tU73/i7x0H0aYCFa9JnUbO1J82p9SXVRtmwvw5jSEXu/HEADqIISB+NCSQZJhpdnEELKp8Rt9jS40CqMIlT0iblURnsvCGAGipnl6MVFWbfCAwCSkFu5pKZI9xRYkFvnlFoAj9G0UGFlDRk44qJKgORPyn/fovLPv2j3aRaSuns+lCMMZKjj9Fl3JXvVle0+4pTBguk90EYqKXxF5DgZ47lpwqZ3biHR9v6tgkiaGzr1Ti7KfU0+mM76MiLuNOAxeBFosbZqbVC0TOClIiD/gRiS7PnoZZrPlyqM7GoQw3I3l7ctxX5zGYgmV8Na4lIID3
X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;
 IPV:NLI; SFV:NSPM; H:MWHPR0101MB2864.prod.exchangelabs.com; PTR:; CAT:NONE;
 SFTY:;
 SFS:(4636009)(346002)(376002)(396003)(136003)(366004)(39860400002)(478600001)(31696002)(16576012)(316002)(52116002)(8676002)(8936002)(786003)(5660300002)(33964004)(2616005)(235185007)(6486002)(956004)(66946007)(36756003)(66556008)(66476007)(186003)(6916009)(6666004)(564344004)(16526019)(2906002)(31686004)(66576008)(26005)(75432002)(43740500002);
 DIR:OUT; SFP:1102; 
X-MS-Exchange-AntiSpam-MessageData: i2ZN00iNc2JlJPnVnX5g84+WQEJhG9nvfg1b1xIl2IFkBmb9aOBpkZeVlGfT0KryHUefaKG2zASw36yvryjXYFV1x366Ku2c2p7Cx+0aJ9uMaNMFjR7ocDe0ArnG+MzAlWvElI/lUlPG+kRS73ky7tpsV63wNIbJJvRqNb7tjIS7zKGUR3RIWKnbn6JE9JdRCyw0VAotbYt0wPRqVD5SDxXy6iyMwDpsswPINc/2MEEmDpSoQUhq5y2IDi+Tl3xiNy8fSm6VZ6cLqWEYwIkQyXR85gjMnF5/bk3FXATwf1iekAQXX0yR1MzuKoJFGUQp6eNbBq0bNjah3PV05ro7+He/TanLxBu+k9jlUtHvZobUhsseB1twTtopYqESglPBFzQERN23Idap2I9fT0eBOV5hfDo2gLkbXP2Uc6qUEP7jDTRCGw0DsBU/IuFR+fkz8t4G684oicO53gMtQdKjH6xuJAJBcwR3j3bqHrT3i/c=
X-OriginatorOrg: byui.edu
X-MS-Exchange-CrossTenant-Network-Message-Id: 050a3a0b-fc64-4776-0d0f-08d8333f4808
X-MS-Exchange-CrossTenant-AuthSource: MWHPR0101MB2864.prod.exchangelabs.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jul 2020 21:43:35.8817 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: e6ac1d1f-d695-4ef1-91d4-94cddef8be11
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: CTsPtsfTPF31Udxigh5D8JDrdyNS36902epBVXDG27XSRBR6AOcWJsQFGKbE+RNZSSjueUMwXw4jDrQxNX/0lA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR0101MB2911
X-Spam-Score: 1.0 (+)
X-Debbugs-Envelope-To: 42462
X-Mailman-Approved-At: Tue, 28 Jul 2020 18:17:46 -0400
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

--------------402EDDFB4AD2DD8BE10F8CBB
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit

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


--------------402EDDFB4AD2DD8BE10F8CBB
Content-Type: text/x-patch; charset=UTF-8;
 name="0002-gnu-freedink-engine-Fix-sdl-hints.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="0002-gnu-freedink-engine-Fix-sdl-hints.patch"

From fb4f7827cb8aab1b5db3d8837981a5c0caa2b40c Mon Sep 17 00:00:00 2001
From: Jesse Gibbons <jgibbons2357+guix@HIDDEN>
Date: Mon, 10 Feb 2020 10:18:57 -0700
Subject: [PATCH 2/2] gnu: freedink-engine: Fix sdl hints.

* 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@HIDDEN>
+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
+
-- 
2.27.0


--------------402EDDFB4AD2DD8BE10F8CBB
Content-Type: text/x-patch; charset=UTF-8;
 name="0001-gnu-freedink-engine-Call-autoreconf.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="0001-gnu-freedink-engine-Call-autoreconf.patch"

From babb7bd41959a450ac3ab4a77e9bd36dea6d94fd Mon Sep 17 00:00:00 2001
From: Jesse Gibbons <jgibbons2357+guix@HIDDEN>
Date: Fri, 3 Jul 2020 16:54:21 -0600
Subject: [PATCH 1/2] gnu: freedink-engine: Call autoreconf.

* 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)
-- 
2.27.0


--------------402EDDFB4AD2DD8BE10F8CBB--




Information forwarded to guix-patches@HIDDEN:
bug#42462; Package guix-patches. Full text available.

Message received at 42462 <at> debbugs.gnu.org:


Received: (at 42462) by debbugs.gnu.org; 25 Jul 2020 08:25:13 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Jul 25 04:25:13 2020
Received: from localhost ([127.0.0.1]:49310 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1jzFUX-0007dR-3e
	for submit <at> debbugs.gnu.org; Sat, 25 Jul 2020 04:25:13 -0400
Received: from rezeros.cc ([45.76.207.221]:50122)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <iyzsong@HIDDEN>) id 1jzFUU-0007dA-Vl
 for 42462 <at> debbugs.gnu.org; Sat, 25 Jul 2020 04:25:12 -0400
Received: from localhost (<unknown> [2409:8a62:372:7010:f6ff:fbf4:a58a:891c])
 by rezeros.cc (OpenSMTPD) with ESMTPSA id 75fa0045
 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); 
 Sat, 25 Jul 2020 08:25:02 +0000 (UTC)
Received: from gift (localhost [127.0.0.1])
 by localhost (OpenSMTPD) with ESMTP id 5c23715a;
 Sat, 25 Jul 2020 08:24:51 +0000 (UTC)
From: iyzsong@HIDDEN (=?utf-8?B?5a6L5paH5q2m?=)
To: Jesse Gibbons <jgibbons2357@HIDDEN>
Subject: Re: [bug#42462] [PATCH 0/2] freedink: fix build
References: <b0a63440-08bb-d171-9de4-3579d5f6d099@HIDDEN>
Date: Sat, 25 Jul 2020 16:24:51 +0800
In-Reply-To: <b0a63440-08bb-d171-9de4-3579d5f6d099@HIDDEN> (Jesse Gibbons's
 message of "Tue, 21 Jul 2020 00:40:15 -0600")
Message-ID: <87lfj8t31o.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 42462
Cc: 42462 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Jesse Gibbons <jgibbons2357@HIDDEN> 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!




Information forwarded to guix-patches@HIDDEN:
bug#42462; Package guix-patches. Full text available.

Message received at 42462 <at> debbugs.gnu.org:


Received: (at 42462) by debbugs.gnu.org; 21 Jul 2020 06:42:59 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jul 21 02:42:59 2020
Received: from localhost ([127.0.0.1]:37581 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1jxlzK-0004Bq-RM
	for submit <at> debbugs.gnu.org; Tue, 21 Jul 2020 02:42:59 -0400
Received: from mail-pg1-f170.google.com ([209.85.215.170]:38746)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <jgibbons2357@HIDDEN>) id 1jxlzE-0004BX-T1
 for 42462 <at> debbugs.gnu.org; Tue, 21 Jul 2020 02:42:53 -0400
Received: by mail-pg1-f170.google.com with SMTP id e8so11486686pgc.5
 for <42462 <at> debbugs.gnu.org>; Mon, 20 Jul 2020 23:42:48 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
 h=from:subject:to:message-id:date:user-agent:mime-version
 :content-transfer-encoding:content-language;
 bh=NFmAqmxwl9yBSEuwVXDtsMHtzyQPpbV7/HKXuIdThn8=;
 b=bDdainpo8cKIFr4VXK2wL5Hc32QqQnxCSOL5QYHQWHq2KzsEhRhW4bXKEh40BOsKP3
 /m2/fFSYmlkPDmvc6Zs2YRyYHqBrkyHdj6lYJAPk/TEZVKNfdNqMBODcq6RxRwIDfc4i
 jRXzqVVATJTZubjC2WG5FgEMZMbsqPIsUvlWuZdTHk7bZ398exwsH8mYzG7ZWpPsrmDY
 N6rVs+/9X3Ge9uGVYfg+P1S+lnw/aDo8BoDg19f5KX0S2TG0pNOsZUCTGhbJMLfA1ML+
 MXt07/0xPNNlF8gTaqfw7V96aMFqNFFvIPoylIf1Q0s7nSQx86I6XeDvmVYw62sH6qU6
 auhg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:subject:to:message-id:date:user-agent
 :mime-version:content-transfer-encoding:content-language;
 bh=NFmAqmxwl9yBSEuwVXDtsMHtzyQPpbV7/HKXuIdThn8=;
 b=iXj+3MgNFEmpS5arSYXcetGEmMjjaLmzjQXDCmmqNykdp5kF9tVljWzTVcLqPtbEEH
 Xj1cKEbjNYhFjfzcbVq3zTjiz8zGhpElU/OxfVttfadUOBh47kzgxfhKv6DdTXdbGj1j
 brVCtbqVt/63Bj3Ofvxo6p67K5LG+SMNPIQiPFzvj+8wr4G/5FUsytWw9J3/U58gGLAl
 QgxAL6ps9IY1L2iUtpWMSjCaUGr7iyekzganSS9urvvgppNHqRzmHfsEuuzu6nrX5aKX
 z9mwAll0K8Xd8hVYIBE57f1f9NxunHT0YHK/KngcwLQakT0SwQxiQtIAS9AwN3Av70ny
 mARQ==
X-Gm-Message-State: AOAM532E+LW2i1lqBqrPr+dRjw2euccWagMaYvFK5S5UVMKKW2aSUxmn
 zXOXxlZWWwB4XVgIXfwgYsGekudj
X-Google-Smtp-Source: ABdhPJw1tCAzm+L5kXYNYAz65iNr5IFP+zheglWotul31qHfJLZTvWyNKd41sGlUmETC66jmybK3PA==
X-Received: by 2002:aa7:9ac3:: with SMTP id x3mr21992285pfp.261.1595313762861; 
 Mon, 20 Jul 2020 23:42:42 -0700 (PDT)
Received: from [192.168.1.25] ([38.141.58.134])
 by smtp.gmail.com with ESMTPSA id z5sm19268675pfn.117.2020.07.20.23.42.41
 for <42462 <at> debbugs.gnu.org>
 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
 Mon, 20 Jul 2020 23:42:42 -0700 (PDT)
From: Jesse Gibbons <jgibbons2357@HIDDEN>
Subject: [PATCH 2/2] gnu: freedink-engine: Fix sdl hints.
To: 42462 <at> debbugs.gnu.org
Message-ID: <417cb347-4ad9-016d-b018-e533a7215832@HIDDEN>
Date: Tue, 21 Jul 2020 00:42:41 -0600
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Icedove/68.10.0
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
Content-Language: en-US
X-Spam-Score: 0.3 (/)
X-Debbugs-Envelope-To: 42462
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.7 (/)

* 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@HIDDEN>
+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
+




Information forwarded to guix-patches@HIDDEN:
bug#42462; Package guix-patches. Full text available.

Message received at 42462 <at> debbugs.gnu.org:


Received: (at 42462) by debbugs.gnu.org; 21 Jul 2020 06:42:21 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jul 21 02:42:21 2020
Received: from localhost ([127.0.0.1]:37578 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1jxlyn-0004Ay-JE
	for submit <at> debbugs.gnu.org; Tue, 21 Jul 2020 02:42:21 -0400
Received: from mail-pl1-f174.google.com ([209.85.214.174]:44479)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <jgibbons2357@HIDDEN>) id 1jxlyl-0004Ah-Lj
 for 42462 <at> debbugs.gnu.org; Tue, 21 Jul 2020 02:42:20 -0400
Received: by mail-pl1-f174.google.com with SMTP id w17so9811743ply.11
 for <42462 <at> debbugs.gnu.org>; Mon, 20 Jul 2020 23:42:19 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
 h=from:subject:to:message-id:date:user-agent:mime-version
 :content-transfer-encoding:content-language;
 bh=UP3Yf1w+WecV7w2GgL15BGXcSrU/XZ54pc3fArKZwUY=;
 b=pUjXPFgoGU6FJCl6Rgk862ekengLprnITHnsBuCLHbKpJj6CHoFK4Ibukk7/sQDOai
 matRE3I2gpBjIk7OVm11nHigx3ciVxYtx98kXX9SJd9IjrF3gkhOweCUPAOrT/fnYCgQ
 sPAxBPCG0yy924LPrS0pBOuhUSSK1oCloLK9/ISs1nSYPRrV8R7wnH5S+m9NvOwuijsX
 bLRdgju3THSCAYYPWDdVAPTvqmF3cDNBheAAlbQ2ZMbkMouEP0gtYVBHE8VYr1iIB/+Y
 pIm2LVzvi6TWrremfMcymInnW33viPnh7L3d0Gq72FG7Rna12OoneNFwZWHCAe3YF3sC
 YJsQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:subject:to:message-id:date:user-agent
 :mime-version:content-transfer-encoding:content-language;
 bh=UP3Yf1w+WecV7w2GgL15BGXcSrU/XZ54pc3fArKZwUY=;
 b=fRVivoSxsYrIWxPSsRT36TZsMnjV4wPUrxTFheoMxqq/RRJNo6Np+P2El1UQFbVDKk
 WjfptswOH35AJnPa+c1gHRBqSb+QOh3hTAM9onIg5lF2sNZCeilujLG/lREJzUthY9pP
 vwutxEzFE/5KVVAMDMhVESFdoBYw4o2cgoEYhUxc0TJtE7yOKZyfMmI1TQERLPhVnZeb
 LusyODYnfpdOsVsWxvb4IcgBB6pg0mgFrg9UA6pY6F4Wdypv+lPmpw5mX+dj+etuL7/l
 cOZLpoiONBg+JWNyjgJg6Kn7ibDgsWkGMGCNVn5TJVlkFVsZhfcYSgjaD86fGmE649s7
 rkDg==
X-Gm-Message-State: AOAM53084F43qzTzuze0UOlBisgoHt4zmVh2+gLr7PSTeaLh1PegdNs6
 I8YqdJO4hfL0XacWNr939orhc2vX
X-Google-Smtp-Source: ABdhPJzUSGHptFKB8zB8DMvhqnBahEQ/VuPwv9c7BlLosR5Blb4eUIdwyEvZgk+vxj8AQ71S7oJkUQ==
X-Received: by 2002:a17:90b:24a:: with SMTP id
 fz10mr3211035pjb.36.1595313733691; 
 Mon, 20 Jul 2020 23:42:13 -0700 (PDT)
Received: from [192.168.1.25] ([38.141.58.134])
 by smtp.gmail.com with ESMTPSA id a2sm17328986pgf.53.2020.07.20.23.42.12
 for <42462 <at> debbugs.gnu.org>
 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
 Mon, 20 Jul 2020 23:42:13 -0700 (PDT)
From: Jesse Gibbons <jgibbons2357@HIDDEN>
Subject: [PATCH 1/2] gnu: freedink-engine: Call autoreconf.
To: 42462 <at> debbugs.gnu.org
Message-ID: <bb1b9195-e434-4525-4450-c709bee402be@HIDDEN>
Date: Tue, 21 Jul 2020 00:42:11 -0600
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Icedove/68.10.0
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
Content-Language: en-US
X-Spam-Score: 0.3 (/)
X-Debbugs-Envelope-To: 42462
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.7 (/)

* 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)




Information forwarded to guix-patches@HIDDEN:
bug#42462; Package guix-patches. Full text available.

Message received at submit <at> debbugs.gnu.org:


Received: (at submit) by debbugs.gnu.org; 21 Jul 2020 06:40:34 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jul 21 02:40:34 2020
Received: from localhost ([127.0.0.1]:37571 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1jxlwr-00047Q-1S
	for submit <at> debbugs.gnu.org; Tue, 21 Jul 2020 02:40:34 -0400
Received: from lists.gnu.org ([209.51.188.17]:57922)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <jgibbons2357@HIDDEN>) id 1jxlwq-00047J-8U
 for submit <at> debbugs.gnu.org; Tue, 21 Jul 2020 02:40:20 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:57870)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <jgibbons2357@HIDDEN>)
 id 1jxlwq-00060U-1m
 for guix-patches@HIDDEN; Tue, 21 Jul 2020 02:40:20 -0400
Received: from mail-pj1-x102b.google.com ([2607:f8b0:4864:20::102b]:34945)
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <jgibbons2357@HIDDEN>)
 id 1jxlwo-00067W-Hc
 for guix-patches@HIDDEN; Tue, 21 Jul 2020 02:40:19 -0400
Received: by mail-pj1-x102b.google.com with SMTP id f16so1173171pjt.0
 for <guix-patches@HIDDEN>; Mon, 20 Jul 2020 23:40:18 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
 h=to:from:subject:message-id:date:user-agent:mime-version
 :content-transfer-encoding:content-language;
 bh=fGmFUKtM8upE6WJP9EC7TVT3VapQQ9hTm1Lfjhle7o4=;
 b=sS8ybdTZvDPEK397WjimCMbSupwMr3vhHg64i8fC3GM4qCA2SzidtKN5cCiMzQWI+M
 HjNUMlFocERK7IvYk/u+AeMBOiVVpWGrUlPa+2cU+qf24zBQtCkGnZH1bnRmnZLoKa+/
 GumFLMo2G3Gw2l9qTeMncFo8Ek36cu1stfIK7ZXc1VlDVjPFHXZFKIftwDrhC07Bd2Yu
 K2GO5QH+dW4JobcTrYX43c2ojOGzycQqQwyiSKFKfRYXOCH3XVRUdLY5EfdDez0eZ1ld
 FzPRyVRRuwaN5+4WYNOxNz2rJruIGerEgAFp+KzooWahHG4BaEu27gQGm5zpbZFAcYUM
 vzZg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:to:from:subject:message-id:date:user-agent
 :mime-version:content-transfer-encoding:content-language;
 bh=fGmFUKtM8upE6WJP9EC7TVT3VapQQ9hTm1Lfjhle7o4=;
 b=YSPvujh47jlM4e9GsK9o9B03PW9+uJrVP+QlDHT5FyMhZc272QeQqTVH+2KU+/ATK9
 +Nmi3JDzlUw80QK2UJi0HJ2cnqFAvsLStDtCG5hqNFoY17SYKfJYUjGYr71/LhXxG82u
 ahvY2TEUWyFYCRRmUFn3ILQ1Sa3HQvBuJLd2fUU527bvfsfibUGZJh9fQUjApjSpNYPj
 L0hiRfXKmNZStyLk3Uiz9U3P1wDGWxPrS8RFpq8XYFqvsNvuYD26iYBtWYxRMFOtACo2
 C0/7wXrNxhcPhzOCvAxb9LQYDz1ltRGAmiexDBfaa/uxWqy4u1rE4KUKPNofvZnnWuwa
 lxFQ==
X-Gm-Message-State: AOAM5329SuyLoAuxDsBIvyqriIp9ITEJgrgbHQo+3sWZUBl6HwJMLD7V
 pafDVxbnpYzOmCZt6kCqY5A3DZz9
X-Google-Smtp-Source: ABdhPJyGjRE45d3AU/Js1hxbOiz5VPKK0znOaAt6sphlR75hfqTaPEGk1Z9tri44RGnX2SMiftvhJA==
X-Received: by 2002:a17:90a:ec13:: with SMTP id
 l19mr2838438pjy.81.1595313616714; 
 Mon, 20 Jul 2020 23:40:16 -0700 (PDT)
Received: from [192.168.1.25] ([38.141.58.134])
 by smtp.gmail.com with ESMTPSA id y24sm20021457pfp.217.2020.07.20.23.40.15
 for <guix-patches@HIDDEN>
 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
 Mon, 20 Jul 2020 23:40:16 -0700 (PDT)
To: guix-patches@HIDDEN
From: Jesse Gibbons <jgibbons2357@HIDDEN>
Subject: [PATCH 0/2] freedink: fix build
Message-ID: <b0a63440-08bb-d171-9de4-3579d5f6d099@HIDDEN>
Date: Tue, 21 Jul 2020 00:40:15 -0600
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Icedove/68.10.0
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
Content-Language: en-US
Received-SPF: pass client-ip=2607:f8b0:4864:20::102b;
 envelope-from=jgibbons2357@HIDDEN; helo=mail-pj1-x102b.google.com
X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache.
 That's all we know.
X-Spam_score_int: -17
X-Spam_score: -1.8
X-Spam_bar: -
X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
 FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001,
 RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
 SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 0.9 (/)
X-Debbugs-Envelope-To: submit
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.7 (/)

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





Acknowledgement sent to Jesse Gibbons <jgibbons2357@HIDDEN>:
New bug report received and forwarded. Copy sent to guix-patches@HIDDEN. Full text available.
Report forwarded to guix-patches@HIDDEN:
bug#42462; Package guix-patches. Full text available.
Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Last modified: Wed, 5 Aug 2020 17:45:02 UTC

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