Remove the .xbps files and squash everything to 1 commit.
Please try to use the release tarballs, they contain the only submodule (gvc).
It's prefered to not use variables in `homepage`
There is a release v10.2.7 at https://github.com/solus-project/budgie-desktop/archive/v10.2.7.tar.gz so there's really no need to git clone, or is there?
Under no circumstance should you use GitHub generated tarballs to integrate Budgie Desktop into your project/distro/whatever-it-is. These tarballs are not correct, and are not supported by the maintainer.
If we determine your package uses GitHub generated tarballs, or bypasses our own release and build processes, your bug will be invalidated and no support will be received.
Note that a valid generated tarball for use from git can be generated and hosted in your own infrastructure as follows:
./autogen.sh
make distcheck
@ebfe What do you mean by remove .xbps files ?
Also I tried squashing my last commits but they doubled. I used this command:
git reset --soft HEAD~4 &&
git commit
There are non automatically generated release tarballs at https://github.com/solus-project/budgie-desktop/releases/download/v10.2.7/budgie-desktop-10.2.7.tar.xz.
Please see previous discussion on this:
https://github.com/voidlinux/void-packages/pull/4398
This template makes use of the tarballs which are specifically disa-vowed of by the project authors. This should be refactored to do a git checkout so that you can ensure you actually have all of the tarball since github does not fold in the submodules.
There should be no issues with Void policy on this matter since it is still a tagged, repeatable release that is made by the upstream project, only the transport mechanism is changing.
@mar1n3r0 pushed 2 commits.
fcaef25 Merge branch 'budgie-desktop' of https://github.com/mar1n3r0/void-packages into budgie-desktop
185ebb9 Merge branch 'budgie-desktop' of https://github.com/mar1n3r0/void-packages into budgie-desktop
I don't know which tarballs you used in the initial PR and the commit is gone so i can't check. Maybe you used the autogenerated one and the real release tarball was overlooked.
git rebase -i origin/master
assuming origin is the remote you use for https://github.com/voidlinux/void-packages
drop the commits that add .xbps files, squash the rest.
[DEBUG] Added `libtls10-2.3.6_1' into the dependency list (/host/binpkgs)
libcrypto37-2.3.6_1 (update) breaks installed pkg `libressl-2.3.8_1'
libssl38-2.3.6_1 (update) breaks installed pkg `libressl-2.3.8_1'
Transaction aborted due to unresolved dependencies.
I guess the bot is currently building some packages.
This is solved now thanks to @Duncaen. Basically I had to pull latest changes in masterdir first.
Here is what happens next:
ERROR: [trans] failed to download wget-1.18_1' package fromhttps://repo.voidlinux.eu/current/aarch64': Not Found
[DEBUG] [trans] failed to download binpkgs: Device or resource busy
If I only knew how to do squashing properly. In this pull request I have 12 commits but when I choose git rebase -i HEAD~12 I see all commits on the upstream repository rather than only mine. After various attempts I am now brought to cherry-picking...
```
git fetch origin
git rebase -i origin/master
```
assuming origin is the remote you use for https://github.com/voidlinux/void-packages
drop the commits that add .xbps files, squash the rest.
FWIW here's my scheme to prepare and handle a git PR.
Do this once in your fork.
```
git remote add upstream git://github.com/voidlinux/void-packages.git
```
Now for a new package
```
git pull --rebase upstream master
git checkout -b mystuff
{ work on it and add files }
git add srcpkgs/mystuff
git commit
git push
{ more changes }
git add srcpkgs/mystuff
git commit --amend
git push -f
{ rebase to upstream master again, if there were changes like common/shlibs }
git pull --rebase upstream master
git push -f
```
Fetch downloads the upstream, but doesn't combine it with any branch. You need to manually merge or rebase for that to happen. Pull simply does a fetch and a merge all in one.