diff options
Diffstat (limited to 'app-misc/bijiben')
| -rw-r--r-- | app-misc/bijiben/Manifest | 3 | ||||
| -rw-r--r-- | app-misc/bijiben/bijiben-40.1.ebuild | 6 | ||||
| -rw-r--r-- | app-misc/bijiben/files/bijiben-40.1-meson-0.61.patch | 38 |
3 files changed, 45 insertions, 2 deletions
diff --git a/app-misc/bijiben/Manifest b/app-misc/bijiben/Manifest index cf0ff196b4fa..07fc17c87458 100644 --- a/app-misc/bijiben/Manifest +++ b/app-misc/bijiben/Manifest @@ -1,3 +1,4 @@ +AUX bijiben-40.1-meson-0.61.patch 978 BLAKE2B 35dfc7084a7b1795dd6c3b36434e94031bf16abba31401942760c095e076f817857e90b09356ec9f1540fa5821b4f31014d71d63b2a32d83bcff73bb39599a92 SHA512 0b3cd4ea3cee7a6368ff18edc4e5206f2e354b4d8be6a88b2ce10c0dc7a7a1fbbee7fe596592d239d1ed21d394297519579c08c9254a4677dcf48d037a37b959 DIST bijiben-40.1.tar.xz 687344 BLAKE2B 187e6d0af40649ef35453af4ce51f286196bfd0570370136611cd2191e6c0c6b578e95eb4b6edf448bac6ae7b93b729afef161d3cd4d2cbd9c40f873ed5004c3 SHA512 5d2e0694f9eddca9a152eac5c208b51a15d2a5651ab77c79c1bb94425c0f1541c916887c3aab5fb8b105ca50d0f14c432ac18cd8ac64d03e2a0ee46c91901f10 -EBUILD bijiben-40.1.ebuild 1125 BLAKE2B 69f54c4656fdde89c593d777a16413cfee8561d02d45f707731470cca0769f82759c040d89e22d413203cd089276912eab661ee082d64bcdc12f63118bdbca60 SHA512 064b4462f30e9709593b76849a17cc791177b6967cc69deff12c9c198b6fb733c111aeb790cca9320617bf17c713aad0a4625e06770fdb5a1d51ce99f904a78a +EBUILD bijiben-40.1.ebuild 1181 BLAKE2B 83df7aaf07ac771b32bf956c445325f1d5a0bb0c85660fd932fe1184a6a286f0b1f810231bf7bfb0e879dd26cd8015880afd4dd7908f4f6c53ac00e8aff2a3f6 SHA512 260958ada151bb6b411c69da721fb0e8538a15bff1b670b6b014a692f68862cec701b0386353011cc0fc53a1fe53aefbfb252a420d4bad58a18ba27a97ebcb2a MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8 diff --git a/app-misc/bijiben/bijiben-40.1.ebuild b/app-misc/bijiben/bijiben-40.1.ebuild index d0fada65c229..261b6eea5d78 100644 --- a/app-misc/bijiben/bijiben-40.1.ebuild +++ b/app-misc/bijiben/bijiben-40.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -36,6 +36,10 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}"/${PN}-40.1-meson-0.61.patch +) + src_configure() { local emesonargs=( -Dupdate_mimedb=false diff --git a/app-misc/bijiben/files/bijiben-40.1-meson-0.61.patch b/app-misc/bijiben/files/bijiben-40.1-meson-0.61.patch new file mode 100644 index 000000000000..63584fc81464 --- /dev/null +++ b/app-misc/bijiben/files/bijiben-40.1-meson-0.61.patch @@ -0,0 +1,38 @@ +https://gitlab.gnome.org/GNOME/gnome-notes/-/merge_requests/158.patch +https://bugs.gentoo.org/831929 + +From 01ccae2ccb640b2d33fd09c3dfb7d605830b5b0f 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 +--- 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, +--- 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 |