Attachment 824 Details for Bug 1169 – Proposed additional patch for libwpd-0.9

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] Proposed additional patch for libwpd-0.9

koffice-libwpd-0.9.diff (text/plain), 1.61 KB, created by Darrell on 2012-09-24 14:28:14 CDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darrell

Created: 2012-09-24 14:28:14 CDT

Size: 1.61 KB

patch

obsolete

>diff -urN koffice/configure.in koffice.new/configure.in
>--- koffice/configure.in	2012-09-14 17:44:19.000000000 -0500
>+++ koffice.new/configure.in	2012-09-18 20:50:42.000000000 -0500
>@@ -553,6 +553,29 @@
>   fi
> fi
> 
>+if test -z "$LIBWPD_LIBS"; then
>+  if test -n "$PKGCONFIG"; then
>+    vers=`$PKGCONFIG libwpd-0.9 --modversion 2>/dev/null`
>+    if test -n "$vers"
>+    then
>+       LIBWPD_LIBS="`$PKGCONFIG libwpd-0.9 --libs`"
>+       LIBWPD_RPATH=
>+       for args in $LIBWPD_LIBS; do
>+            case $args in
>+              -L*)
>+                 LIBWPD_RPATH="$LIBWPD_RPATH $args"
>+                 ;;
>+            esac
>+       done
>+       LIBWPD_RPATH=`echo $LIBWPD_RPATH | $SED -e "s/-L/-R/g"`
>+       LIBWPD_CFLAGS="`$PKGCONFIG libwpd-0.9 --cflags`"
>+
>+       AC_DEFINE_UNQUOTED(HAVE_WPD, 1, [Defines if your system has the libwpd library])
>+       AC_DEFINE_UNQUOTED(HAVE_LIBWPD_090, 1, [Defines if your system has libpwd greater than or equal to v0.9.0])
>+
>+    fi
>+  fi
>+fi
> 
> AC_SUBST(LIBWPD_LIBS)
> AC_SUBST(LIBWPD_CFLAGS)
>diff -urN koffice/filters/kword/wordperfect/configure.in.in koffice.new/filters/kword/wordperfect/configure.in.in
>--- koffice/filters/kword/wordperfect/configure.in.in	2012-09-14 17:44:28.000000000 -0500
>+++ koffice.new/filters/kword/wordperfect/configure.in.in	2012-09-18 20:50:33.000000000 -0500
>@@ -42,7 +42,6 @@
>        AC_DEFINE_UNQUOTED(HAVE_WPD, 1, [Defines if your system has the libwpd library])
>        AC_DEFINE_UNQUOTED(HAVE_LIBWPD_090, 1, [Defines if your system has libpwd greater than or equal to v0.9.0])
> 
>-       AC_MSG_ERROR([[libwpd >= 0.9.0 is not yet supported!]])       
>     fi
>   fi
> fi

Actions: View | Diff

Attachments on bug 1169: 824 | 876 | 1143 | 1144