Added patch to fix x11 linkage (needed only on x86???), fixes bug 343283

Package-Manager: portage-2.1.9.24/cvs/Linux x86_64

4 files changed, 38 insertions, 17 deletions

diff --git a/app-office/krita/ChangeLog b/app-office/krita/ChangeLog
index 4f066fedd95e..84b17eb1e34c 100644
--- a/app-office/krita/ChangeLog
+++ b/app-office/krita/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/krita
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/krita/ChangeLog,v 1.120 2010/10/29 20:56:48 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/krita/ChangeLog,v 1.121 2010/11/04 10:19:34 dilfridge Exp $
+
+  04 Nov 2010; Andreas K. Huettel <dilfridge@gentoo.org> krita-2.2.2.ebuild,
+  +files/krita-2.2.2-xlibs.patch:
+  Added patch to fix x11 linkage (needed only on x86???), fixes bug 343283
 
   29 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org> metadata.xml:
   Added myself to maintainers
diff --git a/app-office/krita/Manifest b/app-office/krita/Manifest
index e2205da4ceaa..717810b580f3 100644
--- a/app-office/krita/Manifest
+++ b/app-office/krita/Manifest
@@ -4,28 +4,29 @@ Hash: SHA1
 AUX krita-2.1.0-opengl.patch 425 RMD160 957b1df959402314f5e5b2167d2c16ed8e32c960 SHA1 4f8fb8deea43a3303b5457dceecd1b330da23027 SHA256 aa7d65328462b8aefcd48da6ff2fe5571ef512c886448eadf9e44869a67ff565
 AUX krita-2.1.1-libpng14.patch 327 RMD160 9ec9c492d456d388b8d944b4a40e360693dd8605 SHA1 941850dc8485729edf3296cfd7bace6c1b56414c SHA256 93ef65c7da0e8f5d480ec90424e16e44c82068e7db5218ff4910f8e9a3b19b46
 AUX krita-2.1.2-gcc45.patch 3664 RMD160 f9e0766045b53102a6531b4aeec4f4a5be3a252d SHA1 b70b997572d5ff01e87b244c5f112e402794d72e SHA256 a054443342b5001f62f17fa5f1b705d160fb5cfca4f21b0265bad5ac9f1e067b
+AUX krita-2.2.2-xlibs.patch 595 RMD160 9c2fb5b5b1bec960bb8dae0b1073fee5d54d7de2 SHA1 0d881f3811e2b759d3a7405387e9c42e5d9ee62d SHA256 9d01cf6a68d904816eca84718d85dc49527a3099b583532f839fd2a29733de05
 DIST koffice-2.1.0.tar.bz2 76150485 RMD160 9703bdf4d70d0556c5c101f4cf4baecb17b66a10 SHA1 0fd0bf64e6d166d41bae41730b17d5194e7f5adf SHA256 96ea36d1e7e2495f0076805eacf29a84607dc597f58b129a310df7227716acc9
 DIST koffice-2.1.2.tar.bz2 50359739 RMD160 20f3b162d49cbd70492c597aec2d79cb3de5a2d7 SHA1 29f5b5e611408ac2a2e68352cb64299b78d83094 SHA256 64233bb7b5b18813a9da46ab0c347170904611b59480b91297db4c3deb14b7da
 DIST koffice-2.2.2.tar.bz2 56470974 RMD160 bdd75cb056e2fa96b799eeec0ecb5ed6b6aef4c2 SHA1 ab6405e0efae0d8e895879183f1369facae410e0 SHA256 e5b060f640dd7ecd13b5d17f7e9ace7c0d1c0621e5fb83529f6e6db2d5c1edcb
 EBUILD krita-2.1.0.ebuild 1325 RMD160 6ba64d73a0699bb9e7bb989ae7834dc9ebd0abf2 SHA1 365cf457ce475aa49a8b9db6997696010b4b75b8 SHA256 8c6474fdc98b64a6349f82d0db09e9f3e61d1eea903d344e4286ae4da87c785a
 EBUILD krita-2.1.2.ebuild 1353 RMD160 fba15179190639df777983d4b5b0a886615bac2c SHA1 19ec0bb7da1ca38955844e0bfbb169428b849fe7 SHA256 8362e4290772bf323eb2d29cc35ec5d319c8a86de6b119c8fe8307b17eca3a8c
-EBUILD krita-2.2.2.ebuild 1290 RMD160 2e57a3ca71f08264b3112d4efaf77481dbafe4df SHA1 27fe0feafebeb7d5443fc00744f87a5ba52b927f SHA256 9276f45cb2d4c3a92ba630eaf46650a4869f198a3311f3edaef92624042929dc
-MISC ChangeLog 14496 RMD160 e51cda191a42948bb4f4e324127d98ee2e202d6d SHA1 9ce79fb5c95dd19301da6934d222d07884eedc03 SHA256 05ec117eaf1c50af9405338dce4f2abec5239256d0e730f2cc3e9fe041d75887
+EBUILD krita-2.2.2.ebuild 1334 RMD160 0719198966b4659f206a303a527a1c446ad39e46 SHA1 1d1924251930f69c7ba710eaa80710b22b9e464d SHA256 af17379df079f8006e6de8511dab7939193638b119a822a7758d5d72fcb4deed
+MISC ChangeLog 14683 RMD160 3a22ace211d4ab65cdfabdd88e8edb907320c190 SHA1 67f89722ea88448d45cf0807b42ed823189cb1f7 SHA256 20bb739ddeee24b59cec17a82e069a73296b465d4760a4918e9e60a9952d4bd5
 MISC metadata.xml 379 RMD160 645c35ed94997af82a8575a07787eb097b2793f4 SHA1 27de1f0e93c2ab13086610395f5868cdd2a7a917 SHA256 cb16908b934ceaa242edba6fcdec7a187f5c8ae6fba345fc131bbb64cd11204c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBAgAGBQJMyzUBAAoJENwGBM22xffeF9QP/0Pz+1DpJXwXE4PcH9HG5TJx
