PublicArchive/gentoo
2
0
Fork 0
mirror of https://anongit.gentoo.org/git/repo/gentoo.git synced 2026-05-06 07:27:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

app-office/abiword: align with eds-3.60 vCard export

Browse Source 
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 <lschmelting@posteo.com>
Part-of: https://github.com/gentoo/gentoo/pull/46119
Closes: https://github.com/gentoo/gentoo/pull/46119
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Lukas Schmelting
2026-04-16 23:07:56 +02:00
committed by Sam James
parent de891e5595
commit 9d4081733d
3 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app-office/abiword/abiword-3.0.7.ebuild → app-office/abiword/abiword-3.0.7-r2.ebuild
+7 -2
View File
@@ -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:=
<gnome-extra/evolution-data-server-3.60.0:=
)
goffice? ( >=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
app-office/abiword/abiword-3.0.7-r1.ebuild → app-office/abiword/abiword-3.0.7-r3.ebuild
+1
View File
@@ -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() {
app-office/abiword/files/abiword-3.0.7-eds-3.60-vCard-export.patch
+30
View File
@@ -0,0 +1,30 @@
From 4657a5ebd13025365d6fd56a7af77a0625eb3e30 Mon Sep 17 00:00:00 2001
From: Lukas Schmelting <lschmelting@posteo.com>
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 <lschmelting@posteo.com>
---
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