From e87ef1b6ce856ae8859bdfce8028fb992f3e3763 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 15 Sep 2022 23:13:45 +0100 Subject: gentoo auto-resync : 15:09:2022 - 23:13:44 --- app-office/endeavour/Manifest | 5 ++ app-office/endeavour/endeavour-42.0.ebuild | 75 +++++++++++++++++++ app-office/endeavour/endeavour-9999.ebuild | 62 ++++++++++++++++ .../42.0-build-Generate-enum-headers-first.patch | 84 ++++++++++++++++++++++ app-office/endeavour/metadata.xml | 8 +++ 5 files changed, 234 insertions(+) create mode 100644 app-office/endeavour/Manifest create mode 100644 app-office/endeavour/endeavour-42.0.ebuild create mode 100644 app-office/endeavour/endeavour-9999.ebuild create mode 100644 app-office/endeavour/files/42.0-build-Generate-enum-headers-first.patch create mode 100644 app-office/endeavour/metadata.xml (limited to 'app-office/endeavour') diff --git a/app-office/endeavour/Manifest b/app-office/endeavour/Manifest new file mode 100644 index 000000000000..be85a4067abd --- /dev/null +++ b/app-office/endeavour/Manifest @@ -0,0 +1,5 @@ +AUX 42.0-build-Generate-enum-headers-first.patch 1889 BLAKE2B ce11acb08003adf6bc4cc240213f3134a0ce021a720e201ef18177097cc1953db3be0d3eb2509eeab4e9e4afc9c1f8e2246338442b5a089d3ff698a4394dc90a SHA512 3c7344205f9e71201affa162c9d9bd788054434975ac523f36330f3724628567dbcc6e04cceb199b847b58e03090a83316885af58ecd6702ce25c4cbb201e02c +DIST Endeavour-v42.0.tar.bz2 606645 BLAKE2B f9575eeaa67f837e465cbf8e8790a477c299bea12410ceda3c1f9ab5df69948087c7c8679cee5651eac828b69fe64f2b22ff759c2174f044166b94a25270668c SHA512 6312bad832f864adc3e4e01112efccb9c867b31485460791a1d1cf0d515586e7fdb7dd9dca3790201f764b72c39cff69626794f7020b4b084034fdbd0e07d94a +EBUILD endeavour-42.0.ebuild 1838 BLAKE2B c8cfbf404831eab92949f8d684da6c145b5dec1bfab423cc259bb35b04a92db8219229129729f2212b4495ae02fc7e21011ab98d71bebb0f1c499b60e28f894b SHA512 37bbf0eea96166febace957caf486f4da4ee0cfb9dc7cad44c0cbfeb82cb448cabedf388d82043c92e5ee64a136438a7cce61ac681716d1a7607f72ecaeb81ea +EBUILD endeavour-9999.ebuild 1492 BLAKE2B e48f749e13ad4de817fba6ce0c7e2865adca4451e125555f4507a320112e89e91ab8e1c235772fe22cdb8c45be5383f2e12449e0bb711594d9970a1be92d86d9 SHA512 c5633a21897e5bb5e4e35679fee6e321875b084f30146847418413446419db7043719fbb946e78871e88140ced369e7c14ca1863cad432a0f8c644e8165b4614 +MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8 diff --git a/app-office/endeavour/endeavour-42.0.ebuild b/app-office/endeavour/endeavour-42.0.ebuild new file mode 100644 index 000000000000..cb393edc681b --- /dev/null +++ b/app-office/endeavour/endeavour-42.0.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome.org gnome2-utils meson xdg + +DESCRIPTION="Personal task manager" +HOMEPAGE="https://wiki.gnome.org/Apps/Todo https://gitlab.gnome.org/World/Endeavour" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.gnome.org/World/Endeavour.git" + SRC_URI="" +else + SRC_URI="https://gitlab.gnome.org/World/${PN^}/-/archive/v${PV}/${PN^}-v${PV}.tar.bz2" + KEYWORDS="~amd64" + S="${WORKDIR}/${PN^}-v${PV}" +fi + +LICENSE="GPL-3+" +SLOT="0" +IUSE="+introspection" +RESTRICT="test" # Tests are broken in 42.0 + +RDEPEND=" + >=dev-libs/glib-2.58.0:2 + >=gui-libs/gtk-3.92.0:4[introspection?] + >=gui-libs/libadwaita-1.2.0:1 + >=net-libs/gnome-online-accounts-3.25.3:= + >=dev-libs/libpeas-1.17 + dev-libs/libportal:0=[gtk] + >=gnome-extra/evolution-data-server-3.33.2:=[gtk] + net-libs/rest:0.7 + dev-libs/json-glib + introspection? ( >=dev-libs/gobject-introspection-1.42:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-libs/libxml2:2 + dev-util/glib-utils + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PV}-build-Generate-enum-headers-first.patch +) + +src_configure() { + # TODO: There aren't any consumers of the introspection outside gnome-todo's own plugins, so maybe we + # TODO: should just always build introspection support as an application that needs it for full functionality? + # Todoist plugin requires 3.25.3 GOA for being able to add a Todoist account + local emesonargs=( + $(meson_use introspection) + -Dtracing=false + -Dprofile=default + + -Dtodo_txt_plugin=true + -Dtodoist_plugin=true + -Dunscheduled_panel_plugin=true + -Dbackground_plugin=true + ) + meson_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/app-office/endeavour/endeavour-9999.ebuild b/app-office/endeavour/endeavour-9999.ebuild new file mode 100644 index 000000000000..97a763cfccef --- /dev/null +++ b/app-office/endeavour/endeavour-9999.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome.org gnome2-utils meson xdg + +DESCRIPTION="Personal task manager" +HOMEPAGE="https://wiki.gnome.org/Apps/Todo https://gitlab.gnome.org/World/Endeavour" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.gnome.org/World/Endeavour.git" + SRC_URI="" +else + SRC_URI="https://gitlab.gnome.org/World/${PN^}/-/archive/v${PV}/${PN^}-v${PV}.tar.bz2" + KEYWORDS="~amd64" + S="${WORKDIR}/${PN^}-v${PV}" +fi + +LICENSE="GPL-3+" +SLOT="0" +IUSE="+introspection" + +RDEPEND=" + >=dev-libs/glib-2.58.0:2 + >=gui-libs/gtk-3.92.0:4[introspection?] + >=gui-libs/libadwaita-1.2.0:1 + >=net-libs/gnome-online-accounts-3.2.0:= + >=dev-libs/libpeas-1.17 + dev-libs/libportal:0=[gtk] + >=gnome-extra/evolution-data-server-3.33.2:=[gtk] + introspection? ( >=dev-libs/gobject-introspection-1.42:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-libs/libxml2:2 + dev-util/glib-utils + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +src_configure() { + # TODO: There aren't any consumers of the introspection outside gnome-todo's own plugins, so maybe we + # TODO: should just always build introspection support as an application that needs it for full functionality? + local emesonargs=( + $(meson_use introspection) + -Dtracing=false + -Dprofile=default + ) + meson_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/app-office/endeavour/files/42.0-build-Generate-enum-headers-first.patch b/app-office/endeavour/files/42.0-build-Generate-enum-headers-first.patch new file mode 100644 index 000000000000..6efa26dead2c --- /dev/null +++ b/app-office/endeavour/files/42.0-build-Generate-enum-headers-first.patch @@ -0,0 +1,84 @@ +From b492285e2a4fafad887df2c4fd2a5bdb53ce39fb Mon Sep 17 00:00:00 2001 +From: Jamie Murphy +Date: Fri, 5 Aug 2022 18:52:20 -0700 +Subject: [PATCH] build: Generate enum headers first + +Fixes #380, #398, !120, !110 +--- + src/meson.build | 38 +++++++++++++++++++------------------- + src/plugins/meson.build | 3 ++- + 2 files changed, 21 insertions(+), 20 deletions(-) + +diff --git a/src/meson.build b/src/meson.build +index deb410a2..8f621e78 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -16,6 +16,25 @@ vcs_identifier_h = declare_dependency(sources: vcs_tag) + + endeavour_deps += vcs_identifier_h + ++######### ++# Enums # ++######### ++ ++enum_headers = files( ++ join_paths('animation', 'gtd-animation-enums.h'), ++) ++ ++enum_types = 'gtd-enum-types' ++ ++gtd_enum_types = gnome.mkenums( ++ enum_types, ++ sources: enum_headers, ++ c_template: enum_types + '.c.template', ++ h_template: enum_types + '.h.template' ++) ++ ++sources += gtd_enum_types ++ + ########### + # Plugins # + ########### +@@ -42,25 +61,6 @@ gtd_deps = endeavour_deps + [ + plugins_dep, + ] + +- +-######### +-# Enums # +-######### +- +-enum_headers = files( +- join_paths('animation', 'gtd-animation-enums.h'), +-) +- +-enum_types = 'gtd-enum-types' +- +-sources += gnome.mkenums( +- enum_types, +- sources: enum_headers, +- c_template: enum_types + '.c.template', +- h_template: enum_types + '.h.template' +-) +- +- + ################ + # Header files # + ################ +diff --git a/src/plugins/meson.build b/src/plugins/meson.build +index 3d7ac4e4..2a13aff5 100644 +--- a/src/plugins/meson.build ++++ b/src/plugins/meson.build +@@ -3,7 +3,8 @@ plugins_incs = [ + include_directories('..'), + ] + +-plugins_sources = [] ++# Ensure enum types header is generated before building plugins ++plugins_sources = [ gtd_enum_types[1] ] + plugins_deps = [ endeavour_deps ] + plugins_ldflags = [] + plugins_libs = [] +-- +2.35.1 + diff --git a/app-office/endeavour/metadata.xml b/app-office/endeavour/metadata.xml new file mode 100644 index 000000000000..7b343b06be8a --- /dev/null +++ b/app-office/endeavour/metadata.xml @@ -0,0 +1,8 @@ + + + + + gnome@gentoo.org + Gentoo GNOME Desktop + + -- cgit v1.2.3