-y3TonIQr3lGrY2hnYirrSJmj8fpKsxV0oAJSVHg1r++esAUlhkxeRepHO4iPuely
-7ISnYAga3Xyjd9pk8y1GnXgFfmhIwRp8wwtUN5GzY8m2xHXczh/7TIqqtmaVlWE7
-++WRxZjxp6kW7QtUYcCZuK9ySddtiEZrBUXQP7SdHM+PVLbfCXDxD7PlvkQ7yyhN
-tTfzMyrllU60DF7l6RDdNtvwu9fgrh1WBrYuFIqWox8LB4gUCrK25tTrh5R0lM6f
-jBzSb3ukXgXZlJejRHijqM5D2xeVgAhKvKSc5BXhJE7FBq77gTY5NvXUKa09Qqzf
-pYN0aA35fV8YTpFmjR9/o8MPHJUYzUmBBKYM3d6Fq+aNU4y1ltZa17wILBjx5Jfz
-lOokzbQMQZN5vj8iLKOnht1jN3orISyMODH16YxGYqUOvLcSzMvu9p4zhqeSsuAl
-zXhsQOL77mwfF2aTLvgrxJVpvm+3aa4b4LCRQeOGtKBM6tqZoukEz/3ICxfFk/QA
-Z81dNXpHmlPq0hH3X5bSdL8CarVJwhrE54CzNhSszFBoIsLIzbkpzkRJCqRNQNF3
-oiDMqhn3dir8YcS017sIut2AezGk0UVGqWferFSfmoi4jwfiRpZSZDVdwn/pQjbU
-jGf0upDucQn/72x15VDi
-=6xd9
+iQIcBAEBAgAGBQJM0oi2AAoJENwGBM22xffeS9gP/1i+BGRJJADFA5yy7YCDG551
+zD4i1yCoqDfGwBFfXadZYjrapcgNzixTJDNRw1u64IIogCEUxLyfdy3dYLthaSVB
+YPuJV5vcyOrZrJg9y4CP8GiGsZhNa/JkM/6fW2aWXAXp9bS0rqIpRQyVL/+8Rtv9
+USFaN710jUor0NPQixpfNlImHx5b3XeVZf0eQqwhCDYpykguEl1XTWQMDlMq4Pba
+plTdyKoBTbEiUNCeXHEnT0E3+Wa4JT7jLrO2tBUjBiLE3foPHremP47MLuWxhzae
+ho9R/ilSTKX6hQay7ozGtuCEw7DDkIBXLFVhNBvqhpRgBf9PIiNXN7l/05EpuoN5
+IduFJYMyuwKUGSMfEnf86LTM9sHefEYKgwhxOsp++rh6p6F9woDtOLUSfWn1rUUO
+yZSnZ+z9qE7Jg3wRwTGniSk5l0nvFXdPvHRdla3E+EZORy22KpVhpMPs2SAFfd2W
+jFyi2xE+1abJD3R5k/q89ww0yvGeXkhLfjFGan0E8WBCGM+RrdpHZPc5om2IWgmC
+x15U/BopREZWMaZrtl6VDJlWL++uu3LdjHAzWh33QMT97NTMikaOO0HLfvY9/bEG
+ZhG/IQC+9MPCsyeRaP2GRJi6el43sVDMpFQJKdRtrYDaWArGGamiRs99EkOTnbUD
+YtyoVzGLCh0AXJdqFVCz
+=rKCL
 -----END PGP SIGNATURE-----
diff --git a/app-office/krita/files/krita-2.2.2-xlibs.patch b/app-office/krita/files/krita-2.2.2-xlibs.patch
new file mode 100644
index 000000000000..24b626905e79
--- /dev/null
+++ b/app-office/krita/files/krita-2.2.2-xlibs.patch
@@ -0,0 +1,14 @@
+diff -urN krita-2.2.2.vanilla/krita/ui/CMakeLists.txt krita-2.2.2/krita/ui/CMakeLists.txt
+--- krita-2.2.2.vanilla/krita/ui/CMakeLists.txt	2010-08-21 07:38:52.000000000 +0200
++++ krita-2.2.2/krita/ui/CMakeLists.txt	2010-11-03 23:43:28.000000000 +0100
+@@ -217,6 +217,10 @@
+ 
+ target_link_libraries(kritaui LINK_INTERFACE_LIBRARIES kritaimage komain ${GL_INTERFACE_LIBRARIES} )
+ 
++IF(Q_WS_X11)
++    TARGET_LINK_LIBRARIES(kritaui ${X11_LIBRARIES})
++ENDIF(Q_WS_X11)
++
+ set_target_properties(kritaui
+     PROPERTIES VERSION ${GENERIC_KOFFICE_LIB_VERSION} SOVERSION ${GENERIC_KOFFICE_LIB_SOVERSION}
+ )
diff --git a/app-office/krita/krita-2.2.2.ebuild b/app-office/krita/krita-2.2.2.ebuild
index ae851facdc09..f0ed2c859f8f 100644
--- a/app-office/krita/krita-2.2.2.ebuild
+++ b/app-office/krita/krita-2.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/krita/krita-2.2.2.ebuild,v 1.2 2010/10/15 21:49:52 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/krita/krita-2.2.2.ebuild,v 1.3 2010/11/04 10:19:34 dilfridge Exp $
 
 EAPI="2"
 
@@ -26,6 +26,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-xlibs.patch" )
+
 KMEXTRACTONLY="libs/"
 
 KMLOADLIBS="koffice-libs"