diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-08-03 20:21:09 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-08-03 20:21:09 +0000 |
| commit | 55975b2bf24f3e4cb9d77fbdc5573b71472ddf35 (patch) | |
| tree | 57ad6ebb6a0fece4e8e14ebc6723a4200d6c28e6 /app-office | |
| parent | New snapshot. (diff) | |
| download | gentoo-2-55975b2bf24f3e4cb9d77fbdc5573b71472ddf35.tar.gz gentoo-2-55975b2bf24f3e4cb9d77fbdc5573b71472ddf35.tar.bz2 gentoo-2-55975b2bf24f3e4cb9d77fbdc5573b71472ddf35.zip | |
Update the qt patch as the 3.4 branch lacks quite few commits.
(Portage version: 2.2.0_alpha50/cvs/Linux x86_64)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/libreoffice/files/libreoffice-32b-qt4-libdir.patch | 41 |
2 files changed, 19 insertions, 28 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 55447d015879..94bec8b0c09d 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.81 2011/08/03 17:23:04 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.82 2011/08/03 20:21:09 scarabeus Exp $ + + 03 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org> + files/libreoffice-32b-qt4-libdir.patch: + Update the qt patch as the 3.4 branch lacks quite few commits. 03 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.4.2.3.ebuild, libreoffice-3.4.9999.ebuild, diff --git a/app-office/libreoffice/files/libreoffice-32b-qt4-libdir.patch b/app-office/libreoffice/files/libreoffice-32b-qt4-libdir.patch index f8c5f57d451b..1b0c7a604ffb 100644 --- a/app-office/libreoffice/files/libreoffice-32b-qt4-libdir.patch +++ b/app-office/libreoffice/files/libreoffice-32b-qt4-libdir.patch @@ -1,30 +1,17 @@ -From d1c187bd6005339ba260c166b2539791628e4702 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tomas.chvatal@gmail.com> -Date: Wed, 3 Aug 2011 13:02:38 +0200 -Subject: [PATCH] Add one more libdir path for detection with qt4 on 32b platform to be same with 64b. Fixes gentoo bug #377377. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - - -Signed-off-by: Tomáš Chvátal <tomas.chvatal@gmail.com> ---- - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/configure.in b/configure.in -index f4363db..cf308dc 100755 ---- a/configure.in -+++ b/configure.in -@@ -7310,7 +7310,7 @@ KDE_GLIB_LIBS="" +diff -urN libreoffice-bootstrap-3.4.2.3.old/configure.in libreoffice-bootstrap-3.4.2.3/configure.in +--- libreoffice-bootstrap-3.4.2.3.old/configure.in 2011-08-03 22:11:11.000000000 +0200 ++++ libreoffice-bootstrap-3.4.2.3/configure.in 2011-08-03 22:13:55.000000000 +0200 +@@ -6878,10 +6878,10 @@ KDE_HAVE_GLIB="" if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then - qt_incdirs="$QT4INC /usr/include/qt4 /usr/include $x_includes" -- qt_libdirs="$QT4LIB /usr/lib $x_libraries" -+ qt_libdirs="$QT4LIB /usr/lib/qt4 /usr/lib $x_libraries" + qt_incdirs="$QT4INC /usr/include/qt4 /usr/include $x_includes" +- qt_libdirs="$QT4LIB /usr/lib $x_libraries" ++ qt_libdirs="$QT4LIB /usr/lib/qt4 /usr/lib/qt /usr/lib $x_libraries" - kde_incdirs="/usr/include /usr/include/kde4 $x_includes" - kde_libdirs="/usr/lib /usr/lib/kde4 /usr/lib/kde4/devel $x_libraries" --- -1.7.3.4 - +- kde_incdirs="/usr/include $x_includes" +- kde_libdirs="/usr/lib $x_libraries" ++ kde_incdirs="/usr/include /usr/include/kde4 $x_includes" ++ kde_libdirs="/usr/lib /usr/lib/kde4 $x_libraries" + + if test "$host_cpu" = "x86_64" ; then + qt_libdirs="$qt_libdirs /usr/lib64/qt4 /usr/lib64/qt /usr/lib64" |