Merge branch '3.3' into 3.4

2018-02-09 18:09:43 +01:00 · 2018-02-09 18:09:43 +01:00 · 1a90db166d
commit 1a90db166d
parent 02063f1dc1 a3a293abac
42 changed files with 274 additions and 145 deletions
--- a/chromium/.md5sum
+++ b/chromium/.md5sum
@ -1,8 +1,7 @@
 d144ace1ee63acdf7dd149b013c83088  chromium-64.0.3282.119-constexpr-1.patch
-5b72bcaba2ad920c524cd92a7a6125fe  chromium-64.0.3282.119.tar.xz
+1d054126448cceabc922625e54835a53  chromium-64.0.3282.140.tar.xz
 27dbd1479d469346d1ffe27c7e7c0011  chromium-clang-r2.patch
 21f73763be6c44ce3df0f1cbbfbff440  chromium-cups-r0.patch
-3e30a8e6629c931a640d65d4ab02b939  chromium-exclude_unwind_tables.patch
 cb40c4153943f9eb5e38e90ba2f8b382  chromium-memcpy-r0.patch
 e42a8b91ea55b4765b9b2b9e2437a9d0  chromium-omnibox-unescape-fragment.patch
 254061cb349cff714230b7cca83b0a4c  chromium-skia-harmony.patch
--- a/chromium/.signature
+++ b/chromium/.signature
@ -1,12 +1,11 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/eMT5dMXGD/Cjir9qaOlX5vQrQjKugSDAZj9lj9orWVCuFEq4PqVk+EpjkiBaPE/Jaf/7fON+UzzsKTplp3ZRgs=
-SHA256 (Pkgfile) = 1344a0a071676087345b642c05f74dfbd35ec97280bd74939a8c06b0b15c9538
+RWSE3ohX2g5d/bEWr/oZRxzPFR+b9F9rIpyo8+rffsdlcDOb0jHHAQD8mwbqC1LcLr3svwaFM8xsWV8ResFO5THfaJkKnLClFwY=
+SHA256 (Pkgfile) = f863f53f84dedf29eff377d5efa68d92e9ff9e5d63cb3823d298d88d8949bb71
 SHA256 (.footprint) = e1e6cdeeb1dc4e10e1b0f3e743f69fae1c35e4db1f455cd9e65e5bf0387d9d7e
-SHA256 (chromium-64.0.3282.119.tar.xz) = 342ea80a925d85f5155b2b423a0d3cbcf2ee5729bf107c601d7d902315d03127
+SHA256 (chromium-64.0.3282.140.tar.xz) = 146afbab37982c52251e5c71b6e19e6e7053b527217fe1da9966c794478c29ce
 SHA256 (last-commit-position.patch) = d3dc397956a26ec045e76c25c57a1fac5fc0acff94306b2a670daee7ba15709e
 SHA256 (chromium.sh) = 7b182d0ae1e9ef841f8cd0b403a304babd548bf60b5e3808b2144bebdbb7c154
 SHA256 (chromium-64.0.3282.119-constexpr-1.patch) = 9982464badc03879c5f73ed18a719661f00aad51da078bae032293e656bfaf6d
-SHA256 (chromium-exclude_unwind_tables.patch) = 9478f1ec1a3c53425306cf41c2d0555c215a4f106955d9d6adfff38044530ce8
 SHA256 (chromium-use-fromUTF8-for-UnicodeString-construction.patch) = c82c830bac7ab328a76d85fb141e150a17d02d97138a6daa4720a8a8c371a402
 SHA256 (chromium-omnibox-unescape-fragment.patch) = 814eb2cecb10cb697e24036b08aac41e88d0e38971741f9e946200764e2401ae
 SHA256 (chromium-skia-harmony.patch) = feca54ab09ac0fc9d0626770a6b899a6ac5a12173c7d0c1005bc3964ec83e7b3
--- a/chromium/Pkgfile
+++ b/chromium/Pkgfile
@ -4,12 +4,11 @@
 # Depends on: dbus-glib gperf gtk gtk3 libevent libexif libgcrypt ninja nodejs nss pciutils speech-dispatcher xorg-libxscrnsaver xorg-libxt yasm

 name=chromium
