Accepting request 963486 from GNOME:Next

- Update to version 42.0:
  + Move /command feedback into a popover.
  + Port UI to libadwaita.
  + Misc. bug fixes and cleanups.
  + Updated translations.
- Drop patches fixed upstream:
  + 0f0a4b54142d8b424969f0b6ace6fc8b53b1d05d.patch
  + polari-fix-nb-translation.patch
- Add appstream-glib, desktop-file-utils and json-glib-devel
  BuildRequires, and add check section and meson_test macro:
  Validate appdata, desktopfile, networks.json and functions during
  build.
- Add pkgconfig(gtk4) and pkgconfig(libadwaita-1) BuildRequires:
  New dependencies after upstreams port of UI to libadwaita.
- Add obsolete-not-provided typelib-1_0-Polari-1_0 to rpmlintrc: We
  know that we are not providing the Obsoleted typelib, this is on
  purpose, as the typelib is now private.

OBS-URL: https://build.opensuse.org/request/show/963486
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/polari?expand=0&rev=117

0f0a4b54142d8b424969f0b6ace6fc8b53b1d05d.patch

@@ -1,43 +0,0 @@
-From 0f0a4b54142d8b424969f0b6ace6fc8b53b1d05d Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 24 Jan 2022 12:32:00 +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/appdata/meson.build:2:0: ERROR: Function does not take positional arguments.
-data/meson.build:5:0: ERROR: Function does not take positional arguments.
-
-Part-of: <https://gitlab.gnome.org/GNOME/polari/-/merge_requests/242>
----
- data/appdata/meson.build | 2 +-
- data/meson.build         | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/data/appdata/meson.build b/data/appdata/meson.build
-index 88b4a0be..781ba22f 100644
---- a/data/appdata/meson.build
-+++ b/data/appdata/meson.build
-@@ -1,5 +1,5 @@
- appdata_name = app_id + '.appdata.xml'
--appdata = i18n.merge_file(appdata_name,
-+appdata = i18n.merge_file(
-   input: appdata_name + '.in',
-   output: appdata_name,
-   po_dir: '../../po',
-diff --git a/data/meson.build b/data/meson.build
-index cedfd57b..655ae700 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -2,7 +2,7 @@ subdir('appdata')
- subdir('icons')
- 
- desktop_filename = app_id + '.desktop'
--desktop_file = i18n.merge_file(desktop_filename,
-+desktop_file = i18n.merge_file(
-   input: desktop_filename + '.in',
-   output: desktop_filename,
-   po_dir: '../po',
--- 
-GitLab
-

polari-41.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a3b05f81660370c67c942b6f44b298c7b78816feb38c926ec2212bde22ea40eb
-size 1125016

polari-42.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:58f15bbf5b42c0b0123efded775711d3b0f244997573094038ca556461e0493c
+size 1125160

polari-fix-nb-translation.patch

@@ -1,14 +0,0 @@
-diff -Nur orig-polari-3.34.1/po/nb.po polari-3.34.1/po/nb.po
---- orig-polari-3.34.1/po/nb.po	2019-12-02 15:50:00.000000000 +0100
-+++ polari-3.34.1/po/nb.po	2020-02-14 21:02:53.563204662 +0100
-@@ -505,8 +505,8 @@
- #, javascript-format
- msgid "%d user left"
- msgid_plural "%d users left"
--msgstr[0] "%d bruker igjen"
--msgstr[1] "%d brukere igjen"
-+msgstr[0] "%d bruker gikk ut"
-+msgstr[1] "%d brukere gikk ut"
- 
- #. today
- #. Translators: Time in 24h format

polari-rpmlintrc

@@ -1,2 +1,4 @@
 addFilter(".*devel-file-in-non-devel-package.*/usr/share/polari/gir-1.0/Polari-1.0.gir")
 addFilter(".*desktopfile-without-binary.*/usr/share/applications/org.gnome.Polari.desktop gapplication")
+# We are not providing the Obsoleted typelib as it is now private, hence we can not provide it no matter how much rpmlint wants us to.
+addFilter("W: obsolete-not-provided typelib-1_0-Polari-1_0")

polari.changes

@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Sun Mar 20 22:18:40 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 42.0:
+  + Move /command feedback into a popover.
+  + Port UI to libadwaita.
+  + Misc. bug fixes and cleanups.
+  + Updated translations.
+- Drop patches fixed upstream:
+  + 0f0a4b54142d8b424969f0b6ace6fc8b53b1d05d.patch
+  + polari-fix-nb-translation.patch
+- Add appstream-glib, desktop-file-utils and json-glib-devel
+  BuildRequires, and add check section and meson_test macro:
+  Validate appdata, desktopfile, networks.json and functions during
+  build.
+- Add pkgconfig(gtk4) and pkgconfig(libadwaita-1) BuildRequires:
+  New dependencies after upstreams port of UI to libadwaita.
+- Add obsolete-not-provided typelib-1_0-Polari-1_0 to rpmlintrc: We
+  know that we are not providing the Obsoleted typelib, this is on
+  purpose, as the typelib is now private.
+
 -------------------------------------------------------------------
 Tue Feb  1 12:31:32 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
 

polari.spec

@@ -18,27 +18,27 @@
 
 
 Name:           polari
-Version:        41.0
+Version:        42.0
 Release:        0
 Summary:        An IRC Client for GNOME
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
 Group:          Productivity/Networking/IRC
 URL:            https://wiki.gnome.org/Apps/Polari
-Source0:        https://download.gnome.org/sources/polari/41/%{name}-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/polari/42/%{name}-%{version}.tar.xz
 Source99:       polari-rpmlintrc
-# PATCH-FIX-UPSTREAM polari-fix-nb-translation.patch glgo#GNOME/polari!145 -- Fix Norwegian bokmål translation
-Patch0:         polari-fix-nb-translation.patch
-# PATCH-FIX-UPSTREAM 0f0a4b54142d8b424969f0b6ace6fc8b53b1d05d.patch -- Fix build with meson 0.61.0 and newer
-Patch1:         https://gitlab.gnome.org/GNOME/polari/-/commit/0f0a4b54142d8b424969f0b6ace6fc8b53b1d05d.patch
 
+BuildRequires:  appstream-glib
+BuildRequires:  desktop-file-utils
 BuildRequires:  gjs >= 1.57.3
+BuildRequires:  json-glib-devel
 BuildRequires:  meson >= 0.53.0
 BuildRequires:  pkgconfig
 BuildRequires:  yelp-tools
 BuildRequires:  pkgconfig(gio-2.0) >= 2.43.4
 BuildRequires:  pkgconfig(gjs-1.0) >= 1.69.2
 BuildRequires:  pkgconfig(gobject-introspection-1.0) >= 0.9.6
-#BuildRequires:  pkgconfig(gtk+-3.0) >= 3.21.6
+BuildRequires:  pkgconfig(gtk4)
+BuildRequires:  pkgconfig(libadwaita-1)
 BuildRequires:  pkgconfig(pango)
 BuildRequires:  pkgconfig(pangocairo)
 BuildRequires:  pkgconfig(telepathy-glib)
@@ -69,6 +69,9 @@ with GNOME 3.
 %meson_install
 %find_lang %{name} %{?no_lang_C}
 
+%check
+%meson_test
+
 %files
 %license COPYING
 %doc AUTHORS NEWS