app-office/texmaker: Add fix for clang, #449376

Package-Manager: portage-2.2.0_alpha151/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

4 files changed, 32 insertions, 11 deletions

diff --git a/app-office/texmaker/ChangeLog b/app-office/texmaker/ChangeLog
index 560fd666b742..aa6bbfe81bfe 100644
--- a/app-office/texmaker/ChangeLog
+++ b/app-office/texmaker/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/texmaker
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.115 2012/12/12 16:34:57 jlec Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.116 2013/01/12 18:55:30 jlec Exp $
+
+  12 Jan 2013; Justin Lecher <jlec@gentoo.org> texmaker-3.5.2.ebuild,
+  +files/texmaker-3.5.2-clang.patch:
+  Add fix for clang, #449376
 
   12 Dec 2012; Justin Lecher <jlec@gentoo.org> texmaker-3.3.4.ebuild,
   texmaker-3.5.2.ebuild, metadata.xml:
diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
index a833d4b421e8..d480c312ca30 100644
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@@ -1,22 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX texmaker-3.1-hunspell.patch 4493 SHA256 4605225c49282b2e075f3fc96dddaf98367be415a7ef195f27d9ff537a107f87 SHA512 212cb763cdca5e4b3ba8f0893927df7e6dfeb11be8a52861b323fa415827e6d8d91402f7ce5a90ffe49d8681a78ea84abf4c339a4c2973b8bf38d5f14fba7780 WHIRLPOOL 4034fd261ace8d1cbbcfba376b8d576f16d13181e2aef39a294fa2e44517a24137a7b806a6167ffe0520f7aa7d028e2d545bdf7f127e36b4a1dac2e183397f0e
 AUX texmaker-3.3.3-qt48.patch 294 SHA256 28da547538b5ccff6fa60e0f3b7d77749991d62174c97f9f637db12c7a3365aa SHA512 28d85b799b81150748b4483b6cc514472aabf646da9ef88eedad6f4347b85e848b8e1c36608ccfdd667f7fca32cfffc619343af31f1364e0f2b134cf84ced80c WHIRLPOOL bd42204ac3e6c09d5f660cd07d595cc6f51878c2fd523ffbf5d1ac13256fbbdb4f1f8ec3b519f2d186e0a7e7d1d6f6c346114c58b67e3742880ba3a7219810bc
 AUX texmaker-3.3.4-hunspell.patch 4478 SHA256 4d3b6dbbe829140e224bfa0cdceefef29c3ff012aa86d68b248d93bee564cd84 SHA512 4d9fc23fef2e6497f25a32cfcb3c1832527a684fedd70005fe990f234bfb90e68e752e06ba887acd84c4856d3c9f34f0aca631117a1537e49cba817e890b7f11 WHIRLPOOL 6deb23a437628c9cf69c0a7361497035b6bd923379cd4975cedcbe0222127f8f2e20b4244ace79d8d52f670aaea37b8dd2290d969f7090610edcb7fbaeaf0f09
 AUX texmaker-3.5-hunspell.patch 3841 SHA256 c886be8ca7c624ee0b61f57e4d23404882a4b142e6b7b3b02262c42829aef069 SHA512 fed81729a3e0a61caa4417aa28d39ffced6e5a728715760725d7bec8c9a8848bf56c0f82c160cfa20ccf10294d88e91c4a60589b695c549273620b419ee13960 WHIRLPOOL 5a048ea581184a84af1cf31858590940e5f799ae136578376e4ceb74e82d12b4238c62b0bada4ed1a42d56b9fcee0435c2a617c70bb47fa2f54f4d151f238501
 AUX texmaker-3.5.1-hunspell.patch 3843 SHA256 5bbd61ba62d87797230887afc3e6f618b90ae38009fd3c44eefba16b53fea1f3 SHA512 18efa8484ce05e3809fcc45f3b8a2c0ab83faaacc010c7beeb4069c68c67d24acba0ab5a0bea2896538f5b81e02c1d303fc4a3f679b8f611a51be7203e37cf94 WHIRLPOOL ef0c32261cc214a6efc9c7cd4eac1a23569a9d2d097a32eaaeaf6512771cb110b3248939a9c5bd84eb39889925d37aa527d2a16cdf959b286e78c67bc8bb3711
