gentoo resync : 16.01.2021

3 files changed, 86 insertions, 0 deletions

diff --git a/gnome-extra/gucharmap/files/14.0.1-fix-file-conflicts.patch b/gnome-extra/gucharmap/files/14.0.1-fix-file-conflicts.patch
new file mode 100644
index 000000000000..55a346271880
--- /dev/null
+++ b/gnome-extra/gucharmap/files/14.0.1-fix-file-conflicts.patch
@@ -0,0 +1,26 @@
+From 92b5a40d2d84e1989cdd091a10660e14e66c4daf Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <mart@leio.tech>
+Date: Sun, 16 Jan 2022 01:03:08 +0200
+Subject: [PATCH 3/3] build: Use API version in gettext domain
+
+Avoids file conficts with other API versions being installed on the system.
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 00cfbeec..db44e1dd 100644
+--- a/meson.build
++++ b/meson.build
+@@ -78,7 +78,7 @@ libgucharmap_gtk4_soversion = '0'
+ 
+ # i18n
+ 
+-gucharmap_gettext_domain = gucharmap_name
++gucharmap_gettext_domain = libgucharmap_gtk3_api_name
+ po_dir = meson.current_source_dir() / 'po'
+ 
+ # Directories
+-- 
+2.32.0
+
diff --git a/gnome-extra/gucharmap/files/14.0.1-install-user-help.patch b/gnome-extra/gucharmap/files/14.0.1-install-user-help.patch
new file mode 100644
index 000000000000..42507f865685
--- /dev/null
+++ b/gnome-extra/gucharmap/files/14.0.1-install-user-help.patch
@@ -0,0 +1,28 @@
+From 3193fe41561e6ddd99c1f5148089aa51c88236aa Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <mart@leio.tech>
+Date: Sun, 16 Jan 2022 01:00:43 +0200
+Subject: [PATCH 2/3] build: Always build and install user help
+
+We need a separate knob for gtk-doc that wouldn't affect user help
+being installed. Just remove the docs option check for user help to
+always installed it for us.
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 9529f5d1..00cfbeec 100644
+--- a/meson.build
++++ b/meson.build
+@@ -262,7 +262,7 @@ if get_option('docs')
+   subdir('docs' / 'reference')
+ endif
+ 
+-if get_option('docs') and get_option('charmap')
++if get_option('charmap')
+   subdir('help')
+ endif
+ 
+-- 
+2.32.0
+
diff --git a/gnome-extra/gucharmap/files/14.0.1-meson-0.60-fix.patch b/gnome-extra/gucharmap/files/14.0.1-meson-0.60-fix.patch
new file mode 100644
index 000000000000..682f52a960c4
--- /dev/null
+++ b/gnome-extra/gucharmap/files/14.0.1-meson-0.60-fix.patch
@@ -0,0 +1,32 @@
+From 7e748fcf7e7459e3a0368f4d057d241adc71936b Mon Sep 17 00:00:00 2001
+From: Christian Persch <chpe@src.gnome.org>
+Date: Wed, 15 Dec 2021 00:03:33 +0100
+Subject: [PATCH 1/3] build: Fix build with meson 0.60
+
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 11e4e8a6..4bd50014 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -18,7 +18,6 @@
+ metainfodir = gucharmap_prefix / gucharmap_datadir / 'metainfo'
+ 
+ i18n.merge_file(
+-  'gucharmap.metainfo.xml',
+   input: 'gucharmap.metainfo.xml.in',
+   output: '@BASENAME@',
+   po_dir: po_dir,
+@@ -42,7 +41,6 @@ desktop_in = configure_file(
+ )
+ 
+ i18n.merge_file(
+-  'gucharmap.desktop',
+   input: desktop_in,
+   output: '@BASENAME@',
+   type: 'desktop',
+-- 
+2.32.0
+