diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-12-05 17:55:11 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-12-05 17:55:11 +0000 |
| commit | 16e9974177dd11ffea79f1a963993e2da25267e0 (patch) | |
| tree | 6d6735d9c46c643c7120d279ebed2797f137cddf /app-office/krita | |
| parent | version bump (diff) | |
| download | gentoo-2-16e9974177dd11ffea79f1a963993e2da25267e0.tar.gz gentoo-2-16e9974177dd11ffea79f1a963993e2da25267e0.tar.bz2 gentoo-2-16e9974177dd11ffea79f1a963993e2da25267e0.zip | |
Fix building with USE="-opengl" wrt #294787, thanks to Jouni Rinne for reporting.
(Portage version: 2.2_rc54/cvs/Linux x86_64)
Diffstat (limited to 'app-office/krita')
| -rw-r--r-- | app-office/krita/ChangeLog | 7 | ||||
| -rw-r--r-- | app-office/krita/files/krita-2.1.0-opengl.patch | 24 | ||||
| -rw-r--r-- | app-office/krita/krita-2.1.0.ebuild | 4 |
3 files changed, 33 insertions, 2 deletions
diff --git a/app-office/krita/ChangeLog b/app-office/krita/ChangeLog index f233035aa21d..d6dc614d0d5c 100644 --- a/app-office/krita/ChangeLog +++ b/app-office/krita/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/krita # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/krita/ChangeLog,v 1.102 2009/11/28 08:26:07 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/krita/ChangeLog,v 1.103 2009/12/05 17:55:10 ssuominen Exp $ + + 05 Dec 2009; Samuli Suominen <ssuominen@gentoo.org> krita-2.1.0.ebuild, + +files/krita-2.1.0-opengl.patch: + Fix building with USE="-opengl" wrt #294787, thanks to Jouni Rinne for + reporting. 28 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org> -krita-2.0.2.ebuild: Drop old 2.0 release series. diff --git a/app-office/krita/files/krita-2.1.0-opengl.patch b/app-office/krita/files/krita-2.1.0-opengl.patch new file mode 100644 index 000000000000..bee8efe2b312 --- /dev/null +++ b/app-office/krita/files/krita-2.1.0-opengl.patch @@ -0,0 +1,24 @@ +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/krita-2.1.0.ebuild b/app-office/krita/krita-2.1.0.ebuild index 7295c1019dc8..230f6a890b8a 100644 --- a/app-office/krita/krita-2.1.0.ebuild +++ b/app-office/krita/krita-2.1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/krita/krita-2.1.0.ebuild,v 1.1 2009/11/22 16:17:33 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/krita/krita-2.1.0.ebuild,v 1.2 2009/12/05 17:55:10 ssuominen Exp $ EAPI="2" @@ -31,6 +31,8 @@ KMEXTRACTONLY="libs/" KMLOADLIBS="koffice-libs" +PATCHES=( "${FILESDIR}/${P}-opengl.patch" ) + src_configure() { mycmakeargs="${mycmakeargs} -DWITH_Eigen2=On |