gentoo auto-resync : 15:09:2022 - 05:12:09

4 files changed, 40 insertions, 1 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index a068633fb90f..9a1939ebe44b 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest
index 6bb5fa5f1122..dc909ffee2cd 100644
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -1,4 +1,5 @@
+AUX abiword-3.0.5-musl-lose-precision-fix.patch 1340 BLAKE2B 4e2f9d2d82d7ef2c00a425e2f354130771c9d441156b2a256dcdb89aac0ccf2646bd33d19e8d6199e63e97fd70c024f2f4b979851c8f02aa2a2acd3a510a04df SHA512 ff14374ecc01b1f51a638e34b695be9535456e1b9b184da817660286b763c7fd9147e633b01c295a5d2a61a66b8c86a7a6c12352f5de01896da0e0f862ad8db1
 DIST abiword-3.0.4-patchset-r3.txz 14752 BLAKE2B 2faaaf333a38ea181b83819fd53fd97c5e98a0cbb0b2ad6e668254a88cb69e922fd3b70a181fc7edd789bc313d929915460a0524ff463166400d8e46d878c034 SHA512 e8d2508cf561b49581441b3b581dd663a966da67175f2a39d4a95a6035d8c8c7c3198ca99f253f8d6f3993a66be752265f612b6c59c7712592e464a1da0f240e
 DIST abiword-3.0.5.tar.gz 11084159 BLAKE2B c34361c2ae1604ef1ec913781c98f3707f3c98c3fb5ed5328212b51081706fe5177fb8b5a3805431c0ee451f04d8d95fdc6e7dbc3fc38d9d5037b576e115ee54 SHA512 a2484268901ff47307c9d1f1928622e364f1006f22ce38257c585144df9411dfe3c2dea28c1f1f50a6e545e8cc579cce34117a89dfa771e20312e3ea1a9989d6
-EBUILD abiword-3.0.5.ebuild 4395 BLAKE2B fa2ce68465e7613fbc88abf44967ce02b3958b71f04dc88e71f50db666e85bfd893f280e70786d3f57a5d426683b2e18d8bd187f1cc43a6c90cbec08666c14a7 SHA512 c518a8d3c864cdfb4907aba043d947870cf12c88f4ceaf3f0bc99bea6528bf93b222e549b3956da58d1fd48f2e2f991589a2c868856b8d362036d6bca62b716d
+EBUILD abiword-3.0.5.ebuild 4452 BLAKE2B ed1e2be488d60a53b2b439ae62fae1a719f3ac4913d333dced2978b003dec8290938f579f9b553dde8566e9f4bc142e13e72eec5a719257d685dc6c5969b0a0e SHA512 24fccb691a446100fb2d848af5ca2cc4cafedfc6c5c7b3eaf12196d1ea4ae58e479bea1df0fda76f411eaaf3299b2102ef9280dfd69faac444130db6f46d4e19
 MISC metadata.xml 1227 BLAKE2B edcbab9c01d27e816d0f7523b7159527b6886c28015e0a4814ca65e5370657a351afe1a1d42d25293ef0926ae22d6bd564bdcfc087fe0838377f111b04d38a3d SHA512 06e659852c2fc4649c736135fa156e679387f4df1e46b26909391c4094ccea9ef4d7901e456dc4e5cd4d568ed35bc59ae327ecd4a8cb147369e68bd8b72b0edd
diff --git a/app-office/abiword/abiword-3.0.5.ebuild b/app-office/abiword/abiword-3.0.5.ebuild
index 919b3748b85a..e0d085420c5d 100644
--- a/app-office/abiword/abiword-3.0.5.ebuild
+++ b/app-office/abiword/abiword-3.0.5.ebuild
@@ -84,6 +84,7 @@ PATCHES=(
 	"${WORKDIR}"/patches/${PN}-3.0.4-pygobject.patch
 	"${WORKDIR}"/patches/${PN}-3.0.4-asio-standalone-placeholders.patch
 	"${WORKDIR}"/patches/${PN}-3.0.4-c++17-dynamic-exception-specifications.patch
+	"${FILESDIR}"/${PN}-3.0.5-musl-lose-precision-fix.patch
 )
 
 src_prepare() {
diff --git a/app-office/abiword/files/abiword-3.0.5-musl-lose-precision-fix.patch b/app-office/abiword/files/abiword-3.0.5-musl-lose-precision-fix.patch
new file mode 100644
index 000000000000..af2a33f0bbb8
--- /dev/null
+++ b/app-office/abiword/files/abiword-3.0.5-musl-lose-precision-fix.patch
@@ -0,0 +1,37 @@
+# Patch written by fellow Gentoo user ernsteiswuerfel
+#
+# Please also reffer:
+# https://gitlab.gnome.org/World/AbiWord/-/commit/857cd86def49fe8557cfe123830c4d5a61eee732
+#
+# Closes: https://bugs.gentoo.org/853118
+--- a/src/af/xap/xp/xap_Dialog.cpp
++++ b/src/af/xap/xp/xap_Dialog.cpp
+@@ -36,8 +36,8 @@
+
+ XAP_Dialog::XAP_Dialog(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id,
+ 		       const char * helpUrl )
+-  : m_pApp ( NULL ), m_pDlgFactory ( pDlgFactory ), m_id ( id ), 
+-	m_helpUrl(NULL)
++  : m_pApp ( nullptr ), m_pDlgFactory ( pDlgFactory ), m_id ( id ), 
++	m_helpUrl(nullptr)
+ {
+   m_pApp = pDlgFactory->getApp();
+
+@@ -235,7 +235,7 @@ XAP_Frame *   XAP_Dialog_Modeless::getActiveFrame(void) const
+ 	// This function returns the frame currently connected to a modeless dialog
+
+ 	XAP_Frame * pFrame = m_pApp->getLastFocussedFrame();
+-	if(pFrame == (XAP_Frame *) NULL)
++	if(pFrame == (XAP_Frame *) nullptr)
+ 	{
+ 		pFrame = m_pApp->getFrame(0);
+ 	}
+@@ -267,7 +267,7 @@ XAP_Dialog_Modeless::BuildWindowName(char * pWindowName, const char * pDialogNam
+ // This function constructs and returns the window name of a modeless dialog by
+ // concatenating the active frame with the dialog name
+
+-	*pWindowName = (char) NULL;
++	*pWindowName = (char) 0;
+ 	UT_UTF8String wn = UT_UTF8String(pDialogName);
+
+ 	XAP_Frame* pFrame = getActiveFrame();