CVS commit: pkgsrc/x11/xfce4-settings

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

Module Name:    pkgsrc
Committed By:   youri
Date:           Sat Jun 23 22:08:54 UTC 2018

Modified Files:
        pkgsrc/x11/xfce4-settings: Makefile distinfo
        pkgsrc/x11/xfce4-settings/patches: patch-xfsettingsd_Makefile.in
            patch-xfsettingsd_xsettings.xml

Log Message:
Update to 4.13.4:

What’s New?

xfsettingsd --replace does not replace old daemon (Xfce #14381)
Uninitialized scalar variables (CID #292062, #292063)
Resolved warnings for -Wcast-function-type (GCC 8)
Fixed redefinition of DISTCLEANFILES in Makefile.am
Fixed typo in display manufacturers, “PRECISON” to “PRECISION”
Improved Display Manufacturer Recognition (4.12 and 4.13)
Refreshed PNP IDs from hwdata
Added support for VBX (VirtualBox)
Standardized and shortened manufacturer names
Updated laptop detection to include eDP in XfceRandr


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/x11/xfce4-settings/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/xfce4-settings/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/x11/xfce4-settings/patches/patch-xfsettingsd_Makefile.in
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/x11/xfce4-settings/patches/patch-xfsettingsd_xsettings.xml

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-settings/Makefile
diff -u pkgsrc/x11/xfce4-settings/Makefile:1.41 pkgsrc/x11/xfce4-settings/Makefile:1.42
--- pkgsrc/x11/xfce4-settings/Makefile:1.41     Mon Jun  4 01:34:12 2018
+++ pkgsrc/x11/xfce4-settings/Makefile  Sat Jun 23 22:08:54 2018
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2018/06/04 01:34:12 youri Exp $
+# $NetBSD: Makefile,v 1.42 2018/06/23 22:08:54 youri Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-VERSION=       4.13.2
-PKGREVISION=   1
+VERSION=       4.13.4
 DISTNAME=      xfce4-settings-${VERSION}
 CATEGORIES=    x11
 MASTER_SITES=  http://archive.xfce.org/src/xfce/xfce4-settings/4.13/

Index: pkgsrc/x11/xfce4-settings/distinfo
diff -u pkgsrc/x11/xfce4-settings/distinfo:1.10 pkgsrc/x11/xfce4-settings/distinfo:1.11
--- pkgsrc/x11/xfce4-settings/distinfo:1.10     Mon Jun  4 01:34:12 2018
+++ pkgsrc/x11/xfce4-settings/distinfo  Sat Jun 23 22:08:54 2018
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2018/06/04 01:34:12 youri Exp $
+$NetBSD: distinfo,v 1.11 2018/06/23 22:08:54 youri Exp $
 
-SHA1 (xfce4-settings-4.13.2.tar.bz2) = dc1257ac084100f061f96a9fca085447879155a3
-RMD160 (xfce4-settings-4.13.2.tar.bz2) = babfcab442abae05e1f2c9cd544e27bae6ec75e6
-SHA512 (xfce4-settings-4.13.2.tar.bz2) = 3564ee50914a6cb1955457c2b7bc5b515815142b04df418c70ed87692bc9aa87365af61682f07a5d979501df0fe32fe229f5be927fe0233855dfd9f454ff9643
-Size (xfce4-settings-4.13.2.tar.bz2) = 1043277 bytes
+SHA1 (xfce4-settings-4.13.4.tar.bz2) = 0943203dd0c1317cc7878dbedea6d4797fa8c28c
+RMD160 (xfce4-settings-4.13.4.tar.bz2) = 709b111a03201f8a2210c48dec33cf5c78795c67
+SHA512 (xfce4-settings-4.13.4.tar.bz2) = 39e2adaa93e2d86ff51e47f194306e57d025c13b5c07ee76cad7f67994f26fe03677c5a3bac91d1db4a25201371f6d135f36eed110dc15a1fbb46228ee715893
+Size (xfce4-settings-4.13.4.tar.bz2) = 1046733 bytes
 SHA1 (patch-xfce4-settings-manager_Makefile.in) = c02cd0ccede9cea56c5d123eb1b5146039712f39
-SHA1 (patch-xfsettingsd_Makefile.in) = ebe7d40d67fedaa846273242e1ba25f4a74a2b20
-SHA1 (patch-xfsettingsd_xsettings.xml) = 2748f68097a2f1a13e509d4aee9a1bbe77e6b995
+SHA1 (patch-xfsettingsd_Makefile.in) = 4436cd90a4bdbdce731248735a38898afdd367d9
+SHA1 (patch-xfsettingsd_xsettings.xml) = dc4130aeabac2c5964695ae8b55a61a9989ff67d

Index: pkgsrc/x11/xfce4-settings/patches/patch-xfsettingsd_Makefile.in
diff -u pkgsrc/x11/xfce4-settings/patches/patch-xfsettingsd_Makefile.in:1.2 pkgsrc/x11/xfce4-settings/patches/patch-xfsettingsd_Makefile.in:1.3
--- pkgsrc/x11/xfce4-settings/patches/patch-xfsettingsd_Makefile.in:1.2 Sun Jun 18 22:41:54 2017
+++ pkgsrc/x11/xfce4-settings/patches/patch-xfsettingsd_Makefile.in     Sat Jun 23 22:08:54 2018
@@ -1,13 +1,13 @@
-$NetBSD: patch-xfsettingsd_Makefile.in,v 1.2 2017/06/18 22:41:54 youri Exp $
+$NetBSD: patch-xfsettingsd_Makefile.in,v 1.3 2018/06/23 22:08:54 youri Exp $
 
-Adjust config path.
+Adjust install paths.
 
---- xfsettingsd/Makefile.in.orig       2015-02-28 19:10:30.000000000 +0000
+--- xfsettingsd/Makefile.in.orig       2018-06-23 20:33:39.000000000 +0000
 +++ xfsettingsd/Makefile.in
-@@ -535,9 +535,9 @@ xfsettingsd_LDADD = $(GTK_LIBS) $(GLIB_L
-       $(LIBXFCE4KBD_PRIVATE_LIBS) $(LIBXKLAVIER_LIBS) $(XI_LIBS) \
-       $(LIBX11_LIBS) $(LIBNOTIFY_LIBS) $(FONTCONFIG_LIBS) \
-       $(LIBINPUT_LIBS) -lm $(am__append_3) $(am__append_6)
+@@ -547,9 +547,9 @@ xfsettingsd_LDADD = $(GTK_LIBS) $(GLIB_L
+       $(LIBXKLAVIER_LIBS) $(XI_LIBS) $(LIBX11_LIBS) \
+       $(LIBNOTIFY_LIBS) $(FONTCONFIG_LIBS) $(LIBINPUT_LIBS) -lm \
+       $(am__append_3) $(am__append_6)
 -settingsdir = $(sysconfdir)/xdg/xfce4/xfconf/xfce-perchannel-xml
 +settingsdir = $(datadir)/examples/xfce4/xfconf/xfce-perchannel-xml
  settings_DATA = xsettings.xml

Index: pkgsrc/x11/xfce4-settings/patches/patch-xfsettingsd_xsettings.xml
diff -u pkgsrc/x11/xfce4-settings/patches/patch-xfsettingsd_xsettings.xml:1.4 pkgsrc/x11/xfce4-settings/patches/patch-xfsettingsd_xsettings.xml:1.5
--- pkgsrc/x11/xfce4-settings/patches/patch-xfsettingsd_xsettings.xml:1.4       Mon Jun  4 01:34:12 2018
+++ pkgsrc/x11/xfce4-settings/patches/patch-xfsettingsd_xsettings.xml   Sat Jun 23 22:08:54 2018
@@ -1,8 +1,8 @@
-$NetBSD: patch-xfsettingsd_xsettings.xml,v 1.4 2018/06/04 01:34:12 youri Exp $
+$NetBSD: patch-xfsettingsd_xsettings.xml,v 1.5 2018/06/23 22:08:54 youri Exp $
 
 Use a good icon theme by default.
 
---- xfsettingsd/xsettings.xml.orig     2018-03-18 20:59:33.000000000 +0000
+--- xfsettingsd/xsettings.xml.orig     2018-06-20 22:37:58.000000000 +0000
 +++ xfsettingsd/xsettings.xml
 @@ -6,8 +6,8 @@
  <?xml version="1.0" encoding="UTF-8"?>
@@ -10,8 +10,8 @@ Use a good icon theme by default.
    <property name="Net" type="empty">
 -    <property name="ThemeName" type="empty"/>
 -    <property name="IconThemeName" type="empty"/>
-+    <property name="ThemeName" type="string" value="Adwaita"/>
-+    <property name="IconThemeName" type="string" value="elementary-xfce"/>
++    <property name="ThemeName" type="Adwaita"/>
++    <property name="IconThemeName" type="elementary-xfce"/>
      <property name="DoubleClickTime" type="int" value="400"/>
      <property name="DoubleClickDistance" type="int" value="5"/>
      <property name="DndDragThreshold" type="int" value="8"/>