X-Authentication-Warning: delorie.com: mail set sender to geda-user-bounces using -f
X-Recipient: geda-user AT delorie DOT com
X-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
	messagingengine.com; h=content-transfer-encoding:content-type
	:date:from:in-reply-to:message-id:mime-version:references
	:reply-to:subject:to:x-me-proxy:x-me-proxy:x-me-sender
	:x-me-sender:x-sasl-enc; s=fm1; bh=NVKboztSDVLE9EOYn5fdLbmAZF5Tu
	b0chIWGiUO1Fm0=; b=cOweWlRx3mZrTb+eKTfWq+xE9SIePh3lKmdc7uORcuXdN
	I9pXYngbnnpMzo8dV/E1RDy+nZMEInD7nH4EC1XLFDFbzhm4iwCEMobUpQBIl4eF
	6PMKhcN9ywQZw1jbCHSoqBn/q6CSAAJeMpguqibk7FI49A2UUIGN7XoBl/xEGvOc
	LDQpDUiNRLBSHOkQKg2NFaNqMI4T1KI498RhLN973cQonPDRPERdDf/aVgkuf6UV
	PQGjocXzEoeflKgRab1NDKmjWHfphp0y28NTeIe9+INV+8hy6c+EossDqa2pTq08
	aGGn5jdxsly7admbVRTV3ffVGnd3MoqIE72vzmviQ==
X-ME-Sender: <xms:WNnfX8MO_wbpPlavIiQmQJnT-3ARogCdLAiTTyobMIIgauS_oah3lA>
    <xme:WNnfXy-Xlh_xyX7kGPvfvnhryNc2LKDKDCx4BZjRt-AuT4b9-145JViQNKmsvJ32g
    Z_46MQw_bDPlRDhDA>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrvddtuddgtdejucetufdoteggodetrfdotf
    fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen
    uceurghilhhouhhtmecufedttdenucenucfjughrpehruffvfhfhkffffgggjggtgfesth
    ekredttdefjeenucfhrhhomhepifhirhhvihhnucfjvghrrhcuoehghhgvrhhrlhesfhgr
    shhtmhgrihhlrdgtohhmqeenucggtffrrghtthgvrhhnpeetvdetfefgjeekgfdukeekie
    eggfevtdevtdevjeefteekgedtiedtvddvveeffeenucffohhmrghinhepghgvuggrqdhp
    rhhojhgvtghtrdhorhhgnecukfhppedutdekrddvudehrdduleehrddvtdehnecuvehluh
    hsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepghhhvghrrhhlsehf
    rghsthhmrghilhdrtghomh
X-ME-Proxy: <xmx:WNnfXzTxptfzmTn3wyB1k4aY5YGutxcehRpXAWgVICnNgiCpB7uQBw>
    <xmx:WNnfX0vXnIcqad3oewXzSOOcFnTes6FvamZk18DUnKkqlsj6u5MbBw>
    <xmx:WNnfX0fRnGZEPXfDAPMwbDNSkf3G_QsqJDIptNdp7JEmyBhYSUSOew>
    <xmx:WdnfX-puixzUsKVa_jCWfCzE8_sGNXLR4ZfduTXE3XezuRKG_zcu26Chubc>
Subject: Re: [geda-user] Problem with Guile 2.2.4 dependency for gEDA 1.10.1.
To: geda-user AT delorie DOT com
References: <f5ab1b6f-dbf3-4be3-a43f-eb74b32b7a51 AT fastmail DOT com>
 <alpine DOT DEB DOT 2 DOT 21 DOT 2012190043450 DOT 7556 AT nimbus>
 <alpine DOT DEB DOT 2 DOT 21 DOT 2012191400380 DOT 24569 AT nimbus>
 <20201219180603 DOT 22277 DOT qmail AT stuge DOT se>
 <a3f3b383-ebf2-fc8a-6405-e1d69c2a6838 AT epilitimus DOT com>
 <20201219205836 DOT 23919 DOT qmail AT stuge DOT se>
 <ccee0a93-a553-f351-901b-1f986a8eba2e AT epilitimus DOT com>
 <alpine DOT DEB DOT 2 DOT 21 DOT 2012201503460 DOT 17210 AT nimbus>