-version=64.0.3282.119
+version=64.0.3282.140
 release=1
 source=(https://commondatastorage.googleapis.com/$name-browser-official/$name-$version.tar.xz
 	last-commit-position.patch $name.sh
 	chromium-64.0.3282.119-constexpr-1.patch
-	chromium-exclude_unwind_tables.patch
 	chromium-use-fromUTF8-for-UnicodeString-construction.patch
 	chromium-omnibox-unescape-fragment.patch
 	chromium-skia-harmony.patch
@ -45,7 +44,10 @@ build() {
 	echo "LASTCHANGE=$_chrome_build_hash-" >build/util/LASTCHANGE

 	# https://chromium-review.googlesource.com/c/chromium/src/+/712575
-	patch -p1 -i $SRC/chromium-exclude_unwind_tables.patch
+	# _flags+=('exclude_unwind_tables=true')
+	CFLAGS+='   -fno-unwind-tables -fno-asynchronous-unwind-tables'
+	CXXFLAGS+=' -fno-unwind-tables -fno-asynchronous-unwind-tables'
+	CPPFLAGS+=' -DNO_UNWIND_TABLES'

 	# https://crbug.com/772655
 	patch -p1 -i $SRC/chromium-use-fromUTF8-for-UnicodeString-construction.patch
@ -64,19 +66,22 @@ build() {
 	mkdir -p third_party/node/linux/node-linux-x64/bin
 	ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/

-#	for LIB in ffmpeg flac harfbuzz-ng libjpeg libjpeg_turbo libpng libwebp libxslt yasm; do
-#		find -type f -path "*third_party/$LIB/*" \
-#		 \! -path "*third_party/$LIB/chromium/*" \
-#		 \! -path "*third_party/$LIB/google/*" \
-#		 \! -path "*base/third_party/icu/*" \
-#		 \! -regex '.*\.\(gn\|gni\|isolate\|py\)' \
-#		 -delete
-#	done
+	local LIB
+	for LIB in libjpeg libjpeg_turbo yasm; do
+		find -type f -path "*third_party/$LIB/*" \
+			\! -path "*third_party/$LIB/chromium/*" \
+			\! -path "*third_party/$LIB/google/*" \
+			\! -path './base/third_party/icu/*' \
+			\! -path './third_party/yasm/run_yasm.py' \
+                        \! -regex '.*\.\(gn\|gni\|isolate\)' \
+			\! -path './third_party/freetype/src/src/psnames/pstables.h' \
+			-delete
+	done

-#	/usr/bin/python2 build/linux/unbundle/replace_gn_files.py \
-#		--system-libraries ffmpeg flac harfbuzz-ng libjpeg libxml libevent \
-#		libpng libwebp libxslt opus yasm freetype
-#	/usr/bin/python2 third_party/libaddressinput/chromium/tools/update-strings.py
+	/usr/bin/python2 build/linux/unbundle/replace_gn_files.py \
+		--system-libraries libjpeg libxml libevent yasm
+
+	/usr/bin/python2 third_party/libaddressinput/chromium/tools/update-strings.py

 	_gn_args=(
 		'blink_gc_plugin=false'
@ -99,7 +104,6 @@ build() {
 		'use_gconf=false'
 		'use_gnome_keyring=false'
 		'use_gold=false'
-		'use_gtk3=true'
 		'use_kerberos=false'
 		'use_pulseaudio=false'
 		'use_sysroot=false'
--- a/chromium/chromium-exclude_unwind_tables.patch
+++ b/chromium/chromium-exclude_unwind_tables.patch
@ -1,33 +0,0 @@
-diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni
-index ad40fd9..50e19a4 100644
--- a/build/config/compiler/compiler.gni
-+++ b/build/config/compiler/compiler.gni
-@@ -68,19 +68,19 @@
- 
-   # Whether or not we should use position independent code.
-   use_pic = true
-+
-+  # Exclude unwind tables for official builds as unwinding can be done from
-+  # stack dumps produced by Crashpad at a later time "offline" in the crash
-+  # server. For unofficial (e.g. development) builds and non-Chrome branded
-+  # (e.g. Cronet which doesn't use Crashpad, crbug.com/479283) builds it's
-+  # useful to be able to unwind at runtime.
-+  exclude_unwind_tables =
-+      (is_chrome_branded && is_official_build) ||
-+      (is_chromecast && !is_cast_desktop_build && !is_debug && !is_fuchsia)
- }
- 
- assert(!is_cfi || use_thin_lto, "CFI requires ThinLTO")
- 
-# Exclude unwind tables for official builds as unwinding can be done from stack
-# dumps produced by Crashpad at a later time "offline" in the crash server.
-# For unofficial (e.g. development) builds and non-Chrome branded (e.g. Cronet
-# which doesn't use Crashpad, crbug.com/479283) builds it's useful to be able
-# to unwind at runtime.
-exclude_unwind_tables =
-    (is_chrome_branded && is_official_build) ||
-    (is_chromecast && !is_cast_desktop_build && !is_debug && !is_fuchsia)
-
- # If true, optimize for size. Does not affect windows builds.
- # Linux & Mac favor speed over size.
- # TODO(brettw) it's weird that Mac and desktop Linux are different. We should
--- a/dbus/.footprint
+++ b/dbus/.footprint
@ -48,9 +48,9 @@ drwxr-xr-x	root/root	usr/lib/dbus/
 -rwsr-x---	root/messagebus	usr/lib/dbus/dbus-daemon-launch-helper
 -rw-r--r--	root/root	usr/lib/libdbus-1.a
 -rwxr-xr-x	root/root	usr/lib/libdbus-1.la
-lrwxrwxrwx	root/root	usr/lib/libdbus-1.so -> libdbus-1.so.3.19.4
-lrwxrwxrwx	root/root	usr/lib/libdbus-1.so.3 -> libdbus-1.so.3.19.4
-rwxr-xr-x	root/root	usr/lib/libdbus-1.so.3.19.4
+lrwxrwxrwx	root/root	usr/lib/libdbus-1.so -> libdbus-1.so.3.19.5
+lrwxrwxrwx	root/root	usr/lib/libdbus-1.so.3 -> libdbus-1.so.3.19.5
+-rwxr-xr-x	root/root	usr/lib/libdbus-1.so.3.19.5
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/dbus-1.pc
 drwxr-xr-x	root/root	usr/sbin/
--- a/dbus/.md5sum
+++ b/dbus/.md5sum
@ -1,3 +1,3 @@
 23bc5ff22fe4f9a208d65fbbfd489ad9  30-dbus.launch
-3361456cadb99aa6601bed5b48964254  dbus-1.12.2.tar.gz
+89745b5a6c45c26751dcf673d912f745  dbus-1.12.4.tar.gz
 0acb71de3d0fc3271d2391da168c6f9f  rc.dbus
--- a/dbus/.signature
+++ b/dbus/.signature
@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/dp1wda/1MTNM3qSZmY5LplfvAKab/rn7Rrw/iT79NXNDZgEYy5eEgHR2J3tOVKGfpViRoLwl4RFInZXnLGUVgk=
-SHA256 (Pkgfile) = 839daa65db40ca947b9ecddd255fd952e7564b682b9dd198aacfe70b3bf7885e
-SHA256 (.footprint) = 86d7a63f5fadc0ed96aca78b941f07e186cdd7ea07c456987454df1679850846
-SHA256 (dbus-1.12.2.tar.gz) = 272bb5091770b047c8188b926d5e6038fa4fe6745488b2add96b23e2d9a83d88
+RWSE3ohX2g5d/cZMsQAA903khYGD9ZfY2cQeNllGM6Ht7DseD6N1CV2usTvgCw92UmjlhWXxqPg53Al5L0AacTPN0HvTuL6k6wo=
+SHA256 (Pkgfile) = ad274185c5e3df77d3c1725b4d701285893d7980d7f22db7da977a911a278081
+SHA256 (.footprint) = 142ab797d69827f6647804433c7fe386c8e0e1e77d18be5a1d9c43f5a46fbf05
+SHA256 (dbus-1.12.4.tar.gz) = f9756b68ec68065ae2dafcf1191ee40b4cb06e9534a01f6a74d5a4d7894221c7
 SHA256 (rc.dbus) = ccc40d9bcb9d763b914d598390c0868f85c6447d239084dad0fe776a4ce3f23e
 SHA256 (30-dbus.launch) = 18ea1e79698bb876f7f5fb298daae5ff6cd17c56764b087f8da2e1d5809af37a
--- a/dbus/Pkgfile
+++ b/dbus/Pkgfile
@ -4,7 +4,7 @@
 # Depends on: expat

 name=dbus
-version=1.12.2
+version=1.12.4
 release=1
 source=(http://dbus.freedesktop.org/releases/dbus/$name-$version.tar.gz \
        rc.dbus 30-dbus.launch)
--- a/deadwood/.md5sum
+++ b/deadwood/.md5sum
@ -1,3 +1,3 @@
 b2dd06eb5f3e6c621695bd5679a2d208  deadwood
-d6a7cb926f1a08e80bd3de23b119dd26  deadwood-3.2.10.tar.xz
+3319233d9a0e6756f63153e73aed3578  deadwood-3.2.11.tar.xz
 0a2d736d8043d5cae0c5e41d2110c6a9  dwood3rc
--- a/deadwood/.signature
+++ b/deadwood/.signature
@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/edDRWCHdC01E4ttVQJDgbQlyk4RokCuDEdJqTseQ5FXW7U7x2ggvXXjUmiYnalG0px7N/O7giUpF3TVisl32AQ=
-SHA256 (Pkgfile) = 1de9db6e620ce75b4570ccaf16a87808ad4f9c254a8a95c8cc2e0ec7f96bee00
+RWSE3ohX2g5d/cfc2dwiAnS86Lvtribm9VRuMt5yDBwaArGXXTFalkm3y9a9Ntt0tMzR6CcwBrK1x68itxGEBMYIViRWWIP/+Q8=
+SHA256 (Pkgfile) = 8445e4bee9a2ccc1b5acf95a7e2121d7a77f5a1d006c42abf7460df9df2c7d1f
 SHA256 (.footprint) = c8d916f21b2796115656b1b5337f4fa2a9db6bd1bcc5afbafa5d85c54201dce6
-SHA256 (deadwood-3.2.10.tar.xz) = dbe565c14903308a16cca1634178c5be0201e5a7034dab841db0f4f0e6e06a19
+SHA256 (deadwood-3.2.11.tar.xz) = ceb124b3917cf24e8e16887c1c9cb67819b7f41013c3a6e723316d470099f104
 SHA256 (dwood3rc) = 358f8d6f195ecfa9823105233620be91a8a67da686322a41ea1f292069613216
 SHA256 (deadwood) = b50eb7d4de77dc16282f7c4d542a08ba3f706244ca71b164d58dcb8aac995eeb
--- a/deadwood/Pkgfile
+++ b/deadwood/Pkgfile
@ -3,7 +3,7 @@
 # Maintainer:  Juergen Daubert, jue at crux dot nu

 name=deadwood
-version=3.2.10
+version=3.2.11
 release=1
 source=(http://maradns.samiam.org/deadwood/stable/$name-$version.tar.xz \
        dwood3rc deadwood)
--- a/hexchat/.md5sum
+++ b/hexchat/.md5sum
@ -1,2 +1,3 @@
 8f1ac351752d149a98aa3a77d40e1f7c  hexchat-2.12.4.tar.xz
 3ac82bdef880de4bd8c7ead4ea3328bf  hexchat-enchant2.0.patch
+9a6e7bbdbdfe87bd897121413fe657e7  hexchat-enchant2.0_name.patch
--- a/hexchat/.signature
+++ b/hexchat/.signature
@ -1,6 +1,7 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/RwHNC4xhb07BhrDOHxToqigYcqyz0HSPfPF4FfYEQ1iumJ2073WTRipD3btTRP+MB715Xr7cT9EHgGDPo6g9Q4=
-SHA256 (Pkgfile) = 3e678d73a0aa289f7168c7645e5f536e408db8f35b0276fe3b9d15a673c3cbff
+RWSE3ohX2g5d/ZX78J/Xv8j7kDzx/MOBbgbN/whu6787t1KT4PNg1nVk2/5+kfTj5NbphwQQeDD+2ARfB2hiquJcLoBe2ISbOQs=
+SHA256 (Pkgfile) = c5604b8f867783e1327c69a402d528fdb9e71afc6e306346421bccb80f356944
 SHA256 (.footprint) = 23bf408e9ed745eb12003a6b2270de16b3a651b03374c34b29edec11ceac6cdd
 SHA256 (hexchat-2.12.4.tar.xz) = fa35913158bbc7d0d99de79371b6df3e8d21802f1d2c7c92f0e5db694acf2c3a
 SHA256 (hexchat-enchant2.0.patch) = d5f1e70b696337b15d40386292748483d2b27631a9bba6cfa5c97eae4f6987f1
+SHA256 (hexchat-enchant2.0_name.patch) = b9687999f8e013716ec997458de1db0d3618382a6963d5f6eb578fea253daa24
--- a/hexchat/Pkgfile
+++ b/hexchat/Pkgfile
@ -1,20 +1,21 @@
 # Description: GTK+ based IRC client.
 # URL: http://hexchat.github.io/
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Packager: Danny Rawlins, crux at romster dot me
 # Depends on: autoconf-archive gtk iso-codes libnotify pciutils xorg-libxdamage
 # Optional: enchant libcanberra lua

 name=hexchat
 version=2.12.4
-release=2
+release=3
 source=(http://dl.hexchat.net/hexchat/$name-$version.tar.xz
-	hexchat-enchant2.0.patch)
+	hexchat-enchant2.0.patch
+	hexchat-enchant2.0_name.patch)

 build() {
 	cd $name-$version

 	patch -p1 -i $SRC/hexchat-enchant2.0.patch
+	patch -p1 -i $SRC/hexchat-enchant2.0_name.patch

 	local LUA
 	if [ "$(pkginfo -i | grep '^lua ')" ]; then
--- a/hexchat/hexchat-enchant2.0.patch
+++ b/hexchat/hexchat-enchant2.0.patch
@ -0,0 +1,124 @@
+From 005858795878b92fc17b4c2127bce90a1d053483 Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <tingping@tingping.se>
+Date: Fri, 24 Nov 2017 03:51:10 -0500
+Subject: [PATCH] spell-entry: Improve robustness of enchant loading and fix
+ 2.0 support
+
+- Add logging and error handling to loading symbols
+- Don't load unversioned symbol
+- Handle new function names in Enchant 2.0
+
+Closes #2095
+---
+ src/fe-gtk/sexy-spell-entry.c | 94 +++++++++++++++++++++++++------------------
+ 1 file changed, 55 insertions(+), 39 deletions(-)
+
+diff --git a/src/fe-gtk/sexy-spell-entry.c b/src/fe-gtk/sexy-spell-entry.c
+index 566abcf3e..bd31d2239 100644
+--- a/src/fe-gtk/sexy-spell-entry.c
+++ b/src/fe-gtk/sexy-spell-entry.c
+@@ -159,49 +159,65 @@ initialize_enchant (void)
+ {
+ 	GModule *enchant;
+ 	gpointer funcptr;
+-
+-
+-	enchant = g_module_open("libenchant."G_MODULE_SUFFIX, 0);
+-	if (enchant == NULL)
+-	{
+-#ifndef WIN32
+-		enchant = g_module_open("libenchant.so.1", 0);
+-		if (enchant == NULL)
+-		{
+-#ifdef __APPLE__
+-			enchant = g_module_open("libenchant.dylib", 0);
+-			if (enchant == NULL)
+    gsize i;
+    const char * const libnames[] = {
+#ifdef G_OS_WIN32
+        "libenchant.dll",
+ #endif
+-				return;
+-		}
+-#else
+-		return;
+#ifdef G_OS_UNIX
+        "libenchant.so.1",
+        "libenchant.so.2",
+ #endif
+-	}
+-
+-	have_enchant = TRUE;
+-
+-#define MODULE_SYMBOL(name, func) \
+-	g_module_symbol(enchant, (name), &funcptr); \
+-	(func) = funcptr;
+-
+-	MODULE_SYMBOL("enchant_broker_init", enchant_broker_init)
+-	MODULE_SYMBOL("enchant_broker_free", enchant_broker_free)
+-	MODULE_SYMBOL("enchant_broker_free_dict", enchant_broker_free_dict)
+-	MODULE_SYMBOL("enchant_broker_list_dicts", enchant_broker_list_dicts)
+-	MODULE_SYMBOL("enchant_broker_request_dict", enchant_broker_request_dict)
+-
+-	MODULE_SYMBOL("enchant_dict_add_to_personal", enchant_dict_add_to_personal)
+-	MODULE_SYMBOL("enchant_dict_add_to_session", enchant_dict_add_to_session)
+-	MODULE_SYMBOL("enchant_dict_check", enchant_dict_check)
+-	MODULE_SYMBOL("enchant_dict_describe", enchant_dict_describe)
+#ifdef __APPLE__
+        "libenchant.dylib",
+#endif
+    };
+
+    for (i = 0; i < G_N_ELEMENTS(libnames); ++i)
+    {
+        enchant = g_module_open(libnames[i], 0);
+        if (enchant)
+        {
+            g_info ("Loaded %s", libnames[i]);
+            have_enchant = TRUE;
+            break;
+        }
+    }
+
+  if (!have_enchant)
+    return;
+
+#define MODULE_SYMBOL(name, func, alt_name) G_STMT_START { \
+    const char *funcname = name; \
+    gboolean ret = g_module_symbol(enchant, funcname, &funcptr); \
+    if (alt_name) { \
+        funcname = alt_name; \
+        ret = g_module_symbol(enchant, funcname, &funcptr); \
+    } \
+    if (ret == FALSE) { \
+        g_warning ("Failed to find enchant symbol %s", funcname); \
+        have_enchant = FALSE; \
+        return; \
+    } \
+    (func) = funcptr; \
+} G_STMT_END;
+
+	MODULE_SYMBOL("enchant_broker_init", enchant_broker_init, NULL)
+	MODULE_SYMBOL("enchant_broker_free", enchant_broker_free, NULL)
+	MODULE_SYMBOL("enchant_broker_free_dict", enchant_broker_free_dict, NULL)
+	MODULE_SYMBOL("enchant_broker_list_dicts", enchant_broker_list_dicts, NULL)
+	MODULE_SYMBOL("enchant_broker_request_dict", enchant_broker_request_dict, NULL)
+
+	MODULE_SYMBOL("enchant_dict_add_to_personal", enchant_dict_add_to_personal,
+                  "enchant_dict_add")
+	MODULE_SYMBOL("enchant_dict_add_to_session", enchant_dict_add_to_session, NULL)
+	MODULE_SYMBOL("enchant_dict_check", enchant_dict_check, NULL)
+	MODULE_SYMBOL("enchant_dict_describe", enchant_dict_describe, NULL)
+ 	MODULE_SYMBOL("enchant_dict_free_suggestions",
+-				  enchant_dict_free_suggestions)
+				  enchant_dict_free_suggestions, "enchant_dict_free_string_list")
+ 	MODULE_SYMBOL("enchant_dict_store_replacement",
+-				  enchant_dict_store_replacement)
+-	MODULE_SYMBOL("enchant_dict_suggest", enchant_dict_suggest)
+-
+-#undef MODULE_SYMBOL
+				  enchant_dict_store_replacement, NULL)
+	MODULE_SYMBOL("enchant_dict_suggest", enchant_dict_suggest, NULL)
+ }
+ 
+ static void
--- a/hexchat/hexchat-enchant2.0_name.patch
+++ b/hexchat/hexchat-enchant2.0_name.patch
@ -0,0 +1,24 @@
+From 234fe8698781f149df0e6928e48859f66b5e947b Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <tingping@tingping.se>
+Date: Tue, 6 Feb 2018 16:57:30 -0500
+Subject: [PATCH] Fix Enchant 2.1.3+ support
+
+They changed the lib name yet again...
+
+Closes #2117
+---
+ src/fe-gtk/sexy-spell-entry.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/fe-gtk/sexy-spell-entry.c b/src/fe-gtk/sexy-spell-entry.c
+index bd31d2239..dce19b829 100644
+--- a/src/fe-gtk/sexy-spell-entry.c
+++ b/src/fe-gtk/sexy-spell-entry.c
+@@ -167,6 +167,7 @@ initialize_enchant (void)
+ #ifdef G_OS_UNIX
+         "libenchant.so.1",
+         "libenchant.so.2",
+        "libenchant-2.so.2",
+ #endif
+ #ifdef __APPLE__
+         "libenchant.dylib",
--- a/lunzip/.md5sum
+++ b/lunzip/.md5sum
@ -1 +1 @@
-75d3412fe3f28b059c9f83dfd10227f8  lunzip-1.9.tar.gz
+e11d3533634dd975497494d994169095  lunzip-1.10.tar.gz
--- a/lunzip/.signature
+++ b/lunzip/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/YK308O7qpKXdZWfaAkPPIgF3ZcldatYjZy9u0mYFZ2UH65BMXCyAHFdMU+5BI0qZY6od/EijCPkuuSFisGrxA0=
-SHA256 (Pkgfile) = 7fbf3ca3557c1408169bbb29b4b868d13fb3f34bbda868ce69f3e20f8bc74b89
+RWSE3ohX2g5d/R9Iv4ZZE9w/HpX/1Vxf9INr1JGVFwM1f35RwmXI2fCZFpvMPzvd+XARFLoz2ERclqlWBi3MQVQA1kj9Ss+R9Qs=
+SHA256 (Pkgfile) = 9ee2b20b3906b7bfa064b14c9b5672402bac7f0fb5313d6debf464ba8abf5db0
 SHA256 (.footprint) = 7d1aa9b7a30315eff5a7efe06fa73cb68126b976f5f5de6866d920d06a0d578d
-SHA256 (lunzip-1.9.tar.gz) = 58bcfb3006952753b82e2ae1d77307c3a47e5779dfd183d3c2e11b73596aa3ab
+SHA256 (lunzip-1.10.tar.gz) = 7416393bac6a67460c55fe97075d2720f3be0747b01c74033dba6b6bf24a85c7
--- a/lunzip/Pkgfile
+++ b/lunzip/Pkgfile
@ -4,7 +4,7 @@
 # Depends on:

 name=lunzip
-version=1.9
+version=1.10
 release=1
 source=(http://download.savannah.gnu.org/releases/lzip/lunzip/lunzip-$version.tar.gz)

--- a/maradns/.md5sum
+++ b/maradns/.md5sum
@ -1,4 +1,4 @@
 6e2f5cfb258b8955fa345a2070b6c4b0  db.localhost
 e752122d3f1beb32ba0ebd3738c1071e  maradns
-93102ac1569f953661c7ff25b85652a2  maradns-2.0.14.tar.bz2
+8df40c835d82dfaa5b4fd84ed9617680  maradns-2.0.15.tar.bz2
 8205d9a6cdeba454d173847fd44168a3  mararc
--- a/maradns/.signature
+++ b/maradns/.signature
@ -1,8 +1,8 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/bCd/xAlBGGbB8PszOqO+89AVNQTw+DvgTwPLAk0d3Sjh95bMjLS0Vc1E+nhLw7CkRnBHsohq/P89TfdLThspAw=
-SHA256 (Pkgfile) = f946aef4ded5094ecacb08d6f4bf68701736b17cb546ec29f04b4054bb292ca2
+RWSE3ohX2g5d/Vzz4KIduNyGPRp/MohGCN0UifTCJbYa2xqbhq35NPA0ywjlMWs9YNbnXYnDHa6ooJmSJ2V+eZd7JWo3qUbvMQU=
+SHA256 (Pkgfile) = 606952870c950635cea5bac4e029baf93356c722e90cf0aa625688b4eed71646
 SHA256 (.footprint) = 5a05ccb9b87167d86e461961de65a9faa670f4a9be19fe5fd1d74fb6485e1221
-SHA256 (maradns-2.0.14.tar.bz2) = 1a529c818df9cbd431fa09e3a413dfbbb410f7be3542a766028a36bc5ef94e29
+SHA256 (maradns-2.0.15.tar.bz2) = 2c20588dc9a79492aca94a477864c59ac28ec7ae4715046022311e9cefe332b2
 SHA256 (mararc) = 090d5cdd0c388206357ab14e6f03f4cf64dbb8e2580f7342d3fd6d047a1e651d
 SHA256 (maradns) = fe2f36ef23a530784df4574c52b335c97863fe49dff5d22c19076dd32d5858af
 SHA256 (db.localhost) = 9ce7256594f978142df749abeaf1b5983921b2415cdd730b3696919d9ba426ed
--- a/maradns/Pkgfile
+++ b/maradns/Pkgfile
@ -3,7 +3,7 @@
 # Maintainer:  Juergen Daubert, jue at crux dot nu

 name=maradns
-version=2.0.14
+version=2.0.15
 release=1
 source=(http://maradns.samiam.org/download/2.0/$version/$name-$version.tar.bz2 \
        mararc maradns db.localhost)
--- a/parted/parted-3.1-readline-6.3.patch
+++ b/parted/parted-3.1-readline-6.3.patch
@ -1,12 +0,0 @@
-diff -Nru parted-3.1.orig/parted/ui.c parted-3.1/parted/ui.c
--- parted-3.1.orig/parted/ui.c	2014-03-04 11:20:01.556849738 +0100
-+++ parted-3.1/parted/ui.c	2014-03-04 11:21:36.810139757 +0100
-@@ -1474,7 +1474,7 @@
- #ifdef HAVE_LIBREADLINE
-   if (!opt_script_mode) {
-     rl_initialize ();
-    rl_attempted_completion_function = (CPPFunction*) complete_function;
-+    rl_attempted_completion_function = (rl_completion_func_t *) complete_function;
-     readline_state.in_readline = 0;
-   }
- #endif
--- a/python-setuptools/.footprint
+++ b/python-setuptools/.footprint
@ -60,14 +60,14 @@ drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/pkg_resources/extern/
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/pkg_resources/py31compat.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/pkg_resources/py31compat.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/pkg_resources/py31compat.pyo
-drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/setuptools-38.2.5-py2.7.egg-info/
-rw-r--r--	root/root	usr/lib/python2.7/site-packages/setuptools-38.2.5-py2.7.egg-info/PKG-INFO
-rw-r--r--	root/root	usr/lib/python2.7/site-packages/setuptools-38.2.5-py2.7.egg-info/SOURCES.txt
-rw-r--r--	root/root	usr/lib/python2.7/site-packages/setuptools-38.2.5-py2.7.egg-info/dependency_links.txt
-rw-r--r--	root/root	usr/lib/python2.7/site-packages/setuptools-38.2.5-py2.7.egg-info/entry_points.txt
-rw-r--r--	root/root	usr/lib/python2.7/site-packages/setuptools-38.2.5-py2.7.egg-info/requires.txt
-rw-r--r--	root/root	usr/lib/python2.7/site-packages/setuptools-38.2.5-py2.7.egg-info/top_level.txt
-rw-r--r--	root/root	usr/lib/python2.7/site-packages/setuptools-38.2.5-py2.7.egg-info/zip-safe
+drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/setuptools-38.5.1-py2.7.egg-info/
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/setuptools-38.5.1-py2.7.egg-info/PKG-INFO
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/setuptools-38.5.1-py2.7.egg-info/SOURCES.txt
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/setuptools-38.5.1-py2.7.egg-info/dependency_links.txt
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/setuptools-38.5.1-py2.7.egg-info/entry_points.txt
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/setuptools-38.5.1-py2.7.egg-info/requires.txt
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/setuptools-38.5.1-py2.7.egg-info/top_level.txt
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/setuptools-38.5.1-py2.7.egg-info/zip-safe
 drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/setuptools/
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/setuptools/__init__.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/setuptools/__init__.pyc
--- a/python-setuptools/.md5sum
+++ b/python-setuptools/.md5sum
@ -1,2 +1,2 @@
 3b74f5cd0740a05802a23b019ce579a3  get-pip.py
-abfd02fba07b381c3a9682a32d765cc6  setuptools-38.2.5.zip
+1705ae74b04d1637f604c336bb565720  setuptools-38.5.1.zip
--- a/python-setuptools/.signature
+++ b/python-setuptools/.signature
@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/USnz7qf/mwqPv+p+FfkIdPpOnPyGPsNKBzujNBOlKr1pJIbQntzs4IdfAJ3T48vJv37uboQA0tKvDCN/uzK1wg=
-SHA256 (Pkgfile) = b83b112aa7ce0c89b93a2f3aff9615c69c16bd2606a636f6234ad2f01c3cf5f0
-SHA256 (.footprint) = 2b841eede13e27572ad0eb2e1b7f5a54ee55ff6db447862edd57965bb9e96083
-SHA256 (setuptools-38.2.5.zip) = b080f276cc868670540b2c03cee06cc14d2faf9da7bec0f15058d1b402c94507
+RWSE3ohX2g5d/Ygm8ETvkHNNJfkroVf4GBoLA1GILw7pVB4IfEvD3tC5XrHigLS1j2nzzzRlNacuM3QKbxJXtw2pEWpjKTiM8wA=
+SHA256 (Pkgfile) = f4c52eec55691bf2c09703c3d9f199d2dd5ac8855f481bc3192c81514446b2bf
+SHA256 (.footprint) = 6218da450fd5f1f82b16bac9b1d2c0e8b78df460ca4235da3e0dd45c208f5e6d
+SHA256 (setuptools-38.5.1.zip) = 6425484c08e99a98a42209c25c3d325f749230b55284d66192784f941a7e6628
 SHA256 (get-pip.py) = 19dae841a150c86e2a09d475b5eb0602861f2a5b7761ec268049a662dbd2bd0c
--- a/python-setuptools/Pkgfile
+++ b/python-setuptools/Pkgfile
@ -4,7 +4,7 @@
 # Depends on: python-appdirs python-packaging python-pip

 name=python-setuptools
-version=38.2.5
+version=38.5.1
 release=1
 source=(https://files.pythonhosted.org/packages/source/${name:7:1}/${name#*-}/${name#*-}-$version.zip
 	https://bootstrap.pypa.io/get-pip.py)
--- a/python3-setuptools/.footprint
+++ b/python3-setuptools/.footprint
@ -64,14 +64,14 @@ drwxr-xr-x	root/root	usr/lib/python3.6/site-packages/pkg_resources/extern/__pyca
 -rw-r--r--	root/root	usr/lib/python3.6/site-packages/pkg_resources/extern/__pycache__/__init__.cpython-36.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.6/site-packages/pkg_resources/extern/__pycache__/__init__.cpython-36.pyc
 -rw-r--r--	root/root	usr/lib/python3.6/site-packages/pkg_resources/py31compat.py
-drwxr-xr-x	root/root	usr/lib/python3.6/site-packages/setuptools-38.2.5-py3.6.egg-info/
-rw-r--r--	root/root	usr/lib/python3.6/site-packages/setuptools-38.2.5-py3.6.egg-info/PKG-INFO
-rw-r--r--	root/root	usr/lib/python3.6/site-packages/setuptools-38.2.5-py3.6.egg-info/SOURCES.txt
-rw-r--r--	root/root	usr/lib/python3.6/site-packages/setuptools-38.2.5-py3.6.egg-info/dependency_links.txt
-rw-r--r--	root/root	usr/lib/python3.6/site-packages/setuptools-38.2.5-py3.6.egg-info/entry_points.txt
-rw-r--r--	root/root	usr/lib/python3.6/site-packages/setuptools-38.2.5-py3.6.egg-info/requires.txt
-rw-r--r--	root/root	usr/lib/python3.6/site-packages/setuptools-38.2.5-py3.6.egg-info/top_level.txt
-rw-r--r--	root/root	usr/lib/python3.6/site-packages/setuptools-38.2.5-py3.6.egg-info/zip-safe
+drwxr-xr-x	root/root	usr/lib/python3.6/site-packages/setuptools-38.5.1-py3.6.egg-info/
+-rw-r--r--	root/root	usr/lib/python3.6/site-packages/setuptools-38.5.1-py3.6.egg-info/PKG-INFO
+-rw-r--r--	root/root	usr/lib/python3.6/site-packages/setuptools-38.5.1-py3.6.egg-info/SOURCES.txt
+-rw-r--r--	root/root	usr/lib/python3.6/site-packages/setuptools-38.5.1-py3.6.egg-info/dependency_links.txt
+-rw-r--r--	root/root	usr/lib/python3.6/site-packages/setuptools-38.5.1-py3.6.egg-info/entry_points.txt
+-rw-r--r--	root/root	usr/lib/python3.6/site-packages/setuptools-38.5.1-py3.6.egg-info/requires.txt
+-rw-r--r--	root/root	usr/lib/python3.6/site-packages/setuptools-38.5.1-py3.6.egg-info/top_level.txt
+-rw-r--r--	root/root	usr/lib/python3.6/site-packages/setuptools-38.5.1-py3.6.egg-info/zip-safe
 drwxr-xr-x	root/root	usr/lib/python3.6/site-packages/setuptools/
 -rw-r--r--	root/root	usr/lib/python3.6/site-packages/setuptools/__init__.py
 drwxr-xr-x	root/root	usr/lib/python3.6/site-packages/setuptools/__pycache__/
--- a/python3-setuptools/.md5sum
+++ b/python3-setuptools/.md5sum
@ -1,2 +1,2 @@
 3b74f5cd0740a05802a23b019ce579a3  get-pip.py
-abfd02fba07b381c3a9682a32d765cc6  setuptools-38.2.5.zip
+1705ae74b04d1637f604c336bb565720  setuptools-38.5.1.zip
--- a/python3-setuptools/.signature
+++ b/python3-setuptools/.signature
@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/TyRw0rTCnbFuOA2PsEIKaNoPZVx6loYwijs70DbmECeimfk/tWh4nR106IES1S8o+NW72lriqwTiyghbYPN1gI=
-SHA256 (Pkgfile) = 459c23637408538f8b90faa68d5a30d86685eb95d4bffea0fc415702c047889c
-SHA256 (.footprint) = 1e46d76d3fbf288d02ce8c45f8d0d88ae076d0dc30bf983e686dd63952a67468
-SHA256 (setuptools-38.2.5.zip) = b080f276cc868670540b2c03cee06cc14d2faf9da7bec0f15058d1b402c94507
+RWSE3ohX2g5d/RlVvINExLVqKLYjq9m/kCBGYR4+hBYPY7HBQwZ8sFYCJUhzWU+ZXrfqllshpc1KEETc64GcapCV/rbZUCiomAw=
+SHA256 (Pkgfile) = 68b1fba56b60a627e548dc0ddaf5eafda00c3218f95e1bd9d003e99a1bc2fdda
+SHA256 (.footprint) = 06c51d47aa5b14c115ac974452d33fd1537c79e6807e6f514865590aa30473ea
+SHA256 (setuptools-38.5.1.zip) = 6425484c08e99a98a42209c25c3d325f749230b55284d66192784f941a7e6628
 SHA256 (get-pip.py) = 19dae841a150c86e2a09d475b5eb0602861f2a5b7761ec268049a662dbd2bd0c
--- a/python3-setuptools/Pkgfile
+++ b/python3-setuptools/Pkgfile
@ -4,7 +4,7 @@
 # Depends on: python3-appdirs python3-packaging python3-pip

 name=python3-setuptools
-version=38.2.5
+version=38.5.1
 release=1
 source=(https://files.pythonhosted.org/packages/source/${name:8:1}/${name#*-}/${name#*-}-$version.zip
 	https://bootstrap.pypa.io/get-pip.py)
--- a/qpdf/.footprint
+++ b/qpdf/.footprint
@ -37,9 +37,9 @@ drwxr-xr-x	root/root	usr/include/qpdf/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libqpdf.a
 -rwxr-xr-x	root/root	usr/lib/libqpdf.la
-lrwxrwxrwx	root/root	usr/lib/libqpdf.so -> libqpdf.so.18.2.0
-lrwxrwxrwx	root/root	usr/lib/libqpdf.so.18 -> libqpdf.so.18.2.0
-rwxr-xr-x	root/root	usr/lib/libqpdf.so.18.2.0
+lrwxrwxrwx	root/root	usr/lib/libqpdf.so -> libqpdf.so.18.2.1
+lrwxrwxrwx	root/root	usr/lib/libqpdf.so.18 -> libqpdf.so.18.2.1
+-rwxr-xr-x	root/root	usr/lib/libqpdf.so.18.2.1
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libqpdf.pc
 drwxr-xr-x	root/root	usr/share/
--- a/qpdf/.md5sum
+++ b/qpdf/.md5sum
@ -1 +1 @@
-8c99dd6a55bbea2c0f7bceab8562631d  qpdf-7.1.0.tar.gz
+d6f5aab023905499aaf4b47f63387667  qpdf-7.1.1.tar.gz
--- a/qpdf/.signature
+++ b/qpdf/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/d9NzutHWUmkCfPnZ1XFuzd3VmXbejEOEyG8DuMHb1/VKjs1GqdSXFh/uHedHgj+7jJUQg+p7euOS3Sz2UxReQY=
-SHA256 (Pkgfile) = f80c40053b412f9d7d5ad542dffe4617aca0a2e2df2e30924491ddb1c0df2979
-SHA256 (.footprint) = b23aa9546ebc510339ebd35eeedd528bfcf43598746e362766226aed6d7fb48d
-SHA256 (qpdf-7.1.0.tar.gz) = 27054bfb83a4f4f70053c6d4c2de5e18ddf60c9a8edbce219ac1bdcf03f16a2e
+RWSE3ohX2g5d/Z1injXUiqh46ItVJUofAM9N5Lu7Vkl5zwcAuWnRnxXsTzLJgCVzYkFkKHtUeKETyciiGLWbLXoGKS/3A0liNwc=
+SHA256 (Pkgfile) = f0648985ad445479de2be84ce561cdc7fb2ce525ea2347f9e6ebf71f87428ff7
+SHA256 (.footprint) = f1e22e82d78a5bb65d970eeb5a0ba348b8ef32293f30fe91ec3f8616ff332e27
+SHA256 (qpdf-7.1.1.tar.gz) = 8a0dbfa000a5c257abbc03721c7be277920fe0fcff08202b61c9c2464eedf2fa
--- a/qpdf/Pkgfile
+++ b/qpdf/Pkgfile
@ -4,7 +4,7 @@
 # Depends on:  zlib libjpeg-turbo

 name=qpdf
-version=7.1.0
+version=7.1.1
 release=1
 source=(http://downloads.sourceforge.net/project/$name/$name/$version/$name-$version.tar.gz)

--- a/samba/.md5sum
+++ b/samba/.md5sum
@ -1,3 +1,3 @@
 163d01ae33948fc1e2e384b28f4c6cdc  kerberos_keytab.c.patch
 1869ebd29f3e277b405e3e4cd9423ccf  samba
-427e7feb988603c51f01c97803305fed  samba-4.7.4.tar.gz
+3629a134253d6a4a16ebd23a508b0d5b  samba-4.7.5.tar.gz
--- a/samba/.signature
+++ b/samba/.signature
@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/cEwkm/Q9JrS6jlOZGohQHeQhbdBj3WWCk7oQLG4q5FnGLv1eh4ooUYx48CxtzM/jfa8o7wCsCnR66EiVq9SBwk=
-SHA256 (Pkgfile) = 70061a94673d0296e79a49b5c0ca854512976a32e7f41ab50d94b544df1c8a6d
+RWSE3ohX2g5d/cjERFE26eYcRC3TKoK61DXag9hVJi6suS9IubjIGX8yM1XgRETs7XiII4k0u8KI7Pc1RTSfW0/c0QiQrM7bQAQ=
+SHA256 (Pkgfile) = 61c652b0756c3283393c51e3c77f2ce37860395740602358312434c311e85aa2
 SHA256 (.footprint) = 3021111df1970c6210fbef3eab58f15d222c1f2c3affaae8122b958dc144ad5e
-SHA256 (samba-4.7.4.tar.gz) = fb12d0c4452f85b67b78bbeabd4c762d8feb8ff83e39d044d285120c2c488247
+SHA256 (samba-4.7.5.tar.gz) = 316d04fa9fbabad6f2739fe68e1928778af4866265409119aba6ef3435c8fe8d
 SHA256 (kerberos_keytab.c.patch) = 39cb889128d1e6ee07af4c75da765957893e7d1f151376308b3005cb85266a75
 SHA256 (samba) = 75bccea892422b5aebe8d2f9ce9b9c42ddc3cbdeccfd16f3161c07c1eb3feff0
--- a/samba/Pkgfile
+++ b/samba/Pkgfile
@ -4,7 +4,7 @@
 # Depends on:  e2fsprogs libarchive tdb tevent libcap libaio popt

 name=samba
-version=4.7.4
+version=4.7.5
 release=1
 source=(https://www.samba.org/samba/ftp/stable/$name-$version.tar.gz \
        kerberos_keytab.c.patch samba)
--- a/wine/.footprint
+++ b/wine/.footprint
@ -83,6 +83,8 @@ drwxr-xr-x	root/root	usr/include/wine/windows/
 -rw-r--r--	root/root	usr/include/wine/windows/access.idl
 -rw-r--r--	root/root	usr/include/wine/windows/aclapi.h
 -rw-r--r--	root/root	usr/include/wine/windows/aclui.h
+-rw-r--r--	root/root	usr/include/wine/windows/activation.h
+-rw-r--r--	root/root	usr/include/wine/windows/activation.idl
 -rw-r--r--	root/root	usr/include/wine/windows/activaut.h
 -rw-r--r--	root/root	usr/include/wine/windows/activaut.idl
 -rw-r--r--	root/root	usr/include/wine/windows/activdbg.h
@ -184,6 +186,8 @@ drwxr-xr-x	root/root	usr/include/wine/windows/
 -rw-r--r--	root/root	usr/include/wine/windows/cvconst.h
 -rw-r--r--	root/root	usr/include/wine/windows/d2d1.h
 -rw-r--r--	root/root	usr/include/wine/windows/d2d1.idl
+-rw-r--r--	root/root	usr/include/wine/windows/d2d1_1.h
+-rw-r--r--	root/root	usr/include/wine/windows/d2d1_1.idl
 -rw-r--r--	root/root	usr/include/wine/windows/d2dbasetypes.h
 -rw-r--r--	root/root	usr/include/wine/windows/d2derr.h
 -rw-r--r--	root/root	usr/include/wine/windows/d3d.h
@ -736,6 +740,7 @@ drwxr-xr-x	root/root	usr/include/wine/windows/ddk/
 -rw-r--r--	root/root	usr/include/wine/windows/shdeprecated.idl
 -rw-r--r--	root/root	usr/include/wine/windows/shdispid.h
 -rw-r--r--	root/root	usr/include/wine/windows/shellapi.h
+-rw-r--r--	root/root	usr/include/wine/windows/shellscalingapi.h
 -rw-r--r--	root/root	usr/include/wine/windows/shimgdata.h
 -rw-r--r--	root/root	usr/include/wine/windows/shimgdata.idl
 -rw-r--r--	root/root	usr/include/wine/windows/shldisp.h
@ -1056,6 +1061,7 @@ drwxr-xr-x	root/root	usr/lib/wine/
 -rwxr-xr-x	root/root	usr/lib/wine/api-ms-win-core-shlwapi-legacy-l1-1-0.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/api-ms-win-core-shlwapi-obsolete-l1-1-0.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/api-ms-win-core-shlwapi-obsolete-l1-2-0.dll.so
+-rwxr-xr-x	root/root	usr/lib/wine/api-ms-win-core-shutdown-l1-1-0.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/api-ms-win-core-sidebyside-l1-1-0.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/api-ms-win-core-string-l1-1-0.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/api-ms-win-core-string-l2-1-0.dll.so
@ -1143,6 +1149,7 @@ drwxr-xr-x	root/root	usr/lib/wine/
 -rwxr-xr-x	root/root	usr/lib/wine/api-ms-win-security-grouppolicy-l1-1-0.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/api-ms-win-security-lsalookup-l1-1-0.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/api-ms-win-security-lsalookup-l1-1-1.dll.so
+-rwxr-xr-x	root/root	usr/lib/wine/api-ms-win-security-lsalookup-l2-1-0.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/api-ms-win-security-lsalookup-l2-1-1.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/api-ms-win-security-lsapolicy-l1-1-0.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/api-ms-win-security-provider-l1-1-0.dll.so
@ -1270,6 +1277,7 @@ drwxr-xr-x	root/root	usr/lib/wine/
 -rwxr-xr-x	root/root	usr/lib/wine/ddrawex.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/devenum.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/dhcpcsvc.dll.so
+-rwxr-xr-x	root/root	usr/lib/wine/dhtmled.ocx.so
 -rwxr-xr-x	root/root	usr/lib/wine/difxapi.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/dinput.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/dinput8.dll.so
@ -1436,6 +1444,7 @@ drwxr-xr-x	root/root	usr/lib/wine/fakedlls/
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/api-ms-win-core-shlwapi-legacy-l1-1-0.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/api-ms-win-core-shlwapi-obsolete-l1-1-0.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/api-ms-win-core-shlwapi-obsolete-l1-2-0.dll
+-rw-r--r--	root/root	usr/lib/wine/fakedlls/api-ms-win-core-shutdown-l1-1-0.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/api-ms-win-core-sidebyside-l1-1-0.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/api-ms-win-core-string-l1-1-0.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/api-ms-win-core-string-l2-1-0.dll
@ -1523,6 +1532,7 @@ drwxr-xr-x	root/root	usr/lib/wine/fakedlls/
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/api-ms-win-security-grouppolicy-l1-1-0.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/api-ms-win-security-lsalookup-l1-1-0.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/api-ms-win-security-lsalookup-l1-1-1.dll
+-rw-r--r--	root/root	usr/lib/wine/fakedlls/api-ms-win-security-lsalookup-l2-1-0.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/api-ms-win-security-lsalookup-l2-1-1.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/api-ms-win-security-lsapolicy-l1-1-0.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/api-ms-win-security-provider-l1-1-0.dll
@ -1650,6 +1660,7 @@ drwxr-xr-x	root/root	usr/lib/wine/fakedlls/
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/ddrawex.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/devenum.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/dhcpcsvc.dll
+-rw-r--r--	root/root	usr/lib/wine/fakedlls/dhtmled.ocx
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/difxapi.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/dinput.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/dinput8.dll
@ -1964,6 +1975,7 @@ drwxr-xr-x	root/root	usr/lib/wine/fakedlls/
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/setupapi.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/sfc.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/sfc_os.dll
+-rw-r--r--	root/root	usr/lib/wine/fakedlls/shcore.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/shdoclc.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/shdocvw.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/shell32.dll
@ -2556,6 +2568,7 @@ drwxr-xr-x	root/root	usr/lib/wine/fakedlls/
 -rwxr-xr-x	root/root	usr/lib/wine/setupapi.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/sfc.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/sfc_os.dll.so
+-rwxr-xr-x	root/root	usr/lib/wine/shcore.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/shdoclc.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/shdocvw.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/shell32.dll.so
@ -2821,6 +2834,7 @@ drwxr-xr-x	root/root	usr/lib32/wine/
 -rwxr-xr-x	root/root	usr/lib32/wine/api-ms-win-core-shlwapi-legacy-l1-1-0.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/api-ms-win-core-shlwapi-obsolete-l1-1-0.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/api-ms-win-core-shlwapi-obsolete-l1-2-0.dll.so
+-rwxr-xr-x	root/root	usr/lib32/wine/api-ms-win-core-shutdown-l1-1-0.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/api-ms-win-core-sidebyside-l1-1-0.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/api-ms-win-core-string-l1-1-0.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/api-ms-win-core-string-l2-1-0.dll.so
@ -2908,6 +2922,7 @@ drwxr-xr-x	root/root	usr/lib32/wine/
 -rwxr-xr-x	root/root	usr/lib32/wine/api-ms-win-security-grouppolicy-l1-1-0.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/api-ms-win-security-lsalookup-l1-1-0.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/api-ms-win-security-lsalookup-l1-1-1.dll.so
+-rwxr-xr-x	root/root	usr/lib32/wine/api-ms-win-security-lsalookup-l2-1-0.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/api-ms-win-security-lsalookup-l2-1-1.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/api-ms-win-security-lsapolicy-l1-1-0.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/api-ms-win-security-provider-l1-1-0.dll.so
@ -3042,6 +3057,7 @@ drwxr-xr-x	root/root	usr/lib32/wine/
 -rwxr-xr-x	root/root	usr/lib32/wine/ddrawex.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/devenum.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/dhcpcsvc.dll.so
+-rwxr-xr-x	root/root	usr/lib32/wine/dhtmled.ocx.so
 -rwxr-xr-x	root/root	usr/lib32/wine/difxapi.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/dinput.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/dinput8.dll.so
@ -3210,6 +3226,7 @@ drwxr-xr-x	root/root	usr/lib32/wine/fakedlls/
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/api-ms-win-core-shlwapi-legacy-l1-1-0.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/api-ms-win-core-shlwapi-obsolete-l1-1-0.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/api-ms-win-core-shlwapi-obsolete-l1-2-0.dll
+-rw-r--r--	root/root	usr/lib32/wine/fakedlls/api-ms-win-core-shutdown-l1-1-0.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/api-ms-win-core-sidebyside-l1-1-0.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/api-ms-win-core-string-l1-1-0.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/api-ms-win-core-string-l2-1-0.dll
@ -3297,6 +3314,7 @@ drwxr-xr-x	root/root	usr/lib32/wine/fakedlls/
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/api-ms-win-security-grouppolicy-l1-1-0.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/api-ms-win-security-lsalookup-l1-1-0.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/api-ms-win-security-lsalookup-l1-1-1.dll
+-rw-r--r--	root/root	usr/lib32/wine/fakedlls/api-ms-win-security-lsalookup-l2-1-0.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/api-ms-win-security-lsalookup-l2-1-1.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/api-ms-win-security-lsapolicy-l1-1-0.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/api-ms-win-security-provider-l1-1-0.dll
@ -3431,6 +3449,7 @@ drwxr-xr-x	root/root	usr/lib32/wine/fakedlls/
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/ddrawex.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/devenum.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/dhcpcsvc.dll
+-rw-r--r--	root/root	usr/lib32/wine/fakedlls/dhtmled.ocx
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/difxapi.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/dinput.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/dinput8.dll
@ -3770,6 +3789,7 @@ drwxr-xr-x	root/root	usr/lib32/wine/fakedlls/
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/setupx.dll16
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/sfc.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/sfc_os.dll
+-rw-r--r--	root/root	usr/lib32/wine/fakedlls/shcore.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/shdoclc.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/shdocvw.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/shell.dll16
@ -4418,6 +4438,7 @@ drwxr-xr-x	root/root	usr/lib32/wine/fakedlls/
 -rwxr-xr-x	root/root	usr/lib32/wine/setupx.dll16.so
 -rwxr-xr-x	root/root	usr/lib32/wine/sfc.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/sfc_os.dll.so
+-rwxr-xr-x	root/root	usr/lib32/wine/shcore.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/shdoclc.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/shdocvw.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/shell.dll16.so
--- a/wine/.md5sum
+++ b/wine/.md5sum
@ -1,4 +1,4 @@
-52e49d9d7b677b7ab0892545cdacfe43  wine-3.0.tar.xz
+f690ba4e9196c26b30af4701ae240f23  wine-3.1.tar.xz
 844ae4134e6df71f23dbb222076c37a6  wine-mono-4.7.1.msi
 5ebc4ec71c92b3db3d84b334a1db385d  wine_gecko-2.47-x86.msi
 d93ac0d2e6aceafe9113a9918916df45  wine_gecko-2.47-x86_64.msi
--- a/wine/.signature
+++ b/wine/.signature
@ -1,8 +1,8 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/cOvFH6viNXGmX8QuKW2mgpVSqPNF9du6gdbJBPD8qOMRLY1OqQMK7Qml4gYz/EvDS6AntcnqQc2tIu2JTkl8wc=
-SHA256 (Pkgfile) = 05d597837423467f1b271351a06108e10619908bdb98d0ef92b36b680d724758
-SHA256 (.footprint) = 0ed3edec3d5afb9f839d72be5252b48bb1aa9c8c291f862ec87ba241f6eff0c2
-SHA256 (wine-3.0.tar.xz) = 346a050aca5cd0d9978a655af11c30e68c201a58aea0c70d5e4c4f1b63c2fbec
+RWSE3ohX2g5d/am0MqKGhhnQTd0lwxS5jY6kylRBNF6U8PSHi9NDvcUmdqNFcKEbNIMAHIfp39sbqbV7HSI2ZvR2QZzHbP/IwQ4=
+SHA256 (Pkgfile) = 4fd1516f9406219491b9ab3f0a066b25dd34a3481b9e879a467df5463743e4c2
+SHA256 (.footprint) = 7fb2c04000715f4b273579a8ebead6cb10277b081621c80c5b5d8aa895fc0cca
+SHA256 (wine-3.1.tar.xz) = 0f33c021b9fdd35954c812dc09dc243f13796c254b41bb5fc47250f7cca42099
 SHA256 (wine_gecko-2.47-x86.msi) = 3b8a361f5d63952d21caafd74e849a774994822fb96c5922b01d554f1677643a
 SHA256 (wine_gecko-2.47-x86_64.msi) = c565ea25e50ea953937d4ab01299e4306da4a556946327d253ea9b28357e4a7d
 SHA256 (wine-mono-4.7.1.msi) = 2c8d5db7f833c3413b2519991f5af1f433d59a927564ec6f38a3f1f8b2c629aa
--- a/wine/Pkgfile
+++ b/wine/Pkgfile
@ -5,9 +5,9 @@
 # Depends on: fontconfig-32 freeglut-32 gnutls-32 lcms2-32 mpg123-32 openal-32 prelink xorg-libxcomposite-32 xorg-libxcursor-32 xorg-libxinerama-32 xorg-libxrandr-32 xorg-libxxf86dga-32

 name=wine
-version=3.0
+version=3.1
 release=1
-source=(https://dl.winehq.org/wine/source/3.0/$name-$version.tar.xz
+source=(https://dl.winehq.org/wine/source/3.x/$name-$version.tar.xz
 	https://dl.winehq.org/wine/wine-gecko/2.47/wine_gecko-2.47-x86.msi
 	https://dl.winehq.org/wine/wine-gecko/2.47/wine_gecko-2.47-x86_64.msi
 	https://dl.winehq.org/wine/wine-mono/4.7.1/wine-mono-4.7.1.msi)