Date: 18 Sep 2004 21:09:23 -0000 From: Sergio Mangialardi <sergio@softshark.org> To: FreeBSD-gnats-submit@freebsd.org Cc: ports@freebsd.org Subject: [PATCH] x11-toolkits/inti: fix the build with gcc 3.4, unmark BROKEN Message-ID: <20040918210923.120.qmail@softshark.home>
next in thread | raw e-mail | index | archive | help
>Submitter-Id: current-users
>Originator: Sergio Mangialardi
>Organization:
>Confidential: no
>Synopsis: [PATCH] x11-toolkits/inti: fix the build with gcc 3.4, unmark BROKEN
>Severity: serious
>Priority: low
>Category: ports
>Class: change-request
>Release: FreeBSD 5.2.1-RELEASE-p9 i386
>Environment:
System: FreeBSD ainu.softshark.home 5.2.1-RELEASE-p9 FreeBSD 5.2.1-RELEASE-p9 #10: Sun Jul 4 01:51:04 CEST
>Description:
This patch:
- fixes build with gcc 3.4
- remove the BROKEN mark; the port build properly.
Added file(s):
- files/patch-inti::glib::property.h
- files/patch-inti::glib::thread.h
- files/patch-inti::gtk::childproperty.h
- files/patch-inti::gtk::itemfactory.h
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- inti-1.2_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/x11-toolkits/inti.old/Makefile /usr/ports/x11-toolkits/inti/Makefile
--- /usr/ports/x11-toolkits/inti.old/Makefile Sat Sep 18 20:54:39 2004
+++ /usr/ports/x11-toolkits/inti/Makefile Sat Sep 18 22:41:40 2004
@@ -28,10 +28,6 @@
.include <bsd.port.pre.mk>
-.if ${OSVERSION} >= 502126
-BROKEN= "Does not compile on FreeBSD >= 5.x"
-.endif
-
post-configure:
@${TOUCH} ${WRKSRC}/inti-config.h.in
diff -ruN --exclude=CVS /usr/ports/x11-toolkits/inti.old/files/patch-inti::glib::property.h /usr/ports/x11-toolkits/inti/files/patch-inti::glib::property.h
--- /usr/ports/x11-toolkits/inti.old/files/patch-inti::glib::property.h Thu Jan 1 01:00:00 1970
+++ /usr/ports/x11-toolkits/inti/files/patch-inti::glib::property.h Sat Sep 18 22:41:38 2004
@@ -0,0 +1,17 @@
+--- inti/glib/property.h.orig Sat Sep 18 21:03:00 2004
++++ inti/glib/property.h Sat Sep 18 21:04:01 2004
+@@ -187,12 +187,12 @@
+
+ void get(DataType& data) const
+ {
+- property()->get(object(), data);
++ this->property()->get(this->object(), data);
+ }
+
+ void set(const DataType& data) const
+ {
+- property()->set(object(), data);
++ this->property()->set(this->object(), data);
+ }
+ };
+
diff -ruN --exclude=CVS /usr/ports/x11-toolkits/inti.old/files/patch-inti::glib::thread.h /usr/ports/x11-toolkits/inti/files/patch-inti::glib::thread.h
--- /usr/ports/x11-toolkits/inti.old/files/patch-inti::glib::thread.h Thu Jan 1 01:00:00 1970
+++ /usr/ports/x11-toolkits/inti/files/patch-inti::glib::thread.h Sat Sep 18 22:41:38 2004
@@ -0,0 +1,18 @@
+--- inti/glib/thread.h.orig Sat Sep 18 21:08:25 2004
++++ inti/glib/thread.h Sat Sep 18 21:09:00 2004
+@@ -485,13 +485,13 @@
+
+ Private()
+ {
+- g_static_private_init(g_static_private());
++ g_static_private_init(this->g_static_private());
+ }
+ //!< Constructs and initializes a new private key.
+
+ ~Private()
+ {
+- g_static_private_free(g_static_private());
++ g_static_private_free(this->g_static_private());
+ }
+ //!< Destructor. Frees the private key.
+
diff -ruN --exclude=CVS /usr/ports/x11-toolkits/inti.old/files/patch-inti::gtk::childproperty.h /usr/ports/x11-toolkits/inti/files/patch-inti::gtk::childproperty.h
--- /usr/ports/x11-toolkits/inti.old/files/patch-inti::gtk::childproperty.h Thu Jan 1 01:00:00 1970
+++ /usr/ports/x11-toolkits/inti/files/patch-inti::gtk::childproperty.h Sat Sep 18 22:41:38 2004
@@ -0,0 +1,17 @@
+--- inti/gtk/childproperty.h.orig Sat Sep 18 21:10:17 2004
++++ inti/gtk/childproperty.h Sat Sep 18 21:12:44 2004
+@@ -139,12 +139,12 @@
+
+ void get(const Widget& child, DataType& data) const
+ {
+- property()->get(object(), child, data);
++ this->property()->get(this->object(), child, data);
+ }
+
+ void set(Widget& child, const DataType& data) const
+ {
+- property()->set(object(), child, data);
++ this->property()->set(this->object(), child, data);
+ }
+ };
+
diff -ruN --exclude=CVS /usr/ports/x11-toolkits/inti.old/files/patch-inti::gtk::itemfactory.h /usr/ports/x11-toolkits/inti/files/patch-inti::gtk::itemfactory.h
--- /usr/ports/x11-toolkits/inti.old/files/patch-inti::gtk::itemfactory.h Thu Jan 1 01:00:00 1970
+++ /usr/ports/x11-toolkits/inti/files/patch-inti::gtk::itemfactory.h Sat Sep 18 22:41:38 2004
@@ -0,0 +1,11 @@
+--- inti/gtk/itemfactory.h.orig Sat Sep 18 21:25:05 2004
++++ inti/gtk/itemfactory.h Sat Sep 18 21:26:59 2004
+@@ -373,7 +373,7 @@
+ int i = 0;
+ while ((owner.item_factory_map[i]).path)
+ {
+- delete_entry(item_factory_map[i]);
++ delete_entry(owner.item_factory_map[i]);
+ i++;
+ }
+ }
--- inti-1.2_1.patch ends here ---
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040918210923.120.qmail>