Accepting request 1308801 from GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/1308801
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bijiben?expand=0&rev=62

158.patch

@@ -1,46 +0,0 @@
-From 994af76ce5144062d55d141129bf6bf5fab002ee Mon Sep 17 00:00:00 2001
-From: Michal Vasilek <michal@vasilek.cz>
-Date: Sat, 22 Jan 2022 23:16:37 +0100
-Subject: [PATCH] meson: fix build with meson 0.61
-
-i18n.merge_file doesn't accept positional arguments
----
- data/appdata/meson.build | 1 -
- data/meson.build         | 2 --
- 2 files changed, 3 deletions(-)
-
-diff --git a/data/appdata/meson.build b/data/appdata/meson.build
-index 48a31e3c..d78d052f 100644
---- a/data/appdata/meson.build
-+++ b/data/appdata/meson.build
-@@ -1,7 +1,6 @@
- info = 'org.gnome.Notes.appdata.xml'
- 
- i18n.merge_file(
--  info,
-   input: info + '.in',
-   output: info,
-   po_dir: po_dir,
-diff --git a/data/meson.build b/data/meson.build
-index d00d98f1..556d5642 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -4,7 +4,6 @@ subdir('appdata')
- mime = 'org.gnome.Notes.xml'
- 
- i18n.merge_file(
--  mime,
-   input: mime + '.in',
-   output: mime,
-   po_dir: po_dir,
-@@ -18,7 +17,6 @@ desktop_conf = configuration_data()
- desktop_conf.set ('icon', application_id)
- 
- i18n.merge_file(
--  desktop,
-   type: 'desktop',
-   input: configure_file(
-     input: files (desktop + '.in'),
--- 
-GitLab
-

_service

@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<services>
+  <service name="obs_scm" mode="manual">
+    <param name="scm">git</param>
+    <param name="url">https://gitlab.gnome.org/GNOME/gnome-notes.git</param>
+    <param name="revision">b629192b8adddddb9181500f02e43fcb6919f8b3</param>
+    <param name="versionformat">40.1+git@TAG_OFFSET@.%h</param>
+    <!--
+    <param name="versionformat">@PARENT_TAG@+git@TAG_OFFSET@.%h</param>
+    <param name="versionrewrite-pattern">BIJIBEN_(\d+)_(\d+)(\+0)?(.*)?</param>
+    <param name="versionrewrite-replacement">\1.\2\3\4</param>
+    -->
+    <param name="filename">bijiben</param>
+<!--    <param name="changesgenerate">enable</param> -->
+  </service>
+  <service name="tar" mode="buildtime"/>
+  <service name="recompress" mode="buildtime">
+    <param name="file">*.tar</param>
+    <param name="compression">zst</param>
+  </service>
+  <service name="set_version" mode="manual" />
+</services>

bijiben-40.1+git499.b629192.obscpio

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

bijiben-40.1.tar.xz

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

bijiben-switch-to-soup3.patch

@@ -1,11 +0,0 @@
---- orig-bijiben-40.1/meson.build	2021-04-30 13:59:10.302303300 +0200
-+++ bijiben-40.1/meson.build	2022-08-30 22:11:07.619192939 +0200
-@@ -126,7 +126,7 @@
-   dependency('libxml-2.0'),
-   dependency('libcurl'),
-   dependency('uuid'),
--  dependency('webkit2gtk-4.0', version: '>= 2.26'),
-+  dependency('webkit2gtk-4.1', version: '>= 2.26'),
-   cc.find_library('m')
- ]
- 

bijiben.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Thu Sep 18 14:19:36 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 40.1+git499.b629192:
+  + Port to gtk4
+  + Port to libadwaita.
+  + Port to webkitgtk-6.0
+  + Updated translations.
+- Changes to BuildRequries following upstreams ports:
+  + Add: pkgconfig(gtk4), pkgconfig(libadwaita-1) and
+    pkgconfig(webkitgtk-6.0)
+  + Drop: pkgconfig(gtk+-3.0), pkgconfig(libhandy-1) and
+    pkgconfig(webkit2gtk-4.1)
+- Drop patches fixed upstream:
+  + 158.patch
+  + bijiben-switch-to-soup3.patch
+
 -------------------------------------------------------------------
 Mon Aug 19 11:27:11 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
 

bijiben.obsinfo

@@ -0,0 +1,4 @@
+name: bijiben
+version: 40.1+git499.b629192
+mtime: 1755634615
+commit: b629192b8adddddb9181500f02e43fcb6919f8b3

bijiben.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package bijiben
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,17 +17,13 @@
 
 
 Name:           bijiben
-Version:        40.1
+Version:        40.1+git499.b629192
 Release:        0
 Summary:        Note editor for GNOME
 License:        CC-BY-SA-3.0 AND GPL-3.0-or-later
 Group:          Productivity/Text/Editors
 URL:            https://wiki.gnome.org/Apps/Bijiben
-Source0:        https://download.gnome.org/sources/bijiben/40/%{name}-%{version}.tar.xz
-# PATCH-FIX-UPSTREAM 158.patch -- Fix build with meson 0.61.0 and newer
-Patch0:         https://gitlab.gnome.org/GNOME/gnome-notes/-/merge_requests/158.patch
-# PATCH-FIX-UPSTREAM bijiben-switch-to-soup3.patch -- Backport upstream switch to soup3
-Patch1:         bijiben-switch-to-soup3.patch
+Source0:        %{name}-%{version}.tar.zst
 
 BuildRequires:  fdupes
 BuildRequires:  gettext-devel
@@ -38,16 +34,17 @@ BuildRequires:  pkgconfig(gio-unix-2.0)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.58
 BuildRequires:  pkgconfig(goa-1.0)
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
-BuildRequires:  pkgconfig(gtk+-3.0) >= 3.19.3
+BuildRequires:  pkgconfig(gtk4)
 BuildRequires:  pkgconfig(json-glib-1.0)
+BuildRequires:  pkgconfig(libadwaita-1)
 BuildRequires:  pkgconfig(libcurl)
 BuildRequires:  pkgconfig(libecal-2.0) >= 3.33.92
 BuildRequires:  pkgconfig(libedataserver-1.2) >= 3.33.92
-BuildRequires:  pkgconfig(libhandy-1) >= 1.0.0
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(tracker-sparql-3.0)
 BuildRequires:  pkgconfig(uuid)
-BuildRequires:  pkgconfig(webkit2gtk-4.1) >= 2.26.0
+BuildRequires:  pkgconfig(webkitgtk-6.0)
+Provides:       gnome-notes = %{version}
 
 %description
 Bijiben is a note editor designed to remain simple to use.
@@ -94,7 +91,7 @@ search results from documents.
 %{_datadir}/icons/hicolor/*/apps/org.gnome.Notes*
 %{_datadir}/mime/packages/org.gnome.Notes.xml
 %dir %{_datadir}/metainfo/
-%{_datadir}/metainfo/org.gnome.Notes.appdata.xml
+%{_datadir}/metainfo/org.gnome.Notes.metainfo.xml
 
 %files -n gnome-shell-search-provider-%{name}
 %{_datadir}/dbus-1/services/org.gnome.Notes.SearchProvider.service