Date: Fri, 18 Jul 2008 11:52:14 GMT From: Lin@FreeBSD.org, Cheng-Tao <b89605222@ntu.edu.tw> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/125744: [maintainer update] x11/lxpanel: patch to fix the build on 6.3 Message-ID: <200807181152.m6IBqElR016896@www.freebsd.org> Resent-Message-ID: <200807181200.m6IC0BVx050264@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 125744
>Category: ports
>Synopsis: [maintainer update] x11/lxpanel: patch to fix the build on 6.3
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Jul 18 12:00:10 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Lin, Cheng-Tao
>Release: FreeBSD 7.0-STABLE amd64
>Organization:
FreeBSD Taiwan
>Environment:
FreeBSD neolitsea 7.0-STABLE FreeBSD 7.0-STABLE #0: Sat Jun 21 22:32:28 CST 2008 root@neolitsea:/usr/obj/usr/src/sys/NEOLITSEA amd64
>Description:
Approve Pietro's patch. It fixed the build on 6.3.
>How-To-Repeat:
>Fix:
diff -ruN lxpanel.orig/Makefile lxpanel/Makefile
--- lxpanel.orig/Makefile 2008-07-17 14:27:33.000000000 +0800
+++ lxpanel/Makefile 2008-07-17 14:28:16.000000000 +0800
@@ -46,10 +46,6 @@
PLIST_SUB+= NLS="@comment "
.endif
-.if ${OSVERSION} < 700000
-BROKEN= does not compile
-.endif
-
pre-patch:
@${REINPLACE_CMD} -e 's,linux,sys,' \
${WRKSRC}/src/plugins/volume/volume-impl.c
diff -ruN lxpanel.orig/files/patch-src-configurator.c lxpanel/files/patch-src-configurator.c
--- lxpanel.orig/files/patch-src-configurator.c 1970-01-01 08:00:00.000000000 +0800
+++ lxpanel/files/patch-src-configurator.c 2008-07-17 14:59:06.000000000 +0800
@@ -0,0 +1,19 @@
+--- src/configurator.c.orig 2008-07-17 14:36:27.000000000 +0800
++++ src/configurator.c 2008-07-17 14:38:36.000000000 +0800
+@@ -46,6 +46,7 @@
+ void restart(void);
+ void gtk_run(void);
+ void panel_config_save(Panel* panel);
++void save_global_config(void);
+ static void logout(void);
+
+ Command commands[] = {
+@@ -532,7 +533,7 @@
+ gtk_box_pack_start( (GtkBox*)GTK_DIALOG(dlg)->vbox, scroll,
+ TRUE, TRUE, 4 );
+ view = (GtkTreeView*)gtk_tree_view_new();
+- gtk_container_add( (GtkContainer*)scroll, view );
++ gtk_container_add( (GtkContainer*)scroll, (GtkWidget*)view );
+ tree_sel = gtk_tree_view_get_selection( view );
+ gtk_tree_selection_set_mode( tree_sel, GTK_SELECTION_BROWSE );
+
diff -ruN lxpanel.orig/files/patch-src-panel.h lxpanel/files/patch-src-panel.h
--- lxpanel.orig/files/patch-src-panel.h 1970-01-01 08:00:00.000000000 +0800
+++ lxpanel/files/patch-src-panel.h 2008-07-17 14:59:20.000000000 +0800
@@ -0,0 +1,10 @@
+--- src/panel.h.orig 2008-07-17 14:40:37.000000000 +0800
++++ src/panel.h 2008-07-17 14:41:21.000000000 +0800
+@@ -190,6 +190,7 @@
+ void panel_set_dock_type(Panel *p);
+ void panel_set_orientation(Panel *p);
+ void panel_update_background( Panel* p );
++void panel_destroy( Panel* p );
+
+ extern const char* lxpanel_get_file_manager();
+ extern const char* lxpanel_get_terminal();
diff -ruN lxpanel.orig/files/patch-src-systray-fixedtip.h lxpanel/files/patch-src-systray-fixedtip.h
--- lxpanel.orig/files/patch-src-systray-fixedtip.h 1970-01-01 08:00:00.000000000 +0800
+++ lxpanel/files/patch-src-systray-fixedtip.h 2008-07-17 14:58:30.000000000 +0800
@@ -0,0 +1,11 @@
+--- src/systray/fixedtip.h.orig 2008-07-17 14:48:22.000000000 +0800
++++ src/systray/fixedtip.h 2008-07-17 14:49:43.000000000 +0800
+@@ -52,6 +52,8 @@
+ void (* clicked) (NaFixedTip *fixedtip);
+ };
+
++ void fixed_tip_hide(void);
++
+ GType na_fixed_tip_get_type (void);
+
+ GtkWidget *na_fixed_tip_new (GtkWidget *parent,
diff -ruN lxpanel.orig/pkg-plist lxpanel/pkg-plist
--- lxpanel.orig/pkg-plist 2008-07-17 14:27:33.000000000 +0800
+++ lxpanel/pkg-plist 2008-07-17 14:28:51.000000000 +0800
@@ -65,7 +65,6 @@
@dirrmtry lib/lxpanel
@dirrm %%DATADIR%%/ui
@dirrm %%DATADIR%%/profile/default/panels
-@dirrm %%DATADIR%%/profile/default/config
@dirrm %%DATADIR%%/profile/default
@dirrm %%DATADIR%%/profile
@dirrm %%DATADIR%%/images
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200807181152.m6IBqElR016896>