For discussion of Alpine Linux development and developer support

4 2

[alpine-devel] [PATCH] Move motif to main

Isaac Dunham
Details
Message ID
<20141109203416.GA1896@newbook>
Sender timestamp
1415565262
DKIM signature
missing
Download raw message
In my testing, Motif seems to be working well.
Is there any objection to moving it to main?

The attached patch will move it to main and add myself as 
contributor/maintainer, since that was my intent when I submitted it.

Thanks,
Isaac Dunham
Isaac Dunham
Details
Message ID
<20141110152005.GA1819@newbook>
In-Reply-To
<20141110085457.597c5994@ncopa-desktop.alpinelinux.org> (view parent)
Sender timestamp
1415632807
DKIM signature
missing
Download raw message
On Mon, Nov 10, 2014 at 08:54:57AM +0100, Natanael Copa wrote:
> On Sun, 9 Nov 2014 12:34:22 -0800
> Isaac Dunham <ibid.ag@gmail.com> wrote:
> 
> > In my testing, Motif seems to be working well.
> > Is there any objection to moving it to main?
> > 
> > The attached patch will move it to main and add myself as 
> > contributor/maintainer, since that was my intent when I submitted it.
> > 
> > Thanks,
> > Isaac Dunham
> 
> I'd be happy to move it to main.
> 
> I get this error though:
> 
> error: patch failed: testing/motif/11-fix_underlinking.patch:1
> error: testing/motif/11-fix_underlinking.patch: patch does not apply
> Patch failed at 0001 main/motif: move from testing
> 
> 
> -nc

Looks like 11-fix_underlinking.patch in git has ^M (\r) at eol for the 
comment; probably getting mutilated on the way.

I'm not sure how to avoid that, other than sending the patch compressed.
And I don't know for sure if that's enough, but I'll try.
(If you could run "dos2unix -u" on the file somewhere along the line, 
it would be nice...)

Thanks,
Isaac Dunham
Natanael Copa
Details
Message ID
<20141110085457.597c5994@ncopa-desktop.alpinelinux.org>
In-Reply-To
<20141109203416.GA1896@newbook> (view parent)
Sender timestamp
1415606097
DKIM signature
missing
Download raw message
On Sun, 9 Nov 2014 12:34:22 -0800
Isaac Dunham <ibid.ag@gmail.com> wrote:

> In my testing, Motif seems to be working well.
> Is there any objection to moving it to main?
> 
> The attached patch will move it to main and add myself as 
> contributor/maintainer, since that was my intent when I submitted it.
> 
> Thanks,
> Isaac Dunham

I'd be happy to move it to main.

I get this error though:

error: patch failed: testing/motif/11-fix_underlinking.patch:1
error: testing/motif/11-fix_underlinking.patch: patch does not apply
Patch failed at 0001 main/motif: move from testing


-nc


---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---
Natanael Copa
Details
Message ID
<20141110090733.291c4416@ncopa-desktop.alpinelinux.org>
In-Reply-To
<20141109203416.GA1896@newbook> (view parent)
Sender timestamp
1415606853
DKIM signature
missing
Download raw message
On Sun, 9 Nov 2014 12:34:22 -0800
Isaac Dunham <ibid.ag@gmail.com> wrote:

> In my testing, Motif seems to be working well.
> Is there any objection to moving it to main?
> 
> The attached patch will move it to main and add myself as 
> contributor/maintainer, since that was my intent when I submitted it.
> 
> Thanks,
> Isaac Dunham

just a little tip on how patches with request for comments can be done.


# create a dir dedicated for patches
mkdir -p ~/patches

# create a single patch from HEAD
git format-patch -o ~/patches -1

now edit the created patch and add your comments/questions that you
don't want be included in the commit under the '---'.

For example:

From 15191bb59e1374d830b6f50cf13068130baf9973 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Sun, 9 Nov 2014 19:42:24 +0000
Subject: [PATCH] testing/firefox: upgrade to 33.0.3

---
<insert your comment/question here>
Text here will not be included in commit message.

 testing/firefox/APKBUILD | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/testing/firefox/APKBUILD b/testing/firefox/APKBUILD
index d7b6248..e885fcd 100644
--- a/testing/firefox/APKBUILD
+++ b/testing/firefox/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=firefox
-pkgver=33.0.2
+pkgver=33.0.3
 _pkgver=$pkgver
 _xulver=$pkgver
 pkgrel=0
@@ -167,7 +167,7 @@ dev() {
...

And after that use:

 git send-email --to alpine-devel@lists.alpinelinux.org ~/patches/0001-testing-.....


An alternate, quicker way to do it is to do:

 git send-email --annotate -1

Which will open a text editor before sending it (but will not save your
changes locally in case you type wrong password for smtp auth)

-nc


---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---
Natanael Copa
Details
Message ID
<20141111081338.2bae52a3@ncopa-desktop.alpinelinux.org>
In-Reply-To
<20141110152005.GA1819@newbook> (view parent)
Sender timestamp
1415690018
DKIM signature
missing
Download raw message
On Mon, 10 Nov 2014 07:20:07 -0800
Isaac Dunham <ibid.ag@gmail.com> wrote:

> On Mon, Nov 10, 2014 at 08:54:57AM +0100, Natanael Copa wrote:
> > On Sun, 9 Nov 2014 12:34:22 -0800
> > Isaac Dunham <ibid.ag@gmail.com> wrote:
> > 
> > > In my testing, Motif seems to be working well.
> > > Is there any objection to moving it to main?
> > > 
> > > The attached patch will move it to main and add myself as 
> > > contributor/maintainer, since that was my intent when I submitted it.
> > > 
> > > Thanks,
> > > Isaac Dunham
> > 
> > I'd be happy to move it to main.
> > 
> > I get this error though:
> > 
> > error: patch failed: testing/motif/11-fix_underlinking.patch:1
> > error: testing/motif/11-fix_underlinking.patch: patch does not apply
> > Patch failed at 0001 main/motif: move from testing
> > 
> > 
> > -nc
> 
> Looks like 11-fix_underlinking.patch in git has ^M (\r) at eol for the 
> comment; probably getting mutilated on the way.
> 
> I'm not sure how to avoid that, other than sending the patch compressed.
> And I don't know for sure if that's enough, but I'll try.
> (If you could run "dos2unix -u" on the file somewhere along the line, 
> it would be nice...)

I don't know what happened but the .gz didnt apply either. Maybe the
patch was broken somehow?

This is how i solved/worked around it:

In claws mail, i did "show source" of your original email (with the
patch as attachment). Marked all (ctrl-a), copy (ctrl-c), in terminal i
ran 'git am', paste (ctrl-shift-v) and ctrl-d for EOF.

The funny thing is that this worked, except the commit message was your
email subject and body with the patch headers as a part of the body. So
I just 'git commit --amend' and used the commit message from patch
header.

I hope it is correct.

Thanks!
> 
> Thanks,
> Isaac Dunham
> 



---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---