CVS commit: pkgsrc/x11/xfce4-desktop

["Youri Mouton" <youri%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   youri
Date:           Tue May 15 22:33:24 UTC 2018

Modified Files:
        pkgsrc/x11/xfce4-desktop: Makefile PLIST distinfo
        pkgsrc/x11/xfce4-desktop/patches: patch-common_xfdesktop-common.h

Log Message:
Downgrade to stable releases again.
Update to 4.12.4:

Incomplete changelogs:

4.12.3
======
Stable release of xfdesktop for Xfce 4.12.

* Bug fixes:
 - Remove whitespaces from monitor name when accessing settings
   Patch by Andreas Müller
 - Settings: Fix loading of wallpaper previews (Bug #11892)
 - Rotate images for wallpaper based on embedded orientation

* Translation updates:
  English (Australia) (en_AU), Spanish (Castilian) (es),
  Lithuanian (lt), Swedish (sv)


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 pkgsrc/x11/xfce4-desktop/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/x11/xfce4-desktop/PLIST
cvs rdiff -u -r1.26 -r1.27 pkgsrc/x11/xfce4-desktop/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/x11/xfce4-desktop/patches/patch-common_xfdesktop-common.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/xfce4-desktop/Makefile
diff -u pkgsrc/x11/xfce4-desktop/Makefile:1.69 pkgsrc/x11/xfce4-desktop/Makefile:1.70
--- pkgsrc/x11/xfce4-desktop/Makefile:1.69      Mon Apr 16 14:35:26 2018
+++ pkgsrc/x11/xfce4-desktop/Makefile   Tue May 15 22:33:23 2018
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.69 2018/04/16 14:35:26 wiz Exp $
+# $NetBSD: Makefile,v 1.70 2018/05/15 22:33:23 youri Exp $
 
-PKGREVISION= 3
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-DISTNAME=      xfdesktop-4.13.1
-PKGNAME=       xfce4-desktop-4.13.1
+DISTNAME=      xfdesktop-4.12.4
+PKGNAME=       xfce4-desktop-4.12.4
 CATEGORIES=    x11
-MASTER_SITES+= http://archive.xfce.org/src/xfce/xfdesktop/4.13/
+MASTER_SITES+= http://archive.xfce.org/src/xfce/xfdesktop/4.12/
 
 HOMEPAGE=      http://docs.xfce.org/xfce/xfdesktop/start
 COMMENT=       Xfce desktop background manager
@@ -14,9 +13,10 @@ COMMENT=     Xfce desktop background manager
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFBASE}
 
 .include "../../devel/libglade/buildlink3.mk"
-.include "../../devel/libwnck3/buildlink3.mk"
+.include "../../devel/libwnck/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../sysutils/xfce4-thunar/buildlink3.mk"
 .include "../../x11/xfce4-garcon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/x11/xfce4-desktop/PLIST
diff -u pkgsrc/x11/xfce4-desktop/PLIST:1.24 pkgsrc/x11/xfce4-desktop/PLIST:1.25
--- pkgsrc/x11/xfce4-desktop/PLIST:1.24 Tue Jun 14 13:09:47 2016
+++ pkgsrc/x11/xfce4-desktop/PLIST      Tue May 15 22:33:23 2018
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.24 2016/06/14 13:09:47 youri Exp $
+@comment $NetBSD: PLIST,v 1.25 2018/05/15 22:33:23 youri Exp $
 bin/xfdesktop
 bin/xfdesktop-settings
 man/man1/xfdesktop.1
 share/applications/xfce-backdrop-settings.desktop
 share/backgrounds/xfce/xfce-blue.jpg
+share/backgrounds/xfce/xfce-teal.jpg
 share/icons/hicolor/32x32/apps/xfce4-backdrop.png
 share/icons/hicolor/32x32/apps/xfce4-menueditor.png
 share/icons/hicolor/48x48/apps/xfce4-backdrop.png

Index: pkgsrc/x11/xfce4-desktop/distinfo
diff -u pkgsrc/x11/xfce4-desktop/distinfo:1.26 pkgsrc/x11/xfce4-desktop/distinfo:1.27
--- pkgsrc/x11/xfce4-desktop/distinfo:1.26      Sun Jun 18 22:48:17 2017
+++ pkgsrc/x11/xfce4-desktop/distinfo   Tue May 15 22:33:23 2018
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.26 2017/06/18 22:48:17 youri Exp $
+$NetBSD: distinfo,v 1.27 2018/05/15 22:33:23 youri Exp $
 
-SHA1 (xfdesktop-4.13.1.tar.bz2) = 5e13c80ac3ed13f8219ba99229eee2c11cffefc9
-RMD160 (xfdesktop-4.13.1.tar.bz2) = 3826712ebe3fdac30f0b75acc3c077741fd1f9f2
-SHA512 (xfdesktop-4.13.1.tar.bz2) = efe5ffe450f498ee0188a1ca5efd0ef340d73b5650060f18db4fe94ae9130dd27e41c6b30af2f90839e6c8272f3e270d16b86df64d595fe82169c26d624f806a
-Size (xfdesktop-4.13.1.tar.bz2) = 1485914 bytes
+SHA1 (xfdesktop-4.12.4.tar.bz2) = 11a244cf2adeef6dacc83881ff2e2ac66da3e118
+RMD160 (xfdesktop-4.12.4.tar.bz2) = d7ba49b1269310cbdc3314be50aa5a57162365a1
+SHA512 (xfdesktop-4.12.4.tar.bz2) = 29f170b96836298dc83e3c49650ab7e88a93c1a2fa1599d1d98f3b6c80c9c059748b76a821077eea39b5b4619998bb300ff17f06e88483a59bd5ae2b76d0605e
+Size (xfdesktop-4.12.4.tar.bz2) = 1421623 bytes
 SHA1 (patch-backgrounds_Makefile.in) = 9310c57da7265b65b0ac1073d7481006162ccd95
-SHA1 (patch-common_xfdesktop-common.h) = 4b747479cb7428317cc39a7b2056d831263e70ad
+SHA1 (patch-common_xfdesktop-common.h) = 78ad3c5f59f02ebf0f725417cd676f485829ae39

Index: pkgsrc/x11/xfce4-desktop/patches/patch-common_xfdesktop-common.h
diff -u pkgsrc/x11/xfce4-desktop/patches/patch-common_xfdesktop-common.h:1.2 pkgsrc/x11/xfce4-desktop/patches/patch-common_xfdesktop-common.h:1.3
--- pkgsrc/x11/xfce4-desktop/patches/patch-common_xfdesktop-common.h:1.2        Sun Jun 18 22:48:17 2017
+++ pkgsrc/x11/xfce4-desktop/patches/patch-common_xfdesktop-common.h    Tue May 15 22:33:23 2018
@@ -1,8 +1,8 @@
-$NetBSD: patch-common_xfdesktop-common.h,v 1.2 2017/06/18 22:48:17 youri Exp $
+$NetBSD: patch-common_xfdesktop-common.h,v 1.3 2018/05/15 22:33:23 youri Exp $
 
 Use the blue background by default.
 
---- common/xfdesktop-common.h.orig     2017-04-20 15:38:05.000000000 +0000
+--- common/xfdesktop-common.h.orig     2017-06-26 13:48:02.000000000 +0000
 +++ common/xfdesktop-common.h
 @@ -35,7 +35,7 @@
  #include <stdarg.h>
@@ -12,4 +12,4 @@ Use the blue background by default.
 +#define DEFAULT_BACKDROP         DATADIR "/backgrounds/xfce/xfce-blue.jpg"
  #define DEFAULT_ICON_FONT_SIZE   12
  #define DEFAULT_ICON_SIZE        48
- #define ITHEME_FLAGS             (GTK_ICON_LOOKUP_USE_BUILTIN)
+ #define ITHEME_FLAGS             (GTK_ICON_LOOKUP_USE_BUILTIN \