wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-08-01 10:22:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

xbps: actually actually add the fix for 32bit platforms

Browse source
This commit is contained in:
maxice8 2018-07-30 16:29:34 -03:00
parent 3c87953fca
commit 81931875db
2 changed files with 64 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
srcpkgs/xbps/patches/fix-32-bit-formatting.patch Normal file
View file

@ -0,0 +1,62 @@
From 4eaf45a7679e59f6e24d5464dc1a122bd059dbb7 Mon Sep 17 00:00:00 2001
From: Foxlet <foxlet@furcode.co>
Date: Tue, 17 Jul 2018 20:26:08 -0400
Subject: [PATCH] Fix string formatting of 64-bit unsigned integers
---
bin/xbps-create/main.c | 4 ++--
lib/package_unpack.c | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git bin/xbps-create/main.c bin/xbps-create/main.c
index d03b9f39..aac9676a 100644
--- bin/xbps-create/main.c
+++ bin/xbps-create/main.c
@@ -426,7 +426,7 @@ ftw_cb(const char *fpath, const struct stat *sb, const struct dirent *dir _unuse
TAILQ_FOREACH(xep, &xentry_list, entries) {
if (sb->st_nlink > 1 && xep->inode == sb->st_ino) {
/* matched */
- printf("%lu %lu\n", xep->inode, sb->st_ino);
+ printf("%"PRIu64" %"PRIu64"\n", xep->inode, sb->st_ino);
hlink = true;
break;
}
@@ -441,7 +441,7 @@ ftw_cb(const char *fpath, const struct stat *sb, const struct dirent *dir _unuse
xbps_dictionary_get_uint64(linkinfo, "inode", &inode);
if (inode == sb->st_ino) {
/* matched */
- printf("%lu %lu\n", inode, sb->st_ino);
+ printf("%"PRIu64" %"PRIu64"\n", inode, sb->st_ino);
break;
}
}
diff --git lib/package_unpack.c lib/package_unpack.c
index 6546a77a..25a6388e 100644
--- lib/package_unpack.c
+++ lib/package_unpack.c
@@ -377,13 +377,13 @@ unpack_archive(struct xbps_handle *xhp,
archive_entry_gid(entry)) != 0) {
xbps_dbg_printf(xhp,
"%s: failed "
- "to set uid/gid to %zu:%zu (%s)\n",
+ "to set uid/gid to %"PRIu64":%"PRIu64" (%s)\n",
pkgver, archive_entry_uid(entry),
archive_entry_gid(entry),
strerror(errno));
} else {
xbps_dbg_printf(xhp, "%s: entry %s changed "
- "uid/gid to %zu:%zu.\n", pkgver, entry_pname,
+ "uid/gid to %"PRIu64":%"PRIu64".\n", pkgver, entry_pname,
archive_entry_uid(entry),
archive_entry_gid(entry));
}
@@ -426,7 +426,7 @@ unpack_archive(struct xbps_handle *xhp,
AT_SYMLINK_NOFOLLOW) == -1) {
xbps_dbg_printf(xhp,
"%s: failed "
- "to set mtime %ju to %s: %s\n",
+ "to set mtime %lu to %s: %s\n",
pkgver, archive_entry_mtime_nsec(entry),
entry_pname,
strerror(errno));

4
srcpkgs/xbps/template
View file

@ -1,14 +1,14 @@
# Template file for 'xbps' # Template file for 'xbps'
pkgname=xbps pkgname=xbps
version=0.53 version=0.53
revision=3 revision=4
bootstrap=yes bootstrap=yes
build_style=configure build_style=configure
short_desc="The XBPS package system utilities" short_desc="The XBPS package system utilities"
maintainer="Juan RP <xtraeme@voidlinux.eu>" maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="https://github.com/void-linux/xbps" homepage="https://github.com/void-linux/xbps"
license="BSD-2-Clause" license="BSD-2-Clause"
distfiles="https://github.com/void-linux/xbps/archive/$version.tar.gz" distfiles="https://github.com/void-linux/xbps/archive/${version}.tar.gz"
checksum=360b3149141fec46dd6da9019605bcee48ee4d29bffe5aa47a9fd5fa68ccd5f4 checksum=360b3149141fec46dd6da9019605bcee48ee4d29bffe5aa47a9fd5fa68ccd5f4
hostmakedepends="pkg-config" hostmakedepends="pkg-config"