Quick&Dirty hack to fix svx build crash i observed on my desktop (definitely not...

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

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 2a361e316debb956736e1e3b0f400decb51c6d92..f41da87ec057a638afb8258a142bade85df21326 100644 (file)
--- 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.44 2011/07/24 16:40:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.45 2011/07/24 21:32:42 scarabeus Exp $
+
+  24 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.4.2.2.ebuild, +files/libreoffice-svx.patch:
+  Quick&Dirty hack to fix svx build crash i observed on my desktop (definitely
+  not a solution for upstream).
 
   24 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.4.2.2.ebuild:

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 7fa582d583a95d3216dd7c9bd419efa227bc6d72..7766b3d54315500a51ac33d0d9917dd01fe5da54 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -13,6 +13,7 @@ AUX libreoffice-3.3.1-neon_remove_SSPI_support.diff 1081 RMD160 9c91936b136055a6
 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-libdb5-fix-check.diff 1197 RMD160 dea8896745502035e899f9f685c662a1dbdfbbeb SHA1 07202400d8c17a12cb965331ddbef57c4438e7be SHA256 f8532c4ee3ebb8cb424cbb736abcb7b3c7027fd7c749f39571e76527808bd51a
+AUX libreoffice-svx.patch 1347 RMD160 91d5f142df33d119666252ecc319dc4e7ec70f6d SHA1 020db7d4e784a131acc63413ccc625715d44df70 SHA256 dbcd451e390c78102075b048e1472cb45c8d960608bef4ac0c0611c7aeaea736
 AUX libreoffice-unfigured-options.txt 1886 RMD160 b3ad4169dc6634b5e9e34e41af5a90a5de980577 SHA1 2f2ea97227408c8d55c8697d4180cb7284157cce SHA256 9e9188be96eeaacb4d6f5755370e90a0ee791ee95e20098315c758d659f15320
 AUX scrap-pixmap-links.diff 1085 RMD160 29384dbf63fce1419e05ddd506915a73ef3459ab SHA1 44ad5198b7bc70813afd74b456a61081f18838cf SHA256 054b18ebe38c804082b66d763285f9c7af11da773486ba8e9f4255266efb7ac9
 AUX sdext-presenter.diff 649 RMD160 1f302a949deaba5c0243b18c60037c3602dc45ed SHA1 e4b2b653390e4fc972cfe5afc57911ece1c30f39 SHA256 7abf056815e5faee5fddfd17b25df5d7afe88347472695cfcadc0617739ac93f
@@ -205,13 +206,13 @@ EBUILD libreoffice-3.3.1.ebuild 18572 RMD160 d92d1933c8bbde7d28425b11717614cf6cf
 EBUILD libreoffice-3.3.2.ebuild 18122 RMD160 c8f363b391004652a2a3c7b1c2660df9d604a475 SHA1 7578952923caf5ed05a54c5cc2c951b86d7acbee SHA256 ebadb43837677bbcec00992718f67c6610c4d049d441f06d15814276c9c11207
 EBUILD libreoffice-3.3.3.ebuild 18134 RMD160 95cf52bf10765cd9bb7862c673dc57a96bcca376 SHA1 4a001ff974125839ad5219915bb2f8399e6f90f8 SHA256 a60d52f57767ac5e9f46ad5204dd27b4f4a45ac1468357c41462b502d37b8626
 EBUILD libreoffice-3.4.1.ebuild 19176 RMD160 9f22a8c93f185f56dfaa37a291f194bc8f1972c8 SHA1 91eb7e4e285643d5c8da3acf1bf952fb68916efe SHA256 0b895bc9569a3b3ca84fe8d54fb861a4570ba8ec57317c0fcd8cf3b03e010274
-EBUILD libreoffice-3.4.2.2.ebuild 18549 RMD160 539006fdaa9a5648b5279447c42912379d2fd93a SHA1 e3bb059accc41f5f00e75661c978adac3977df9f SHA256 85db7a4c7851560b76815fc0c4d733eee4765892fe07ab5a8b7a26afdbf49869
-MISC ChangeLog 9120 RMD160 05cca759253f4435b101228799a3ca9e2d4ed6a4 SHA1 8d06c3ac7db2568a59bc91d71d0b1542ab73c4df SHA256 afd19337d3b1a7c6663c5f6a91b809e631c28163d0bd01fb87c4ec36a2a86a1b
+EBUILD libreoffice-3.4.2.2.ebuild 18580 RMD160 e738cb8e67cb9e9138dfc3b41a0f35e647482608 SHA1 251755b2b4192259fbdf1fdbe3879a260640bac9 SHA256 ca189e91e1100408cf23590326173c2624a91ee508cec97eaf13ab167d2d6898
+MISC ChangeLog 9347 RMD160 a4a78f388c61401fff0f3fdb85eec6627db2efcf SHA1 2dc7bf2f1a3503cb558654ab29315d4f31dcaf39 SHA256 c40b286d8125564378fb1fc9d35757ba34b242ce73d7926aa0eceebcc335a85e
 MISC metadata.xml 882 RMD160 fec57be29e81f82a00fe1a3792d06bf55094312f SHA1 2256f830fe8568d99a9104a8446dde40259546d0 SHA256 4b55d790375e3eb2cd00a94f2327efccc0a505cb8e3358eb9a15e44f917f5333
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4sSscACgkQHB6c3gNBRYfrwACcCXSUZvtAoCQWfbboydLOKePa
-oAkAniw9y0rkAYGSag7yTe1emK6K1DVq
-=YteI
+iEYEARECAAYFAk4sj4YACgkQHB6c3gNBRYegxQCgo2Mq/jsqh6Oc2c9I61aOf+vp
+bPgAoKTwwTYZXYQ6lMWoabbw3jPoUIrx
+=ugoO
 -----END PGP SIGNATURE-----

diff --git a/app-office/libreoffice/files/libreoffice-svx.patch b/app-office/libreoffice/files/libreoffice-svx.patch
new file mode 100644 (file)
index 0000000..d25d192
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-svx.patch
@@ -0,0 +1,28 @@
+--- libreoffice-bootstrap-3.4.2.2/svx/AllLangResTarget_svx.mk.old      2011-07-24 21:49:06.000000000 +0200
++++ libreoffice-bootstrap-3.4.2.2/svx/AllLangResTarget_svx.mk  2011-07-24 22:02:11.000000000 +0200
+@@ -106,11 +106,11 @@
+ # hack !!!
+ # just a temporary - globlmn.hrc about to be removed!
+ ifeq ($(strip $(WITH_LANG)),)
+-$(WORKDIR)/inc/svx/globlmn.hrc : $(realpath $(SRCDIR)/svx/inc/globlmn_tmpl.hrc)
++$(WORKDIR)/inc/svx/globlmn.hrc : $(SRCDIR)/svx/inc/globlmn_tmpl.hrc
+       echo copying $@
+       -mkdir -p $(WORKDIR)/inc/svx
+-      cp $< $@
+-      $(call gb_Deliver_deliver, $@, $(OUTDIR)/inc/svx/globlmn.hrc)
++      cp $(SRCDIR)/svx/inc/globlmn_tmpl.hrc $(WORKDIR)/inc/svx/globlmn.hrc
++      cp $(SRCDIR)/svx/inc/globlmn_tmpl.hrc $(OUTDIR)/inc/svx/globlmn.hrc
+       rm -f $(WORKDIR)/inc/svx/lastrun.mk
+ else
+ -include $(WORKDIR)/inc/svx/lastrun.mk
+@@ -125,8 +125,8 @@
+       $(call gb_Helper_abbreviate_dirs_native, \
+             $(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
+             -p svx \
+-            -i $< -o $@ -m $(realpath $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf) -l all)
+-      $(call gb_Deliver_deliver, $@, $(OUTDIR)/inc/svx/globlmn.hrc)
++            -i $< -o $@ -m $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf -l all)
++      cp $(WORKDIR)/inc/svx/globlmn.hrc $(OUTDIR)/inc/svx/globlmn.hrc
+ endif
+ 
+ .PHONY : $(WORKDIR)/inc/svx/globlmn.hrc_clean

diff --git a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
index 04907540a37f866fe3a2f5a8debd2017ebf77476..317017a328f733ba8e51f9d67c7baac308402215 100644 (file)
--- a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.2.2.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.2.ebuild,v 1.4 2011/07/24 16:40:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v 1.5 2011/07/24 21:32:42 scarabeus Exp $
 
 EAPI=3
 
@@ -214,6 +214,7 @@ PATCHES=(
        "${FILESDIR}/${PN}-libdb5-fix-check.diff"
        "${FILESDIR}/${PN}-3.4.1-salfix.diff"
        "${FILESDIR}/sdext-presenter.diff"
+       "${FILESDIR}/${PN}-svx.patch"
 )
 
 # Uncoment me when updating to eapi4