Index: head/Mk/Uses/xfce.mk =================================================================== --- head/Mk/Uses/xfce.mk (revision 450041) +++ head/Mk/Uses/xfce.mk (revision 450042) @@ -1,107 +1,110 @@ # # $FreeBSD$ # # Provide support for Xfce related ports. # # Feature: xfce # Usage: USES=xfce or USES=xfce:ARGS # Valid ARGS: gtk3 # # Variables, which can be set by the port: # # USE_XFCE List of components # # MAINTAINER: xfce@FreeBSD.org .if !defined(_INCLUDE_USES_XFCE_Mk) _INCLUDE_USES_XFCE_Mk= yes _USES_POST+= xfce _USE_XFCE_ALL= garcon libexo libgui libmenu libutil panel thunar xfconf XFCE_MASTER_SITE_VER= 4.12 xfce_ARGS?= # empty CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib .if ${xfce_ARGS:Mgtk3} libmenu_LIB_DEPENDS= libxfce4ui-2.so:x11/libxfce4menu libmenu_USE_XFCE_REQ= xfconf +garcon_LIB_DEPENDS= libgarcon-gtk3-1.so:sysutils/garcon +garcon_USE_XFCE_REQ= libmenu + panel_LIB_DEPENDS= libxfce4panel-2.0.so:x11-wm/xfce4-panel panel_RUN_DEPENDS= xfce4-panel:x11-wm/xfce4-panel panel_USE_XFCE_REQ= garcon libexo xfconf .else libmenu_LIB_DEPENDS= libxfce4ui-1.so:x11/libxfce4menu libmenu_USE_XFCE_REQ= xfconf +garcon_LIB_DEPENDS= libgarcon-gtk2-1.so:sysutils/garcon +garcon_USE_XFCE_REQ= libmenu + panel_LIB_DEPENDS= libxfce4panel-1.0.so:x11-wm/xfce4-panel panel_RUN_DEPENDS= xfce4-panel:x11-wm/xfce4-panel panel_USE_XFCE_REQ= garcon libexo xfconf .endif - -garcon_LIB_DEPENDS= libgarcon-1.so:sysutils/garcon -garcon_USE_XFCE_REQ= libmenu libexo_LIB_DEPENDS= libexo-1.so:x11/libexo libexo_USE_XFCE_REQ= libmenu libgui_LIB_DEPENDS= libxfcegui4.so:x11-toolkits/libxfce4gui libgui_USE_XFCE_REQ= libutil libutil_LIB_DEPENDS= libxfce4util.so:x11/libxfce4util thunar_LIB_DEPENDS= libthunarx-2.so:x11-fm/thunar thunar_RUN_DEPENDS= Thunar:x11-fm/thunar thunar_USE_XFCE_REQ= xfconf libmenu xfconf_LIB_DEPENDS= libxfconf-0.so:x11/xfce4-conf xfconf_USE_XFCE_REQ= libutil .if defined(USE_XFCE) # First, expand all USE_XFCE_REQ recursively. .for comp in ${_USE_XFCE_ALL} . for subcomp in ${${comp}_USE_XFCE_REQ} ${comp}_USE_XFCE_REQ+=${${subcomp}_USE_XFCE_REQ} . endfor .endfor # Then, use already expanded USE_XFCE_REQ to expand USE_XFCE. .for comp in ${USE_XFCE} . if ${_USE_XFCE_ALL:M${comp}} == "" IGNORE= cannot install: Unknown component ${comp} . endif _USE_XFCE+= ${${comp}_USE_XFCE_REQ} ${comp} .endfor # Remove duplicate components USE_XFCE= ${_USE_XFCE:O:u} .for comp in ${USE_XFCE} . if defined(${comp}_BUILD_DEPENDS) BUILD_DEPENDS+= ${${comp}_BUILD_DEPENDS} . endif . if defined(${comp}_LIB_DEPENDS) LIB_DEPENDS+= ${${comp}_LIB_DEPENDS} . endif . if defined(${comp}_RUN_DEPENDS) RUN_DEPENDS+= ${${comp}_RUN_DEPENDS} . endif .endfor . if ${USE_XFCE:M*gui} == libgui DEPRECATED?= Depends on unmaintained x11-toolkits/libxfce4gui . endif .endif # end of defined(USE_XFCE) .endif .if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_XFCE_POST_MK) _INCLUDE_USES_XFCE_POST_MK= yes .endif Index: head/sysutils/garcon/Makefile =================================================================== --- head/sysutils/garcon/Makefile (revision 450041) +++ head/sysutils/garcon/Makefile (revision 450042) @@ -1,31 +1,35 @@ # Created by: Oliver Lehmann # $FreeBSD$ PORTNAME= garcon -PORTVERSION= 0.4.0 -PORTREVISION= 1 +PORTVERSION= 0.6.1 CATEGORIES= sysutils xfce -MASTER_SITES= 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= gmake libtool pathfix pkgconfig gettext-tools xfce tar:bzip2 -USE_GNOME= glib20 gtk20 intltool intlhack +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 -CONFIGURE_ARGS=--without-html-dir +CONFIGURE_ARGS= --without-html-dir \ + --enable-gtk2 OPTIONS_DEFINE= NLS -NLS_USES= gettext-runtime +NLS_USES= gettext-runtime NLS_CONFIGURE_ENABLE= nls -OPTIONS_SUB= yes +OPTIONS_SUB= yes .include Index: head/sysutils/garcon/distinfo =================================================================== --- head/sysutils/garcon/distinfo (revision 450041) +++ head/sysutils/garcon/distinfo (revision 450042) @@ -1,2 +1,3 @@ -SHA256 (xfce4/garcon-0.4.0.tar.bz2) = 787dc859713b6518992d760d4b858fb02e8a30705e6f6e871d7a14cc97bca972 -SIZE (xfce4/garcon-0.4.0.tar.bz2) = 466118 +TIMESTAMP = 1497180847 +SHA256 (xfce4/garcon-0.6.1.tar.bz2) = 41c31ba0498c2cc39de4a8e0c2367510adbf4bc2104c17feee358e51e6acf603 +SIZE (xfce4/garcon-0.6.1.tar.bz2) = 511415 Index: head/sysutils/garcon/files/patch-configure =================================================================== --- head/sysutils/garcon/files/patch-configure (revision 450041) +++ head/sysutils/garcon/files/patch-configure (revision 450042) @@ -1,11 +1,11 @@ ---- ./configure.orig 2013-05-05 16:32:02.000000000 +0000 -+++ ./configure 2013-05-05 21:17:24.000000000 +0000 -@@ -13632,7 +13632,7 @@ +--- configure.orig 2017-04-16 04:37:20 UTC ++++ configure +@@ -14201,7 +14201,7 @@ $as_echo "#define HAVE_LC_MESSAGES 1" >> fi fi - USE_NLS=yes +# USE_NLS=yes gt_cv_have_gettext=no Index: head/sysutils/garcon/files/patch-garcon-gtk_garcon-gtk-menu.c =================================================================== --- head/sysutils/garcon/files/patch-garcon-gtk_garcon-gtk-menu.c (nonexistent) +++ head/sysutils/garcon/files/patch-garcon-gtk_garcon-gtk-menu.c (revision 450042) @@ -0,0 +1,53 @@ +--- 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 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/garcon/pkg-descr =================================================================== --- head/sysutils/garcon/pkg-descr (revision 450041) +++ head/sysutils/garcon/pkg-descr (revision 450042) @@ -1,6 +1,5 @@ Garcon is an implementation of the freedesktop.org menu specification replacing the former Xfce menu library libxfce4menu. It is based on -GLib/GIO only and aims at covering the entire specification except for -legacy menus. +GLib/GIO only and aims at covering the entire specification. WWW: http://www.xfce.org/ Index: head/sysutils/garcon/pkg-plist =================================================================== --- head/sysutils/garcon/pkg-plist (revision 450041) +++ head/sysutils/garcon/pkg-plist (revision 450042) @@ -1,95 +1,103 @@ 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/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/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/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/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/zh_CN/LC_MESSAGES/garcon.mo %%NLS%%share/locale/zh_HK/LC_MESSAGES/garcon.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/garcon.mo