Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Sebastien Fabbro (bicatali)" <bicatali@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-mathematics/cgal/files: cgal-3.3.1-qt.patch cgal-3.3.1-rpath.patch
Date: Mon, 27 Oct 2008 15:17:28
Message-Id: E1KuTqO-00069h-Ne@stork.gentoo.org
1 bicatali 08/10/27 15:17:24
2
3 Added: cgal-3.3.1-qt.patch cgal-3.3.1-rpath.patch
4 Log:
5 Initial import. Closing bug #167944.
6 (Portage version: 2.2_rc11/cvs/Linux 2.6.25-gentoo-r7 x86_64)
7
8 Revision Changes Path
9 1.1 sci-mathematics/cgal/files/cgal-3.3.1-qt.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/cgal/files/cgal-3.3.1-qt.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/cgal/files/cgal-3.3.1-qt.patch?rev=1.1&content-type=text/plain
13
14 Index: cgal-3.3.1-qt.patch
15 ===================================================================
16 --- config/support/test_QT.cpp.orig 2007-08-25 21:01:03.000000000 +0200
17 +++ config/support/test_QT.cpp 2008-02-06 18:34:06.000000000 +0100
18 @@ -25,7 +25,7 @@
19
20 #include <iostream>
21 #include <qglobal.h>
22 -#include <qarray.h>
23 +#include <qmemarray.h>
24
25 QArray<int> fib( int num ) // returns fibonacci array
26 {
27 --- demo/Apollonius_graph_2/qt_file_toolbar.h.orig 2007-08-25 21:00:54.000000000 +0200
28 +++ demo/Apollonius_graph_2/qt_file_toolbar.h 2008-02-06 18:34:51.000000000 +0100
29 @@ -21,7 +21,7 @@
30 #define QT_FILE_TOOLBAR_H
31
32 // include files for QT
33 -#include <qapp.h>
34 +#include <qapplication.h>
35 #include <qmainwindow.h>
36 #include <qaction.h>
37 #include <qmenubar.h>
38 @@ -32,7 +32,7 @@
39 #include <qwhatsthis.h>
40 #include <qstring.h>
41 #include <qpixmap.h>
42 -#include <qmsgbox.h>
43 +#include <qmessagebox.h>
44 #include <qfiledialog.h>
45 #include <qprinter.h>
46 #include <qpainter.h>
47 --- demo/Segment_Delaunay_graph_2/qt_file_toolbar.h.orig 2007-08-25 21:01:03.000000000 +0200
48 +++ demo/Segment_Delaunay_graph_2/qt_file_toolbar.h 2008-02-06 18:35:06.000000000 +0100
49 @@ -21,7 +21,7 @@
50 #define QT_FILE_TOOLBAR_H
51
52 // include files for QT
53 -#include <qapp.h>
54 +#include <qapplication.h>
55 #include <qmainwindow.h>
56 #include <qaction.h>
57 #include <qmenubar.h>
58 @@ -32,7 +32,7 @@
59 #include <qwhatsthis.h>
60 #include <qstring.h>
61 #include <qpixmap.h>
62 -#include <qmsgbox.h>
63 +#include <qmessagebox.h>
64 #include <qfiledialog.h>
65 #include <qprinter.h>
66 #include <qpainter.h>
67 --- demo/Voronoi_diagram_2/qt_file_toolbar.h.orig 2007-08-25 21:00:21.000000000 +0200
68 +++ demo/Voronoi_diagram_2/qt_file_toolbar.h 2008-02-06 18:34:36.000000000 +0100
69 @@ -21,7 +21,7 @@
70 #define QT_FILE_TOOLBAR_H
71
72 // include files for QT
73 -#include <qapp.h>
74 +#include <qapplication.h>
75 #include <qmainwindow.h>
76 #include <qaction.h>
77 #include <qmenubar.h>
78 @@ -32,7 +32,7 @@
79 #include <qwhatsthis.h>
80 #include <qstring.h>
81 #include <qpixmap.h>
82 -#include <qmsgbox.h>
83 +#include <qmessagebox.h>
84 #include <qfiledialog.h>
85 #include <qprinter.h>
86 #include <qpainter.h>
87
88
89
90 1.1 sci-mathematics/cgal/files/cgal-3.3.1-rpath.patch
91
92 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/cgal/files/cgal-3.3.1-rpath.patch?rev=1.1&view=markup
93 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/cgal/files/cgal-3.3.1-rpath.patch?rev=1.1&content-type=text/plain
94
95 Index: cgal-3.3.1-rpath.patch
96 ===================================================================
97 diff -urNad cgal-3.3.1~/install_cgal cgal-3.3.1/install_cgal
98 --- cgal-3.3.1~/install_cgal 2008-04-16 19:37:23.000000000 +0200
99 +++ cgal-3.3.1/install_cgal 2008-04-16 19:37:25.000000000 +0200
100 @@ -836,7 +836,7 @@
101 CGAL_SHARED_LIB_SONAME=""
102 CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME)"
103 CGAL_SHARED_LIBNAME_WITH_SOMAJOR="\$(CGAL_SHARED_LIBNAME)"
104 - RUNTIME_LINKER_FLAG=''
105 +# RUNTIME_LINKER_FLAG=''
106 PRINT_STACKTRACE_PROGRAM="gdb"
107 WINDOWS_COMPILER=""
108 CYGWIN_COMPILER=""
109 @@ -937,7 +937,7 @@
110 #### settings for sgi mipspro compiler on irix5
111 CGAL_SHARED_LIB_CXXFLAGS=
112 CGAL_SHARED_LIB_LDFLAGS="-lm"
113 - RUNTIME_LINKER_FLAG="-rpath "
114 +# RUNTIME_LINKER_FLAG="-rpath "
115 PRINT_STACKTRACE_PROGRAM="dbx"
116 ;;
117 *IRIX*6.*CC*7.3*)
118 @@ -946,14 +946,14 @@
119 ADDITIONAL_LDFLAGS="-LANG:std"
120 CGAL_STATIC_LIB_CREATE="\$(CGAL_CXX) -ar -o''"
121 CGAL_SHARED_LIB_CXXFLAGS=
122 - RUNTIME_LINKER_FLAG="-rpath "
123 +# RUNTIME_LINKER_FLAG="-rpath "
124 PRINT_STACKTRACE_PROGRAM="dbx"
125 ;;
126 *IRIX*6.*CC*)
127 #### settings for sgi mipspro compiler on irix6
128 CGAL_STATIC_LIB_CREATE="\$(CGAL_CXX) -ar -o''"
129 CGAL_SHARED_LIB_CXXFLAGS=
130 - RUNTIME_LINKER_FLAG="-rpath "
131 +# RUNTIME_LINKER_FLAG="-rpath "
132 PRINT_STACKTRACE_PROGRAM="dbx"
133 ;;
134 *IRIX*g++*)
135 @@ -961,7 +961,7 @@
136 ADDITIONAL_CXXFLAGS="-Wall"
137 LONG_NAME_PROBLEM_LDFLAGS="-U -s"
138 CGAL_SHARED_LIB_LDFLAGS="-lm"
139 - RUNTIME_LINKER_FLAG="-Xlinker -rpath -Xlinker "
140 +# RUNTIME_LINKER_FLAG="-Xlinker -rpath -Xlinker "
141 CGAL_SHARED_LIB_SONAME="-Wl,-soname,\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
142 CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)"
143 CGAL_SHARED_LIBNAME_WITH_SOMAJOR="\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
144 @@ -973,7 +973,7 @@
145 CGAL_STATIC_LIB_CREATE="\$(CGAL_CXX) -xar -o ''"
146 CGAL_SHARED_LIB_CXXFLAGS="-PIC"
147 CGAL_SHARED_LIB_CREATE="\$(CGAL_CXX) -G"
148 - RUNTIME_LINKER_FLAG="-R "
149 +# RUNTIME_LINKER_FLAG="-R "
150 PRINT_STACKTRACE_PROGRAM="dbx"
151 CGAL_SHARED_LIB_SONAME="-Qoption ld -h\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
152 CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)"
153 @@ -986,7 +986,7 @@
154 LONG_NAME_PROBLEM_CXXFLAGS="-g"
155 LONG_NAME_PROBLEM_LDFLAGS="-z nodefs -s"
156 CGAL_SHARED_LIB_CREATE="\$(CGAL_CXX) -G"
157 - RUNTIME_LINKER_FLAG="-R "
158 +# RUNTIME_LINKER_FLAG="-R "
159 CGAL_SHARED_LIB_SONAME="-h \$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
160 CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)"
161 CGAL_SHARED_LIBNAME_WITH_SOMAJOR="\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
162 @@ -995,7 +995,7 @@
163 #### settings for g++ on alpha-linux (special FPU handling)
164 #### LONG_NAME_PROBLEM is cured by disabling debugging
165 ADDITIONAL_CXXFLAGS="-Wall -mieee -mfp-rounding-mode=d"
166 - RUNTIME_LINKER_FLAG='-Wl,-R'
167 +# RUNTIME_LINKER_FLAG='-Wl,-R'
168 CGAL_SHARED_LIB_SONAME="-Wl,-soname,\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
169 CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)"
170 CGAL_SHARED_LIBNAME_WITH_SOMAJOR="\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
171 @@ -1003,7 +1003,7 @@
172 *Linux*g++*)
173 #### settings for g++ on linux
174 ADDITIONAL_CXXFLAGS="-Wall"
175 - RUNTIME_LINKER_FLAG='-Wl,-R'
176 +# RUNTIME_LINKER_FLAG='-Wl,-R'
177 CGAL_SHARED_LIB_SONAME="-Wl,-soname,\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
178 CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)"
179 CGAL_SHARED_LIBNAME_WITH_SOMAJOR="\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
180 @@ -1013,12 +1013,12 @@
181 # -mp is required for correct enough floating point operations
182 # necessary for interval arithmetic.
183 ADDITIONAL_CXXFLAGS="-mp"
184 - RUNTIME_LINKER_FLAG='-Wl,-R'
185 +# RUNTIME_LINKER_FLAG='-Wl,-R'
186 PRINT_STACKTRACE_PROGRAM="idb"
187 ;;
188 *Linux*pgCC*|*Linux*pgcpp*)
189 #### settings for Portland Group Compiler on linux
190 - RUNTIME_LINKER_FLAG='-Wl,-R'
191 +# RUNTIME_LINKER_FLAG='-Wl,-R'
192 # PGCC has long name problems with "-g".
193 DEBUG_OPT=""
194 ;;
195 @@ -1029,7 +1029,7 @@
196 CGAL_STATIC_LIB_CREATE="\$(CGAL_CXX) -xar -o ''"
197 CGAL_SHARED_LIB_CXXFLAGS="-PIC"
198 CGAL_SHARED_LIB_CREATE="\$(CGAL_CXX) -G"
199 - RUNTIME_LINKER_FLAG="-R "
200 +# RUNTIME_LINKER_FLAG="-R "
201 PRINT_STACKTRACE_PROGRAM="dbx"
202 CGAL_SHARED_LIB_SONAME="-Qoption ld -h\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
203 CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)"
204 @@ -4335,7 +4335,7 @@
205 _buildlog_marker="log for $1 $2 shown"
206
207 ${_printf} "%s %s\n" "${MAKE}" "${MAKE_OPTION}" > "${COMPILE_LOGFILE}"
208 - if ${MAKE} ${MAKE_OPTION} >"${COMPILE_LOGFILE}" 2>&1; then
209 + if ${MAKE} ${MAKE_OPTION} | tee "${COMPILE_LOGFILE}" 2>&1; then
210 log_print "Compilation of $1 $2 ${_libname} succeeded."
211 log_print "vvvvvvvvvvvv build ${_buildlog_marker} below vvvvvvvvvvvv"
212 eval ${_cat} \"${COMPILE_LOGFILE}\" ${INSTALL_LOGFILE_REDIRECTION}
Report Message
Find on MARC Find on Google Groups