Package: gnome-main-menu
Version: 0.9.12-3
Severity: important
Tags: patch
User: [email protected]
Usertags: kfreebsd
Hi,
the current version fails to build on GNU/kFreeBSD.
It needs to conditionalize support of network-manager
only for linux architectures.
Please apply attached patch and run "autoreconf -vfi"
to renenerate configure and Makefile.in files.
It would also be nice if you can ask upstream
to include source changes.
Thanks in advance
Petr
diff -u gnome-main-menu-0.9.12/debian/control gnome-main-menu-0.9.12/debian/control
--- gnome-main-menu-0.9.12/debian/control
+++ gnome-main-menu-0.9.12/debian/control
@@ -17,9 +17,9 @@
libgnomeui-dev,
libgtop2-dev,
libhal-storage-dev,
- libiw-dev,
- libnm-glib-dev (>= 0.7),
- libnm-util-dev (>= 0.7),
+ libiw-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libnm-glib-dev (>= 0.7) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libnm-util-dev (>= 0.7) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libpanel-applet2-dev,
libpango1.0-dev,
librsvg2-dev
only in patch2:
unchanged:
--- gnome-main-menu-0.9.12.orig/configure.in
+++ gnome-main-menu-0.9.12/configure.in
@@ -61,17 +61,21 @@
AC_SUBST(LIBSLAB_CFLAGS)
AC_SUBST(LIBSLAB_LIBS)
-PKG_CHECK_MODULES(MAIN_MENU, [ $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager libnm_glib >= 0.7.0 hal-storage cairo ])
AC_CHECK_HEADERS(iwlib.h, [ AC_CHECK_LIB(iw, iw_sockets_open, have_iwlib=yes, have_iwlib=no)], have_iwlib=no)
if test "x$have_iwlib" != "xyes" ; then
- AC_ERROR(cannot find iwlib)
+ AC_WARN(cannot find iwlib, proceeding without network manager, wireless)
+ AC_DEFINE(NO_NETMAN, 1, [do not use network manager, wireless])
+ PKG_CHECK_MODULES(MAIN_MENU, [ $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo ])
else
MAIN_MENU_LIBS="$MAIN_MENU_LIBS -liw"
AC_SUBST(MAIN_MENU_LIBS)
+ PKG_CHECK_MODULES(MAIN_MENU, [ $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo NetworkManager libnm_glib >= 0.7.0])
fi
+AM_CONDITIONAL(USE_NETMAN, test x$have_iwlib = xyes)
+
AC_SUBST(MAIN_MENU_CFLAGS)
AC_SUBST(MAIN_MENU_LIBS)
only in patch2:
unchanged:
--- gnome-main-menu-0.9.12.orig/main-menu/src/main-menu-ui.c
+++ gnome-main-menu-0.9.12/main-menu/src/main-menu-ui.c
@@ -41,7 +41,10 @@
#include "directory-tile.h"
#include "system-tile.h"
#include "hard-drive-status-tile.h"
+
+#ifndef NO_NETMAN
#include "network-status-tile.h"
+#endif
#include "tile-table.h"
@@ -721,6 +724,7 @@
gtk_container_add (ctnr, tile);
gtk_widget_show_all (GTK_WIDGET (ctnr));
+#ifndef NO_NETMAN
ctnr = GTK_CONTAINER (glade_xml_get_widget (
priv->main_menu_xml, "network-status-container"));
priv->network_status = network_status_tile_new ();
@@ -733,6 +737,7 @@
gtk_container_add (ctnr, priv->network_status);
gtk_widget_show_all (GTK_WIDGET (ctnr));
+#endif
priv->status_section = glade_xml_get_widget (
priv->main_menu_xml, "slab-status-section");
@@ -1839,7 +1844,9 @@
{
MainMenuUIPrivate *priv = PRIVATE (this);
+#ifndef NO_NETMAN
network_tile_update_status (priv->network_status);
+#endif
update_recently_used_sections (this);
only in patch2:
unchanged:
--- gnome-main-menu-0.9.12.orig/main-menu/src/Makefile.am
+++ gnome-main-menu-0.9.12/main-menu/src/Makefile.am
@@ -15,6 +15,8 @@
-DDATADIR=\""$(datadir)"\" \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
+
+if USE_NETMAN
main_menu_SOURCES = \
main-menu.c \
main-menu-ui.c main-menu-ui.h \
@@ -26,6 +28,17 @@
network-status-info.c network-status-info.h \
tomboykeybinder.c tomboykeybinder.h \
eggaccelerators.c eggaccelerators.h
+else
+main_menu_SOURCES = \
+ main-menu.c \
+ main-menu-ui.c main-menu-ui.h \
+ main-menu-migration.c main-menu-migration.h \
+ tile-table.c tile-table.h \
+ hard-drive-status-tile.c hard-drive-status-tile.h \
+ tomboykeybinder.c tomboykeybinder.h \
+ eggaccelerators.c eggaccelerators.h
+endif
+
main_menu_LDADD = \
$(MAIN_MENU_LIBS) \
