New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26642#issuecomment-732218883

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

```diff
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.