p
/
tdv
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix various macOS-related/found issues 

Even though this software isn't very useful on that system either,
due to its lack of PRIMARY.
This commit is contained in:
Přemysl Eric Janouch 2021-11-02 16:57:18 +01:00
parent 726ecd83ac
commit b36f185426
Signed by: p
GPG Key ID: A0420B94F92B9493
4 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -66,7 +66,6 @@ endif ()
find_package (Termo QUIET NO_MODULE) find_package (Termo QUIET NO_MODULE)
option (USE_SYSTEM_TERMO option (USE_SYSTEM_TERMO
"Don't compile our own termo library, use the system one" ${Termo_FOUND}) "Don't compile our own termo library, use the system one" ${Termo_FOUND})
if (USE_SYSTEM_TERMO) if (USE_SYSTEM_TERMO)
if (NOT Termo_FOUND) if (NOT Termo_FOUND)
message (FATAL_ERROR "System termo library not found") message (FATAL_ERROR "System termo library not found")
@ -88,7 +87,6 @@ endif ()
pkg_check_modules (xcb xcb xcb-xfixes) pkg_check_modules (xcb xcb xcb-xfixes)
option (WITH_X11 "Compile with X11 selection support using XCB" ${xcb_FOUND}) option (WITH_X11 "Compile with X11 selection support using XCB" ${xcb_FOUND})
if (WITH_X11) if (WITH_X11)
if (NOT xcb_FOUND) if (NOT xcb_FOUND)
message (FATAL_ERROR "XCB not found") message (FATAL_ERROR "XCB not found")
@ -100,8 +98,15 @@ endif ()
pkg_check_modules (gtk gtk+-3.0) pkg_check_modules (gtk gtk+-3.0)
option (WITH_GUI "Build an alternative GTK+ UI" ${gtk_FOUND}) option (WITH_GUI "Build an alternative GTK+ UI" ${gtk_FOUND})
if (WITH_GUI)
if (NOT gtk_FOUND)
message (FATAL_ERROR "GTK+ not found")
endif ()
link_directories (${dependencies_LIBRARY_DIRS}) link_directories (${gtk_LIBRARY_DIRS})
endif ()
link_directories (${dependencies_LIBRARY_DIRS} ${icu_LIBRARY_DIRS})
include_directories (${ZLIB_INCLUDE_DIRS} ${icu_INCLUDE_DIRS} include_directories (${ZLIB_INCLUDE_DIRS} ${icu_INCLUDE_DIRS}
${dependencies_INCLUDE_DIRS} ${Ncursesw_INCLUDE_DIRS} ${dependencies_INCLUDE_DIRS} ${Ncursesw_INCLUDE_DIRS}
${Termo_INCLUDE_DIRS}) ${Termo_INCLUDE_DIRS})

2
dicts/gnu-fdl-de-cz.sh
View File

@ -2,7 +2,7 @@
# GNU/FDL German-Czech dictionary, see https://gnu.nemeckoceskyslovnik.cz # GNU/FDL German-Czech dictionary, see https://gnu.nemeckoceskyslovnik.cz
# Sometimes the domain doesn't resolve, and the contents are close to useless # Sometimes the domain doesn't resolve, and the contents are close to useless
[ -n "$WANT_BAD_DICTS" ] || exit [ -n "$WANT_BAD_DICTS" ] || exit 0
curl -Lo- 'https://gnu.nemeckoceskyslovnik.cz/index.php?id=6&sablona=export&format=zcu' | \ curl -Lo- 'https://gnu.nemeckoceskyslovnik.cz/index.php?id=6&sablona=export&format=zcu' | \
grep -v ^# | sed 's/\\//g' | perl -CSD -F\\t -le ' grep -v ^# | sed 's/\\//g' | perl -CSD -F\\t -le '

2
src/sdtui.c
View File

@ -37,9 +37,7 @@
#include <termo.h> // input #include <termo.h> // input
#include <ncurses.h> // output #include <ncurses.h> // output
#include <termios.h> #include <termios.h>
#ifndef TIOCGWINSZ
#include <sys/ioctl.h> #include <sys/ioctl.h>
#endif // ! TIOCGWINSZ
#include "config.h" #include "config.h"
#include "stardict.h" #include "stardict.h"

14
src/stardict.c
View File

@ -309,26 +309,24 @@ load_ifo (StardictInfo *sti, const gchar *path, GError **error)
goto error; goto error;
} }
ret_val = TRUE; // FIXME check for zeros, don't assume that 0 means "not set"
// FIXME check for zeros, don't assume that 0 means for "not set"
if (!sti->book_name || !*sti->book_name) if (!sti->book_name || !*sti->book_name)
{ {
g_set_error (error, STARDICT_ERROR, STARDICT_ERROR_INVALID_DATA, g_set_error (error, STARDICT_ERROR, STARDICT_ERROR_INVALID_DATA,
"%s: %s", path, _("no book name specified")); "%s: %s", path, _("no book name specified"));
ret_val = FALSE; goto error;
} }
if (!sti->word_count) if (!sti->word_count)
{ {
g_set_error (error, STARDICT_ERROR, STARDICT_ERROR_INVALID_DATA, g_set_error (error, STARDICT_ERROR, STARDICT_ERROR_INVALID_DATA,
"%s: %s", path, _("word count not specified")); "%s: %s", path, _("word count not specified"));
ret_val = FALSE; goto error;
} }
if (!sti->idx_filesize) if (!sti->idx_filesize)
{ {
g_set_error (error, STARDICT_ERROR, STARDICT_ERROR_INVALID_DATA, g_set_error (error, STARDICT_ERROR, STARDICT_ERROR_INVALID_DATA,
"%s: %s", path, _("index file size not specified")); "%s: %s", path, _("index file size not specified"));
ret_val = FALSE; goto error;
} }
if (!sti->idx_offset_bits) if (!sti->idx_offset_bits)
@ -338,9 +336,11 @@ load_ifo (StardictInfo *sti, const gchar *path, GError **error)
g_set_error (error, STARDICT_ERROR, STARDICT_ERROR_INVALID_DATA, g_set_error (error, STARDICT_ERROR, STARDICT_ERROR_INVALID_DATA,
"%s: %s: %lu", path, _("invalid index offset bits"), "%s: %s: %lu", path, _("invalid index offset bits"),
sti->idx_offset_bits); sti->idx_offset_bits);
ret_val = FALSE; goto error;
} }
ret_val = TRUE;
error: error:
if (!ret_val) if (!ret_val)
{ {