diff options
5 files changed, 107 insertions, 11 deletions
diff --git a/graphics/passepartout/files/extra-patch-old_cxx b/graphics/passepartout/files/extra-patch-old_cxx index 38bb797fadbd..1854eed256f6 100644 --- a/graphics/passepartout/files/extra-patch-old_cxx +++ b/graphics/passepartout/files/extra-patch-old_cxx @@ -24,17 +24,6 @@ } #ifdef PFB2PFA_STANDALONE ---- src/util/filesys.h.orig Fri Oct 31 20:47:03 2003 -+++ src/util/filesys.h Fri Oct 31 20:52:19 2003 -@@ -4,7 +4,7 @@ - // Copyright (C) 2002, 2003, Fredrik Arnerup & Rasmus Kaj, See COPYING - /// - #include <string> --#include <ios> // mode for access -+#include <iostream> // mode for access - - // Check if the specified file exists - bool exists(const std::string& filename); --- src/pptout/docview.cc.orig Sun Nov 2 11:56:40 2003 +++ src/pptout/docview.cc Sun Nov 2 12:04:37 2003 @@ -467,7 +467,7 @@ @@ -46,3 +35,27 @@ } void Document_View::cut() { +--- src/util/filesys.h.orig Fri Sep 19 16:46:08 2003 ++++ src/util/filesys.h Thu Dec 4 03:59:31 2003 +@@ -4,7 +4,8 @@ + // Copyright (C) 2002, 2003, Fredrik Arnerup & Rasmus Kaj, See COPYING + /// + #include <string> +-#include <ios> // mode for access ++//#include <ios> // mode for access ++#include <iostream> + #include <stdexcept> + + /** +--- src/fonts/fontmetrics.cc.orig Thu Dec 4 04:08:47 2003 ++++ src/fonts/fontmetrics.cc Thu Dec 4 10:06:36 2003 +@@ -109,7 +109,8 @@ + cerr << " found " << ch << "!\n"; + #endif + } +- source.ignore(std::numeric_limits<std::streamsize>::max(), '\n'); ++// source.ignore(std::numeric_limits<std::streamsize>::max(), '\n'); ++ source.ignore(UINT_MAX,'\n'); + } + } + diff --git a/graphics/passepartout/files/patch-src::pptout::document::textstream.h b/graphics/passepartout/files/patch-src::pptout::document::textstream.h new file mode 100644 index 000000000000..522dee52f34c --- /dev/null +++ b/graphics/passepartout/files/patch-src::pptout::document::textstream.h @@ -0,0 +1,10 @@ +--- src/pptout/document/textstream.h.orig Thu Dec 4 10:27:38 2003 ++++ src/pptout/document/textstream.h Thu Dec 4 10:46:07 2003 +@@ -90,6 +90,7 @@ + std::map<const TextFrame*, unsigned int> pageno_map; + + class WorkerThread; ++ friend class WorkerThread; + Glib::RefPtr<WorkerThread> typesetter_thread; + + // Undefined ctors, avoid defaults diff --git a/graphics/passepartout/files/patch-src::pptout::pagent.cc b/graphics/passepartout/files/patch-src::pptout::pagent.cc new file mode 100644 index 000000000000..d081632cf0fc --- /dev/null +++ b/graphics/passepartout/files/patch-src::pptout::pagent.cc @@ -0,0 +1,53 @@ +--- src/pptout/document/pagent.cc.orig Thu Dec 4 10:24:15 2003 ++++ src/pptout/document/pagent.cc Thu Dec 4 10:25:23 2003 +@@ -77,8 +77,8 @@ + new_w(w), new_h(h), + old_w(pagent.get_width()), old_h(pagent.get_height()) + {} +- void undo() const {pagent.set_size(new_w, new_h, false);} +- void redo() const {pagent.set_size(old_w, old_h, false);} ++ void undo() const {pagent.set_size(new_w, new_h);} ++ void redo() const {pagent.set_size(old_w, old_h);} + private: + Pagent &pagent; + float new_w, new_h, old_w, old_h; +@@ -104,7 +104,7 @@ + Action(locked ? "Lock" : "Unlock"), + pagent(_pagent) + {} +- void undo() const {pagent.set_lock(!pagent.get_lock(), false);} ++ void undo() const {pagent.set_lock(!pagent.get_lock());} + void redo() const {undo();} + private: + Pagent &pagent; +@@ -131,7 +131,7 @@ + pagent(_pagent) + {} + void undo() const +- {pagent.set_flow_around(!pagent.get_flow_around(), false);} ++ {pagent.set_flow_around(!pagent.get_flow_around());} + void redo() const {undo();} + private: + Pagent &pagent; +@@ -155,8 +155,8 @@ + pagent(_pagent), + old_margin(pagent.get_obstacle_margin()), new_margin(margin) + {} +- void undo() const {pagent.set_obstacle_margin(old_margin, false);} +- void redo() const {pagent.set_obstacle_margin(new_margin, false);} ++ void undo() const {pagent.set_obstacle_margin(old_margin);} ++ void redo() const {pagent.set_obstacle_margin(new_margin);} + private: + Pagent &pagent; + float old_margin, new_margin; +@@ -181,8 +181,8 @@ + Action("Rename"), + pagent(_pagent), old_name(pagent.get_name()), new_name(name) + {} +- void undo() const {pagent.set_name(old_name, false);} +- void redo() const {pagent.set_name(new_name, false);} ++ void undo() const {pagent.set_name(old_name);} ++ void redo() const {pagent.set_name(new_name);} + private: + Pagent &pagent; + std::string old_name, new_name; diff --git a/graphics/passepartout/files/patch-src::pptout::postscriptviewent.h b/graphics/passepartout/files/patch-src::pptout::postscriptviewent.h new file mode 100644 index 000000000000..7ed0624d528d --- /dev/null +++ b/graphics/passepartout/files/patch-src::pptout::postscriptviewent.h @@ -0,0 +1,10 @@ +--- src/pptout/postscriptviewent.h.orig Thu Dec 4 10:51:01 2003 ++++ src/pptout/postscriptviewent.h Thu Dec 4 10:56:37 2003 +@@ -5,6 +5,7 @@ + /// + #include "viewent.h" + #include "document/cachedframe.h" ++#include <unistd.h> + + class PostscriptViewent : public Viewent { + protected: diff --git a/graphics/passepartout/files/patch-src::util::processman.h b/graphics/passepartout/files/patch-src::util::processman.h new file mode 100644 index 000000000000..9157b13909b8 --- /dev/null +++ b/graphics/passepartout/files/patch-src::util::processman.h @@ -0,0 +1,10 @@ +--- src/util/processman.h.orig Thu Dec 4 04:05:14 2003 ++++ src/util/processman.h Thu Dec 4 04:03:33 2003 +@@ -6,6 +6,7 @@ + #include "refcount.h" + #include <map> + #include <string> ++#include <memory> + #include <sigc++/object.h> + #include <sys/types.h> + #include <gtkmm/main.h> |