diff options
| author | olivierd <olivierd@FreeBSD.org> | 2013-03-11 02:38:31 +0800 |
|---|---|---|
| committer | olivierd <olivierd@FreeBSD.org> | 2013-03-11 02:38:31 +0800 |
| commit | ab7e0b90746a7aadd4c2524aa23946babf3c6f38 (patch) | |
| tree | 6dd0880a644669c60e32f37b7da7347991708dbe /x11-wm | |
| parent | e8d49200aa3725fad91e106bbcdd1abebcf4861c (diff) | |
| download | freebsd-ports-graphics-ab7e0b90746a7aadd4c2524aa23946babf3c6f38.tar.gz freebsd-ports-graphics-ab7e0b90746a7aadd4c2524aa23946babf3c6f38.tar.zst freebsd-ports-graphics-ab7e0b90746a7aadd4c2524aa23946babf3c6f38.zip | |
- Update to 4.10.2
- Remove unneeded patch
Approved by: rene, miwi (mentors, implicit)
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/xfce4-desktop/Makefile | 3 | ||||
| -rw-r--r-- | x11-wm/xfce4-desktop/distinfo | 4 | ||||
| -rw-r--r-- | x11-wm/xfce4-desktop/files/patch-src__xfce-backdrop.c | 37 |
3 files changed, 3 insertions, 41 deletions
diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile index a1006ce3351..a693701fa55 100644 --- a/x11-wm/xfce4-desktop/Makefile +++ b/x11-wm/xfce4-desktop/Makefile @@ -3,8 +3,7 @@ # PORTNAME= xfce4-desktop -PORTVERSION= 4.10.1 -PORTREVISION= 1 +PORTVERSION= 4.10.2 CATEGORIES= x11-wm xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/xfce/xfdesktop/${PORTVERSION:R} diff --git a/x11-wm/xfce4-desktop/distinfo b/x11-wm/xfce4-desktop/distinfo index 0290392a170..c137d989815 100644 --- a/x11-wm/xfce4-desktop/distinfo +++ b/x11-wm/xfce4-desktop/distinfo @@ -1,2 +1,2 @@ -SHA256 (xfce4/xfdesktop-4.10.1.tar.bz2) = 2883fe381e1b967d179fdf5ece5ac2566a3ffdb94f4cf139c7fb44567f17d4ad -SIZE (xfce4/xfdesktop-4.10.1.tar.bz2) = 1144840 +SHA256 (xfce4/xfdesktop-4.10.2.tar.bz2) = 49a6e0be513e307e896f7e5929825babec9bbcd4b2e73552f9d27647a4db797d +SIZE (xfce4/xfdesktop-4.10.2.tar.bz2) = 1144561 diff --git a/x11-wm/xfce4-desktop/files/patch-src__xfce-backdrop.c b/x11-wm/xfce4-desktop/files/patch-src__xfce-backdrop.c deleted file mode 100644 index 191cea3548a..00000000000 --- a/x11-wm/xfce4-desktop/files/patch-src__xfce-backdrop.c +++ /dev/null @@ -1,37 +0,0 @@ ---- ./src/xfce-backdrop.c.orig 2013-03-02 16:42:00.000000000 +0000 -+++ ./src/xfce-backdrop.c 2013-03-07 19:23:41.000000000 +0000 -@@ -924,6 +924,8 @@ - xfce_backdrop_get_pixbuf(XfceBackdrop *backdrop) - { - GdkPixbuf *final_image, *image = NULL, *tmp; -+ GdkPixbufFormat *format = NULL; -+ gboolean apply_backdrop_image = FALSE; - gint i, j; - gint w, h, iw = 0, ih = 0; - XfceBackdropImageStyle istyle; -@@ -933,8 +935,12 @@ - - g_return_val_if_fail(XFCE_IS_BACKDROP(backdrop), NULL); - -- if(backdrop->priv->show_image && backdrop->priv->image_path) -- gdk_pixbuf_get_file_info(backdrop->priv->image_path, &iw, &ih); -+ if(backdrop->priv->show_image && backdrop->priv->image_path) { -+ format = gdk_pixbuf_get_file_info(backdrop->priv->image_path, &iw, &ih); -+ /* make sure we have a usable backdrop image */ -+ if(format != NULL) -+ apply_backdrop_image = TRUE; -+ } - - if(backdrop->priv->width == 0 || backdrop->priv->height == 0) { - w = iw; -@@ -956,9 +962,7 @@ - final_image = create_solid(&backdrop->priv->color1, w, h, FALSE, 0xff); - } - -- /*check if the file exists, -- *and if it doesn't then make the background the single colour*/ -- if(!g_file_test(backdrop->priv->image_path, G_FILE_TEST_EXISTS)) { -+ if(!apply_backdrop_image) { - if(backdrop->priv->brightness != 0) - final_image = adjust_brightness(final_image, backdrop->priv->brightness); - |