mirror of
https://git.freebsd.org/ports.git
synced 2025-06-27 15:40:32 -04:00
60f61d1988
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
49 lines
1.4 KiB
C++
49 lines
1.4 KiB
C++
--- src/luafx.cpp.orig 2013-10-03 09:22:51 UTC
|
|
+++ src/luafx.cpp
|
|
@@ -36,6 +36,10 @@
|
|
#include "intl.h"
|
|
#include "luafx.h"
|
|
|
|
+#if LUA_VERSION_NUM<502
|
|
+# define lua_rawlen lua_objlen
|
|
+#endif
|
|
+
|
|
static FXWindow*main_window=NULL;
|
|
|
|
static const char*default_title;
|
|
@@ -173,7 +177,7 @@ static int input(lua_State*L)
|
|
switch (toupper(type[0])) {
|
|
case 'I' : {
|
|
if (!lua_isnil(L,3)) {
|
|
- txt.format(sizeof(lua_Integer)>4?"%ld":"%d", luaL_checkinteger(L,3));
|
|
+ txt.format("%ld", luaL_checkinteger(L,3));
|
|
}
|
|
opt=INPUTDIALOG_INTEGER;
|
|
break;
|
|
@@ -248,7 +252,7 @@ static int choose(lua_State*L) {
|
|
FXString fmsg;
|
|
int i,n;
|
|
luaL_argcheck(L, lua_istable(L,argtbl), argtbl, _("table expected") );
|
|
- n=lua_objlen(L,argtbl);
|
|
+ n=lua_rawlen(L,argtbl);
|
|
luaL_argcheck(L, n>0, argtbl, _("table can't be empty"));
|
|
for (i=1;i<=n; i++) {
|
|
lua_rawgeti(L,argtbl,i);
|
|
@@ -599,7 +603,7 @@ static int pid(lua_State* L)
|
|
|
|
|
|
|
|
-static const struct luaL_reg fx_util_funcs[] = {
|
|
+static const struct luaL_Reg fx_util_funcs[] = {
|
|
{"message", message},
|
|
{"confirm", confirm},
|
|
{"input", input},
|
|
@@ -620,7 +624,7 @@ static const struct luaL_reg fx_util_funcs[] = {
|
|
|
|
|
|
|
|
-const luaL_reg* LuaFxUtils(FXWindow*topwin, const char*exe_name)
|
|
+const luaL_Reg* LuaFxUtils(FXWindow*topwin, const char*exe_name)
|
|
{
|
|
default_title=exe_name;
|
|
if (!main_window) { main_window=topwin; }
|