[texworks] 54/73: unapply synctex patch
This is an automated email from the git hooks/post-receive script.
preining pushed a commit to branch master
in repository texworks.
commit 3704c8c727449de97096fc8e82a7696ae4c64e76
Author: Andreas Beckmann <anbe@debian.org>
Date: Sat Aug 8 16:11:59 2015 +0200
unapply synctex patch
---
CMake/Modules/FindSynctex.cmake | 51 -----------------------------------------
CMakeLists.txt | 10 --------
src/CMakeLists.txt | 8 -------
src/PDFDocument.h | 2 +-
4 files changed, 1 insertion(+), 70 deletions(-)
diff --git a/CMake/Modules/FindSynctex.cmake b/CMake/Modules/FindSynctex.cmake
deleted file mode 100644
index a807d43..0000000
--- a/CMake/Modules/FindSynctex.cmake
+++ /dev/null
@@ -1,51 +0,0 @@
-# - Try to find Synctex
-# Once done this will define
-#
-# SYNCTEX_FOUND - system has Synctex
-# SYNCTEX_INCLUDE_DIR - the Fontconfig include directory
-# SYNCTEX_LIBRARIES - Link these to use Sycntex
-#
-# Redistribution and use of this file is allowed according to the terms of the
-# MIT license. For details see the file COPYING-CMAKE-MODULES.
-
-
-if ( SYNCTEX_INCLUDE_DIR AND SYNCTEX_LIBRARIES )
- # in cache already
- SET(Synctex_FIND_QUIETLY TRUE)
-endif ( SYNCTEX_INCLUDE_DIR AND SYNCTEX_LIBRARIES )
-
-# use pkg-config to get the directories and then use these values
-# in the FIND_PATH() and FIND_LIBRARY() calls
-if( NOT WIN32 )
- find_package(PkgConfig)
-
- pkg_check_modules(SYNCTEX_PKG QUIET synctex)
-endif( NOT WIN32 )
-
-FIND_PATH(SYNCTEX_INCLUDE_DIR NAMES synctex_parser.h
- PATHS
- /usr/local/include/synctex_parser
- /usr/X11/include/synctex_parser
- /usr/include/synctex_parser
- HINTS
- ${SYNCTEX_PKG_INCLUDE_DIRS} # Generated by pkg-config
-)
-
-FIND_LIBRARY(SYNCTEX_LIBRARIES NAMES synctex ${SYNCTEX_PKG_LIBRARIES}
- PATHS
- /usr/local
- /usr/X11
- /usr
- HINTS
- ${SYNCTEX_PKG_LIBRARY_DIRS} # Generated by pkg-config
- PATH_SUFFIXES
- lib64
- lib
-)
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Synctex DEFAULT_MSG SYNCTEX_LIBRARIES SYNCTEX_INCLUDE_DIR)
-
-# show the SYNCTEX_INCLUDE_DIR and SYNCTEX_LIBRARIES variables only in the advanced view
-MARK_AS_ADVANCED(SYNCTEX_INCLUDE_DIR SYNCTEX_LIBRARIES )
-
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4ac3a21..8417ae0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -221,7 +221,6 @@ INCLUDE( TranslationMacros )
FIND_PACKAGE(ZLIB REQUIRED)
FIND_PACKAGE(Hunspell REQUIRED)
FIND_PACKAGE(Poppler REQUIRED)
-FIND_PACKAGE(Synctex)
# The only thing Poppler should need is the location of the include directories
# in order to access header files. The library loader should be able to find
@@ -242,10 +241,6 @@ IF ( POPPLER_NEEDS_FONTCONFIG )
LIST(APPEND TeXworks_INCLUDE_DIRS ${FONTCONFIG_INCLUDE_DIR})
ENDIF ()
-IF ( SYNCTEX_FOUND )
- LIST(APPEND TeXworks_INCLUDE_DIRS ${SYNCTEX_INCLUDE_DIR})
-ENDIF ()
-
SET(TeXworks_LIB_DIRS ${QT_LIBRARY_DIR})
set(TEXWORKS_ADDITIONAL_LIBS "" CACHE STRING "Additional libraries not found by CMake")
@@ -260,11 +255,6 @@ SET(TeXworks_LIBS
${TEXWORKS_ADDITIONAL_LIBS}
)
-IF ( SYNCTEX_FOUND )
- LIST(APPEND TeXworks_LIBS ${SYNCTEX_LIBRARIES})
-ENDIF ()
-
-
# Configure Optional Dependencies
# -------------------------------
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 81da447..9cfc6ee 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -21,14 +21,6 @@ IF ( WIN32 )
LIST(APPEND TEXWORKS_SRCS ${TEXWORKS_WIN_RCS})
ENDIF ( WIN32 )
-IF ( SYNCTEX_FOUND )
- FILE(GLOB SYNCTEX_SRCS "synctex_*.c")
- FILE(GLOB SYNCTEX_HDRS "synctex_*.h")
-
- LIST(REMOVE_ITEM TEXWORKS_SRCS ${SYNCTEX_SRCS})
- LIST(REMOVE_ITEM TEXWORKS_HDRS ${SYNCTEX_HDRS})
-ENDIF ( SYNCTEX_FOUND )
-
# These source files along with the `.moc` files generated from some headers
# form the TeXworks scripting API. We export them to variables in the
# `PARENT_SCOPE` (top level CMake file) so that they will be available to the
diff --git a/src/PDFDocument.h b/src/PDFDocument.h
index 24b42dc..f0c04e9 100644
--- a/src/PDFDocument.h
+++ b/src/PDFDocument.h
@@ -40,7 +40,7 @@
#else
#include "poppler-qt5.h"
#endif
-#include <synctex_parser.h>
+#include "synctex_parser.h"
#include "ui_PDFDocument.h"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/texworks.git
Reply to: