Date: Thu, 17 Mar 2011 15:51:48 +0200 From: Ivan Klymenko <fidaj@ukr.net> To: pav@FreeBSD.org Cc: gustau.perez@gmail.com, freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/152678: [update] deskutils/global-menu to 0.7.10 Message-ID: <20110317155148.0b79a141@ukr.net> In-Reply-To: <201103171332.p2HDW72n001037@freefall.freebsd.org> References: <201103171332.p2HDW72n001037@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
=D0=92 Thu, 17 Mar 2011 13:32:07 GMT pav@FreeBSD.org =D0=BF=D0=B8=D1=88=D0=B5=D1=82: > Synopsis: [update] deskutils/global-menu to 0.7.10 >=20 > State-Changed-From-To: open->feedback > State-Changed-By: pav > State-Changed-When: Thu Mar 17 13:30:20 UTC 2011 > State-Changed-Why:=20 > The last patch is corrupted, care to re-submit? >=20 >=20 > Responsible-Changed-From-To: freebsd-ports-bugs->pav > Responsible-Changed-By: pav > Responsible-Changed-When: Thu Mar 17 13:30:20 UTC 2011 > Responsible-Changed-Why:=20 > Track >=20 > http://www.freebsd.org/cgi/query-pr.cgi?pr=3D152678 >=20 >=20 because there is a problem with attach a file to the letter. 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:5= 3 ade Exp $ +# $FreeBSD: ports/deskutils/global-menu/Makefile,v 1.11 2010/10/16 11:51:5= 3 ade Exp $ # =20 PORTNAME=3D gnome-globalmenu -PORTVERSION=3D 0.7.5 -PORTREVISION=3D 6 +PORTVERSION=3D 0.7.10 CATEGORIES=3D deskutils MASTER_SITES=3D http://gnome2-globalmenu.googlecode.com/files/ =20 @@ -24,14 +23,28 @@ GNU_CONFIGURE=3D yes USE_GMAKE=3D yes USE_AUTOTOOLS=3D libtool automake:env autoheader:env INSTALLS_ICONS=3D yes + +OPTIONS+=3D XFCE4_PANEL "Xfce panel applet" Off + +.include <bsd.port.options.mk> + CONFIGURE_ENV=3D CPPFLAGS=3D"-I${LOCALBASE}/include" \ LDFLAGS=3D"-L${LOCALBASE}/lib" =20 +.if defined(WITHOUT_XFCE4_PANEL) +CONFIGURE_ARGS+=3D --without-xfce4-panel +PLIST_SUB+=3D XFCE4_PANEL=3D"@comment " +.else +LIB_DEPENDS+=3D libxfce4panel-1.0:${PORTSDIR}/x11-wm/xfce4-panel +CONFIGURE_ARGS+=3D --with-xfce4-panel +PLIST_SUB+=3D XFCE4_PANEL=3D"" +.endif + .if !defined(WITHOUT_NLS) USE_GETTEXT=3D yes PLIST_SUB+=3D NLS=3D"" .else -CONFIGURE_ARGS+=3D--disable-nls +CONFIGURE_ARGS+=3D --disable-nls PLIST_SUB+=3D NLS=3D"@comment " .endif =20 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) =3D bafbad33ad43ba401d228dbaa10f26a0 -SHA256 (gnome-globalmenu-0.7.5.tar.bz2) =3D d628604c9623587cdb8b1459b6acee= 7a038faa2380d814ced27a22a72839d4db -SIZE (gnome-globalmenu-0.7.5.tar.bz2) =3D 623230 +SHA256 (gnome-globalmenu-0.7.10.tar.bz2) =3D 5ce762e99ad033a64bb99ebc7d301= 59ee3225a88663e1d8585a8499174a12b89 +SIZE (gnome-globalmenu-0.7.10.tar.bz2) =3D 565247 diff --git a/global-menu-cur/files/patch-makefile.am b/global-menu/files/pa= tch-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 =3D $(GTK_LIBS) $(WNCK_LIBS) $(X11_LIBS) ../libcompa= t/libcompat.la - libgnomenu_la_LDFLAGS =3D -version-info 2:0:0 -release $(VERSION) -no-und= efined -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 =3D $(includedir)/gnome-globalmenu + libglobalmenu_server_include_HEADERS =3D globalmenu-server.h =20 -pkgconfigdir =3D $(libdir)/pkgconfig +pkgconfigdir =3D $(prefix)/libdata/pkgconfig - pkgconfig_DATA =3D libgnomenu.pc + pkgconfig_DATA =3D globalmenu-server.pc =20 - libgnomenu_includedir =3D $(includedir)/libgnomenu + libglobalmenu_server_la_SOURCES =3D \ diff --git a/global-menu-cur/files/patch-makefile.in b/global-menu/files/pa= tch-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 =3D -I$(top_srcdir) $(GTK_CFLAGS) $(WNCK_CFLAGS) $= (X11_CFLAGS) -include $(CONFIG_HEADER) -DWNCK_I_KNOW_THIS_IS_UNSTABLE - libgnomenu_la_LIBADD =3D $(GTK_LIBS) $(WNCK_LIBS) $(X11_LIBS) ../libcompa= t/libcompat.la - libgnomenu_la_LDFLAGS =3D -version-info 2:0:0 -release $(VERSION) -no-und= efined -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 =3D libglobalmenu-server.la + libglobalmenu_server_includedir =3D $(includedir)/gnome-globalmenu + libglobalmenu_server_include_HEADERS =3D globalmenu-server.h -pkgconfigdir =3D $(libdir)/pkgconfig +pkgconfigdir =3D $(prefix)/libdata/pkgconfig - pkgconfig_DATA =3D libgnomenu.pc - libgnomenu_includedir =3D $(includedir)/libgnomenu - libgnomenu_include_HEADERS =3D $(VALASOURCES:.vala=3D.h) + pkgconfig_DATA =3D globalmenu-server.pc + libglobalmenu_server_la_SOURCES =3D \ + $(VALASOURCES:.vala=3D.c) \ diff --git a/global-menu-cur/files/patch-menuitem.c b/global-menu/files/pat= ch-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_ =3D FALSE; } - if (_tmp0) { - g_debug ("menuitem.vala:81: maybe?"); + if (_tmp0_) { - if (gtk_menu_item_get_submenu ((GtkMenuItem*) self) !=3D GTK_MENU (self= ->_submenu_cache)) { + if (gtk_menu_item_get_submenu ((GtkMenuItem*) self) !=3D (GtkWidget*) G= TK_MENU (self->_submenu_cache)) { gtk_menu_item_set_submenu ((GtkMenuItem*) self, (GtkMenu*) self->_subm= enu_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%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110317155148.0b79a141>