diff --git a/README b/README index 60273c1..948673f 100644 --- a/README +++ b/README @@ -17,7 +17,7 @@ The following dependencies are optional: * sqlite3 (>= 3.6.23): splite3 database backend * libmagic from file(1): for mime-type detection -* libsynctex from TeXLive: SyncTeX support +* libsynctex from TeXLive (>= 1.19): SyncTeX support * libseccomp: sandbox support For building zathura, the following dependencies are also required: diff --git a/meson.build b/meson.build index b4372a8..969d27c 100644 --- a/meson.build +++ b/meson.build @@ -69,7 +69,7 @@ flags = cc.get_supported_arguments(flags) # optional dependencies additional_sources = [] sqlite = dependency('sqlite3', version: '>=3.6.23', required: get_option('sqlite')) -synctex = dependency('synctex', required: get_option('synctex')) +synctex = dependency('synctex', version: '>=1.19', required: get_option('synctex')) magic = cc.find_library('magic', required: get_option('magic')) seccomp = dependency('libseccomp', required: get_option('seccomp')) @@ -82,12 +82,8 @@ endif if synctex.found() build_dependencies += synctex defines += '-DWITH_SYNCTEX' - if synctex.version() < '2.0.0' - if synctex.version() >= '1.19.0' - warning('You are using a synctex version pre-SONAME bump, but post-ABI-break. Please make sure to always run zathura using the correct synctex version.') - else - defines += '-DWITH_SYNCTEX1' - endif + if synctex.version() < '2.0.0' and synctex.version() >= '1.19.0' + warning('You are using a synctex version pre-SONAME bump, but post-ABI-break. Please make sure to always run zathura using the correct synctex version.') endif endif diff --git a/zathura/synctex.c b/zathura/synctex.c index f003800..1fd4ac6 100644 --- a/zathura/synctex.c +++ b/zathura/synctex.c @@ -16,14 +16,6 @@ #include "adjustment.h" #ifdef WITH_SYNCTEX -#ifdef WITH_SYNCTEX1 -typedef synctex_scanner_t synctex_scanner_p; -typedef synctex_node_t synctex_node_p; - -#define synctex_scanner_next_result(scanner) synctex_next_result(scanner) -#define synctex_display_query(scanner, file, line, column, page) synctex_display_query(scanner, file, line, column) -#endif - bool synctex_get_input_line_column(const char* filename, unsigned int page, int x, int y, char** input_file, unsigned int* line, unsigned int* column)