kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Update garcon to 0.6.2

Browse source 
- Silence portlint warnings
This commit is contained in:
Guido Falsi 2018-12-08 07:49:10 +00:00
parent 138ac1c0ff
commit 87b03c7b8a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=486916
4 changed files with 11 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sysutils/garcon/Makefile
View file

@ -2,7 +2,7 @@
# $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
@ -17,13 +17,13 @@ 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

6
sysutils/garcon/distinfo
View file

@ -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

53
sysutils/garcon/files/patch-garcon-gtk_garcon-gtk-menu.c
View file

@ -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;
}

7
sysutils/garcon/pkg-plist
View file

@ -48,10 +48,12 @@ 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
@ -65,6 +67,7 @@ share/desktop-directories/xfce-system.directory
%%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
@ -82,8 +85,8 @@ share/desktop-directories/xfce-system.directory
%%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
@ -96,8 +99,8 @@ share/desktop-directories/xfce-system.directory
%%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