Fix: Patch attached with submission follows:
Maintainer of deskutils/global-menu, Please note that PR ports/152678 has just been submitted. If it contains a patch for an upgrade, an enhancement or a bug fix you agree on, reply to this email stating that you approve the patch and a committer will take care of it. The full text of the PR can be found at: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/152678 -- Edwin Groothuis via the GNATS Auto Assign Tool edwin@FreeBSD.org
State Changed From-To: open->feedback Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Responsible Changed From-To: freebsd-ports-bugs->amdmi3 I'll take it.
I'll check it as soon as possible and report. Thanks. Enviat des del meu iTotxo
I tested it with gnome 2.32 under FreeBSD gusiport 9.0-CURRENT-201011, didn't test it under xfce. I checked the files installed by they remove clean. The ports sets the PORTREVISION to 0, portlint complais about this, so I'm attaching a simple modification that removes this issue. For the rest, it does fine for so I would approve it. Thanks for the patch. Gustau
* Gustau P=C3=A9rez (gustau.perez@gmail.com) wrote: > I tested it with gnome 2.32 under FreeBSD gusiport=20 > 9.0-CURRENT-201011, didn't test it under xfce. I checked the files=20 > installed by they remove clean. The ports sets the PORTREVISION to 0,=20 > portlint complais about this, so I'm attaching a simple modification=20 > that removes this issue. The plist contains some dirrm(try)'s for mtree directories that shouldn't be there, which I've removed. Here's modified patch: http://people.freebsd.org/~amdmi3/globalmenu.patch however, plist is incomplete and the port does leave files on deinstallation: http://people.freebsd.org/~amdmi3/gnome-globalmenu-0.7.10.log Also, to both submitter and maintainer: next time please send updates as patches. --=20 Dmitry Marakasov . 55B5 0596 FF1E 8D84 5F56 9510 D35A 80DD F9D2 F77D amdmi3@amdmi3.ru ..: jabber: amdmi3@jabber.ru http://www.amdmi3.ru
diff --git a/global-menu-cur/Makefile b/global-menu/Makefile index a038dea..473281d 100644 --- Makefile +++ Makefile @@ -2,12 +2,11 @@ # Date created: 27 February 2009 # Whom: Gustavo Perez # -# $FreeBSD: ports/deskutils/global-menu/Makefile,v 1.12 2010/12/04 07:30:53 ade Exp $ +# $FreeBSD: ports/deskutils/global-menu/Makefile,v 1.11 2010/10/16 11:51:53 ade Exp $ # PORTNAME= gnome-globalmenu -PORTVERSION= 0.7.5 -PORTREVISION= 6 +PORTVERSION= 0.7.10 CATEGORIES= deskutils MASTER_SITES= http://gnome2-globalmenu.googlecode.com/files/ @@ -24,14 +23,28 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool automake:env autoheader:env INSTALLS_ICONS= yes + +OPTIONS+= XFCE4_PANEL "Xfce panel applet" Off + +.include <bsd.port.options.mk> + CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +.if defined(WITHOUT_XFCE4_PANEL) +CONFIGURE_ARGS+= --without-xfce4-panel +PLIST_SUB+= XFCE4_PANEL="@comment " +.else +LIB_DEPENDS+= libxfce4panel-1.0:${PORTSDIR}/x11-wm/xfce4-panel +CONFIGURE_ARGS+= --with-xfce4-panel +PLIST_SUB+= XFCE4_PANEL="" +.endif + .if !defined(WITHOUT_NLS) USE_GETTEXT= yes PLIST_SUB+= NLS="" .else -CONFIGURE_ARGS+=--disable-nls +CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " .endif diff --git a/global-menu-cur/distinfo b/global-menu/distinfo index 671d0a8..695933f 100644 --- distinfo +++ distinfo @@ -1,3 +1,2 @@ -MD5 (gnome-globalmenu-0.7.5.tar.bz2) = bafbad33ad43ba401d228dbaa10f26a0 -SHA256 (gnome-globalmenu-0.7.5.tar.bz2) = d628604c9623587cdb8b1459b6acee7a038faa2380d814ced27a22a72839d4db -SIZE (gnome-globalmenu-0.7.5.tar.bz2) = 623230 +SHA256 (gnome-globalmenu-0.7.10.tar.bz2) = 5ce762e99ad033a64bb99ebc7d30159ee3225a88663e1d8585a8499174a12b89 +SIZE (gnome-globalmenu-0.7.10.tar.bz2) = 565247 diff --git a/global-menu-cur/files/patch-makefile.am b/global-menu/files/patch-makefile.am index f582c8b..808c6fe 100644 --- files/patch-makefile.am +++ files/patch-makefile.am @@ -1,11 +1,11 @@ ---- libgnomenu/Makefile.am.orig 2009-04-27 10:04:37.000000000 +0200 -+++ libgnomenu/Makefile.am 2009-04-27 10:05:43.000000000 +0200 -@@ -32,7 +32,7 @@ - libgnomenu_la_LIBADD = $(GTK_LIBS) $(WNCK_LIBS) $(X11_LIBS) ../libcompat/libcompat.la - libgnomenu_la_LDFLAGS = -version-info 2:0:0 -release $(VERSION) -no-undefined -Wl,--as-needed +--- libserver/Makefile.am.orig 2010-11-29 16:10:04.000000000 +0200 ++++ libserver/Makefile.am 2010-11-29 16:10:11.000000000 +0200 +@@ -31,7 +31,7 @@ + libglobalmenu_server_includedir = $(includedir)/gnome-globalmenu + libglobalmenu_server_include_HEADERS = globalmenu-server.h -pkgconfigdir = $(libdir)/pkgconfig +pkgconfigdir = $(prefix)/libdata/pkgconfig - pkgconfig_DATA = libgnomenu.pc + pkgconfig_DATA = globalmenu-server.pc - libgnomenu_includedir = $(includedir)/libgnomenu + libglobalmenu_server_la_SOURCES = \ diff --git a/global-menu-cur/files/patch-makefile.in b/global-menu/files/patch-makefile.in index 23c9879..244905d 100644 --- files/patch-makefile.in +++ files/patch-makefile.in @@ -1,11 +1,11 @@ ---- libgnomenu/Makefile.in.orig 2009-04-27 10:06:46.000000000 +0200 -+++ libgnomenu/Makefile.in 2009-04-27 10:07:20.000000000 +0200 -@@ -324,7 +324,7 @@ - libgnomenu_la_CPPFLAGS = -I$(top_srcdir) $(GTK_CFLAGS) $(WNCK_CFLAGS) $(X11_CFLAGS) -include $(CONFIG_HEADER) -DWNCK_I_KNOW_THIS_IS_UNSTABLE - libgnomenu_la_LIBADD = $(GTK_LIBS) $(WNCK_LIBS) $(X11_LIBS) ../libcompat/libcompat.la - libgnomenu_la_LDFLAGS = -version-info 2:0:0 -release $(VERSION) -no-undefined -Wl,--as-needed +--- libserver/Makefile.in.orig 2010-11-29 16:10:57.000000000 +0200 ++++ libserver/Makefile.in 2010-11-29 16:11:26.000000000 +0200 +@@ -325,7 +325,7 @@ + lib_LTLIBRARIES = libglobalmenu-server.la + libglobalmenu_server_includedir = $(includedir)/gnome-globalmenu + libglobalmenu_server_include_HEADERS = globalmenu-server.h -pkgconfigdir = $(libdir)/pkgconfig +pkgconfigdir = $(prefix)/libdata/pkgconfig - pkgconfig_DATA = libgnomenu.pc - libgnomenu_includedir = $(includedir)/libgnomenu - libgnomenu_include_HEADERS = $(VALASOURCES:.vala=.h) + pkgconfig_DATA = globalmenu-server.pc + libglobalmenu_server_la_SOURCES = \ + $(VALASOURCES:.vala=.c) \ diff --git a/global-menu-cur/files/patch-menuitem.c b/global-menu/files/patch-menuitem.c index 9e79673..b98c2cf 100644 --- files/patch-menuitem.c +++ files/patch-menuitem.c @@ -1,9 +1,9 @@ ---- libgnomenu/menuitem.c.old 2009-06-03 12:00:59.000000000 +0200 -+++ libgnomenu/menuitem.c 2009-06-03 12:01:05.000000000 +0200 -@@ -128,7 +128,7 @@ +--- libserver/widgets/menuitem.c.orig 2010-11-29 16:07:02.000000000 +0200 ++++ libserver/widgets/menuitem.c 2010-11-29 16:07:09.000000000 +0200 +@@ -358,7 +358,7 @@ + _tmp0_ = FALSE; } - if (_tmp0) { - g_debug ("menuitem.vala:81: maybe?"); + if (_tmp0_) { - if (gtk_menu_item_get_submenu ((GtkMenuItem*) self) != GTK_MENU (self->_submenu_cache)) { + if (gtk_menu_item_get_submenu ((GtkMenuItem*) self) != (GtkWidget*) GTK_MENU (self->_submenu_cache)) { gtk_menu_item_set_submenu ((GtkMenuItem*) self, (GtkMenu*) self->_submenu_cache); diff --git a/global-menu-cur/pkg-plist b/global-menu/pkg-plist index f03c576..db060d0 100644 --- pkg-plist +++ pkg-plist @@ -1,60 +1,57 @@ -include/libgnomenu/application.h -include/libgnomenu/globalmenu.h -include/libgnomenu/gnomenu.h -include/libgnomenu/helper.h -include/libgnomenu/interface-item.h -include/libgnomenu/interface-shell.h -include/libgnomenu/keygrab.h -include/libgnomenu/label.h -include/libgnomenu/menu.h -include/libgnomenu/menubar.h -include/libgnomenu/menubarbox.h -include/libgnomenu/menuitem.h -include/libgnomenu/menushellutils.h -include/libgnomenu/monitor.h -include/libgnomenu/parser.h -include/libgnomenu/serializer.h -include/libgnomenu/window.h +bin/globalmenu-settings +include/gnome-globalmenu/globalmenu-server.h lib/bonobo/servers/GlobalMenu_PanelApplet.server -lib/gtk-2.0/modules/libglobalmenu-gnome-0.7.5.so -lib/gtk-2.0/modules/libglobalmenu-gnome.la -lib/gtk-2.0/modules/libglobalmenu-gnome.so -lib/libgnomenu-0.7.5.so -lib/libgnomenu-0.7.5.so.2 -lib/libgnomenu.la -lib/libgnomenu.so -libdata/pkgconfig/libgnomenu.pc +lib/libglobalmenu-server.la +lib/libglobalmenu-server.so +lib/libglobalmenu-server.so.3 +libdata/pkgconfig/globalmenu-server.pc libdata/bonobo/servers/GlobalMenu_PanelApplet.server +lib/gtk-2.0/modules/libglobalmenu-plugin.so +lib/gtk-2.0/modules/libglobalmenu-plugin.la +lib/gtk-2.0/modules/libglobalmenu-gnome-panel.so +lib/gtk-2.0/modules/libglobalmenu-gnome-panel.la libexec/GlobalMenu.PanelApplet -%%DOCSDIR%%/AUTHORS +%%DOCSDIR%%/README %%DOCSDIR%%/COPYING %%DOCSDIR%%/ChangeLog +%%DOCSDIR%%/AUTHORS %%DOCSDIR%%/INSTALL -%%DOCSDIR%%/README -%%DOCSDIR%%/README.GNOME %%DOCSDIR%%/README.XFCE +%%DOCSDIR%%/README.GNOME +%%DOCSDIR%%/README.LEGACY +share/locale/ca/LC_MESSAGES/gnome-globalmenu.mo +share/locale/da/LC_MESSAGES/gnome-globalmenu.mo share/locale/de/LC_MESSAGES/gnome-globalmenu.mo share/locale/en_GB/LC_MESSAGES/gnome-globalmenu.mo +share/locale/eo/LC_MESSAGES/gnome-globalmenu.mo share/locale/es/LC_MESSAGES/gnome-globalmenu.mo share/locale/fi/LC_MESSAGES/gnome-globalmenu.mo share/locale/fr/LC_MESSAGES/gnome-globalmenu.mo +share/locale/gl/LC_MESSAGES/gnome-globalmenu.mo +share/locale/he/LC_MESSAGES/gnome-globalmenu.mo share/locale/hu/LC_MESSAGES/gnome-globalmenu.mo share/locale/id/LC_MESSAGES/gnome-globalmenu.mo share/locale/it/LC_MESSAGES/gnome-globalmenu.mo share/locale/ko/LC_MESSAGES/gnome-globalmenu.mo +share/locale/lt/LC_MESSAGES/gnome-globalmenu.mo +share/locale/nb/LC_MESSAGES/gnome-globalmenu.mo share/locale/nl/LC_MESSAGES/gnome-globalmenu.mo share/locale/pl/LC_MESSAGES/gnome-globalmenu.mo share/locale/pt/LC_MESSAGES/gnome-globalmenu.mo share/locale/pt_BR/LC_MESSAGES/gnome-globalmenu.mo +share/locale/ro/LC_MESSAGES/gnome-globalmenu.mo share/locale/ru/LC_MESSAGES/gnome-globalmenu.mo +share/locale/sk/LC_MESSAGES/gnome-globalmenu.mo share/locale/sv/LC_MESSAGES/gnome-globalmenu.mo +share/locale/te/LC_MESSAGES/gnome-globalmenu.mo +share/locale/tr/LC_MESSAGES/gnome-globalmenu.mo +share/locale/uk/LC_MESSAGES/gnome-globalmenu.mo share/locale/zh_CN/LC_MESSAGES/gnome-globalmenu.mo share/pixmaps/globalmenu.png -@dirrmtry share/locale -@dirrmtry share/pixmaps -@dirrmtry include/libgnomenu -@dirrmtry libdata/pkgconfig -@dirrmtry libexec +@dirrm include/gnome-globalmenu +@dirrmtry etc/gconf/gconf.xml.defaults +@dirrmtry etc/gconf/schemas +@dirrmtry etc/gconf @dirrmtry lib/bonobo/servers @dirrmtry libdata/bonobo/servers @dirrm %%DOCSDIR%%
Responsible Changed From-To: amdmi3->portmgr Release PR due to ENOTIME
State Changed From-To: feedback->open Note that feedback was received.
Responsible Changed From-To: portmgr->freebsd-ports-bugs Apparently assigned to portmgr by mistake.
State Changed From-To: open->feedback The last patch is corrupted, care to re-submit?
Responsible Changed From-To: freebsd-ports-bugs->pav Track
State Changed From-To: feedback->closed Committed, thanks!
pav 2011-03-17 17:24:07 UTC FreeBSD ports repository Modified files: deskutils/global-menu Makefile distinfo pkg-plist deskutils/global-menu/files patch-makefile.am patch-makefile.in patch-menuitem.c Log: - Update to 0.7.10 PR: ports/152678 Submitted by: Ivan Klymenko <fidaj@ukr.net> Approved by: maintainer Revision Changes Path 1.13 +16 -3 ports/deskutils/global-menu/Makefile 1.2 +2 -3 ports/deskutils/global-menu/distinfo 1.2 +7 -7 ports/deskutils/global-menu/files/patch-makefile.am 1.2 +9 -9 ports/deskutils/global-menu/files/patch-makefile.in 1.2 +5 -5 ports/deskutils/global-menu/files/patch-menuitem.c 1.2 +30 -33 ports/deskutils/global-menu/pkg-plist _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"