Attachment 930478 Details for Bug 1133565 – gtg-export-no-pdftk.patch

[patch] gtg-export-no-pdftk.patch

gtg-export-no-pdftk.patch (text/plain), 16.29 KB, created by Tim Waugh on 2014-08-25 13:18:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Waugh

Created: 2014-08-25 13:18:08 UTC

Size: 16.29 KB

patch

obsolete

>diff -durN gtg-0.3.1.orig/GTG/plugins/export/export.py gtg-0.3.1/GTG/plugins/export/export.py
>--- gtg-0.3.1.orig/GTG/plugins/export/export.py	2013-11-24 14:51:43.000000000 +0000
>+++ gtg-0.3.1/GTG/plugins/export/export.py	2014-08-25 13:54:04.696637261 +0100
>@@ -32,13 +32,6 @@
> from GTG.plugins.export.templates import Template, get_templates_paths
> 
> 
>-# Enforce external dependencies
>-for dependence in "pdflatex", "pdftk", "pdfjam":
>-    retval = subprocess.call(["which", dependence], stdout=subprocess.PIPE)
>-    if retval != 0:
>-        raise ImportError("Missing command %s" % dependence)
>-
>-
> def get_user_dir(key):
>     """
>     http://www.freedesktop.org/wiki/Software/xdg-user-dirs
>diff -durN gtg-0.3.1.orig/GTG/plugins/export/export_templates/description_pocketmod.py gtg-0.3.1/GTG/plugins/export/export_templates/description_pocketmod.py
>--- gtg-0.3.1.orig/GTG/plugins/export/export_templates/description_pocketmod.py	2013-11-24 14:51:43.000000000 +0000
>+++ gtg-0.3.1/GTG/plugins/export/export_templates/description_pocketmod.py	1970-01-01 01:00:00.000000000 +0100
>@@ -1,22 +0,0 @@
>-# -*- coding: utf-8 -*-
>-# Copyright (c) 2010 - Luca Invernizzi <invernizzi.l@gmail.com>
>-#
>-# This program is free software: you can redistribute it and/or modify it under
>-# the terms of the GNU General Public License as published by the Free Software
>-# Foundation, either version 3 of the License, or (at your option) any later
>-# version.
>-#
>-# This program is distributed in the hope that it will be useful, but WITHOUT
>-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
>-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
>-# details.
>-#
>-# You should have received a copy of the GNU General Public License along with
>-# this program.  If not, see <http://www.gnu.org/licenses/>.
>-
>-from GTG import _
>-title = _("Foldable booklet (PDF)")
>-description = _("""A template to create
>-<a href="http://www.pocketmod.com">PocketMod</a>, which is a small foldable
>-booklet. Packages <b>pdflatex</b>, <b>pdftk</b> and <b>pdfjam</b>
>-are required.""")
>diff -durN gtg-0.3.1.orig/GTG/plugins/export/export_templates/graphics_pocketmod.svg gtg-0.3.1/GTG/plugins/export/export_templates/graphics_pocketmod.svg
>--- gtg-0.3.1.orig/GTG/plugins/export/export_templates/graphics_pocketmod.svg	2013-11-24 14:51:43.000000000 +0000
>+++ gtg-0.3.1/GTG/plugins/export/export_templates/graphics_pocketmod.svg	1970-01-01 01:00:00.000000000 +0100
>@@ -1,182 +0,0 @@
>-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
>-
>-
>-<svg
>-   xmlns:dc="http://purl.org/dc/elements/1.1/"
>-   xmlns:cc="http://creativecommons.org/ns#"
>-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
>-   xmlns:svg="http://www.w3.org/2000/svg"
>-   xmlns="http://www.w3.org/2000/svg"
>-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
>-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
>-   width="744.09448819"
>-   height="1052.3622047"
>-   id="svg2"
>-   version="1.1"
>-   inkscape:version="0.47 r22583"
>-   sodipodi:docname="graphics_pocketmod.svg">
>-  <defs
>-     id="defs4">
>-    <inkscape:perspective
>-       sodipodi:type="inkscape:persp3d"
>-       inkscape:vp_x="0 : 526.18109 : 1"
>-       inkscape:vp_y="0 : 1000 : 0"
>-       inkscape:vp_z="744.09448 : 526.18109 : 1"
>-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
>-       id="perspective10" />
>-    <inkscape:perspective
>-       id="perspective3755"
>-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
>-       inkscape:vp_z="1 : 0.5 : 1"
>-       inkscape:vp_y="0 : 1000 : 0"
>-       inkscape:vp_x="0 : 0.5 : 1"
>-       sodipodi:type="inkscape:persp3d" />
>-  </defs>
>-  <sodipodi:namedview
>-     id="base"
>-     pagecolor="#ffffff"
>-     bordercolor="#666666"
>-     borderopacity="1.0"
>-     inkscape:pageopacity="0.0"
>-     inkscape:pageshadow="2"
>-     inkscape:zoom="0.98994949"
>-     inkscape:cx="237.45275"
>-     inkscape:cy="433.36651"
>-     inkscape:document-units="px"
>-     inkscape:current-layer="layer1"
>-     showgrid="false"
>-     inkscape:window-width="1280"
>-     inkscape:window-height="774"
>-     inkscape:window-x="0"
>-     inkscape:window-y="26"
>-     inkscape:window-maximized="1" />
>-  <metadata
>-     id="metadata7">
>-    <rdf:RDF>
>-      <cc:Work
>-         rdf:about="">
>-        <dc:format>image/svg+xml</dc:format>
>-        <dc:type
>-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
>-        <dc:title></dc:title>
>-      </cc:Work>
>-    </rdf:RDF>
>-  </metadata>
>-  <g
>-     inkscape:label="Layer 1"
>-     inkscape:groupmode="layer"
>-     id="layer1">
>-    <rect
>-       style="fill:#e6e6e6;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
>-       id="rect2816"
>-       width="317.14285"
>-       height="320"
>-       x="168.57143"
>-       y="338.07645"
>-       rx="0"
>-       ry="0"
>-       inkscape:export-filename="/home/luca/Projects/gtg/plugins_fixed/GTG/plugins/export/export_templates/thumbnail_pocketmod.png"
>-       inkscape:export-xdpi="90"
>-       inkscape:export-ydpi="90" />
>-    <rect
>-       inkscape:export-ydpi="90"
>-       inkscape:export-xdpi="90"
>-       inkscape:export-filename="/home/luca/Projects/gtg/plugins_fixed/GTG/plugins/export/export_templates/thumbnail_pocketmod.png"
>-       transform="matrix(0.99625201,0.08649817,0,1,0,0)"
>-       inkscape:transform-center-y="-148.09393"
>-       inkscape:transform-center-x="-154.40557"
>-       style="fill:#e6e6e6;fill-opacity:1;stroke:#000000;stroke-width:3.00563788;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
>-       id="rect2824"
>-       width="307.06821"
>-       height="320"
>-       x="169.20561"
>-       y="323.56613"
>-       rx="0"
>-       ry="0" />
>-    <rect
>-       ry="0"
>-       rx="0"
>-       y="314.10364"
>-       x="170.29597"
>-       height="320"
>-       width="299.86255"
>-       id="rect2826"
>-       style="fill:#e6e6e6;fill-opacity:1;stroke:#000000;stroke-width:3.01530671;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
>-       inkscape:transform-center-x="-149.81687"
>-       inkscape:transform-center-y="-140.01528"
>-       transform="matrix(0.98987326,0.141954,0,1,0,0)"
>-       inkscape:export-filename="/home/luca/Projects/gtg/plugins_fixed/GTG/plugins/export/export_templates/thumbnail_pocketmod.png"
>-       inkscape:export-xdpi="90"
>-       inkscape:export-ydpi="90" />
>-    <rect
>-       ry="0"
>-       rx="0"
>-       y="304.97009"
>-       x="171.84337"
>-       height="320"
>-       width="291.25995"
>-       id="rect3603"
>-       style="fill:#e6e6e6;fill-opacity:1;stroke:#000000;stroke-width:3.02897477;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
>-       inkscape:transform-center-x="-144.20849"
>-       inkscape:transform-center-y="-132.94945"
>-       transform="matrix(0.98095972,0.1942113,0,1,0,0)"
>-       inkscape:export-filename="/home/luca/Projects/gtg/plugins_fixed/GTG/plugins/export/export_templates/thumbnail_pocketmod.png"
>-       inkscape:export-xdpi="90"
>-       inkscape:export-ydpi="90" />
>-    <path
>-       style="fill:#e6e6e6;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
>-       d="m 187.61319,420.75502 c 9.92708,1.80191 19.85417,3.60381 29.78125,5.40572 0,-11.40514 0,-22.81027 0,-34.21541 -9.92708,-1.80191 -19.85417,-3.60381 -29.78125,-5.40572 0,11.40513 0,22.81027 0,34.21541 z"
>-       id="rect3605"
>-       inkscape:export-filename="/home/luca/Projects/gtg/plugins_fixed/GTG/plugins/export/export_templates/thumbnail_pocketmod.png"
>-       inkscape:export-xdpi="90"
>-       inkscape:export-ydpi="90" />
>-    <path
>-       id="path3735"
>-       d="m 187.61319,533.89211 c 9.92708,1.80191 19.85417,3.60381 29.78125,5.40572 0,-11.40514 0,-22.81027 0,-34.21541 -9.92708,-1.80191 -19.85417,-3.60381 -29.78125,-5.40572 0,11.40513 0,22.81027 0,34.21541 z"
>-       style="fill:#e6e6e6;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
>-       inkscape:export-filename="/home/luca/Projects/gtg/plugins_fixed/GTG/plugins/export/export_templates/thumbnail_pocketmod.png"
>-       inkscape:export-xdpi="90"
>-       inkscape:export-ydpi="90" />
>-    <path
>-       style="fill:#e6e6e6;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
>-       id="path3741"
>-       d="m 190.39377,506.65005 c 0.75899,0.68789 1.49311,1.40206 2.18659,2.15586 1.04564,1.16383 1.98061,2.42061 2.87537,3.70224 0.88891,1.23011 1.5917,2.57322 2.21898,3.95083 0.51358,1.13644 0.95191,2.30157 1.29221,3.50096 0.27587,0.95401 0.43736,1.93037 0.526,2.91768 0.0626,0.77245 0.0662,1.54771 0.0674,2.32215 0.0259,0.73252 -0.0448,1.45977 -0.14168,2.18453 -0.0791,0.59156 -0.17445,1.18061 -0.28351,1.76733 -0.0818,0.61025 0.11679,0.33683 -0.68728,0.25488 0.59483,-0.53029 1.00581,-1.22734 1.42829,-1.8939 1.52576,-2.47344 3.29684,-4.78641 5.01499,-7.12713 3.3565,-4.57363 6.84295,-9.04957 10.46073,-13.41901 3.17316,-3.86201 6.63032,-7.46044 10.39753,-10.74204 2.52798,-2.14505 5.25617,-4.02957 7.99308,-5.89317 0,0 0.65985,0.35822 0.65985,0.35822 l 0,0 c -2.7495,1.83372 -5.48864,3.69118 -8.03032,5.8102 -3.78772,3.24157 -7.26211,6.80867 -10.44807,10.6464 -3.62664,4.34088 -7.11298,8.79845 -10.39492,13.40687 -1.64993,2.33738 -3.31346,4.67201 -4.7431,7.15369 -0.44159,0.72681 -0.86585,1.47822 -1.45456,2.09912 -1.2338,0.35104 -1.28633,0.43487 -1.17098,-0.61828 0.11695,-0.57384 0.22523,-1.1495 0.30189,-1.73033 0.0955,-0.69623 0.18508,-1.39313 0.15541,-2.09802 0.001,-0.75735 -0.001,-1.51531 -0.048,-2.27151 -0.0715,-0.94967 -0.21479,-1.888 -0.47641,-2.80595 -0.32217,-1.17194 -0.73332,-2.31334 -1.23241,-3.42243 -0.60735,-1.34522 -1.28611,-2.65887 -2.14994,-3.86059 -0.87979,-1.25757 -1.80104,-2.48969 -2.84301,-3.6191 -0.68832,-0.72803 -1.4075,-1.43076 -2.19298,-2.05461 0,0 0.71891,-0.67489 0.71891,-0.67489 z"
>-       inkscape:export-filename="/home/luca/Projects/gtg/plugins_fixed/GTG/plugins/export/export_templates/thumbnail_pocketmod.png"
>-       inkscape:export-xdpi="90"
>-       inkscape:export-ydpi="90" />
>-    <text
>-       xml:space="preserve"
>-       style="font-size:34.10958862px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Scriptina;-inkscape-font-specification:Scriptina"
>-       x="162.41887"
>-       y="518.4834"
>-       id="text3743"
>-       transform="matrix(1.3944821,0.28478379,0,0.7171121,0,0)"
>-       inkscape:transform-center-x="-102.84118"
>-       inkscape:transform-center-y="30.467712"
>-       inkscape:export-filename="/home/luca/Projects/gtg/plugins_fixed/GTG/plugins/export/export_templates/thumbnail_pocketmod.png"
>-       inkscape:export-xdpi="90"
>-       inkscape:export-ydpi="90"><tspan
>-         sodipodi:role="line"
>-         id="tspan3745"
>-         x="162.41887"
>-         y="518.4834"
>-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Serif;-inkscape-font-specification:Serif">get milk</tspan></text>
>-    <text
>-       xml:space="preserve"
>-       style="font-size:34.10958862px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Scriptina;-inkscape-font-specification:Scriptina"
>-       x="165.46724"
>-       y="674.99536"
>-       id="text3743-0"
>-       transform="matrix(1.3944821,0.28478379,0,0.7171121,0,0)"
>-       inkscape:transform-center-x="-102.84118"
>-       inkscape:transform-center-y="30.467712"
>-       inkscape:export-filename="/home/luca/Projects/gtg/plugins_fixed/GTG/plugins/export/export_templates/thumbnail_pocketmod.png"
>-       inkscape:export-xdpi="90"
>-       inkscape:export-ydpi="90"><tspan
>-         sodipodi:role="line"
>-         id="tspan3745-2"
>-         x="165.46724"
>-         y="674.99536"
>-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Serif;-inkscape-font-specification:Serif">buy cow</tspan></text>
>-  </g>
>-</svg>
>diff -durN gtg-0.3.1.orig/GTG/plugins/export/export_templates/script_pocketmod gtg-0.3.1/GTG/plugins/export/export_templates/script_pocketmod
>--- gtg-0.3.1.orig/GTG/plugins/export/export_templates/script_pocketmod	2013-11-24 14:51:43.000000000 +0000
>+++ gtg-0.3.1/GTG/plugins/export/export_templates/script_pocketmod	1970-01-01 01:00:00.000000000 +0100
>@@ -1,35 +0,0 @@
>-#!/bin/sh
>-#
>-# Copyright (c) 2009 - Jan Girlich <vollkorn@freenet.de>, Luca Invernizzi <invernizzi.l@gmail.com>
>-#
>-# This program is free software: you can redistribute it and/or modify it under
>-# the terms of the GNU General Public License as published by the Free Software
>-# Foundation, either version 3 of the License, or (at your option) any later
>-# version.
>-#
>-# This program is distributed in the hope that it will be useful, but WITHOUT
>-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
>-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
>-# details.
>-#
>-# You should have received a copy of the GNU General Public License along with
>-# this program.  If not, see <http://www.gnu.org/licenses/>.
>-#
>-# Script to create a pocketmod form a latex source file
>-#
>-# Note that the GTG export plugin passes the script the path of the source file
>-# and expects to be given the path of the generated file in the standard output
>-
>-TMPFOLDER=`mktemp -d /tmp/pocketmod.XXXXXXXXXX`
>-OUTFILE=`mktemp /tmp/pockemod.XXXXXXXXXXXXX`.pdf
>-SOURCEFILE=$1
>-pdflatex -interaction nonstopmode -output-directory $TMPFOLDER -jobname temp $SOURCEFILE  1>&2
>-PDFFILE=$TMPFOLDER/temp.pdf
>-pdftk $PDFFILE cat 6 7 8 1 output $TMPFOLDER/seite6781.pdf   1>&2
>-pdftk $PDFFILE cat 5 4 3 2 output $TMPFOLDER/seite5432.pdf   1>&2
>-pdf90 $TMPFOLDER/seite5432.pdf --outfile $TMPFOLDER/seite5432-r.pdf      1>&2
>-pdf90 $TMPFOLDER/seite5432-r.pdf --outfile $TMPFOLDER/seite5432-r2.pdf      1>&2
>-pdftk $TMPFOLDER/seite6781.pdf $TMPFOLDER/seite5432-r2.pdf cat output $TMPFOLDER/gesamt.pdf      1>&2
>-pdfnup $TMPFOLDER/gesamt.pdf --nup 4x2 --landscape --outfile $OUTFILE      1>&2
>-rm -rf $TMPFOLDER      1>&2
>-echo -n $OUTFILE
>diff -durN gtg-0.3.1.orig/GTG/plugins/export/export_templates/template_pocketmod.tex gtg-0.3.1/GTG/plugins/export/export_templates/template_pocketmod.tex
>--- gtg-0.3.1.orig/GTG/plugins/export/export_templates/template_pocketmod.tex	2013-11-24 14:51:43.000000000 +0000
>+++ gtg-0.3.1/GTG/plugins/export/export_templates/template_pocketmod.tex	1970-01-01 01:00:00.000000000 +0100
>@@ -1,57 +0,0 @@
>-\documentclass[a6paper]{article}
>-\usepackage[T1]{fontenc}
>-\usepackage[utf8]{inputenc}
>-\usepackage{lmodern}
>-\usepackage[ngerman]{babel}
>-\usepackage{wasysym}
>-\usepackage[margin=0.2cm]{geometry}
>-\usepackage{mdwlist}
>-\begin{document}
>-
>-\pagestyle{empty}
>-\thispagestyle{empty}
>-
>-\begin{itemize*}
>-	#for $task in $tasks:
>-		$task_template($task)
>-	#end for
>-\end{itemize*}
>-
>-#def task_template($task)
>-\item[\Square]
>-	#if $task.has_title
>-	\textbf{$task.title.replace('_', '\_')}
>-		#if $task.has_tags
>-			#for $tag in $task.tags:
>-				\textit{$tag.replace('_', '\_')}
>-			#end for
>-		#end if
>-	#end if
>-
>-	#if $task.has_due_date
>-		\textit{Due: $task.due_date}\\ 
>-	#end if
>-
>-	#if $task.has_subtasks
>-	\begin{itemize*}
>-		#for $subtask in $task.subtasks:
>-			$task_template($subtask)
>-		#end for
>-	\end{itemize*}
>-	#end if
>-#end def
>-\newpage
>-.
>-\newpage
>-.
>-\newpage
>-.
>-\newpage
>-.
>-\newpage
>-.
>-\newpage
>-.
>-\newpage
>-.
>-\end{document}
>Binary files gtg-0.3.1.orig/GTG/plugins/export/export_templates/thumbnail_pocketmod.png and gtg-0.3.1/GTG/plugins/export/export_templates/thumbnail_pocketmod.png differ
>diff -durN gtg-0.3.1.orig/GTG/plugins/export.gtg-plugin gtg-0.3.1/GTG/plugins/export.gtg-plugin
>--- gtg-0.3.1.orig/GTG/plugins/export.gtg-plugin	2013-11-24 14:51:43.000000000 +0000
>+++ gtg-0.3.1/GTG/plugins/export.gtg-plugin	2014-08-25 13:54:41.431824736 +0100
>@@ -8,4 +8,4 @@
> authors=Luca Invernizzi <invernizzi.l@gmail.com>, Izidor MatuÅ¡ov <izidor.matusov@gmail.com>
> version=0.2
> enabled=False
>-dependencies=Cheetah,pdflatex,pdftk,pdfjam
>+dependencies=Cheetah

Actions: View | Diff

Attachments on bug 1133565: 930478