diff options
| author |   Bo Ørsted Andresen <zlin@gentoo.org> | 2008-01-27 23:02:56 +0000 |
|---|---|---|
| committer | Bo Ørsted Andresen <zlin@gentoo.org> | 2008-01-27 23:02:56 +0000 |
| commit | b226e2ea96872f8a7435961a0c01b9d1f4556ec6 (patch) | |
| tree | b3a296a73d0597e22640cc7cbc5fab97efea9a3e /kde-base | |
| parent | Version bump (diff) | |
| download | gentoo-2-b226e2ea96872f8a7435961a0c01b9d1f4556ec6.tar.gz gentoo-2-b226e2ea96872f8a7435961a0c01b9d1f4556ec6.tar.bz2 gentoo-2-b226e2ea96872f8a7435961a0c01b9d1f4556ec6.zip | |
Fix compilation with USE="-cviewer -opengl".
(Portage version: 2.1.4)
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/kdeedu/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/kdeedu/files/kdeedu-4.0.0-opengl.patch | 20 | ||||
| -rw-r--r-- | kde-base/kdeedu/kdeedu-4.0.0.ebuild | 9 |
3 files changed, 29 insertions, 6 deletions
diff --git a/kde-base/kdeedu/ChangeLog b/kde-base/kdeedu/ChangeLog index 3e38afc324dd..d8a72f94fd86 100644 --- a/kde-base/kdeedu/ChangeLog +++ b/kde-base/kdeedu/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdeedu # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/ChangeLog,v 1.225 2008/01/18 09:31:21 ingmar Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/ChangeLog,v 1.226 2008/01/27 23:02:56 zlin Exp $ + + 27 Jan 2008; Bo Ørsted Andresen <zlin@gentoo.org> + +files/kdeedu-4.0.0-opengl.patch, kdeedu-4.0.0.ebuild: + Fix compilation with USE="-cviewer -opengl". 18 Jan 2008; Ingmar Vanhassel <ingmar@gentoo.org> files/digest-kdeedu-4.0.0, Manifest: diff --git a/kde-base/kdeedu/files/kdeedu-4.0.0-opengl.patch b/kde-base/kdeedu/files/kdeedu-4.0.0-opengl.patch new file mode 100644 index 000000000000..d29e975d37eb --- /dev/null +++ b/kde-base/kdeedu/files/kdeedu-4.0.0-opengl.patch @@ -0,0 +1,20 @@ +Index: kalgebra/src/CMakeLists.txt +=================================================================== +--- kalgebra/src/CMakeLists.txt (revision 767350) ++++ kalgebra/src/CMakeLists.txt (working copy) +@@ -24,7 +24,6 @@ + functionedit.cpp + varedit.cpp + main.cpp +- graph3d.cpp + algebrahighlighter.cpp + expressionedit.cpp + graph2d.cpp +@@ -45,6 +44,7 @@ + target_link_libraries(kalgebra ${KDE4_KHTML_LIBS} analitza) + + if(OPENGL_FOUND) ++ set(kalgebra_SRCS ${kalgebra_SRCS} graph3d.cpp) + target_link_libraries(kalgebra ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}) + endif(OPENGL_FOUND) + diff --git a/kde-base/kdeedu/kdeedu-4.0.0.ebuild b/kde-base/kdeedu/kdeedu-4.0.0.ebuild index 5f4379b31d18..922585355de5 100644 --- a/kde-base/kdeedu/kdeedu-4.0.0.ebuild +++ b/kde-base/kdeedu/kdeedu-4.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-4.0.0.ebuild,v 1.3 2008/01/18 04:38:46 ingmar Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-4.0.0.ebuild,v 1.4 2008/01/27 23:02:56 zlin Exp $ EAPI="1" @@ -36,12 +36,11 @@ RDEPEND="${COMMONDEPEND} >=kde-base/kdebase-${PV}:${SLOT} )" PATCHES="${FILESDIR}/kstars-4.0.0-destdir.patch - ${FILESDIR}/marble-4.0.0-fix-tests.patch" + ${FILESDIR}/marble-4.0.0-fix-tests.patch + ${FILESDIR}/${P}-opengl.patch" pkg_setup() { - if use cviewer || use opengl; then - QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK} opengl" - fi + use cviewer && QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK} opengl" kde4-base_pkg_setup } |