jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

gnome-settings-daemon: remove outdated branch for cross compiling.

Browse source
This commit is contained in:
Enno Boland 2018-07-31 08:45:39 +02:00
parent 781fbfca23
commit 96f3dcc846
No known key found for this signature in database
GPG key ID: D09964719BDE9971
2 changed files with 61 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
srcpkgs/gnome-settings-daemon/template
View file

@ -17,12 +17,6 @@ homepage="https://www.gnome.org"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=594f78e194eb42a6f77785d1a92a4cb9cda54b8c3af6ca0c315b4570d38d2d7d
pre_configure() {
# XXX workaround wrong paths for build
if [ "$CROSS_BUILD" ]; then
sed -i "s#^GEOCLUE_DBUS_INTERFACE_XML=#\0${XBPS_CROSS_BASE}#" configure
fi
}
gnome-settings-daemon-devel_package() {
depends="libglib-devel"
short_desc+=" - development files"

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

@ -0,0 +1,61 @@
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 a/bin/xbps-create/main.c b/bin/xbps-create/main.c
index d03b9f39..aac9676a 100644
--- a/bin/xbps-create/main.c
+++ b/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 a/lib/package_unpack.c b/lib/package_unpack.c
index 6546a77a..25a6388e 100644
--- a/lib/package_unpack.c
+++ b/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));