Skip to content

Conversation

@dora-meowmeow
Copy link
Contributor

@dora-meowmeow dora-meowmeow commented Nov 14, 2025

Testing the changes

  • I tested the changes in this PR: YES

New package

Local build testing

  • I built this PR locally for my native architecture, (x86-64-glibc)

@tranzystorekk tranzystorekk added the new-package This PR adds a new package label Nov 14, 2025
Copy link
Member

@classabbyamp classabbyamp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it would be good to install the desktop file (with vinstall) and the sample config (with vsconf)

commit messages should follow the format from here and there should only be 1 commit per package (so 1 commit in the PR)

@dora-meowmeow
Copy link
Contributor Author

dora-meowmeow commented Nov 14, 2025

it would be good to install the desktop file (with vinstall) and the sample config (with vsconf)

commit messages should follow the format from here and there should only be 1 commit per package (so 1 commit in the PR)

I haven't used the vfunctions in xbps but I will be definetly adding those two. Regarding commits, I'm not sure how I can merge all of the commits into 1 big commit and only PR that. I'll look into it(worse case just make another branch with 1 commit).

Additionally thank you so much for all of the fixes. I'm still learning and toying with xbps so showing me the right way to do some of this instead of just telling me its not good really helped.

@classabbyamp
Copy link
Member

classabbyamp commented Nov 14, 2025

git reset --soft master && git commit then git push --force-with-lease

@dora-meowmeow dora-meowmeow force-pushed the wiremix branch 2 times, most recently from 8f14f93 to 2744b8a Compare November 14, 2025 14:52
@dora-meowmeow
Copy link
Contributor Author

dora-meowmeow commented Nov 14, 2025

Sorry for the mess, I initially screwed up a bit and pushed to master. Had to fix master branch of my fork. I hope this is satisfactory. As requested I added the desktop icon and conf. I also included the vlicense for the licenses (xlint did warn me on MIT but I included both for good measure).

Please let me know if you need anything else changed.

@dora-meowmeow
Copy link
Contributor Author

hopefully I nailed it this time 😅

Copy link
Member

@classabbyamp classabbyamp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so the reason cross-build is failing is it's trying to use libgit2 in the build.rs script to get version info. this is extra useless here because there will never be a git context to grab a version from.

on cross, build.rs runs for the host, so if we wanted to, we could move the libgit2-1.9-devel dependency to hostmakedepends, but it's better to just circumvent it altogether

so, add this patch:

we know this isn't going to be in a git repo, so get rid of a useless dependency
on libgit2.

--- a/build.rs
+++ b/build.rs
@@ -1,12 +1,3 @@
-use vergen_git2::{Emitter, Git2Builder};
-
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    // Put "git describe" output (ex. "v0.5.0-2-gbc03f8a-dirty") in
-    // VERGEN_GIT_DESCRIBE environment variable for use in --version output.
-    let describe = Git2Builder::default()
-        .describe(true, true, Some("v[0-9]*.[0-9]*.[0-9]*"))
-        .build()?;
-    Emitter::default().add_instructions(&describe)?.emit()?;
-
     Ok(())
 }

I called it srcpkgs/wiremix/patches/useless-git.patch

and...

@classabbyamp
Copy link
Member

and btw, the commit message for new packages should include the version: New package: wiremix-0.8.0

@dora-meowmeow
Copy link
Contributor Author

alright I am currently out for an hour or two. I'll do the patch and renaming in max 2-3 hours. Thanks for the help.

@dora-meowmeow
Copy link
Contributor Author

I've compiled the package twice (x86_64, and i686) with the patch. Both compiled fine and x86_64 installed and worked in my machine. So hopefully, fingers crossed, this will be it.

I do have a question regarding patches. Are all the patches in patches folder ran when building a package? Is there way to specify it for a specific library(glibc or musl) or architecture compile? Sorry I am not that familiar with patching in general but would love to learn more 😅

@classabbyamp
Copy link
Member

I do have a question regarding patches. Are all the patches in patches folder ran when building a package? Is there way to specify it for a specific library(glibc or musl) or architecture compile? Sorry I am not that familiar with patching in general but would love to learn more 😅

patches are always applied yes. if something is architecture-specific, it's probably a bad patch (i.e., it's better if it's written in an arch-agnostic way), but if necessary you can work around it a couple ways, like chromium does for example

@dora-meowmeow
Copy link
Contributor Author

dora-meowmeow commented Nov 14, 2025

Hmm patch didn't seem to work :/. I'm going to tinker with it on xbps-src a bit (try to compile it to aarch64). Hopes it is something minor. If not maybe put libgit2.19-devel to hostmakedepends as suggested?

@classabbyamp
Copy link
Member

you need to add the patch to git, look at the PR contents right now

@dora-meowmeow
Copy link
Contributor Author

dora-meowmeow commented Nov 14, 2025

Yeah I was surprised to see my cross compile working 😅. I've pushed it with the patch this time, sorry for the brainfart.

@dora-meowmeow dora-meowmeow changed the title New package: wiremix New package: wiremix-0.8.0 Nov 16, 2025
@dora-meowmeow
Copy link
Contributor Author

@classabbyamp my apologies, I didn't realized that the patch message was still broken. It should be fixed now.

@leahneukirchen leahneukirchen merged commit f750baa into void-linux:master Nov 23, 2025
8 checks passed
@dora-meowmeow dora-meowmeow deleted the wiremix branch November 25, 2025 20:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

new-package This PR adds a new package

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants