[gentoo-commits] repo/gentoo:master commit in: x11-misc/shared-mime-info/files/, x11-misc/shared-mime-info/
commit: 195e216792faf46cb927875cef75ad6870ac4baa
Author: Sam James gentoo org>
AuthorDate: Tue Feb 6 03:30:46 2024 +
Commit: Sam James gentoo org>
CommitDate: Tue Feb 6 03:30:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=195e2167
x11-misc/shared-mime-info: fix build w/ libxml2-2.12
Closes: https://bugs.gentoo.org/917561
Signed-off-by: Sam James gentoo.org>
.../files/shared-mime-info-2.4-libxml2.12.patch | 20
...nfo-2.4.ebuild => shared-mime-info-2.4-r1.ebuild} | 6 +-
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git
a/x11-misc/shared-mime-info/files/shared-mime-info-2.4-libxml2.12.patch
b/x11-misc/shared-mime-info/files/shared-mime-info-2.4-libxml2.12.patch
new file mode 100644
index ..22d2349053f5
--- /dev/null
+++ b/x11-misc/shared-mime-info/files/shared-mime-info-2.4-libxml2.12.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/917561
+https://gitlab.freedesktop.org/xdg/shared-mime-info/-/issues/219
+https://gitlab.freedesktop.org/xdg/shared-mime-info/-/commit/c918fe77e255150938e83a6aec259f153d303573
+
+From c918fe77e255150938e83a6aec259f153d303573 Mon Sep 17 00:00:00 2001
+From: David Faure
+Date: Sun, 19 Nov 2023 11:18:11 +0100
+Subject: [PATCH] Fix build with libxml2-2.12.0 and clang-17
+
+Fixes #219
+--- a/src/test-subclassing.c
b/src/test-subclassing.c
+@@ -1,4 +1,5 @@
+ #include
++#include
+ #include
+ #include
+
+--
+GitLab
diff --git a/x11-misc/shared-mime-info/shared-mime-info-2.4.ebuild
b/x11-misc/shared-mime-info/shared-mime-info-2.4-r1.ebuild
similarity index 96%
rename from x11-misc/shared-mime-info/shared-mime-info-2.4.ebuild
rename to x11-misc/shared-mime-info/shared-mime-info-2.4-r1.ebuild
index 82a520646c8e..75a1866ef66f 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-2.4.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-2.4-r1.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
@@ -33,6 +33,10 @@ DEPEND="${RDEPEND}"
DOCS=( HACKING.md NEWS README.md )
+PATCHES=(
+ "${FILESDIR}"/${P}-libxml2.12.patch
+)
+
src_prepare() {
default
[gentoo-commits] repo/gentoo:master commit in: x11-misc/shared-mime-info/files/, x11-misc/shared-mime-info/
commit: 9f3fff4dda5c7de17663db95721cebad15402a7c
Author: Sam James gentoo org>
AuthorDate: Thu Oct 19 13:12:12 2023 +
Commit: Sam James gentoo org>
CommitDate: Thu Oct 19 13:12:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f3fff4d
x11-misc/shared-mime-info: backport Clang fixes
Closes: https://bugs.gentoo.org/915859
Signed-off-by: Sam James gentoo.org>
...shared-mime-info-2.3-clang-string-literal.patch | 38 +++
.../shared-mime-info-2.3-fsync-detection.patch | 55
.../files/shared-mime-info-2.3-wformat.patch | 282 +
.../shared-mime-info-2.3-r1.ebuild | 100
4 files changed, 475 insertions(+)
diff --git
a/x11-misc/shared-mime-info/files/shared-mime-info-2.3-clang-string-literal.patch
b/x11-misc/shared-mime-info/files/shared-mime-info-2.3-clang-string-literal.patch
new file mode 100644
index ..fe868ad709f6
--- /dev/null
+++
b/x11-misc/shared-mime-info/files/shared-mime-info-2.3-clang-string-literal.patch
@@ -0,0 +1,38 @@
+https://bugs.gentoo.org/915859
+https://gitlab.freedesktop.org/xdg/shared-mime-info/-/commit/12a3a6b1141c704fc594379af1808bb9008d588c
+
+From 12a3a6b1141c704fc594379af1808bb9008d588c Mon Sep 17 00:00:00 2001
+From: Tobias Mayer
+Date: Sun, 8 Oct 2023 00:11:49 +0200
+Subject: [PATCH] Fix string literal concatenation
+
+Clang is not able to disambiguate between multiple string literatals
+and C++11 user defined literals. Spaces help.
+---
+ src/update-mime-database.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/update-mime-database.cpp b/src/update-mime-database.cpp
+index 733ba063..29d82a9d 100644
+--- a/src/update-mime-database.cpp
b/src/update-mime-database.cpp
+@@ -2158,7 +2158,7 @@ static void check_in_path_xdg_data(const char *mime_path)
+
+ env = getenv("XDG_DATA_DIRS");
+ if (!env)
+- env = "/usr/local/share/"PATH_SEPARATOR"/usr/share/";
++ env = "/usr/local/share/" PATH_SEPARATOR "/usr/share/";
+ dirs = g_strsplit(env, PATH_SEPARATOR, 0);
+ g_return_if_fail(dirs != NULL);
+ for (n = 0; dirs[n]; n++)
+@@ -2170,7 +2170,7 @@ static void check_in_path_xdg_data(const char *mime_path)
+ dirs[n] = g_build_filename(g_get_home_dir(), ".local",
+ "share", NULL);
+ n++;
+-
++
+ for (i = 0; i < n; i++)
+ {
+ if (stat(dirs[i], _info) == 0 &&
+--
+GitLab
diff --git
a/x11-misc/shared-mime-info/files/shared-mime-info-2.3-fsync-detection.patch
b/x11-misc/shared-mime-info/files/shared-mime-info-2.3-fsync-detection.patch
new file mode 100644
index ..abf766c07f84
--- /dev/null
+++ b/x11-misc/shared-mime-info/files/shared-mime-info-2.3-fsync-detection.patch
@@ -0,0 +1,55 @@
+https://gitlab.freedesktop.org/xdg/shared-mime-info/-/commit/7499ac1a85b2487b94e315e6b55c34bcf220295f
+
+From 7499ac1a85b2487b94e315e6b55c34bcf220295f Mon Sep 17 00:00:00 2001
+From: Tobias Mayer
+Date: Sat, 7 Oct 2023 23:45:47 +0200
+Subject: [PATCH] Fix false positive fdatasync detection on darwin
+
+The `has_function` feature in meson uses different detection methods
+depending on the contents of the `prefix` kwarg [1]:
+
+ * if it contains `#include` directives it will copy the prefix into
+ the test code and check if it compiles
+ * if it doesn't contain an include or isn't specified, `has_function`
+ will forward declare the function and test for it's existence by
+ trying to link it to the default libraries
+
+The latter approach wrongly succeeds for `fdatasync` on darwin because
+the linker binds the function to a system call of the same name. Note
+that this result really is wrong because that system call has not
+the expected semantics of `fdatasync`.
+
+By adding an include for `unistd.h` we can get meson to use the
+first approach and the detection fails.
+
+Note that this has gone unnoticed so far because only recent versions
+of clang (the default compiler on darwin) started to treat implicit
+function declarations as an error.
+
+[1]
https://github.com/mesonbuild/meson/blob/583d2815d1a130227f0f4db47e4ab2e80ebb6a61/mesonbuild/compilers/mixins/clike.py#L839-L846
+
+Fixes #211
+---
+ meson.build | 7 +--
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 1780c443..7998a51b 100644
+--- a/meson.build
b/meson.build
+@@ -49,12 +49,7 @@ endif
+
###
+ # Dependencies
+
+-check_functions = [
+-'fdatasync',
+-]
+-foreach function : check_functions
+-config.set('HAVE_'+function.to_upper(), cc.has_function(function))
+-endforeach
++config.set('HAVE_FDATASYNC', cc.has_function('fdatasync', prefix: '#include
'))
+
+
+ if get_option('build-translations')
+--
+GitLab
diff --git
[gentoo-commits] repo/gentoo:master commit in: x11-misc/shared-mime-info/files/, x11-misc/shared-mime-info/
commit: 40fb79f4c69cdc4331ba21d12b65d70c8175b7e8
Author: Mike Gilbert gentoo org>
AuthorDate: Sun Nov 21 23:36:15 2021 +
Commit: Mike Gilbert gentoo org>
CommitDate: Sun Nov 21 23:38:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40fb79f4
x11-misc/shared-mime-info: avoid calling broken translation script
Closes: https://bugs.gentoo.org/824142
Signed-off-by: Mike Gilbert gentoo.org>
.../files/shared-mime-info-2.1-itstool.patch | 82 ++
.../shared-mime-info/shared-mime-info-2.1.ebuild | 5 +-
2 files changed, 86 insertions(+), 1 deletion(-)
diff --git a/x11-misc/shared-mime-info/files/shared-mime-info-2.1-itstool.patch
b/x11-misc/shared-mime-info/files/shared-mime-info-2.1-itstool.patch
new file mode 100644
index ..dedeb61e29cf
--- /dev/null
+++ b/x11-misc/shared-mime-info/files/shared-mime-info-2.1-itstool.patch
@@ -0,0 +1,82 @@
+From 5a406b06792e26a83c7346b3c2443c0bd8d4cdb2 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz
+Date: Mon, 8 Nov 2021 18:22:47 -0500
+Subject: [PATCH] migrate from custom itstool to builtin msgfmt for creating
+ translated XML
+
+gettext upstream has supported this for a very long time (since 0.19.7
+via commit b3c2a5a242c36fbbaa0c5b17f975d6c638598a23, released in 2015),
+and itstool is (mostly) a legacy of the time before gettext had proper
+support for these sorts of use cases.
+
+This is similar to the state of intltool, which is described at
+https://wiki.gnome.org/MigratingFromIntltoolToGettext
+
+During the port from autotools to meson, the legacy use of itstool was
+faithfully translated to meson in the only way possible: by jumping
+through hoops to run ninja inside ninja in order to generate the .mo
+files for itstool, because meson's i18n module used a flawed design and
+there was no "real" target to create those files, only a .PHONY
+run_target which other rules cannot depend on.
+
+Although meson 0.60.0 added support for real targets for the built .mo
+files, this changed the rules for output filenames, breaking the script.
+
+But msgfmt does not care, and anyways comes with builtin meson functions
+for convenient use with XML files. So let's take this opportunity to
+drop legacy dependencies and use the modern, builtin tooling, which
+fixes this bug as a side effect.
+
+Fixes #170
+---
+ .gitlab-ci.yml | 2 --
+ README.md| 2 +-
+ data/freedesktop_generate.sh | 12
+ data/meson.build | 16 +---
+ meson.build | 1 -
+ 5 files changed, 6 insertions(+), 27 deletions(-)
+ delete mode 100755 data/freedesktop_generate.sh
+
+diff --git a/data/meson.build b/data/meson.build
+index 24361c9..09ed7a9 100644
+--- a/data/meson.build
b/data/meson.build
+@@ -1,18 +1,12 @@
+
+ install_man('update-mime-database.1')
+
+-freedesktop_org_xml = custom_target('freedesktop.org.xml',
+-input : files(
+-'freedesktop.org.xml.in',
+-'its/shared-mime-info.its',
+-'its/shared-mime-info.loc',
+-),
++freedesktop_org_xml = i18n.merge_file(
++input: 'freedesktop.org.xml.in',
+ output: 'freedesktop.org.xml',
+-command: [
+-find_program('freedesktop_generate.sh'),
+-meson.source_root(),
+-meson.build_root()
+-],
++data_dirs: '.',
++po_dir: '../po',
++type: 'xml',
+ install: true,
+ install_dir: get_option('datadir') / 'mime' / 'packages',
+ )
+diff --git a/meson.build b/meson.build
+index 0d08c8a..60f17ae 100644
+--- a/meson.build
b/meson.build
+@@ -20,7 +20,6 @@
+
###
+ # Find tools
+
+-itstool = find_program('itstool')
+ xmllint = find_program('xmllint')
+ xmlto = find_program('xmlto')
+
+--
+GitLab
+
diff --git a/x11-misc/shared-mime-info/shared-mime-info-2.1.ebuild
b/x11-misc/shared-mime-info/shared-mime-info-2.1.ebuild
index 440f28e1465b..0957f1fa1a14 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-2.1.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-2.1.ebuild
@@ -20,7 +20,6 @@ RESTRICT="test"
BDEPEND="
app-text/docbook-xml-dtd:4.1.2
app-text/xmlto
- dev-util/itstool
sys-devel/gettext
virtual/pkgconfig
"
@@ -32,6 +31,10 @@ DEPEND="${RDEPEND}"
DOCS=( HACKING.md NEWS README.md )
+PATCHES=(
+ "${FILESDIR}/shared-mime-info-2.1-itstool.patch"
+)
+
src_install() {
meson_src_install
[gentoo-commits] repo/gentoo:master commit in: x11-misc/shared-mime-info/files/, x11-misc/shared-mime-info/
commit: 1e87a64d415f618ab7773bf251f4a96a2932be8c
Author: Lars Wendler gentoo org>
AuthorDate: Mon Jun 15 20:05:59 2020 +
Commit: Lars Wendler gentoo org>
CommitDate: Mon Jun 15 20:06:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e87a64d
x11-misc/shared-mime-info: Use upstream patch for previous fix
Closes: https://bugs.gentoo.org/728404
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Lars Wendler gentoo.org>
...ared-mime-info-2.0-pkgconfig_install_path.patch | 22 ++
.../shared-mime-info-2.0-r2.ebuild | 9 -
2 files changed, 26 insertions(+), 5 deletions(-)
diff --git
a/x11-misc/shared-mime-info/files/shared-mime-info-2.0-pkgconfig_install_path.patch
b/x11-misc/shared-mime-info/files/shared-mime-info-2.0-pkgconfig_install_path.patch
new file mode 100644
index 000..e694928728f
--- /dev/null
+++
b/x11-misc/shared-mime-info/files/shared-mime-info-2.0-pkgconfig_install_path.patch
@@ -0,0 +1,22 @@
+From 6bf9e4ff0fb7eff11a02bd937045bf5dc291841a Mon Sep 17 00:00:00 2001
+From: Bastien Nocera
+Date: Wed, 6 May 2020 16:48:47 +0200
+Subject: [PATCH] data: Fix pkg-config installation path
+
+---
+ data/meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/data/meson.build b/data/meson.build
+index 25ce031..e22b544 100644
+--- a/data/meson.build
b/data/meson.build
+@@ -38,4 +38,5 @@ pkgconfig.generate(
+ name: 'shared-mime-info',
+ description: 'Freedesktop common MIME database',
+ version: meson.project_version(),
++install_dir: get_option('datadir') / 'pkgconfig'
+ )
+--
+2.26.2
+
diff --git a/x11-misc/shared-mime-info/shared-mime-info-2.0-r2.ebuild
b/x11-misc/shared-mime-info/shared-mime-info-2.0-r2.ebuild
index b21ac610129..dc5eca64624 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-2.0-r2.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-2.0-r2.ebuild
@@ -31,6 +31,10 @@ DEPEND="${RDEPEND}"
DOCS=( HACKING.md NEWS README.md )
+PATCHES=(
+ "${FILESDIR}/${P}-pkgconfig_install_path.patch" #728404
+)
+
src_install() {
meson_src_install
@@ -39,11 +43,6 @@ src_install() {
echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share\"" >
"${T}"/50mimeinfo || die
doenvd "${T}"/50mimeinfo
fi
-
- # Move pkgconfig file to /usr/share/pkgconfig #728404
- dodir /usr/share/pkgconfig
- mv "${ED}"/usr/{$(get_libdir),share}/pkgconfig/${PN}.pc || die
- rm "${ED}"/usr/$(get_libdir) -r || die
}
pkg_postinst() {
