[gentoo-commits] gentoo-x86 commit in app-office/libreoffice/files: libreoffice-32b-qt4-libdir.patch

[gentoo-commits] gentoo-x86 commit in app-office/libreoffice/files: libreoffice-32b-qt4-libdir.patch

[Tomas Chvatal (scarabeus)]

scarabeus    11/08/03 17:23:04

  Added:                libreoffice-32b-qt4-libdir.patch
  Log:
  Fix finding qt libraries on 32b platform. Fixes bug #377377.
  
  (Portage version: 2.2.0_alpha50/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-office/libreoffice/files/libreoffice-32b-qt4-libdir.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-32b-qt4-libdir.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-32b-qt4-libdir.patch?rev=1.1&content-type=text/plain

Index: libreoffice-32b-qt4-libdir.patch
===================================================================
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=""
 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"
 
     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

[gentoo-commits] gentoo-x86 commit in app-office/libreoffice/files: libreoffice-32b-qt4-libdir.patch

[Tomas Chvatal (scarabeus)]

scarabeus    11/08/03 20:21:09

  Modified:             libreoffice-32b-qt4-libdir.patch
  Log:
  Update the qt patch as the 3.4 branch lacks quite few commits.
  
  (Portage version: 2.2.0_alpha50/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  app-office/libreoffice/files/libreoffice-32b-qt4-libdir.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-32b-qt4-libdir.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-32b-qt4-libdir.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-32b-qt4-libdir.patch?r1=1.1&r2=1.2

Index: libreoffice-32b-qt4-libdir.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/files/libreoffice-32b-qt4-libdir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libreoffice-32b-qt4-libdir.patch	3 Aug 2011 17:23:04 -0000	1.1
+++ libreoffice-32b-qt4-libdir.patch	3 Aug 2011 20:21:09 -0000	1.2
@@ -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"