From ca7e0c0ff552313f79b2fbdcad96b245839475ed Mon Sep 17 00:00:00 2001 From: Patryk Zawadzki Date: Fri, 17 Nov 2006 14:23:01 +0000 Subject: [PATCH] - i fscked up Changed files: abiword-goffice03.patch -> 1.5 abiword.spec -> 1.134 --- abiword-goffice03.patch | 82 +++++++++++++++++++---------------------- abiword.spec | 2 +- 2 files changed, 39 insertions(+), 45 deletions(-) diff --git a/abiword-goffice03.patch b/abiword-goffice03.patch index df6cbd6..8b8cd1d 100644 --- a/abiword-goffice03.patch +++ b/abiword-goffice03.patch @@ -42,49 +42,43 @@ m_Image = new GR_UnixImage(NULL, pixbuf); g_object_ref(pixbuf); m_Image->scaleImageTo(m_pGOMan->getGraphics(),rec); ---- abiword-plugins/configure~ 2006-11-17 13:08:32.000000000 +0100 -+++ abiword-plugins/configure 2006-11-17 13:51:20.348315000 +0100 -@@ -24074,12 +24074,12 @@ - pkg_cv_GOFFICE_CFLAGS="$GOFFICE_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-1 >= \$LIBGOffice_REQUIRED_VERSION\"") >&5 -- ($PKG_CONFIG --exists --print-errors "libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION") 2>&5 -+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.3 >= \$LIBGOffice_REQUIRED_VERSION\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "libgoffice-0.3 >= $LIBGOffice_REQUIRED_VERSION") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- pkg_cv_GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION" 2>/dev/null` -+ pkg_cv_GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-0.3 >= $LIBGOffice_REQUIRED_VERSION" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -24092,12 +24092,12 @@ - pkg_cv_GOFFICE_LIBS="$GOFFICE_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-1 >= \$LIBGOffice_REQUIRED_VERSION\"") >&5 -- ($PKG_CONFIG --exists --print-errors "libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION") 2>&5 -+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.3 >= \$LIBGOffice_REQUIRED_VERSION\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "libgoffice-0.3 >= $LIBGOffice_REQUIRED_VERSION") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- pkg_cv_GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION" 2>/dev/null` -+ pkg_cv_GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-0.3 >= $LIBGOffice_REQUIRED_VERSION" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -24116,9 +24116,9 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- GOFFICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION"` -+ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgoffice-0.3 >= $LIBGOffice_REQUIRED_VERSION"` +--- abiword-plugins/configure.orig 2006-11-17 15:05:35.228315000 +0100 ++++ abiword-plugins/configure 2006-11-17 15:14:15.268315000 +0100 +@@ -22834,23 +22834,23 @@ + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then +- echo "$as_me:$LINENO: checking for libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION" >&5 +-echo $ECHO_N "checking for libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION... $ECHO_C" >&6 ++ echo "$as_me:$LINENO: checking for libgoffice-0.3 >= $LIBGOffice_REQUIRED_VERSION" >&5 ++echo $ECHO_N "checking for libgoffice-0.3 >= $LIBGOffice_REQUIRED_VERSION... $ECHO_C" >&6 + +- if $PKG_CONFIG --exists "libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION" ; then ++ if $PKG_CONFIG --exists "libgoffice-0.3 >= $LIBGOffice_REQUIRED_VERSION" ; then + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + succeeded=yes + + echo "$as_me:$LINENO: checking GOFFICE_CFLAGS" >&5 + echo $ECHO_N "checking GOFFICE_CFLAGS... $ECHO_C" >&6 +- GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION"` ++ GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-0.3 >= $LIBGOffice_REQUIRED_VERSION"` + echo "$as_me:$LINENO: result: $GOFFICE_CFLAGS" >&5 + echo "${ECHO_T}$GOFFICE_CFLAGS" >&6 + + echo "$as_me:$LINENO: checking GOFFICE_LIBS" >&5 + echo $ECHO_N "checking GOFFICE_LIBS... $ECHO_C" >&6 +- GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION"` ++ GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-0.3 >= $LIBGOffice_REQUIRED_VERSION"` + echo "$as_me:$LINENO: result: $GOFFICE_LIBS" >&5 + echo "${ECHO_T}$GOFFICE_LIBS" >&6 else -- GOFFICE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION"` -+ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgoffice-0.3 >= $LIBGOffice_REQUIRED_VERSION"` +@@ -22858,7 +22858,7 @@ + GOFFICE_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. +- GOFFICE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION"` ++ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgoffice-0.3 >= $LIBGOffice_REQUIRED_VERSION"` + fi - # Put the nasty error message in config.log where it belongs - echo "$GOFFICE_PKG_ERRORS" >&5 + diff --git a/abiword.spec b/abiword.spec index 7227cb4..a2c6a1f 100644 --- a/abiword.spec +++ b/abiword.spec @@ -724,8 +724,8 @@ Jest to teczka clipart %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p0 %patch5 -p1 +%patch4 -p0 # use generic icon name sed -i -e 's|abiword_48.png|abiword.png|' abi/GNUmakefile.am -- 2.44.0