Fix finding qt libraries on 32b platform. Fixes bug #377377.

Package-Manager: portage-2.2.0_alpha50/cvs/Linux x86_64

5 files changed, 47 insertions, 9 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 0b0fa4c0016c..55447d015879 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,11 @@
 # 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.80 2011/08/01 15:51:36 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.81 2011/08/03 17:23:04 scarabeus Exp $
+
+  03 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.4.2.3.ebuild, libreoffice-3.4.9999.ebuild,
+  +files/libreoffice-32b-qt4-libdir.patch:
+  Fix finding qt libraries on 32b platform. Fixes bug #377377.
 
   01 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.4.2.3.ebuild, +files/libreoffice-append-no-avx.patch:
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 91cc159d24ad..9fd24091257d 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -12,6 +12,7 @@ AUX libreoffice-3.3.0_libxmlsec_fix_extern_c.diff 1256 RMD160 278ea1a7025e2e47ce
 AUX libreoffice-3.3.1-neon_remove_SSPI_support.diff 1081 RMD160 9c91936b136055a61e90fb2269e63c720af1e562 SHA1 e9e83130a6d4814e2a15b0d1062c2b21d97d23b3 SHA256 646ccebdce09fd2d29093b956244725191f376099be0b397365064a974dc5e7e
 AUX libreoffice-3.3.2-bison25.diff 911 RMD160 b3335fe3728e97b69bde744dcd34dc27d4f3212c SHA1 857406c4735f9bcb0d1a7bd0b1dec3b444142ac6 SHA256 d16a9c2a41d2a5669208eac33212920e2d356da60d30e9dc5126ccd13319464b
 AUX libreoffice-3.4.1-salfix.diff 668 RMD160 3764e664888b423d81f9e78def6c2a93e037a462 SHA1 10e0128da7ddebdae3b52983e91363940b151cf1 SHA256 3adf1eab52b80c34b3ef1f8ab26eb6171af4515c8e05a264dcf10bd7c45e20e7
+AUX libreoffice-32b-qt4-libdir.patch 1099 RMD160 2482665c0d40a42ce32df5608d3462790f93ffad SHA1 c88de6c9f203b3c2cd933e09420c28d38b8d5275 SHA256 0a5565fbd096221d9e2cd69a4e6432bdb6ccaf4fdb2ff817116bd2aa5190598b
 AUX libreoffice-append-no-avx.patch 9329 RMD160 fce82cac5b15592cc9bd7b4af90372987fb198cb SHA1 4145cd7741c5b1e9ee2fb3974db7bda0f68282c5 SHA256 fab496a65e583bd484d5a5671d712acc17643c8f655e419f5148b2de9fc5c256
 AUX libreoffice-as-needed-gtk.patch 403 RMD160 c1c5733d282eb3b59b7fe03d5258e9c917d9c6c4 SHA1 7516a3d554d96b7a27e5884ef124f9f5166a5939 SHA256 88609b6bac793423dee7af79110a05981669471170f9473a2bc591d35927117a
 AUX libreoffice-fix-sandbox-install.patch 1609 RMD160 e79859f6343e04808cc261c101483ff2ba0f1a5d SHA1 579d30eafb7a7e54531faf4bc8d3bd35150494f7 SHA256 fdb54126c78837d73e7a095ceedba9329b121ce2ce1d1a23ad75247b8f144b50
@@ -167,14 +168,14 @@ DIST libreoffice-writer-3.4.2.3.tar.bz2 7294695 RMD160 2a7210c518376d9fe5c6e8a50
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 EBUILD libreoffice-3.3.1.ebuild 18572 RMD160 d92d1933c8bbde7d28425b11717614cf6cf7b1e0 SHA1 60ef1f62c341ce7997de7ff5bcef04b304f4dfd9 SHA256 a3fae0a7f7da4a92e67d9c86ba4e7f92a92bbfac8f40a2703c64f317b670da6b
 EBUILD libreoffice-3.3.3.ebuild 18134 RMD160 95cf52bf10765cd9bb7862c673dc57a96bcca376 SHA1 4a001ff974125839ad5219915bb2f8399e6f90f8 SHA256 a60d52f57767ac5e9f46ad5204dd27b4f4a45ac1468357c41462b502d37b8626
