gentoo auto-resync : 18:07:2022 - 02:33:38

3 files changed, 75 insertions, 1 deletions

diff --git a/dev-libs/libratbag/Manifest b/dev-libs/libratbag/Manifest
index 5ca18fb48ce7..bd417394e4fb 100644
--- a/dev-libs/libratbag/Manifest
+++ b/dev-libs/libratbag/Manifest
@@ -1,6 +1,7 @@
+AUX libratbag-0.16-musl-error.h.patch 1786 BLAKE2B 80e333dfa7e7e2a6d207885836b3654f01c821a21d1cda233770eb4d5879239b74e0886826f2118b1e7f5674f35e697ec933b79b43f0f415c94a1c62e159594e SHA512 43fd1e68670228a438c68714987d7ff930abfc271dc54abc26e0c7809e2302c7d3d45d3293ae9edfde2887b54a74dcda9eeff372145165eed5cb048672d8c69a
 AUX ratbagd.init 336 BLAKE2B c6f2ef095cd7d929c3097a18e912ae4b3615bd0ebbdfdaa9f4151b312614c016af2f3581c2fbb2853472cb70ce47d5f26f254772fb9f3dabba2ce93626b672b7 SHA512 3908b3481b49bcebc84e3023ff911dcbc1773e4322356def0067ed4aa426184cf43e12de702e98210157d17c2806d57c1cb4bc79ddb0b8660036a6fe3974607e
 DIST libratbag-0.15.tar.gz 249492 BLAKE2B 0f5b35800cb9f82cb892dacd5e3b041843cf5513507ee4882ec5b3f8c8aec8a24594736f2eb1c8e373a0ee38ace1e6328cbd4816d6e5b2cd1f2154ebd803a5fa SHA512 add47a6b3d771de77c6307e128a549f5295e216059b5a2375aa6b2b6bbebcf9a93d7bf148181b3f39f855976e9b6f57072dd9198d07828bebe85409f4ad994aa
 DIST libratbag-0.16.tar.gz 253080 BLAKE2B ede56838c822519b4fe4c6846f5d6d237104fc06f96fb17aa62b4c712965f00827973ebe732ee5ac9a16f101baf0b63eb445fbb97746df3b8ed24d6e085b34e1 SHA512 b3f2fee39ec85c0e08d257753241fb0e553de53eb7409a3b95f93a0fac3989a9411c53c915e72bef19bcfc5682fe9cdafaeb1f41f2718ab02766859f565415e3
 EBUILD libratbag-0.15.ebuild 2107 BLAKE2B 43fc8590fc94903bff93459e34ba9e182eec2186609d730908aed5fc6257667f5e72471962047c12c39bcb2fa4e635dc484f708645812a77cf934ba42d82d966 SHA512 fb893059bc1ba1fc8ada517d0983c09c6149e184228bf3854b7973306385f43a92f0adf9f95524d91048f8568b99e3d70ecb7375c60bfc049d457f7b8a7ed14a
-EBUILD libratbag-0.16.ebuild 2107 BLAKE2B 43fc8590fc94903bff93459e34ba9e182eec2186609d730908aed5fc6257667f5e72471962047c12c39bcb2fa4e635dc484f708645812a77cf934ba42d82d966 SHA512 fb893059bc1ba1fc8ada517d0983c09c6149e184228bf3854b7973306385f43a92f0adf9f95524d91048f8568b99e3d70ecb7375c60bfc049d457f7b8a7ed14a
+EBUILD libratbag-0.16.ebuild 2165 BLAKE2B e5f26bb2a400fbff4aa67d29eeeae7853e6a10d4215334ee6d2ddf9dcf4cd8ace1e05682b4a030335cd9aad7b85a8232e0f56ac77fad83146f1d42bccc196a5b SHA512 96f6563f7996676c826b37d0ddb4bba515178edc2de36d0132f5c0829121c5c5133f77c2a45fb86557b74580d6b693f78e2937f07128b278834da78c35fb2fda
 MISC metadata.xml 490 BLAKE2B 1acac7162603488b92a2a99c2bf9ee12971b79d62b48ebea2bc6fdbb5e45f351002cb932cd6a8222fcd23acdffa77d4cd708b71459a5f557f668a9687da66efa SHA512 e55ba297fed6952b379b92bf14adfe02fd4a90a7f305d70126fb28ff12c63e64ff2781f378c279bd17392bf917d31f4ed2b3679b308ecf0e713e42eccbc9d1a0
