diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
| commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
| tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-office/passepartout | |
| download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip | |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'app-office/passepartout')
12 files changed, 833 insertions, 0 deletions
diff --git a/app-office/passepartout/Manifest b/app-office/passepartout/Manifest new file mode 100644 index 000000000000..e6772ed0a03f --- /dev/null +++ b/app-office/passepartout/Manifest @@ -0,0 +1 @@ +DIST passepartout-0.7.0.tar.bz2 369232 SHA256 709890fb1530217e2678b710e996e9e3ee41c969088193711f119fc456f67d0b SHA512 41b8ed3905ee5332a89bc8512a5481bc52bdf58871254137e48150ad0d00a561aa9483d2accd41672f34bc37bea645f2a5ad40435cfd45490c3ff5542032ab8f WHIRLPOOL 2da483041be06eb2d8f268bd291d8105a0840c4e73ee61abb36fd4394310657e673979092b155718a8dc48c74b645529774e27a265f683daa73a8fa7752693ec diff --git a/app-office/passepartout/files/passepartout-0.6-extra_qual.patch b/app-office/passepartout/files/passepartout-0.6-extra_qual.patch new file mode 100644 index 000000000000..a9d33929c1b0 --- /dev/null +++ b/app-office/passepartout/files/passepartout-0.6-extra_qual.patch @@ -0,0 +1,45 @@ +diff -NurdpB passepartout-0.6/src/pptout/document/group.h passepartout-0.6-patched/src/pptout/document/group.h +--- passepartout-0.6/src/pptout/document/group.h 2004-10-02 16:18:45.000000000 -0500 ++++ passepartout-0.6-patched/src/pptout/document/group.h 2007-03-21 19:00:13.000000000 -0500 +@@ -30,7 +30,7 @@ public: + void set_flow_around(bool); + bool get_flow_around() const; + Boundary get_obstacle_boundary() const; +- BoundaryVect Group::obstacle_list() const; ++ BoundaryVect obstacle_list() const; + + void add(Pagent* obj); + Pagent* ungroup(Pagent* obj); +@@ -55,7 +55,7 @@ public: + /** Raised on direct changes to the group (i.e. new / ungrouped member) */ + SigC::Signal1<void, Pagent*> group_changed_signal; + private: +- Boundary Group::get_untransformed_box() const; ++ Boundary get_untransformed_box() const; + + ChildVec childs; + }; +diff -NurdpB passepartout-0.6/src/pptout/propertiesdialog.h passepartout-0.6-patched/src/pptout/propertiesdialog.h +--- passepartout-0.6/src/pptout/propertiesdialog.h 2004-04-16 14:03:56.000000000 -0500 ++++ passepartout-0.6-patched/src/pptout/propertiesdialog.h 2007-03-21 19:18:26.000000000 -0500 +@@ -39,7 +39,7 @@ private: + // no destructor + ~PropertiesDialog(); + +- void PropertiesDialog::show_page_contents(GtkNotebookPage*, guint index); ++ void show_page_contents(GtkNotebookPage*, guint index); + + Gtk::Notebook book; + std::vector<PropBase*> pages; +diff -NurdpB passepartout-0.6/src/xml2ps/canvas.hh passepartout-0.6-patched/src/xml2ps/canvas.hh +--- passepartout-0.6/src/xml2ps/canvas.hh 2004-07-21 17:00:34.000000000 -0500 ++++ passepartout-0.6-patched/src/xml2ps/canvas.hh 2007-03-21 18:47:12.000000000 -0500 +@@ -52,7 +52,7 @@ namespace xml2ps { + HBox hbox(bool span, float margin_left, float margin_right, + float ascender, float descender); + +- virtual void xml2ps::Canvas::addRelObstacle ++ virtual void addRelObstacle + (const float left, const float bottom, const float right, const float top); + + // Check where the current column starts. diff --git a/app-office/passepartout/files/passepartout-0.7.0-automake-1.13.patch b/app-office/passepartout/files/passepartout-0.7.0-automake-1.13.patch new file mode 100644 index 000000000000..4c57a85c79cd --- /dev/null +++ b/app-office/passepartout/files/passepartout-0.7.0-automake-1.13.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index e59f631..ca329c1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -6,7 +6,7 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2]) + # For automake < 1.6 you need to use this line instead: + #AM_INIT_AUTOMAKE(Passepartout, 0.7-PRE) + +-AM_CONFIG_HEADER(src/defines.h) ++AC_CONFIG_HEADERS([src/defines.h]) + # AC_CONFIG_HEADER(src/defines.h) + + # We're just a few binaries...not worth doing shared by default? diff --git a/app-office/passepartout/files/passepartout-0.7.0-gcc42.patch b/app-office/passepartout/files/passepartout-0.7.0-gcc42.patch new file mode 100644 index 000000000000..feda57bf3938 --- /dev/null +++ b/app-office/passepartout/files/passepartout-0.7.0-gcc42.patch @@ -0,0 +1,14 @@ +diff -urNad passepartout-0.7.0~/src/ps/misc.cc passepartout-0.7.0/src/ps/misc.cc +--- passepartout-0.7.0~/src/ps/misc.cc 2007-06-13 13:05:07.000000000 +0200 ++++ passepartout-0.7.0/src/ps/misc.cc 2007-09-14 17:49:49.000000000 +0200 +@@ -3,6 +3,8 @@ + /// + #include "misc.h" + +-std::ostream& PS::operator << (std::ostream& out, const PS::Concat& c) { +- return out << '[' << c.matrix << "] concat\n"; ++namespace PS { ++ std::ostream& operator << (std::ostream& out, const Concat& c) { ++ return out << '[' << c.matrix << "] concat\n"; ++ } + } diff --git a/app-office/passepartout/files/passepartout-0.7.0-gcc43.patch b/app-office/passepartout/files/passepartout-0.7.0-gcc43.patch new file mode 100644 index 000000000000..64703e164a47 --- /dev/null +++ b/app-office/passepartout/files/passepartout-0.7.0-gcc43.patch @@ -0,0 +1,97 @@ +--- a/src/fonts/afm.cc ++++ b/src/fonts/afm.cc +@@ -10,6 +10,8 @@ + #include "util/warning.h" + #include "util/stringutil.h" + ++#include <limits> ++ + using std::string; + + class font::AFMetrics::GlyphData { +--- a/src/fonts/fontmanager.cc ++++ b/src/fonts/fontmanager.cc +@@ -14,6 +14,8 @@ + #include "util/filesys.h" + #include "util/warning.h" + ++#include <memory> ++ + font::FontManager* font::FontManager::_instance = 0; + // StaticMutex can, unlike regular Mutex, be created before the call + // to thread_init +--- a/src/pptout/document/rasterframe.cc ++++ b/src/pptout/document/rasterframe.cc +@@ -12,6 +12,8 @@ + #include "ps/misc.h" + #include "pptout/config.h" // Todo + ++#include <ctime> ++ + RasterFrame::RasterFrame(const ElementWrap& xml, Group *parent) + : BasicFrame(xml, parent), + association(xml.get_filename("file")), +--- a/src/ps/encode.h ++++ b/src/ps/encode.h +@@ -8,6 +8,7 @@ + #include <iostream> + #include <string> + #include <vector> ++#include <cstring> + + // Standard PostScript encoding filters + +--- a/src/ps/examinepdf.cc ++++ b/src/ps/examinepdf.cc +@@ -5,6 +5,7 @@ + #include <fstream> + #include <cassert> // Todo: other assert! + #include <iostream> ++#include <cstdlib> + + void usage() {} + +--- a/src/ps/pdf.cc ++++ b/src/ps/pdf.cc +@@ -15,6 +15,7 @@ + #include <stdexcept> + #include <glibmm/convert.h> + #include <fstream> ++#include <typeinfo> + + + namespace { +--- a/src/util/filesys.cc ++++ b/src/util/filesys.cc +@@ -14,6 +14,9 @@ + #include <sys/types.h> + #endif + ++#include <cstring> ++#include <stdlib.h> ++ + using std::string; + + ClibException::ClibException(const string& msg) +--- a/src/util/vector.h ++++ b/src/util/vector.h +@@ -5,6 +5,7 @@ + /// + #include <algorithm> // max + #include <cmath> // sqrt ++#include <ostream> + template<class C> C sqr(const C& c) { return c*c; } + + template <class C> +--- a/src/util/tempfile.cc ++++ b/src/util/tempfile.cc +@@ -8,6 +8,9 @@ + #include <stdexcept> + #include <unistd.h> + ++#include <cstring> ++#include <stdlib.h> ++ + namespace { + std::string get_tmplate(std::string base) { + base += "XXXXXX"; diff --git a/app-office/passepartout/files/passepartout-0.7.0-gcc44.patch b/app-office/passepartout/files/passepartout-0.7.0-gcc44.patch new file mode 100644 index 000000000000..97c9badfcb20 --- /dev/null +++ b/app-office/passepartout/files/passepartout-0.7.0-gcc44.patch @@ -0,0 +1,109 @@ +From tbm@cyrius.com Sat Nov 08 17:07:16 2008 +Received: (at submit) by bugs.debian.org; 8 Nov 2008 17:07:16 +0000 +X-Spam-Checker-Version: SpamAssassin 3.2.3-bugs.debian.org_2005_01_02 + (2007-08-08) on rietz.debian.org +X-Spam-Level: +X-Spam-Bayes: score:0.0000 Tokens: new, 59; hammy, 151; neutral, 105; spammy, + 0. spammytokens: hammytokens:0.000-+--libxml2, 0.000-+--amd64, + 0.000-+--sk:libgnom, 0.000-+--Usertags, 0.000-+--H*r:1000 +X-Spam-Status: No, scoreø.8 required0 testsL,BAYES_00,HAS_PACKAGE, + MURPHY_DRUGS_REL8,WEIRD_PORT autolearnúm + version2.3-bugs.debian.org_2005_01_02 +Return-path: <tbm@cyrius.com> +Received: from sorrow.cyrius.com ([65.19.161.204]) + by rietz.debian.org with esmtp (Exim 4.63) + (envelope-from <tbm@cyrius.com>) + id 1KyrHH-0002u6-Vy + for submit@bugs.debian.org; Sat, 08 Nov 2008 17:07:16 +0000 +Received: by sorrow.cyrius.com (Postfix, from userid 10) + id 564C8D857; Sat, 8 Nov 2008 17:07:15 +0000 (UTC) +Received: by deprecation.cyrius.com (Postfix, from userid 1000) + id 0F2C1150B58; Sat, 8 Nov 2008 18:06:54 +0100 (CET) +Date: Sat, 8 Nov 2008 18:06:53 +0100 +From: Martin Michlmayr <tbm@cyrius.com> +To: submit@bugs.debian.org +Subject: FTBFS with GCC 4.4: missing #include +Message-ID: <20081108170653.GD27323@deprecation.cyrius.com> +References: <20081108132249.5332A460DB@em64t.snowman.net> +MIME-Version: 1.0 +Content-Type: text/plain; charset-ascii +Content-Disposition: inline +Content-Transfer-Encoding: quoted-printable +In-Reply-To: <20081108132249.5332A460DB@em64t.snowman.net> +User-Agent: Mutt/1.5.18 (2008-05-17) +Delivered-To: submit@bugs.debian.org + +Package: passepartout +Version: 0.7.0-1.1 +User: debian-gcc@lists.debian.org +Usertags: ftbfs-gcc-4.4 +Tags: patch + +Your package fails to build with the upcoming GCC 4.4. Version 4.4 +has not been released yet but I'm building with a snapshot in order +to find errors and give people an advance warning. + +GCC 4.4 cleaned up some more C++ headers. You always have to #include +headers directly and cannot rely for things to be included indirectly. + +You can reproduce this problem with gcc-snapshot from unstable. + +> Automatic build of passepartout_0.7.0-1.1 on em64t by sbuild/amd64 0.53 +... +> if x86_64-linux-gnu-g++ -DHAVE_CONFIG_H -I. -I. -I../../src -I/usr/include/libxml++-1.0 -I/usr/lib/libxml++-1.0/include -I/usr/include/libxml2 -D_REENTRANT -I/usr/include/gtkmm-2.4 -I/usr/lib/gtkmm-2.4/include -I/usr/include/glibmm-2.4 -I/usr/lib/glibmm-2.4/include -I/usr/include/gdkmm-2.4 -I/usr/lib/gdkmm-2.4/include -I/usr/include/pangomm-1.4 -I/usr/include/atkmm-1.6 -I/usr/include/gtk-2.0 -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/gtk-2.0/include -I/usr/include/cairomm-1.0 -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/pixman-1 -I/usr/include/atk-1.0 -D_REENTRANT -I/usr/include/libgnomecanvasmm-2.6 -I/usr/lib/libgnomecanvasmm-2.6/include -I/usr/include/gtkmm-2.4 -I/usr/lib/gtkmm-2.4/include -I/usr/include/libgnomecanvas-2.0 -I/usr/include/glibmm-2.4 -I/usr/lib/glibmm-2.4/include -I/usr/include/gdkmm-2.4 -I/usr/lib/gdkmm-2.4/include -I/usr/include/pangomm-1.4 -I/usr/include/atkmm-1.6 -I/usr/include/gtk-2.0 -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/gtk-2.0/include -I/usr/include/cairomm-1.0 -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/pixman-1 -I/usr/include/atk-1.0 -I/usr/include/gail-1.0 -I/usr/include/libart-2.0 -MT stringutil.o -MD -MP -MF ".deps/stringutil.Tpo" -c -o stringutil.o stringutil.cc; \ +> then mv -f ".deps/stringutil.Tpo" ".deps/stringutil.Po"; else rm -f ".deps/stringutil.Tpo"; exit 1; fi +> In file included from stringutil.cc:4: +> stringutil.h: In function 'C to(const std::string&)': +> stringutil.h:25: error: 'EOF' was not declared in this scope +> stringutil.cc: In function 'std::string to_roman(int)': +> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*' +> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*' +> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*' +> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*' +> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*' +> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*' +> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*' +> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*' +> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*' +> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*' +> make[4]: *** [stringutil.o] Error 1 +> make[4]: Leaving directory `/build/tbm/passepartout-0.7.0/src/util' + +--- src/util/stringutil.h~ 2008-11-08 16:48:10.000000000 +0000 ++++ src/util/stringutil.h 2008-11-08 16:48:25.000000000 +0000 +@@ -4,6 +4,7 @@ + // Copyright (C) 2002 - 2004, Fredrik Arnerup & Rasmus Kaj, See COPYING + /// + #include "typeinfo.h" ++#include <cstdio> + #include <string> + #include <sstream> + #include <stdexcept> +--- src/util/warning.cc~ 2008-11-08 16:48:33.000000000 +0000 ++++ src/util/warning.cc 2008-11-08 16:48:43.000000000 +0000 +@@ -2,6 +2,7 @@ + // Copyright (C) 2002 - 2004, Fredrik Arnerup & Rasmus Kaj, See COPYING + /// + #include "warning.h" ++#include <cstdio> + + class NullFdBuf : public std::streambuf { + public: +--- src/util/filedescriptors.cc~ 2008-11-08 16:49:15.000000000 +0000 ++++ src/util/filedescriptors.cc 2008-11-08 16:49:23.000000000 +0000 +@@ -5,6 +5,7 @@ + #include "filesys.h" + #include <fcntl.h> + #include <unistd.h> ++#include <cstdio> + + int + filedesc::move(int to, int from) { + +-- +Martin Michlmayr +http://www.cyrius.com/ + + + + diff --git a/app-office/passepartout/files/passepartout-0.7.0-include-flags.patch b/app-office/passepartout/files/passepartout-0.7.0-include-flags.patch new file mode 100644 index 000000000000..ac1b116fbdef --- /dev/null +++ b/app-office/passepartout/files/passepartout-0.7.0-include-flags.patch @@ -0,0 +1,140 @@ +diff -Nurd -x'*~' passepartout-0.7.0.orig/src/fonts/Makefile.am passepartout-0.7.0/src/fonts/Makefile.am +--- passepartout-0.7.0.orig/src/fonts/Makefile.am 2007-06-13 07:05:06.000000000 -0400 ++++ passepartout-0.7.0/src/fonts/Makefile.am 2007-08-07 19:11:04.000000000 -0400 +@@ -5,9 +5,9 @@ + + libfonts_a_SOURCES = fontinfo.cc fontmanager.cc afm.cc freetype.cc + +-libfonts_a_CXXFLAGS = -I$(top_srcdir)/src ++libfonts_a_CPPFLAGS = -I$(top_srcdir)/src + + # for Glib::ustring +-libfonts_a_CXXFLAGS += $(GTKMM_CFLAGS) $(FREETYPE_CFLAGS) ++libfonts_a_CPPFLAGS += $(GTKMM_CFLAGS) $(FREETYPE_CFLAGS) + + #libfonts_a_LIBADD = $(top_srcdir)/src/util/libpptutil.a +\ No newline at end of file +diff -Nurd -x'*~' passepartout-0.7.0.orig/src/pptout/Makefile.am passepartout-0.7.0/src/pptout/Makefile.am +--- passepartout-0.7.0.orig/src/pptout/Makefile.am 2007-07-26 07:31:05.000000000 -0400 ++++ passepartout-0.7.0/src/pptout/Makefile.am 2007-08-07 19:14:51.000000000 -0400 +@@ -32,10 +32,10 @@ + $(BUILT_SOURCES) \ + $(NULL) + +-passepartout_CXXFLAGS = $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) $(GNOMECANVAS_CFLAGS) \ +- $(GNOME_CFLAGS) $(GNOMEVFS_CFLAGS) ++passepartout_CPPFLAGS = -I$(top_srcdir)/src -D'XMLPATH=$(xmldir)' + +-passepartout_CXXFLAGS += -I$(top_srcdir)/src -D'XMLPATH=$(xmldir)' ++passepartout_CPPFLAGS += $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) $(GNOMECANVAS_CFLAGS) \ ++ $(GNOME_CFLAGS) $(GNOMEVFS_CFLAGS) + + passepartout_LDADD = $(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS) \ + $(GTHREAD_LIBS) $(GNOME_LIBS) $(GNOMEVFS_LIBS) +diff -Nurd -x'*~' passepartout-0.7.0.orig/src/pptout/document/Makefile.am passepartout-0.7.0/src/pptout/document/Makefile.am +--- passepartout-0.7.0.orig/src/pptout/document/Makefile.am 2007-06-13 07:05:06.000000000 -0400 ++++ passepartout-0.7.0/src/pptout/document/Makefile.am 2007-08-07 19:15:12.000000000 -0400 +@@ -10,6 +10,6 @@ + textframe.cc textstream.cc paper_sizes.cc getxsltparams.cc \ + loader.cc typesetterthread.cc + +-libdocument_a_CXXFLAGS = $(GTKMM_CFLAGS) $(XMLPP_CFLAGS) ++libdocument_a_CPPFLAGS = -I$(top_srcdir)/src + +-libdocument_a_CXXFLAGS += -I$(top_srcdir)/src ++libdocument_a_CPPFLAGS += $(GTKMM_CFLAGS) $(XMLPP_CFLAGS) +diff -Nurd -x'*~' passepartout-0.7.0.orig/src/pptout/widget/Makefile.am passepartout-0.7.0/src/pptout/widget/Makefile.am +--- passepartout-0.7.0.orig/src/pptout/widget/Makefile.am 2007-06-14 06:17:20.000000000 -0400 ++++ passepartout-0.7.0/src/pptout/widget/Makefile.am 2007-08-07 19:29:32.000000000 -0400 +@@ -8,6 +8,6 @@ + dialogwrap.cc subpanel.cc wmisc.cc errordialog.cc \ + usererror.cc programs.cc zoomer.cc + +-libwidget_a_CXXFLAGS = $(GTKMM_CFLAGS) $(GNOMEVFS_CFLAGS) $(GNOME_CFLAGS) ++libwidget_a_CPPFLAGS = -I$(top_srcdir)/src -D'DOCDIR=$(docdir)' + +-libwidget_a_CXXFLAGS += -I$(top_srcdir)/src -D'DOCDIR=$(docdir)' ++libwidget_a_CPPFLAGS += $(GTKMM_CFLAGS) $(GNOMEVFS_CFLAGS) $(GNOME_CFLAGS) +diff -Nurd -x'*~' passepartout-0.7.0.orig/src/ps/Makefile.am passepartout-0.7.0/src/ps/Makefile.am +--- passepartout-0.7.0.orig/src/ps/Makefile.am 2007-06-13 07:48:09.000000000 -0400 ++++ passepartout-0.7.0/src/ps/Makefile.am 2007-08-07 19:26:30.000000000 -0400 +@@ -9,12 +9,12 @@ + + examinepdf_SOURCES = examinepdf.cc + +-# for Glib::ustring +-libps_a_CXXFLAGS = $(GTKMM_CFLAGS) $(FREETYPE_CFLAGS) ++libps_a_CPPFLAGS = -I$(top_srcdir)/src + +-libps_a_CXXFLAGS += -I$(top_srcdir)/src ++# for Glib::ustring ++libps_a_CPPFLAGS += $(GTKMM_CFLAGS) $(FREETYPE_CFLAGS) + +-examinepdf_CXXFLAGS = $(libps_a_CXXFLAGS) ++examinepdf_CPPFLAGS = $(libps_a_CPPFLAGS) + examinepdf_LDADD = $(GTKMM_LIBS) \ + -L. -lps -L../fonts -lfonts -lps -L../util -lpptutil + examinepdf_DEPENDENCIES = libps.a +@@ -24,8 +24,8 @@ + TESTS = runtest + check_PROGRAMS = runtest + runtest_SOURCES = test_glyphlist.cc +-runtest_CXXFLAGS = -I$(top_srcdir)/src +-runtest_CXXFLAGS += $(GTKMM_CFLAGS) ++runtest_CPPFLAGS = -I$(top_srcdir)/src ++runtest_CPPFLAGS += $(GTKMM_CFLAGS) + runtest_DEPENDENCIES = ../util/libpptutil.a $(noinst_LIBRARIES) + runtest_LDADD = -L../testbed -lppttest -L. -lps -L../util -lpptutil \ + $(GTKMM_LIBS) +diff -Nurd -x'*~' passepartout-0.7.0.orig/src/testbed/Makefile.am passepartout-0.7.0/src/testbed/Makefile.am +--- passepartout-0.7.0.orig/src/testbed/Makefile.am 2007-06-13 07:05:07.000000000 -0400 ++++ passepartout-0.7.0/src/testbed/Makefile.am 2007-08-07 19:17:57.000000000 -0400 +@@ -4,8 +4,8 @@ + + libppttest_a_SOURCES = testbed.cc + +-libppttest_a_CXXFLAGS = -I$(top_srcdir)/src ++libppttest_a_CPPFLAGS = -I$(top_srcdir)/src + + # Just because Glib::Exception is stupid and doesn't inherit the standard + # exception the testbed has to know about glib! +-libppttest_a_CXXFLAGS += $(GTKMM_CFLAGS) ++libppttest_a_CPPFLAGS += $(GTKMM_CFLAGS) +diff -Nurd -x'*~' passepartout-0.7.0.orig/src/util/Makefile.am passepartout-0.7.0/src/util/Makefile.am +--- passepartout-0.7.0.orig/src/util/Makefile.am 2007-06-14 06:12:42.000000000 -0400 ++++ passepartout-0.7.0/src/util/Makefile.am 2007-08-07 19:18:50.000000000 -0400 +@@ -12,12 +12,12 @@ + cmdline.cc xmlwrap.cc + + # gtkmm and gnomecanvas flags is needed just to get RefPtr and AffineTrans. +-CXXFLAGS = $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) $(GNOMECANVAS_CFLAGS) ++AM_CPPFLAGS = $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) $(GNOMECANVAS_CFLAGS) + + TESTS = runtest + check_PROGRAMS = runtest + runtest_SOURCES = test_stringutil.cc test_valuunit.cc test_matrix.cc \ + test_boundary.cc test_procio.cc test_cmdline.cc +-runtest_CXXFLAGS = -I$(top_srcdir)/src ++runtest_CPPFLAGS = -I$(top_srcdir)/src $(AM_CPPFLAGS) + runtest_DEPENDENCIES = $(noinst_LIBRARIES) + runtest_LDADD = -L../testbed -lppttest -L. -lpptutil $(GTKMM_LIBS) $(GNOMECANVAS_LIBS) +diff -Nurd -x'*~' passepartout-0.7.0.orig/src/xml2ps/Makefile.am passepartout-0.7.0/src/xml2ps/Makefile.am +--- passepartout-0.7.0.orig/src/xml2ps/Makefile.am 2007-06-22 12:07:26.000000000 -0400 ++++ passepartout-0.7.0/src/xml2ps/Makefile.am 2007-08-07 19:36:26.000000000 -0400 +@@ -13,12 +13,12 @@ + + xml2ps_SOURCES = main.cc + +-libxml2ps_a_CXXFLAGS = $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) \ +- $(GNOMECANVAS_CFLAGS) ++libxml2ps_a_CPPFLAGS = -I$(top_srcdir)/src + +-libxml2ps_a_CXXFLAGS += -I$(top_srcdir)/src ++libxml2ps_a_CPPFLAGS += $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) \ ++ $(GNOMECANVAS_CFLAGS) + +-xml2ps_CXXFLAGS = $(libxml2ps_a_CXXFLAGS) ++xml2ps_CPPFLAGS = $(libxml2ps_a_CPPFLAGS) + + xml2ps_LDADD = $(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS)\ + libxml2ps.a ../fonts/libfonts.a ../ps/libps.a ../util/libpptutil.a diff --git a/app-office/passepartout/files/passepartout-0.7.0-libtoolization.patch b/app-office/passepartout/files/passepartout-0.7.0-libtoolization.patch new file mode 100644 index 000000000000..418362c204e2 --- /dev/null +++ b/app-office/passepartout/files/passepartout-0.7.0-libtoolization.patch @@ -0,0 +1,293 @@ +Index: trunk/src/ps/Makefile.am +=================================================================== +--- trunk/src/ps/Makefile.am (revision 1530) ++++ trunk/src/ps/Makefile.am (working copy) +@@ -1,31 +1,26 @@ + bin_PROGRAMS = examinepdf +-noinst_LIBRARIES = libps.a ++noinst_LTLIBRARIES = libps.la + + dist_noinst_HEADERS = encode.h pdf.h unicode.h pfb2pfa.h misc.h wineps.h \ + pdfparser.h type42.h + +-libps_a_SOURCES = encode.cc glyphs.cc pdf.cc unicode.cc pfb2pfa.cc misc.cc \ ++libps_la_SOURCES = encode.cc glyphs.cc pdf.cc unicode.cc pfb2pfa.cc misc.cc \ + wineps.cc pdfparser.cc type42.cc + + examinepdf_SOURCES = examinepdf.cc + +-libps_a_CPPFLAGS = -I$(top_srcdir)/src ++libps_la_LIBADD = ../fonts/libfonts.la + + # for Glib::ustring +-libps_a_CPPFLAGS += $(GTKMM_CFLAGS) $(FREETYPE_CFLAGS) ++libps_la_CPPFLAGS = $(FREETYPE_CFLAGS) $(GTKMM_CFLAGS) ++libps_la_LIBADD += $(GTKMM_LIBS) + +-examinepdf_CPPFLAGS = $(libps_a_CPPFLAGS) +-examinepdf_LDADD = $(GTKMM_LIBS) \ +- -L. -lps -L../fonts -lfonts -lps -L../util -lpptutil +-examinepdf_DEPENDENCIES = libps.a ++examinepdf_CPPFLAGS = $(libps_la_CPPFLAGS) ++examinepdf_LDADD = libps.la + +-#libps_a_LIBADD = $(GTKMM_LIBS) +- + TESTS = runtest + check_PROGRAMS = runtest + runtest_SOURCES = test_glyphlist.cc +-runtest_CPPFLAGS = -I$(top_srcdir)/src +-runtest_CPPFLAGS += $(GTKMM_CFLAGS) +-runtest_DEPENDENCIES = ../util/libpptutil.a $(noinst_LIBRARIES) +-runtest_LDADD = -L../testbed -lppttest -L. -lps -L../util -lpptutil \ ++runtest_CPPFLAGS = $(GTKMM_CFLAGS) ++runtest_LDADD = ../testbed/libppttest.la libps.la ../util/libpptutil.la \ + $(GTKMM_LIBS) +Index: trunk/src/xml2ps/Makefile.am +=================================================================== +--- trunk/src/xml2ps/Makefile.am (revision 1530) ++++ trunk/src/xml2ps/Makefile.am (working copy) +@@ -1,28 +1,29 @@ + bin_PROGRAMS = xml2ps + +-noinst_LIBRARIES = libxml2ps.a ++noinst_LTLIBRARIES = libxml2ps.la + + dist_noinst_HEADERS = blockcontainer.hh boundaries.hh canvas.hh \ + line.hh paragraph.hh typesetter.hh pagedstream.hh \ + pdfcanvas.hh pscanvas.hh psstream.hh xly.hh xcanvas.hh + +-libxml2ps_a_SOURCES = paragraph.cc xly.cc typesetter.cc \ ++libxml2ps_la_SOURCES = paragraph.cc xly.cc typesetter.cc \ + blockcontainer.cc psstream.cc line.cc canvas.cc \ + pagedstream.cc pscanvas.cc boundaries.cc pdfcanvas.cc \ + xcanvas.cc + + xml2ps_SOURCES = main.cc + +-libxml2ps_a_CPPFLAGS = -I$(top_srcdir)/src +- +-libxml2ps_a_CPPFLAGS += $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) \ ++libxml2ps_la_CPPFLAGS = $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) \ + $(GNOMECANVAS_CFLAGS) + +-xml2ps_CPPFLAGS = $(libxml2ps_a_CPPFLAGS) ++libxml2ps_la_LIBADD =../util/libpptutil.la ../fonts/libfonts.la ../ps/libps.la \ ++ $(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS) + +-xml2ps_LDADD = $(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS)\ +- libxml2ps.a ../fonts/libfonts.a ../ps/libps.a ../util/libpptutil.a ++xml2ps_CPPFLAGS = $(libxml2ps_la_CPPFLAGS) + ++xml2ps_LDADD = libxml2ps.la \ ++ $(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS) ++ + #install DTDs and XSLTs in $(datadir)/xml/passepartout/ (xmldir is defined in configure.ac) + dist_xml_DATA = xml2ps.dtd xhtml.xslt docbook.xslt + +Index: trunk/src/fonts/Makefile.am +=================================================================== +--- trunk/src/fonts/Makefile.am (revision 1530) ++++ trunk/src/fonts/Makefile.am (working copy) +@@ -1,13 +1,15 @@ +-noinst_LIBRARIES = libfonts.a ++noinst_LTLIBRARIES = libfonts.la + + dist_noinst_HEADERS = fontinfo.hh fontmanager.hh fontmetrics.hh afm.hh \ + freetype.hh + +-libfonts_a_SOURCES = fontinfo.cc fontmanager.cc afm.cc freetype.cc ++libfonts_la_SOURCES = fontinfo.cc fontmanager.cc afm.cc freetype.cc + +-libfonts_a_CPPFLAGS = -I$(top_srcdir)/src +- + # for Glib::ustring +-libfonts_a_CPPFLAGS += $(GTKMM_CFLAGS) $(FREETYPE_CFLAGS) ++libfonts_la_CPPFLAGS = $(FREETYPE_CFLAGS) $(GTKMM_CFLAGS) + +-#libfonts_a_LIBADD = $(top_srcdir)/src/util/libpptutil.a +\ No newline at end of file ++libfonts_la_LIBADD = ../util/libpptutil.la $(FREETYPE_LIBS) $(GTKMM_LIBS) ++ ++# can't have explicit circular dependency, so rely on consumers ++# to link against them and us ++#libfonts_la_LIBADD += ../ps/libps.la +Index: trunk/src/Makefile.am +=================================================================== +--- trunk/src/Makefile.am (revision 1530) ++++ trunk/src/Makefile.am (working copy) +@@ -1 +1 @@ +-SUBDIRS = testbed util fonts ps xml2ps pptout ++SUBDIRS = util testbed fonts ps xml2ps pptout +Index: trunk/src/testbed/Makefile.am +=================================================================== +--- trunk/src/testbed/Makefile.am (revision 1530) ++++ trunk/src/testbed/Makefile.am (working copy) +@@ -1,11 +1,18 @@ +-noinst_LIBRARIES = libppttest.a ++noinst_LTLIBRARIES = libppttest.la + + dist_noinst_HEADERS = testbed.hh + +-libppttest_a_SOURCES = testbed.cc ++libppttest_la_SOURCES = testbed.cc + +-libppttest_a_CPPFLAGS = -I$(top_srcdir)/src +- + # Just because Glib::Exception is stupid and doesn't inherit the standard + # exception the testbed has to know about glib! +-libppttest_a_CPPFLAGS += $(GTKMM_CFLAGS) ++libppttest_la_CPPFLAGS = $(GTKMM_CFLAGS) ++ ++libppttest_la_LIBADD = ../util/libpptutil.la $(GTKMM_LIBS) ++ ++TESTS = runtest ++check_PROGRAMS = runtest ++runtest_SOURCES = ../util/test_stringutil.cc ../util/test_valuunit.cc ../util/test_matrix.cc \ ++ ../util/test_boundary.cc ../util/test_procio.cc ../util/test_cmdline.cc ++runtest_CPPFLAGS = $(GTKMM_CFLAGS) ++runtest_LDADD = libppttest.la ../util/libpptutil.la $(GTKMM_LIBS) +Index: trunk/src/pptout/widget/Makefile.am +=================================================================== +--- trunk/src/pptout/widget/Makefile.am (revision 1530) ++++ trunk/src/pptout/widget/Makefile.am (working copy) +@@ -1,13 +1,13 @@ +-noinst_LIBRARIES = libwidget.a ++noinst_LTLIBRARIES = libwidget.la + + dist_noinst_HEADERS = spinner.h filesel.h imagefilesel.h dialogwrap.h \ + subpanel.h wmisc.h errordialog.h usererror.h programs.h \ + zoomer.h + +-libwidget_a_SOURCES = spinner.cc filesel.cc imagefilesel.cc \ ++libwidget_la_SOURCES = spinner.cc filesel.cc imagefilesel.cc \ + dialogwrap.cc subpanel.cc wmisc.cc errordialog.cc \ + usererror.cc programs.cc zoomer.cc + +-libwidget_a_CPPFLAGS = -I$(top_srcdir)/src -D'DOCDIR=$(docdir)' +- +-libwidget_a_CPPFLAGS += $(GTKMM_CFLAGS) $(GNOMEVFS_CFLAGS) $(GNOME_CFLAGS) ++libwidget_la_CPPFLAGS = -DDOCDIR=\"$(docdir)\" ++libwidget_la_CPPFLAGS += $(GTKMM_CFLAGS) $(GNOMEVFS_CFLAGS) $(GNOME_CFLAGS) ++libwidget_la_LIBADD = ../../util/libpptutil.la $(GTKMM_LDFLAGS) $(GNOMEVFS_LDFLAGS) $(GNOME_LDFLAGS) +Index: trunk/src/pptout/document/Makefile.am +=================================================================== +--- trunk/src/pptout/document/Makefile.am (revision 1530) ++++ trunk/src/pptout/document/Makefile.am (working copy) +@@ -1,15 +1,18 @@ +-noinst_LIBRARIES = libdocument.a ++noinst_LTLIBRARIES = libdocument.la + + dist_noinst_HEADERS = basicframe.h cachedframe.h document.h group.h \ + imageframe.h page.h pagent.h rasterframe.h textframe.h \ + textstream.h fileerrors.h paper_sizes.h getxsltparams.h \ + loader.h filecontext.h typesetterthread.h + +-libdocument_a_SOURCES = basicframe.cc cachedframe.cc document.cc \ ++libdocument_la_SOURCES = basicframe.cc cachedframe.cc document.cc \ + group.cc imageframe.cc page.cc pagent.cc rasterframe.cc \ + textframe.cc textstream.cc paper_sizes.cc getxsltparams.cc \ + loader.cc typesetterthread.cc + +-libdocument_a_CPPFLAGS = -I$(top_srcdir)/src ++libdocument_la_CPPFLAGS = $(GTKMM_CFLAGS) $(XMLPP_CFLAGS) + +-libdocument_a_CPPFLAGS += $(GTKMM_CFLAGS) $(XMLPP_CFLAGS) ++# can't get complete symbol resolution here...rasterframe.cc uses ++# config() from ../passepartout-config.o but subdirs build before ++# parent so cannot easily get it ++libdocument_la_LIBADD = ../../util/libpptutil.la ../../ps/libps.la ../../xml2ps/libxml2ps.la ../widget/libwidget.la $(GTKMM_LIBS) $(XMLPP_LIBS) +Index: trunk/src/pptout/Makefile.am +=================================================================== +--- trunk/src/pptout/Makefile.am (revision 1530) ++++ trunk/src/pptout/Makefile.am (working copy) +@@ -1,4 +1,4 @@ +-SUBDIRS = document widget icons ++SUBDIRS = widget document icons + + EXTRA_DIST = NOTES + +@@ -32,19 +32,19 @@ + $(BUILT_SOURCES) \ + $(NULL) + +-passepartout_CPPFLAGS = -I$(top_srcdir)/src -D'XMLPATH=$(xmldir)' ++passepartout_CPPFLAGS = -DXMLPATH=\"$(xmldir)\" + + passepartout_CPPFLAGS += $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) $(GNOMECANVAS_CFLAGS) \ + $(GNOME_CFLAGS) $(GNOMEVFS_CFLAGS) + +-passepartout_LDADD = $(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS) \ +- $(GTHREAD_LIBS) $(GNOME_LIBS) $(GNOMEVFS_LIBS) ++pptpartlibs= document/libdocument.la ../xml2ps/libxml2ps.la \ ++ ../fonts/libfonts.la ../ps/libps.la \ ++ ../util/libpptutil.la widget/libwidget.la + +-pptpartlibs= document/libdocument.a ../xml2ps/libxml2ps.a \ +- ../fonts/libfonts.a ../ps/libps.a \ +- ../util/libpptutil.a widget/libwidget.a ++passepartout_LDADD = $(pptpartlibs) + +-passepartout_LDADD += $(pptpartlibs) ++passepartout_LDADD += $(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS) \ ++ $(GTHREAD_LIBS) $(GNOME_LIBS) $(GNOMEVFS_LIBS) + + # Extra dependencies for builddate, so it is rebuilt every time anything else + # is rebuilt +Index: trunk/src/util/Makefile.am +=================================================================== +--- trunk/src/util/Makefile.am (revision 1530) ++++ trunk/src/util/Makefile.am (working copy) +@@ -1,23 +1,17 @@ +-noinst_LIBRARIES = libpptutil.a ++noinst_LTLIBRARIES = libpptutil.la + + dist_noinst_HEADERS = stringutil.h filesys.h warning.h os.h configfile.h \ + valueunit.h units.h refcount.h matrix.h boundary.h \ + rectboundary.h typeinfo.h barrier.h processman.h tempfile.h \ + filewatcher.h vector.h filedescriptors.h cmdline.h xmlwrap.h + +-libpptutil_a_SOURCES = stringutil.cc filesys.cc warning.cc os.cc \ ++libpptutil_la_SOURCES = stringutil.cc filesys.cc warning.cc os.cc \ + configfile.cc \ + matrix.cc boundary.cc rectboundary.cc typeinfo.cc barrier.cc \ + processman.cc tempfile.cc filewatcher.cc filedescriptors.cc \ + cmdline.cc xmlwrap.cc + + # gtkmm and gnomecanvas flags is needed just to get RefPtr and AffineTrans. +-AM_CPPFLAGS = $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) $(GNOMECANVAS_CFLAGS) ++libpptutil_la_CPPFLAGS = $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) $(GNOMECANVAS_CFLAGS) + +-TESTS = runtest +-check_PROGRAMS = runtest +-runtest_SOURCES = test_stringutil.cc test_valuunit.cc test_matrix.cc \ +- test_boundary.cc test_procio.cc test_cmdline.cc +-runtest_CPPFLAGS = -I$(top_srcdir)/src $(AM_CPPFLAGS) +-runtest_DEPENDENCIES = $(noinst_LIBRARIES) +-runtest_LDADD = -L../testbed -lppttest -L. -lpptutil $(GTKMM_LIBS) $(GNOMECANVAS_LIBS) ++libpptutil_la_LIBADD = $(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS) +Index: trunk/configure.ac +=================================================================== +--- trunk/configure.ac (revision 1530) ++++ trunk/configure.ac (working copy) +@@ -9,14 +9,16 @@ + AM_CONFIG_HEADER(src/defines.h) + # AC_CONFIG_HEADER(src/defines.h) + +-# Define global compiler flags: +-MY_CXXFLAGS="-Wall" +-CXXFLAGS="$CXXFLAGS $MY_CXXFLAGS" ++# We're just a few binaries...not worth doing shared by default? ++AC_DISABLE_SHARED + + # Checks for programs. + AC_PROG_CXX +-AC_PROG_RANLIB ++AC_PROG_LIBTOOL + ++# Define global compiler flags: ++CXXFLAGS="$CXXFLAGS -Wall" ++ + # AC_APPLY_RPATH(LIBS) + # -------------------- + # Add an -rpath linker option for each -L path in LIBS diff --git a/app-office/passepartout/files/passepartout-0.7.0-libxmlpp-2.6-depend.patch b/app-office/passepartout/files/passepartout-0.7.0-libxmlpp-2.6-depend.patch new file mode 100644 index 000000000000..08151e6fe49f --- /dev/null +++ b/app-office/passepartout/files/passepartout-0.7.0-libxmlpp-2.6-depend.patch @@ -0,0 +1,11 @@ +--- trunk/configure.ac 2007/08/08 17:47:27 1527 ++++ trunk/configure.ac 2007/08/09 14:55:36 1529 +@@ -30,7 +30,7 @@ + # check for libxml++ + AC_SUBST([XMLPP_LIBS]) + AC_SUBST([XMLPP_CFLAGS]) +-PKG_CHECK_MODULES([XMLPP], libxml++-1.0 >= 1.0) ++PKG_CHECK_MODULES([XMLPP], libxml++-2.6 >= 1.0) + AC_APPLY_RPATH([XMLPP_LIBS]) + + AC_SUBST([GTKMM_LIBS]) diff --git a/app-office/passepartout/files/passepartout-0.7.0-safer.patch b/app-office/passepartout/files/passepartout-0.7.0-safer.patch new file mode 100644 index 000000000000..4d0e48169c0e --- /dev/null +++ b/app-office/passepartout/files/passepartout-0.7.0-safer.patch @@ -0,0 +1,13 @@ +Index: src/pptout/postscriptviewent.cc +=================================================================== +--- src/pptout/postscriptviewent.cc (revision 1517) ++++ src/pptout/postscriptviewent.cc (arbetskopia) +@@ -143,7 +143,7 @@ + + std::ostringstream tmp; + tmp << psinterpreter //assuming it is ghostscript +- << " -q -dSAFER -dNOPAUSE -dBATCH" ++ << " -q -dSAFE -dNOPAUSE -dBATCH" + << " -sDEVICE=" << preferredDeviceName(); + + // gs doesn't use fontconfig, so give font paths as parameters diff --git a/app-office/passepartout/metadata.xml b/app-office/passepartout/metadata.xml new file mode 100644 index 000000000000..4538a68724a6 --- /dev/null +++ b/app-office/passepartout/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer><email>maintainer-needed@gentoo.org</email></maintainer> +</pkgmetadata> diff --git a/app-office/passepartout/passepartout-0.7.0-r1.ebuild b/app-office/passepartout/passepartout-0.7.0-r1.ebuild new file mode 100644 index 000000000000..66aa40a05070 --- /dev/null +++ b/app-office/passepartout/passepartout-0.7.0-r1.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit autotools base eutils gnome2 libtool + +DESCRIPTION="A DTP application for the X Window System" +HOMEPAGE="http://www.stacken.kth.se/project/pptout/" +SRC_URI="mirror://gnome/sources/passepartout/0.7/passepartout-0.7.0.tar.bz2" + +IUSE="gnome" +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 x86" + +COMMON_DEPS="dev-cpp/libxmlpp:2.6 + >=dev-libs/libxml2-2 + dev-cpp/gtkmm:2.4 + dev-cpp/libgnomecanvasmm:2.6 + dev-libs/glib:2 + dev-libs/libsigc++:2 + media-libs/freetype:2 + virtual/fam + gnome? ( + gnome-base/libgnome + gnome-base/gnome-vfs + ) + " + +RDEPEND="${COMMON_DEPS} + dev-libs/libxslt + app-text/ghostscript-gpl" + +DEPEND="${COMMON_DEPS} + virtual/pkgconfig" + +DOCS="AUTHORS BUGS NEWS README" + +# GCC-4.2 patch: +# http://bugzilla.gnome.org/477017 +# GCC-4.3 patch: +# Snatched from Debian +# http://bugzilla.gnome.org/565131 +# include-flags: +# http://bugzilla.gnome.org/464517 +# libtoolization: +# http://bugzilla.gnome.org/464567 +# libxml-2.6: +# http://bugzilla.gnome.org/449596 + +# The include and libtoolization patches are needed for +# forced as-needed to work. + +PATCHES=( + "${FILESDIR}/${P}-gcc42.patch" + "${FILESDIR}/${P}-gcc43.patch" + "${FILESDIR}/${P}-gcc44.patch" + "${FILESDIR}/${P}-include-flags.patch" + "${FILESDIR}/${P}-libtoolization.patch" + "${FILESDIR}/${P}-safer.patch" + "${FILESDIR}/${P}-libxmlpp-2.6-depend.patch" + "${FILESDIR}/${P}-automake-1.13.patch" + ) + +src_unpack() { + base_src_unpack +} + +src_prepare() { + gnome2_omf_fix + base_src_prepare + eautoreconf + elibtoolize +} + +src_configure() { + # Bug 367867: Broken AC_ARG_WITH + use gnome && G2CONF="--with-gnome" + gnome2_src_configure +} + +src_compile() { + base_src_compile +} + +src_install() { + gnome2_src_install + mv "${D}"/usr/share/doc/${PN}/* "${D}/usr/share/doc/${PF}" || die + rmdir "${D}"/usr/share/doc/${PN}/ || die + make_desktop_entry "/usr/bin/passepartout" "Passepartout DTP" "" "GNOME;Graphics" +} |