[texworks] 07/73: Imported Debian patch 0.3~svn569-3
This is an automated email from the git hooks/post-receive script.
preining pushed a commit to branch master
in repository texworks.
commit e34736527407a799a3aad0639fb8aee34b6c6958
Author: Atsuhito KOHDA <kohda@debian.org>
Date: Mon Feb 22 12:52:39 2010 +0900
Imported Debian patch 0.3~svn569-3
---
debian/changelog | 10 ++++++++++
debian/patch-luatex | 11 +++++++++++
debian/patch-plugin | 35 +++++++++++++++++++++++++++++++++--
debian/rules | 2 ++
plugins-src/TWLuaPlugin/Makefile | 2 +-
plugins-src/TWPythonPlugin/Makefile | 2 +-
6 files changed, 58 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index edd3da7..9319100 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+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
diff --git a/debian/patch-luatex b/debian/patch-luatex
new file mode 100644
index 0000000..2505ddb
--- /dev/null
+++ b/debian/patch-luatex
@@ -0,0 +1,11 @@
+--- 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)
diff --git a/debian/patch-plugin b/debian/patch-plugin
index 75835c0..4955255 100644
--- a/debian/patch-plugin
+++ b/debian/patch-plugin
@@ -1,11 +1,42 @@
--- 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_*
diff --git a/debian/rules b/debian/rules
index 481f22a..cbba457 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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
diff --git a/plugins-src/TWLuaPlugin/Makefile b/plugins-src/TWLuaPlugin/Makefile
index dcf45fe..57457c1 100644
--- a/plugins-src/TWLuaPlugin/Makefile
+++ b/plugins-src/TWLuaPlugin/Makefile
@@ -1,6 +1,6 @@
#############################################################################
# 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
diff --git a/plugins-src/TWPythonPlugin/Makefile b/plugins-src/TWPythonPlugin/Makefile
index 1f70a2a..710d8d9 100644
--- a/plugins-src/TWPythonPlugin/Makefile
+++ b/plugins-src/TWPythonPlugin/Makefile
@@ -1,6 +1,6 @@
#############################################################################
# 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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/texworks.git
Reply to: