Commit e3473652 authored by Atsuhito Kohda's avatar Atsuhito Kohda

Imported Debian patch 0.3~svn569-3

parent e0f68555
texworks (0.3~svn569-3) experimental; urgency=low
* Fixed TWPythonPlugin compilation problems on AMD64 by consulting
a package of Stefan Löffler. (Closes: #570841)
* Modified TW_HELPPATH as a package of Stefan Löffler. I expect one can
use a texworks-help-en package by Stefan Löffler now.
* Added LuaTeX in a list of Typeset engines for experiment.
-- Atsuhito KOHDA <kohda@debian.org> Mon, 22 Feb 2010 12:52:39 +0900
texworks (0.3~svn569-2) experimental; urgency=low
* Added Lua and Python scripting plugins. These are called
......
--- texworks-0.3/src/TWApp.cpp.orig 2010-02-22 13:19:33.000000000 +0900
+++ texworks-0.3/src/TWApp.cpp 2010-02-22 13:20:27.000000000 +0900
@@ -587,6 +587,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", "texmfstart" EXE, QStringList("texexec") << "$fullname", true)
<< Engine("XeConTeXt", "texmfstart" EXE, QStringList("texexec") << "--xtx" << "$fullname", true)
<< Engine("BibTeX", "bibtex" EXE, QStringList("$basename"), false)
--- texworks-0.3~svn569.orig/TeXworks.pro
+++ texworks-0.3~svn569/TeXworks.pro
@@ -88,7 +88,7 @@
@@ -87,8 +87,8 @@
# Enclose the path in \\\" (which later gets expanded to \", which in turn
# gets expanded to " in the c++ code)
QMAKE_CXXFLAGS += -DTW_HELPPATH=\\\"/usr/local/share/texworks-help\\\"
- QMAKE_CXXFLAGS += -DTW_HELPPATH=\\\"/usr/local/share/texworks-help\\\"
- QMAKE_CXXFLAGS += -DTW_PLUGINPATH=\\\"/usr/local/lib/texworks\\\"
+ QMAKE_CXXFLAGS += -DTW_HELPPATH=\\\"/usr/share/doc/texworks-help\\\"
+ QMAKE_CXXFLAGS += -DTW_PLUGINPATH=\\\"/usr/lib/texworks\\\"
QMAKE_CXXFLAGS += -DTW_DICPATH=\\\"/usr/share/myspell/dicts\\\"
}
--- texworks-0.3~svn569/plugins-src/TWPythonPlugin/TWPythonPlugin.cpp 2010-02-16 12:38:52.000000000 +0900
+++ texworks-scripting-python-0.3.0~svn558~karmic1/plugins-src/TWPythonPlugin/TWPythonPlugin.cpp 2010-01-31 18:00:06.000000000 +0900
@@ -27,17 +27,6 @@
#include <QStringList>
#include <QTextStream>
-/* macros that may not be available in older python headers */
-#ifndef Py_RETURN_NONE
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-#endif
-#ifndef Py_RETURN_TRUE
-#define Py_RETURN_TRUE return Py_INCREF(Py_True), Py_True
-#endif
-#ifndef Py_RETURN_FALSE
-#define Py_RETURN_FALSE return Py_INCREF(Py_False), Py_False
-#endif
-
/** \brief Structure to hold data for the pyQObject wrapper */
typedef struct {
PyObject_HEAD
@@ -431,7 +420,7 @@
QVariantList list;
QVariantMap map;
PyObject * key, * value;
- int i = 0;
+ Py_ssize_t i = 0;
QString str;
// in Python 3.x, the PyInt_* were removed in favor of PyLong_*
......@@ -21,6 +21,7 @@ configure-stamp:
uudecode debian/document-print.png.enc
mv document-print.png res/tango/
patch -p1 < ./debian/patch-plugin
patch -p1 < ./debian/patch-luatex
qmake-qt4
touch configure-stamp
......@@ -63,6 +64,7 @@ clean:
if [ -d $(PLIPYT)/obj ]; then rmdir $(PLIPYT)/obj; fi
if [ -d $(PLIPYT)/rcc ]; then rmdir $(PLIPYT)/rcc; fi
if [ -d $(PLIPYT)/ui ]; then rmdir $(PLIPYT)/ui; fi
patch -NRp1 < ./debian/patch-luatex || true
patch -NRp1 < ./debian/patch-print || true
patch -NRp1 < ./debian/patch-plugin || true
......
#############################################################################
# Makefile for building: libTWLuaPlugin.so
# Generated by qmake (2.01a) (Qt 4.5.3) on: ? 2? 18 12:37:48 2010
# Generated by qmake (2.01a) (Qt 4.5.3) on: ? 2? 22 13:25:43 2010
# Project: TWLuaPlugin.pro
# Template: lib
# Command: /usr/bin/qmake-qt4 -unix -after target.path\ =\ /usr/lib/texworks -o Makefile TWLuaPlugin.pro
......
#############################################################################
# Makefile for building: libTWPythonPlugin.so
# Generated by qmake (2.01a) (Qt 4.5.3) on: ? 2? 18 12:37:53 2010
# Generated by qmake (2.01a) (Qt 4.5.3) on: ? 2? 22 13:25:48 2010
# Project: TWPythonPlugin.pro
# Template: lib
# Command: /usr/bin/qmake-qt4 -unix -after target.path\ =\ /usr/lib/texworks -o Makefile TWPythonPlugin.pro
......
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