View | Details | Raw Unified | Return to bug 219928 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-6 / +15 lines)
Lines 2-11 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	garcon
4
PORTNAME=	garcon
5
PORTVERSION=	0.4.0
5
PORTVERSION=	0.6.1
6
PORTREVISION=	1
7
CATEGORIES=	sysutils xfce
6
CATEGORIES=	sysutils xfce
8
MASTER_SITES=	XFCE
7
MASTER_SITES=	XFCE/src/xfce/${PORTNAME}/${PORTVERSION:R}
9
DIST_SUBDIR=	xfce4
8
DIST_SUBDIR=	xfce4
10
9
11
MAINTAINER=	xfce@FreeBSD.org
10
MAINTAINER=	xfce@FreeBSD.org
Lines 15-31 Link Here
15
# documentation is under GFDL 1.1.
14
# documentation is under GFDL 1.1.
16
LICENSE=	GPLv2
15
LICENSE=	GPLv2
17
16
17
LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
18
	libfreetype.so:print/freetype2
19
18
GNU_CONFIGURE=	yes
20
GNU_CONFIGURE=	yes
19
INSTALL_TARGET=	install-strip
21
INSTALL_TARGET=	install-strip
20
USES=	gmake libtool pathfix pkgconfig gettext-tools xfce tar:bzip2
22
USES=	gettext-tools gmake libtool pathfix pkgconfig tar:bzip2 xfce:gtk3
21
USE_GNOME=	glib20 gtk20 intltool intlhack
23
USE_GNOME=	glib20 gtk30 intltool cairo gdkpixbuf2
22
USE_XFCE=	libmenu
24
USE_XFCE=	libmenu
23
25
24
CONFIGURE_ARGS=--without-html-dir
26
CONFIGURE_ARGS=--without-html-dir
25
27
26
OPTIONS_DEFINE=		NLS
28
OPTIONS_DEFINE=	GTK2 NLS
29
OPTIONS_DEFAULT=	GTK2
30
GTK2_USE=	gnome=gtk20
31
GTK2_CONFIGURE_ENABLE=	gtk2
27
NLS_USES=	gettext-runtime
32
NLS_USES=	gettext-runtime
28
NLS_CONFIGURE_ENABLE=	nls
33
NLS_CONFIGURE_ENABLE=	nls
29
OPTIONS_SUB=	yes
34
OPTIONS_SUB=	yes
30
35
36
## https://bugzilla.xfce.org/show_bug.cgi?id=13635
37
post-install-GTK2-off:
38
	@${RM} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/garcon-gtk2-1.pc
39
31
.include <bsd.port.mk>
40
.include <bsd.port.mk>
(-)distinfo (-2 / +3 lines)
Lines 1-2 Link Here
1
SHA256 (xfce4/garcon-0.4.0.tar.bz2) = 787dc859713b6518992d760d4b858fb02e8a30705e6f6e871d7a14cc97bca972
1
TIMESTAMP = 1497180847
2
SIZE (xfce4/garcon-0.4.0.tar.bz2) = 466118
2
SHA256 (xfce4/garcon-0.6.1.tar.bz2) = 41c31ba0498c2cc39de4a8e0c2367510adbf4bc2104c17feee358e51e6acf603
3
SIZE (xfce4/garcon-0.6.1.tar.bz2) = 511415
(-)files/patch-configure (-3 / +3 lines)
Lines 1-6 Link Here
1
--- ./configure.orig	2013-05-05 16:32:02.000000000 +0000
1
--- configure.orig	2017-04-16 04:37:20 UTC
2
+++ ./configure	2013-05-05 21:17:24.000000000 +0000
2
+++ configure
3
@@ -13632,7 +13632,7 @@
3
@@ -14201,7 +14201,7 @@ $as_echo "#define HAVE_LC_MESSAGES 1" >>
4
 
4
 
5
     fi
5
     fi
6
   fi
6
   fi
(-)files/patch-garcon-gtk_garcon-gtk-menu.c (+56 lines)
Line 0 Link Here
1
--- garcon-gtk/garcon-gtk-menu.c.orig	2017-04-16 04:26:38 UTC
2
+++ garcon-gtk/garcon-gtk-menu.c
3
@@ -650,8 +650,12 @@ garcon_gtk_menu_load_icon (const gchar *icon_name)
4
   gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &w, &h);
5
   size = MIN (w, h);
6
 
7
-  if (! gtk_icon_theme_has_icon (icon_theme, icon_name))
8
+  if (gtk_icon_theme_has_icon (icon_theme, icon_name))
9
     {
10
+	  pixbuf = gtk_icon_theme_load_icon (icon_theme, icon_name, size, 0, NULL);;
11
+    }
12
+  else
13
+    {
14
       if (g_path_is_absolute (icon_name))
15
         {
16
           pixbuf = gdk_pixbuf_new_from_file_at_scale (icon_name, w, h, TRUE, NULL);
17
@@ -684,22 +688,23 @@ garcon_gtk_menu_load_icon (const gchar *icon_name)
18
               g_free (name);
19
             }
20
         }
21
+    }
22
 
23
-      /* Turn the pixbuf into a gtk_image */
24
-      if (G_LIKELY (pixbuf))
25
-        {
26
-          /* scale the pixbuf down if it needs it */
27
-          GdkPixbuf *tmp = gdk_pixbuf_scale_simple (pixbuf, w, h, GDK_INTERP_BILINEAR);
28
-          g_object_unref (pixbuf);
29
-          pixbuf = tmp;
30
+  /* Turn the pixbuf into a gtk_image */
31
+  if (G_LIKELY (pixbuf))
32
+    {
33
+      /* scale the pixbuf down if it needs it */
34
+      GdkPixbuf *pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf, w, h, GDK_INTERP_BILINEAR);
35
+      g_object_unref (G_OBJECT (pixbuf));
36
 
37
-          image = gtk_image_new_from_pixbuf (pixbuf);
38
-          g_object_unref (G_OBJECT (pixbuf));
39
-        }
40
+      image = gtk_image_new_from_pixbuf (pixbuf_scaled);
41
+      g_object_unref (G_OBJECT (pixbuf_scaled));
42
     }
43
-
44
-  if (image == NULL)
45
-    image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
46
+  else
47
+    {
48
+	  /* display the placeholder at least */
49
+	  image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
50
+    }
51
 
52
   return image;
53
 }
54
yes
55
native
56
text/plain
(-)pkg-descr (-2 / +1 lines)
Lines 1-6 Link Here
1
Garcon is an implementation of the freedesktop.org menu specification
1
Garcon is an implementation of the freedesktop.org menu specification
2
replacing the former Xfce menu library libxfce4menu. It is based on
2
replacing the former Xfce menu library libxfce4menu. It is based on
3
GLib/GIO only and aims at covering the entire specification except for
3
GLib/GIO only and aims at covering the entire specification.
4
legacy menus.
5
4
6
WWW: http://www.xfce.org/
5
WWW: http://www.xfce.org/
(-)pkg-plist (-6 / +14 lines)
Lines 4-9 Link Here
4
include/garcon-1/garcon/garcon-marshal.h
4
include/garcon-1/garcon/garcon-marshal.h
5
include/garcon-1/garcon/garcon-menu-directory.h
5
include/garcon-1/garcon/garcon-menu-directory.h
6
include/garcon-1/garcon/garcon-menu-element.h
6
include/garcon-1/garcon/garcon-menu-element.h
7
include/garcon-1/garcon/garcon-menu-item-action.h
7
include/garcon-1/garcon/garcon-menu-item-cache.h
8
include/garcon-1/garcon/garcon-menu-item-cache.h
8
include/garcon-1/garcon/garcon-menu-item-pool.h
9
include/garcon-1/garcon/garcon-menu-item-pool.h
9
include/garcon-1/garcon/garcon-menu-item.h
10
include/garcon-1/garcon/garcon-menu-item.h
Lines 14-29 Link Here
14
include/garcon-1/garcon/garcon-menu-tree-provider.h
15
include/garcon-1/garcon/garcon-menu-tree-provider.h
15
include/garcon-1/garcon/garcon-menu.h
16
include/garcon-1/garcon/garcon-menu.h
16
include/garcon-1/garcon/garcon.h
17
include/garcon-1/garcon/garcon.h
17
include/garcon-gtk2-1/garcon-gtk/garcon-gtk-menu.h
18
%%GTK2%%include/garcon-gtk2-1/garcon-gtk/garcon-gtk-menu.h
18
include/garcon-gtk2-1/garcon-gtk/garcon-gtk.h
19
%%GTK2%%include/garcon-gtk2-1/garcon-gtk/garcon-gtk.h
20
include/garcon-gtk3-1/garcon-gtk/garcon-gtk-menu.h
21
include/garcon-gtk3-1/garcon-gtk/garcon-gtk.h
19
lib/libgarcon-1.so
22
lib/libgarcon-1.so
20
lib/libgarcon-1.so.0
23
lib/libgarcon-1.so.0
21
lib/libgarcon-1.so.0.0.0
24
lib/libgarcon-1.so.0.0.0
22
lib/libgarcon-gtk2-1.so
25
%%GTK2%%lib/libgarcon-gtk2-1.so
23
lib/libgarcon-gtk2-1.so.0
26
%%GTK2%%lib/libgarcon-gtk2-1.so.0
24
lib/libgarcon-gtk2-1.so.0.0.0
27
%%GTK2%%lib/libgarcon-gtk2-1.so.0.0.0
28
lib/libgarcon-gtk3-1.so
29
lib/libgarcon-gtk3-1.so.0
30
lib/libgarcon-gtk3-1.so.0.0.0
25
libdata/pkgconfig/garcon-1.pc
31
libdata/pkgconfig/garcon-1.pc
26
libdata/pkgconfig/garcon-gtk2-1.pc
32
%%GTK2%%libdata/pkgconfig/garcon-gtk2-1.pc
33
libdata/pkgconfig/garcon-gtk3-1.pc
27
share/desktop-directories/xfce-accessories.directory
34
share/desktop-directories/xfce-accessories.directory
28
share/desktop-directories/xfce-development.directory
35
share/desktop-directories/xfce-development.directory
29
share/desktop-directories/xfce-education.directory
36
share/desktop-directories/xfce-education.directory
Lines 38-43 Link Here
38
share/desktop-directories/xfce-screensavers.directory
45
share/desktop-directories/xfce-screensavers.directory
39
share/desktop-directories/xfce-settings.directory
46
share/desktop-directories/xfce-settings.directory
40
share/desktop-directories/xfce-system.directory
47
share/desktop-directories/xfce-system.directory
48
%%NLS%%share/locale/am/LC_MESSAGES/garcon.mo
41
%%NLS%%share/locale/ar/LC_MESSAGES/garcon.mo
49
%%NLS%%share/locale/ar/LC_MESSAGES/garcon.mo
42
%%NLS%%share/locale/ast/LC_MESSAGES/garcon.mo
50
%%NLS%%share/locale/ast/LC_MESSAGES/garcon.mo
43
%%NLS%%share/locale/bg/LC_MESSAGES/garcon.mo
51
%%NLS%%share/locale/bg/LC_MESSAGES/garcon.mo

Return to bug 219928