diff options
Diffstat (limited to 'app-office/abiword')
| -rw-r--r-- | app-office/abiword/ChangeLog | 7 | ||||
| -rw-r--r-- | app-office/abiword/Manifest | 16 | ||||
| -rw-r--r-- | app-office/abiword/abiword-2.4.6.ebuild | 89 | ||||
| -rw-r--r-- | app-office/abiword/files/11_history_fullpath.dpatch | 73 | ||||
| -rw-r--r-- | app-office/abiword/files/freebsd_fix.patch | 11 |
5 files changed, 17 insertions, 179 deletions
diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog index eeb02e7324d4..7d1c423e66cc 100644 --- a/app-office/abiword/ChangeLog +++ b/app-office/abiword/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/abiword # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.238 2011/03/16 07:45:18 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.239 2011/03/18 16:39:29 pacho Exp $ + + 18 Mar 2011; Pacho Ramos <pacho@gentoo.org> + -files/11_history_fullpath.dpatch, -abiword-2.4.6.ebuild, + -files/freebsd_fix.patch: + Drop old as bsd won't keyword this. 16 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> abiword-2.4.6.ebuild, abiword-2.8.6.ebuild, abiword-2.8.6-r1.ebuild: diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest index 38302a28b55a..958e77da1afd 100644 --- a/app-office/abiword/Manifest +++ b/app-office/abiword/Manifest @@ -1,9 +1,15 @@ -AUX 11_history_fullpath.dpatch 1905 RMD160 17c9ceecbe54c9e83605fe74d1b52ee42b5bbc4f SHA1 4eb037972e1115b01c04e2d4e6474973d787d8a7 SHA256 16b50d4aa4822aba7577f804bd98fc35c30561e5aa354f2c2ca9cd0c8819941f -AUX freebsd_fix.patch 550 RMD160 aa37f1f1737c1723840b72a1e48724575dd196a6 SHA1 c39b6964ef1e24652c026c344513facd94c88226 SHA256 28db978a944016d43862a221af8ef9dbc69e239b3abde14ede33ca21485ed8c5 -DIST abiword-2.4.6.tar.bz2 24994889 RMD160 ca56800d811b3aca0af6b2fb6cd70cbea29ab792 SHA1 3011d221d09336f09f4bb0732add3405961a8623 SHA256 1ca509814d1ce939c98f2776f95351a2a6ea216d12c20be30d40eefd13f43020 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + DIST abiword-2.8.6.tar.gz 9218827 RMD160 caabab25d197f9553ea12376de36fc7f5a771a58 SHA1 998f69d038000b3fc027d4259548f02d67c8d0df SHA256 d99089a63a6cfc1a6a4a026be9278028d47d224088d24b1853acb67e95683a15 -EBUILD abiword-2.4.6.ebuild 2384 RMD160 3164125eb64f8965c15ae229e10242023da0bcae SHA1 9f4d2a0e192d05fa1d03f436cff2c7f3d301d496 SHA256 9e14d09ac1981369e07d1be0d4a9f96f5589546b2989086b530e5fc3ed52ca19 EBUILD abiword-2.8.6-r1.ebuild 4534 RMD160 89ff3a6e41d947e15a4a037d16268ecf255286ec SHA1 45df51152f893057cfbb8a4ada6bd0d9739e472c SHA256 516cdc145feb05c59f04035c0c6d05d5fc4c2c85f8f5f495a7da15195540e1c1 EBUILD abiword-2.8.6.ebuild 4644 RMD160 4a9ed630c70718b80b4ff524acfa382f68a61b45 SHA1 a8c5f716db0b89e3fa1866c63c518b55f6ad62fe SHA256 f9c4b52b144e8fefc4661ae60599760cb3b05c0f915f28634ad713f3f04fb8c2 -MISC ChangeLog 31983 RMD160 6e72e919d42e81f99333c7f08b2a5b5b128635f7 SHA1 7bab2af532a9bd0d9ff2580b89b07b54f3b6d47e SHA256 4d0c005da43b6127322eab1d4777381fe04f45fe3b269b44f4842bb7d96d92a2 +MISC ChangeLog 32153 RMD160 0c67558b0ff24b4bd74247a65bbf6032c9440d04 SHA1 74f63ceb43883707120cf704f7c808a137865e96 SHA256 c212a871c40b8fc4cfd8f217c9cdcc2f4036959f527edfdfcef59817fe798b5e MISC metadata.xml 879 RMD160 df1f57e78a294b266ece583d9c04e685fc6f2b53 SHA1 8876780818c62eb42318ba47ef68c15cc80a2a10 SHA256 68442b26d087af39be60f2b41749ae53e94073770449f80bf8f6fd2286e0be84 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iEYEARECAAYFAk2DisYACgkQCaWpQKGI+9RgCwCggh6oO8fqm6M27LG7FNF18zrK +RkcAn3vuDaOB8304KPij83gxmFWWSP9s +=SH9j +-----END PGP SIGNATURE----- diff --git a/app-office/abiword/abiword-2.4.6.ebuild b/app-office/abiword/abiword-2.4.6.ebuild deleted file mode 100644 index ee0bdd4a1b0b..000000000000 --- a/app-office/abiword/abiword-2.4.6.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.4.6.ebuild,v 1.20 2011/03/16 07:45:18 nirbheek Exp $ - -EAPI="1" - -inherit alternatives eutils fdo-mime - -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="~x86-fbsd" -IUSE="debug gnome spell xml" - -RDEPEND="dev-libs/popt - sys-libs/zlib - >=dev-libs/glib-2:2 - >=x11-libs/gtk+-2.4:2 - >=x11-libs/pango-1.2 - x11-libs/libXft - >=gnome-base/libglade-2:2.0 - >=gnome-base/libgnomeprint-2.2:2.2 - >=gnome-base/libgnomeprintui-2.2:2.2 - >=media-libs/libpng-1.2:1.2 - >=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_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/11_history_fullpath.dpatch - epatch "${FILESDIR}"/freebsd_fix.patch -} - -src_compile() { - econf $(use_enable debug) \ - $(use_enable debug symbols) \ - $(use_enable gnome) \ - $(use_enable gnome gucharmap) \ - $(use_enable spell enchant) \ - $(use_with xml libxml2) \ - "--enable-threads" \ - "--disable-scripting" \ - "--with-sys-wv" \ - || die "configure failed" - - emake all-recursive || die "build failed" -} - -src_install() { - dodir /usr/{bin,lib} - emake DESTDIR="${D}" icondir="/usr/share/pixmaps" install || die "install failed" - - dosed "s:Exec=abiword:Exec=abiword-2.4:" /usr/share/applications/abiword.desktop - - rm -f "${D}"/usr/bin/abiword - rm -f "${D}"/usr/bin/abiword-2.4 - dosym AbiWord-2.4 /usr/bin/abiword-2.4 - - dodoc *.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]" - - elog "As of version 2.4, all abiword plugins have been moved" - elog "into a seperate abiword-plugins package" - elog "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 deleted file mode 100644 index 059dac6cc2ab..000000000000 --- a/app-office/abiword/files/11_history_fullpath.dpatch +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/sh /usr/share/dpatch/dpatch-run -## 11_history_fullpath.dpatch by Joshua Kwan <joshk@triplehelix.org> -## -## 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 <limits.h> -+ - #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/freebsd_fix.patch b/app-office/abiword/files/freebsd_fix.patch deleted file mode 100644 index 9e95194c18bf..000000000000 --- a/app-office/abiword/files/freebsd_fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/af/util/xp/ut_iconv.cpp.orig Tue Jan 10 00:18:13 2006 -+++ src/af/util/xp/ut_iconv.cpp Tue Jan 10 00:18:31 2006 -@@ -67,7 +67,7 @@ - #if defined (WIN32) || defined(__QNXNTO__) || defined(__CYGWIN__) || \ - (defined (__MACH__) && defined (__APPLE__)) || \ - (defined(TARGET_OS_MAC) && TARGET_OS_MAC) || \ --defined (__AIX__) || defined(__OpenBSD__) || \ -+defined (__AIX__) || defined(__OpenBSD__) || defined (__FreeBSD__) || \ - (defined(__linux__) && defined(__powerpc__) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ <= 1)) - - #define ICONV_CONST const |