From: "Girvin Herr (gherrl AT fastmail DOT com) [via geda-user AT delorie DOT com]" <geda-user AT delorie DOT com>
Message-ID: <1277282c-52c2-6ab9-5e7b-ce4fdeb95b84@fastmail.com>
Date: Sun, 20 Dec 2020 15:05:59 -0800
User-Agent: Mozilla/5.0 (X11; Linux i686; rv:68.0) Gecko/20100101
 Thunderbird/68.12.0
MIME-Version: 1.0
In-Reply-To: <alpine.DEB.2.21.2012201503460.17210@nimbus>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 8bit
Content-Language: en-US
Reply-To: geda-user AT delorie DOT com
Errors-To: nobody AT delorie DOT com
X-Mailing-List: geda-user AT delorie DOT com
X-Unsubscribes-To: listserv AT delorie DOT com
Precedence: bulk


On 12/20/20 6:18 AM, Roland Lutz wrote:
> <snip> 

> I pushed a patch to the branch `stable-1.10' which allows compiling 
> gEDA/gaf with either version of Guile:
>
> http://git.geda-project.org/geda-gaf/commit/?h=stable-1.10&id=288cb8fd
>
> Please use this instead of the provisional patch I posted earlier.
>
> Roland
>
Roland,

I am having problems with the html patch from your URL above. I saved 
the html page and used OpenOffice to convert it to plain text. I then 
had to do a lot of editing to get patch to even get past the first file 
(configure.ac). Now it is giving errors on each of the subsequent files.

FYI, I am trying to apply the patch to the unpacked 1.10.1 source 
tarball from within my Slackware package buildscript.

I am using "patch --dry-run --verbose -p1 -i <patch-file>". If there is 
anything wrong with this, I would appreciate your experience.

Here is a snippet of the beginning of the build:

------------------------------------

514:$./geda-gaf.SlackBuild -u

geda-gaf.SlackBuild: User-space build.
geda-gaf.SlackBuild: Creating Slackware package for geda-gaf version 
1.10.1...
geda-gaf.SlackBuild: Checking sha256sum of geda-gaf-1.10.1.tar.gz.sha256...

     (pwd test output verifies it is in the correct directory:)

/home/gherr/build/geda-gaf-1.10.1

     (Now the output of patch:)

Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|
|author        Roland Lutz <rlutz AT hedmen DOT org>    2020-12-20 13:53:45 (GMT)
|committer    Roland Lutz <rlutz AT hedmen DOT org>    2020-12-20 13:53:45 (GMT)
|commit        288cb8fd74ae520cb54bee157801c24756de19f4 (patch) 
(side-by-side diff)
|tree        63c44c2abacdbb8944697dd789fe62ea9d8c0535
|parent        9fbe269f551c2cd07a438101eca2ee3335e9e4fa (diff)
|
|Re-add support for Guile 2.0 stable-1.10
|
|Diffstat (more/less context) (ignore whitespace changes)
|-rw-r--r--    configure.ac            2
|-rw-r--r--    m4/geda-guile.m4        15
|-rw-r--r--    xorn/configure.ac        4
|-rw-r--r--    xorn/src/cpython/guile/module.h    3
|-rw-r--r--    xorn/src/cpython/guile/proc.c    19
|-rw-r--r--    xorn/src/cpython/guile/py2scm.c    4
|-rw-r--r--    xorn/src/cpython/guile/scm2py.c    3
|
|7 files changed, 43 insertions, 7 deletions
|
|diff --git a/configure.ac b/configure.ac
|index d03ba1b..1e66194 100644
|--- a/configure.ac
|+++ b/configure.ac
--------------------------
checking file configure.ac
Using Plan A...
Hunk #1 succeeded at 81.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|
|diff --git a/m4/geda-guile.m4 b/m4/geda-guile.m4
|index ea3f243..bbdf67b 100644
|--- a/m4/geda-guile.m4
|+++ b/m4/geda-guile.m4
--------------------------
checking file m4/geda-guile.m4
Using Plan A...
Hunk #1 FAILED at 34.
1 out of 1 hunk FAILED
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------

...

The remaining files are similar to the last one above.

Can you send me a plain text patch file to verify what I am doing is 
correct? I am not a patch expert, but I have successfully applied 
supplied patches in the past. Thanks.

Girvin