git: 7969890a3d8e - 2021Q2 - sysutils/xfce4-settings: Update to 4.16.1

Mon Apr 12 18:20:45 UTC 2021

The branch 2021Q2 has been updated by madpilot:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7969890a3d8e1b8fa820ec40c84fa0a97025ba0b

commit 7969890a3d8e1b8fa820ec40c84fa0a97025ba0b
Author:     Guido Falsi <madpilot at FreeBSD.org>
AuthorDate: 2021-04-12 18:15:53 +0000
Commit:     Guido Falsi <madpilot at FreeBSD.org>
CommitDate: 2021-04-12 18:20:26 +0000

    sysutils/xfce4-settings: Update to 4.16.1
    
    - Remove upstreamed patch
    - Also fix plist glitch I introduced by mistake in a previous
      update
    
    MFH:    2021Q2 (due to plist glitch fix)
    (cherry picked from commit 7902e4999f11de4a5bc3389a7185bdb4afbd1bcd)
---
 sysutils/xfce4-settings/Makefile                             |  3 +--
 sysutils/xfce4-settings/distinfo                             |  6 +++---
 .../files/patch-dialogs_appearance-settings_main.c           | 11 -----------
 sysutils/xfce4-settings/pkg-plist                            | 12 ++++++------
 4 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/sysutils/xfce4-settings/Makefile b/sysutils/xfce4-settings/Makefile
index aad15f78755f..ba44f4c6de90 100644
--- a/sysutils/xfce4-settings/Makefile
+++ b/sysutils/xfce4-settings/Makefile
@@ -1,8 +1,7 @@
 # Created by: Oliver Lehmann <oliver at FreeBSD.org>
 
 PORTNAME=	xfce4-settings
-PORTVERSION=	4.16.0
-PORTREVISION=	2
+PORTVERSION=	4.16.1
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	XFCE
 DIST_SUBDIR=	xfce4
diff --git a/sysutils/xfce4-settings/distinfo b/sysutils/xfce4-settings/distinfo
index d35c3bf9848a..afd90135e467 100644
--- a/sysutils/xfce4-settings/distinfo
+++ b/sysutils/xfce4-settings/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1608682830
-SHA256 (xfce4/xfce4-settings-4.16.0.tar.bz2) = 67a1404fc754c675c6431e22a8fe0e5d79644fdfadbfe25a4523d68e1442ddc2
-SIZE (xfce4/xfce4-settings-4.16.0.tar.bz2) = 1492754
+TIMESTAMP = 1618240574
+SHA256 (xfce4/xfce4-settings-4.16.1.tar.bz2) = bb28e1be7aa34d0edb1cfbaacc509a4267db56828b36cd6be312a202973635c6
+SIZE (xfce4/xfce4-settings-4.16.1.tar.bz2) = 1496053
diff --git a/sysutils/xfce4-settings/files/patch-dialogs_appearance-settings_main.c b/sysutils/xfce4-settings/files/patch-dialogs_appearance-settings_main.c
deleted file mode 100644
index d7f7ca22cde7..000000000000
--- a/sysutils/xfce4-settings/files/patch-dialogs_appearance-settings_main.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- dialogs/appearance-settings/main.c.orig	2020-12-16 10:44:46 UTC
-+++ dialogs/appearance-settings/main.c
-@@ -994,7 +994,7 @@ appearance_settings_install_theme_cb (GtkButton *widge
-         gchar **uris;
-         GtkFileChooser *chooser = GTK_FILE_CHOOSER (dialog);
- 
--        uris = g_new0 (gchar *, 1);
-+        uris = g_new0 (gchar *, 2);
-         filename = gtk_file_chooser_get_filename (chooser);
-         uris[0] = g_filename_to_uri (filename, NULL, NULL);
-         install_theme (window, uris, builder);
diff --git a/sysutils/xfce4-settings/pkg-plist b/sysutils/xfce4-settings/pkg-plist
index eb84cd186b1a..5ba1ba6d8583 100644
--- a/sysutils/xfce4-settings/pkg-plist
+++ b/sysutils/xfce4-settings/pkg-plist
@@ -112,10 +112,6 @@ share/icons/hicolor/scalable/apps/org.xfce.settings.manager.svg
 share/icons/hicolor/scalable/apps/org.xfce.settings.mouse.svg
 share/icons/hicolor/scalable/apps/org.xfce.terminalemulator.svg
 share/icons/hicolor/scalable/apps/org.xfce.webbrowser.svg
-
-share/locale/be at tarask/LC_MESSAGES/xfce4-settings.mo
-share/locale/et/LC_MESSAGES/xfce4-settings.mo
-share/locale/hye/LC_MESSAGES/xfce4-settings.mo
 share/xfce4/helpers/thunar.desktop
 share/xfce4/helpers/aterm.desktop
 share/xfce4/helpers/balsa.desktop
@@ -173,6 +169,7 @@ share/xfce4/helpers/xterm.desktop
 %%NLS%%share/locale/ar/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/ast/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/be/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/be at tarask/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/bn/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/xfce4-settings.mo
@@ -184,6 +181,7 @@ share/xfce4/helpers/xterm.desktop
 %%NLS%%share/locale/en_CA/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/es/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/et/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/xfce4-settings.mo
@@ -192,11 +190,13 @@ share/xfce4/helpers/xterm.desktop
 %%NLS%%share/locale/hr/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/hy_AM/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/hye/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/id/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/ie/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/is/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/it/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/kab/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/kk/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/xfce4-settings.mo
@@ -208,8 +208,8 @@ share/xfce4/helpers/xterm.desktop
 %%NLS%%share/locale/oc/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/pa/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/xfce4-settings.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/si/LC_MESSAGES/xfce4-settings.mo
@@ -223,8 +223,8 @@ share/xfce4/helpers/xterm.desktop
 %%NLS%%share/locale/tr/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/ug/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/xfce4-settings.mo
-%%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/ur/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/zh_HK/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-settings.mo
