summaryrefslogtreecommitdiff
path: root/editors/fxite/files/patch-src_outpane.cpp
diff options
context:
space:
mode:
authorJason E. Hale <jhale@FreeBSD.org>2018-02-16 08:12:16 +0000
committerJason E. Hale <jhale@FreeBSD.org>2018-02-16 08:12:16 +0000
commit60f61d1988e6e9ff69129fc09da760963a3236be (patch)
tree5f962027f6700e5595a5dc83cc812a8bdd7ffe35 /editors/fxite/files/patch-src_outpane.cpp
parentnew port sysutils/getssl: Local LetsEncrypt client (diff)
Fix build with clang 6 (C++11 requires a space between literal and identifier)
Mark FOX17 option broken (Not related to clang 6 in particular, the FOX-1.7 API is ever changing due to being a development version. This project appears to be dead, so I'm not sure it is worth fixing.) recorder.cpp:104:9: error: no matching member function for call to 'prepend' NewMessage(); ^~~~~~~~~~~~ recorder.cpp:51:6: note: expanded from macro 'NewMessage' list.prepend((FXObject*)mm); ~~~~~^~~~~~~ /usr/local/include/fox-1.7/FXObjectList.h:256:10: note: candidate function not viable: no known conversion from 'FX::FXObject *' to 'MacroMessage *' for 1st argument FXbool prepend(TYPE* object){ return FXObjectList::prepend(object); } ^ /usr/local/include/fox-1.7/FXObjectList.h:265:10: note: candidate function not viable: no known conversion from 'FX::FXObject *' to 'const FXObjectListOf<MacroMessage>' for 1st argument FXbool prepend(const FXObjectListOf<TYPE>& objects){ return FXObjectList::prepend(objects); } ^ /usr/local/include/fox-1.7/FXObjectList.h:259:10: note: candidate function not viable: requires 2 arguments, but 1 was provided FXbool prepend(TYPE* object,FXival n){ return FXObjectList::prepend(object,n); } ^ /usr/local/include/fox-1.7/FXObjectList.h:262:10: note: candidate function not viable: requires 2 arguments, but 1 was provided FXbool prepend(TYPE** objects,FXival n){ return FXObjectList::prepend(objects,n); } ^ Rename/remake patches
Diffstat (limited to 'editors/fxite/files/patch-src_outpane.cpp')
-rw-r--r--editors/fxite/files/patch-src_outpane.cpp28
1 files changed, 28 insertions, 0 deletions
diff --git a/editors/fxite/files/patch-src_outpane.cpp b/editors/fxite/files/patch-src_outpane.cpp
new file mode 100644
index 000000000000..4de84587e609
--- /dev/null
+++ b/editors/fxite/files/patch-src_outpane.cpp
@@ -0,0 +1,28 @@
+--- src/outpane.cpp.orig 2013-10-03 09:22:51 UTC
++++ src/outpane.cpp
+@@ -115,7 +115,12 @@ void OutputList::GoToError()
+ FXint begs[4]={0,0,0,0};
+ FXint ends[4]={0,0,0,0};
+ FXRex rx(pats[i].pat, REX_CAPTURE);
+- if (rx.match(txt,begs,ends,REX_FORWARD,3)) {
++#ifdef FOX_1_7_50_OR_NEWER
++ if (rx.search(txt,0,txt.length(),FXRex::Normal,begs,ends,3)>=0)
++#else
++ if (rx.match(txt,begs,ends,REX_FORWARD,3))
++#endif
++ {
+ FXString filename = txt.mid(begs[1],ends[1]-begs[1]);
+ FXString linenum = txt.mid(begs[2],ends[2]-begs[2]);
+ if (FXStat::isFile(filename)) {
+@@ -228,7 +233,11 @@ void OutputList::SelectFirstError()
+ FXRex rx(_(": [Ee]rror: "));
+ for (FXint i=0; i<getNumItems(); i++) {
+ FXListItem *item=getItem(i);
++#ifdef FOX_1_7_50_OR_NEWER
++ if (rx.search(item->getText(),0,item->getText().length())>=0) {
++#else
+ if (rx.match(item->getText())) {
++#endif
+ selectItem(i);
+ setCurrentItem(i);
+ makeItemVisible(i);