* [gentoo-commits] repo/gentoo:master commit in: dev-util/devhelp/files/, dev-util/devhelp/
@ 2022-01-25 2:15 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-01-25 2:15 UTC (permalink / raw
To: gentoo-commits
commit: ce97cf736d5a6de2311fcb2bf345b7ebc9f043c3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 25 02:15:28 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 25 02:15:28 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce97cf73
dev-util/devhelp: fix build with meson 0.61
Closes: https://bugs.gentoo.org/831928
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/devhelp/devhelp-41.2.ebuild | 4 ++-
dev-util/devhelp/files/41.2-meson-0.61.patch | 52 ++++++++++++++++++++++++++++
2 files changed, 55 insertions(+), 1 deletion(-)
diff --git a/dev-util/devhelp/devhelp-41.2.ebuild b/dev-util/devhelp/devhelp-41.2.ebuild
index 0d4bb96937b5..7892dd7fcbf5 100644
--- a/dev-util/devhelp/devhelp-41.2.ebuild
+++ b/dev-util/devhelp/devhelp-41.2.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
@@ -45,6 +45,8 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PV}-optional-introspection.patch
"${FILESDIR}"/${PV}-webkitgtk40.patch
+
+ "${FILESDIR}"/${PV}-meson-0.61.patch
)
pkg_setup() {
diff --git a/dev-util/devhelp/files/41.2-meson-0.61.patch b/dev-util/devhelp/files/41.2-meson-0.61.patch
new file mode 100644
index 000000000000..dd75f802056a
--- /dev/null
+++ b/dev-util/devhelp/files/41.2-meson-0.61.patch
@@ -0,0 +1,52 @@
+https://gitlab.gnome.org/GNOME/devhelp/-/merge_requests/43.patch
+https://gitlab.gnome.org/GNOME/devhelp/-/merge_requests/42.patch
+https://bugs.gentoo.org/831928
+
+From f1c27fd4eaa59e86005f9698bb839451a2f0ef44 Mon Sep 17 00:00:00 2001
+From: r-value <i@rvalue.moe>
+Date: Wed, 17 Nov 2021 18:02:20 +0800
+Subject: [PATCH] Remove incorrect arg for i18n.merge_file
+
+`i18n.merge_file` has been ignoring positional arguments and
+explicitly rejects with error "ERROR: Function does not take
+positional arguments" since meson 0.60.0
+---
+ data/meson.build | 2 --
+ plugins/gedit-plugin/meson.build | 1 -
+ 2 files changed, 3 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index c6aeffb4..0bc531a2 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -19,7 +19,6 @@ appdata_conf = configuration_data()
+ appdata_conf.set('application_id', APPLICATION_ID)
+ appdata = APPLICATION_ID + '.appdata.xml'
+ appdata_file = I18N.merge_file(
+- appdata,
+ input: configure_file(
+ input: 'org.gnome.Devhelp.appdata.xml.in.in',
+ output: APPLICATION_ID + '.appdata.xml.in',
+@@ -45,7 +44,6 @@ desktop_conf = configuration_data()
+ desktop_conf.set('application_id', APPLICATION_ID)
+ desktop = APPLICATION_ID + '.desktop'
+ desktop_file = I18N.merge_file(
+- desktop,
+ type: 'desktop',
+ input: configure_file(
+ input: 'org.gnome.Devhelp.desktop.in.in',
+diff --git a/plugins/gedit-plugin/meson.build b/plugins/gedit-plugin/meson.build
+index 4f779886..877a01ff 100644
+--- a/plugins/gedit-plugin/meson.build
++++ b/plugins/gedit-plugin/meson.build
+@@ -7,7 +7,6 @@ install_data(
+
+ plugin_info_file = 'devhelp.plugin'
+ I18N.merge_file(
+- plugin_info_file,
+ type: 'desktop',
+ input: plugin_info_file + '.desktop.in',
+ output: plugin_info_file,
+--
+GitLab
+
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-util/devhelp/files/, dev-util/devhelp/
@ 2022-08-29 23:51 Matt Turner
0 siblings, 0 replies; 3+ messages in thread
From: Matt Turner @ 2022-08-29 23:51 UTC (permalink / raw
To: gentoo-commits
commit: 351a580acab57f68f1f9773ecd8f06115615400c
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 29 16:42:20 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Aug 29 23:48:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=351a580a
dev-util/devhelp: Version bump to 41.3
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
dev-util/devhelp/Manifest | 1 +
dev-util/devhelp/devhelp-41.3.ebuild | 83 +++++++++++++++++++++++++++
dev-util/devhelp/files/41.3-webkitgtk40.patch | 34 +++++++++++
3 files changed, 118 insertions(+)
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index 9e1facd9d301..98bd8fd423b8 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1 +1,2 @@
DIST devhelp-41.2.tar.xz 1455736 BLAKE2B c531af6cded6c9624581e4d14fb4d7713afbdcf173ec2a82e49789af1752568790dc346cc0293eddc68c0943fec4f742de726953de34441771711a938ba858fa SHA512 99a75ff19bf1b4613c312921452f190334e3e2036c28cda070169e3d1d352a5d2e7a56a393326efd679076257412e281dc94b628429119fcad58060d1a88ea98
+DIST devhelp-41.3.tar.xz 2303068 BLAKE2B 1c08931897a7cd1d15028d9394479297d6fffc48412aa31cc739380405b8588fec47fddbea803c80d44eb23d2fa84d5f9a42aa8b061859d459e450ccd76ee82d SHA512 91251f1d8c0380f16768a1fed2d0a0a19935a646613a966c48ae70e52bfe8b6aa0c683d2b371d9e25dfdfcaeac687ea2c83c2bfd5f4f35394bb4576e6f98b48d
diff --git a/dev-util/devhelp/devhelp-41.3.ebuild b/dev-util/devhelp/devhelp-41.3.ebuild
new file mode 100644
index 000000000000..b9eb3583a6e9
--- /dev/null
+++ b/dev-util/devhelp/devhelp-41.3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 xdg
+
+DESCRIPTION="An API documentation browser for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
+
+LICENSE="GPL-3+ CC-BY-SA-4.0"
+SLOT="0/3-6" # subslot = 3-(libdevhelp-3 soname version)
+KEYWORDS="~amd64 ~arm ~ppc64 ~sparc ~x86"
+IUSE="+gedit gtk-doc +introspection"
+REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} ) gtk-doc? ( introspection )"
+
+DEPEND="
+ >=dev-libs/glib-2.64:2
+ >=x11-libs/gtk+-3.22:3[introspection?]
+ >=net-libs/webkit-gtk-2.26:4[introspection?]
+ gnome-base/gsettings-desktop-schemas
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+ gedit? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ app-editors/gedit[introspection(+),python,${PYTHON_SINGLE_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ ')
+ )
+"
+# libxml2 required for glib-compile-resources
+BDEPEND="
+ ${PYTHON_DEPS}
+ dev-libs/libxml2:2
+ dev-util/glib-utils
+ dev-util/itstool
+ gtk-doc? ( >=dev-util/gi-docgen-2021.6 )
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/41.2-optional-introspection.patch
+ "${FILESDIR}"/${PV}-webkitgtk40.patch
+)
+
+pkg_setup() {
+ use gedit && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ local emesonargs=(
+ -Dflatpak_build=false
+ $(meson_use gtk-doc gtk_doc)
+ $(meson_use introspection)
+ -Dplugin_emacs=true
+ $(meson_use gedit plugin_gedit)
+ -Dplugin_vim=true
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+ if use gtk-doc; then
+ mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
+ mv "${ED}"/usr/share/doc/devhelp-3 "${ED}"/usr/share/gtk-doc/html/ || die
+ fi
+ use gedit && python_optimize "${ED}"/usr/$(get_libdir)/gedit/plugins
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/dev-util/devhelp/files/41.3-webkitgtk40.patch b/dev-util/devhelp/files/41.3-webkitgtk40.patch
new file mode 100644
index 000000000000..bd798e8ce7cf
--- /dev/null
+++ b/dev-util/devhelp/files/41.3-webkitgtk40.patch
@@ -0,0 +1,34 @@
+From bdb13ad7f18c90d6409da713ac49dc3995d2dfe2 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sun, 3 Oct 2021 23:52:27 +0300
+Subject: [PATCH] build: Don't automagically depend on webkit2gtk-4.1
+
+That's the libsoup3 using webkit-gtk SLOT that we don't have. Patch it out,
+so it wouldn't be picked up automagically once it's added or comes from some
+overlay.
+
+This reverts commit f9d52aad23914df9dcb404723d1c99cf7b4e1eca.
+---
+ meson.build | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 307a351a..64dc385a 100644
+--- a/meson.build
++++ b/meson.build
+@@ -46,12 +46,8 @@ lt_revision = 3
+ lt_age = 0
+ LIBDEVHELP_LT_VERSION = '@0@.@1@.@2@'.format(lt_current, lt_revision, lt_age)
+
+-webkit_dep = dependency('webkit2gtk-4.1', required : false)
+-webkit_abi = '4.1'
+-if not webkit_dep.found()
+ webkit_abi = '4.0'
+ webkit_dep = dependency('webkit2gtk-4.0')
+-endif
+
+ LIBDEVHELP_PUBLIC_DEPS = [
+ dependency('gio-2.0', version: '>= 2.64'),
+--
+2.35.1
+
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-util/devhelp/files/, dev-util/devhelp/
@ 2021-04-18 3:04 Matt Turner
0 siblings, 0 replies; 3+ messages in thread
From: Matt Turner @ 2021-04-18 3:04 UTC (permalink / raw
To: gentoo-commits
commit: 01feec5d5c5d963ce55b8e820fa6b7c4e5a45a6b
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 17 22:55:40 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Apr 18 03:04:18 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01feec5d
dev-util/devhelp: Version bump to 40.0
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
dev-util/devhelp/Manifest | 1 +
dev-util/devhelp/devhelp-40.0.ebuild | 82 ++++++++++++++++++++++
.../files/40.0-optional-introspection.patch | 47 +++++++++++++
3 files changed, 130 insertions(+)
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index e6c4ceea771..cb01af4c2f2 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1 +1,2 @@
DIST devhelp-3.38.1.tar.xz 313948 BLAKE2B bd070c98e92a8968ffbac7e634c19730e7c63ee18d180a5d9dda7d831b28deea49a7aa50b17ca9a8b5a411276ac055074cb76ef8cde5017ca395d49bf4aecdf6 SHA512 bcdd61cd822ae3fbe2c9542c09d058760fc1fa0bbbd55b1fc0853b4fdbf1c3856d4fed8f2263f94f41096cbdc0a76394773d43a9072d8aa89274fa61a3c2a430
+DIST devhelp-40.0.tar.xz 318076 BLAKE2B 05345f422e0ec906855c139306020165277daefea2c85229092be57c98f96459c33ab0fdf847a7135fa1b329c76edea71f7da0342c6673a828efe26298d26bdf SHA512 b8dd5fbb12558845f7f5794dad56ef0ffc1dbd60d5a6a28029dc8acea241e8deb1b68cd0abe9d620a512931a1c5f6db12fc594cd4597758c8d4904fb64e6ade7
diff --git a/dev-util/devhelp/devhelp-40.0.ebuild b/dev-util/devhelp/devhelp-40.0.ebuild
new file mode 100644
index 00000000000..8814cb62406
--- /dev/null
+++ b/dev-util/devhelp/devhelp-40.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 xdg
+
+DESCRIPTION="An API documentation browser for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
+
+LICENSE="GPL-3+ CC-BY-SA-4.0"
+SLOT="0/3-6" # subslot = 3-(libdevhelp-3 soname version)
+KEYWORDS="~amd64 ~arm ~ppc64 ~sparc ~x86"
+IUSE="+gedit gtk-doc +introspection"
+REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+ >=dev-libs/glib-2.64:2
+ >=x11-libs/gtk+-3.22:3[introspection?]
+ >=net-libs/webkit-gtk-2.24:4[introspection?]
+ >=gui-libs/amtk-5.0:5
+ gnome-base/gsettings-desktop-schemas
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+ gedit? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ app-editors/gedit[introspection(+),python,${PYTHON_SINGLE_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+ ')
+ )
+"
+# libxml2 required for glib-compile-resources
+BDEPEND="
+ ${PYTHON_DEPS}
+ dev-libs/libxml2:2
+ dev-util/glib-utils
+ dev-util/itstool
+ gtk-doc? (
+ >=dev-util/gtk-doc-1.25
+ app-text/docbook-xml-dtd:4.3
+ )
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/40.0-optional-introspection.patch
+)
+
+pkg_setup() {
+ use gedit && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ local emesonargs=(
+ -Dflatpak_build=false
+ $(meson_use gtk-doc gtk_doc)
+ $(meson_use introspection)
+ -Dplugin_emacs=true
+ $(meson_use gedit plugin_gedit)
+ -Dplugin_vim=true
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+ use gedit && python_optimize "${ED}"/usr/$(get_libdir)/gedit/plugins
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/dev-util/devhelp/files/40.0-optional-introspection.patch b/dev-util/devhelp/files/40.0-optional-introspection.patch
new file mode 100644
index 00000000000..d4c00d369d6
--- /dev/null
+++ b/dev-util/devhelp/files/40.0-optional-introspection.patch
@@ -0,0 +1,47 @@
+From 6c982d00f9d6f03f916bb6a572e7f938cd56fa74 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Fri, 22 Mar 2019 19:44:40 +0200
+Subject: [PATCH] build: Add optionality for introspection build
+
+---
+ devhelp/meson.build | 2 ++
+ meson_options.txt | 6 ++++++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/devhelp/meson.build b/devhelp/meson.build
+index eef055e7..eeaa51eb 100644
+--- a/devhelp/meson.build
++++ b/devhelp/meson.build
+@@ -120,6 +120,7 @@ PKG_CONFIG.generate(
+ requires_private: LIBDEVHELP_PRIVATE_DEPS
+ )
+
++if get_option('introspection')
+ GNOME.generate_gir(
+ libdevhelp_shared_lib,
+ export_packages: 'libdevhelp-@0@'.format(LIBDEVHELP_API_VERSION_FULL),
+@@ -140,3 +141,4 @@ GNOME.generate_gir(
+ '--quiet',
+ ],
+ )
++endif
+diff --git a/meson_options.txt b/meson_options.txt
+index 17dc85f5..c69a2906 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -10,6 +10,12 @@ option(
+ description: 'Build the API reference'
+ )
+
++option(
++ 'introspection',
++ type: 'boolean', value: true,
++ description: 'Build GObject Introspection data'
++)
++
+ option(
+ 'plugin_emacs',
+ type: 'boolean', value: false,
+--
+2.26.3
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-08-29 23:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-25 2:15 [gentoo-commits] repo/gentoo:master commit in: dev-util/devhelp/files/, dev-util/devhelp/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-08-29 23:51 Matt Turner
2021-04-18 3:04 Matt Turner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox