diff options
Diffstat (limited to 'freebsd/tdebase/files')
| -rw-r--r-- | freebsd/tdebase/files/patch-bp000-fix-tdmlib-log-symbol-redefinition.diff | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/freebsd/tdebase/files/patch-bp000-fix-tdmlib-log-symbol-redefinition.diff b/freebsd/tdebase/files/patch-bp000-fix-tdmlib-log-symbol-redefinition.diff new file mode 100644 index 000000000..37d9c6687 --- /dev/null +++ b/freebsd/tdebase/files/patch-bp000-fix-tdmlib-log-symbol-redefinition.diff @@ -0,0 +1,47 @@ +commit 5b7a534126e2ed2d26d75c1321a9bc58a5a95a29 +Author: Slávek Banko <slavek.banko@axis.cz> +Date: Thu Oct 29 00:09:36 2020 +0100 + + Fix FTBFS due to redefine the 'log' symbol in tdmlib. + + Signed-off-by: Slávek Banko <slavek.banko@axis.cz> + +diff --git a/tdmlib/kgreet_pam.cpp b/tdmlib/kgreet_pam.cpp +index e7a5f074..69eac485 100644 +--- a/tdmlib/kgreet_pam.cpp ++++ b/tdmlib/kgreet_pam.cpp +@@ -55,7 +55,7 @@ protected: + virtual void contextMenuEvent( TQContextMenuEvent * ) {} + }; + +-static FILE* log; ++static FILE *logFile; + static void kg_debug(const char* fmt, ...) + { + va_list lst; +@@ -63,8 +63,8 @@ static void kg_debug(const char* fmt, ...) + + #ifdef PAM_GREETER_DEBUG + #if 0 +- vfprintf(log, fmt, lst); +- fflush(log); ++ vfprintf(logFile, fmt, lst); ++ fflush(logFile); + #else + char buf[6000]; + sprintf(buf, "*** %s\n", fmt); +@@ -691,9 +691,11 @@ static bool init( const TQString &, + static void done( void ) + { + TDEGlobal::locale()->removeCatalogue( "kgreet_pam" ); +- if (log && log != stderr) +- fclose(log); +- log = 0; ++ if (logFile && (logFile != stderr)) ++ { ++ fclose(logFile); ++ } ++ logFile = 0; + } + + static KGreeterPlugin * |