Re: [SoaS] Issue with telepathy-salut

2020-12-23 Thread Chihurumnaya Ibiam 
On Tue, Dec 22, 2020 at 8:53 PM James Cameron  wrote:

> Summary: you are conflating git patches with diff patches.
>

Agreed, makes sense now.


> On Tue, Dec 22, 2020 at 12:55:49PM +0100, Chihurumnaya Ibiam wrote:
> > telepathy-salut-0.8.1.tar.gz does contain lib/ext/wocky as a
> > directory with files in it and it has the github repo as it's
> > upstream and that doesn't contain lib/ext /wocky as a directory but
> > as a wocky submodule. I don't see a reason why the git submodule is
> > affecting it at the moment
>
> It has affected it because of how you prepared the patch using git
> instead of using diff.
>

Yeah I normally prepare such patches with git as most of the time the
upstream on github is still active.
Now I know different.


> > Yeah I haven't created an PRs as I'm trying to get it to build
> > locally first, you can find the patch here.
>
> The patch is in error because;
>
> (a) it is generated using git(1), and contains no content except
> submodule hashes, yet you are asking to apply using patch(1),
>
> (b) unlike patch0, it does not have complete file paths.
>
> You should generate the patch again, using diff -ru, between two
> clones that have been prepared to the corresponding states.
>

Yeah I will.

>
> > The commit upstream shows that there was a change but the change was
> > to a submodule, the source files from telepathyfreedesktop.org
> > contains lib/ext/wocky but the source on github doesn't and that
> > explains the error from build.log
>
> You should not use the tar.gz from github, because it
>
> (a) does not equal the distributed software; therefore unsupported,
>
> (b) does not contain autoconf prepared source; therefore broken, and
>
> (c) does not have submodules expanded; therefore incomplete.
>
> > I used rpmbuild to build just the %prep section and ls shows there
> > files in lib /ext/wocky but still throws same error when applying
> > the patch and I don't get why right now but I think it's because the
> > patch is pointing to a submodule commit.
>
> No, it is because the patch is not intended for processing by
> patch(1).
>

Yeah, makes sense now.


> The patch(1) command has no clue (or glue) for handling git patches in
> that way.
>

I understand now.


> Hope that helps!
>

Yeah, thanks a lot.

>
> --
> James Cameron
> https://quozl.linux.org.au/



-- 

Ibiam Chihurumnaya
ibiamchihurumn...@gmail.com
___
SoaS mailing list
SoaS@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/soas

Re: [SoaS] Issue with telepathy-salut

2020-12-22 Thread James Cameron 
Summary: you are conflating git patches with diff patches.

On Tue, Dec 22, 2020 at 12:55:49PM +0100, Chihurumnaya Ibiam wrote:
> telepathy-salut-0.8.1.tar.gz does contain lib/ext/wocky as a
> directory with files in it and it has the github repo as it's
> upstream and that doesn't contain lib/ext /wocky as a directory but
> as a wocky submodule. I don't see a reason why the git submodule is
> affecting it at the moment

It has affected it because of how you prepared the patch using git
instead of using diff.

> Yeah I haven't created an PRs as I'm trying to get it to build
> locally first, you can find the patch here.

The patch is in error because;

(a) it is generated using git(1), and contains no content except
submodule hashes, yet you are asking to apply using patch(1),

(b) unlike patch0, it does not have complete file paths.

You should generate the patch again, using diff -ru, between two
clones that have been prepared to the corresponding states.

> The commit upstream shows that there was a change but the change was
> to a submodule, the source files from telepathyfreedesktop.org
> contains lib/ext/wocky but the source on github doesn't and that
> explains the error from build.log

You should not use the tar.gz from github, because it

(a) does not equal the distributed software; therefore unsupported,

(b) does not contain autoconf prepared source; therefore broken, and

(c) does not have submodules expanded; therefore incomplete.

> I used rpmbuild to build just the %prep section and ls shows there
> files in lib /ext/wocky but still throws same error when applying
> the patch and I don't get why right now but I think it's because the
> patch is pointing to a submodule commit.

No, it is because the patch is not intended for processing by
patch(1).

The patch(1) command has no clue (or glue) for handling git patches in
that way.

Hope that helps!

-- 
James Cameron
https://quozl.linux.org.au/
___
SoaS mailing list
SoaS@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/soas

Re: [SoaS] Issue with telepathy-salut

2020-12-22 Thread Chihurumnaya Ibiam 
On Mon, Dec 21, 2020 at 9:04 PM James Cameron  wrote:

> I don't believe it, because telepathy-salut-0.8.1.tar.gz does contain
> lib/ext/wocky, and it is a directory which contains files.  There's no
> reason why a git submodule should affect the tar.gz in that way.
>

telepathy-salut-0.8.1.tar.gz does contain lib/ext/wocky as a directory with
files in it
and it has the github repo 
as it's upstream and that doesn't contain lib/ext/wocky as a directory but
as
a wocky submodule. I don't see a reason why the git submodule is affecting
it at the moment


>
> It seems more likely the patch is in error.  How can I see the patch?
> https://src.fedoraproject.org/ didn't seem to have it.
>

