From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id AKYALDumIF/BYAAA0tVLHw (envelope-from ) for ; Tue, 28 Jul 2020 22:27:07 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id wE3jJzumIF8NSwAAB5/wlQ (envelope-from ) for ; Tue, 28 Jul 2020 22:27:07 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id B32C89400BF for ; Tue, 28 Jul 2020 22:27:06 +0000 (UTC) Received: from localhost ([::1]:38978 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0Y3s-0006wd-Ob for larch@yhetil.org; Tue, 28 Jul 2020 18:27:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55652) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0Xv8-0005Lb-Et for guix-patches@gnu.org; Tue, 28 Jul 2020 18:18:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47819) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k0Xv8-00053U-6h for guix-patches@gnu.org; Tue, 28 Jul 2020 18:18:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k0Xv8-00056v-2e for guix-patches@gnu.org; Tue, 28 Jul 2020 18:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42462] (re-send) [PATCH 0/2] freedink: fix build References: In-Reply-To: Resent-From: Jesse Gibbons Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 28 Jul 2020 22:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42462 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42462@debbugs.gnu.org Received: via spool by 42462-submit@debbugs.gnu.org id=B42462.159597467119626 (code B ref 42462); Tue, 28 Jul 2020 22:18:02 +0000 Received: (at 42462) by debbugs.gnu.org; 28 Jul 2020 22:17:51 +0000 Received: from localhost ([127.0.0.1]:59365 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k0Xut-00056O-5V for submit@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 ) id 1k0XNv-0004G8-0r for 42462@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= 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 Message-ID: <624a56fa-d0b3-d47a-faec-4c9bb1cb515e@byui.edu> 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: 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-Mailman-Approved-At: Tue, 28 Jul 2020 18:17:46 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-Mailman-Approved-At: Tue, 28 Jul 2020 18:26:47 -0400 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Jesse Gibbons , Jesse Gibbons via Guix-patches From: Jesse Gibbons via Guix-patches via X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=byui.edu header.s=selector2 header.b=bN9DsFrw; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 1.99 X-TUID: thO5yWZEG65h --------------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 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 +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 +. + +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 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--