Date: Mon, 24 Jun 2002 10:36:52 -0700 (PDT) From: Sean Chittenden <sean@chittenden.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/39793: Fix gnome-- on -CURRENT Message-ID: <20020624173652.D3A23D111C@rand.tgd.net>
next in thread | raw e-mail | index | archive | help
>Number: 39793
>Category: ports
>Synopsis: Fix gnome-- on -CURRENT
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Mon Jun 24 10:40:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Sean Chittenden
>Release: FreeBSD 5.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD rand.tgd.net 5.0-CURRENT FreeBSD 5.0-CURRENT #0: Sun Jun 16 19:32:51 PDT 2002 root@dhcp-263-209:/usr/obj/usr/src/sys/DELLAPTOP i386
>Description:
gnome-- has some C++ bogons that get caught by our C++ compiler
>How-To-Repeat:
cd ${PORTSDIR}/x11-toolkits/gnome11 && make install
>Fix:
Add patch-a[b-e] included in the shar below.
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# files/patch-ab
# files/patch-ac
# files/patch-ad
# files/patch-ae
#
echo x - files/patch-ab
sed 's/^X//' >files/patch-ab << 'END-of-files/patch-ab'
X--- src/gnome--/affinetrans.cc.orig Sun Jun 23 23:35:54 2002
X+++ src/gnome--/affinetrans.cc Sun Jun 23 23:36:09 2002
X@@ -29,7 +29,7 @@
X namespace Art
X {
X
X-AffineTrans::AffineTrans(gdouble scale = 1.0)
X+AffineTrans::AffineTrans(gdouble scale)
X {
X trans_[0] = scale;
X trans_[1] = 0.0;
END-of-files/patch-ab
echo x - files/patch-ac
sed 's/^X//' >files/patch-ac << 'END-of-files/patch-ac'
X--- ./src/gnome--/app.cc.orig Sun Jun 23 23:49:35 2002
X+++ ./src/gnome--/app.cc Mon Jun 24 00:04:26 2002
X@@ -162,13 +162,13 @@
X return w;
X }
X
X-App::Progress App::progress(const Gtk::string &description, Callback cancel=0)
X+App::Progress App::progress(const Gtk::string &description, Callback cancel)
X {
X return Progress(*this, description, cancel);
X }
X
X App::Progress App::progress(const Gtk::string &description, guint32 interval,
X- ProgressCallback percent, Callback cancel=0)
X+ ProgressCallback percent, Callback cancel)
X {
X return Progress(*this, description, interval, percent, cancel);
X }
X@@ -210,7 +210,7 @@
X
X Progress::Progress(Gnome::App& app,
X const Gtk::string &description,
X- Cancel cancel=0)
X+ Cancel cancel)
X {
X ProgressCallbackData *data=new ProgressCallbackData();
X data->cancel=cancel;
X@@ -225,7 +225,7 @@
X const Gtk::string &description,
X guint32 interval,
X Update percent,
X- Cancel cancel=0)
X+ Cancel cancel)
X {
X ProgressCallbackData *data=new ProgressCallbackData();
X data->cancel=cancel;
END-of-files/patch-ac
echo x - files/patch-ad
sed 's/^X//' >files/patch-ad << 'END-of-files/patch-ad'
X--- src/gnome--/clock.cc.orig Mon Jun 24 00:10:55 2002
X+++ src/gnome--/clock.cc Mon Jun 24 00:11:28 2002
X@@ -5,7 +5,7 @@
X #include <gnome--/private/clock_p.h>
X #include <gnome--/construct_copies.h>
X
X-Gtk::Clock::Clock(Type type = REALTIME)
X+Gtk::Clock::Clock(Type type)
X : Gtk::Label(GTK_LABEL(gtk_object_new(get_type(),0)))
X {
X initialize_class();
END-of-files/patch-ad
echo x - files/patch-ae
sed 's/^X//' >files/patch-ae << 'END-of-files/patch-ae'
X--- ./src/gnome--/icon-item.cc.orig Mon Jun 24 01:32:00 2002
X+++ ./src/gnome--/icon-item.cc Mon Jun 24 01:32:13 2002
X@@ -27,7 +27,7 @@
X void Gnome::IconTextItem::configure(int x, int y, int width,
X const Gtk::string &fontname,
X const Gtk::string &text,
X- bool is_editable = true)
X+ bool is_editable)
X {
X gnome_icon_text_item_configure(gtkobj(), x, y, width,
X fontname.c_str(), text.c_str(),
END-of-files/patch-ae
exit
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020624173652.D3A23D111C>