Yeah I haven't created an PRs as I'm trying to get it to build locally
first, you can find the patch here 
.

The commit upstream shows that there was a change but the change was to a
submodule,
the source files from telepathyfreedesktop.org contains lib/ext/wocky but
the source on github doesn't and
that explains the error from build.log


> You may place temporary shell commands for diagnosis in the %prep
> section before the %patch1.  Such as ls(1) or file(1).  This will give
> you output in the build log that you can use to diagnose further.
>

I used rpmbuild to build just the %prep section and ls shows there files in
lib/ext/wocky
but still throws same error when applying the patch and I don't get why
right now but I think it's because
the patch is pointing to a submodule commit.


> You should also consider building by hand using rpmbuild, as that will
> speed up your iterations for solving the problem.  Once you have it
> solved, go back to using the Fedora infrastructure to build.
>
> On Mon, Dec 21, 2020 at 04:50:39PM +0100, Chihurumnaya Ibiam wrote:
> > This isn't a problem on my path as I'm not trying to build
> telepathy-salut from
> > the source code so I didn't clone telepathy-salut,
> > building telepathy-salut locally and on koji doesn't work because of
> what I
> > stated above, I should've included the error
> > I got from the build log earlier;
> >
> > Patch #1 (update-wocky-to-fix-openssl1.1-build-issue.patch):
> > + echo 'Patch #1 (update-wocky-to-fix-openssl1.1-build-issue.patch):'
> > + /usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0
> > File lib/ext/wocky is not a regular file -- refusing to patch
> >
> > You can find the full build log [1]here.
> >
> > The error seems to happen because in the source code, [2]lib/ext/wocky
> is pointing to a particular commit in the wocky submodule,
> >
> > hence the patch failing as that's not a regular file.
> >
> > --
> >
> > Ibiam Chihurumnaya
> > [3]ibiamchihurumn...@gmail.com
> >
> > On Sat, Dec 19, 2020 at 12:43 AM James Cameron <[4]qu...@laptop.org>
> wrote:
> >
> > On Thu, Dec 17, 2020 at 12:52:11PM +0100, Chihurumnaya Ibiam wrote:
> > > Hi Everyone,
> > >
> > > I'm currently working on fixing telepathy-salut to use openssl 1.0
> > > which has been fixed upstream in this [1]commit but the problem is,
> > > lib/ext/wocky points to a particular commit in the wocky submodule
> > > of TelepathyIM hence the patch fails as it isn't a regular file,
> > > it's supposed to be a directory but in this case it's empty as it's
> > > pointing to a particular commit.
> >
> > When the wocky directory is empty, that suggests the submodule has
> not
> > been checked out.
> >
> > > What are the possible ways to fix this?
> >
> > When cloning, use --recurse-submodules.  Or, use `git submodule
> update
> > --init --recursive` after cloning.
> >
> > Should you be preparing a patch for packaging, you can also work
> > around such git problems by using a recursive diff between two clones
> > of wocky.  You may need to tweak the diffs with sed.
> >
> > --
> > James Cameron
> > [5]http://quozl.netrek.org/
> >
> > References:
> >
> > [1]
> https://kojipkgs.fedoraproject.org//work/tasks/1714/57311714/build.log
> > [2]
> https://github.com/TelepathyIM/wocky/tree/64062d2f0119b89d15e7bb0e0f6fa54ec23ff7f8
> > [3] mailto:ibiamchihurumn...@gmail.com
> > [4] mailto:qu...@laptop.org
> > [5] http://quozl.netrek.org/
>
> --
> James Cameron
> https://quozl.linux.org.au/




-- 

Ibiam Chihurumnaya
ibiamchihurumn...@gmail.com
___
SoaS mailing list
SoaS@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/soas

Re: [SoaS] Issue with telepathy-salut

2020-12-21 Thread James Cameron 
I don't believe it, because telepathy-salut-0.8.1.tar.gz does contain
lib/ext/wocky, and it is a directory which contains files.  There's no
reason why a git submodule should affect the tar.gz in that way.

It seems more likely the patch is in error.  How can I see the patch?
https://src.fedoraproject.org/ didn't seem to have it.

You may place temporary shell commands for diagnosis in the %prep
section before the %patch1.  Such as ls(1) or file(1).  This will give
you output in the build log that you can use to diagnose further.

You should also consider building by hand using rpmbuild, as that will
speed up your iterations for solving the problem.  Once you have it
solved, go back to using the Fedora infrastructure to build.