-EBUILD libreoffice-3.4.2.3.ebuild 18726 RMD160 a2eda3881f2d726daf7c35b540ddc996164058f7 SHA1 0a2564e3081b9d0702af585e1cce3538494709b2 SHA256 797be37f343820df8d15d1e7fcac65358eec4038a3a01fdd73bf404c814d96d3
-EBUILD libreoffice-3.4.9999.ebuild 18637 RMD160 80bca4571deb9d80c2c3ada76531d2b11bf7efab SHA1 f8b990b335c8d848f218e727e172c1e0bbfb4c71 SHA256 cf98d148b57783327d4d2d256ada2d03d048444888c987d0e38c781c4719df15
-MISC ChangeLog 16056 RMD160 adaa762686f0de53aef9318a6b1d52513f5204c2 SHA1 016b7a4a31f32a8cf0efaf957d9df15696e029c5 SHA256 768c9d0519b52e57ad41b26e856bf9185791fea80e26069f8c18e7aebe0b24d1
+EBUILD libreoffice-3.4.2.3.ebuild 18768 RMD160 8f8402a6439e032f6d85f28e503e5c5406a734f8 SHA1 0a59fe9a554120034288df4d70a32481ce4fac6e SHA256 774b56c62b29a23153f44c03a86e13b96d72416b37cfd5f1f16620f29a80968f
+EBUILD libreoffice-3.4.9999.ebuild 18680 RMD160 6f9c763b9980005d26b9de08df1456ffe7ce2443 SHA1 7b3702902b61332c6e87faeca6594ee9904d6c08 SHA256 4bb3fab5fd3b5736dc0f4e1e3a7ac7ff8dc5257734acf0f3e47130e98a2f8310
+MISC ChangeLog 16277 RMD160 ed180a270758bd988c6713a0e92bee6e9e69fe75 SHA1 cd0eb2a1b80ae3587cef3dd9ed952ec28246b4c2 SHA256 18fb6a66d98f4e13bed9c6b5b1f2d6e9e3e8ff3d5cbdb5274478feb28be13060
 MISC metadata.xml 1070 RMD160 5a010568eabba00eaa6193765fa5d181462dc5a5 SHA1 9973d230e4e10704136eddd33c8e20ddf485ba9f SHA256 c15b697bd70ccf20aef38b02b55a316cc02df24e027daf6d9b0d185d920469b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk42y5IACgkQHB6c3gNBRYdUaQCfY7JTUKHwBzxIVbC3n/DZTIkk
-O6cAoJhQEnw6YaVQ3Jg2WVa/Lk6u4/Dn
-=+hXb
+iEYEARECAAYFAk45g/sACgkQHB6c3gNBRYfbYwCcD4JWji+y/G8GpqPDEoaZJ4t8
+gLIAn35Frda3867BhCTcgNVrr84sgVQs
+=YL2/
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/files/libreoffice-32b-qt4-libdir.patch b/app-office/libreoffice/files/libreoffice-32b-qt4-libdir.patch
new file mode 100644
index 000000000000..f8c5f57d451b
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-32b-qt4-libdir.patch
@@ -0,0 +1,30 @@
+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
+
diff --git a/app-office/libreoffice/libreoffice-3.4.2.3.ebuild b/app-office/libreoffice/libreoffice-3.4.2.3.ebuild
index 4f47a78f9b70..87b48341f4f1 100644
--- a/app-office/libreoffice/libreoffice-3.4.2.3.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild,v 1.15 2011/08/01 15:51:36 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild,v 1.16 2011/08/03 17:23:04 scarabeus Exp $
 
 EAPI=3
 
@@ -237,6 +237,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-gbuild-use-cxxflags.patch"
 	"${FILESDIR}/${PN}-installed-files-permissions.patch"
 	"${FILESDIR}/${PN}-append-no-avx.patch"
+	"${FILESDIR}/${PN}-32b-qt4-libdir.patch"
 )
 
 # Uncoment me when updating to eapi4
diff --git a/app-office/libreoffice/libreoffice-3.4.9999.ebuild b/app-office/libreoffice/libreoffice-3.4.9999.ebuild
index 9964d030e732..e610b5b522da 100644
--- a/app-office/libreoffice/libreoffice-3.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild,v 1.3 2011/07/31 16:03:50 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild,v 1.4 2011/08/03 17:23:04 scarabeus Exp $
 
 EAPI=3
 
@@ -235,6 +235,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-translate-toolkit-parallel-solenv.patch"
 	"${FILESDIR}/${PN}-gbuild-use-cxxflags.patch"
 	"${FILESDIR}/${PN}-installed-files-permissions.patch"
+	"${FILESDIR}/${PN}-32b-qt4-libdir.patch"
 )
 
 # Uncoment me when updating to eapi4