+AUX texmaker-3.5.2-clang.patch 771 SHA256 3aece614446a324270a8c9e05ca0830d4a0686f43f3fd94b033d0ecace62b946 SHA512 1043085f81338981ac931d34f0b1d5cb96c6bcbd0df4a8e2a8d46636514ffa0df8dec8623fd106867cffae161a099b45facc11778a2ec054031cbd7a75794266 WHIRLPOOL 32fc27128d8c7b5ee35953395e253a782be96b87fe60dd19141162a85fefae82659f7b39a5ff7b313e80822a441df8c15f2d5b0b5e9397329e5305dec449d632
 AUX texmaker-3.5.2-hunspell.patch 3738 SHA256 2cef3ac9d72e53de3b93df1bd5e70bb65186d49c7f7f86d98d507060b7eee348 SHA512 82c403244b1a552b624a6b79a0536030c06d9b41bcf88a1a3e050b90708ae1b79078424950a50c6a48986173c08597baaaf533f9853f70d18a9ae726d1b252b9 WHIRLPOOL 1b185c4c70b72bdc45e874cd6adb87ae218a56c25ffcb6e458a9bcd8a802c106d9570f1b85a5ecaed29aaaad7faa069e184a1aee96c68b0d74d47dff44e12fa0
 DIST texmaker-3.3.4.tar.bz2 13028203 SHA256 db9aa4d2633e6ad96ff4b0d893205d42c2220928f021c210146a41ecf87525f5 SHA512 014bfbe2a72aa2aef8d71972526959116a8dc39852475ea8e9da0d0fbbc4e8441c04b124be93911a0b637436f94ecab730150064f2bb3842e6566cd26116c28e WHIRLPOOL fb0a5d150ac463905b0c243e4402858e0142c42f1278f185e678e48a690369830a75848b342f0f22c3db6495580ee03eb65cbcf989bad52b63f87371d660970d
 DIST texmaker-3.5.2.tar.bz2 13165580 SHA256 5ffc96d64befa07656ee82e4f3cfc95a84d73759607d0229e864899d7629f312 SHA512 e81d553938102ec895641fbda364a5ad3d0cd09ddf0a0c3cc6c9034da67477711c01bcd13ca0b4daad78030513b5a2957dee021646efd4b9f2a22b9aea0fbe5b WHIRLPOOL 19ee0b138579f759f7eac29fe1976d5e8354c30719c4f0d29941f5d0aad41d29b4010c7eba77461f2051554dc05415feeead02d0d41637aa14bf757416293954
 EBUILD texmaker-3.3.4.ebuild 1690 SHA256 1d9ffb7f5822cdcc885d8a5b2db49d2c508f5119f7cf08370bba054ccc60e078 SHA512 94e8582b11e33a1181fffff672d8e40283d61bbcde3463dd5deff01ab7ec49b02ad5c440ef633422341e5c393acc387047bf66673d96dc53ed736c1ab3b9d213 WHIRLPOOL 8b991152408cc6ae05357e5a3d2703ced200273f26b48129d0675232dc478d3d71d405abab0276cff5fed18b32f72801eaed4f708218878b7524efe6443efb73
