Page MenuHomeFreeBSD
Files F165107789

D12387.id.diff
No OneTemporary
Actions

D12387.id.diff
View Options

Index: Mk/Uses/xfce.mk
===================================================================
--- Mk/Uses/xfce.mk
+++ Mk/Uses/xfce.mk
@@ -30,6 +30,9 @@
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
@@ -37,14 +40,14 @@
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
Index: sysutils/garcon/Makefile
===================================================================
--- sysutils/garcon/Makefile
+++ sysutils/garcon/Makefile
@@ -2,10 +2,9 @@
# $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
@@ -15,17 +14,22 @@
# 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 <bsd.port.mk>
Index: sysutils/garcon/distinfo
===================================================================
--- sysutils/garcon/distinfo
+++ sysutils/garcon/distinfo
@@ -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: sysutils/garcon/files/patch-configure
===================================================================
--- sysutils/garcon/files/patch-configure
+++ sysutils/garcon/files/patch-configure
@@ -1,6 +1,6 @@
---- ./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
Index: sysutils/garcon/files/patch-garcon-gtk_garcon-gtk-menu.c
===================================================================
--- sysutils/garcon/files/patch-garcon-gtk_garcon-gtk-menu.c
+++ sysutils/garcon/files/patch-garcon-gtk_garcon-gtk-menu.c
@@ -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;
+ }
Index: sysutils/garcon/pkg-descr
===================================================================
--- sysutils/garcon/pkg-descr
+++ sysutils/garcon/pkg-descr
@@ -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: sysutils/garcon/pkg-plist
===================================================================
--- sysutils/garcon/pkg-plist
+++ sysutils/garcon/pkg-plist
@@ -4,6 +4,7 @@
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
@@ -16,6 +17,8 @@
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
@@ -22,8 +25,12 @@
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
@@ -38,6 +45,7 @@
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

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 7, 2:53 AM (5 h, 24 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
36126362
Default Alt Text
D12387.id.diff (7 KB)

Event Timeline