Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gtg for openSUSE:Factory checked in at 2022-01-10 23:53:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gtg (Old) and /work/SRC/openSUSE:Factory/.gtg.new.1892 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gtg" Mon Jan 10 23:53:25 2022 rev:2 rq:945295 version:0.5 Changes: -------- --- /work/SRC/openSUSE:Factory/gtg/gtg.changes 2021-04-29 01:39:09.602643041 +0200 +++ /work/SRC/openSUSE:Factory/.gtg.new.1892/gtg.changes 2022-01-10 23:53:56.920822499 +0100 @@ -1,0 +2,22 @@ +Fri Jan 7 23:36:48 UTC 2022 - Luciano Santos <luc1...@opensuse.org> + +- Add fix upstream 0001-GTG-0.5-fix-meson-build-failure.patch based + on commit 1809d10663ae3d8f69c04138b66f9b4e66ee14f6. + Fix i18n.merge_file() that got "build_always_stale" keyword + argument removed from Meson 0.60 release. +- Add sed call to fix shebang issues (env python3, or unneeded + shebang) for gtg binary, networkmanager.py, info.py and + script_pocketmod. + +------------------------------------------------------------------- +Tue Jan 4 22:45:50 UTC 2022 - Luciano Santos <luc1...@opensuse.org> + +- Add explicit python-rpm-macros build requirement to avoid + openSUSE Leap build failures due to package not being pulled + automatically. +- Update "GPL-3.0+" license tag to "GPL-3.0-or-later" following + SPDX-3.0 format. +- Make use of version macro in Source tag rather than hardcode. +- Drop deprecated BuildRoot tag. + +------------------------------------------------------------------- New: ---- 0001-GTG-0.5-fix-meson-build-failure.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtg.spec ++++++ --- /var/tmp/diff_new_pack.lrSKG8/_old 2022-01-10 23:53:57.464822976 +0100 +++ /var/tmp/diff_new_pack.lrSKG8/_new 2022-01-10 23:53:57.468822980 +0100 @@ -1,7 +1,7 @@ # # spec file for package gtg # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,24 +15,30 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + Name: gtg Version: 0.5 Release: 0 Summary: Personal Organizer for GNOME -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Productivity/Office/Organizers URL: https://wiki.gnome.org/Apps/GTG -Source0: https://github.com/getting-things-gnome/gtg/archive/refs/tags/v0.5.tar.gz +Source0: https://github.com/getting-things-gnome/gtg/archive/refs/tags/v%{version}.tar.gz +# PATCH-FIX-UPSTREAM fix-meson-build-failure.patch -- luc1...@opensuse.org +# based on commit 1809d10663ae3d8f69c04138b66f9b4e66ee14f6. +# Fix i18n.merge_file() that got "build_always_stale" keyword +# argument removed from Meson 0.60 release. +Patch0: 0001-GTG-0.5-fix-meson-build-failure.patch BuildRequires: fdupes -BuildRequires: update-desktop-files BuildRequires: meson -Requires: python3-pycairo +BuildRequires: python-rpm-macros +BuildRequires: update-desktop-files Requires: python3-gobject-Gdk -Requires: python3-lxml Requires: python3-liblarch Requires: python3-liblarch-gtk -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: python3-lxml +Requires: python3-pycairo BuildArch: noarch %description @@ -45,9 +51,14 @@ from small tasks to large projects. %lang_package + %prep %autosetup -p1 +### Fix Shebang Issues ### +sed -i -e '1s/env //' GTG/{gtg.in,core/networkmanager.py} +sed -i -r '1s/(.*)/# \1/' GTG/{core/info.py.in,plugins/export/export_templates/script_pocketmod} + %build %meson %{nil} %meson_build ++++++ 0001-GTG-0.5-fix-meson-build-failure.patch ++++++ >From 1809d10663ae3d8f69c04138b66f9b4e66ee14f6 Mon Sep 17 00:00:00 2001 From: Neui <neui...@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 eb20f0b8..55688528 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 0af3e5f1..184f9884 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 -- 2.34.1
