From 6381418953704c9397b8b20045c1f5e6b550d89b Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Tue, 12 Dec 2006 22:27:26 +0000 Subject: [PATCH] rev bump to fix bug #157804 Package-Manager: portage-2.1.2_rc3-r2 --- app-office/abiword/ChangeLog | 9 +- app-office/abiword/Manifest | 23 ++++- app-office/abiword/abiword-2.4.5-r1.ebuild | 89 +++++++++++++++++++ .../abiword/files/11_history_fullpath.dpatch | 73 +++++++++++++++ .../abiword/files/16_fcfini_crash.dpatch | 26 ++++++ .../abiword/files/digest-abiword-2.4.5-r1 | 3 + 6 files changed, 218 insertions(+), 5 deletions(-) create mode 100644 app-office/abiword/abiword-2.4.5-r1.ebuild create mode 100644 app-office/abiword/files/11_history_fullpath.dpatch create mode 100644 app-office/abiword/files/16_fcfini_crash.dpatch create mode 100644 app-office/abiword/files/digest-abiword-2.4.5-r1 diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog index eb409463d526..c35e39f2df84 100644 --- a/app-office/abiword/ChangeLog +++ b/app-office/abiword/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-office/abiword # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.161 2006/10/15 01:46:01 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.162 2006/12/12 22:27:26 compnerd Exp $ + +*abiword-2.4.5-r1 (12 Dec 2006) + + 12 Dec 2006; Saleem Abdulrasool + +files/11_history_fullpath.dpatch, +files/16_fcfini_crash.dpatch, + +abiword-2.4.5-r1.ebuild: + Add patches from debian to a revbump to fix bug #157804 15 Oct 2006; Aron Griffis -abiword-2.2.10.ebuild, -abiword-2.4.1.ebuild, -abiword-2.4.2.ebuild, -abiword-2.4.2-r1.ebuild: diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest index d6e34c6b2b1b..142fc97babb0 100644 --- a/app-office/abiword/Manifest +++ b/app-office/abiword/Manifest @@ -1,3 +1,11 @@ +AUX 11_history_fullpath.dpatch 1905 RMD160 17c9ceecbe54c9e83605fe74d1b52ee42b5bbc4f SHA1 4eb037972e1115b01c04e2d4e6474973d787d8a7 SHA256 16b50d4aa4822aba7577f804bd98fc35c30561e5aa354f2c2ca9cd0c8819941f +MD5 63f15ae133398949d37b721215fb669f files/11_history_fullpath.dpatch 1905 +RMD160 17c9ceecbe54c9e83605fe74d1b52ee42b5bbc4f files/11_history_fullpath.dpatch 1905 +SHA256 16b50d4aa4822aba7577f804bd98fc35c30561e5aa354f2c2ca9cd0c8819941f files/11_history_fullpath.dpatch 1905 +AUX 16_fcfini_crash.dpatch 834 RMD160 106126c6846dc1fd5f8a4b718172c999112116de SHA1 9fcacbce84acd335366011337344880f490a6dca SHA256 bf04596ec7a795375aa1d9f0a5cbeca94b1bdf93534e0c061d409600f0045306 +MD5 fd3f86f7cd0bf8ebd4bb0fb06faab328 files/16_fcfini_crash.dpatch 834 +RMD160 106126c6846dc1fd5f8a4b718172c999112116de files/16_fcfini_crash.dpatch 834 +SHA256 bf04596ec7a795375aa1d9f0a5cbeca94b1bdf93534e0c061d409600f0045306 files/16_fcfini_crash.dpatch 834 AUX abiword-2.4.2-spell_crash_1.patch 1700 RMD160 eeaf9431172739dd271c64148c9bb1676d0fc8cd SHA1 577f386e05681f2fbd56470cbd89f2dad2a784c8 SHA256 adff1614e3328e90703da5b856726a2ae2e001418de12b1577a1cf677c0a6429 MD5 98841e46f8a384dc4121c339f9ce79eb files/abiword-2.4.2-spell_crash_1.patch 1700 RMD160 eeaf9431172739dd271c64148c9bb1676d0fc8cd files/abiword-2.4.2-spell_crash_1.patch 1700 @@ -21,14 +29,18 @@ EBUILD abiword-2.4.4.ebuild 2421 RMD160 558dc043bfb620e7dd34a8ed02790bea1475458f MD5 b082c134fbde1fa64b913a0ac8829497 abiword-2.4.4.ebuild 2421 RMD160 558dc043bfb620e7dd34a8ed02790bea1475458f abiword-2.4.4.ebuild 2421 SHA256 13c057f906377938de6c9c308c340c1e6aea61c3130a3c90f0aa120de3ae612f abiword-2.4.4.ebuild 2421 +EBUILD abiword-2.4.5-r1.ebuild 2547 RMD160 72364fd096d045bc9c268754708df8728410cf8c SHA1 bab529595ee081a87bbb5c64cf6a45a9adeac6ae SHA256 a95c903bb10cba3df91f932651edda51aa8da8f13d4e777b8214123e84794208 +MD5 805e40a8c14093fafbee463493007044 abiword-2.4.5-r1.ebuild 2547 +RMD160 72364fd096d045bc9c268754708df8728410cf8c abiword-2.4.5-r1.ebuild 2547 +SHA256 a95c903bb10cba3df91f932651edda51aa8da8f13d4e777b8214123e84794208 abiword-2.4.5-r1.ebuild 2547 EBUILD abiword-2.4.5.ebuild 2334 RMD160 f5dab11edcb1a1530d7a01a0a3fdc925baf83054 SHA1 ebdbae2c99f94b85d0bbbbdf5a347dc50cd1060a SHA256 ec17ea05c4923525524fb098b5308285c1aa7ff2e10ce40d8e9550166bc99e2c MD5 47dfaddf977cf303fc70839227879b3a abiword-2.4.5.ebuild 2334 RMD160 f5dab11edcb1a1530d7a01a0a3fdc925baf83054 abiword-2.4.5.ebuild 2334 SHA256 ec17ea05c4923525524fb098b5308285c1aa7ff2e10ce40d8e9550166bc99e2c abiword-2.4.5.ebuild 2334 -MISC ChangeLog 21492 RMD160 273ffb4d6ca317aa665d4fb0776e7658edd5039f SHA1 4eccc5b24675a1fb1a6f0c8405db915ae8c8b07c SHA256 bd8cd82f50d7708e2890a1b5a1800009d355a5925040dd2c74ce3d1b3ca79483 -MD5 d8f22debbb31fd90f0b61bfb30a303ff ChangeLog 21492 -RMD160 273ffb4d6ca317aa665d4fb0776e7658edd5039f ChangeLog 21492 -SHA256 bd8cd82f50d7708e2890a1b5a1800009d355a5925040dd2c74ce3d1b3ca79483 ChangeLog 21492 +MISC ChangeLog 21736 RMD160 9e972728e69262854159d04930ddd9be851fafcd SHA1 ed4230c2a41293937dccdd106864168e03650d82 SHA256 dddb8ad3d1986757dfb7320853d1663b8614edd3f2fe0116fb95ede1dbfc2b51 +MD5 966fee10cec5100aae414328c4b4a0a3 ChangeLog 21736 +RMD160 9e972728e69262854159d04930ddd9be851fafcd ChangeLog 21736 +SHA256 dddb8ad3d1986757dfb7320853d1663b8614edd3f2fe0116fb95ede1dbfc2b51 ChangeLog 21736 MISC metadata.xml 165 RMD160 46d22302656e49f090e45d3c10f90c4e16f75877 SHA1 7fc9c8a1bf4ba6ea2047d4fa8046e13a2abd6b82 SHA256 9e51028c1f6811ec63067385fb8d6cb393d04b1a1d6688e0bbeb368ef34d57a0 MD5 3b7f9b4ae874f21ec05137f8038bdd69 metadata.xml 165 RMD160 46d22302656e49f090e45d3c10f90c4e16f75877 metadata.xml 165 @@ -42,3 +54,6 @@ SHA256 01b3cfec2aa9a250a52a94b28d604b4424d81eb648c335a3b6464e2cfbd2d146 files/di MD5 fa658cf75f1760c74f84c7a7eecd6961 files/digest-abiword-2.4.5 250 RMD160 8f87b2d831cb3205a0605ef1af62dd1a116ccc4e files/digest-abiword-2.4.5 250 SHA256 d4ae306dba2e6b8eeb394067a42a2f54673d02aa7f6fa925404ff388861d2a0d files/digest-abiword-2.4.5 250 +MD5 fa658cf75f1760c74f84c7a7eecd6961 files/digest-abiword-2.4.5-r1 250 +RMD160 8f87b2d831cb3205a0605ef1af62dd1a116ccc4e files/digest-abiword-2.4.5-r1 250 +SHA256 d4ae306dba2e6b8eeb394067a42a2f54673d02aa7f6fa925404ff388861d2a0d files/digest-abiword-2.4.5-r1 250 diff --git a/app-office/abiword/abiword-2.4.5-r1.ebuild b/app-office/abiword/abiword-2.4.5-r1.ebuild new file mode 100644 index 000000000000..b5eed807633a --- /dev/null +++ b/app-office/abiword/abiword-2.4.5-r1.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.4.5-r1.ebuild,v 1.1 2006/12/12 22:27:26 compnerd Exp $ + +inherit eutils fdo-mime alternatives + +DESCRIPTION="Fully featured yet light and fast cross platform word processor" +HOMEPAGE="http://www.abisource.com/" +SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/source/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="debug gnome spell xml" + +RDEPEND="virtual/xft + >=dev-libs/glib-2 + >=x11-libs/gtk+-2.4 + >=x11-libs/pango-1.2 + >=gnome-base/libglade-2 + >=gnome-base/libgnomeprint-2.2 + >=gnome-base/libgnomeprintui-2.2 + sys-libs/zlib + >=media-libs/libpng-1.2 + dev-libs/popt + >=media-libs/fontconfig-2.1 + >=app-text/wv-1 + >=dev-libs/fribidi-0.10.4 + xml? ( >=dev-libs/libxml2-2.4.10 ) + !xml? ( dev-libs/expat ) + spell? ( >=app-text/enchant-1.1 ) + gnome? ( + >=gnome-base/libbonobo-2 + >=gnome-base/libgnomeui-2.2 + >=gnome-extra/gucharmap-1.4 )" +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.9" + +S=${WORKDIR}/${P}/abi + +src_compile() { + # Patch taken from debian to use full path for file history + epatch ${FILESDIR}/11_history_fullpath.dpatch + + # Patch taken from debian to prevent crash on exit + epatch ${FILESDIR}/16_fcfini_crash.dpatch + + # this is a hack since I don't want to go hack in the gnome-vfs + # headerfiles. The issue is about gnome-vfs containing "long long" + # which makes gcc 3.3.1 balk + sed -i -e 's:-pedantic::g' configure + + local myconf="$(use_enable gnome) \ + $(use_enable gnome gucharmap) \ + $(use_enable spell enchant) \ + $(use_enable debug) \ + $(use_with xml libxml2) \ + --enable-threads \ + --disable-scripting \ + --with-sys-wv" + + econf $myconf || die "./configure failed" + + emake all-recursive || die "Compilation failed" +} + +src_install() { + dodir /usr/{bin,lib} + + make DESTDIR="${D}" install || die "Installation failed" + + dosed "s:Exec=abiword:Exec=abiword-2.4:" /usr/share/applications/abiword.desktop + + rm -f ${D}/usr/bin/abiword-2.4 + rm -f ${D}/usr/bin/abiword + dosym AbiWord-2.4 /usr/bin/abiword-2.4 + + dodoc *.TXT docs/build/BUILD.TXT user/wp/readme.txt +} + +pkg_postinst() { + fdo-mime_desktop_database_update + + alternatives_auto_makesym "/usr/bin/abiword" "/usr/bin/abiword-[0-9].[0-9]" + + einfo "As of version 2.4, all abiword plugins have been moved" + einfo "into a seperate abiword-plugins package" + einfo "You can install them by running emerge abiword-plugins" +} diff --git a/app-office/abiword/files/11_history_fullpath.dpatch b/app-office/abiword/files/11_history_fullpath.dpatch new file mode 100644 index 000000000000..059dac6cc2ab --- /dev/null +++ b/app-office/abiword/files/11_history_fullpath.dpatch @@ -0,0 +1,73 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +## 11_history_fullpath.dpatch by Joshua Kwan +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Store absolute paths, however gnarly, into history, when relative file +## DP: paths are used on the command line. + +--- abiword-2.2.0/abi/src/wp/ap/xp/ap_App.cpp~ 2004-11-23 02:02:17.000000000 -0800 ++++ abiword-2.2.0/abi/src/wp/ap/xp/ap_App.cpp 2004-11-23 02:02:04.000000000 -0800 +@@ -18,6 +18,8 @@ + * 02111-1307, USA. + */ + ++#include ++ + #include "ap_Features.h" + #include "ap_App.h" + #include "ap_Args.h" +@@ -50,13 +50,45 @@ + { + int kWindowsOpened = 0; + const char *file = NULL; ++ ++#ifdef WIN32 ++# define arch_separator '\\' ++#else ++# define arch_separator '/' ++#endif ++ char cwd[PATH_MAX]; + poptContext poptcon = args->poptcon; ++ ++ getcwd(cwd, PATH_MAX); + + while ((file = poptGetArg (poptcon)) != NULL) { + XAP_Frame * pFrame = newFrame(); ++ char* fullpath = NULL; ++ ++ if (*file != arch_separator) ++ { ++ size_t file_len = strlen(file); ++#ifdef WIN32 ++ if (file_len > 1 && (file[1] != ':' || !(file[0] != '\\' && file[1] != '\\'))) /* check for C:\Blah.doc and \\share\Blah.doc */ ++#endif ++ { ++ size_t len = strlen(cwd) + file_len + 2; /* C/F + NUL */ ++ fullpath = (char*)malloc(len); ++ ++ /* First, resolve the path into an absolute one as best as we can */ ++ snprintf(fullpath, len, "%s%c%s", cwd, arch_separator, file); ++ } ++ } + + UT_Error error = pFrame->loadDocument +- (file, IEFT_Unknown, true); ++ (fullpath ? fullpath : file, IEFT_Unknown, true); ++ ++ if (fullpath != NULL) ++ { ++ free (fullpath); ++ fullpath = NULL; ++ } ++ + if (!error) + { + kWindowsOpened++; +@@ -74,6 +106,7 @@ + pFrame->loadDocument(NULL, IEFT_Unknown); + pFrame->raise(); + ++ /* OK to use relative path here. We get it */ + errorMsgBadFile (pFrame, file, error); + } + diff --git a/app-office/abiword/files/16_fcfini_crash.dpatch b/app-office/abiword/files/16_fcfini_crash.dpatch new file mode 100644 index 000000000000..73b9d895caab --- /dev/null +++ b/app-office/abiword/files/16_fcfini_crash.dpatch @@ -0,0 +1,26 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 16_fcfini_crash.dpatch by Joshua Kwan +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +Index: xap_UnixApp.cpp +=================================================================== +RCS file: /cvsroot/abi/src/af/xap/unix/xap_UnixApp.cpp,v +retrieving revision 1.102.2.1 +retrieving revision 1.102.2.2 +diff -u -r1.102.2.1 -r1.102.2.2 +--- a/abi/src/af/xap/unix/xap_UnixApp.cpp 12 May 2006 20:40:11 -0000 1.102.2.1 ++++ b/abi/src/af/xap/unix/xap_UnixApp.cpp 15 Sep 2006 22:53:03 -0000 1.102.2.2 +@@ -134,10 +134,6 @@ + DELETEP(m_pUnixToolbarIcons); + + delete m_fontManager; +- +-#if FC_MINOR > 2 +- FcFini(); +-#endif + } + + bool XAP_UnixApp::initialize(const char * szKeyBindingsKey, const char * szKeyBindingsDefaultValue) diff --git a/app-office/abiword/files/digest-abiword-2.4.5-r1 b/app-office/abiword/files/digest-abiword-2.4.5-r1 new file mode 100644 index 000000000000..92a5bbc12741 --- /dev/null +++ b/app-office/abiword/files/digest-abiword-2.4.5-r1 @@ -0,0 +1,3 @@ +MD5 e018669a154164d31c768f773a1c95b4 abiword-2.4.5.tar.bz2 24930028 +RMD160 f0de27f97135f8fff9b4400b05d74a27eee348cd abiword-2.4.5.tar.bz2 24930028 +SHA256 b8e5f61697c6d796e8f9f0812886666487fd0125bc777ca093c096b4b3e31264 abiword-2.4.5.tar.bz2 24930028 -- 2.26.2