SOURCES: passepartout-cvs.patch (NEW) - updated from CVS (0.7-PRE ...

qboosh qboosh at pld-linux.org
Sun Dec 24 03:05:42 CET 2006


Author: qboosh                       Date: Sun Dec 24 02:05:42 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated from CVS (0.7-PRE version, unchanged since 200503)

---- Files affected:
SOURCES:
   passepartout-cvs.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/passepartout-cvs.patch
diff -u /dev/null SOURCES/passepartout-cvs.patch:1.1
--- /dev/null	Sun Dec 24 03:05:42 2006
+++ SOURCES/passepartout-cvs.patch	Sun Dec 24 03:05:37 2006
@@ -0,0 +1,10388 @@
+diff -Nur -x CVS passepartout-0.6/configure.ac passepartout/configure.ac
+--- passepartout-0.6/configure.ac	2004-10-30 17:33:39.000000000 +0200
++++ passepartout/configure.ac	2005-04-18 16:35:46.000000000 +0200
+@@ -1,16 +1,16 @@
+ # Process this file with autoconf to produce a configure script.
+-AC_INIT(Passepartout, 0.6, [passepartout at stacken.kth.se])
++AC_INIT(Passepartout, 0.7-PRE, [passepartout at stacken.kth.se])
+ AC_CONFIG_SRCDIR([src/xml2ps/blockcontainer.cc])
+ 
+ AM_INIT_AUTOMAKE([foreign dist-bzip2])
+ # For automake < 1.6 you need to use this line instead:
+-#AM_INIT_AUTOMAKE(Passepartout, 0.6)
++#AM_INIT_AUTOMAKE(Passepartout, 0.7-PRE)
+ 
+ AM_CONFIG_HEADER(src/defines.h)
+ # AC_CONFIG_HEADER(src/defines.h)
+ 
+ # Define global compiler flags:
+-MY_CXXFLAGS="-Wall -Wold-style-casts"
++MY_CXXFLAGS="-Wall"
+ CXXFLAGS="$CXXFLAGS $MY_CXXFLAGS"
+ 
+ # Checks for programs.
+@@ -27,44 +27,45 @@
+ fi])
+ AC_ARG_VAR([APPLY_RPATH], [="true" : specify -rpath options to the linker])
+ 
+-LIBS="$LIBS -L/mpkg/gettext/0.12.1/lib"
+-
+ # check for libxml++ 
+ AC_SUBST([XMLPP_LIBS])
+ AC_SUBST([XMLPP_CFLAGS])
+-PKG_CHECK_MODULES([XMLPP], libxml++-1.0)
++PKG_CHECK_MODULES([XMLPP], libxml++-1.0 >= 1.0)
+ AC_APPLY_RPATH([XMLPP_LIBS])
+ 
+-AC_SUBST([XML2_LIBS])
+-AC_SUBST([XML2_CFLAGS])
+-PKG_CHECK_MODULES(XML2, libxml-2.0)
+-AC_APPLY_RPATH([XML2_LIBS])
+-
+ AC_SUBST([GTKMM_LIBS])
+ AC_SUBST([GTKMM_CFLAGS])
+-PKG_CHECK_MODULES(GTKMM, gtkmm-2.0)
++PKG_CHECK_MODULES(GTKMM, gtkmm-2.4)
+ AC_APPLY_RPATH([GTKMM_LIBS])
+ 
+ AC_SUBST([GNOMECANVAS_LIBS])
+ AC_SUBST([GNOMECANVAS_CFLAGS])
+-PKG_CHECK_MODULES(GNOMECANVAS, libgnomecanvasmm-2.0)
+-AC_APPLY_RPATH([XMLPP_LIBS])
++PKG_CHECK_MODULES(GNOMECANVAS, libgnomecanvasmm-2.6)
++AC_APPLY_RPATH([GNOMECANVAS_LIBS])
+ 
+ AC_SUBST([GTHREAD_LIBS])
+ AC_SUBST([GTHREAD_CFLAGS])
+ PKG_CHECK_MODULES([GTHREAD], [gthread-2.0])
+ AC_APPLY_RPATH([GTHREAD_LIBS])
+ 
+-AC_SUBST([SIGC_LIBS])
+-AC_SUBST([SIGC_CFLAGS])
+-PKG_CHECK_MODULES([SIGC], [sigc++-1.2])
+-AC_APPLY_RPATH([SIGC_LIBS])
+-
+ AC_SUBST([FREETYPE_LIBS])
+ AC_SUBST([FREETYPE_CFLAGS])
+ PKG_CHECK_MODULES([FREETYPE], [freetype2])
+ AC_APPLY_RPATH([FREETYPE_LIBS])
+ 
++# gnome is optional
++AC_SUBST([GNOME_LIBS])
++AC_SUBST([GNOME_CFLAGS])
++AC_SUBST([GNOMEVFS_LIBS])
++AC_SUBST([GNOMEVFS_CFLAGS])
++AC_ARG_WITH([gnome], AC_HELP_STRING([--with-gnome],
++                                    [Gnome support (default is NO)]),
++            [PKG_CHECK_MODULES(GNOME, libgnome-2.0)]
++            [PKG_CHECK_MODULES(GNOMEVFS, gnome-vfs-module-2.0)]
++            AC_DEFINE([HAVE_GNOME], [1], [Gnome is present]))
++AC_APPLY_RPATH([GNOME_LIBS])
++AC_APPLY_RPATH([GNOMEVFS_LIBS])
++
+ # check for fam
+ AC_CHECK_LIB([fam], [FAMOpen])
+ 
+diff -Nur -x CVS passepartout-0.6/DEVNOTES passepartout/DEVNOTES
+--- passepartout-0.6/DEVNOTES	1970-01-01 01:00:00.000000000 +0100
++++ passepartout/DEVNOTES	2004-10-30 14:29:15.000000000 +0200
+@@ -0,0 +1,45 @@
++Notes for Passepartout developers
++---------------------------------
++
++*** automake/autoconf ***
++
++Needs automake >= 1.6 or AM_INIT_AUTOMAKE won't work.
++Perhaps we should use version 1.5 instead. (Gentoo installs 1.4, 1.5
++and 1.6 but sets 1.5 as default.)
++
++As far as autoconf is concerned, both version 2.13 and 2.5x seem to
++work fine.
++
++The process:
++
++1. aclocal 	# install macros that will be needed
++2. automake -a	# "-a" means "add missing files"
++3. autoconf
++
++You should now have a ./configure script.
++
++
++Checklist for making a release
++------------------------------
++
++* Update Copyright notices in all source files, in the about box and
++in COPYING.
++
++* Update NEWS.
++
++* Update User's Guide, and man pages.
++
++* Update README, INSTALL, AUTHORS, BUGS
++
++* Update version number in configure.ac and doc/users_guide.xml
++
++* Check out a fresh copy (or make sure you have no uncommitted
++changes), then do "make dist".
++
++* Make a cvs tag PASSEPARTOUT_X_Y.
++
++* Check the dist files for omissions. Check that they build, install and run.
++
++* Update web page and send a mail to passepartout-announce at stacken.kth.se.
++
++* Make a freshmeat release and a GnomeFiles release.
+diff -Nur -x CVS passepartout-0.6/devutils/copyright.py passepartout/devutils/copyright.py
+--- passepartout-0.6/devutils/copyright.py	1970-01-01 01:00:00.000000000 +0100
++++ passepartout/devutils/copyright.py	2002-11-05 02:11:53.000000000 +0100
+@@ -0,0 +1,88 @@
++#! /usr/bin/env python
++
++# copyright.py
++# Insert copyright information into source code.
++
++# Looks at every C++ file (.cc, .h, .hh) in the current directory and
++# recursively in the subdirectories to see if it has two comments
++# "///".  If it does, the text between the comments is substituted for
++# the text in the file specified on the command line. Does not follow
++# symlinks.  Todo: make it insert a copyright message into this file
++# as well :-)
++
++import sys
++import re
++import os
++import stat
++
++add=0 # add tags to beginning of file instead of substituting
++
++if len(sys.argv)!=2:
++    sys.stderr.write("Usage: copyright.py <message file>\n")
++    sys.stderr.write("   or: copyright.py -a\n   to add tags\n")
++    sys.exit(2)
++
++def parse_message(message):
++    message=re.sub("\n$", "", message) # remove newline on last line
++    message=re.sub("(?m)^", "// ", message) # commentify
++    message="///\n"+message+"\n///\n" # add begin/end tag
++    return message
++
++if sys.argv[1]=="-a": # "add" flag
++    add=1
++else:
++    try:
++        message_file=open(sys.argv[1])
++        message=message_file.read()
++        parsed_message=parse_message(message)
++    except IOError:
++        sys.stderr.write("Couldn't read "+sys.argv[1]+"\n")
++        sys.exit(2)
++
++
++def substitute(filename, add):
++    file=open(filename, "r+")
++    sys.stderr.write(filename)
++    file_content=file.read() # one big string
++    # Check for two lines beginning with "///" and replace everything
++    # in between:
++    if add:
++        file_content="///\n///\n"+file_content
++        file.seek(0)
++        file.write(file_content)
++    else:
++        (file_content, num)=re.subn("(?ms)^\/\/\/.*^\/\/\/[^\n]*\n",
++                                    parsed_message,
++                                    file_content)
++        if num==1: # check if a substitution was made
++            file.seek(0)
++            file.write(file_content)
++        else:
++            sys.stderr.write(": nothing changed")
++    sys.stderr.write("\n")
++    file.close()
++
++filetypes=(".cc", ".h", ".hh") # file types to modify
++
++def correct_filetype(filename):
++    for filetype in filetypes:
++        if filename[-len(filetype):]==filetype:
++            return 1
++    return 0
++
++from os.path import *
++def recursive_substitute(path):
++    files=os.listdir(path)
++    for file in files:
++        file=path+"/"+file
++        # Don't follow links!
++        if isdir(file) and not islink(file):
++            recursive_substitute(file)
++        elif isfile(file) and (not islink(file)) and correct_filetype(file):
++            # It's a file,
++            substitute(file, add)
++        else:
++            pass
++
++recursive_substitute(".")
++
+diff -Nur -x CVS passepartout-0.6/devutils/copyright.txt passepartout/devutils/copyright.txt
+--- passepartout-0.6/devutils/copyright.txt	1970-01-01 01:00:00.000000000 +0100
++++ passepartout/devutils/copyright.txt	2003-02-26 01:29:10.000000000 +0100
+@@ -0,0 +1 @@
++Copyright (C) 2002, 2003, Fredrik Arnerup & Rasmus Kaj, See COPYING
+diff -Nur -x CVS passepartout-0.6/doc/faq.xml passepartout/doc/faq.xml
+--- passepartout-0.6/doc/faq.xml	2004-09-19 17:58:56.000000000 +0200
++++ passepartout/doc/faq.xml	2004-12-02 22:41:52.000000000 +0100
+@@ -4,7 +4,7 @@
+ <article>
+   <articleinfo>
+     <title>Passepartout Frequently Asked Questions</title>
+-    <releaseinfo>$Id$</releaseinfo>
++    <releaseinfo>$Id$</releaseinfo>
+   </articleinfo>
+   
+   <section>
+@@ -63,7 +63,8 @@
+ 	API. Versions prior to 0.4 will only be guaranteed to build
+ 	with <emphasis>exactly</emphasis> the version or versions of
+ 	libxml++ that are specified in the
+-	<filename>INSTALL</filename> file.
++	<filename>INSTALL</filename> file. No version have yet been
++	built against the libxml++ 2.6 branch.
+       </para>
+     </section>
+ 
+@@ -145,8 +146,7 @@
+     <section>
+       <title>Is there no TrueType support?</title>
+       <para>
+-	No. PostScript Type 1 only, but we will have at least partial
+-	TrueType support in release 0.6.
++	Yes there is, as of version 0.6.
+       </para>
+     </section>
+ 
+diff -Nur -x CVS passepartout-0.6/doc/README passepartout/doc/README
+--- passepartout-0.6/doc/README	2002-11-22 02:30:20.000000000 +0100
++++ passepartout/doc/README	2004-12-02 22:45:12.000000000 +0100
+@@ -2,18 +2,15 @@
+ The documentation is also available online: 
+ http://www.stacken.kth.se/project/pptout/doc.shtml
+ 
+-Documentation in DocBook and HTML formats:
++Documentation in DocBook, HTML and .txt formats:
+ 
+-	users_guide.xml
+-	users_guide.html
+-	faq.xml
+-	faq.html
+-	nsfaq.xml	
+-	nsfaq.html
++	users_guide.*
++	faq.*
++	nsfaq.*
+ 
+ User's guide in Passepartout layout format:
+ 
+-	users_guide.ppt
++	users_guide.pp
+ 
+ xml2ps markup example:
+ 
+@@ -21,4 +18,8 @@
+ 
+ Layout example:
+ 	
+-	examples/example1.ppt
++	examples/example1.pp
++
++Unicode example:
++
++	examples/multilingual.pp
+diff -Nur -x CVS passepartout-0.6/doc/users_guide.xml passepartout/doc/users_guide.xml
+--- passepartout-0.6/doc/users_guide.xml	2004-10-30 14:24:11.000000000 +0200
++++ passepartout/doc/users_guide.xml	2004-12-02 22:35:38.000000000 +0100
+@@ -3,7 +3,7 @@
+ 	"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> 
+ <article>
+   <articleinfo>
+-    <title>Passepartout 0.6 User's Guide</title>
++    <title>Passepartout 0.7 User's Guide</title>
+   </articleinfo>
+ 
+   <graphic fileref="pptout.png"/>
+@@ -397,6 +397,10 @@
+       with default values for all settings.
+       If you want to, you can change these settings.</para>
+ 
++    <para><emphasis>Note: you should not edit this file while
++    Passepartout is running, because it will be overwritten when the
++    program ends.</emphasis></para>
++
+     <variablelist>
+       <title>Settings that may be of interest:</title>
+ 
+@@ -421,11 +425,6 @@
+       </varlistentry>
+       
+       <varlistentry>
+-	<term><varname>PSViewer</varname></term>
+-	<listitem><para>PostScript viewer. (Default is
+-	<command>gv</command>.)</para></listitem></varlistentry>
+-      
+-      <varlistentry>
+ 	<term><varname>PrintCommand</varname></term>
+ 	<listitem><para>Default command used for printing. (Default is
+ 	<command>lpr</command>.)</para></listitem></varlistentry>
+diff -Nur -x CVS passepartout-0.6/INSTALL passepartout/INSTALL
+--- passepartout-0.6/INSTALL	2004-10-30 14:37:40.000000000 +0200
++++ passepartout/INSTALL	2004-12-16 22:00:18.000000000 +0100
+@@ -1,6 +1,6 @@
+ INSTALLING PASSEPARTOUT 
+ -----------------------
+-Fredrik Arnerup, 30 Oct 2004
++Fredrik Arnerup, 16 December 2004
+ Report problems to <passepartout at stacken.kth.se>
+ 
+ Passepartout has so far been successfully built on Linux, FreeBSD and
+@@ -12,13 +12,13 @@
+ Requirements
+ ------------
+ 
+-Make sure you have gtkmm-2.2.x, libgnomecanvasmm-2.0.x
++Make sure you have gtkmm-2.4.x, libgnomecanvasmm-2.6.x
+ (http://gtkmm.sourceforge.net), and libxml++ 1.0.x
+ (http://sourceforge.net/projects/libxmlplusplus/) properly installed
+-(later versions will *not* work!) and that you are using at least
+-gcc-3.2. You will need xsltproc (http://xmlsoft.org/XSLT/xsltproc2.html)
+-and Ghostscript to run Passepartout. A postscript viewer (e.g. gv) is
+-recommended.
++and that you are using at least gcc-3.2. You will need xsltproc
++(http://xmlsoft.org/XSLT/xsltproc2.html) and Ghostscript to run
++Passepartout. The gv postscript viewer is recommended. If you want
++Gnome support, then you will need libgnome and gnome-vfs.
+ 
+ 
+ Building and installing
+@@ -30,7 +30,7 @@
+ http://www.stacken.kth.se/project/pptout/files/.
+ Check http://www.stacken.kth.se/project/pptout/items.html for news.
+ 
+-./configure
++./configure (--with-gnome if you want Gnome support)
+ make
+ make install
+ 
+diff -Nur -x CVS passepartout-0.6/logotype/pptout.eps passepartout/logotype/pptout.eps
+--- passepartout-0.6/logotype/pptout.eps	1970-01-01 01:00:00.000000000 +0100
++++ passepartout/logotype/pptout.eps	2002-11-05 02:12:07.000000000 +0100
+@@ -0,0 +1,1396 @@
++%!PS-Adobe-3.0 EPSF-3.0
++%%Creator: Fredrik Arnerup
++%%CreationDate: D:20020930182227
++%%LanguageLevel: 2
++%%Pages: 1
++%%BoundingBox: 0 90 390 450
++%%PageOrder: Ascend
++%%Title: Passepartout logotype
++%%DocumentSuppliedResources: procset gnome-print-procs-0.34
++%%EndComments
++%%BeginProlog
++%%BeginResource: procset gnome-print-procs-0.34
++/|/def load def/,/load load
++|/n/newpath , |/m/moveto , |/l/lineto , |/c/curveto ,
++|/q/gsave , |/Q/grestore , |/rg/setrgbcolor , |/J/setlinecap ,
++|/j/setlinejoin , |/w/setlinewidth , |/M/setmiterlimit ,
++|/d/setdash , |/i/pop , |/W/clip , |/W*/eoclip , |/n/newpath ,
++|/S/stroke , |/f/fill , |/f*/eofill , |/Tj/show , |/Tm/moveto ,
++|/FF/findfont ,
++|/h/closepath , |/cm/concat , |/rm/rmoveto , |/sp/strokepath ,
++|/SP/showpage , |/p/pop , |/EX/exch , |/DF/definefont , |
++/F {scalefont setfont} def
++%%EndResource
++%%EndProlog
++%%BeginSetup
++%%EndSetup
++%%Page: Passepartout 1
++%%PageResources: (atend)
++
++%0 setgray
++%/ww 350 def
++%/hh 420 def
++%/ox 20 def
++%/oy 10 def
++%ox oy moveto
++%0 hh rlineto
++%ww 0 rlineto
++%0 hh neg rlineto
++%closepath
++%stroke
++
++% *** Scissors ***
++
++-70 40 translate
++
++q
++q
++q
++q
++0.5 0.5 0.5 rg
++252.38 281.318 m
++194.543 244.158 193.957 243.28 166.031 220.817 c
++168.081 229.967 163.633 238.374 157.532 246.32 c
++140.805 266.462 113.331 251 100.659 241.247 c
++88.7817 232.1 65.3508 209.423 84.2651 183.53 c
++103.975 158.243 132.65 177.627 143.052 185.545 c
++152.659 192.856 156.177 196.79 167.685 209.319 c
++170.525 212.349 213.809 240.656 217.853 242.473 c
++231.015 248.46 243.936 242.073 249.254 242.495 c
++279.613 262.684 432.338 390.178 427.966 397.358 c
++420.496 398.356 260.316 286.429 252.38 281.318 c
++h
++106.011 234.271 m
++89.2629 221.525 82.5024 202.203 90.9205 191.142 c
++99.3386 180.082 119.763 181.45 136.511 194.196 c
++153.259 206.942 160.02 226.264 151.602 237.325 c
++143.183 248.386 122.759 247.018 106.011 234.271 c
++h
++eofill
++Q
++Q
++Q
++Q
++q
++q
++q
++q
++1 1 1 rg
++160.272 214.508 m
++159.611 227.284 164.394 225.925 157.415 237.578 c
++159.53 233.409 166.148 225.883 160.272 214.508 c
++h
++f
++Q
++Q
++Q
++Q
++q
++q
++q
++q
++1 1 1 rg
++94.4089 226.042 m
++84.8204 220.641 82.5795 205.796 83.8961 199.466 c
++84.6587 209.584 88.6993 220.649 94.4089 226.042 c
++h
++f
++Q
++Q
++Q
++Q
++q
++q
++q
++q
++0.298 0.298 0.298 rg
++252.38 281.318 m
++194.543 244.158 213.809 240.656 217.853 242.473 c
++231.015 248.46 243.936 242.073 249.254 242.495 c
++279.613 262.684 432.338 390.178 427.966 397.358 c
++420.496 398.356 260.316 286.429 252.38 281.318 c
++h
++f
++Q
++Q
++Q
++Q
++q
++q
++q
++q
++1 1 1 rg
++223.583 261.914 m
++217.853 242.473 l
++211.564 239.958 211.647 244.28 211.061 246.566 c
++210.891 248.797 214.861 257.058 223.583 261.914 c
++h
++f
++Q
++Q
++Q
++Q
++q
++q
++q
++q
++q
++0.5 0.5 0.5 rg
++271.623 283.151 m
++329.17 245.544 329.749 244.661 357.5 221.983 c
++355.52 231.148 360.034 239.52 366.197 247.419 c
++383.079 267.43 410.432 251.756 423.028 241.905 c
++434.834 232.665 458.088 209.807 438.974 184.062 c
++419.068 158.929 390.545 178.535 380.204 186.533 c
++370.654 193.919 367.167 197.879 355.756 210.497 c
++352.94 213.55 309.877 242.191 305.847 244.04 c
++292.733 250.129 279.762 243.842 274.448 244.305 c
++244.245 264.729 92.5152 393.405 96.9421 400.551 c
++104.42 401.491 263.726 288.324 271.623 283.151 c
++h
++417.622 234.971 m
++434.27 222.095 440.88 202.722 432.377 191.726 c
++423.873 180.731 403.46 182.258 386.811 195.134 c
++370.163 208.01 363.552 227.383 372.056 238.378 c
++380.56 249.374 400.973 247.847 417.622 234.971 c
++h
++eofill
++Q
++Q
++Q
++Q
++q
++q
++q
++q
++0.8 0.8 0.8 rg
++247.23 277.76 m
++204.041 310.124 118.546 379.284 99.692 399.554 c
++113.868 395.196 193.268 338.913 258.024 292.655 c
++247.23 277.76 l
++h
++f
++Q
++Q
++Q
++Q
++q
++q
++q
++q
++1 1 1 rg
++259.06 287.79 m
++261.044 290.786 338.092 234.529 355.658 218.903 c
++357.875 216.968 356.112 221.3 357.933 220.663 c
++359.798 217.34 359.315 215.591 361.736 212.594 c
++343.241 228.864 320.305 244.891 298.19 260.068 c
++276.074 275.246 258.222 286.49 259.06 287.79 c
++h
++f
++Q
++Q
++Q
++Q
++q
++q
++q
++q
++1 1 1 rg
++412.902 180.678 m
++402.553 176.148 382.174 192.433 379.926 196.068 c
++388.937 190.556 402.061 181.287 412.902 180.678 c
++h
++f
++Q
++Q
++Q
++Q
++q
++q
++q
++q
++1 1 1 rg
++386.804 251.225 m
<<Diff was trimmed, longer than 597 lines>>


More information about the pld-cvs-commit mailing list