diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2009-09-03 15:29:16 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2009-09-03 15:29:16 +0000 |
| commit | 123b66e7dbd3ef5b921e8af8ed1450b11ffa21c6 (patch) | |
| tree | 6ec05fb919dac08c1809f48f354b2d070879288b /app-office | |
| parent | Cleanup work, also drop sparc for the time being (diff) | |
| download | gentoo-2-123b66e7dbd3ef5b921e8af8ed1450b11ffa21c6.tar.gz gentoo-2-123b66e7dbd3ef5b921e8af8ed1450b11ffa21c6.tar.bz2 gentoo-2-123b66e7dbd3ef5b921e8af8ed1450b11ffa21c6.zip | |
Fix qt4-detection, see bug #280344
(Portage version: 2.2_rc40/cvs/Linux i686)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/openoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/openoffice/files/gentoo-3.1.1.diff | 11 |
2 files changed, 16 insertions, 1 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index abc3cefdefcf..f4341b21bc79 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/openoffice # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.478 2009/09/03 15:24:08 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.479 2009/09/03 15:29:16 suka Exp $ + + 03 Sep 2009; Andreas Proschofsky <suka@gentoo.org> + files/gentoo-3.1.1.diff: + Fix qt4-detection, see bug #280344 02 Sep 2009; Andreas Proschofsky <suka@gentoo.org> -files/buildfix-mono-2-2.diff, -openoffice-3.0.1.ebuild, diff --git a/app-office/openoffice/files/gentoo-3.1.1.diff b/app-office/openoffice/files/gentoo-3.1.1.diff index c220676b6de9..1dcbe8519c2f 100644 --- a/app-office/openoffice/files/gentoo-3.1.1.diff +++ b/app-office/openoffice/files/gentoo-3.1.1.diff @@ -11,4 +11,15 @@ [ LinuxOnly ] # fix that allows OOo to work with a standard (unpatched) libjpeg, +--- patches/dev300kde4-configure.diff ++++ patches/dev300/kde4-configure.diff +@@ -104,7 +104,7 @@ + +MOC4="moc" + +if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then + + qt_incdirs="$QTINC $QTDIR /usr/include/qt4 /usr/include $x_includes" +-+ qt_libdirs="$QTLIB /usr/lib $x_libraries" +++ qt_libdirs="$QTLIB /usr/lib /usr/lib/qt4 $x_libraries" + + + + kde_incdirs="/usr/include $x_includes" + + kde_libdirs="/usr/lib $x_libraries" |