* [PR PATCH] Upgrade Yaru++ to the new version 4.0
@ 2020-08-23 20:11 gusbemacbe
2020-08-23 20:14 ` [PR PATCH] [Merged]: " pullmoll
2020-08-23 20:14 ` pullmoll
0 siblings, 2 replies; 12+ messages in thread
From: gusbemacbe @ 2020-08-23 20:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 523 bytes --]
There is a new pull request by gusbemacbe against master on the void-packages repository
https://github.com/gusbemacbe/void-packages yaru-plus
https://github.com/void-linux/void-packages/pull/24441
Upgrade Yaru++ to the new version 4.0
Hello @pullmoll
In reference to #24125, in which I did something wrong.
But I unbderstood the squash, ran correctly the commands. I am not sure if I did something correct in this new PR.
A patch file from https://github.com/void-linux/void-packages/pull/24441.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-yaru-plus-24441.patch --]
[-- Type: text/x-diff, Size: 1067 bytes --]
From 0a7991dda340ead1aab96a4ba89275177379ab34 Mon Sep 17 00:00:00 2001
From: Gustavo Reis <gusbemacbe@gmail.com>
Date: Fri, 7 Aug 2020 04:34:58 -0300
Subject: [PATCH] yaru-plus: update to 4.0.
---
srcpkgs/yaru-plus/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/yaru-plus/template b/srcpkgs/yaru-plus/template
index 72c63ec663b..c4cebdb389e 100644
--- a/srcpkgs/yaru-plus/template
+++ b/srcpkgs/yaru-plus/template
@@ -1,14 +1,15 @@
# Template file for 'yaru-plus'
pkgname=yaru-plus
-version=3.0
+version=4.0
revision=1
archs=noarch
+depends="yaru"
short_desc="Elegant Canonical's Yaru-based third-party icons theme"
maintainer="Gustavo Costa <gusbemacbe@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/Bonandry/yaru-plus"
distfiles="https://github.com/Bonandry/${pkgname}/archive/v${version}.tar.gz"
-checksum=02491bd251358bd5b6dab89a910c274ba8dbf081dd5b5db5757a0a3c6bdcf618
+checksum=74b2bf4b13b29ddad51cf948afa928af35d5199effa4be01323c8a1aad7224a6
do_install() {
vmkdir usr/share/icons
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Merged]: Upgrade Yaru++ to the new version 4.0
2020-08-23 20:11 [PR PATCH] Upgrade Yaru++ to the new version 4.0 gusbemacbe
@ 2020-08-23 20:14 ` pullmoll
2020-08-23 20:14 ` pullmoll
1 sibling, 0 replies; 12+ messages in thread
From: pullmoll @ 2020-08-23 20:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 364 bytes --]
There's a merged pull request on the void-packages repository
Upgrade Yaru++ to the new version 4.0
https://github.com/void-linux/void-packages/pull/24441
Description:
Hello @pullmoll
In reference to #24125, in which I did something wrong.
But I unbderstood the squash, ran correctly the commands. I am not sure if I did something correct in this new PR.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: Upgrade Yaru++ to the new version 4.0
2020-08-23 20:11 [PR PATCH] Upgrade Yaru++ to the new version 4.0 gusbemacbe
2020-08-23 20:14 ` [PR PATCH] [Merged]: " pullmoll
@ 2020-08-23 20:14 ` pullmoll
1 sibling, 0 replies; 12+ messages in thread
From: pullmoll @ 2020-08-23 20:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 150 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/24441#issuecomment-678819408
Comment:
Perfect.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: Upgrade Yaru++ to the new version 4.0
2020-08-07 8:37 [PR PATCH] " gusbemacbe
` (7 preceding siblings ...)
2020-08-23 20:00 ` gusbemacbe
@ 2020-08-23 20:02 ` gusbemacbe
8 siblings, 0 replies; 12+ messages in thread
From: gusbemacbe @ 2020-08-23 20:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 420 bytes --]
New comment by gusbemacbe on void-packages repository
https://github.com/void-linux/void-packages/pull/24125#issuecomment-678818142
Comment:
@pullmoll
At branch `yaru-plus`, I did like:
1. `git rebase -i origin/master`
2. I modified:
```
pick 12acf3e952 yaru-plus: update to 4.0.
fixup f385cc38b1 yaru-plus: update to 4.0.
```
3. `git push -f origin HEAD:yaru-plus`
Did I do something incorrectly?
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: Upgrade Yaru++ to the new version 4.0
2020-08-07 8:37 [PR PATCH] " gusbemacbe
` (6 preceding siblings ...)
2020-08-23 8:19 ` pullmoll
@ 2020-08-23 20:00 ` gusbemacbe
2020-08-23 20:02 ` gusbemacbe
8 siblings, 0 replies; 12+ messages in thread
From: gusbemacbe @ 2020-08-23 20:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 178 bytes --]
New comment by gusbemacbe on void-packages repository
https://github.com/void-linux/void-packages/pull/24125#issuecomment-678817914
Comment:
I did something wrong, @pullmoll.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: Upgrade Yaru++ to the new version 4.0
2020-08-07 8:37 [PR PATCH] " gusbemacbe
` (5 preceding siblings ...)
2020-08-23 8:19 ` pullmoll
@ 2020-08-23 8:19 ` pullmoll
2020-08-23 20:00 ` gusbemacbe
2020-08-23 20:02 ` gusbemacbe
8 siblings, 0 replies; 12+ messages in thread
From: pullmoll @ 2020-08-23 8:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 370 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/24125#issuecomment-678744843
Comment:
If your fork is clean you can (and should) rebase against origin/master. There should be only 2 entries and you can squash them and edit the message, or fixup the first with the second by prepending f(ixup) before 2nd the entry.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: Upgrade Yaru++ to the new version 4.0
2020-08-07 8:37 [PR PATCH] " gusbemacbe
` (4 preceding siblings ...)
2020-08-23 3:11 ` gusbemacbe
@ 2020-08-23 8:19 ` pullmoll
2020-08-23 8:19 ` pullmoll
` (2 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: pullmoll @ 2020-08-23 8:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 366 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/24125#issuecomment-678744843
Comment:
If your fork is clean you can (and should) rebase against origin/master. There should be only 2 entries and you can squash them and edit the message, or fixup the first with the second by prepending f(ixup) before the entry.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: Upgrade Yaru++ to the new version 4.0
2020-08-07 8:37 [PR PATCH] " gusbemacbe
` (3 preceding siblings ...)
2020-08-23 0:19 ` pullmoll
@ 2020-08-23 3:11 ` gusbemacbe
2020-08-23 8:19 ` pullmoll
` (3 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: gusbemacbe @ 2020-08-23 3:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 225 bytes --]
New comment by gusbemacbe on void-packages repository
https://github.com/void-linux/void-packages/pull/24125#issuecomment-678723172
Comment:
@pullmoll,
`git rebase -i origin/master` or `git rebase -i origin/yaru-plus`?
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: Upgrade Yaru++ to the new version 4.0
2020-08-07 8:37 [PR PATCH] " gusbemacbe
` (2 preceding siblings ...)
2020-08-22 22:38 ` gusbemacbe
@ 2020-08-23 0:19 ` pullmoll
2020-08-23 3:11 ` gusbemacbe
` (4 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: pullmoll @ 2020-08-23 0:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 309 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/24125#issuecomment-678712500
Comment:
You still have two commits. `git rebase -i origin/master` and put an `f` (fixup) before the 2nd line, save and let git fixup the 1st commit, then do a `git push -f`.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: Upgrade Yaru++ to the new version 4.0
2020-08-07 8:37 [PR PATCH] " gusbemacbe
2020-08-22 10:45 ` pullmoll
2020-08-22 22:28 ` gusbemacbe
@ 2020-08-22 22:38 ` gusbemacbe
2020-08-23 0:19 ` pullmoll
` (5 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: gusbemacbe @ 2020-08-22 22:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 206 bytes --]
New comment by gusbemacbe on void-packages repository
https://github.com/void-linux/void-packages/pull/24125#issuecomment-678703876
Comment:
@pullmoll
Solved. I reseted harded and pushed with force.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: Upgrade Yaru++ to the new version 4.0
2020-08-07 8:37 [PR PATCH] " gusbemacbe
2020-08-22 10:45 ` pullmoll
@ 2020-08-22 22:28 ` gusbemacbe
2020-08-22 22:38 ` gusbemacbe
` (6 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: gusbemacbe @ 2020-08-22 22:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 180 bytes --]
New comment by gusbemacbe on void-packages repository
https://github.com/void-linux/void-packages/pull/24125#issuecomment-678702892
Comment:
@pullmoll
No, I made a mistake.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: Upgrade Yaru++ to the new version 4.0
2020-08-07 8:37 [PR PATCH] " gusbemacbe
@ 2020-08-22 10:45 ` pullmoll
2020-08-22 22:28 ` gusbemacbe
` (7 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: pullmoll @ 2020-08-22 10:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 205 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/24125#issuecomment-678625228
Comment:
Please squash to one commit. AFAICT the `depends="yaru"` is ok.
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2020-08-23 20:14 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-23 20:11 [PR PATCH] Upgrade Yaru++ to the new version 4.0 gusbemacbe
2020-08-23 20:14 ` [PR PATCH] [Merged]: " pullmoll
2020-08-23 20:14 ` pullmoll
-- strict thread matches above, loose matches on Subject: below --
2020-08-07 8:37 [PR PATCH] " gusbemacbe
2020-08-22 10:45 ` pullmoll
2020-08-22 22:28 ` gusbemacbe
2020-08-22 22:38 ` gusbemacbe
2020-08-23 0:19 ` pullmoll
2020-08-23 3:11 ` gusbemacbe
2020-08-23 8:19 ` pullmoll
2020-08-23 8:19 ` pullmoll
2020-08-23 20:00 ` gusbemacbe
2020-08-23 20:02 ` gusbemacbe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).