| 1 |
jlec 12/01/30 12:12:04 |
| 2 |
|
| 3 |
Modified: ChangeLog qtiplot-0.9.8.9.ebuild |
| 4 |
qtiplot-0.9.8.9-r1.ebuild |
| 5 |
Log: |
| 6 |
Fix building against qt-4.8, #399829 |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.88 sci-visualization/qtiplot/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/qtiplot/ChangeLog?rev=1.88&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/qtiplot/ChangeLog?rev=1.88&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/qtiplot/ChangeLog?r1=1.87&r2=1.88 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v |
| 20 |
retrieving revision 1.87 |
| 21 |
retrieving revision 1.88 |
| 22 |
diff -u -r1.87 -r1.88 |
| 23 |
--- ChangeLog 22 Jan 2012 14:20:07 -0000 1.87 |
| 24 |
+++ ChangeLog 30 Jan 2012 12:12:04 -0000 1.88 |
| 25 |
@@ -1,6 +1,10 @@ |
| 26 |
# ChangeLog for sci-visualization/qtiplot |
| 27 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.87 2012/01/22 14:20:07 dilfridge Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.88 2012/01/30 12:12:04 jlec Exp $ |
| 30 |
+ |
| 31 |
+ 30 Jan 2012; Justin Lecher <jlec@g.o> qtiplot-0.9.8.9.ebuild, |
| 32 |
+ qtiplot-0.9.8.9-r1.ebuild, +files/qtiplot-0.9.8.9-qt48.patch: |
| 33 |
+ Fix building against qt-4.8, #399829 |
| 34 |
|
| 35 |
*qtiplot-0.9.8.9-r1 (22 Jan 2012) |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.2 sci-visualization/qtiplot/qtiplot-0.9.8.9.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.8.9.ebuild?rev=1.2&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.8.9.ebuild?rev=1.2&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.8.9.ebuild?r1=1.1&r2=1.2 |
| 45 |
|
| 46 |
Index: qtiplot-0.9.8.9.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.8.9.ebuild,v |
| 49 |
retrieving revision 1.1 |
| 50 |
retrieving revision 1.2 |
| 51 |
diff -u -r1.1 -r1.2 |
| 52 |
--- qtiplot-0.9.8.9.ebuild 22 Dec 2011 15:45:25 -0000 1.1 |
| 53 |
+++ qtiplot-0.9.8.9.ebuild 30 Jan 2012 12:12:04 -0000 1.2 |
| 54 |
@@ -1,6 +1,6 @@ |
| 55 |
-# Copyright 1999-2011 Gentoo Foundation |
| 56 |
+# Copyright 1999-2012 Gentoo Foundation |
| 57 |
# Distributed under the terms of the GNU General Public License v2 |
| 58 |
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.8.9.ebuild,v 1.1 2011/12/22 15:45:25 jlec Exp $ |
| 59 |
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.8.9.ebuild,v 1.2 2012/01/30 12:12:04 jlec Exp $ |
| 60 |
|
| 61 |
EAPI=3 |
| 62 |
|
| 63 |
@@ -53,6 +53,7 @@ |
| 64 |
python? ( dev-python/PyQt4[X] )" |
| 65 |
|
| 66 |
PATCHES=( |
| 67 |
+ "${FILESDIR}/${P}-qt48.patch" |
| 68 |
"${FILESDIR}/${PN}-0.9.8.8-system-gl2ps.patch" |
| 69 |
"${FILESDIR}/${PN}-0.9.7.10-dont-install-qwt.patch" |
| 70 |
"${FILESDIR}/${PN}-0.9.8.6-gold.patch" |
| 71 |
@@ -90,7 +91,7 @@ |
| 72 |
QWT_LIBS = \$\$QTI_ROOT/3rdparty/qwt/lib/libqwt.a |
| 73 |
QWT3D_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwtplot3d/include |
| 74 |
QWT3D_LIBS = \$\$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a |
| 75 |
- SYS_LIBS = -lgl2ps ${mylibs} |
| 76 |
+ SYS_LIBS = -lgl2ps ${mylibs} -lGLU |
| 77 |
|
| 78 |
PYTHON = python |
| 79 |
LUPDATE = lupdate |
| 80 |
|
| 81 |
|
| 82 |
|
| 83 |
1.2 sci-visualization/qtiplot/qtiplot-0.9.8.9-r1.ebuild |
| 84 |
|
| 85 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.8.9-r1.ebuild?rev=1.2&view=markup |
| 86 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.8.9-r1.ebuild?rev=1.2&content-type=text/plain |
| 87 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.8.9-r1.ebuild?r1=1.1&r2=1.2 |
| 88 |
|
| 89 |
Index: qtiplot-0.9.8.9-r1.ebuild |
| 90 |
=================================================================== |
| 91 |
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.8.9-r1.ebuild,v |
| 92 |
retrieving revision 1.1 |
| 93 |
retrieving revision 1.2 |
| 94 |
diff -u -r1.1 -r1.2 |
| 95 |
--- qtiplot-0.9.8.9-r1.ebuild 22 Jan 2012 14:20:07 -0000 1.1 |
| 96 |
+++ qtiplot-0.9.8.9-r1.ebuild 30 Jan 2012 12:12:04 -0000 1.2 |
| 97 |
@@ -1,6 +1,6 @@ |
| 98 |
# Copyright 1999-2012 Gentoo Foundation |
| 99 |
# Distributed under the terms of the GNU General Public License v2 |
| 100 |
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.8.9-r1.ebuild,v 1.1 2012/01/22 14:20:07 dilfridge Exp $ |
| 101 |
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.8.9-r1.ebuild,v 1.2 2012/01/30 12:12:04 jlec Exp $ |
| 102 |
|
| 103 |
EAPI=3 |
| 104 |
|
| 105 |
@@ -58,6 +58,7 @@ |
| 106 |
PATCHES=( |
| 107 |
"${DISTDIR}/${P}-origin.patch.bz2" |
| 108 |
"${FILESDIR}/${P}-origin-2.patch" |
| 109 |
+ "${FILESDIR}/${P}-qt48.patch" |
| 110 |
"${FILESDIR}/${PN}-0.9.8.8-system-gl2ps.patch" |
| 111 |
"${FILESDIR}/${PN}-0.9.7.10-dont-install-qwt.patch" |
| 112 |
"${FILESDIR}/${PN}-0.9.8.6-gold.patch" |
| 113 |
@@ -95,7 +96,7 @@ |
| 114 |
QWT_LIBS = \$\$QTI_ROOT/3rdparty/qwt/lib/libqwt.a |
| 115 |
QWT3D_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwtplot3d/include |
| 116 |
QWT3D_LIBS = \$\$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a |
| 117 |
- SYS_LIBS = -lgl2ps ${mylibs} |
| 118 |
+ SYS_LIBS = -lgl2ps ${mylibs} -lGLU |
| 119 |
|
| 120 |
PYTHON = python |
| 121 |
LUPDATE = lupdate |
Archives