gentoo resync : 05.12.2021

3 files changed, 55 insertions, 1 deletions

diff --git a/app-office/gtg/Manifest b/app-office/gtg/Manifest
index 28d58ba938da..fbb496ccb5f8 100644
--- a/app-office/gtg/Manifest
+++ b/app-office/gtg/Manifest
@@ -1,8 +1,9 @@
+AUX 0.5-Revert-meson-plugin-translation-apply-thing.patch 2389 BLAKE2B e383adebcd628be98826fe9caa9f7bfd6a5133fe0407e1d0041648f98c4bf2abe9eab7dee415bb709a5dcded98c1552feb7a83fc383146d3306219b2d4816e64 SHA512 654d18f0856514de48e2533b594508c411f0abdc468be95212a6bf237f5c97a7f55dffcb4eb2bd22cf09edfae493a39234112419a5c9c9dbc0114b25a86790fd
 AUX 0.5-mouse-cursor-fixes1.patch 2684 BLAKE2B 3ed8e075911fca65eb8031ea9a998411365c48a40b0985f9ba7bca6de107986be12b74c23ce4d1ab0b469823b60c38875ba592a7e8eaa6e049052a5f88ab8ea6 SHA512 6dcc68967e148bc481a615063913393e2190d8ea070cf193f6525e2e6f24947099fb20353cfb27270005ea2c244d706206f3f3b6f2e48e2f107f8c3f8938f72a
 AUX 0.5-mouse-cursor-fixes2.patch 2299 BLAKE2B 0664740211d33f56f8a55efcec05c89e82f113d04e808a3a883c2c0c9db0298dc2d9bbb060472dfdd3a3a1c219a287aef224387fc161b8b72c44091cee85dc0b SHA512 6a055344dd5012ae0c2a27d115c7c06530ff26fb4817f73f0c9bcaec9dcfb07ed6bc5c40d644f2feaf26c8b7eec7020432b5ae3653c598faea1c55c64a6b6fe4
 AUX 0.5-mouse-cursor-fixes3.patch 1431 BLAKE2B 887e3237d57623b12d3b94e67138aa0838f6b5782aeff18abec12a1f6607334cf49dd1bd82d07053a80649a1f3bb7fdcf1c02a9d7b36749a0a45fe8e9f80ce7a SHA512 a353a4bc4d641e973cd50424cfa089a213d3de283b1c61c3aaeb859d2e8f068108d7740b1f3f6935f20142d2500ca0dffcdd570e47e83b9e0d9959da37f3e726
 DIST gtg-0.4.0.tar.xz 3744752 BLAKE2B fdeabe32135dea24ac6113a486650b66b5143aa745117029b03e26e1bb3f2e8629623b26efdae0c8217741a2b4964b5dc060f0e450c05c950e21ea360f3f3823 SHA512 f2677f6bbc0b6cb21b7882a2bd0342b4919581c12e4aa43c13b5dbc48740418c512a41619584d0d75bfa63ebc4a5460abfbc27360e1817c8832cbecf3c34a60e
 DIST gtg-0.5.tar.gz 2229259 BLAKE2B e724cbd015a6f0b6fee62c52283b56244490efb7df4e57b2e30745f58fbc41442b008f5c81b53cfd001f04a92ff53a14e2117d6c12d0d5a35fe49158b5f736fa SHA512 631f5343301d7d72211398152fa081c0fa15154babc7ec900f13a39a2677d0edaf4fea534a83284207e8019926c9108dc1d8f25bdbeae85ef0665dfe1c7b768a
 EBUILD gtg-0.4.0.ebuild 1365 BLAKE2B 1a8fafbc64ddf449930d8494e14c1e602977438dfdae024a5298d0aceebee153781fb99878484498b17020a8be475949552e48ca5e37af71a16cc441c481fd86 SHA512 7d1ac5b538ca7d10e9b5c77134b1426aaef69d16d1386210819be6d39e155014083d8d506d07125444674a4215776f832a884524305bcdc2f56effa58b7bd85d
