From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 4AI7KEatIF8oWwAA0tVLHw (envelope-from ) for ; Tue, 28 Jul 2020 22:57:10 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id mDHlI0atIF9wLQAAbx9fmQ (envelope-from ) for ; Tue, 28 Jul 2020 22:57:10 +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 D7797940391 for ; Tue, 28 Jul 2020 22:57:09 +0000 (UTC) Received: from localhost ([::1]:45120 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0YWy-0003aO-DK for larch@yhetil.org; Tue, 28 Jul 2020 18:57:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38334) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0YWs-0003Zz-0i for guix-patches@gnu.org; Tue, 28 Jul 2020 18:57:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47873) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k0YWr-0002cR-Na for guix-patches@gnu.org; Tue, 28 Jul 2020 18:57:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k0YWr-00063r-Lz for guix-patches@gnu.org; Tue, 28 Jul 2020 18:57:01 -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:57:01 +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.159597698823261 (code B ref 42462); Tue, 28 Jul 2020 22:57:01 +0000 Received: (at 42462) by debbugs.gnu.org; 28 Jul 2020 22:56:28 +0000 Received: from localhost ([127.0.0.1]:59419 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k0YWG-000634-D5 for submit@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 ) id 1k0YWB-00062o-Rz for 42462@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@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@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 28 Jul 2020 15:56:12 -0700 (PDT) From: Jesse Gibbons Message-ID: 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -0.7 (/) 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" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=gmail.com header.s=20161025 header.b=DcvR5sNO; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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: 0.09 X-TUID: 3Auf8zqCPItj 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 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 --------------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 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--