summaryrefslogtreecommitdiff
path: root/app-office
diff options
context:
space:
mode:
Diffstat (limited to 'app-office')
-rw-r--r--app-office/Manifest.gzbin8411 -> 8414 bytes
-rw-r--r--app-office/abiword-docs/Manifest2
-rw-r--r--app-office/abiword-docs/abiword-docs-3.0.2-r1.ebuild (renamed from app-office/abiword-docs/abiword-docs-3.0.2.ebuild)11
-rw-r--r--app-office/dia/Manifest4
-rw-r--r--app-office/dia/dia-0.97.3-r2.ebuild (renamed from app-office/dia/dia-0.97.3-r1.ebuild)16
-rw-r--r--app-office/dia/files/dia-0.97.3-configure-clang16.patch38
-rw-r--r--app-office/glabels/Manifest2
-rw-r--r--app-office/glabels/glabels-3.4.1-r1.ebuild (renamed from app-office/glabels/glabels-3.4.1.ebuild)18
8 files changed, 62 insertions, 29 deletions
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 9b0abf4e110e..5ef5a55e2435 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
Binary files differ
diff --git a/app-office/abiword-docs/Manifest b/app-office/abiword-docs/Manifest
index d4b8916c3480..6faf1dce62a0 100644
--- a/app-office/abiword-docs/Manifest
+++ b/app-office/abiword-docs/Manifest
@@ -1,3 +1,3 @@
DIST abiword-docs-3.0.2.tar.gz 1488624 BLAKE2B 9cc7f631ad4dac4d18828ccecd8f94189dc4d8498284c7ca4a5ed98e85722a775de4fb77c7b407ee923eafb8dd883a38f448115f82626165a23915e2f6f7fa81 SHA512 8d6e5987fd2b58019aebe000d6ab1f10943a53cbbeb01fa53bbcf1a90904eed42182d09862070278ecace187d2510a889e763fe493bf2e2fa381b224e17c98e5
-EBUILD abiword-docs-3.0.2.ebuild 561 BLAKE2B 56b4a060c9b784a9b94674a4ae20d020cece101304bd81c5dc8f986a0a5c73d7b70c08a8913d3a27a5e4f3a4ca37933b37e55eb3af718c405f7445ea04d4f150 SHA512 cf99bccadf7340973e12d68276c61baae8b7269c1e3e52ca0fb86d6eedbffe7f72fab2c3ac75b7296d3a345e28448585d026861d1a99aa786a7c1fb8becddfe4
+EBUILD abiword-docs-3.0.2-r1.ebuild 553 BLAKE2B a22a03c00a207232f6557e43e7c93a53b562f4c0a369fee123f70766f9459b4c305d6ae92065bfac40b0e7f83329bee861beac8261ff3d2413f8432f58b0bc49 SHA512 2b1b252e826c467fa62d46375297f63d8b74b09fd9c85161eaae03c3a29f1096f2ebdbd111045b57095aee515718911c68e85d0c44262c0ede609c66b03f55a9
MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-office/abiword-docs/abiword-docs-3.0.2.ebuild b/app-office/abiword-docs/abiword-docs-3.0.2-r1.ebuild
index 7398d1b1c67c..37c336bbbdd7 100644
--- a/app-office/abiword-docs/abiword-docs-3.0.2.ebuild
+++ b/app-office/abiword-docs/abiword-docs-3.0.2-r1.ebuild
@@ -1,20 +1,19 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
+
inherit gnome2
DESCRIPTION="Fully featured yet light and fast cross platform word processor documentation"
HOMEPAGE="http://www.abisource.com/"
SRC_URI="http://www.abisource.com/downloads/abiword/${PV}/source/${P}.tar.gz"
+# Upstream tarball is wrongly prepared, drop in the next version
+S="${WORKDIR}/${PN}-3.0.1"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
-IUSE=""
RDEPEND=">=app-office/abiword-${PV}"
DEPEND="${RDEPEND}"
-
-# Upstream tarball is wrongly prepared, drop in the next version
-S="${WORKDIR}/${PN}-3.0.1"
diff --git a/app-office/dia/Manifest b/app-office/dia/Manifest
index 546f2078571b..096382906a86 100644
--- a/app-office/dia/Manifest
+++ b/app-office/dia/Manifest
@@ -1,8 +1,8 @@
AUX dia-0.97.0-gnome-doc.patch 1961 BLAKE2B 6b6835a487e4b1ada0a1e67cb3ce123b0b4b3e67c86e9478ac0f401ae70f8f1381ef068a2ca6e116313db42d09bdb7abb523bf9a34856a1a39f7e4b0c9c3a84f SHA512 5200051f19d4a199f8c4e17e5f23c16ad4c13a9531b843be0a4d491aa8884efd4d90e6850c1cd1488e80b344ff18e5dc2b2ad7e57cb7417b6c574ad1e8d6f186
AUX dia-0.97.2-underlinking.patch 969 BLAKE2B 00c56ce70b89e2e78c565ac106633e00601f917c9964f36812f3eddb3031df26c3446591e043b90da6890a0623c99bdf5d0bbd34b468d54bcdfeee8b6ae13bf2 SHA512 556bfd779c6487b20fdca5cd4b6de3d4855db87d68db17549a802719024130cad55a249f9db5329960622a0857b1b3ec009f7a8fd173c27bb5ed1953af9a4ee0
-AUX dia-0.97.3-configure-clang16.patch 760 BLAKE2B 4d0599ae1bd89d3f0b8e262e21fa69d0b552b195e9fed92ed14e7d84c06ef803bb0c9e01052a8a7f2fa13addda0305c076992ca5091a966a29ea39f2e3eb8145 SHA512 976a5f1486dc98f6d6515d8217ebc09148d9879a9d98c54159a526e6c6099f1690f44b0e2dd07c06f45f4dc8877357a7f7b76bf167f3f129a88e98f108ebe73d
+AUX dia-0.97.3-configure-clang16.patch 2023 BLAKE2B 301d6f35218db4f095b7aa5b1fa10c5bfe3d3007334cf402b26d9cbbf56b2431ce8f94057fe5207fb8f45a591e88ff607396137bf8c471bac0a97c47c2cfc0c4 SHA512 788aa004c2d5074e206a555bf8f8f35b7fa7657fb6186a5972acd9803e3d73c5a305f858740a85c35b32f72643bfe7fa2983a9e5c4d45984e910a25af3527118
AUX dia-0.97.3-freetype_pkgconfig.patch 2574 BLAKE2B 870617b939e4ab7ecdfbf5bba4e78cee9f34ee10b1de2bb85380cc96d31c319132861b8ddd0e89a5a03cae2578588c9483ba62f0bf4006096c4074beef77cc4f SHA512 0e937bb17cb69d3f266f68658b11b209a913300d2366adfa4bb608212cd82f00d85272be784f0442d0dcba8659d020e5e848d2e02ee7310ec8cfd6c7170aa8b7
AUX dia-0.97.3-slibtool.patch 316 BLAKE2B 8882a51ab33a81cb8df4180878996baa167b724328df61d55b742cf3c8750d3ce63be07c3631684ea76ef03f9802ecc1f3cda64c803bbe3f7bb87628d02c1e4d SHA512 2160eb2d7e9b2f5e3b4af5c227713e9001685d40f39181e24713049fba2b1bdf3899f7e7e8926ad9cf525c4848fb6206c26ccea7b22de8a578ae616aaab9a4e4
DIST dia-0.97.3.tar.xz 5548500 BLAKE2B ab476ce48e57c1def01095a8d6d92208c11817580cfca1cfcf38af12943153116b31149ca187c65e5121ef9fb281bacc4c3e7f1726ed23b46ba14902faaaa34f SHA512 34298980be930b87cb4a636344e4cb2a7e43eedc00b0969a5e446cee9b74b616fdc8c798efcb9a5832b98741f2e20632a44037b2bcb436f59591d531ef441efa
-EBUILD dia-0.97.3-r1.ebuild 2666 BLAKE2B 3c0886d555d73808c9cce4283ee039d6e272489e412cb1be098e7a39f6eec405cee68cb2f498f86d2676016deb17b4e275d27a250bb20881df0438a8eefc2eb2 SHA512 0c0aa6384a7f05bb0b43c0645c6def419c9a5d9cd5d4bda7516a0971ed161de8ea5fa6e7bbc50f233994219b9e40777b0a7d32e02a48b26e7b2e81881107bf46
+EBUILD dia-0.97.3-r2.ebuild 2620 BLAKE2B 9d82927ec49ff8fc3e9167f2d61c76a3e39a2387f319773e2f41e000412de958863b3b36624ce1c626265f53f1c2c9da70301ce9c2d2f3eca6485b272679f7e7 SHA512 dc9b0039c9c310048c43e591dc311f35ca11c3b1cc6a137ce891eced0368644ec4c9a1e71f06d60af48e4f6dde77faf17bb9370757df7603179f881bc44616d2
MISC metadata.xml 773 BLAKE2B c654cf30f7cac3a198911772f4af09dce74ead25e1b2e501f092929c5967640a1df80d110579a7ffc3777f735ca5f485a5348eb707243266af574ccd8f38f160 SHA512 949a675449bdd4533153d890d5d8106d4c447fce85b33624e9ae693d0dc485b8e764a8d52174c509077ab7c304093313a894d41ed267f100a31923a89356e72f
diff --git a/app-office/dia/dia-0.97.3-r1.ebuild b/app-office/dia/dia-0.97.3-r2.ebuild
index 840d9aaaca77..dc5d778a673a 100644
--- a/app-office/dia/dia-0.97.3-r1.ebuild
+++ b/app-office/dia/dia-0.97.3-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
GNOME2_EAUTORECONF="yes"
inherit gnome2
@@ -24,22 +24,21 @@ RDEPEND="
dev-libs/popt
>=media-libs/freetype-2
>=media-libs/libart_lgpl-2
- media-libs/libpng:0
+ media-libs/libpng:=
sys-libs/zlib
x11-libs/gtk+:2
x11-libs/pango
cairo? ( x11-libs/cairo )
doc? (
app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets )
-"
-DEPEND="${RDEPEND}
+ app-text/docbook-xsl-stylesheets
+ )"
+DEPEND="${RDEPEND}"
+BDEPEND="
dev-util/intltool
virtual/pkgconfig
doc? ( dev-libs/libxslt )"
-DOCS=( AUTHORS ChangeLog KNOWN_BUGS MAINTAINERS NEWS README RELEASE-PROCESS THANKS TODO )
-
PATCHES=(
"${FILESDIR}"/${PN}-0.97.0-gnome-doc.patch #159381 , upstream #470812 #558690
"${FILESDIR}"/${PN}-0.97.2-underlinking.patch #420685, upstream #678761
@@ -83,6 +82,7 @@ src_configure() {
src_install() {
gnome2_src_install
+ dodoc KNOWN_BUGS RELEASE-PROCESS
# Install second desktop file for integrated mode (bug #415495, upstream #588208)
sed -e 's|^Exec=dia|Exec=dia --integrated|' \
diff --git a/app-office/dia/files/dia-0.97.3-configure-clang16.patch b/app-office/dia/files/dia-0.97.3-configure-clang16.patch
index 75b6f003ca3f..0cf797a4ad0d 100644
--- a/app-office/dia/files/dia-0.97.3-configure-clang16.patch
+++ b/app-office/dia/files/dia-0.97.3-configure-clang16.patch
@@ -8,9 +8,12 @@ type declarations.
Upstream has switched to Meson, and it does not seem to use this
particular check anymore.
+https://bugs.gentoo.org/651522
+Remove the insane check for isinf(), since every sane compiler nowadays supports it.
+
--- a/configure.in
+++ b/configure.in
-@@ -197,7 +197,7 @@ if test "$png_ok" = yes; then
+@@ -183,7 +183,7 @@
png_structp pp;
png_infop info;
png_colorp cmap;
@@ -19,4 +22,35 @@ particular check anymore.
png_ok=yes,
png_ok=no)
LDFLAGS="${old_LDFLAGS}"
-
+@@ -378,28 +378,9 @@
+
+ dnl Platform-specific fixes.
+ dnl
+-
+-dnl Sun Forte C provides isinf() in the unbundled -lsunmath. Solaris
+-dnl declares finite() in ieeefp.h. It's preferrable not to link
+-dnl to -lsunmath as it's not present on all machines.
+-have_isinf=no
+-AC_CHECK_HEADERS(math.h,
+- AC_CHECK_LIB(m,isinf,
+- have_isinf=yes))
+-
+-if test "$have_isinf" = "no"; then
+- AC_CHECK_HEADER(ieeefp.h,
+- [AC_CHECK_FUNC(finite,
+- AC_DEFINE(HAVE_IEEEFP_H,1,
+- [Define if finite() is defined in ieeefp.h]),
+- AC_MSG_ERROR([Can't find a definition of neither
+- finite nor isinf]))],
+- [AC_MSG_ERROR(Can't find neither a definition of
+- isinf nor ieeefp.h)])
+-else
+- AC_DEFINE([HAVE_ISINF], 1,
+- [Define if the isinf() function is available])
+-fi
++dnl every modern compiler supports C99's isinf()
++AC_DEFINE([HAVE_ISINF], 1,
++ [Define if the isinf() function is available])
+
+ dnl Alpha needs -mieee or we get a segfault
+ dnl This shouldn't be needed but is here until a real solution is found
diff --git a/app-office/glabels/Manifest b/app-office/glabels/Manifest
index ac5b8c5cd4e2..44f132fd27b0 100644
--- a/app-office/glabels/Manifest
+++ b/app-office/glabels/Manifest
@@ -1,4 +1,4 @@
AUX glabels-externs.patch 834 BLAKE2B 3df1dbfedaf8773626c11c44676268a33696588dc91a87f7607a9e7ede7ed1883adc5a34ca0632d513cdd99782f58b0225dde1c5ca65b374d0c41e20eaacc469 SHA512 4f55e4e152e8b93b9f334ee84b319914d79a76f484a1a575e1c041b930c19af788a64df1316b4043d8c4b85edf81bde185bb4e0e61fb19e4d4229d22d1c27935
DIST glabels-3.4.1.tar.xz 3467992 BLAKE2B 87da586052995a61b1031c5598a21142e525851c5d94b2870e6f62b0d2a6227f44b55ce1aaf6a4c52bd6bb81d9005fde0e58befe26834acb37f4b6728a378cdd SHA512 d3cb98a3b8e33aaace5773a5715ebe45a28a046dd89443b97126078261954fe4713abdc70c38d0d2b932a37eef02ea266726fd28433153bb5aef33c5d5f8175f
-EBUILD glabels-3.4.1.ebuild 964 BLAKE2B 36d9da9bc7614438994e0435c82156781cd7c07e0a1003854d46dff5783231874b291c0fca339facd237e438628599d110859edcf6b1010137588475e05e7447 SHA512 29accde4b5103c33ed1cbe399e11aeff4e6afeca6054d63fe252e613e8ecbf1dcd025b44f78bfb36291aa6946b6511981aa31fd287b4beb5d0e27ab5effb3441
+EBUILD glabels-3.4.1-r1.ebuild 952 BLAKE2B 5ccf071b29d7a73ccba42150a6bc9eaec0537be93871bdd72abedface8f7387c8d87fe68cccd134ae14d28e724e8280d7c9fe8762501b91970ab82f587078b5a SHA512 5b5bfaf4e609b008259e9d9f85288b00790ffe20a88b2602df4360bf6c020913d78170d2ab10f55c80b1c605e36ce07ed106f5ddc2d02ecff362609a599de4a2
MISC metadata.xml 629 BLAKE2B 5fb4b84c7345a024970ff23bfe2ed2955a01ffe1357f038ae9c317cbeea5c6074a96dfb54e72e020299b977254fae4f5b7a942556c7323e53471e24c6f9f858f SHA512 79d568ba9515bbc66255b8dc85a8efb49b9850d65825d5e9b5c366857b9090ac901c72b26a0e3d8566c4d0b51bf91cd02f196ad68cc2df0c968e1e18f3df27d8
diff --git a/app-office/glabels/glabels-3.4.1.ebuild b/app-office/glabels/glabels-3.4.1-r1.ebuild
index 9babfa8dceca..cf1bc346deb7 100644
--- a/app-office/glabels/glabels-3.4.1.ebuild
+++ b/app-office/glabels/glabels-3.4.1-r1.ebuild
@@ -1,7 +1,8 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI=8
+
inherit gnome2
DESCRIPTION="Program for creating labels and business cards"
@@ -21,16 +22,16 @@ RDEPEND="
>=x11-libs/pango-1.36.1
barcode? (
>=app-text/barcode-0.98
- >=media-gfx/qrencode-3.1 )
- eds? ( >=gnome-extra/evolution-data-server-3.12.0:= )
-"
-DEPEND="${RDEPEND}
+ >=media-gfx/qrencode-3.1
+ )
+ eds? ( >=gnome-extra/evolution-data-server-3.12.0:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
app-text/docbook-xml-dtd:4.1.2
dev-util/itstool
dev-build/gtk-doc-am
>=dev-util/intltool-0.28
- virtual/pkgconfig
-"
+ virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/glabels-externs.patch # Fix compilation with -fno-common/gcc10; patch from Fedora
@@ -38,6 +39,5 @@ PATCHES=(
src_configure() {
gnome2_src_configure \
- $(use_with eds libebook) \
- --disable-static
+ $(use_with eds libebook)
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-08 00:41:32 +0000