-EBUILD gtg-0.5.ebuild 1569 BLAKE2B 2dde0c9370f60590019cc6bf464e0882eb5d5cef89ee6eeb71d12e2fae41c33e1a43438eadc6bd6352ac13c27ab52702d0489c319aa637d93ce4caf6fd7bc35b SHA512 3a8e9b98dbbf800c3864270336f8628b789ef1c5198d5d24415c24f7b8d19cb3771be5935700ca051e6083d9f380da5566217a406295defb2dc1ec5a59aa4eba
+EBUILD gtg-0.5.ebuild 1638 BLAKE2B 1cbe2180ab53b4e86fec563fe6983881af73d89ce1505559f6fcf0c497e8344ebdad89f2b4b42c6184dff1c217f360f1f06a9b7c8e1b7196d3e1a8e5d2967137 SHA512 e41b023fe409b24d578f1452f101cc5550f26ee6ecf0e9eec03097a811279fd7d2893dcb73c1871a8ebf61ad295b5365c19bbecb3d189a6bfc73a30132782971
 MISC metadata.xml 887 BLAKE2B dc510d2d5598d32acd9ab78b794618c2f16f25fb25c605fda6f0aa944d93d282c26cc2f39277bf313e4688025195baf13f5ab3e376fe5462c77f1af2bbd7dd93 SHA512 f41496c2e499341cd7f6c7538b27edb7a4c02ffbf5d36d6971d5bcb0b58076ae6f131dcfde499e80b21afea349cb4ca2b25e9d23b35af4ab6d7510136d6a785c
diff --git a/app-office/gtg/files/0.5-Revert-meson-plugin-translation-apply-thing.patch b/app-office/gtg/files/0.5-Revert-meson-plugin-translation-apply-thing.patch
new file mode 100644
index 000000000000..915e40cadfdc
--- /dev/null
+++ b/app-office/gtg/files/0.5-Revert-meson-plugin-translation-apply-thing.patch
@@ -0,0 +1,52 @@
+From 1809d10663ae3d8f69c04138b66f9b4e66ee14f6 Mon Sep 17 00:00:00 2001
+From: Neui <neuisen@googlemail.com>
+Date: Mon, 15 Nov 2021 01:53:40 +0100
+Subject: [PATCH] Revert meson plugin translation apply thing
+
+Since meson 0.60, the `build_always_stale` option was removed:
+https://github.com/mesonbuild/meson/commit/6b1a80024c79876dc3b75f2b525be24ca8fe671a
+
+However, meson doesn't make such files depend on the translation .po
+files, which is a known bug:
+https://github.com/mesonbuild/meson/issues/2621
+
+So with that option taken away, I tried passing a list to the input
+which includes all .po files, since I saw it only uses the first element
+for the translations, but that fails when trying to generate po files.
+
+Since it seems you can't dynamically add dependencies after the fact,
+this seems like a dead end, so I am reverting this for now to make it
+compile on meson 0.60.
+---
+ GTG/plugins/meson.build          | 4 +---
+ docs/contributors/translating.md | 3 +++
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/GTG/plugins/meson.build b/GTG/plugins/meson.build
+index eb20f0b85..556885280 100644
+--- a/GTG/plugins/meson.build
++++ b/GTG/plugins/meson.build
+@@ -24,9 +24,7 @@ foreach plugin : gtg_plugins
+     install_dir: plugin_install_dir,
+     type: 'desktop',
+     args: ['--keyword=name', '--keyword=short-description', '--keyword=description'],
+-    build_by_default: true,
+-    build_always_stale: true
+-    # build always because otherwise new translations won't be applied
++    build_by_default: true
+   )
+   subdir(plugin.underscorify())
+ endforeach
+diff --git a/docs/contributors/translating.md b/docs/contributors/translating.md
+index 0af3e5f19..184f98843 100644
+--- a/docs/contributors/translating.md
++++ b/docs/contributors/translating.md
+@@ -75,5 +75,8 @@ Make sure to this AFTER COMMITING YOUR CHANGES!
+ * During launching, it might complain about certain files not being found in [`po/POTFILES.in`][POTFILES.IN].
+   It is safe to remove the lines from that file and re-run until it works.
+   It would be useful to comment about that if you're submitting your translation, just in case.
++* Plugin related strings don't update after updating the translation.
++  The cause is unknown, but you can delete the plugin files to re-generate
++  them using the new translations: `rm -f .local_build/GTG/plugins/*.gtg-plugin`
+ 
+ [POTFILES.IN]: ../../po/POTFILES.in
diff --git a/app-office/gtg/gtg-0.5.ebuild b/app-office/gtg/gtg-0.5.ebuild
index 665f741c9650..c3ae9ba1ab10 100644
--- a/app-office/gtg/gtg-0.5.ebuild
+++ b/app-office/gtg/gtg-0.5.ebuild
@@ -49,6 +49,7 @@ BDEPEND="
 PATCHES=(
 	# Fixes tests, and mouse cursor with some themes
 	"${FILESDIR}"/${PV}-mouse-cursor-fixes{1,2,3}.patch
+	"${FILESDIR}"/0.5-Revert-meson-plugin-translation-apply-thing.patch
 )
 
 src_install() {