diff options
Diffstat (limited to 'freebsd/tdebase')
| -rw-r--r-- | freebsd/tdebase/distinfo | 6 | ||||
| -rw-r--r-- | freebsd/tdebase/files/patch-bp000-fix-tdmlib-log-symbol-redefinition.diff | 47 | ||||
| -rw-r--r-- | freebsd/tdebase/pkg-plist | 14 |
3 files changed, 64 insertions, 3 deletions
diff --git a/freebsd/tdebase/distinfo b/freebsd/tdebase/distinfo index bad95bdcc..b053296e9 100644 --- a/freebsd/tdebase/distinfo +++ b/freebsd/tdebase/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1586690515 -SHA256 (TDE/tdebase-trinity_14.0.8.orig.tar.xz) = d6bc5406d951cf5a651ab65a4c3656f512124cdd89fb9595f644983575959b1b -SIZE (TDE/tdebase-trinity_14.0.8.orig.tar.xz) = 30049464 +TIMESTAMP = 1602988578 +SHA256 (TDE/tdebase-trinity_14.0.9.orig.tar.xz) = 3206503b40195943bd069e26c3be3233e75bbfb338315de1a9c8148e4de44942 +SIZE (TDE/tdebase-trinity_14.0.9.orig.tar.xz) = 30412112 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 * diff --git a/freebsd/tdebase/pkg-plist b/freebsd/tdebase/pkg-plist index d1de83775..165a1c238 100644 --- a/freebsd/tdebase/pkg-plist +++ b/freebsd/tdebase/pkg-plist @@ -841,9 +841,11 @@ share/apps/kappfinder/apps/Development/ddd.desktop share/apps/kappfinder/apps/Development/designer.desktop share/apps/kappfinder/apps/Development/dlgedit.desktop share/apps/kappfinder/apps/Development/eclipse.desktop +share/apps/kappfinder/apps/Development/fdesign.desktop share/apps/kappfinder/apps/Development/j2mewtk.desktop share/apps/kappfinder/apps/Development/linguist.desktop share/apps/kappfinder/apps/Development/pose.desktop +share/apps/kappfinder/apps/Development/sced.desktop share/apps/kappfinder/apps/Games/Arcade/ClanBomber.desktop share/apps/kappfinder/apps/Games/Arcade/FrozenBubble.desktop share/apps/kappfinder/apps/Games/Arcade/Gnibbles.desktop @@ -856,8 +858,11 @@ share/apps/kappfinder/apps/Games/Arcade/XKobo.desktop share/apps/kappfinder/apps/Games/Arcade/XSoldier.desktop share/apps/kappfinder/apps/Games/Arcade/alephone-nogl.desktop share/apps/kappfinder/apps/Games/Arcade/alephone.desktop +share/apps/kappfinder/apps/Games/Arcade/battalion.desktop +share/apps/kappfinder/apps/Games/Arcade/battleball.desktop share/apps/kappfinder/apps/Games/Arcade/cxhextris.desktop share/apps/kappfinder/apps/Games/Arcade/rocksndiamonds.desktop +share/apps/kappfinder/apps/Games/Arcade/scavenger.desktop share/apps/kappfinder/apps/Games/Board/Gataxx.desktop share/apps/kappfinder/apps/Games/Board/Gchess.desktop share/apps/kappfinder/apps/Games/Board/Glines.desktop @@ -875,6 +880,7 @@ share/apps/kappfinder/apps/Games/Card/FreeCell.desktop share/apps/kappfinder/apps/Games/Card/PySol.desktop share/apps/kappfinder/apps/Games/Card/XPat2.desktop share/apps/kappfinder/apps/Games/Clanbomber.desktop +share/apps/kappfinder/apps/Games/Emulators/cmail.desktop share/apps/kappfinder/apps/Games/Emulators/qmamecat.desktop share/apps/kappfinder/apps/Games/GTali.desktop share/apps/kappfinder/apps/Games/Roguelikes/angband.desktop @@ -2381,6 +2387,7 @@ share/doc/tde/HTML/en/khelpcenter/releasenotes/r14.0.5.docbook share/doc/tde/HTML/en/khelpcenter/releasenotes/r14.0.6.docbook share/doc/tde/HTML/en/khelpcenter/releasenotes/r14.0.7.docbook share/doc/tde/HTML/en/khelpcenter/releasenotes/r14.0.8.docbook +share/doc/tde/HTML/en/khelpcenter/releasenotes/r14.0.9.docbook share/doc/tde/HTML/en/khelpcenter/shadow1.png share/doc/tde/HTML/en/khelpcenter/support.docbook share/doc/tde/HTML/en/khelpcenter/tdelogo2.png @@ -4187,8 +4194,15 @@ share/mimelnk/fonts/package.desktop share/mimelnk/fonts/system-folder.desktop share/mimelnk/inode/system_directory.desktop share/mimelnk/media/audiocd.desktop +share/mimelnk/media/blankbluray.desktop share/mimelnk/media/blankcd.desktop share/mimelnk/media/blankdvd.desktop +share/mimelnk/media/bluray_mounted.desktop +share/mimelnk/media/bluray_mounted_decrypted.desktop +share/mimelnk/media/bluray_unmounted.desktop +share/mimelnk/media/bluray_unmounted_decrypted.desktop +share/mimelnk/media/bluray_unmounted_encrypted.desktop +share/mimelnk/media/blurayvideo.desktop share/mimelnk/media/camera_mounted.desktop share/mimelnk/media/camera_unmounted.desktop share/mimelnk/media/cd-r_mounted.desktop |