-EBUILD texmaker-3.5.2.ebuild 1726 SHA256 da7d9cee9e57a2f4b6f6a16896ad66051a91b4a6c2b9df9e8bd6167b188f1f31 SHA512 a7818b685fc451a6a679a667ab64acf0c351e747e99a9144712f7f17620bfc1e9562b81a5c85f6633d87711a76dca4e064eec8e7a48d7511054fdfff04cefb20 WHIRLPOOL 6ec0d8f9778d9287473eaa8dc3f89ebd23da77286f52c905fa89597670e15dca7412ff54540dfc756b295b07028b5abf26290de4dc0174aa7e35a06ee560ef4c
-MISC ChangeLog 17577 SHA256 64bd2ba10b84ac1da722dbabefd4618e700b38d0e3c0f5ee9a420ae3ea9fa110 SHA512 4338eec356ff16beafdb09c908a2cb0e7198c16d1a53dbfadaf88de8accd58a06059ed547142ca5f253c4cf7325b98fc86af3bcf0203a5eb45631227c9ea3972 WHIRLPOOL 6c4201abada4f19ee7e5d9e669be1480bd7065aca0c5e42dd68752e23ba7b5fecdd6e60a2cd5f466329d66bf69db865295cdd195c65a801676567456b86c2105
+EBUILD texmaker-3.5.2.ebuild 1719 SHA256 41e7bc98a02a908b4a6c8227cf172fbed00355c945442aaec97d86d832329b68 SHA512 b8e37daa41a92bd5e8cf58bdf35846dd015ff603d4f240bb538aff0ef71870d4b5f575907fa14d3f490d5c68a918a34f8bc20ce4afae5fc6dc7fb3bd54d3a9eb WHIRLPOOL 646e496054ddcd213f329c3e0aadc9ed334d07639c48ff64e3a2d8304c0269555d772b6cfe664ee5797567e0bbd80cd0841421d2af3f71d6a21ddaa9530845ac
+MISC ChangeLog 17714 SHA256 2f7a6a95a6a944120946d9a6feca00f2db3d93827e1b5982836aff9629e4d8d0 SHA512 dd178eb9a72a35b20eddcd09bb08598002ab7bd9b4f56c03dd0f972f9151c8e2806277e7a810c915c20609b7382a863e2e9985b9b7a7bef19ed4260766d5c91c WHIRLPOOL 7a12b68aea1ed6141f5f01369056f884f15ad9b3f0d386ae634091809511e350b0e715cb753b20bb6e9ac73bdadaa1eb7a8b6912461307c25e3ccb5eb16d2f2f
 MISC metadata.xml 281 SHA256 2c7a572c26bbf24b0de55efe3ef0be56a2d9280869ffb4647791ce66f78a01bf SHA512 793f7f982c959f54c1af0f96a433837d031cf619190e57d784a5bb1f05503de72bf59329774c9efde5bf52c286eacd8032b366e1cc0ebaba94e110c326faa93d WHIRLPOOL f5324da1385ba50007e7f01f5d34f767f1cebefec780de74ade5c980c4d05e7e36590c6a8d79f5608201831daa6597e4a679b4e6a4e4ac33c2e09d94e554f5a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDIsjIACgkQgAnW8HDreRYWEQCeMwEKhzYu8rtcBhWUS4RySuGE
-E7QAnifEdluHYV7qOe1oqvBiifX9dNf7
-=vzvl
+iEYEAREKAAYFAlDxsaMACgkQgAnW8HDreRYMyACcCZVoOXv5joK9AZ57L71MnwoS
+NKQAoLGxJvOfs9EftBIHfJcGfbYFOz9D
+=Kop4
 -----END PGP SIGNATURE-----
diff --git a/app-office/texmaker/files/texmaker-3.5.2-clang.patch b/app-office/texmaker/files/texmaker-3.5.2-clang.patch
new file mode 100644
index 000000000000..8a232a99eb17
--- /dev/null
+++ b/app-office/texmaker/files/texmaker-3.5.2-clang.patch
@@ -0,0 +1,16 @@
+ texmaker.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/texmaker.h b/texmaker.h
+index 3b7135e..acd49d8 100644
+--- a/texmaker.h
++++ b/texmaker.h
+@@ -121,7 +121,7 @@ UserTagsListWidget *usertagsListWidget;
+ XmlTagsListWidget *MpListWidget, *PsListWidget, *leftrightWidget, *tikzWidget, *asyWidget;
+ SymbolListWidget *RelationListWidget, *ArrowListWidget, *MiscellaneousListWidget, *DelimitersListWidget, *GreekListWidget, *MostUsedListWidget, *FavoriteListWidget;
+ QTreeWidget *StructureTreeWidget;
+-QVBoxLayout *OutputLayoutV, *CentralLayoutBis,*LeftPanelLayoutBis,;
++QVBoxLayout *OutputLayoutV, *CentralLayoutBis,*LeftPanelLayoutBis;
+ QHBoxLayout *OutputLayoutH, *LeftPanelLayout, *CentralLayout;
+ QTableWidget *OutputTableWidget;
+ //menu-toolbar
diff --git a/app-office/texmaker/texmaker-3.5.2.ebuild b/app-office/texmaker/texmaker-3.5.2.ebuild
index a485bd5df9f1..1e9c0eead1de 100644
--- a/app-office/texmaker/texmaker-3.5.2.ebuild
+++ b/app-office/texmaker/texmaker-3.5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-3.5.2.ebuild,v 1.2 2012/12/12 16:34:57 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-3.5.2.ebuild,v 1.3 2013/01/12 18:55:30 jlec Exp $
 
 EAPI=4
 
@@ -50,7 +50,7 @@ DEPEND="${COMMON_DEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${P}-hunspell.patch
-#	"${FILESDIR}"/${PN}-3.3.3-qt48.patch
+	"${FILESDIR}"/${P}-clang.patch
 	)
 src_configure() {
 	eqmake4 \