diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2011-02-25 12:44:19 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-02-25 12:44:19 +0000 |
commit | af31e4af87ad595b41142dc5ccc7b1914a067567 (patch) | |
tree | d0531ab173be6a17c4142c66244bb9646169add2 /app-office/krita | |
parent | old (diff) | |
download | gentoo-2-af31e4af87ad595b41142dc5ccc7b1914a067567.tar.gz gentoo-2-af31e4af87ad595b41142dc5ccc7b1914a067567.tar.bz2 gentoo-2-af31e4af87ad595b41142dc5ccc7b1914a067567.zip |
old
(Portage version: 2.2.0_alpha24/cvs/Linux x86_64)
Diffstat (limited to 'app-office/krita')
-rw-r--r-- | app-office/krita/Manifest | 25 | ||||
-rw-r--r-- | app-office/krita/files/krita-2.1.0-opengl.patch | 24 | ||||
-rw-r--r-- | app-office/krita/files/krita-2.1.1-libpng14.patch | 11 | ||||
-rw-r--r-- | app-office/krita/files/krita-2.1.2-gcc45.patch | 91 | ||||
-rw-r--r-- | app-office/krita/krita-2.1.2.ebuild | 52 |
5 files changed, 0 insertions, 203 deletions
diff --git a/app-office/krita/Manifest b/app-office/krita/Manifest index 412f03a6f872..b6b1cccea8d9 100644 --- a/app-office/krita/Manifest +++ b/app-office/krita/Manifest @@ -1,37 +1,12 @@ ------BEGIN PGP SIGNED MESSAGE----- -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-exiv2.patch 2478 RMD160 799b173fd19096246e417427e67655584ba3d765 SHA1 7be5c485e72d856cd2f5233f0d7ed890bfb2e894 SHA256 6244d428ca3353d101e1d7cbe527d9ba4092028f0786bbefffcbc9d0a2c53e80 AUX krita-2.2.2-xlibs.patch 595 RMD160 9c2fb5b5b1bec960bb8dae0b1073fee5d54d7de2 SHA1 0d881f3811e2b759d3a7405387e9c42e5d9ee62d SHA256 9d01cf6a68d904816eca84718d85dc49527a3099b583532f839fd2a29733de05 AUX krita-2.3.1-linkx11.patch 679 RMD160 60cf0e7f5c8bccef490804befbcd65ca542fe727 SHA1 bfc3ca41a18a9b8dd794ab7b1bc055daef2174f8 SHA256 84a21f5799315723d3fb70bab3240046c8069899e8ae123b862572d1da08b17f -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 DIST koffice-2.3.1.tar.bz2 75687214 RMD160 0d40d38108bef14dfc04399c0f5505d38436102b SHA1 6337cb2efa8deec9a9fca57e5b604863475af1a0 SHA256 e73da38cfbfb2c6b7170767065addc0de38725e82c4fa49c76bcf375ee44f143 DIST koffice-2.3.3.tar.bz2 75688999 RMD160 d91fadd686e7f4b773031b642c89c012690f754f SHA1 53eaac4d17922e9fff8cc8028612e581003e1add SHA256 31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099 -EBUILD krita-2.1.2.ebuild 1353 RMD160 cb9865f7411c20abca997679c8a92b71d4ccc171 SHA1 0235687fb0edccf61550f89b232f50306474ee67 SHA256 146b036a91f03a3ddb114b88bee272c284d22401de2a1e8dfef2024650c16c32 EBUILD krita-2.2.2-r1.ebuild 1346 RMD160 caa8b7153d783ad695d006c5c3d0cbb231042ba6 SHA1 dccacc95554ada77243d6a81215f7599ab7e9388 SHA256 d398b6f1edc746a7a0386602c86f5fe538844b51cd8e9446afb8a3306910c76e EBUILD krita-2.2.2.ebuild 1333 RMD160 3a0f839778d028977a84fe65671cefd4cafd8ae4 SHA1 c6c7e4a766c9b16d0788688160e77426ccd79b60 SHA256 e01896365941d3783a5db0b04dfa903714f007fa38dd2140dd550dea93b03228 EBUILD krita-2.3.1.ebuild 1445 RMD160 82671f8a46f52050c407a0e9134cbe7dff5983fd SHA1 9bbb6bf0ece83bfa206f8428e41854ee7e2e7917 SHA256 251e9b5a3b675f940e907b5d9f145eef3b3ae05d11879f96c6c0fbd7c1ddbe44 EBUILD krita-2.3.3.ebuild 1399 RMD160 9dc656f4c6a9bbf927cff4d7bd17802f645be144 SHA1 8163709d157aef33fe972f5d35399df92830bc93 SHA256 80cf55387508e0d2fbce50c362659e3fece529c587d1c25788e9cc29e79c4ac8 MISC ChangeLog 15872 RMD160 a5d9a7e4b66fbc3ac7bc0bbe17d5b281f088474a SHA1 a938e5cb27e77df427e027d20e06fc460c232743 SHA256 ceed1749b417c33e9cbef1159dcc18dfe97c7fd092d291e02c56b67737f14c65 MISC metadata.xml 379 RMD160 645c35ed94997af82a8575a07787eb097b2793f4 SHA1 27de1f0e93c2ab13086610395f5868cdd2a7a917 SHA256 cb16908b934ceaa242edba6fcdec7a187f5c8ae6fba345fc131bbb64cd11204c ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iQIcBAEBAgAGBQJNZki5AAoJENwGBM22xffe+ewP/3w4eUI7TdJq+8eBf1OcZ2e/ -20ghE8TdDl4tJDoN6aqByjC7RGB5PrOjnCAatvoGG/iuMj43d0kc2L1qqjXIPvrd -Le/TKetpy9y5W3rriHtx6D0eMlUaGVF/7mJfB0uhVQDDdzObc0o6hxgJFb2cvGB6 -4kcsTfgauO/4W28pyinsybNgUgCGz/ElLnAlxLaDm+95r85TsXYMLt+G4YLCXD9C -Rp6/TXihIHIyC3/bTpTFauqYLvV5LQEXRvVPhV1UprgpVsZ4wL5IKnTgm8g/uaqA -qCNtzuI13cPEFv+1KSQd86+YrbGXrB1idb7j38FM8jnw/1OSTCwbDePs4UNKMZG4 -6bddWgBVE1M49/4FcViWiTyE0KrGcSdQsr+z3nxcd1/IO+0s2JEKt6qJsJbkflvi -A2uItkuT9uvoIP7NfDqRJmTaYacpesMUBRT/KFqOxzJLH2woDIsz6jKk08ijDyrJ -p6yC5UAglPnG2s+UY69bldZJdygY3Vkmop2rXh4JZaC6AtEXc7gD3lHsyrMDt358 -aH3XKmBoq+g8IcE78kmBSQWeTwwiMDaGvvX6GOr8SSd6BcVq63H0VQIQguccLa1a -0GrGQ2ld4lJRfw/mKxnijJnozhpbUiK+k4ZfmVSNLMiiPNZD8RI/SWCuOXyEnvmz -nys+KoYqAxNjthpmXSP5 -=nGjt ------END PGP SIGNATURE----- diff --git a/app-office/krita/files/krita-2.1.0-opengl.patch b/app-office/krita/files/krita-2.1.0-opengl.patch deleted file mode 100644 index bee8efe2b312..000000000000 --- a/app-office/krita/files/krita-2.1.0-opengl.patch +++ /dev/null @@ -1,24 +0,0 @@ -http://bugs.kde.org/217239 - ---- krita/ui/kis_3d_object_model.h -+++ krita/ui/kis_3d_object_model.h -@@ -56,7 +56,9 @@ - void parseMaterial(const QString &fileName); - - -+#ifdef HAVE_OPENGL - GLuint displayList(); -+#endif - - private: - QString m_fileName; -@@ -71,7 +73,9 @@ - void debug(Material m); - - bool m_cached; -+#ifdef HAVE_OPENGL - GLuint m_displayList; -+#endif - }; - - #endif // KIS_3D_OBJECT_MODEL_H diff --git a/app-office/krita/files/krita-2.1.1-libpng14.patch b/app-office/krita/files/krita-2.1.1-libpng14.patch deleted file mode 100644 index 326c5ee3114d..000000000000 --- a/app-office/krita/files/krita-2.1.1-libpng14.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- krita/ui/kis_png_converter.cpp -+++ krita/ui/kis_png_converter.cpp -@@ -404,7 +404,7 @@ - - png_byte signature[8]; - iod->peek((char*)signature, 8); -- if (!png_check_sig(signature, 8)) { -+ if (!png_sig_cmp(signature, 0, 8) == 0) { - iod->close(); - return (KisImageBuilder_RESULT_BAD_FETCH); - } diff --git a/app-office/krita/files/krita-2.1.2-gcc45.patch b/app-office/krita/files/krita-2.1.2-gcc45.patch deleted file mode 100644 index 13292e90f02b..000000000000 --- a/app-office/krita/files/krita-2.1.2-gcc45.patch +++ /dev/null @@ -1,91 +0,0 @@ -http://bugs.gentoo.org/314483 -http://websvn.kde.org/?view=revision&revision=1061366 -http://websvn.kde.org/?view=revision&revision=1061381 - ---- krita/ui/widgets/kis_curve_widget_p.h -+++ krita/ui/widgets/kis_curve_widget_p.h -@@ -439,7 +439,7 @@ - * That is not mandatory but desirable - */ - -- p.setPen(QPen::QPen(Qt::gray, 1, Qt::SolidLine)); -+ p.setPen(QPen(Qt::gray, 1, Qt::SolidLine)); - p.drawLine(div4_round(wWidth), 0, div4_round(wWidth), wHeight); - p.drawLine(div2_round(wWidth), 0, div2_round(wWidth), wHeight); - p.drawLine(div4_round(3*wWidth), 0, div4_round(3*wWidth), wHeight); ---- krita/ui/widgets/kis_curve_widget.cpp -+++ krita/ui/widgets/kis_curve_widget.cpp -@@ -312,11 +312,11 @@ - curveY = d->m_points.at(i).y(); - - if (i == d->m_grab_point_index) { -- p.setPen(QPen::QPen(Qt::red, 3, Qt::SolidLine)); -+ p.setPen(QPen(Qt::red, 3, Qt::SolidLine)); - p.drawEllipse(QRectF(curveX * wWidth - 2, - wHeight - 2 - curveY * wHeight, 4, 4)); - } else { -- p.setPen(QPen::QPen(Qt::red, 1, Qt::SolidLine)); -+ p.setPen(QPen(Qt::red, 1, Qt::SolidLine)); - p.drawEllipse(QRectF(curveX * wWidth - 3, - wHeight - 3 - curveY * wHeight, 6, 6)); - } ---- krita/plugins/filters/colorsfilters/kis_perchannel_filter.cpp -+++ krita/plugins/filters/colorsfilters/kis_perchannel_filter.cpp -@@ -123,7 +123,7 @@ - - QPixmap gradientpix(width, height); - QPainter p(&gradientpix); -- p.setPen(QPen::QPen(QColor(0, 0, 0), 1, Qt::SolidLine)); -+ p.setPen(QPen(QColor(0, 0, 0), 1, Qt::SolidLine)); - for (; *i < 256; (*i)++, col += inc) { - p.setPen(QColor(col, col, col)); - p.drawPoint(x, y); -@@ -138,7 +138,7 @@ - QPixmap pix(256, height); - pix.fill(); - QPainter p(&pix); -- p.setPen(QPen::QPen(Qt::gray, 1, Qt::SolidLine)); -+ p.setPen(QPen(Qt::gray, 1, Qt::SolidLine)); - - if(m_histogram) - { ---- krita/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp -+++ krita/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp -@@ -249,7 +249,7 @@ - // Create the horizontal gradient label - QPixmap hgradientpix(256, 1); - QPainter hgp(&hgradientpix); -- hgp.setPen(QPen::QPen(QColor(0, 0, 0), 1, Qt::SolidLine)); -+ hgp.setPen(QPen(QColor(0, 0, 0), 1, Qt::SolidLine)); - for (i = 0; i < 256; ++i) { - hgp.setPen(QColor(i, i, i)); - hgp.drawPoint(i, 0); -@@ -259,7 +259,7 @@ - // Create the vertical gradient label - QPixmap vgradientpix(1, 256); - QPainter vgp(&vgradientpix); -- vgp.setPen(QPen::QPen(QColor(0, 0, 0), 1, Qt::SolidLine)); -+ vgp.setPen(QPen(QColor(0, 0, 0), 1, Qt::SolidLine)); - for (i = 0; i < 256; ++i) { - vgp.setPen(QColor(i, i, i)); - vgp.drawPoint(0, 255 - i); -@@ -271,7 +271,7 @@ - QPixmap pix(256, height); - pix.fill(); - QPainter p(&pix); -- p.setPen(QPen::QPen(Qt::gray, 1, Qt::SolidLine)); -+ p.setPen(QPen(Qt::gray, 1, Qt::SolidLine)); - - double highest = (double)histogram.calculations().getHighest(); - qint32 bins = histogram.producer()->numberOfBins(); ---- krita/plugins/filters/levelfilter/kis_level_filter.cpp -+++ krita/plugins/filters/levelfilter/kis_level_filter.cpp -@@ -178,7 +178,7 @@ - pix.fill(); - QPainter p(&pix); - -- p.setPen(QPen::QPen(Qt::gray, 1, Qt::SolidLine)); -+ p.setPen(QPen(Qt::gray, 1, Qt::SolidLine)); - - double highest = (double)histogram->calculations().getHighest(); - qint32 bins = histogram->producer()->numberOfBins(); diff --git a/app-office/krita/krita-2.1.2.ebuild b/app-office/krita/krita-2.1.2.ebuild deleted file mode 100644 index 9c6406239070..000000000000 --- a/app-office/krita/krita-2.1.2.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/krita/krita-2.1.2.ebuild,v 1.7 2011/01/28 09:59:44 tampakrap Exp $ - -EAPI="3" - -KMNAME="koffice" -KMMODULE="${PN}" -OPENGL_REQUIRED="optional" -inherit kde4-meta - -DESCRIPTION="KOffice image manipulation program." - -KEYWORDS="~ppc ~ppc64" -IUSE="gmm +kdcraw openexr +pdf +tiff" - -DEPEND=" - >=app-office/koffice-libs-${PV}:${SLOT}[openexr=] - >=dev-cpp/eigen-2.0.3:2 - >=media-libs/qimageblitz-0.0.4 - >=media-gfx/exiv2-0.16 - >=media-gfx/imagemagick-0.6.4.9.2[openexr=,png,tiff?] - gmm? ( sci-mathematics/gmm ) - kdcraw? ( >=kde-base/libkdcraw-${KDE_MINIMAL} ) - opengl? ( media-libs/glew ) - pdf? ( >=app-text/poppler-0.12.3-r3[qt4] ) -" -RDEPEND="${DEPEND}" - -KMEXTRACTONLY="libs/" - -KMLOADLIBS="koffice-libs" - -PATCHES=( "${FILESDIR}/${PN}-2.1.0-opengl.patch" - "${FILESDIR}/${PN}-2.1.1-libpng14.patch" - "${FILESDIR}"/${P}-gcc45.patch ) - -src_configure() { - mycmakeargs="${mycmakeargs} - -DWITH_Eigen2=On - -DWITH_Exiv2=On - -DWITH_JPEG=On - $(cmake-utils_use_with openexr OpenEXR) - $(cmake-utils_use_with gmm) - $(cmake-utils_use_with tiff) - $(cmake-utils_use_with kdcraw) - $(cmake-utils_use_with pdf Poppler) - $(cmake-utils_use_with opengl OpenGL) - $(cmake-utils_use_with opengl GLEW)" - - kde4-meta_src_configure -} |