diff options
| -rw-r--r-- | manual tests/1 wrap/subprojects/sqlite.wrap | 6 | ||||
| -rw-r--r-- | manual tests/2 multiwrap/subprojects/libpng.wrap | 2 | ||||
| -rw-r--r-- | manual tests/2 multiwrap/subprojects/lua.wrap | 7 | ||||
| -rw-r--r-- | manual tests/2 multiwrap/subprojects/zlib.wrap | 6 | ||||
| -rw-r--r-- | wrap.py | 5 |
5 files changed, 15 insertions, 11 deletions
diff --git a/manual tests/1 wrap/subprojects/sqlite.wrap b/manual tests/1 wrap/subprojects/sqlite.wrap index b56e7e2..cf6ff7a 100644 --- a/manual tests/1 wrap/subprojects/sqlite.wrap +++ b/manual tests/1 wrap/subprojects/sqlite.wrap @@ -5,6 +5,6 @@ source_url = http://sqlite.com/2015/sqlite-amalgamation-3080802.zip source_filename = sqlite-amalgamation-3080802.zip source_hash = 5ebeea0dfb75d090ea0e7ff84799b2a7a1550db3fe61eb5f6f61c2e971e57663 -patch_url = https://dl.dropboxusercontent.com/u/37517477/sqlite-meson.tar.gz -patch_filename = sqlite-meson.tar.gz -patch_hash = 8c9d00702d5fe4a6bf25a36b821a332f6b2dfd117c66fe818b88b23d604635e9 +patch_url = http://wrapdb.mesonbuild.com/v1/projects/sqlite/3080802/2/get_zip +patch_filename = sqlite-3080802-2-wrap.zip +patch_hash = 300eb0e16cf7d32e873f16617de959c0a3e914614c5fddcff858fc010db10688 diff --git a/manual tests/2 multiwrap/subprojects/libpng.wrap b/manual tests/2 multiwrap/subprojects/libpng.wrap index d7cb93e..45e639e 100644 --- a/manual tests/2 multiwrap/subprojects/libpng.wrap +++ b/manual tests/2 multiwrap/subprojects/libpng.wrap @@ -1,7 +1,7 @@ [wrap-file] directory = libpng-1.6.16 -source_url = ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng16/libpng-1.6.16.tar.gz +source_url = ftp://ftp.simplesystems.org/pub/libpng/png/src/history/libpng16/libpng-1.6.16.tar.gz source_filename = libpng-1.6.16.tar.gz source_hash = 02f96b6bad5a381d36d7ba7a5d9be3b06f7fe6c274da00707509c23592a073ad diff --git a/manual tests/2 multiwrap/subprojects/lua.wrap b/manual tests/2 multiwrap/subprojects/lua.wrap index 8f19d15..cf2db19 100644 --- a/manual tests/2 multiwrap/subprojects/lua.wrap +++ b/manual tests/2 multiwrap/subprojects/lua.wrap @@ -5,6 +5,7 @@ source_url = http://www.lua.org/ftp/lua-5.3.0.tar.gz source_filename = lua-5.3.0.tar.gz source_hash = ae4a5eb2d660515eb191bfe3e061f2b8ffe94dce73d32cfd0de090ddcc0ddb01 -patch_url = https://dl.dropboxusercontent.com/u/37517477/lua53-meson.zip -patch_filename = lua53-meson.zip -patch_hash = 076d0d57d33ec996c556722c8eeb624a364c66fe9d2225e590b1bc9ae34fbd6e
\ No newline at end of file + +patch_url = http://wrapdb.mesonbuild.com/v1/projects/lua/5.3.0/2/get_zip +patch_filename = lua-5.3.0-2-wrap.zip +patch_hash = f7bc18b6a6487dd7d78b5d3b2d49861a76212dfd79b40e32f4b1e5655361ffb5 diff --git a/manual tests/2 multiwrap/subprojects/zlib.wrap b/manual tests/2 multiwrap/subprojects/zlib.wrap index 37202f8..319a0d1 100644 --- a/manual tests/2 multiwrap/subprojects/zlib.wrap +++ b/manual tests/2 multiwrap/subprojects/zlib.wrap @@ -5,6 +5,6 @@ source_url = http://zlib.net/zlib-1.2.8.tar.gz source_filename = zlib-1.2.8.tar.gz source_hash = 36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d -patch_url = https://dl.dropboxusercontent.com/u/37517477/zlib128-meson.tar.gz -patch_filename = zlib128-meson.tar.gz -patch_hash = 03c868bf22d7e35c978e8b9572c4aea1181606c15c3dd19f0713a8479fe27edc +patch_url = http://wrapdb.mesonbuild.com/v1/projects/zlib/1.2.8/4/get_zip +patch_filename = zlib-1.2.8-4-wrap.zip +patch_hash = 2327a42c8f73a4289ee8c9cd4abc43b324d0decc28d6e609e927f0a50321af4a @@ -126,7 +126,10 @@ class Resolver: try: import lzma del lzma - shutil.register_unpack_format('xztar', ['.tar.xz', '.txz'], shutil._unpack_tarfile, [], "xz'ed tar-file") + try: + shutil.register_unpack_format('xztar', ['.tar.xz', '.txz'], shutil._unpack_tarfile, [], "xz'ed tar-file") + except shutil.RegistryError: + pass except ImportError: pass if os.path.isdir(os.path.join(self.subdir_root, package.get('directory'))): |