Update to 4.13.4: What窶冱 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, 窶弃RECISON窶� to 窶弃RECISION窶� 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 XfceRandrdiff -r1.41 -r1.42 pkgsrc/x11/xfce4-settings/Makefile
(youri)
@@ -1,19 +1,18 @@ | @@ -1,19 +1,18 @@ | |||
1 | # $NetBSD: Makefile,v 1.41 2018/06/04 01:34:12 youri Exp $ | 1 | # $NetBSD: Makefile,v 1.42 2018/06/23 22:08:54 youri Exp $ | |
2 | 2 | |||
3 | .include "../../meta-pkgs/xfce4/Makefile.common" | 3 | .include "../../meta-pkgs/xfce4/Makefile.common" | |
4 | 4 | |||
5 | VERSION= 4.13.2 | 5 | VERSION= 4.13.4 | |
6 | PKGREVISION= 1 | |||
7 | DISTNAME= xfce4-settings-${VERSION} | 6 | DISTNAME= xfce4-settings-${VERSION} | |
8 | CATEGORIES= x11 | 7 | CATEGORIES= x11 | |
9 | MASTER_SITES= http://archive.xfce.org/src/xfce/xfce4-settings/4.13/ | 8 | MASTER_SITES= http://archive.xfce.org/src/xfce/xfce4-settings/4.13/ | |
10 | 9 | |||
11 | HOMEPAGE= http://docs.xfce.org/xfce/xfce4-settings/start | 10 | HOMEPAGE= http://docs.xfce.org/xfce/xfce4-settings/start | |
12 | COMMENT= Xfce settings manager | 11 | COMMENT= Xfce settings manager | |
13 | 12 | |||
14 | BUILD_DEFS+= PKG_SYSCONFBASE | 13 | BUILD_DEFS+= PKG_SYSCONFBASE | |
15 | 14 | |||
16 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} | 15 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} | |
17 | CONFIGURE_ARGS+= --enable-sound-settings | 16 | CONFIGURE_ARGS+= --enable-sound-settings | |
18 | CONFIGURE_ARGS+= --enable-pluggable-dialog | 17 | CONFIGURE_ARGS+= --enable-pluggable-dialog | |
19 | 18 |
@@ -1,9 +1,9 @@ | @@ -1,9 +1,9 @@ | |||
1 | $NetBSD: distinfo,v 1.10 2018/06/04 01:34:12 youri Exp $ | 1 | $NetBSD: distinfo,v 1.11 2018/06/23 22:08:54 youri Exp $ | |
2 | 2 | |||
3 | SHA1 (xfce4-settings-4.13.2.tar.bz2) = dc1257ac084100f061f96a9fca085447879155a3 | 3 | SHA1 (xfce4-settings-4.13.4.tar.bz2) = 0943203dd0c1317cc7878dbedea6d4797fa8c28c | |
4 | RMD160 (xfce4-settings-4.13.2.tar.bz2) = babfcab442abae05e1f2c9cd544e27bae6ec75e6 | 4 | RMD160 (xfce4-settings-4.13.4.tar.bz2) = 709b111a03201f8a2210c48dec33cf5c78795c67 | |
5 | SHA512 (xfce4-settings-4.13.2.tar.bz2) = 3564ee50914a6cb1955457c2b7bc5b515815142b04df418c70ed87692bc9aa87365af61682f07a5d979501df0fe32fe229f5be927fe0233855dfd9f454ff9643 | 5 | SHA512 (xfce4-settings-4.13.4.tar.bz2) = 39e2adaa93e2d86ff51e47f194306e57d025c13b5c07ee76cad7f67994f26fe03677c5a3bac91d1db4a25201371f6d135f36eed110dc15a1fbb46228ee715893 | |
6 | Size (xfce4-settings-4.13.2.tar.bz2) = 1043277 bytes | 6 | Size (xfce4-settings-4.13.4.tar.bz2) = 1046733 bytes | |
7 | SHA1 (patch-xfce4-settings-manager_Makefile.in) = c02cd0ccede9cea56c5d123eb1b5146039712f39 | 7 | SHA1 (patch-xfce4-settings-manager_Makefile.in) = c02cd0ccede9cea56c5d123eb1b5146039712f39 | |
8 | SHA1 (patch-xfsettingsd_Makefile.in) = ebe7d40d67fedaa846273242e1ba25f4a74a2b20 | 8 | SHA1 (patch-xfsettingsd_Makefile.in) = 4436cd90a4bdbdce731248735a38898afdd367d9 | |
9 | SHA1 (patch-xfsettingsd_xsettings.xml) = 2748f68097a2f1a13e509d4aee9a1bbe77e6b995 | 9 | SHA1 (patch-xfsettingsd_xsettings.xml) = dc4130aeabac2c5964695ae8b55a61a9989ff67d |
@@ -1,18 +1,18 @@ | @@ -1,18 +1,18 @@ | |||
1 | $NetBSD: patch-xfsettingsd_Makefile.in,v 1.2 2017/06/18 22:41:54 youri Exp $ | 1 | $NetBSD: patch-xfsettingsd_Makefile.in,v 1.3 2018/06/23 22:08:54 youri Exp $ | |
2 | 2 | |||
3 | Adjust config path. | 3 | Adjust install paths. | |
4 | 4 | |||
5 | --- xfsettingsd/Makefile.in.orig 2015-02-28 19:10:30.000000000 +0000 | 5 | --- xfsettingsd/Makefile.in.orig 2018-06-23 20:33:39.000000000 +0000 | |
6 | +++ xfsettingsd/Makefile.in | 6 | +++ xfsettingsd/Makefile.in | |
7 | @@ -535,9 +535,9 @@ xfsettingsd_LDADD = $(GTK_LIBS) $(GLIB_L | 7 | @@ -547,9 +547,9 @@ xfsettingsd_LDADD = $(GTK_LIBS) $(GLIB_L | |
8 | $(LIBXFCE4KBD_PRIVATE_LIBS) $(LIBXKLAVIER_LIBS) $(XI_LIBS) \ | 8 | $(LIBXKLAVIER_LIBS) $(XI_LIBS) $(LIBX11_LIBS) \ | |
9 | $(LIBX11_LIBS) $(LIBNOTIFY_LIBS) $(FONTCONFIG_LIBS) \ | 9 | $(LIBNOTIFY_LIBS) $(FONTCONFIG_LIBS) $(LIBINPUT_LIBS) -lm \ | |
10 | $(LIBINPUT_LIBS) -lm $(am__append_3) $(am__append_6) | 10 | $(am__append_3) $(am__append_6) | |
11 | -settingsdir = $(sysconfdir)/xdg/xfce4/xfconf/xfce-perchannel-xml | 11 | -settingsdir = $(sysconfdir)/xdg/xfce4/xfconf/xfce-perchannel-xml | |
12 | +settingsdir = $(datadir)/examples/xfce4/xfconf/xfce-perchannel-xml | 12 | +settingsdir = $(datadir)/examples/xfce4/xfconf/xfce-perchannel-xml | |
13 | settings_DATA = xsettings.xml | 13 | settings_DATA = xsettings.xml | |
14 | -autostartdir = $(sysconfdir)/xdg/autostart | 14 | -autostartdir = $(sysconfdir)/xdg/autostart | |
15 | +autostartdir = $(datadir)/examples/xfce4/autostart | 15 | +autostartdir = $(datadir)/examples/xfce4/autostart | |
16 | autostart_in_files = xfsettingsd.desktop.in | 16 | autostart_in_files = xfsettingsd.desktop.in | |
17 | autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) | 17 | autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) | |
18 | EXTRA_DIST = \ | 18 | EXTRA_DIST = \ |
@@ -1,17 +1,17 @@ | @@ -1,17 +1,17 @@ | |||
1 | $NetBSD: patch-xfsettingsd_xsettings.xml,v 1.4 2018/06/04 01:34:12 youri Exp $ | 1 | $NetBSD: patch-xfsettingsd_xsettings.xml,v 1.5 2018/06/23 22:08:54 youri Exp $ | |
2 | 2 | |||
3 | Use a good icon theme by default. | 3 | Use a good icon theme by default. | |
4 | 4 | |||
5 | --- xfsettingsd/xsettings.xml.orig 2018-03-18 20:59:33.000000000 +0000 | 5 | --- xfsettingsd/xsettings.xml.orig 2018-06-20 22:37:58.000000000 +0000 | |
6 | +++ xfsettingsd/xsettings.xml | 6 | +++ xfsettingsd/xsettings.xml | |
7 | @@ -6,8 +6,8 @@ | 7 | @@ -6,8 +6,8 @@ | |
8 | <?xml version="1.0" encoding="UTF-8"?> | 8 | <?xml version="1.0" encoding="UTF-8"?> | |
9 | <channel name="xsettings" version="1.0"> | 9 | <channel name="xsettings" version="1.0"> | |
10 | <property name="Net" type="empty"> | 10 | <property name="Net" type="empty"> | |
11 | - <property name="ThemeName" type="empty"/> | 11 | - <property name="ThemeName" type="empty"/> | |
12 | - <property name="IconThemeName" type="empty"/> | 12 | - <property name="IconThemeName" type="empty"/> | |
13 | + <property name="ThemeName" type="string" value="Adwaita"/> | 13 | + <property name="ThemeName" type="Adwaita"/> | |
14 | + <property name="IconThemeName" type="string" value="elementary-xfce"/> | 14 | + <property name="IconThemeName" type="elementary-xfce"/> | |
15 | <property name="DoubleClickTime" type="int" value="400"/> | 15 | <property name="DoubleClickTime" type="int" value="400"/> | |
16 | <property name="DoubleClickDistance" type="int" value="5"/> | 16 | <property name="DoubleClickDistance" type="int" value="5"/> | |
17 | <property name="DndDragThreshold" type="int" value="8"/> | 17 | <property name="DndDragThreshold" type="int" value="8"/> |