gentoo auto-resync : 05:01:2024 - 20:03:55

3 files changed, 59 insertions, 2 deletions

diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index ffbdebeae999..7eb9798205c8 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,5 +1,6 @@
+AUX 3.6.0-configure-c99.patch 1822 BLAKE2B 09ead950a359b0240e8ff1908483ec7583dedf7ae6627b824ed84e3bdb3e65b91675eac1da1f7ea3ee74730d5fda1ae18bbd3eed542c33e4b78f989a78bbbae7 SHA512 eb58f02b730aee91d4cbf69c93e104ccf106db3fff7f5c78ae21a963de56ca28198b701926734928a8bc5d9d505037e471122f3ec9c8cb0d6d8f598a80940e5e
 DIST tracker-3.5.3.tar.xz 2569412 BLAKE2B 8e35234f74eb4ae22c23661fedf6b3898e6daa41868d18473a9cbf998a7edbff893e63f15573585c130b8b7c40c65a4f5df8e057fd14dfe76dcfe2a9abed4cdb SHA512 ed75f7cbb75daab6597bab58937554b531bc2c32581148c2d828cb313644b198a057024c5202d0990237bc01119d1789f0fbc87868919fc2f00bcb40e76f7b23
 DIST tracker-3.6.0.tar.xz 2560980 BLAKE2B f10720b624b2b00eb510961f7346bb6c1fdc278237126d1b5f4b9af2d0f67cc74896b65bce89de14a085e55441fe64985cb13da06242838fe43dd0739e8d5bce SHA512 d3b7d4c1fd1cdcccc0d78c05f43b85f5cdab584e378cb56a2b568293ff95c887650d41c3c7f65de8864a0b6f80ae26410f4a443f045a80e30bacdf7ef9499697
 EBUILD tracker-3.5.3.ebuild 2462 BLAKE2B 0dfa199cd395c7d92c3665c3b5ffa888298bb44d2992d00ac7e8cb007d46aaafdfe07d050c0a45cb01c1070827829a7d3a187b98e48888097bb1dbc6ae10c63a SHA512 c3b63de9f4071b035a9be78d6ede1822324d1c181150b9c40fc415b6760a720017b097c550154d8f46f4c4728404513cd9252271365819a0a34c8a96c016ac18
-EBUILD tracker-3.6.0.ebuild 2460 BLAKE2B 15305c449edfc7f56d5e398d284784025d73dbd566e572a85330bd2769e05b0ce46b27220ab4a5d6eb3fbe69f830a5d22042b3a78c61203a83c27f4881b2068d SHA512 cc6a284947a71a6bb494457b51797e6c3e26bcd609ea2260380cd181985c3016e82c4bfa89529ec2d64a47ce821c88dadb42ee1476aca7a964aac2b2230cda57
+EBUILD tracker-3.6.0.ebuild 2514 BLAKE2B 06198d82efca72d8c3d7af7b244c6aab109f4e3f1ee63f24b1d5fe0e895e96af8c2e1ad61dc47d18d43efd0a4a22901680dc73891cf7b68c93bf67a5567c7be6 SHA512 489d13e3294134c19d62ffe868d95488fdaabdc94fa2fc0198b1188a3cc0849f6d2354cc40fd68a02c916c4f210887215cf1770c0c6dbf53a8534fb062d89f09
 MISC metadata.xml 586 BLAKE2B 8244e6f8d9491a0c224ed84f17ee6ad64b22e0c373243a319e7911739a7db6223ce47693ed5b31053b4465f35d20108db1469d74afcebb36b4516a53cbd7f98a SHA512 0a60b0e4b077bb03d02b7990511041695c5dff7a8a0972fa80abe9968b643ad5c2ba65182c079e8d5f3d1ef72a2c4dcc659d6ec283bf80813135c94cab2dddef
diff --git a/app-misc/tracker/files/3.6.0-configure-c99.patch b/app-misc/tracker/files/3.6.0-configure-c99.patch
new file mode 100644
index 000000000000..f5de3e2746ce
--- /dev/null
+++ b/app-misc/tracker/files/3.6.0-configure-c99.patch
@@ -0,0 +1,52 @@
+https://bugs.gentoo.org/919095
+https://gitlab.gnome.org/GNOME/tracker/-/merge_requests/638
+https://gitlab.gnome.org/GNOME/tracker/-/commit/f7393d61803815b19a1f210b197cce423ae3cc01
+
+From f7393d61803815b19a1f210b197cce423ae3cc01 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Sun, 3 Dec 2023 12:10:27 +0000
+Subject: [PATCH] build: Fix "4-digit year modifier" test
+
+Upcoming `gcc-14` enabled a few warnings into errors, like
+`-Wincompatible-pointer-types`. This caused `tracker` configure to
+fail as:
+
+    $ ../meson
+    ...
+    Checking if "strftime 4-digit year modifier" runs: DID NOT COMPILE
+
+    ../meson.build:235:2: ERROR: Problem encountered: Libc implementation has broken 4-digit years implementation.
+
+This happens because char buffer had an unusual type:
+
+    testfile.c: In function 'main':
+    testfile.c:16:17: error: passing argument 1 of 'strftime' from incompatible pointer type
+    [-Wincompatible-pointer-types]
+       16 |       strftime (&buf, sizeof buf, modifiers[i], &tm);
+          |                 ^~~~
+          |                 |
+          |                 char * (*)[100]
+--- a/meson.build
++++ b/meson.build
+@@ -215,15 +215,15 @@ result = cc.run('''
+   int main (int argc, char *argv[]) {
+     char *modifiers[] = { "%Y", "%C%y", "%4Y", "%2C%y", NULL };
+     time_t timestamp = -58979923200; /* 0101-01-01T01:01:01Z */
+-    char *buf[100];
++    char buf[100];
+     struct tm tm;
+     int i;
+     gmtime_r (&timestamp, &tm);
+     for (i = 0; modifiers[i]; i++) {
+-      strftime (&buf, sizeof buf, modifiers[i], &tm);
+-      if (strcmp (&buf, "0101") == 0) {
++      strftime (buf, sizeof buf, modifiers[i], &tm);
++      if (strcmp (buf, "0101") == 0) {
+         printf ("%s", modifiers[i]);
+-	return 0;
++        return 0;
+       }
+     }
+     return -1;
+-- 
+GitLab
diff --git a/app-misc/tracker/tracker-3.6.0.ebuild b/app-misc/tracker/tracker-3.6.0.ebuild
index 4df7c34a6c95..c98269f998af 100644
--- a/app-misc/tracker/tracker-3.6.0.ebuild
+++ b/app-misc/tracker/tracker-3.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -45,6 +45,10 @@ BDEPEND="
 "
 PDEPEND="miners? ( >=app-misc/tracker-miners-3.6_rc )"
 
+PATCHES=(
+	"${FILESDIR}"/3.6.0-configure-c99.patch
+)
+
 python_check_deps() {
 	python_has_version -b \
 		"dev-python/pygobject[${PYTHON_USEDEP}]" \