Index: head/sysutils/garcon/Makefile =================================================================== --- head/sysutils/garcon/Makefile (revision 486915) +++ head/sysutils/garcon/Makefile (revision 486916) @@ -1,35 +1,35 @@ # Created by: Oliver Lehmann # $FreeBSD$ PORTNAME= garcon -PORTVERSION= 0.6.1 +PORTVERSION= 0.6.2 CATEGORIES= sysutils xfce MASTER_SITES= XFCE/src/xfce/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= Freedesktop compliant menu library # garcon's source code is licensed under GPLv2, while its # documentation is under GFDL 1.1. LICENSE= GPLv2 LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 -GNU_CONFIGURE= yes -INSTALL_TARGET= install-strip USES= gettext-tools gmake libtool pathfix pkgconfig tar:bzip2 xfce:gtk3 USE_GNOME= glib20 gtk20 gtk30 intltool cairo gdkpixbuf2 USE_XFCE= libmenu USE_LDCONFIG= yes +GNU_CONFIGURE= yes +INSTALL_TARGET= install-strip CONFIGURE_ARGS= --without-html-dir \ --enable-gtk2 OPTIONS_DEFINE= NLS NLS_USES= gettext-runtime NLS_CONFIGURE_ENABLE= nls OPTIONS_SUB= yes .include Index: head/sysutils/garcon/distinfo =================================================================== --- head/sysutils/garcon/distinfo (revision 486915) +++ head/sysutils/garcon/distinfo (revision 486916) @@ -1,3 +1,3 @@ -TIMESTAMP = 1497180847 -SHA256 (xfce4/garcon-0.6.1.tar.bz2) = 41c31ba0498c2cc39de4a8e0c2367510adbf4bc2104c17feee358e51e6acf603 -SIZE (xfce4/garcon-0.6.1.tar.bz2) = 511415 +TIMESTAMP = 1544197918 +SHA256 (xfce4/garcon-0.6.2.tar.bz2) = a87f09648ff10d45c524b3bfe618f18622bdd8b205589d35fed2f12d9c79c47c +SIZE (xfce4/garcon-0.6.2.tar.bz2) = 539745 Index: head/sysutils/garcon/files/patch-garcon-gtk_garcon-gtk-menu.c =================================================================== --- head/sysutils/garcon/files/patch-garcon-gtk_garcon-gtk-menu.c (revision 486915) +++ head/sysutils/garcon/files/patch-garcon-gtk_garcon-gtk-menu.c (nonexistent) @@ -1,53 +0,0 @@ ---- garcon-gtk/garcon-gtk-menu.c.orig 2017-04-16 04:26:38 UTC -+++ garcon-gtk/garcon-gtk-menu.c -@@ -650,8 +650,12 @@ garcon_gtk_menu_load_icon (const gchar *icon_name) - gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &w, &h); - size = MIN (w, h); - -- if (! gtk_icon_theme_has_icon (icon_theme, icon_name)) -+ if (gtk_icon_theme_has_icon (icon_theme, icon_name)) - { -+ pixbuf = gtk_icon_theme_load_icon (icon_theme, icon_name, size, 0, NULL);; -+ } -+ else -+ { - if (g_path_is_absolute (icon_name)) - { - pixbuf = gdk_pixbuf_new_from_file_at_scale (icon_name, w, h, TRUE, NULL); -@@ -684,22 +688,23 @@ garcon_gtk_menu_load_icon (const gchar *icon_name) - g_free (name); - } - } -+ } - -- /* Turn the pixbuf into a gtk_image */ -- if (G_LIKELY (pixbuf)) -- { -- /* scale the pixbuf down if it needs it */ -- GdkPixbuf *tmp = gdk_pixbuf_scale_simple (pixbuf, w, h, GDK_INTERP_BILINEAR); -- g_object_unref (pixbuf); -- pixbuf = tmp; -+ /* Turn the pixbuf into a gtk_image */ -+ if (G_LIKELY (pixbuf)) -+ { -+ /* scale the pixbuf down if it needs it */ -+ GdkPixbuf *pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf, w, h, GDK_INTERP_BILINEAR); -+ g_object_unref (G_OBJECT (pixbuf)); - -- image = gtk_image_new_from_pixbuf (pixbuf); -- g_object_unref (G_OBJECT (pixbuf)); -- } -+ image = gtk_image_new_from_pixbuf (pixbuf_scaled); -+ g_object_unref (G_OBJECT (pixbuf_scaled)); - } -- -- if (image == NULL) -- image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); -+ else -+ { -+ /* display the placeholder at least */ -+ image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); -+ } - - return image; - } Property changes on: head/sysutils/garcon/files/patch-garcon-gtk_garcon-gtk-menu.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/garcon/pkg-plist =================================================================== --- head/sysutils/garcon/pkg-plist (revision 486915) +++ head/sysutils/garcon/pkg-plist (revision 486916) @@ -1,103 +1,106 @@ etc/xdg/menus/xfce-applications.menu include/garcon-1/garcon/garcon-config.h include/garcon-1/garcon/garcon-environment.h include/garcon-1/garcon/garcon-marshal.h include/garcon-1/garcon/garcon-menu-directory.h include/garcon-1/garcon/garcon-menu-element.h include/garcon-1/garcon/garcon-menu-item-action.h include/garcon-1/garcon/garcon-menu-item-cache.h include/garcon-1/garcon/garcon-menu-item-pool.h include/garcon-1/garcon/garcon-menu-item.h include/garcon-1/garcon/garcon-menu-merger.h include/garcon-1/garcon/garcon-menu-node.h include/garcon-1/garcon/garcon-menu-parser.h include/garcon-1/garcon/garcon-menu-separator.h include/garcon-1/garcon/garcon-menu-tree-provider.h include/garcon-1/garcon/garcon-menu.h include/garcon-1/garcon/garcon.h include/garcon-gtk2-1/garcon-gtk/garcon-gtk-menu.h include/garcon-gtk2-1/garcon-gtk/garcon-gtk.h include/garcon-gtk3-1/garcon-gtk/garcon-gtk-menu.h include/garcon-gtk3-1/garcon-gtk/garcon-gtk.h lib/libgarcon-1.so lib/libgarcon-1.so.0 lib/libgarcon-1.so.0.0.0 lib/libgarcon-gtk2-1.so lib/libgarcon-gtk2-1.so.0 lib/libgarcon-gtk2-1.so.0.0.0 lib/libgarcon-gtk3-1.so lib/libgarcon-gtk3-1.so.0 lib/libgarcon-gtk3-1.so.0.0.0 libdata/pkgconfig/garcon-1.pc libdata/pkgconfig/garcon-gtk2-1.pc libdata/pkgconfig/garcon-gtk3-1.pc share/desktop-directories/xfce-accessories.directory share/desktop-directories/xfce-development.directory share/desktop-directories/xfce-education.directory share/desktop-directories/xfce-games.directory share/desktop-directories/xfce-graphics.directory share/desktop-directories/xfce-hardware.directory share/desktop-directories/xfce-multimedia.directory share/desktop-directories/xfce-network.directory share/desktop-directories/xfce-office.directory share/desktop-directories/xfce-other.directory share/desktop-directories/xfce-personal.directory share/desktop-directories/xfce-screensavers.directory share/desktop-directories/xfce-settings.directory share/desktop-directories/xfce-system.directory %%NLS%%share/locale/am/LC_MESSAGES/garcon.mo %%NLS%%share/locale/ar/LC_MESSAGES/garcon.mo %%NLS%%share/locale/ast/LC_MESSAGES/garcon.mo +%%NLS%%share/locale/be/LC_MESSAGES/garcon.mo %%NLS%%share/locale/bg/LC_MESSAGES/garcon.mo %%NLS%%share/locale/bn/LC_MESSAGES/garcon.mo %%NLS%%share/locale/ca/LC_MESSAGES/garcon.mo %%NLS%%share/locale/cs/LC_MESSAGES/garcon.mo +%%NLS%%share/locale/cy/LC_MESSAGES/garcon.mo %%NLS%%share/locale/da/LC_MESSAGES/garcon.mo %%NLS%%share/locale/de/LC_MESSAGES/garcon.mo %%NLS%%share/locale/el/LC_MESSAGES/garcon.mo %%NLS%%share/locale/en_AU/LC_MESSAGES/garcon.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/garcon.mo %%NLS%%share/locale/eo/LC_MESSAGES/garcon.mo %%NLS%%share/locale/es/LC_MESSAGES/garcon.mo %%NLS%%share/locale/et/LC_MESSAGES/garcon.mo %%NLS%%share/locale/eu/LC_MESSAGES/garcon.mo %%NLS%%share/locale/fi/LC_MESSAGES/garcon.mo %%NLS%%share/locale/fr/LC_MESSAGES/garcon.mo %%NLS%%share/locale/gl/LC_MESSAGES/garcon.mo %%NLS%%share/locale/he/LC_MESSAGES/garcon.mo +%%NLS%%share/locale/hi/LC_MESSAGES/garcon.mo %%NLS%%share/locale/hr/LC_MESSAGES/garcon.mo %%NLS%%share/locale/hu/LC_MESSAGES/garcon.mo %%NLS%%share/locale/id/LC_MESSAGES/garcon.mo %%NLS%%share/locale/is/LC_MESSAGES/garcon.mo %%NLS%%share/locale/it/LC_MESSAGES/garcon.mo %%NLS%%share/locale/ja/LC_MESSAGES/garcon.mo %%NLS%%share/locale/kk/LC_MESSAGES/garcon.mo %%NLS%%share/locale/ko/LC_MESSAGES/garcon.mo %%NLS%%share/locale/lt/LC_MESSAGES/garcon.mo %%NLS%%share/locale/lv/LC_MESSAGES/garcon.mo %%NLS%%share/locale/ms/LC_MESSAGES/garcon.mo %%NLS%%share/locale/nb/LC_MESSAGES/garcon.mo %%NLS%%share/locale/nl/LC_MESSAGES/garcon.mo %%NLS%%share/locale/nn/LC_MESSAGES/garcon.mo %%NLS%%share/locale/oc/LC_MESSAGES/garcon.mo %%NLS%%share/locale/pa/LC_MESSAGES/garcon.mo %%NLS%%share/locale/pl/LC_MESSAGES/garcon.mo -%%NLS%%share/locale/pt/LC_MESSAGES/garcon.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/garcon.mo +%%NLS%%share/locale/pt/LC_MESSAGES/garcon.mo %%NLS%%share/locale/ro/LC_MESSAGES/garcon.mo %%NLS%%share/locale/ru/LC_MESSAGES/garcon.mo %%NLS%%share/locale/sk/LC_MESSAGES/garcon.mo %%NLS%%share/locale/sl/LC_MESSAGES/garcon.mo %%NLS%%share/locale/sq/LC_MESSAGES/garcon.mo %%NLS%%share/locale/sr/LC_MESSAGES/garcon.mo %%NLS%%share/locale/sv/LC_MESSAGES/garcon.mo %%NLS%%share/locale/te/LC_MESSAGES/garcon.mo %%NLS%%share/locale/th/LC_MESSAGES/garcon.mo %%NLS%%share/locale/tr/LC_MESSAGES/garcon.mo %%NLS%%share/locale/ug/LC_MESSAGES/garcon.mo %%NLS%%share/locale/uk/LC_MESSAGES/garcon.mo -%%NLS%%share/locale/uz/LC_MESSAGES/garcon.mo %%NLS%%share/locale/uz@Latn/LC_MESSAGES/garcon.mo +%%NLS%%share/locale/uz/LC_MESSAGES/garcon.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/garcon.mo %%NLS%%share/locale/zh_HK/LC_MESSAGES/garcon.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/garcon.mo