rpm: update to 4.16.0

[glaulher]

No description provided.

[ericonr]

Remove this newline

[ericonr]

Is 2 correct? It's linked against python3...

[glaulher]

deleting this line, the package does not compile.

[ericonr]

No, I think you should be using python_version=3

[ericonr]

ping here

[ahesford]

It seems that there is exactly one Python script installed by rpm, and it works with Python 3 (I can at least get the help text to display). Please change to python_version=3 as @ericonr recommends.

[ericonr]

The patch you made is patching the wrong file, you need to apply

diff --git a/srcpkgs/rpm/patches/fix-musl-rpmdb.patch b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
index e1e48b3b0d..2c0317ee5a 100644
--- a/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
+++ b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
@@ -1,12 +1,11 @@
---- rpmdb.c
-+++ rpmdb.c
-@@ -1,7 +1,9 @@
-#include "system.h"
-
+--- lib/rpmdb.c
++++ lib/rpmdb.c
+@@ -8,6 +8,8 @@
+ #include <utime.h>
+ #include <errno.h>
+ #include <dirent.h>
++#include <sys/stat.h>
 +#include <fcntl.h>
-+#include <sys / stat.h>
-#include <popt.h>
-#include <rpm/rpmcli.h>
-#include <rpm/rpmdb.h>
-#include "cliutils.h"
-#include "debug.h"
+ 
+ #ifndef	DYING	/* XXX already in "system.h" */
+ #include <fnmatch.h>

to your repository instead.

The final patch should look like

--- lib/rpmdb.c
+++ lib/rpmdb.c
@@ -8,6 +8,8 @@
 #include <utime.h>
 #include <errno.h>
 #include <dirent.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 
 #ifndef	DYING	/* XXX already in "system.h" */
 #include <fnmatch.h>

Also, rebase your branch so the merge commit goes away.

[glaulher]

the package compiled in musl but took 2h6m46s

[ericonr]

Your local repository might have been out of date, which would have made it build the outdated dependencies. Do git remote add upstream https://github.com/void-linux/void-packages.git then git pull upstream master --autostash

[glaulher]

for some reason trying to rebase I pushed the push up incorrectly, how do I fix it?

[ericonr]

git rebase upstream/master should do it

[ahesford]

Deeper and deeper!

Try this from the root of your clone, while you are in the rpm branch:

git fetch --all --prune
cp srcpkgs/rpm/{template,patches/fix-musl-rpmdb.patch} .
git reset --hard upstream/master
mv fix-musl-rpmdb.patch srcpkgs/rpm/patches/
mv template srcpkgs/rpm/
git add srcpkgs/rpm
git commit -m 'rpm: update to 4.16.0.'
git push -f

[glaulher]

Cada vez mais fundo!

Tente fazer isso a partir da raiz do seu clone, enquanto você está no rpmbranch:

git fetch --all --prune
cp srcpkgs/rpm/{template,patches/fix-musl-rpmdb.patch} .
git reset --hard upstream/master
mv fix-musl-rpmdb.patch srcpkgs/rpm/patches/
mv template srcpkgs/rpm/
git add srcpkgs/rpm
git commit -m 'rpm: update to 4.16.0.'
git push -f

thanks for your help and ericonr's help,
I think it's ok now.

[ahesford]

This should be revision=1 when the version is new.

[glaulher]

the version has been fixed, thanks.

[ericonr]

Você ainda tinha dois commits (pode ver aqui https://github.com/void-linux/void-packages/pull/26642/commits ). Eu juntei os dois e aproveitei para atualizar para 4.16.1.2.

[glaulher]

thank you.