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 | 8dce067697cebaa31f67d90bf629e3b7dc9a789d (patch) | |
| tree | 39207932a0d870e4206397be18ab74c91987fbc8 /app-office | |
| parent | Cleanup work, also drop sparc for the time being (diff) | |
| download | historical-8dce067697cebaa31f67d90bf629e3b7dc9a789d.tar.gz historical-8dce067697cebaa31f67d90bf629e3b7dc9a789d.tar.bz2 historical-8dce067697cebaa31f67d90bf629e3b7dc9a789d.zip | |
Fix qt4-detection, see bug #280344
Package-Manager: portage-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/Manifest | 4 | ||||
| -rw-r--r-- | app-office/openoffice/files/gentoo-3.1.1.diff | 11 |
3 files changed, 18 insertions, 3 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/Manifest b/app-office/openoffice/Manifest index 22e80b021548..2aabb2f35a40 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -2,7 +2,7 @@ AUX base64.diff 770 RMD160 acea95d2f4ac09ef6252eb9a0e22405858574d51 SHA1 4097bc9 AUX buildfix-gcc44.diff 611 RMD160 31e7c33977941458b1472d92c645ed2b2ef64a82 SHA1 ed17195077f5212bfc6f546004f5e6f429b03c14 SHA256 dd66bbe257c9a88c757037d65f48ea4976d7cee8a38e96b6282611c1b70cecff AUX fixsandbox.diff 412 RMD160 2f49f40ccb3b06c2678402f25fbc65658061c35c SHA1 d7ef14c375634358351ce13de4b01fabc54e9c33 SHA256 fd6d40c11f37ed1db0b09cfd1f166cf84e96a759b58064ce58980eb63b2b8d49 AUX gentoo-3.0.0.diff 3086 RMD160 69856c46b641e09c5ffd561cf78c7f2334649d87 SHA1 a8aa9bde2cbde25c1fb54a84a4908a6b4f468873 SHA256 5c3e931564cadf9a5d212fab7c4708cf9f131057ffd1e15276dc343c36a4e33d -AUX gentoo-3.1.1.diff 400 RMD160 cbf92d61ce82acb79674088c19b330021586cb9c SHA1 784711addcfa3f6bc29b2ed24d87c915da320237 SHA256 a3f9aa6ca4e168a471ba90d55c1d055bef2e6cab7c996c33482d2051e6db26d5 +AUX gentoo-3.1.1.diff 849 RMD160 434d24f51c43a24f45b875b86dd0466461fabd1e SHA1 672c283b74caa3874a6be56439baab0a941bad21 SHA256 ae6d9ba3aa8829d26cab2e2152b60aded14871458e58922f4af5f3962b513c53 AUX gentoo-pythonpath.diff 173 RMD160 dacec2c40bd4bd8e2c07fb849afb6f3fe3643371 SHA1 1430513326652f7b09eb04ee8f420532ac60b5c2 SHA256 de9316222af0f197a11041ba1105bfd070ba31cbcc1a2a212641d911b728ed5a AUX hunspell-one-dir-nocrash.diff 874 RMD160 b28b5379b59e30debd4aedb290dd8a1c4ac420a5 SHA1 0df98e9d92c779530fd9cd7e7e2e573ee1b7a603 SHA256 1cd1517d3ea63563a5acdb08f20c9d07cd55f0b646b7435b89d4121945a59ac5 AUX nojavanostax.diff 1374 RMD160 676450cd667425b1ac2ad4df561633778469cb82 SHA1 34e4481f199f23ebca4ff89f8ffc00f3cd08337f SHA256 17e39229576e415e52ff3685d5c4cdfb5e2c6f6177aad23e6e341c256fe3b310 @@ -84,5 +84,5 @@ DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712 EBUILD openoffice-3.0.0.ebuild 12681 RMD160 20d2e4f6ea1e979f33f033d284d97d6a8e9bd4b8 SHA1 7a79d589ade481854fa81ab0309b972883ea6390 SHA256 4d096777f0cb9a99b1dfbfc363efc641a78650032c9544b95f997383e3b6a1f3 EBUILD openoffice-3.1.0-r1.ebuild 13569 RMD160 6e7162ea3eff111c981eb03e2dbd510110aba38c SHA1 a2b4c10d0c6877022dbfaac230ab58be9ebe8437 SHA256 ee5e3cd6a7f0d534b036b8d04b4ddaa830aff0d72bb095cea88cc145a68974f2 EBUILD openoffice-3.1.1.ebuild 13557 RMD160 9b74b41cbe152c7bb63095367abddff281109a26 SHA1 098b69c9c23596a80dd2abca65be06cc7ce86bcc SHA256 12afd4ec83b57ff0a73c4488a3f048e5e40adc5f3fb1943c7da5d0efe611822f -MISC ChangeLog 100000 RMD160 c8002e029d801a41f3b4d908f5013ad30b297f0d SHA1 0fe1783d66cf2c576351c22b9ccbccc374d9d063 SHA256 9d0d0f6ce4d504b3b5c0ab3c0d4cda18270bd57103ffba0a22d76a34169e6dd6 +MISC ChangeLog 100118 RMD160 45ef54d07174031752d6cc5a87c9ed20c1ac3172 SHA1 2e525836bb6f21adb4728ffd25eb8117bd7b417a SHA256 1379b2aba5e388c4d09722656fd05a5e98eb4bfedf7ffa36d5a16015433c2c50 MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78 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" |