diff options
author | Matteo Bernardini | 2019-01-05 11:02:35 +0100 |
---|---|---|
committer | Matteo Bernardini | 2019-01-05 11:02:35 +0100 |
commit | 1f83bd4e081733c3e61db79691b35b4d7520c707 (patch) | |
tree | 7e6516d59eced4b190499cc443b3c32695aa5dd0 /office/qpdfview | |
parent | 5b0cf5e3225e0ef439d733f5095f2f797601d752 (diff) | |
download | slackbuilds-1f83bd4e081733c3e61db79691b35b4d7520c707.tar.gz |
20190105.1 global branch merge.current-20190105.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'office/qpdfview')
-rw-r--r-- | office/qpdfview/qpdfview-synctex-2018.patch | 85 | ||||
-rw-r--r-- | office/qpdfview/qpdfview.SlackBuild | 7 | ||||
-rw-r--r-- | office/qpdfview/qpdfview.info | 6 |
3 files changed, 93 insertions, 5 deletions
diff --git a/office/qpdfview/qpdfview-synctex-2018.patch b/office/qpdfview/qpdfview-synctex-2018.patch new file mode 100644 index 0000000000..defb61f386 --- /dev/null +++ b/office/qpdfview/qpdfview-synctex-2018.patch @@ -0,0 +1,85 @@ +=== modified file 'application.pro' +--- application.pro 2018-05-04 18:00:34 +0000 ++++ application.pro 2018-05-05 05:57:24 +0000 +@@ -227,6 +227,8 @@ + !without_pkgconfig:system(pkg-config --exists synctex) { + CONFIG += link_pkgconfig + PKGCONFIG += synctex ++ ++ system(pkg-config --atleast-version=2.0.0 synctex):DEFINES += HAS_SYNCTEX_2 + } else { + HEADERS += synctex/synctex_parser.h synctex/synctex_parser_utils.h synctex/synctex_parser_local.h + SOURCES += synctex/synctex_parser.c synctex/synctex_parser_utils.c + +=== modified file 'sources/documentview.cpp' +--- sources/documentview.cpp 2018-03-28 19:19:40 +0000 ++++ sources/documentview.cpp 2018-05-05 05:57:24 +0000 +@@ -56,6 +56,15 @@ + + #include <synctex_parser.h> + ++#ifndef HAS_SYNCTEX_2 ++ ++typedef synctex_scanner_t synctex_scanner_p; ++typedef synctex_node_t synctex_node_p; ++ ++#define synctex_scanner_next_result(scanner) synctex_next_result(scanner) ++ ++#endif // HAS_SYNCTEX_2 ++ + #endif // WITH_SYNCTEX + + #include "settings.h" +@@ -245,11 +254,11 @@ + { + DocumentView::SourceLink sourceLink; + +- if(synctex_scanner_t scanner = synctex_scanner_new_with_output_file(filePath.toLocal8Bit(), 0, 1)) ++ if(synctex_scanner_p scanner = synctex_scanner_new_with_output_file(filePath.toLocal8Bit(), 0, 1)) + { + if(synctex_edit_query(scanner, page, pos.x(), pos.y()) > 0) + { +- for(synctex_node_t node = synctex_next_result(scanner); node != 0; node = synctex_next_result(scanner)) ++ for(synctex_node_p node = synctex_scanner_next_result(scanner); node != 0; node = synctex_scanner_next_result(scanner)) + { + sourceLink.name = QString::fromLocal8Bit(synctex_scanner_get_name(scanner, synctex_node_tag(node))); + sourceLink.line = qMax(synctex_node_line(node), 0); + +=== modified file 'sources/main.cpp' +--- sources/main.cpp 2018-05-04 05:40:07 +0000 ++++ sources/main.cpp 2018-05-05 05:57:24 +0000 +@@ -45,6 +45,16 @@ + + #include <synctex_parser.h> + ++#ifndef HAS_SYNCTEX_2 ++ ++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 // HAS_SYNCTEX_2 ++ + #endif // WITH_SYNCTEX + + #include "documentview.h" +@@ -326,13 +336,11 @@ + + if(!file.sourceName.isNull()) + { +- synctex_scanner_t scanner = synctex_scanner_new_with_output_file(file.filePath.toLocal8Bit(), 0, 1); +- +- if(scanner != 0) ++ if(synctex_scanner_p scanner = synctex_scanner_new_with_output_file(file.filePath.toLocal8Bit(), 0, 1)) + { +- if(synctex_display_query(scanner, file.sourceName.toLocal8Bit(), file.sourceLine, file.sourceColumn) > 0) ++ if(synctex_display_query(scanner, file.sourceName.toLocal8Bit(), file.sourceLine, file.sourceColumn, -1) > 0) + { +- for(synctex_node_t node = synctex_next_result(scanner); node != 0; node = synctex_next_result(scanner)) ++ for(synctex_node_p node = synctex_scanner_next_result(scanner); node != 0; node = synctex_scanner_next_result(scanner)) + { + int page = synctex_node_page(node); + QRectF enclosingBox(synctex_node_box_visible_h(node), synctex_node_box_visible_v(node), synctex_node_box_visible_width(node), synctex_node_box_visible_height(node)); + diff --git a/office/qpdfview/qpdfview.SlackBuild b/office/qpdfview/qpdfview.SlackBuild index a87f09d0ad..65eaab0e57 100644 --- a/office/qpdfview/qpdfview.SlackBuild +++ b/office/qpdfview/qpdfview.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=qpdfview -VERSION=${VERSION:-0.4.16} +VERSION=${VERSION:-0.4.17beta1} BUILD=${BUILD:-2} TAG=${TAG:-_SBo} @@ -70,7 +70,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -sed -i "s|/usr/lib/qpdfview|/usr/lib${LIBDIRSUFFIX}/qpdfview|" qpdfview.pri +patch -p0 < $CWD/qpdfview-synctex-2018.patch +sed -e 's|2.0.0|1.21.0|' -i application.pro || exit 1 + +sed -i "s|/usr/lib/qpdfview|/usr/lib${LIBDIRSUFFIX}/qpdfview|" qpdfview.pri || exit 1 # Add localizations lrelease qpdfview.pro diff --git a/office/qpdfview/qpdfview.info b/office/qpdfview/qpdfview.info index 0b90b385dc..2920b841e9 100644 --- a/office/qpdfview/qpdfview.info +++ b/office/qpdfview/qpdfview.info @@ -1,8 +1,8 @@ PRGNAM="qpdfview" -VERSION="0.4.16" +VERSION="0.4.17beta1" HOMEPAGE="https://launchpad.net/qpdfview" -DOWNLOAD="https://launchpad.net/qpdfview/trunk/0.4.16/+download/qpdfview-0.4.16.tar.gz" -MD5SUM="4b317c4536332a7fe437abe50eca1716" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/qpdfview/qpdfview-0.4.17beta1.tar.gz" +MD5SUM="c203518a8988203dd94c648490089a8e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |