From acf34cb86be38d3601273c231058d3fda627e618 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 4 Dec 2022 09:02:03 +0000 Subject: gentoo auto-resync : 04:12:2022 - 09:02:03 --- app-office/Manifest.gz | Bin 7895 -> 7892 bytes app-office/endeavour/Manifest | 3 - app-office/endeavour/endeavour-42.0-r1.ebuild | 73 --------------- .../42.0-build-Generate-enum-headers-first.patch | 84 ------------------ app-office/gnumeric/Manifest | 3 - .../gnumeric/files/gnumeric-1.12.52-slibtool.patch | 36 -------- app-office/gnumeric/gnumeric-1.12.52-r1.ebuild | 98 --------------------- 7 files changed, 297 deletions(-) delete mode 100644 app-office/endeavour/endeavour-42.0-r1.ebuild delete mode 100644 app-office/endeavour/files/42.0-build-Generate-enum-headers-first.patch delete mode 100644 app-office/gnumeric/files/gnumeric-1.12.52-slibtool.patch delete mode 100644 app-office/gnumeric/gnumeric-1.12.52-r1.ebuild (limited to 'app-office') diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz index 0bd993ca72bd..43aed33e37fa 100644 Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ diff --git a/app-office/endeavour/Manifest b/app-office/endeavour/Manifest index 238471db047c..8428cf77de82 100644 --- a/app-office/endeavour/Manifest +++ b/app-office/endeavour/Manifest @@ -1,7 +1,4 @@ -AUX 42.0-build-Generate-enum-headers-first.patch 1889 BLAKE2B ce11acb08003adf6bc4cc240213f3134a0ce021a720e201ef18177097cc1953db3be0d3eb2509eeab4e9e4afc9c1f8e2246338442b5a089d3ff698a4394dc90a SHA512 3c7344205f9e71201affa162c9d9bd788054434975ac523f36330f3724628567dbcc6e04cceb199b847b58e03090a83316885af58ecd6702ce25c4cbb201e02c DIST Endeavour-43.0.tar.bz2 540310 BLAKE2B f878fa39220300838c350acf8924f1c9d9243ff201bbc478b6947ab482acf886f74fa760359994d27a26aded796d06f64718357c16013523f3c35d23c507fd5e SHA512 2fa544d07113f51e858e75608696bc0fee593237ff0c2681e52e802b08ee497faa2e04283b8e24450cc679fc520433285a949c411697f377fd95bd6e4777abbb -DIST Endeavour-v42.0.tar.bz2 606645 BLAKE2B f9575eeaa67f837e465cbf8e8790a477c299bea12410ceda3c1f9ab5df69948087c7c8679cee5651eac828b69fe64f2b22ff759c2174f044166b94a25270668c SHA512 6312bad832f864adc3e4e01112efccb9c867b31485460791a1d1cf0d515586e7fdb7dd9dca3790201f764b72c39cff69626794f7020b4b084034fdbd0e07d94a -EBUILD endeavour-42.0-r1.ebuild 1799 BLAKE2B b501bf977fbc447e1c6636a3646a00fa99e74abd813a6a2adf5c9cd6dab02a75cd2388006186946c0e6a1176253f9e5750b3c473012d1323e798b77c84e77278 SHA512 81d23bbc417ee486dbda6208e1d8dd48818e64392b987d1d73417e388a66f813f55c6541dba98b59a9765d927267893ab7885cd4b6503d0cbcdce05b577a900f EBUILD endeavour-43.0.ebuild 1461 BLAKE2B 449b466328edd44bb4f734154160f44e957c946313d1f197f8a699493eeba74811e65d2f5aa785788306b00f30495ad14049abc3e124c596a14f506978562bab SHA512 79c63a7ed0eebd54a7692e8762eeeed4bda451ff3f352017fadfc90b946ba80bf6a1533ed7a57c0e9a8f748469fc43f1012d2d717080575c78b8a4d6fcfc49dd EBUILD endeavour-9999.ebuild 1461 BLAKE2B 449b466328edd44bb4f734154160f44e957c946313d1f197f8a699493eeba74811e65d2f5aa785788306b00f30495ad14049abc3e124c596a14f506978562bab SHA512 79c63a7ed0eebd54a7692e8762eeeed4bda451ff3f352017fadfc90b946ba80bf6a1533ed7a57c0e9a8f748469fc43f1012d2d717080575c78b8a4d6fcfc49dd MISC metadata.xml 350 BLAKE2B 341539b054e9607ce3d11070534b024ecedd4a7384fc5607de9d7bfbf9f22d5c3a6eab618cd85c48682ad3ccad0c562c26da7ca9a648af9069234444fe4f9c16 SHA512 1a08468d736fbf0514a90dcb2e0ac6dec36e5683013f845e12ac501beee1f503e4f6e202f3fe1df6f80f06ef8d72015207eebd35fb7b670170d4999e6f3325fb diff --git a/app-office/endeavour/endeavour-42.0-r1.ebuild b/app-office/endeavour/endeavour-42.0-r1.ebuild deleted file mode 100644 index 9c8762fa09a2..000000000000 --- a/app-office/endeavour/endeavour-42.0-r1.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# 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] - 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/files/42.0-build-Generate-enum-headers-first.patch b/app-office/endeavour/files/42.0-build-Generate-enum-headers-first.patch deleted file mode 100644 index 6efa26dead2c..000000000000 --- a/app-office/endeavour/files/42.0-build-Generate-enum-headers-first.patch +++ /dev/null @@ -1,84 +0,0 @@ -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/gnumeric/Manifest b/app-office/gnumeric/Manifest index b9beae6c7cca..5ee76c2812ed 100644 --- a/app-office/gnumeric/Manifest +++ b/app-office/gnumeric/Manifest @@ -1,6 +1,3 @@ -AUX gnumeric-1.12.52-slibtool.patch 1489 BLAKE2B aff4a76659bbe81f178baeadea9967870e6a5c38f960bce1287951056eae038cf3c34c7f1e8f7b65aa5999ec9a1474d9e8732b89d432b68ce015dcc96d7a0c27 SHA512 805507509d8fa5702734b74f7c3004001ab3c84e22e14773025b2b53015d3b01bb8acfe7094812e5ad4fac73f8c3e04f2a1d78f99f619bf0f16607d2da0f02aa -DIST gnumeric-1.12.52.tar.xz 18115444 BLAKE2B 6d8489c27b6f7bd0ffad7d255b606a48ca9660dd38973e4bb529d38797a3029db4a0a399e40f69c84ddf33b96d27cfc184fd079fbe16590b92e056c1a836b037 SHA512 3baa2d2c4ed5f740429454f988ea527991febf38f49df17f0d88affe501c676bae95149fb0cdb4b369ef8d32247c1f4fe4c0eeab9a60329e1332aaf9c566f868 DIST gnumeric-1.12.53.tar.xz 18125272 BLAKE2B 6c25107977492391152c403d2ad6fef79161bc9045660090e12cdd281e5832b4f9e414a0ef5e67f93c10ca789097b510fafed712dcea5b6210f67428a2dc7dd7 SHA512 6e9d7b12f9448c75d39985984fac9880c61583fbac10ad9070f5ec7a5bd573874d79e13372d9a185616a5cdb5f53d3f67aeda6ca4bae33e3f5ca0a2160045d7b -EBUILD gnumeric-1.12.52-r1.ebuild 2426 BLAKE2B 66ef68bfbb8151af8827d7228740d01fc20fb7a71fce21fefc0c74e21369b8a4f6d4d9c22f9ab1533e7c4ad2f904aa618cca474e11cfdb1093a878984b01ec28 SHA512 62349a143dcf081a2a8111b021994059a38761247bb6eb2261aa8b637aba1f64ea1bdecb97f40518cddc9b7ec781d47595953051304b32c060cab48ea10c0645 EBUILD gnumeric-1.12.53-r1.ebuild 2369 BLAKE2B 5cf7c9edff4557c053fb404a3dd6cd4cf324deba4f8d08cdf22581beafde02c7cf93293f395f7a0bd782edbdcb7a96404b3d2ba902caf603854d9400bce72fcb SHA512 bbb45c6714c97df630551cdd739aa6b7ab9fff55071bfbdb1c503cad9c567dc92b0a4c051b4c0bb50efe827c43d6241d362b811062fc0b0ac405c158f49480dd MISC metadata.xml 627 BLAKE2B 6704cf7889bf073ee97e1af9145395462f326aa44ad6fa04f4cc4908bbde8a486518c0f11e3a9ab887835c0af862868b8a86ca29191ac1bdf179aa060c621020 SHA512 451313a3c0d62af5f647bcdce0ac76bf1948189bb70c555f6aa871245bf3ce62b0ad306c8835a7c42b24333c3e9ce449a209d3d6967e487ec061792969092107 diff --git a/app-office/gnumeric/files/gnumeric-1.12.52-slibtool.patch b/app-office/gnumeric/files/gnumeric-1.12.52-slibtool.patch deleted file mode 100644 index 43e869afa7a9..000000000000 --- a/app-office/gnumeric/files/gnumeric-1.12.52-slibtool.patch +++ /dev/null @@ -1,36 +0,0 @@ -Upstream-PR: https://gitlab.gnome.org/GNOME/gnumeric/-/merge_requests/25 -From 3031cc85718dde12a34be46330ef3b8c885f4f9e Mon Sep 17 00:00:00 2001 -From: orbea -Date: Tue, 10 May 2022 15:52:57 -0700 -Subject: [PATCH] plugins/excelplugins: Remove erroneous .libs - -The .libs directory is for internal usage by the libtool -implementation only. - -When build gnumeric with slibtool instead of GNU libtool this -will be a failure where slibtool is far more strict about user -errors. - -rdlibtool: error logged in slbt_exec_link_create_dep_file(), line 1091: path not found: ../../src/.libs/.libs/libspreadsheet.a.disabled. - -Gentoo Bug: https://bugs.gentoo.org/791610 ---- - plugins/excelplugins/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plugins/excelplugins/Makefile.am b/plugins/excelplugins/Makefile.am -index 3bc8f70b0..91e2fa765 100644 ---- a/plugins/excelplugins/Makefile.am -+++ b/plugins/excelplugins/Makefile.am -@@ -7,7 +7,7 @@ gnumeric_plugin_excelpluginsdir = $(gnumeric_plugindir)/excelplugins - xmldir = $(gnumeric_plugin_excelpluginsdir) - gnumeric_plugin_excelplugins_LTLIBRARIES = plugin.la xlcall32.la - plugin_la_LDFLAGS = -module $(GNUMERIC_PLUGIN_LDFLAGS) --plugin_la_LIBADD = ../../src/.libs/libspreadsheet.la -+plugin_la_LIBADD = ../../src/libspreadsheet.la - plugin_la_SOURCES = excelplugins.c - xlcall32_la_LDFLAGS = -module $(GNUMERIC_PLUGIN_LDFLAGS) - xlcall32_la_SOURCES = xlcall32_emulation.c win32replacements.h xlcall.h --- -GitLab - diff --git a/app-office/gnumeric/gnumeric-1.12.52-r1.ebuild b/app-office/gnumeric/gnumeric-1.12.52-r1.ebuild deleted file mode 100644 index ab923ba2eb8f..000000000000 --- a/app-office/gnumeric/gnumeric-1.12.52-r1.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{7..10} ) - -inherit autotools gnome.org python-r1 xdg - -DESCRIPTION="The GNOME Spreadsheet" -HOMEPAGE="http://www.gnumeric.org/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="+introspection libgda perl" -REQUIRED_USE="introspection? ( ${PYTHON_REQUIRED_USE} )" - -# Missing gnome-extra/libgnomedb required version in tree -# but its upstream is dead and will be dropped soon. - -# lots of missing files, also fails tests due to 80-bit long story -# upstream bug #721556 -RESTRICT="test" - -# Gnumeric has two python components -# 1. The python loader for loading python-based plugins. -# This component is pure python 2 and a port "is not currently being worked on". -# 2. The python gobject-based introspection API. This component is compatible -# with python 3. -# Component 1. can only be re-enabled once someone has ported the upstream -# codebase to python 3. -# https://gitlab.gnome.org/GNOME/gnumeric/issues/419#note_618852 -RDEPEND=" - app-arch/bzip2 - sys-libs/zlib - >=dev-libs/glib-2.40.0:2 - >=gnome-extra/libgsf-1.14.33:= - >=x11-libs/goffice-0.10.51:0.10[introspection?] - >=dev-libs/libxml2-2.4.12:2 - >=x11-libs/pango-1.24.0:= - - >=x11-libs/gtk+-3.8.7:3 - x11-libs/cairo:=[svg(+)] - - introspection? ( - ${PYTHON_DEPS} - >=dev-libs/gobject-introspection-1:= - ) - perl? ( dev-lang/perl:= ) - libgda? ( gnome-extra/libgda:5[gtk] )" -DEPEND="${RDEPEND}" -BDEPEND=" - app-text/docbook-xml-dtd:4.5 - app-text/yelp-tools - dev-util/gtk-doc-am - >=dev-util/intltool-0.35.0 - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${P}-slibtool.patch" # 791610 -) - -src_prepare() { - default - - # Manage gi overrides ourselves - sed '/SUBDIRS/ s/introspection//' -i Makefile.{am,in} || die - - # Changed from 'elibtoolize' for bug # 791610 - eautoreconf -} - -src_configure() { - econf \ - --disable-gtk-doc \ - --disable-maintainer-mode \ - --disable-schemas-compile \ - --disable-static \ - --without-psiconv \ - --without-python \ - --with-zlib \ - $(use_with libgda gda) \ - $(use_enable introspection) \ - $(use_with perl) -} - -src_install() { - default - dodoc HACKING MAINTAINERS - - if use introspection; then - python_moduleinto gi.overrides - python_foreach_impl python_domodule introspection/gi/overrides/Gnm.py - fi - - # no static archives - find "${ED}" -name '*.la' -delete || die -} -- cgit v1.2.3