From 8da818aeee3f15b9b54cecef16178b88d04e4700 Mon Sep 17 00:00:00 2001
From: Thomas Lotterer <thl@openpkg.org>
Date: Mon, 21 Nov 2005 08:26:04 +0000
Subject: [PATCH] partial success only

---
 abiword/abiword.patch |  4 ++--
 abiword/abiword.spec  | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/abiword/abiword.patch b/abiword/abiword.patch
index e126fbaf52..66eea7a617 100644
--- a/abiword/abiword.patch
+++ b/abiword/abiword.patch
@@ -5,8 +5,8 @@ Index: abi/src/af/util/xp/ut_iconv.cpp
  #if defined (WIN32) || defined(__QNXNTO__) || defined(__CYGWIN__) ||  \
  (defined (__MACH__) && defined (__APPLE__)) || \
  (defined(TARGET_OS_MAC) && TARGET_OS_MAC) || \
--defined(__BEOS__) || defined (__AIX__) || \
-+defined(__BEOS__) || defined (__AIX__) || defined(__FreeBSD__) || \
+-defined (__AIX__) || \
++defined (__AIX__) || defined(__FreeBSD__) || \
  (defined(__linux__) && defined(__powerpc__) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ <= 1))
  
  #define ICONV_CONST const
diff --git a/abiword/abiword.spec b/abiword/abiword.spec
index d9061ab5b5..cf399a59fc 100644
--- a/abiword/abiword.spec
+++ b/abiword/abiword.spec
@@ -32,8 +32,8 @@ Distribution: OpenPKG
 Class:        EVAL
 Group:        Editor
 License:      GPL
-Version:      2.2.3
-Release:      20050813
+Version:      2.4.1
+Release:      20051121
 
 #   list of sources
 Source0:      http://osdn.dl.sourceforge.net/sourceforge/abiword/abiword-%{version}.tar.gz
@@ -55,11 +55,11 @@ BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 20040130, pkgconfig
 BuildPreReq:  glib2, glib2::with_threads = yes, expat
 BuildPreReq:  fontconfig, fribidi, jpeg, libiconv
-BuildPreReq:  libglade, popt, png, xft, libxml, zlib
+BuildPreReq:  libglade, popt, png, xft, libxml, zlib, cairo
 PreReq:       OpenPKG, openpkg >= 20040130
 PreReq:       glib2, glib2::with_threads = yes, expat
 PreReq:       fontconfig, fribidi, jpeg, libiconv
-PreReq:       libglade, popt, png, xft, libxml, zlib
+PreReq:       libglade, popt, png, xft, libxml, zlib, cairo
 AutoReq:      no
 AutoReqProv:  no
 
@@ -76,6 +76,7 @@ AutoReqProv:  no
 
 %track
     prog abiword = {
+        comment   = "thl/2.4.1: error: libgnomeprintui/gnome-print-dialog.h No such file or directory"
         version   = %{version}
         url       = http://prdownloads.sourceforge.net/abiword/
         regex     = abiword-(\d+\.\d+\.\d+(-\d+)?)\.tar\.gz
@@ -107,6 +108,7 @@ AutoReqProv:  no
         -e 's;^\(ABIWORD_APP_NAME=\)"AbiWord";\1"abiword";' \
         -e 's;^\(ABIWORD_APP_LIBDIR=\)"AbiWord";\1"abiword";' \
         -e 's;GTK_CFLAGS=;GTK_CFLAGS=%{l_cppflags} ;' \
+        -e 's;libgnomeprintui-2.2 >= 2.2.0;;' \
         abi/configure
     %{l_shtool} subst \
         -e 's;\((pkgdatadir)\/\)AbiWord;\1abiword;' \
@@ -177,7 +179,7 @@ AutoReqProv:  no
     CXX="%{l_cxx}" \
     CFLAGS="%{l_cflags -O}" \
     CXXFLAGS="%{l_cxxflags -O}" \
-    CPPFLAGS="%{l_cppflags atk pango gtk2} -I%{l_prefix}/lib/gtk2/include -I$l_x11_incdir" \
+    CPPFLAGS="%{l_cppflags atk pango gtk2 cairo} -I%{l_prefix}/lib/gtk2/include -I$l_x11_incdir" \
     LDFLAGS="%{l_ldflags}" \
     ABI_XML_CONFIG="%{l_prefix}/bin/xml2-config" \
     PKG_CONFIG_PATH=%{l_prefix}/lib/pkgconfig:$l_x11_pkgdir \