summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBo Ørsted Andresen <zlin@gentoo.org>2008-01-29 01:26:19 +0000
committerBo Ørsted Andresen <zlin@gentoo.org>2008-01-29 01:26:19 +0000
commitda5cedd1f46bdc0a121e9738e5bb8c32fcd03580 (patch)
tree7f23e0c4352d8f061f53c6970d8b938982286378 /kde-base/kalgebra
parentMarked stable on amd64 as per bug 207663. (diff)
downloadhistorical-da5cedd1f46bdc0a121e9738e5bb8c32fcd03580.tar.gz
historical-da5cedd1f46bdc0a121e9738e5bb8c32fcd03580.tar.bz2
historical-da5cedd1f46bdc0a121e9738e5bb8c32fcd03580.zip
Fix the patch for compilation with USE=-opengl so it doesn't break USE=opengl (bug #207940).
Package-Manager: portage-2.1.4
Diffstat (limited to 'kde-base/kalgebra')
-rw-r--r--kde-base/kalgebra/ChangeLog7
-rw-r--r--kde-base/kalgebra/Manifest22
-rw-r--r--kde-base/kalgebra/files/kdeedu-4.0.0-opengl.patch13
3 files changed, 25 insertions, 17 deletions
diff --git a/kde-base/kalgebra/ChangeLog b/kde-base/kalgebra/ChangeLog
index 5286c2ad7f9b..886aa58e1b70 100644
--- a/kde-base/kalgebra/ChangeLog
+++ b/kde-base/kalgebra/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for kde-base/kalgebra
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalgebra/ChangeLog,v 1.2 2008/01/27 23:15:57 zlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalgebra/ChangeLog,v 1.3 2008/01/29 01:26:18 zlin Exp $
+
+ 28 Jan 2008; Bo Ørsted Andresen <zlin@gentoo.org>
+ files/kdeedu-4.0.0-opengl.patch:
+ Fix the patch for compilation with USE=-opengl so it doesn't break
+ USE=opengl (bug #207940).
27 Jan 2008; Bo Ørsted Andresen <zlin@gentoo.org>
+files/kdeedu-4.0.0-opengl.patch, kalgebra-4.0.0.ebuild:
diff --git a/kde-base/kalgebra/Manifest b/kde-base/kalgebra/Manifest
index b6a6df43b4a5..1e0623ac6ba7 100644
--- a/kde-base/kalgebra/Manifest
+++ b/kde-base/kalgebra/Manifest
@@ -1,19 +1,19 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-AUX kdeedu-4.0.0-opengl.patch 614 RMD160 8ceb1ff5bdac87ed5f5415e17b12a0720dec6560 SHA1 cce8c3d5d7405049b7bf551547b8d67458132428 SHA256 3efc03b2cf5428d5ef57d1fbf83b60663182745ba24364110d7b7b0c8b059a4f
-MD5 92e80e3be29f5d1f585931c4adf920b8 files/kdeedu-4.0.0-opengl.patch 614
-RMD160 8ceb1ff5bdac87ed5f5415e17b12a0720dec6560 files/kdeedu-4.0.0-opengl.patch 614
-SHA256 3efc03b2cf5428d5ef57d1fbf83b60663182745ba24364110d7b7b0c8b059a4f files/kdeedu-4.0.0-opengl.patch 614
+AUX kdeedu-4.0.0-opengl.patch 614 RMD160 62114502a8261b0b1d2fda30fbef2c21c94d2136 SHA1 7fb04d90ac2118f9f8ab246bb7a7eac5affb7fb2 SHA256 df3663fe3b9c2caeb81c9f1be18c4f1626546bfbbca9346d7d172def6210aed3
+MD5 35639458795065cd5399aa12183dffe7 files/kdeedu-4.0.0-opengl.patch 614
+RMD160 62114502a8261b0b1d2fda30fbef2c21c94d2136 files/kdeedu-4.0.0-opengl.patch 614
+SHA256 df3663fe3b9c2caeb81c9f1be18c4f1626546bfbbca9346d7d172def6210aed3 files/kdeedu-4.0.0-opengl.patch 614
DIST kdeedu-4.0.0.tar.bz2 41886885 RMD160 667ba2904a235daf6e041bba3e9b19cae9147e19 SHA1 c338d3187e2f7441b872d3fb65760895d6424910 SHA256 e4cd9607cb0e821e8a6f0687cfe03573de3517aba7f360360d2b46756a0e5ef2
EBUILD kalgebra-4.0.0.ebuild 881 RMD160 089f32daa8bb2279720f4ef683a8a6444a0ff58b SHA1 d5ddd19a36886e926762ac782edaf40eed5446c3 SHA256 114fdd775de680d24554055c4842203fb871c0a4a49b1bb7baf28add136f0f3c
MD5 20988d93ac274c5a70d49cfbfe1233d7 kalgebra-4.0.0.ebuild 881
RMD160 089f32daa8bb2279720f4ef683a8a6444a0ff58b kalgebra-4.0.0.ebuild 881
SHA256 114fdd775de680d24554055c4842203fb871c0a4a49b1bb7baf28add136f0f3c kalgebra-4.0.0.ebuild 881
-MISC ChangeLog 497 RMD160 29b64de3963c75a20f3fd86c4952021cc55b0e67 SHA1 c1e930819b49ed1cbfc37efd6bdf62500eeff00f SHA256 da2466a1a9be004282bf93f5d13378ec195aec6ac652932d66726194c15811ca
-MD5 1d866dc587221165822ffd77e85c411c ChangeLog 497
-RMD160 29b64de3963c75a20f3fd86c4952021cc55b0e67 ChangeLog 497
-SHA256 da2466a1a9be004282bf93f5d13378ec195aec6ac652932d66726194c15811ca ChangeLog 497
+MISC ChangeLog 683 RMD160 77fef964f19f4193c93c2c807253d91c6e7e8ecb SHA1 19bc2d4ad079e20ee098e980aaca2ea03e74cd7e SHA256 4cbb25964772469983ca6f8815e82b2abf9308793df2226881d7ca761ca0c2f8
+MD5 974a90ec1ecf8be1bdfe41cce369c233 ChangeLog 683
+RMD160 77fef964f19f4193c93c2c807253d91c6e7e8ecb ChangeLog 683
+SHA256 4cbb25964772469983ca6f8815e82b2abf9308793df2226881d7ca761ca0c2f8 ChangeLog 683
MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -24,7 +24,7 @@ SHA256 a245b11f6f06334002ed9b23be7d03582f34c310e95f8e0664c6cc662226d835 files/di
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.7 (GNU/Linux)
-iD8DBQFHnRCRfxJ68Jl1NeERAhs+AJ9AHh5uQRdNzRXsMSrv8+FU7Z8g9wCcDYIX
-QZFZ9gJDIH0kcTt9hykYNgA=
-=nTH+
+iD8DBQFHnoCbfxJ68Jl1NeERAuE0AKC51ES0xpPTMzBO0d8tmlOOXn3Z9QCfVvK+
+qCUh/JEOKTJxi7QeiNCe55M=
+=N0On
-----END PGP SIGNATURE-----
diff --git a/kde-base/kalgebra/files/kdeedu-4.0.0-opengl.patch b/kde-base/kalgebra/files/kdeedu-4.0.0-opengl.patch
index d29e975d37eb..0ca889f566e9 100644
--- a/kde-base/kalgebra/files/kdeedu-4.0.0-opengl.patch
+++ b/kde-base/kalgebra/files/kdeedu-4.0.0-opengl.patch
@@ -10,11 +10,14 @@ Index: kalgebra/src/CMakeLists.txt
algebrahighlighter.cpp
expressionedit.cpp
graph2d.cpp
-@@ -45,6 +44,7 @@
- target_link_libraries(kalgebra ${KDE4_KHTML_LIBS} analitza)
+@@ -33,6 +32,10 @@
+ functionimpl.cpp
+ )
- if(OPENGL_FOUND)
++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)
++endif(OPENGL_FOUND)
++
+ kde4_add_library(analitza ${analitza_SRCS})
+ target_link_libraries(analitza ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} ${KDE4_KDECORE_LIBS})