diff --git a/dev-libs/libratbag/files/libratbag-0.16-musl-error.h.patch b/dev-libs/libratbag/files/libratbag-0.16-musl-error.h.patch
new file mode 100644
index 000000000000..a3b0b187c154
--- /dev/null
+++ b/dev-libs/libratbag/files/libratbag-0.16-musl-error.h.patch
@@ -0,0 +1,69 @@
+# Since musl doesn't provide error.h we need to check before adding it. If
+# error.h is present in system only then we include it else we use err.h.
+# Already there exists a bug report for this upstream [1]. The devs are open to
+# a custom implementation of error but for now this patch for do it.
+#
+# [1]: https://github.com/libratbag/libratbag/issues/1253
+#
+# Closes: https://bugs.gentoo.org/830557
+--- a/meson.build
++++ b/meson.build
+@@ -74,8 +74,13 @@ dep_libevdev = dependency('libevdev')
+ dep_glib = dependency('glib-2.0')
+ dep_json_glib = dependency('json-glib-1.0')
+ dep_lm = cc.find_library('m')
++error_exists = cc.has_header('error.h')
+ dep_unistring = cc.find_library('unistring')
+
++if error_exists
++	add_global_arguments('-DHAVE_ERROR_H', language : 'c')
++endif
++
+ if get_option('logind-provider') == 'elogind'
+ 	dep_logind = dependency('libelogind', version : '>=227')
+ else
+--- a/tools/hidpp10-dump-page.c
++++ b/tools/hidpp10-dump-page.c
+@@ -23,7 +23,12 @@
+
+ #include <config.h>
+ #include <errno.h>
++#ifdef HAVE_ERROR_H
+ #include <error.h>
++#else
++#include <err.h>
++#define error(status, errno, ...) err(status, __VA_ARGS__)
++#endif
+ #include <fcntl.h>
+
+ #include <hidpp10.h>
+--- a/tools/hidpp20-dump-page.c
++++ b/tools/hidpp20-dump-page.c
+@@ -23,7 +23,12 @@
+
+ #include <config.h>
+ #include <errno.h>
++#ifdef HAVE_ERROR_H
+ #include <error.h>
++#else
++#include <err.h>
++#define error(status, errno, ...) err(status, __VA_ARGS__)
++#endif
+ #include <fcntl.h>
+
+ #include <hidpp20.h>
+--- a/tools/hidpp20-reset.c
++++ b/tools/hidpp20-reset.c
+@@ -23,7 +23,12 @@
+
+ #include <config.h>
+ #include <errno.h>
++#ifdef HAVE_ERROR_H
+ #include <error.h>
++#else
++#include <err.h>
++#define error(status, errno, ...) err(status, __VA_ARGS__)
++#endif
+ #include <fcntl.h>
+
+ #include <hidpp20.h>
diff --git a/dev-libs/libratbag/libratbag-0.16.ebuild b/dev-libs/libratbag/libratbag-0.16.ebuild
index 9b8dda025eb3..2a174abe96e8 100644
--- a/dev-libs/libratbag/libratbag-0.16.ebuild
+++ b/dev-libs/libratbag/libratbag-0.16.ebuild
@@ -61,6 +61,10 @@ DEPEND="
 	dev-libs/gobject-introspection
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.16-musl-error.h.patch
+)
+
 src_prepare() {
 	default