On Mon, Dec 21, 2020 at 04:50:39PM +0100, Chihurumnaya Ibiam wrote:
> This isn't a problem on my path as I'm not trying to build telepathy-salut 
> from
> the source code so I didn't clone telepathy-salut,
> building telepathy-salut locally and on koji doesn't work because of what I
> stated above, I should've included the error
> I got from the build log earlier;
> 
> Patch #1 (update-wocky-to-fix-openssl1.1-build-issue.patch):
> + echo 'Patch #1 (update-wocky-to-fix-openssl1.1-build-issue.patch):'
> + /usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0
> File lib/ext/wocky is not a regular file -- refusing to patch
> 
> You can find the full build log [1]here.
> 
> The error seems to happen because in the source code, [2]lib/ext/wocky is 
> pointing to a particular commit in the wocky submodule,
> 
> hence the patch failing as that's not a regular file.
> 
> --
> 
> Ibiam Chihurumnaya
> [3]ibiamchihurumn...@gmail.com
> 
> On Sat, Dec 19, 2020 at 12:43 AM James Cameron <[4]qu...@laptop.org> wrote:
> 
> On Thu, Dec 17, 2020 at 12:52:11PM +0100, Chihurumnaya Ibiam wrote:
> > Hi Everyone,
> >
> > I'm currently working on fixing telepathy-salut to use openssl 1.0
> > which has been fixed upstream in this [1]commit but the problem is,
> > lib/ext/wocky points to a particular commit in the wocky submodule
> > of TelepathyIM hence the patch fails as it isn't a regular file,
> > it's supposed to be a directory but in this case it's empty as it's
> > pointing to a particular commit.
> 
> When the wocky directory is empty, that suggests the submodule has not
> been checked out.
> 
> > What are the possible ways to fix this?
> 
> When cloning, use --recurse-submodules.  Or, use `git submodule update
> --init --recursive` after cloning.
> 
> Should you be preparing a patch for packaging, you can also work
> around such git problems by using a recursive diff between two clones
> of wocky.  You may need to tweak the diffs with sed.
> 
> --
> James Cameron
> [5]http://quozl.netrek.org/
> 
> References:
> 
> [1] https://kojipkgs.fedoraproject.org//work/tasks/1714/57311714/build.log
> [2] 
> https://github.com/TelepathyIM/wocky/tree/64062d2f0119b89d15e7bb0e0f6fa54ec23ff7f8
> [3] mailto:ibiamchihurumn...@gmail.com
> [4] mailto:qu...@laptop.org
> [5] http://quozl.netrek.org/

-- 
James Cameron
https://quozl.linux.org.au/
___
SoaS mailing list
SoaS@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/soas

Re: [SoaS] Issue with telepathy-salut

2020-12-21 Thread Chihurumnaya Ibiam 
This isn't a problem on my path as I'm not trying to build telepathy-salut
from the source code so I didn't clone telepathy-salut,
building telepathy-salut locally and on koji doesn't work because of what I
stated above, I should've included the error
I got from the build log earlier;

Patch #1 (update-wocky-to-fix-openssl1.1-build-issue.patch):
+ echo 'Patch #1 (update-wocky-to-fix-openssl1.1-build-issue.patch):'
+ /usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0
File lib/ext/wocky is not a regular file -- refusing to patch


You can find the full build log here
.

The error seems to happen because in the source code, lib/ext/wocky

is pointing to a particular commit in the wocky submodule,

hence the patch failing as that's not a regular file.


-- 

Ibiam Chihurumnaya
ibiamchihurumn...@gmail.com



On Sat, Dec 19, 2020 at 12:43 AM James Cameron  wrote:

> On Thu, Dec 17, 2020 at 12:52:11PM +0100, Chihurumnaya Ibiam wrote:
> > Hi Everyone,
> >
> > I'm currently working on fixing telepathy-salut to use openssl 1.0
> > which has been fixed upstream in this [1]commit but the problem is,
> > lib/ext/wocky points to a particular commit in the wocky submodule
> > of TelepathyIM hence the patch fails as it isn't a regular file,
> > it's supposed to be a directory but in this case it's empty as it's
> > pointing to a particular commit.
>
> When the wocky directory is empty, that suggests the submodule has not
> been checked out.
>
> > What are the possible ways to fix this?
>
> When cloning, use --recurse-submodules.  Or, use `git submodule update
> --init --recursive` after cloning.
>
> Should you be preparing a patch for packaging, you can also work
> around such git problems by using a recursive diff between two clones
> of wocky.  You may need to tweak the diffs with sed.
>
> --
> James Cameron
> http://quozl.netrek.org/
>
___
SoaS mailing list
SoaS@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/soas

Re: [SoaS] Issue with telepathy-salut

2020-12-18 Thread James Cameron 
On Thu, Dec 17, 2020 at 12:52:11PM +0100, Chihurumnaya Ibiam wrote:
> Hi Everyone,
> 
> I'm currently working on fixing telepathy-salut to use openssl 1.0
> which has been fixed upstream in this [1]commit but the problem is,
> lib/ext/wocky points to a particular commit in the wocky submodule
> of TelepathyIM hence the patch fails as it isn't a regular file,
> it's supposed to be a directory but in this case it's empty as it's
> pointing to a particular commit.

When the wocky directory is empty, that suggests the submodule has not
been checked out.

> What are the possible ways to fix this?

When cloning, use --recurse-submodules.  Or, use `git submodule update
--init --recursive` after cloning.

Should you be preparing a patch for packaging, you can also work
around such git problems by using a recursive diff between two clones
of wocky.  You may need to tweak the diffs with sed.

-- 
James Cameron
http://quozl.netrek.org/
___
SoaS mailing list
SoaS@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/soas