API tools faq
paste
Advertisement
JoelSjogren

Untitled

JoelSjogren
Aug 28th, 2017
192
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 14.27 KB | None | 0 0
raw download clone embed print report
  1. diff -aur -bZwB -x .git CoCoALib-0.99543.old/configure CoCoALib-0.99543/configure
  2. --- CoCoALib-0.99543.old/configure 2016-06-12 09:04:54.466844119 -0400
  3. +++ CoCoALib-0.99543/configure 2016-06-12 09:06:08.350123705 -0400
  4. @@ -441,10 +441,10 @@
  5. # Assume that if "qmake" is available then all of QT is too.
  6. # Also check that "qmake" actually runs (Ubuntu 14.04 can have a broken symlink)
  7. HAVE_QMAKE=no
  8. -QMAKE=`which qmake 2>/dev/null`
  9. +QMAKE=`which qmake-qt4 2>/dev/null`
  10. if [ $? = 0 ]
  11. then
  12. - QMAKE=`[ -x "$QMAKE" ] && qmake -help 2>&1 >/dev/null`
  13. + QMAKE=`[ -x "$QMAKE" ] && qmake-qt4 -help 2>&1 >/dev/null`
  14. if [ $? = 0 ]
  15. then
  16. HAVE_QMAKE=yes
  17. @@ -694,7 +697,7 @@
  18. fi
  19. fi
  20.  
  21. -if [ $HAVE_BOOST = yes -a $HAVE_QMAKE = no ]
  22. +if [ $HAVE_BOOST = yes -a $HAVE_QMAKE-qt4 = no ]
  23. then
  24. WARNINGS="no qmake (so no CoCoA-5 GUI); $WARNINGS"
  25. fi
  26. @@ -1038,8 +1038,8 @@
  27. then
  28. #### echo "GSL_INC_DIR=\"$GSL_INC_DIR\"" >> "$CONFIG_FILE"
  29. #### echo "GSL_INCLUDE=-I \$(GSL_INC_DIR)" >> "$CONFIG_FILE"
  30. - echo "GSL_LIBS=\$(EXTLIBS)/lib/libgsl-symlink.a" >> "$CONFIG_FILE"
  31. - echo "GSL_LDLIBS=-lgsl-symlink -lblas -llapack" >> "$CONFIG_FILE"
  32. + echo "GSL_LIBS=\$(EXTLIBS)/lib/libgsl-symlink.so" >> "$CONFIG_FILE"
  33. + echo "GSL_LDLIBS=-lgsl-symlink -lcblas -llapack" >> "$CONFIG_FILE"
  34. echo "GSL_VERSION=" >> "$CONFIG_FILE"
  35. fi
  36. echo >> "$CONFIG_FILE"
  37. @@ -1051,7 +1051,7 @@
  38. if [ $HAVE_NORMALIZ = "yes" ]
  39. then
  40. # Recall that GMPXX_LIB is the libgmpxx.a library
  41. - echo "NORMALIZ_LIBS=\$(EXTLIBS)/lib/libnormaliz-symlink.a \$(GMPXX_LIB)" >> "$CONFIG_FILE"
  42. + echo "NORMALIZ_LIBS=\$(EXTLIBS)/lib/libnormaliz-symlink.so \$(GMPXX_LIB)" >> "$CONFIG_FILE"
  43. echo "NORMALIZ_LDLIBS=-lnormaliz-symlink" >> "$CONFIG_FILE"
  44. echo "NORMALIZ_VERSION=" >> "$CONFIG_FILE"
  45. fi
  46. diff -aur -bZwB -x .git CoCoALib-0.99543.old/doc/CoCoALib-tasks/HTMLTasks.C CoCoALib-0.99543/doc/CoCoALib-tasks/HTMLTasks.C
  47. --- CoCoALib-0.99543.old/doc/CoCoALib-tasks/HTMLTasks.C 2016-06-12 09:04:54.470177450 -0400
  48. +++ CoCoALib-0.99543/doc/CoCoALib-tasks/HTMLTasks.C 2016-06-12 09:04:59.810175187 -0400
  49. @@ -190,7 +190,7 @@
  50. index::index()
  51. {
  52. ifstream in(XMLFileName());
  53. - if (in == 0)
  54. + if (in.fail())
  55. throw "Cannot find input file `tasks.xml`";
  56. index::entry LastEntry("AAAA");
  57. string line="";
  58. @@ -1072,7 +1072,7 @@
  59. // completed tasks
  60. {
  61. ofstream out("CoCoALib-CompletedTasks.html");
  62. - if (out == 0)
  63. + if (out.fail())
  64. {
  65. std::cout << "Cannot use file `completed.html`. Aborting." << endl;
  66. abort();
  67. @@ -1085,7 +1085,7 @@
  68. // HTML
  69. {
  70. ofstream out("CoCoALib-tasks.html");
  71. - if (out == 0)
  72. + if (out.fail())
  73. {
  74. std::cout << "Cannot use file `CoCoALib-tasks.html`. Aborting." << endl;
  75. abort();
  76. diff -aur -bZwB -x .git CoCoALib-0.99543.old/examples/ex-PolyInput1.C CoCoALib-0.99543/examples/ex-PolyInput1.C
  77. --- CoCoALib-0.99543.old/examples/ex-PolyInput1.C 2016-06-12 09:04:54.480177446 -0400
  78. +++ CoCoALib-0.99543/examples/ex-PolyInput1.C 2016-06-12 09:04:59.810175187 -0400
  79. @@ -70,7 +70,7 @@
  80. // we can, at any time, change the default streams in, out, log, err like this:
  81. const char* FileName = "ex-PolyInput1.in";
  82. ifstream in(FileName);
  83. - if (in == 0)
  84. + if (in.fail())
  85. {
  86. cerr << "Cannot find input file `" << FileName << "'. Aborting." << endl;
  87. abort();
  88. diff -aur -bZwB -x .git CoCoALib-0.99543.old/examples/ex-PolyInput2.C CoCoALib-0.99543/examples/ex-PolyInput2.C
  89. --- CoCoALib-0.99543.old/examples/ex-PolyInput2.C 2016-06-12 09:04:54.480177446 -0400
  90. +++ CoCoALib-0.99543/examples/ex-PolyInput2.C 2016-06-12 09:04:59.810175187 -0400
  91. @@ -39,7 +39,7 @@
  92.  
  93. const char* FileName = "ex-PolyInput2.in";
  94. ifstream in(FileName);
  95. - if (in == 0)
  96. + if (in.fail())
  97. {
  98. cerr << "Cannot find input file `" << FileName << "'. Aborting." << endl;
  99. abort();
  100. diff -aur -bZwB -x .git CoCoALib-0.99543.old/src/CoCoA-5/BuiltInFunctions-Normaliz.C CoCoALib-0.99543/src/CoCoA-5/BuiltInFunctions-Normaliz.C
  101. --- CoCoALib-0.99543.old/src/CoCoA-5/BuiltInFunctions-Normaliz.C 2016-06-12 09:04:54.570177411 -0400
  102. +++ CoCoALib-0.99543/src/CoCoA-5/BuiltInFunctions-Normaliz.C 2016-06-12 09:04:59.810175187 -0400
  103. @@ -198,7 +198,7 @@
  104. break;
  105. case libnormaliz::ConeProperty::ExtremeRays:
  106. out->setField(libnormaliz::toString(prop_i), Value::from(ExtremeRays(C)), ARG(0).exp);
  107. - out->setField("Rank", Value::from(rank(C)), ARG(0).exp);
  108. + out->setField("Rank", Value::from(Normaliz::rank(C)), ARG(0).exp);
  109. break;
  110. case libnormaliz::ConeProperty::VerticesOfPolyhedron:
  111. out->setField(libnormaliz::toString(prop_i), Value::from(VerticesOfPolyhedron(C)), ARG(0).exp);
  112. diff -aur -bZwB -x .git CoCoALib-0.99543.old/src/CoCoA-5/C5.cygwin-debug.pro CoCoALib-0.99543/src/CoCoA-5/C5.cygwin-debug.pro
  113. --- CoCoALib-0.99543.old/src/CoCoA-5/C5.cygwin-debug.pro 2016-06-12 09:04:54.570177411 -0400
  114. +++ CoCoALib-0.99543/src/CoCoA-5/C5.cygwin-debug.pro 2016-06-12 09:04:59.810175187 -0400
  115. @@ -14,7 +14,7 @@
  116. MOC_DIR =
  117. UI_DIR =
  118. OBJECTS_DIR = Debug
  119. -QT += xml
  120. +QT += widgets printsupport xml
  121.  
  122. # Input
  123. HEADERS += AST.H \
  124. diff -aur -bZwB -x .git CoCoALib-0.99543.old/src/CoCoA-5/C5.cygwin-release.pro CoCoALib-0.99543/src/CoCoA-5/C5.cygwin-release.pro
  125. --- CoCoALib-0.99543.old/src/CoCoA-5/C5.cygwin-release.pro 2016-06-12 09:04:54.570177411 -0400
  126. +++ CoCoALib-0.99543/src/CoCoA-5/C5.cygwin-release.pro 2016-06-12 09:04:59.810175187 -0400
  127. @@ -14,7 +14,7 @@
  128. MOC_DIR =
  129. UI_DIR =
  130. OBJECTS_DIR = Debug
  131. -QT += xml
  132. +QT += widgets printsupport xml
  133.  
  134. # Input
  135. HEADERS += AST.H \
  136. diff -aur -bZwB -x .git CoCoALib-0.99543.old/src/CoCoA-5/C5.pro.in CoCoALib-0.99543/src/CoCoA-5/C5.pro.in
  137. --- CoCoALib-0.99543.old/src/CoCoA-5/C5.pro.in 2016-06-12 09:04:54.570177411 -0400
  138. +++ CoCoALib-0.99543/src/CoCoA-5/C5.pro.in 2016-06-12 09:04:59.810175187 -0400
  139. @@ -16,7 +16,7 @@
  140. MOC_DIR =
  141. UI_DIR =
  142. OBJECTS_DIR = Debug
  143. -QT += xml
  144. +QT += widgets printsupport xml
  145. HEADERS += AST.H \
  146. C5.H \
  147. CoCoALibSupplement.H \
  148. diff -aur -bZwB -x .git CoCoALib-0.99543.old/src/CoCoA-5/INSTALL CoCoALib-0.99543/src/CoCoA-5/INSTALL
  149. --- CoCoALib-0.99543.old/src/CoCoA-5/INSTALL 2016-06-12 09:04:54.570177411 -0400
  150. +++ CoCoALib-0.99543/src/CoCoA-5/INSTALL 2016-06-12 09:04:59.810175187 -0400
  151. @@ -82,7 +82,7 @@
  152.  
  153. === on Linux ===
  154. cd CoCoALib/src/CoCoA-5/QCodeEdit/
  155. - qmake QCodeEdit.pro
  156. + qmake-qt4 QCodeEdit.pro
  157. make
  158.  
  159. [If you get the error: 'uic: File generated with too recent version of Qt Designer (4.0 vs. 3.3.8b)']
  160. @@ -91,13 +91,13 @@
  161. step (2) update your Qt installation, for instance
  162. sudo update-alternatives --config qmake
  163. [Select qmake-qt4]
  164. - qmake QCodeEdit.pro
  165. + qmake-qt4 QCodeEdit.pro
  166. make
  167.  
  168. === on Mac ===
  169. cd CoCoALib/src/CoCoA-5/QCodeEdit/
  170. *** uncomment line about ppc/x86_64 in QCodeEdit.pro ***
  171. - qmake -spec macx-g++ QCodeEdit.pro
  172. + qmake-qt4 -spec macx-g++ QCodeEdit.pro
  173. make -j2
  174.  
  175. ----------------------------------------------------------------------
  176. @@ -107,7 +107,7 @@
  177.  
  178. === on Linux ===
  179. cd ..
  180. - qmake C5.pro
  181. + qmake-qt4 C5.pro
  182. make -f C5Makefile
  183.  
  184. === on Mac ===
  185. @@ -116,7 +116,7 @@
  186. cd ..
  187. *** if necessary (i.e. ppc) remove -arch 386 from C5.pro ***
  188. *** if necessary add ppc/x86_64 in C5.pro ***
  189. - qmake -spec macx-g++ C5.pro
  190. + qmake-qt4 -spec macx-g++ C5.pro
  191. make -f C5Makefile clean
  192. make -j2 -f C5Makefile
  193. mv C5.app/Contents/MacOS/C5 C5.app/Contents/MacOS/C5.bin
  194. diff -aur -bZwB -x .git CoCoALib-0.99543.old/src/CoCoA-5/make-c5makefile.sh CoCoALib-0.99543/src/CoCoA-5/make-c5makefile.sh
  195. --- CoCoALib-0.99543.old/src/CoCoA-5/make-c5makefile.sh 2016-06-12 09:04:54.570177411 -0400
  196. +++ CoCoALib-0.99543/src/CoCoA-5/make-c5makefile.sh 2016-06-12 09:04:59.810175187 -0400
  197. @@ -2,7 +2,7 @@
  198.  
  199. # This script builds the CoCoA-5 GUI; it assumes that CoCoALib
  200. # has already been built, and that the Qt libraries have been installed
  201. -# (and that the qmake command is available).
  202. +# (and that the qmake-qt4 command is available).
  203.  
  204. # if [ $# -ne 5 ]
  205. # then
  206. @@ -11,7 +11,7 @@
  207. # fi
  208.  
  209.  
  210. -which qmake >/dev/null
  211. +which qmake-qt4 >/dev/null
  212. if [ $? -ne 0 ]
  213. then
  214. echo "ERROR: $0 failed because it cannot find qmake" >/dev/stderr
  215. @@ -104,9 +104,9 @@
  216. then
  217. DARWIN_OPTS="-spec macx-g++"
  218. fi
  219. -qmake $DARWIN_OPTS C5.pro -o C5Makefile
  220. +qmake-qt4 $DARWIN_OPTS C5.pro -o C5Makefile
  221. if [ "$?" -ne 0 ]
  222. then
  223. - echo "ERROR: $0 failed because qmake failed for C5.pro" >/dev/stderr
  224. + echo "ERROR: $0 failed because qmake-qt4 failed for C5.pro" >/dev/stderr
  225. exit 6
  226. fi
  227. diff -aur -bZwB -x .git CoCoALib-0.99543.old/src/CoCoA-5/Makefile CoCoALib-0.99543/src/CoCoA-5/Makefile
  228. --- CoCoALib-0.99543.old/src/CoCoA-5/Makefile 2016-06-12 09:04:54.570177411 -0400
  229. +++ CoCoALib-0.99543/src/CoCoA-5/Makefile 2016-06-12 09:04:59.810175187 -0400
  230. @@ -438,8 +438,8 @@
  231. # Added wordlist.o to files to remove when cleaning.
  232. #
  233. # Revision 1.58 2012/08/06 09:14:53 abbott
  234. -# Added a check for HAVE_QMAKE so we give the user a helpful message instead of
  235. -# an error when trying to builf GUI but QMAKE is absent.
  236. +# Added a check for HAVE_qmake-qt4 so we give the user a helpful message instead of
  237. +# an error when trying to builf GUI but qmake-qt4 is absent.
  238. #
  239. # Revision 1.57 2012/08/05 12:26:03 abbott
  240. # Added check-prerequisites and check-prerequisites-verbose targets
  241. diff -aur -bZwB -x .git CoCoALib-0.99543.old/src/CoCoA-5/make-qcodeeditmakefile.sh CoCoALib-0.99543/src/CoCoA-5/make-qcodeeditmakefile.sh
  242. --- CoCoALib-0.99543.old/src/CoCoA-5/make-qcodeeditmakefile.sh 2016-06-12 09:04:54.570177411 -0400
  243. +++ CoCoALib-0.99543/src/CoCoA-5/make-qcodeeditmakefile.sh 2016-06-12 09:04:59.810175187 -0400
  244. @@ -2,7 +2,7 @@
  245.  
  246. # This script builds the CoCoA-5 GUI; it assumes that CoCoALib
  247. # has already been built, and that the Qt libraries have been installed
  248. -# (and that the qmake command is available).
  249. +# (and that the qmake-qt4 command is available).
  250.  
  251. if [ $# -ne 0 ]
  252. then
  253. @@ -11,9 +11,9 @@
  254. fi
  255.  
  256. ##################################################################
  257. -# Check for qmake program
  258. +# Check for qmake-qt4 program
  259.  
  260. -which qmake >/dev/null
  261. +which qmake-qt4 >/dev/null
  262. if [ $? -ne 0 ]
  263. then
  264. echo "ERROR: $0 failed because it cannot find qmake" >/dev/stderr
  265. @@ -83,9 +83,9 @@
  266. DARWIN="-spec macx-g++"
  267. fi
  268. cd $QCE
  269. -qmake $DARWIN QCodeEdit.pro
  270. +qmake-qt4 $DARWIN QCodeEdit.pro
  271. if [ "$?" -ne 0 ]
  272. then
  273. - echo "ERROR: $0 failed because qmake failed for QCodeEdit" >/dev/stderr
  274. + echo "ERROR: $0 failed because qmake-qt4 failed for QCodeEdit" >/dev/stderr
  275. exit 4
  276. fi
  277. diff -aur -bZwB -x .git CoCoALib-0.99543.old/src/CoCoA-5/OnlineHelp.C CoCoALib-0.99543/src/CoCoA-5/OnlineHelp.C
  278. --- CoCoALib-0.99543.old/src/CoCoA-5/OnlineHelp.C 2016-06-12 09:04:54.570177411 -0400
  279. +++ CoCoALib-0.99543/src/CoCoA-5/OnlineHelp.C 2016-06-12 09:04:59.810175187 -0400
  280. @@ -136,7 +136,7 @@
  281. {
  282. out << "Loading CoCoAManual index ..." << std::flush;
  283. ifstream in(XMLFileName());
  284. - if (in == 0)
  285. + if (in.fail())
  286. CoCoA_ERROR("Cannot find input file `CoCoAHelp.xml`", "OnlineHelp::index()");
  287. string line; // used only inside while loop
  288. string LastCommand;
  289. @@ -426,7 +426,7 @@
  290. void PrintSearchExact(std::string title, std::ostream &out)
  291. {
  292. ifstream in(XMLFileName());
  293. - if (in == 0)
  294. + if (in.fail())
  295. {
  296. std::cout << "Cannot find input file `CoCoAHelp.xml`. Aborting." << endl;
  297. abort();
  298. @@ -560,7 +560,7 @@
  299. SearchType(found, TypeLine);
  300. for (size_t i=0; i<found.size(); ++i)
  301. {
  302. - ifstream in(XMLFileName()); // if (in == 0) ...
  303. + ifstream in(XMLFileName()); // if (in.fail()) ...
  304. string s = SkipToStringInTag(in, "<title>");
  305. while (!in.eof() && s != found[i]) s = SkipToStringInTag(in, "<title>");
  306. if (in.eof())
  307. @@ -583,7 +583,7 @@
  308. SearchRtnType(found, TypeLine);
  309. for (size_t i=0; i<found.size(); ++i)
  310. {
  311. - ifstream in(XMLFileName()); // if (in == 0) ...
  312. + ifstream in(XMLFileName()); // if (in.fail()) ...
  313. string s = SkipToStringInTag(in, "<title>");
  314. while (!in.eof() && s != found[i]) s = SkipToStringInTag(in, "<title>");
  315. if (in.eof())
  316. @@ -769,7 +769,7 @@
  317. void PrintAllExamples(std::ostream &out)
  318. {
  319. ifstream in(XMLFileName());
  320. - if (in == 0)
  321. + if (in.fail())
  322. {
  323. std::cout << "Cannot find input file `CoCoAHelp.xml`. Aborting." << endl;
  324. abort();
  325. @@ -798,7 +798,7 @@
  326. void PrintAllExamplesWithoutOutput(std::ostream &out)
  327. {
  328. ifstream in(XMLFileName());
  329. - if (in == 0)
  330. + if (in.fail())
  331. {
  332. std::cout << "Cannot find input file `CoCoAHelp.xml`. Aborting." << endl;
  333. abort();
  334. @@ -827,7 +827,7 @@
  335. void PrintWordlist(std::ostream &out)
  336. {
  337. ifstream in(XMLFileName());
  338. - if (in == 0)
  339. + if (in.fail())
  340. {
  341. std::cout << "Cannot find input file `CoCoAHelp.xml`. Aborting." << endl;
  342. abort();
  343. diff -aur -bZwB -x .git CoCoALib-0.99543.old/src/CoCoA-5/QCodeEdit/document/qdocumentline.cpp CoCoALib-0.99543/src/CoCoA-5/QCodeEdit/document/qdocumentline.cpp
  344. --- CoCoALib-0.99543.old/src/CoCoA-5/QCodeEdit/document/qdocumentline.cpp 2016-06-12 09:04:54.573510743 -0400
  345. +++ CoCoALib-0.99543/src/CoCoA-5/QCodeEdit/document/qdocumentline.cpp 2016-06-12 09:04:59.810175187 -0400
  346. @@ -268,7 +268,7 @@
  347. */
  348. bool QDocumentLine::isValid() const
  349. {
  350. - return m_handle ? m_handle->document() : false;
  351. + return m_handle ? (bool)m_handle->document() : false;
  352. }
  353.  
  354. /*!
  355. diff -aur -bZwB -x .git CoCoALib-0.99543.old/src/CoCoA-5/QCodeEdit/QCodeEdit.pro.in CoCoALib-0.99543/src/CoCoA-5/QCodeEdit/QCodeEdit.pro.in
  356. --- CoCoALib-0.99543.old/src/CoCoA-5/QCodeEdit/QCodeEdit.pro.in 2016-06-12 09:04:54.573510743 -0400
  357. +++ CoCoALib-0.99543/src/CoCoA-5/QCodeEdit/QCodeEdit.pro.in 2016-06-12 09:04:59.810175187 -0400
  358. @@ -5,7 +5,7 @@
  359. DEPENDPATH += . document images qnfa snippets widgets
  360. INCLUDEPATH += . document widgets qnfa snippets
  361. CONFIG += qt debug warn_off staticlib thread
  362. -QT += xml
  363. +QT += widgets printsupport xml
  364. UI_DIR =
  365. MOC_DIR = .build
  366. OBJECTS_DIR = .build
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!