diff --git a/app-office/abiword/abiword-3.0.7.ebuild b/app-office/abiword/abiword-3.0.7-r2.ebuild similarity index 96% rename from app-office/abiword/abiword-3.0.7.ebuild rename to app-office/abiword/abiword-3.0.7-r2.ebuild index a8a691e4506b..bb9150883c03 100644 --- a/app-office/abiword/abiword-3.0.7.ebuild +++ b/app-office/abiword/abiword-3.0.7-r2.ebuild @@ -44,7 +44,10 @@ RDEPEND=" >=x11-libs/cairo-1.10 >=x11-libs/gtk+-3.0.8:3[cups?] calendar? ( >=dev-libs/libical-0.46:= ) - eds? ( >=gnome-extra/evolution-data-server-3.6.0:= ) + eds? ( + >=gnome-extra/evolution-data-server-3.6.0:= + =x11-libs/goffice-0.10.2:0.10 ) introspection? ( ${PYTHON_DEPS} @@ -79,7 +82,9 @@ BDEPEND=" dev-lang/perl virtual/pkgconfig" -PATCHES=( "${WORKDIR}"/patches ) +PATCHES=( + "${WORKDIR}"/patches +) pkg_setup() { use introspection && python-single-r1_pkg_setup diff --git a/app-office/abiword/abiword-3.0.7-r1.ebuild b/app-office/abiword/abiword-3.0.7-r3.ebuild similarity index 98% rename from app-office/abiword/abiword-3.0.7-r1.ebuild rename to app-office/abiword/abiword-3.0.7-r3.ebuild index e59f9ff5de5b..b7f94bca64b0 100644 --- a/app-office/abiword/abiword-3.0.7-r1.ebuild +++ b/app-office/abiword/abiword-3.0.7-r3.ebuild @@ -83,6 +83,7 @@ PATCHES=( "${WORKDIR}"/patches "${FILESDIR}/${PN}-3.0.6-goffice-pointers.patch" "${FILESDIR}/${PN}-3.0.6-metarecord.patch" + "${FILESDIR}/${PN}-3.0.7-eds-3.60-vCard-export.patch" ) pkg_setup() { diff --git a/app-office/abiword/files/abiword-3.0.7-eds-3.60-vCard-export.patch b/app-office/abiword/files/abiword-3.0.7-eds-3.60-vCard-export.patch new file mode 100644 index 000000000000..860d5a7c5206 --- /dev/null +++ b/app-office/abiword/files/abiword-3.0.7-eds-3.60-vCard-export.patch @@ -0,0 +1,30 @@ +From 4657a5ebd13025365d6fd56a7af77a0625eb3e30 Mon Sep 17 00:00:00 2001 +From: Lukas Schmelting +Date: Thu, 16 Apr 2026 23:16:17 +0200 +Subject: [PATCH] app-office/abiword: align with eds-3.60 vCard export + +evolution-data-server-3.60 changed the vCard export behaviour that +AbiWord’s EDS-backed RDF contact export depended on, so builds against a +current library failed. + +Signed-off-by: Lukas Schmelting +--- + src/text/ptbl/xp/pd_DocumentRDF.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/text/ptbl/xp/pd_DocumentRDF.cpp b/src/text/ptbl/xp/pd_DocumentRDF.cpp +index 3e2b740..c603a88 100644 +--- a/src/text/ptbl/xp/pd_DocumentRDF.cpp ++++ b/src/text/ptbl/xp/pd_DocumentRDF.cpp +@@ -2034,7 +2034,7 @@ PD_RDFContact::exportToFile( const std::string& filename_const ) const + set( c, EVC_TEL, m_phone ); + set( c, EVC_X_JABBER, m_jabberID ); + +- gchar* data = e_vcard_to_string( c, EVC_FORMAT_VCARD_30 ); ++ gchar* data = e_vcard_convert_to_string( c, E_VCARD_VERSION_30 ); + UT_DEBUGMSG(( "saving vcard to file:%s vcard.len:%ld\n", filename.c_str(), strlen(data) )); + std::ofstream oss( filename.c_str() ); + oss.write( data, strlen(data) ); +-- +2.53.0 +