OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 21-Nov-2005 09:26:04 Branch: HEAD Handle: 2005112108260400 Modified files: openpkg-src/abiword abiword.patch abiword.spec Log: partial success only Summary: Revision Changes Path 1.8 +2 -2 openpkg-src/abiword/abiword.patch 1.41 +7 -5 openpkg-src/abiword/abiword.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/abiword/abiword.patch ============================================================================ $ cvs diff -u -r1.7 -r1.8 abiword.patch --- openpkg-src/abiword/abiword.patch 13 Aug 2005 12:24:48 -0000 1.7 +++ openpkg-src/abiword/abiword.patch 21 Nov 2005 08:26:04 -0000 1.8 @@ -5,8 +5,8 @@ #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 @@ . patch -p0 <<'@@ .' Index: openpkg-src/abiword/abiword.spec ============================================================================ $ cvs diff -u -r1.40 -r1.41 abiword.spec --- openpkg-src/abiword/abiword.spec 13 Aug 2005 12:24:48 -0000 1.40 +++ openpkg-src/abiword/abiword.spec 21 Nov 2005 08:26:04 -0000 1.41 @@ -32,8 +32,8 @@ 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 @@ 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 @@ %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 @@ -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 @@ 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 \ @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org