FTFBS fix with glibc-2.28

Inclusion of <sys/sysmacros.h> by <sys/types.h> is deprecated since
glibc-2.25 and has been removed in glibc-2.28

2 files changed, 16 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fe0e6b5e5973..9e86f154916b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -14,7 +14,11 @@ pkgbase = usermode
 	depends = libuser
 	depends = startup-notification
 	source = https://releases.pagure.org/usermode/usermode-1.112.tar.xz
+	source = usermode-1.112-l10n-ftbfs.patch::https://pagure.io/usermode/c/7cbc6441cd06e0c0bb51ac37c8f22b0fd51f12f2.patch
+	source = glib-2.28-sysmacros-ftbfs.patch::https://pagure.io/usermode/c/c5a0bfd174e4a88fcd49fe7a130b37b6779c1a18.patch
 	md5sums = a766a9f7600f573fb6de4655d4162196
+	md5sums = fff566f90a52ddc901d5e3dc6aff0e8d
+	md5sums = 8dfad6535d05e9f78a1935c89634e515
 
 pkgname = usermode
 
diff --git a/PKGBUILD b/PKGBUILD
index cbd40b138826..38f865acec87 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,17 +10,24 @@ url="https://pagure.io/$pkgname"
 license=('GPL2')
 depends=('gtk2' 'libice' 'libsm' 'libuser' 'startup-notification')
 makedepends=('desktop-file-utils' 'intltool')
-source=("https://releases.pagure.org/$pkgname/$pkgname-$pkgver.tar.xz")
-md5sums=('a766a9f7600f573fb6de4655d4162196')
+source=("https://releases.pagure.org/$pkgname/$pkgname-$pkgver.tar.xz"
+        "$pkgname-1.112-l10n-ftbfs.patch::$url/c/7cbc6441cd06e0c0bb51ac37c8f22b0fd51f12f2.patch"
+        "glib-2.28-sysmacros-ftbfs.patch::$url/c/c5a0bfd174e4a88fcd49fe7a130b37b6779c1a18.patch")
+md5sums=('a766a9f7600f573fb6de4655d4162196'
+         'fff566f90a52ddc901d5e3dc6aff0e8d'
+         '8dfad6535d05e9f78a1935c89634e515')
 
 prepare() {
 	cd "$pkgname-$pkgver"
 
-	# FTBFS fix:
+	# FTBFS fixes:
 	# tr.po:411: 'msgid' and 'msgstr' entries do not both end with '\n'
 	# /usr/bin/msgfmt: found 1 fatal error
-	sed -e '411 s/"$/\\n"/' \
-	    -i po/tr.po
+	patch -p1 -i "$srcdir/$pkgname-1.112-l10n-ftbfs.patch"
+
+	# Inclusion of <sys/sysmacros.h> by <sys/types.h> is deprecated since
+	# glibc-2.25 and has been removed in glibc-2.28
+	patch -p1 -i "$srcdir/glib-2.28-sysmacros-ftbfs.patch"
 
 	./autogen.sh
 }