From ff3ab24285912bc94a9c5acbb6ebbbe90ab0c323bbb34c0850e982e6c893c126 Mon Sep 17 00:00:00 2001 From: Luciano Santos Date: Mon, 21 Mar 2022 01:00:18 +0000 Subject: [PATCH] Accepting request 962762 from GNOME:Next GNOME 42 - here we come OBS-URL: https://build.opensuse.org/request/show/962762 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gnote?expand=0&rev=150 --- 21.patch | 36 ------------------------------------ gnote-41.2.tar.xz | 3 --- gnote-42.beta.tar.xz | 3 +++ gnote.changes | 22 ++++++++++++++++++++++ gnote.spec | 8 +++----- 5 files changed, 28 insertions(+), 44 deletions(-) delete mode 100644 21.patch delete mode 100644 gnote-41.2.tar.xz create mode 100644 gnote-42.beta.tar.xz diff --git a/21.patch b/21.patch deleted file mode 100644 index e419311..0000000 --- a/21.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 32795e53681e3ecbaaa05817d4eb5fa1c124d35b Mon Sep 17 00:00:00 2001 -From: Jan Beich -Date: Mon, 24 Jan 2022 11:53:17 +0000 -Subject: [PATCH] meson: drop unused argument for i18n.merge_file() - -Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. - -data/meson.build:4:0: ERROR: Function does not take positional arguments. -data/meson.build:41:0: ERROR: Function does not take positional arguments. ---- - data/meson.build | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index a6138165..8d16368a 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -2,7 +2,6 @@ install_man('gnote.1') - - desktop_file = 'org.gnome.Gnote.desktop' - gnote_desktop_file = i18n.merge_file( -- desktop_file, - type: 'desktop', - input: desktop_file + '.in', - output: desktop_file, -@@ -39,7 +38,6 @@ configure_file( - - gnote_appdata = 'org.gnome.Gnote.appdata.xml' - appdata_file = i18n.merge_file( -- gnote_appdata, - input: gnote_appdata + '.in', - output: gnote_appdata, - po_dir: '../po', --- -GitLab - diff --git a/gnote-41.2.tar.xz b/gnote-41.2.tar.xz deleted file mode 100644 index d126e12..0000000 --- a/gnote-41.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:21b0ef43514e6b68a08ed8573130185be36dbb9fb463b426ebd9f18c5092423f -size 3167080 diff --git a/gnote-42.beta.tar.xz b/gnote-42.beta.tar.xz new file mode 100644 index 0000000..b3d2912 --- /dev/null +++ b/gnote-42.beta.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f431292d713e8280acaed6f54182095696d7b39fee16d2e504a154d46ca9ff5e +size 3330444 diff --git a/gnote.changes b/gnote.changes index 6162a8f..7f4e542 100644 --- a/gnote.changes +++ b/gnote.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Mar 14 10:47:09 UTC 2022 - Bjørn Lie + +- Update to version 42.beta: + + Fix build using meson 0.61.0. + + Manual updates and fixes. + + Fix wrong selection after backgrounding. + + Show help for --background option. + + Updated translations. +- Drop 21.patch: Fixed upstream. + ------------------------------------------------------------------- Wed Feb 2 21:13:40 UTC 2022 - Bjørn Lie @@ -9,6 +20,17 @@ Wed Feb 2 21:13:40 UTC 2022 - Bjørn Lie during build using upstreams included tests. - Add explicit generic c_compiler BuildRequires. +------------------------------------------------------------------- +Mon Jan 10 20:42:01 UTC 2022 - Bjørn Lie + +- Update to version 42.alpha: + + New Features: Main UI now uses tabs to open notes. + + Bugs fixed: + - Fix duplicate condition in SyncManager. + - Rename lefover Add-in to plugin in manual. + - Fix date formatting when second is single digit. + - Fix excessive saves due to rogue marks. + ------------------------------------------------------------------- Mon Jan 10 20:04:41 UTC 2022 - Bjørn Lie diff --git a/gnote.spec b/gnote.spec index 99fb005..e924038 100644 --- a/gnote.spec +++ b/gnote.spec @@ -16,19 +16,17 @@ # -%define base_version 41 +%define base_version 42 Name: gnote -Version: 41.2 +Version: 42.beta Release: 0 Summary: A Port of Tomboy to C++ License: GPL-3.0-or-later Group: Productivity/Text/Editors URL: https://wiki.gnome.org/Apps/Gnote -Source0: https://download.gnome.org/sources/gnote/41/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/gnote/%{base_version}/%{name}-%{version}.tar.xz Source99: gnote-rpmlintrc -# PATCH-FIX-UPSTREAM 21.patch -- Fix build with meson 0.60 and newer -Patch0: https://gitlab.gnome.org/GNOME/gnote/-/merge_requests/21.patch BuildRequires: appstream-glib BuildRequires: c++_compiler