git: 5a86a555fb00 - main - deskutils/bijiben: Import backport in tree

The branch main has been updated by diizzy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5a86a555fb000b7b009f3db6e8b5cb8dc5992f26

commit 5a86a555fb000b7b009f3db6e8b5cb8dc5992f26
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2025-06-20 15:27:09 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2025-06-20 15:45:26 +0000

    deskutils/bijiben: Import backport in tree
    
    Import upstream commit 01ccae2ccb640b2d33fd09c3dfb7d605830b5b0f
    locally as Gnome's GitLab instance no longer allows fetching commits
    anonymously (at least for this project).
    This approach is also fragile in general as GitLab instances
    tends to shuffle around metadata causing checksums to fail frequently.
    
    Approved by:    blanket
---
 deskutils/bijiben/Makefile                             |  3 ---
 deskutils/bijiben/files/patch-data_appdata_meson.build | 10 ++++++++++
 deskutils/bijiben/files/patch-data_meson.build         | 18 ++++++++++++++++++
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/deskutils/bijiben/Makefile b/deskutils/bijiben/Makefile
index f89103e3b97d..22d58909aa63 100644
--- a/deskutils/bijiben/Makefile
+++ b/deskutils/bijiben/Makefile
@@ -5,9 +5,6 @@ CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
 
-PATCH_SITES=	https://gitlab.gnome.org/GNOME/${PORTNAME}/-/commit/
-PATCHFILES+=	01ccae2ccb64.patch:-p1 # https://gitlab.gnome.org/GNOME/bijiben/-/merge_requests/158
-
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Note editor designed to remain simple to use
 WWW=		https://wiki.gnome.org/Apps/Bijiben
diff --git a/deskutils/bijiben/files/patch-data_appdata_meson.build b/deskutils/bijiben/files/patch-data_appdata_meson.build
new file mode 100644
index 000000000000..292d44176224
--- /dev/null
+++ b/deskutils/bijiben/files/patch-data_appdata_meson.build
@@ -0,0 +1,10 @@
+--- data/appdata/meson.build.orig	2021-04-30 11:59:10 UTC
++++ data/appdata/meson.build
+@@ -1,7 +1,6 @@ i18n.merge_file(
+ info = 'org.gnome.Notes.appdata.xml'
+ 
+ i18n.merge_file(
+-  info,
+   input: info + '.in',
+   output: info,
+   po_dir: po_dir,
diff --git a/deskutils/bijiben/files/patch-data_meson.build b/deskutils/bijiben/files/patch-data_meson.build
new file mode 100644
index 000000000000..bcc1d993de51
--- /dev/null
+++ b/deskutils/bijiben/files/patch-data_meson.build
@@ -0,0 +1,18 @@
+--- data/meson.build.orig	2021-04-30 11:59:10 UTC
++++ data/meson.build
+@@ -4,7 +4,6 @@ i18n.merge_file(
+ mime = 'org.gnome.Notes.xml'
+ 
+ i18n.merge_file(
+-  mime,
+   input: mime + '.in',
+   output: mime,
+   po_dir: po_dir,
+@@ -18,7 +17,6 @@ i18n.merge_file(
+ desktop_conf.set ('icon', application_id)
+ 
+ i18n.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: configure_file(
+     input: files (desktop + '.in'),