1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-14 03:10:47 +00:00
freebsd-ports/editors/fxite/files/patch-src_migration.cpp
Jason E. Hale 60f61d1988 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
2018-02-16 08:12:16 +00:00

30 lines
1.4 KiB
C++

Fix build with clang 6
migration.cpp:134:27: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
"The location of the "APP_NAME" configuration directory has changed.\n"
^
migration.cpp:144:33: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
" Click [Cancel] to exit "APP_NAME" now without any changes.\n"
--- src/migration.cpp.orig 2013-10-03 09:22:51 UTC
+++ src/migration.cpp
@@ -131,7 +131,7 @@ void MigrateConfigDir(FXApp*a, const FXString &src, co
_("IMPORTANT NOTICE"),
_(
"\n"
- "The location of the "APP_NAME" configuration directory has changed.\n"
+ "The location of the " APP_NAME " configuration directory has changed.\n"
"\n"
#ifndef WIN32
"This is due to changes in the FOX toolkit, in accordance with\n"
@@ -141,7 +141,7 @@ void MigrateConfigDir(FXApp*a, const FXString &src, co
"Migration options:\n"
" Click [ Yes ] to automatically copy your old settings (recommended).\n"
" Click [ No ] to create a new configuration.\n"
- " Click [Cancel] to exit "APP_NAME" now without any changes.\n"
+ " Click [Cancel] to exit " APP_NAME " now without any changes.\n"
"\n"
"Do you want me to copy your existing configuration?"
),