Merge branch '3.4' into 3.5

2019-03-20 17:37:08 +01:00 · 2019-03-20 17:37:08 +01:00 · ca299ff80f
commit ca299ff80f
parent 3df5ba2d80 3b2935e4d1
8 changed files with 60 additions and 47 deletions
--- a/meson/.footprint
+++ b/meson/.footprint
@ -4,23 +4,23 @@ drwxr-xr-x	root/root	usr/bin/
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/python3.7/
 drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/
-drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/meson-0.49.2-py3.7.egg-info/
-rw-r--r--	root/root	usr/lib/python3.7/site-packages/meson-0.49.2-py3.7.egg-info/PKG-INFO
-rw-r--r--	root/root	usr/lib/python3.7/site-packages/meson-0.49.2-py3.7.egg-info/SOURCES.txt
-rw-r--r--	root/root	usr/lib/python3.7/site-packages/meson-0.49.2-py3.7.egg-info/dependency_links.txt
-rw-r--r--	root/root	usr/lib/python3.7/site-packages/meson-0.49.2-py3.7.egg-info/entry_points.txt
-rw-r--r--	root/root	usr/lib/python3.7/site-packages/meson-0.49.2-py3.7.egg-info/top_level.txt
+drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/meson-0.50.0-py3.7.egg-info/
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/meson-0.50.0-py3.7.egg-info/PKG-INFO
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/meson-0.50.0-py3.7.egg-info/SOURCES.txt
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/meson-0.50.0-py3.7.egg-info/dependency_links.txt
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/meson-0.50.0-py3.7.egg-info/entry_points.txt
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/meson-0.50.0-py3.7.egg-info/top_level.txt
 drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/mesonbuild/
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__init__.py (EMPTY)
 drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/__init__.cpython-37.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/__init__.cpython-37.pyc
-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/astinterpreter.cpython-37.opt-1.pyc
-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/astinterpreter.cpython-37.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/build.cpython-37.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/build.cpython-37.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/coredata.cpython-37.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/coredata.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/envconfig.cpython-37.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/envconfig.cpython-37.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/environment.cpython-37.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/environment.cpython-37.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/interpreter.cpython-37.opt-1.pyc
@ -51,11 +51,32 @@ drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/msubprojects.cpython-37.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/mtest.cpython-37.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/mtest.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/munstable_coredata.cpython-37.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/munstable_coredata.cpython-37.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/optinterpreter.cpython-37.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/optinterpreter.cpython-37.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/rewriter.cpython-37.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/rewriter.cpython-37.pyc
-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/astinterpreter.py
+drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/mesonbuild/ast/
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/ast/__init__.py
+drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/mesonbuild/ast/__pycache__/
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/ast/__pycache__/__init__.cpython-37.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/ast/__pycache__/__init__.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/ast/__pycache__/interpreter.cpython-37.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/ast/__pycache__/interpreter.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/ast/__pycache__/introspection.cpython-37.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/ast/__pycache__/introspection.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/ast/__pycache__/postprocess.cpython-37.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/ast/__pycache__/postprocess.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/ast/__pycache__/printer.cpython-37.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/ast/__pycache__/printer.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/ast/__pycache__/visitor.cpython-37.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/ast/__pycache__/visitor.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/ast/interpreter.py
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/ast/introspection.py
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/ast/postprocess.py
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/ast/printer.py
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/ast/visitor.py
 drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/mesonbuild/backend/
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/backend/__init__.py (EMPTY)
 drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/mesonbuild/backend/__pycache__/
@ -95,6 +116,8 @@ drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/mesonbuild/compilers/__pyca
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/compilers/__pycache__/cpp.cpython-37.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/compilers/__pycache__/cs.cpython-37.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/compilers/__pycache__/cs.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/compilers/__pycache__/cuda.cpython-37.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/compilers/__pycache__/cuda.cpython-37.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/compilers/__pycache__/d.cpython-37.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/compilers/__pycache__/d.cpython-37.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/compilers/__pycache__/fortran.cpython-37.opt-1.pyc
@ -116,6 +139,7 @@ drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/mesonbuild/compilers/__pyca
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/compilers/compilers.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/compilers/cpp.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/compilers/cs.py
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/compilers/cuda.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/compilers/d.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/compilers/fortran.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/compilers/java.py
@ -146,10 +170,12 @@ drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/mesonbuild/dependencies/__p
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/dependencies/boost.py
 drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/mesonbuild/dependencies/data/
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/dependencies/data/CMakeLists.txt
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/dependencies/data/CMakePathInfo.txt
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/dependencies/dev.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/dependencies/misc.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/dependencies/platform.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/dependencies/ui.py
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/envconfig.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/environment.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/interpreter.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/interpreterbase.py
@ -166,6 +192,8 @@ drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/
 drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycache__/
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycache__/__init__.cpython-37.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycache__/__init__.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycache__/cmake.cpython-37.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycache__/cmake.cpython-37.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycache__/dlang.cpython-37.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycache__/dlang.cpython-37.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycache__/gnome.cpython-37.opt-1.pyc
@ -190,12 +218,15 @@ drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycach
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycache__/qt5.cpython-37.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycache__/rpm.cpython-37.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycache__/rpm.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycache__/unstable_cuda.cpython-37.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycache__/unstable_cuda.cpython-37.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycache__/unstable_icestorm.cpython-37.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycache__/unstable_icestorm.cpython-37.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycache__/unstable_simd.cpython-37.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycache__/unstable_simd.cpython-37.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycache__/windows.cpython-37.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycache__/windows.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/cmake.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/dlang.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/gnome.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/hotdoc.py
@ -208,6 +239,7 @@ drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycach
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/qt4.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/qt5.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/rpm.py
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/unstable_cuda.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/unstable_icestorm.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/unstable_simd.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/windows.py
@ -215,6 +247,7 @@ drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycach
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/msetup.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/msubprojects.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/mtest.py
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/munstable_coredata.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/optinterpreter.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/rewriter.py
 drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/mesonbuild/scripts/
@ -222,6 +255,8 @@ drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/mesonbuild/scripts/
 drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/mesonbuild/scripts/__pycache__/
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/scripts/__pycache__/__init__.cpython-37.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/scripts/__pycache__/__init__.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/scripts/__pycache__/clangformat.cpython-37.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/scripts/__pycache__/clangformat.cpython-37.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/scripts/__pycache__/cleantrees.cpython-37.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/scripts/__pycache__/cleantrees.cpython-37.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/scripts/__pycache__/commandrunner.cpython-37.opt-1.pyc
@ -258,6 +293,7 @@ drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/mesonbuild/scripts/__pycach
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/scripts/__pycache__/vcstagger.cpython-37.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/scripts/__pycache__/yelphelper.cpython-37.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/scripts/__pycache__/yelphelper.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/scripts/clangformat.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/scripts/cleantrees.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/scripts/commandrunner.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/scripts/coverage.py
--- a/meson/.signature
+++ b/meson/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/XGB4M9n3TEMz4rnU4RwQkDYyo7UkQNpwiDeeAkOTsqfSzZATQLRtxLDrfNDInMOtNSvQkcTjy64LUj7PmMXsA8=
-SHA256 (Pkgfile) = 19b3e7b81a784dc3ae386669bf650d39a8e7f0c971a88cc6e370adb9ea19adfd
-SHA256 (.footprint) = 4851786739460caafebeb5eaf291dd9ac6a9a429850ff80dd7c08dd70eef50bc
-SHA256 (meson-0.49.2.tar.gz) = ef9f14326ec1e30d3ba1a26df0f92826ede5a79255ad723af78a2691c37109fd
+RWSE3ohX2g5d/QKK+5Xmaa6paoXdPLU0WCBynkZHrTJ3+uuVI6odfwOm51FnpBm1x8+v99uiPvHO0lJdLoP+U3jujjGy6a/IgAE=
+SHA256 (Pkgfile) = b0e2f233a7370935bedcd1fc2e551706fafb31177a6023fef60193b59cedf4ab
+SHA256 (.footprint) = 3f5230e4d8899de3d2f06a8eb49abbd58c1ebeca2e336204390a7ae85d779d9f
+SHA256 (meson-0.50.0.tar.gz) = 2a1bc42dda58206fb922cda5e1ca95cc03ad126321d26acc47d3493ec4e7021f
--- a/meson/Pkgfile
+++ b/meson/Pkgfile
@ -4,8 +4,8 @@
 # Depends on: python3-setuptools

 name=meson
-version=0.49.2
-release=2
+version=0.50.0
+release=1
 source=(https://github.com/mesonbuild/meson/releases/download/$version/$name-$version.tar.gz)

 build() {
--- a/thunderbird-bin/.footprint
+++ b/thunderbird-bin/.footprint
@ -51,26 +51,6 @@ drwxr-xr-x	root/root	usr/lib/thunderbird/isp/
 -rw-r--r--	root/root	usr/lib/thunderbird/isp/POPFile.sfd
 -rw-r--r--	root/root	usr/lib/thunderbird/isp/SpamAssassin.sfd
 -rw-r--r--	root/root	usr/lib/thunderbird/isp/SpamPal.sfd
-drwxr-xr-x	root/root	usr/lib/thunderbird/lib/
-rwxr-xr-x	root/root	usr/lib/thunderbird/lib/libfreeblpriv3.so
-rwxr-xr-x	root/root	usr/lib/thunderbird/lib/libldap60.so
-rwxr-xr-x	root/root	usr/lib/thunderbird/lib/libldif60.so
-rwxr-xr-x	root/root	usr/lib/thunderbird/lib/liblgpllibs.so
-rwxr-xr-x	root/root	usr/lib/thunderbird/lib/libmozgtk.so
-rwxr-xr-x	root/root	usr/lib/thunderbird/lib/libmozsandbox.so
-rwxr-xr-x	root/root	usr/lib/thunderbird/lib/libmozsqlite3.so
-rwxr-xr-x	root/root	usr/lib/thunderbird/lib/libnspr4.so
-rwxr-xr-x	root/root	usr/lib/thunderbird/lib/libnss3.so
-rwxr-xr-x	root/root	usr/lib/thunderbird/lib/libnssckbi.so
-rwxr-xr-x	root/root	usr/lib/thunderbird/lib/libnssdbm3.so
-rwxr-xr-x	root/root	usr/lib/thunderbird/lib/libnssutil3.so
-rwxr-xr-x	root/root	usr/lib/thunderbird/lib/libplc4.so
-rwxr-xr-x	root/root	usr/lib/thunderbird/lib/libplds4.so
-rwxr-xr-x	root/root	usr/lib/thunderbird/lib/libprldap60.so
-rwxr-xr-x	root/root	usr/lib/thunderbird/lib/libsmime3.so
-rwxr-xr-x	root/root	usr/lib/thunderbird/lib/libsoftokn3.so
-rwxr-xr-x	root/root	usr/lib/thunderbird/lib/libssl3.so
-rwxr-xr-x	root/root	usr/lib/thunderbird/lib/libxul.so
 -rw-r--r--	root/root	usr/lib/thunderbird/libfreeblpriv3.chk
 -rwxr-xr-x	root/root	usr/lib/thunderbird/libfreeblpriv3.so
 -rwxr-xr-x	root/root	usr/lib/thunderbird/libldap60.so
--- a/thunderbird-bin/.signature
+++ b/thunderbird-bin/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/ZrKNtkLb/IIyZezWtHn3jwehOQTy6cwlaR/b41r7Jnh9AlCyvHL3VLjstagwINJxMsn6xd5/mtCK45cutEZpQY=
-SHA256 (Pkgfile) = 2984bad91be12b0d445fa301f71b1d4fa74e824cf6f380f35e76780ed4077a63
-SHA256 (.footprint) = 7855c705f38587d61c4f1707bd61cbd9342a184297b613cd833bb4fb5cf9e04b
-SHA256 (thunderbird-60.5.3.tar.bz2) = 7bd88a28f52b929d4c02cd46483cb1c3c9692595d4f9bb8fabd87b36e6db6aa5
+RWSE3ohX2g5d/Uaw3UpUR8rGFtDioKKde7qHUV+7ct5Rak//uQpR+ehG7XUQht6sU4zO1Be1eHPbtGyGomSG2RpcRWvUGAEiOQg=
+SHA256 (Pkgfile) = fff9f3e9db70921e16f38331f650eb89643d272aa0758718941a12f742b07d02
+SHA256 (.footprint) = 1fedb65da9712fdc6f4f8a6d54fd71d22d58ce881022492f5d647d71a052351e
+SHA256 (thunderbird-60.6.0.tar.bz2) = 29f4d09e67e750111c09476a8dd3d4681b54694cdf24f80f098f40c1beccd092
--- a/thunderbird-bin/Pkgfile
+++ b/thunderbird-bin/Pkgfile
@ -4,7 +4,7 @@
 # Depends on: gtk3, dbus-glib

 name=thunderbird-bin
-version=60.5.3
+version=60.6.0
 release=1
 source=(http://ftp.mozilla.org/pub/thunderbird/releases/$version/linux-x86_64/en-US/thunderbird-$version.tar.bz2)

@ -15,9 +15,6 @@ build() {
 	mv $SRC/thunderbird $PKG/usr/lib/thunderbird
 	ln -s /usr/lib/thunderbird/thunderbird $PKG/usr/bin/thunderbird

-	mkdir -p $PKG/usr/lib/thunderbird/lib
-	find $PKG/usr/lib/thunderbird -name '*.so' -exec cp '{}' lib/ \;
-
        mkdir -p $PKG/etc/revdep.d
        echo "/usr/lib/thunderbird/lib" > $PKG/etc/revdep.d/thunderbird-bin

--- a/webkitgtk/.signature
+++ b/webkitgtk/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/eHL+wIZQJkDvZ5AdtMr34SwXmW/Ozn9CArLI1FQ6nwF1wBEBuD9bV57ZYA5JyrzIwJvFK8CKQbuu06ZEpX4DgY=
-SHA256 (Pkgfile) = 638009c24824e4d9c94d9a8028159191f679fcbe176374ee90e817c7651d9a9e
+RWSE3ohX2g5d/U7dL6z1Y3eq3rqNjtbX2HNP8yEVHUet428o3J8ih4IxL5uNmCnO94Yt1OV9i3u/lPQUie5HibUSf6MuvSs7yQI=
+SHA256 (Pkgfile) = 6c0591db08ec5d3dbc10e539ed0b6e67b3f21d777b670cb2a6f5057b992c0636
 SHA256 (.footprint) = 12ce6b23333490a423d5ed05787b92834c7fe23ec0207d52234228dd9c847957
 SHA256 (webkitgtk-2.24.0.tar.xz) = 2e4ad1503fe482ceb5a83cf70ac9cd42f37eb718555a4d6844fe4c59a9214407
--- a/webkitgtk/Pkgfile
+++ b/webkitgtk/Pkgfile
@ -2,7 +2,7 @@
 # URL: https://www.webkitgtk.org/
 # Maintainer: Danny Rawlins, crux at romster dot me
 # Depends on: gst-plugins-base gtk gtk3 harfbuzz-icu hyphen libsecret libsoup libwebp ruby woff2 xorg-libxt
-# Optional: enchant libnotify geoclue
+# Optional: enchant libnotify geoclue openjpeg2

 name=webkitgtk
 version=2.24.0
@ -16,7 +16,7 @@ build() {
 	# setting CC and CXX breaks compilation
 	prt-get isinst ccache && unset CC CXX; export PATH="/usr/lib/ccache/:$PATH"

-	prt-get isinst openjpeg || PKGMK_WEBKITGTK+=' -DUSE_OPENJPEG=OFF'
+	prt-get isinst openjpeg2 || PKGMK_WEBKITGTK+=' -DUSE_OPENJPEG=OFF'
 	prt-get isinst enchant || PKGMK_WEBKITGTK+=' -DENABLE_SPELLCHECK=OFF'
 	prt-get isinst libnotify && PKGMK_WEBKITGTK+=' -DUSE_LIBNOTIFY=ON' || PKGMK_WEBKITGTK+=' -DUSE_LIBNOTIFY=OFF'
 	prt-get isinst geoclue && PKGMK_WEBKITGTK+=' -DENABLE_GEOLOCATION=ON' || PKGMK_WEBKITGTK+=' -DENABLE_GEOLOCATION=OFF'