mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-19 19:59:43 +00:00
Update to 0.4
This commit is contained in:
parent
ddca7623dd
commit
bdd0f3722d
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=98450
@ -6,7 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= passepartout
|
||||
PORTVERSION= 0.3
|
||||
PORTVERSION= 0.4
|
||||
CATEGORIES= graphics gnome
|
||||
MASTER_SITES= http://www.stacken.kth.se/project/pptout/files/
|
||||
|
||||
@ -14,7 +14,7 @@ MAINTAINER= gnome@FreeBSD.org
|
||||
COMMENT= DTP application for X
|
||||
|
||||
LIB_DEPENDS= gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtk--2 \
|
||||
xml\\+\\+-0.1:${PORTSDIR}/textproc/libxml++
|
||||
xml\\+\\+-1.0:${PORTSDIR}/textproc/libxml++
|
||||
RUN_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt
|
||||
|
||||
USE_BZIP2= yes
|
||||
@ -32,12 +32,12 @@ MAN= xml2ps.1 passepartout.1x
|
||||
EXTRA_PATCHES= ${PATCHDIR}/extra-patch-old_cxx
|
||||
.endif
|
||||
|
||||
# Fix for recent libxml++ API change
|
||||
post-patch:
|
||||
@${FIND} ${WRKSRC}/src/pptout -name *.cc \
|
||||
| ${GREP} -v -E 'pagesel|undodialog' \
|
||||
| ${XARGS} ${REINPLACE_CMD} \
|
||||
-e 's|add_attribute|set_attribute|' \
|
||||
-e 's|add_content|add_child_text|'
|
||||
.if exists(${LOCALBASE}/lib/libfam.a)
|
||||
WITH_FAM= yes
|
||||
.endif
|
||||
|
||||
.if defined(WITH_FAM)
|
||||
LIB_DEPENDS+= fam.0:${PORTSDIR}/devel/fam
|
||||
.endif
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
|
@ -1 +1 @@
|
||||
MD5 (passepartout-0.3.tar.bz2) = 84ca77ac477b3ae53b841023e78adc44
|
||||
MD5 (passepartout-0.4.tar.bz2) = 45bcf993d165daa654b6f9bce4160be2
|
||||
|
@ -59,3 +59,34 @@
|
||||
}
|
||||
}
|
||||
|
||||
--- src/util/stringutil.cc.orig Sat Jan 17 23:00:21 2004
|
||||
+++ src/util/stringutil.cc Sat Jan 17 23:03:14 2004
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
bool whitespace(char c)
|
||||
{
|
||||
- return std::isspace(c);
|
||||
+ return isspace(c);
|
||||
}
|
||||
|
||||
std::string strip_whitespace(std::string s, bool front, bool back)
|
||||
--- src/util/cmdline.cc.orig Mon Jan 12 14:01:33 2004
|
||||
+++ src/util/cmdline.cc Sun Jan 18 00:06:17 2004
|
||||
@@ -75,7 +75,7 @@
|
||||
|
||||
// end of arguments
|
||||
if(argi == arguments.end())
|
||||
- return std::make_pair(null_option, "");
|
||||
+ return std::make_pair(null_option, std::string());
|
||||
|
||||
// not an option
|
||||
if(argi->at(0) != '-' || seen_double_dash || *argi == "-")
|
||||
@@ -146,7 +146,7 @@
|
||||
break;
|
||||
}
|
||||
} else { // not REQ_PARAM
|
||||
- arg_queue.push(std::make_pair(option->id, ""));
|
||||
+ arg_queue.push(std::make_pair(option->id, std::string()));
|
||||
}
|
||||
}
|
||||
argi++;
|
||||
|
@ -0,0 +1,10 @@
|
||||
--- src/pptout/document/getxsltparams.cc.orig Sun Jan 18 00:22:12 2004
|
||||
+++ src/pptout/document/getxsltparams.cc Sun Jan 18 00:22:54 2004
|
||||
@@ -3,6 +3,7 @@
|
||||
///
|
||||
#include <libxml++/libxml++.h>
|
||||
#include <fstream>
|
||||
+#include <algorithm>
|
||||
|
||||
class XsltParamsFinder : public xmlpp::SaxParser {
|
||||
public:
|
@ -1,10 +0,0 @@
|
||||
--- src/util/filewatcher.h.orig Sun Nov 2 11:53:06 2003
|
||||
+++ src/util/filewatcher.h Sun Nov 2 11:53:23 2003
|
||||
@@ -5,6 +5,7 @@
|
||||
///
|
||||
#include <sigc++/sigc++.h>
|
||||
#include <string>
|
||||
+#include <sys/time.h>
|
||||
|
||||
class File_Watcher: public SigC::Object {
|
||||
public:
|
@ -1,53 +0,0 @@
|
||||
--- 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;
|
@ -1,5 +1,5 @@
|
||||
--- src/testbed/testbed.cc.orig Fri Oct 31 20:36:24 2003
|
||||
+++ src/testbed/testbed.cc Fri Oct 31 20:39:09 2003
|
||||
--- src/testbed/testbed.cc.orig Sat Jan 17 22:58:16 2004
|
||||
+++ src/testbed/testbed.cc Sat Jan 17 22:42:18 2004
|
||||
@@ -1,6 +1,7 @@
|
||||
#include "testbed.hh"
|
||||
#include "util/warning.h"
|
||||
@ -7,7 +7,7 @@
|
||||
+#include <algorithm>
|
||||
#include <functional>
|
||||
///
|
||||
// Copyright (C) 2003, Fredrik Arnerup & Rasmus Kaj, See COPYING
|
||||
// Copyright (C) 2003, 2004, Fredrik Arnerup & Rasmus Kaj, See COPYING
|
||||
@@ -53,7 +54,7 @@
|
||||
verbose.active = true;
|
||||
verbose << "Starting test run. " << TestCase::cases.size()
|
||||
|
10
graphics/passepartout/files/patch-src::util::cmdline.cc
Normal file
10
graphics/passepartout/files/patch-src::util::cmdline.cc
Normal file
@ -0,0 +1,10 @@
|
||||
--- src/util/cmdline.cc.orig Sat Jan 17 23:49:30 2004
|
||||
+++ src/util/cmdline.cc Sat Jan 17 23:50:03 2004
|
||||
@@ -2,6 +2,7 @@
|
||||
// Copyright (C) 2003, 2004, Fredrik Arnerup & Rasmus Kaj, See COPYING
|
||||
///
|
||||
#include "cmdline.h"
|
||||
+#include <algorithm>
|
||||
|
||||
CmdLine::CmdLine(int argc, char **argv) : seen_double_dash(false)
|
||||
{
|
@ -1,16 +1,11 @@
|
||||
--- src/util/filesys.cc.orig Thu Oct 30 22:42:31 2003
|
||||
+++ src/util/filesys.cc Fri Nov 21 16:31:15 2003
|
||||
@@ -6,11 +6,13 @@
|
||||
--- src/util/filesys.cc.orig Sat Jan 17 23:18:22 2004
|
||||
+++ src/util/filesys.cc Sat Jan 17 23:19:26 2004
|
||||
@@ -4,6 +4,8 @@
|
||||
#include "filesys.h"
|
||||
#include "stringutil.h"
|
||||
#include "os.h"
|
||||
+#include <errno.h>
|
||||
+#include <memory>
|
||||
#include <unistd.h>
|
||||
#include <stdexcept>
|
||||
+#include <memory>
|
||||
#include "defines.h"
|
||||
#ifndef HAVE_MKDTEMP
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#endif
|
||||
+#include <errno.h>
|
||||
|
||||
using std::string;
|
||||
|
||||
|
10
graphics/passepartout/files/patch-src::util::filesys.h
Normal file
10
graphics/passepartout/files/patch-src::util::filesys.h
Normal file
@ -0,0 +1,10 @@
|
||||
--- src/util/filesys.h.orig Mon Jan 12 14:01:33 2004
|
||||
+++ src/util/filesys.h Sat Jan 17 23:40:36 2004
|
||||
@@ -6,6 +6,7 @@
|
||||
#include <string>
|
||||
#include <ios> // mode for access
|
||||
#include <stdexcept>
|
||||
+#include <time.h>
|
||||
|
||||
/// An exception to use when a libc call fails and sets errno.
|
||||
class ClibException : public std::runtime_error {
|
10
graphics/passepartout/files/patch-src::util::filewatcher.h
Normal file
10
graphics/passepartout/files/patch-src::util::filewatcher.h
Normal file
@ -0,0 +1,10 @@
|
||||
--- src/util/filewatcher.h Sat Jan 17 23:45:10 2004
|
||||
+++ src/util/filewatcher.h.orig Sat Jan 17 23:44:57 2004
|
||||
@@ -6,7 +6,8 @@
|
||||
#include <sigc++/sigc++.h>
|
||||
#include <string>
|
||||
#include <memory>
|
||||
+#include <time.h>
|
||||
|
||||
namespace FAM { class File; }
|
||||
|
@ -1,11 +0,0 @@
|
||||
--- src/util/stringutil.cc.orig Fri Oct 31 20:40:15 2003
|
||||
+++ src/util/stringutil.cc Fri Oct 31 20:44:29 2003
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
bool whitespace(char c)
|
||||
{
|
||||
- return std::isspace(c);
|
||||
+ return isspace(c);
|
||||
}
|
||||
|
||||
std::string strip_whitespace(std::string s, bool front, bool back)
|
Loading…
Reference in New Issue
Block a user