Merge pull request #155 from bgilbert/release

Update openslide, sqlite3

Author: bgilbert

.github/workflows/windows.yml

@@ -189,17 +189,5 @@ jobs:
           for bits in 32 64; do
               echo "======== ${bits}-bit ========"
               cd "${GITHUB_WORKSPACE}/openslide-win${bits}-${{ inputs.pkgver }}/bin"
-              if [ -e slidetool.exe ]; then
-                  showprops="./slidetool.exe prop list"
-              else
-                  # OpenSlide 3.4.1
-                  showprops="./openslide-show-properties.exe"
-              fi
-              OPENSLIDE_DEBUG=? $showprops 2> conftest ||:
-              if ! grep -q "  synthetic  " conftest; then
-                  # OpenSlide 3.4.1
-                  echo "Smoke test not supported in this OpenSlide version"
-                  continue
-              fi
-              OPENSLIDE_DEBUG=synthetic $showprops ""
+              OPENSLIDE_DEBUG=synthetic ./slidetool.exe prop list ""
           done

build.sh

@@ -60,12 +60,11 @@ cairo_licenses="COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1"
 libxml2_licenses="Copyright"
 uthash_licenses="LICENSE"
 libdicom_licenses="LICENSE"
-# Remove workaround in bdist() when updating these
-openslide_licenses="LICENSE.txt lgpl-2.1.txt COPYING.LESSER"
+openslide_licenses="COPYING.LESSER"
 openslide_java_licenses="COPYING.LESSER"
 
 # Build artifacts
-openslide_artifacts="libopenslide-0.dll openslide-quickhash1sum.exe openslide-show-properties.exe openslide-write-png.exe slidetool.exe"
+openslide_artifacts="libopenslide-1.dll slidetool.exe"
 openslide_java_artifacts="openslide-jni.dll openslide.jar"
 
 # Update-checking URLs
@@ -317,11 +316,6 @@ bdist() {
         fi
         for artifact in $(expand ${package}_artifacts)
         do
-            if [ "${artifact}" = slidetool.exe -a \
-                    ! -e "${root}/bin/${artifact}" ]; then
-                # Allow missing slidetool.exe until next OpenSlide release
-                continue
-            fi
             if [ "${artifact}" != "${artifact%.dll}" -o \
                     "${artifact}" != "${artifact%.exe}" ] ; then
                 echo "Stripping ${artifact}..."
@@ -347,12 +341,8 @@ bdist() {
         for artifact in $(expand ${package}_licenses)
         do
             if ! cp "${srcdir}/${artifact}" "${licensedir}" 2>/dev/null; then
-                # OpenSlide license files were renamed; support both until
-                # the next release
-                if [ "${package}" != openslide ]; then
-                    echo "Failed to copy ${artifact} from ${package}."
-                    exit 1
-                fi
+                echo "Failed to copy ${artifact} from ${package}."
+                exit 1
             fi
         done
         if [ "$package" = openslide ]; then
@@ -376,15 +366,7 @@ bdist() {
             cp "${root}/lib/libopenslide.dll.a" "${zipdir}/lib/libopenslide.lib"
             mkdir -p "${zipdir}/include"
             cp -r "${root}/include/openslide" "${zipdir}/include/"
-            if [ -f "${srcdir}/README.md" ]; then
-                cp "${srcdir}/README.md" "${zipdir}/"
-            else
-                cp "${srcdir}/README.txt" "${zipdir}/"
-            fi
-            if [ -e "${zipdir}/bin/slidetool.exe" ]; then
-                # If slidetool is present, drop the redundant legacy programs
-                rm "${zipdir}/bin/openslide-"*".exe"*
-            fi
+            cp "${srcdir}/README.md" "${zipdir}/"
         elif [ "$package" != openslide_java ]; then
             log_version "${zipdir}" "$(expand ${package}_name)" \
                     "$(meson_wrap_version ${package})"

meson/subprojects/openslide.wrap

@@ -1,10 +1,7 @@
 # not from wrapdb
 
 [wrap-file]
-directory = openslide-3.4.1
-source_url = https://github.com/openslide/openslide/releases/download/v3.4.1/openslide-3.4.1.tar.xz
-source_filename = openslide-3.4.1.tar.xz
-source_hash = 9938034dba7f48fadc90a2cdf8cfe94c5613b04098d1348a5ff19da95b990564
-
-# backport of Meson config from Git main
-diff_files = openslide-meson.patch
+directory = openslide-4.0.0
+source_url = https://github.com/openslide/openslide/releases/download/v4.0.0/openslide-4.0.0.tar.xz
+source_filename = openslide-4.0.0.tar.xz
+source_hash = cc227c44316abb65fb28f1c967706eb7254f91dbfab31e9ae6a48db6cf4ae562