Commit f9c89a8c authored by Norbert Preining's avatar Norbert Preining

cleanup patches for new release

parent c2179bc4
Author: Andreas Beckmann <anbe@debian.org>
Description: link with -lQtXml
Bug-Debian: https://bugs.debian.org/789842
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -157,6 +157,7 @@ IF (NOT DESIRED_QT_VERSION OR DESIRED_QT
QtUiTools
QtScript
QtScriptTools
+ QtXml
)
IF ( UNIX AND NOT APPLE )
--- texworks_orig/CMakeLists.txt 2018-04-26 12:04:20.000000000 +0200
+++ texworks/CMakeLists.txt 2018-04-26 11:57:01.539254112 +0200
@@ -170,7 +170,7 @@
SET(TeXworks_ICON_DIR share/pixmaps CACHE PATH "Path in which icons are installed")
SET(TeXworks_MAN_DIR share/man/man1 CACHE PATH "Path in which manpages are installed")
SET(TeXworks_DESKTOP_DIR share/applications CACHE PATH "Path in which .desktop files are installed")
- SET(TeXworks_APPDATA_DIR share/appdata CACHE PATH "Path in which .appdata.xml files are installed")
+ SET(TeXworks_APPDATA_DIR share/metainfo CACHE PATH "Path in which .appdata.xml files are installed")
MARK_AS_ADVANCED(TeXworks_HELP_DIR)
MARK_AS_ADVANCED(TeXworks_DIC_DIR)
MARK_AS_ADVANCED(TeXworks_DOCS_DIR)
--- texworks_orig/texworks.appdata.xml 2018-04-25 21:16:38.286584330 +0200
+++ texworks/texworks.appdata.xml 2018-04-26 11:57:01.543254089 +0200
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2014 Stefan Löffler <st.loeffler@gmail.com> -->
-<application>
- <id type="desktop">texworks.desktop</id>
+<component type="desktop-application">
+ <id>org.tug.texworks</id>
<metadata_license>CC0</metadata_license>
<!--
<project_license>GPL-2.0+</project_license>
-->
+ <name>TeXWorks</name>
+ <summary>Environment for authoring TeX (LaTeX, ConTeXt, etc) documents</summary>
+
<description>
<p>
TeXworks is an environment for authoring TeX (LaTeX, ConTeXt, etc) documents, with a
@@ -28,6 +31,5 @@
<screenshot type="default" width="1280" height="800">http://www.tug.org/texworks/img/texworks-linux.png</screenshot>
</screenshots>
<url type="homepage">http://www.tug.org/texworks/</url>
- <updatecontact>texworks@tug.org</updatecontact>
-</application>
-
+ <update_contact>texworks@tug.org</update_contact>
+</component>
adjust search path for dictionaries to conform with the standard
according to https://dict-common.alioth.debian.org/dsdt-policy.html#installdir
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- texworks-debian.git.orig/CMakeLists.txt
+++ texworks-debian.git/CMakeLists.txt
@@ -165,7 +165,7 @@
IF (UNIX AND NOT APPLE)
SET(TeXworks_HELP_DIR share/doc/texworks-help CACHE PATH "Path where TeXworks looks for help files")
- SET(TeXworks_DIC_DIR /usr/share/myspell/dicts CACHE PATH "Path where TeXworks looks for spellchecking dictionaries")
+ SET(TeXworks_DIC_DIR /usr/share/hunspell CACHE PATH "Path where TeXworks looks for spellchecking dictionaries")
SET(TeXworks_DOCS_DIR share/doc/texworks CACHE PATH "Path in which documentation files are installed")
SET(TeXworks_ICON_DIR share/pixmaps CACHE PATH "Path in which icons are installed")
SET(TeXworks_MAN_DIR share/man/man1 CACHE PATH "Path in which manpages are installed")
--- CMakeLists.txt~ 2014-05-15 10:53:07.125865154 +0900
+++ CMakeLists.txt 2014-05-15 11:02:06.981435376 +0900
@@ -110,7 +110,7 @@
# Options controlling the creation of scripting language plugins.
OPTION(WITH_LUA "Build TeXworks Lua plugin?" ON)
-OPTION(WITH_PYTHON "Build TeXworks Python plugin?" OFF)
+OPTION(WITH_PYTHON "Build TeXworks Python plugin?" ON)
# On OS X we default to linking against the Python libraries provided by Apple
# even if other Pythons are available. This helps when building
@@ -121,7 +121,7 @@
ENDIF ()
IF (UNIX AND NOT APPLE)
- SET(TeXworks_HELP_DIR share/doc/texworks-help CACHE PATH "Path where TeXworks looks for help files")
+ SET(TeXworks_HELP_DIR share/texworks-help CACHE PATH "Path where TeXworks looks for help files")
SET(TeXworks_DIC_DIR /usr/share/myspell/dicts CACHE PATH "Path where TeXworks looks for spellchecking dictionaries")
SET(TeXworks_DOCS_DIR share/doc/texworks CACHE PATH "Path in which documentation files are installed")
SET(TeXworks_ICON_DIR share/pixmaps CACHE PATH "Path in which icons are installed")
--- src/TWUtils.cpp~ 2014-05-14 16:18:49.217408113 +0900
+++ src/TWUtils.cpp 2014-05-15 11:01:26.641465563 +0900
@@ -51,6 +51,8 @@
#endif
#ifndef TW_HELPPATH
#define TW_HELPPATH "/usr/local/share/texworks-help"
+#else
+#define TW_HELPPATH "/usr/share/texworks-help"
#endif
#endif
--- src/TWApp.cpp.org 2011-06-14 16:30:33.000000000 +0900
+++ src/TWApp.cpp 2011-06-14 16:33:43.000000000 +0900
@@ -844,6 +844,8 @@
<< Engine("pdfLaTeX", "pdflatex" EXE, QStringList("$synctexoption") << "$fullname", true)
<< Engine("XeTeX", "xetex" EXE, QStringList("$synctexoption") << "$fullname", true)
<< Engine("XeLaTeX", "xelatex" EXE, QStringList("$synctexoption") << "$fullname", true)
+ << Engine("LuaTeX", "luatex" EXE, QStringList("$synctexoption") << "$fullname", true)
+ << Engine("LuaLaTeX", "lualatex" EXE, QStringList("$synctexoption") << "$fullname", true)
<< Engine("ConTeXt (LuaTeX)", "context" EXE, QStringList("--synctex") << "$fullname", true)
<< Engine("ConTeXt (pdfTeX)", "texexec" EXE, QStringList("--synctex") << "$fullname", true)
<< Engine("ConTeXt (XeTeX)", "texexec" EXE, QStringList("--synctex") << "--xtx" << "$fullname", true)
--- texworks-0.5~svn930.orig/plugins-src/TWPythonPlugin/TWPythonPlugin.pro
+++ texworks-0.5~svn930/plugins-src/TWPythonPlugin/TWPythonPlugin.pro
@@ -50,8 +50,8 @@
unix:!macx { # on Unix-ish platforms we should rely on pkgconfig
# Python prior to 3.x doesn't register properly with pkg-config
- INCLUDEPATH += /usr/include/python2.6/
- LIBS += -lpython2.6
+ INCLUDEPATH += /usr/include/$(PYTHON)/
+ LIBS += -l$(PYTHON)
# uncomment these lines (and comment those above) to use Python 3
# CONFIG += link_pkgconfig
#synctex.patch
#patch-cm
#patch-luatex
#patch-py
#QtXml.patch
fix-dictionary-path
496cc1785f335f0eb4451005025fe11ae295d3e4.patch
trans_pro.patch
appdata_update.patch
#trans_pro.patch
--- texworks-0.5~svn1363.orig/CMake/Modules/FindSynctex.cmake
+++ texworks-0.5~svn1363/CMake/Modules/FindSynctex.cmake
@@ -0,0 +1,51 @@
+# - 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 )
+
--- texworks-0.5~svn1363.orig/CMakeLists.txt
+++ texworks-0.5~svn1363/CMakeLists.txt
@@ -221,6 +221,7 @@
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
@@ -241,6 +242,10 @@
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")
@@ -255,6 +260,11 @@
${TEXWORKS_ADDITIONAL_LIBS}
)
+IF ( SYNCTEX_FOUND )
+ LIST(APPEND TeXworks_LIBS ${SYNCTEX_LIBRARIES})
+ENDIF ()
+
+
# Configure Optional Dependencies
# -------------------------------
--- texworks-0.5~svn1363.orig/src/CMakeLists.txt
+++ texworks-0.5~svn1363/src/CMakeLists.txt
@@ -21,6 +21,14 @@
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
--- texworks-0.5~svn1363.orig/src/PDFDocument.h
+++ texworks-0.5~svn1363/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"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment