grim/pidgin3-deps

Update to the lastest wrap setup
draft
2021-07-24, Gary Kramlich
08b0ac454277
Parents a0cff10143e6
Children b60e85834f69
Update to the lastest wrap setup
--- a/.hgignore Sat Jul 24 20:37:10 2021 -0500
+++ b/.hgignore Sat Jul 24 20:51:57 2021 -0500
@@ -4,4 +4,5 @@
syntax: regexp
build\/
subprojects\/.+\/
+subprojects\/zlib\.wrap
--- a/README.md Sat Jul 24 20:37:10 2021 -0500
+++ b/README.md Sat Jul 24 20:51:57 2021 -0500
@@ -1,5 +1,15 @@
-For linux/bsd the build host needs to install libxkbcommon-dev, libwayland-dev,
-libxrandr-dev, libxi-dev, libdbus-1-dev, libxtst-dev, libegl-dev ...?
+For linux/bsd the build host needs to install following:
+
+```
+libxkbcommon-dev
+libwayland-dev
+libxrandr-dev
+libxi-dev
+libdbus-1-dev
+libxtst-dev
+libegl-dev
+python3-setuptools
+```
# Mac
--- a/meson.build Sat Jul 24 20:37:10 2021 -0500
+++ b/meson.build Sat Jul 24 20:51:57 2021 -0500
@@ -1,4 +1,8 @@
project('pidgin3-deps', meson_version : '>=0.56.0')
-gtk_dep = dependency('gtk+-3.0')
-
+glib = dependency('glib-2.0')
+sqlite3 = dependency('sqlite3')
+freetype2 = dependency('freetype2')
+libpng = dependency('libpng')
+#libxml2 = dependency('libxml2')
+lua = dependency('lua-5.3')
--- a/patches/gtk-wraps.diff Sat Jul 24 20:37:10 2021 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-diff --git a/subprojects/atk.wrap b/subprojects/atk.wrap
-index 8666a3a1ab..277c72e698 100644
---- a/subprojects/atk.wrap
-+++ b/subprojects/atk.wrap
-@@ -3,3 +3,4 @@ directory=atk
- url=https://gitlab.gnome.org/GNOME/atk.git
- push-url=git@gitlab.gnome.org:GNOME/atk.git
- revision=master
-+depth=1
-diff --git a/subprojects/cairo.wrap b/subprojects/cairo.wrap
-index 26d5ade52b..d09964e401 100644
---- a/subprojects/cairo.wrap
-+++ b/subprojects/cairo.wrap
-@@ -1,5 +1,6 @@
- [wrap-git]
- directory=cairo
--url=https://github.com/centricular/cairo.git
--push-url=git@github.com:centricular/cairo.git
--revision=meson
-+url=https://gitlab.freedesktop.org/cairo/cairo.git
-+push-url=ssh://git@gitlab.freedesktop.org:cairo/cairo.git
-+revision=master
-+depth=1
-diff --git a/subprojects/fontconfig.wrap b/subprojects/fontconfig.wrap
-index 083a49d6ad..6e26eeefc3 100644
---- a/subprojects/fontconfig.wrap
-+++ b/subprojects/fontconfig.wrap
-@@ -1,5 +1,6 @@
- [wrap-git]
- directory=fontconfig
--url=https://github.com/centricular/fontconfig.git
--push-url=git@github.com:centricular/fontconfig.git
--revision=meson
-+url=https://gitlab.freedesktop.org/fontconfig/fontconfig
-+push-url=git@gitlab.freedesktop.org:fontconfig/fontconfig.git
-+revision=master
-+depth=1
-diff --git a/subprojects/freetype2.wrap b/subprojects/freetype2.wrap
-index 3151539c8b..8617945f48 100644
---- a/subprojects/freetype2.wrap
-+++ b/subprojects/freetype2.wrap
-@@ -2,4 +2,5 @@
- directory=freetype2
- url=https://github.com/centricular/freetype2.git
- push-url=git@github.com:centricular/freetype2.git
--revision=meson
-+revision=master
-+depth=1
-diff --git a/subprojects/harfbuzz.wrap b/subprojects/harfbuzz.wrap
-index cc0a89d699..6fdcb63352 100644
---- a/subprojects/harfbuzz.wrap
-+++ b/subprojects/harfbuzz.wrap
-@@ -1,5 +1,6 @@
- [wrap-git]
- directory=harfbuzz
--url=https://github.com/centricular/harfbuzz.git
--push-url=git@github.com:centricular/harfbuzz.git
--revision=meson
-+url=https://github.com/harfbuzz/harfbuzz.git
-+push-url=git@github.com:harfbuzz/harfbuzz.git
-+revision=master
-+depth=1
-diff --git a/subprojects/libffi.wrap b/subprojects/libffi.wrap
-index 876491c7da..00b29d6a2c 100644
---- a/subprojects/libffi.wrap
-+++ b/subprojects/libffi.wrap
-@@ -1,5 +1,5 @@
- [wrap-git]
- directory=libffi
--url=https://github.com/centricular/libffi.git
--push-url=git@github.com:centricular/libffi.git
-+url=https://gitlab.freedesktop.org/gstreamer/meson-ports/libffi.git
- revision=meson
-+depth=1
-diff --git a/subprojects/pixman.wrap b/subprojects/pixman.wrap
-index 5e9d2f4caa..8377fed87f 100644
---- a/subprojects/pixman.wrap
-+++ b/subprojects/pixman.wrap
-@@ -1,5 +1,6 @@
- [wrap-git]
- directory=pixman
--url=https://github.com/centricular/pixman.git
--push-url=git@github.com:centricular/pixman.git
--revision=meson
-+url=https://gitlab.freedesktop.org/pixman/pixman
-+push-url=git@gitlab.freedesktop.org:pixman/pixman.git
-+revision=master
-+depth=1
--- a/subprojects/at-spi2-atk.wrap Sat Jul 24 20:37:10 2021 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-[wrap-file]
-directory = at-spi2-atk-2.38.0
-source_url = https://download.gnome.org/sources/at-spi2-atk/2.38/at-spi2-atk-2.38.0.tar.xz
-source_filename = at-spi2-atk-2.38.0.tar.xz
-source_hash = cfa008a5af822b36ae6287f18182c40c91dd699c55faa38605881ed175ca464f
-
-[provide]
-atk-bridge-2.0 = libatk_bridge_dep
-
--- a/subprojects/at-spi2-core.wrap Sat Jul 24 20:37:10 2021 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-[wrap-file]
-directory = at-spi2-core-2.40.0
-source_url = https://download.gnome.org/sources/at-spi2-core/2.40/at-spi2-core-2.40.0.tar.xz
-source_filename = at-spi2-core-2.40.0.tar.xz
-source_hash = 4196a7d30a0051e52a67b8ce4283fe79ae5e4e14a725719934565adf1d333429
-
-[provide]
-atspi = atspi_dep
-
--- a/subprojects/atk.wrap Sat Jul 24 20:37:10 2021 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-[wrap-git]
-url=https://gitlab.gnome.org/GNOME/atk.git
-push-url=git@gitlab.gnome.org:GNOME/atk.git
-revision=master
-depth=1
--- a/subprojects/cairo.wrap Sat Jul 24 20:37:10 2021 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-[wrap-git]
-url=https://gitlab.freedesktop.org/cairo/cairo.git
-push-url=ssh://git@gitlab.freedesktop.org:cairo/cairo.git
-revision=master
-depth=1
--- a/subprojects/expat.wrap Sat Jul 24 20:37:10 2021 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-[wrap-file]
-directory = expat-2.2.5
-
-source_url = https://github.com/libexpat/libexpat/releases/download/R_2_2_5/expat-2.2.5.tar.bz2
-source_filename = expat-2.2.5.tar.bz2
-source_hash = d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6
-
-patch_url = https://wrapdb.mesonbuild.com/v1/projects/expat/2.2.5/5/get_zip
-patch_filename = expat-2.2.5-5-wrap.zip
-patch_hash = 95e02942b13ebe237494419c0f7d56d99b8b4e0a2dc04002e055b2325c960e11
--- a/subprojects/fontconfig.wrap Sat Jul 24 20:37:10 2021 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-[wrap-git]
-url=https://gitlab.freedesktop.org/fontconfig/fontconfig
-push-url=git@gitlab.freedesktop.org:fontconfig/fontconfig.git
-revision=master
-depth=1
-
-[provide]
-dependency_names = fontconfig
-fontconfig = fontconfig_dep
-
--- a/subprojects/freetype2.wrap Sat Jul 24 20:37:10 2021 -0500
+++ b/subprojects/freetype2.wrap Sat Jul 24 20:51:57 2021 -0500
@@ -1,11 +1,12 @@
-[wrap-git]
-directory=freetype2
-url=https://github.com/centricular/freetype2.git
-push-url=git@github.com:centricular/freetype2.git
-revision=meson
-depth=1
+[wrap-file]
+directory = freetype-2.9.1
+source_url = https://download.savannah.gnu.org/releases/freetype/freetype-2.9.1.tar.gz
+source_filename = freetype-2.9.1.tar.gz
+source_hash = ec391504e55498adceb30baceebd147a6e963f636eb617424bcfc47a169898ce
+patch_url = https://wrapdb.mesonbuild.com/v1/projects/freetype2/2.9.1/2/get_zip
+patch_filename = freetype2-2.9.1-2-wrap.zip
+patch_hash = eb47e263df3f69281f96011b16442e7a1352ed5a241c1bdda2d9a86be71cf578
[provide]
-dependency_names = freetype2
freetype2 = freetype_dep
--- a/subprojects/fribidi.wrap Sat Jul 24 20:37:10 2021 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-[wrap-file]
-directory = fribidi-1.0.10
-source_url = https://github.com/fribidi/fribidi/releases/download/v1.0.10/fribidi-1.0.10.tar.xz
-source_filename = fribidi-1.0.10.tar.xz
-source_hash = 7f1c687c7831499bcacae5e8675945a39bacbad16ecaa945e9454a32df653c01
--- a/subprojects/gdk-pixbuf.wrap Sat Jul 24 20:37:10 2021 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-[wrap-file]
-directory = gdk-pixbuf-2.42.6
-source_url = https://download.gnome.org/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.6.tar.xz
-source_filename = gdk-pixbuf-2.42.6.tar.xz
-source_hash = c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f
--- a/subprojects/gi-docgen.wrap Sat Jul 24 20:37:10 2021 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-[wrap-redirect]
-filename = pango-1.48.4/subprojects/gi-docgen.wrap
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/subprojects/glib.wrap Sat Jul 24 20:51:57 2021 -0500
@@ -0,0 +1,13 @@
+[wrap-file]
+directory = glib-2.68.1
+source_url = https://download.gnome.org/sources/glib/2.68/glib-2.68.1.tar.xz
+source_filename = glib-2.68.1.tar.xz
+source_hash = 241654b96bd36b88aaa12814efc4843b578e55d47440103727959ac346944333
+patch_url = https://wrapdb.mesonbuild.com/v1/projects/glib/2.68.1/1/get_zip
+patch_filename = glib-2.68.1-1-wrap.zip
+patch_hash = d619dbddc9563d045aca781690a2b4d3d1d79a93cb1669e3ccb3adcf792cc290
+
+[provide]
+dependency_names = gthread-2.0, gobject-2.0, gmodule-no-export-2.0, gmodule-export-2.0, gmodule-2.0, glib-2.0, gio-2.0, gio-win32-2.0, gio-unix-2.0
+program_names = glib-genmarshal, glib-mkenums, glib-compile-schemas, glib-compile-resources, gio-querymodules, gdbus-codegen
+
--- a/subprojects/gperf.wrap Sat Jul 24 20:37:10 2021 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-[wrap-redirect]
-filename = fontconfig/subprojects/gperf.wrap
--- a/subprojects/gtk3.wrap Sat Jul 24 20:37:10 2021 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-[wrap-file]
-directory = gtk+-3.24.29
-
-source_url = https://download.gnome.org/sources/gtk+/3.24/gtk%2B-3.24.29.tar.xz
-source_filename = gtk+-3.24.29.tar.xz
-source_hash = f57ec4ade8f15cab0c23a80dcaee85b876e70a8823d9105f067ce335a8268caa
-
-[provide]
-dependency_names = gtk+-3.0
-gtk+-3.0 = libgtk_dep
-gdk-3.0 = libgdk_dep
-
--- a/subprojects/harfbuzz.wrap Sat Jul 24 20:37:10 2021 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-[wrap-file]
-directory = harfbuzz-2.8.0
-source_url = https://github.com/harfbuzz/harfbuzz/releases/download/2.8.0/harfbuzz-2.8.0.tar.xz
-source_filename = harfbuzz-2.8.0.tar.xz
-source_hash = a1079fd021adaf5683351f34587a255975cc3bcadba31246ae40ebebb95ecd42
--- a/subprojects/libepoxy.wrap Sat Jul 24 20:37:10 2021 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-[wrap-file]
-directory = libepoxy-1.5.5
-source_url = https://github.com/anholt/libepoxy/releases/download/1.5.5/libepoxy-1.5.5.tar.xz
-source_filename = libepoxy-1.5.5.tar.xz
-source_hash = 261663db21bcc1cc232b07ea683252ee6992982276536924271535875f5b0556
--- a/subprojects/libffi.wrap Sat Jul 24 20:37:10 2021 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-[wrap-git]
-directory=libffi
-url=https://gitlab.freedesktop.org/gstreamer/meson-ports/libffi.git
-revision=meson
-depth=1
--- a/subprojects/libjpeg.wrap Sat Jul 24 20:37:10 2021 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-[wrap-file]
-directory = jpeg-9c
-source_url = http://ijg.org/files/jpegsrc.v9c.tar.gz
-source_filename = jpegsrc.v9c.tar.gz
-source_hash = 1e9793e1c6ba66e7e0b6e5fe7fd0f9e935cc697854d5737adec54d93e5b3f730
-patch_url = https://wrapdb.mesonbuild.com/v1/projects/libjpeg/9c/4/get_zip
-patch_filename = libjpeg-9c-4-wrap.zip
-patch_hash = 3e9cfd7f8ca2ad68d1cf3c31e13541d86fe6afc3cceb1ec5d63fbb51b2a79c37
-
-[provide]
-libjpeg = jpeg_dep
--- a/subprojects/libpng.wrap Sat Jul 24 20:37:10 2021 -0500
+++ b/subprojects/libpng.wrap Sat Jul 24 20:51:57 2021 -0500
@@ -1,10 +1,12 @@
-[wrap-file]
-directory = libpng-1.6.34
-
-source_url = ftp://ftp-osl.osuosl.org/pub/libpng/src/libpng16/libpng-1.6.34.tar.xz
-source_filename = libpng-1.6.34.tar.xz
-source_hash = 2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6
-
-patch_url = https://wrapdb.mesonbuild.com/v1/projects/libpng/1.6.35/4/get_zip
-patch_filename = libpng-1.6.35-4-wrap.zip
-patch_hash = 0cd6ca9e8959b9c720c25d67bbf9315ec115bfc74ea4d34ea569619f4cff986f
+[wrap-file]
+directory = libpng-1.6.37
+source_url = https://github.com/glennrp/libpng/archive/v1.6.37.tar.gz
+source_filename = libpng-1.6.37.tar.gz
+source_hash = ca74a0dace179a8422187671aee97dd3892b53e168627145271cad5b5ac81307
+patch_url = https://wrapdb.mesonbuild.com/v1/projects/libpng/1.6.37/3/get_zip
+patch_filename = libpng-1.6.37-3-wrap.zip
+patch_hash = 6c9f32fd9150b3a96ab89be52af664e32207e10aa9f5fb9aa015989ee2dd7100
+
+[provide]
+libpng = libpng_dep
+
--- a/subprojects/librsvg.wrap Sat Jul 24 20:37:10 2021 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-[wrap-git]
-directory=librsvg
-url=https://gitlab.gnome.org/nirbheek/librsvg.git
-push-url=git@gitlab.gnome.org:nirbheek/librsvg.git
-revision=wip/meson-2-40
--- a/subprojects/libxml2.wrap Sat Jul 24 20:37:10 2021 -0500
+++ b/subprojects/libxml2.wrap Sat Jul 24 20:51:57 2021 -0500
@@ -4,6 +4,6 @@
source_url = ftp://xmlsoft.org/libxml2/libxml2-2.9.7.tar.gz
source_filename = libxml2-2.9.7.tar.gz
source_hash = f63c5e7d30362ed28b38bfa1ac6313f9a80230720b7fb6c80575eeab3ff5900c
-patch_url = https://wrapdb.mesonbuild.com/v1/projects/libxml2/2.9.7/5/get_zip
-patch_filename = libxml2-2.9.7-5-wrap.zip
-patch_hash = aed5d6719eb96da0fb3cf284d88c4af486fd6b7754aec40b2be9a5ffd9ecadab
+patch_url = https://wrapdb.mesonbuild.com/v1/projects/libxml2/2.9.7/6/get_zip
+patch_filename = libxml2-2.9.7-6-wrap.zip
+patch_hash = 4f56174fef39fdcc83f235e7021f18ec638403ab3ee2c314fb2509a8bf599b27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/subprojects/lua.wrap Sat Jul 24 20:51:57 2021 -0500
@@ -0,0 +1,12 @@
+[wrap-file]
+directory = lua-5.3.6
+source_url = https://www.lua.org/ftp/lua-5.3.6.tar.gz
+source_filename = lua-5.3.6.tar.gz
+source_hash = fc5fd69bb8736323f026672b1b7235da613d7177e72558893a0bdcd320466d60
+patch_url = https://wrapdb.mesonbuild.com/v1/projects/lua/5.3.6/2/get_zip
+patch_filename = lua-5.3.6-2-wrap.zip
+patch_hash = bdb106e96fe992d95af52fd4e35a3a887097a5bb5ed3f6ea290d6008aa2f569c
+
+[provide]
+lua-5.3 = lua_dep
+
--- a/subprojects/pango.wrap Sat Jul 24 20:37:10 2021 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-[wrap-file]
-directory = pango-1.48.4
-source_url = https://download.gnome.org/sources/pango/1.48/pango-1.48.4.tar.xz
-source_filename = pango-1.48.4.tar.xz
-source_hash = 418913fb062071a075846244989d4a67aa5c80bf0eae8ee4555a092fd566a37a
--- a/subprojects/pixman.wrap Sat Jul 24 20:37:10 2021 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-[wrap-file]
-directory = pixman-0.40.0
-source_url = https://www.cairographics.org/releases/pixman-0.40.0.tar.gz
-source_filename = pixman-0.40.0.tar.gz
-source_hash = 6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc
--- a/subprojects/proxy-libintl.wrap Sat Jul 24 20:37:10 2021 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-[wrap-git]
-directory=proxy-libintl
-url=https://github.com/frida/proxy-libintl.git
-revision=0.1
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/subprojects/sqlite3.wrap Sat Jul 24 20:51:57 2021 -0500
@@ -0,0 +1,12 @@
+[wrap-file]
+directory = sqlite-amalgamation-3340100
+source_url = https://www.sqlite.org/2021/sqlite-amalgamation-3340100.zip
+source_filename = sqlite-amalgamation-3340100.zip
+source_hash = e0b1c0345fe4338b936e17da8e1bd88366cd210e576834546977f040c12a8f68
+patch_url = https://wrapdb.mesonbuild.com/v1/projects/sqlite3/3.34.1/1/get_zip
+patch_filename = sqlite3-3.34.1-1-wrap.zip
+patch_hash = cba9e47bdb4c02f88fadaae8deab357218d32562c6b86ce7ba0c72f107044360
+
+[provide]
+sqlite3 = sqlite3_dep
+
--- a/subprojects/wayland-protocols.wrap Sat Jul 24 20:37:10 2021 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-[wrap-git]
-directory=wayland-protocols
-url=https://gitlab.freedesktop.org/jadahl/wayland-protocols.git
-revision=wip/meson-meson-0.53
-depth=1
-
-[provide]
-dependency_names = wayland-protocols
--- a/subprojects/zlib.wrap Sat Jul 24 20:37:10 2021 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-[wrap-file]
-directory = zlib-1.2.11
-
-source_url = https://zlib.net/fossils/zlib-1.2.11.tar.gz
-source_filename = zlib-1.2.11.tar.gz
-source_hash = c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
-
-patch_url = https://wrapdb.mesonbuild.com/v1/projects/zlib/1.2.11/3/get_zip
-patch_filename = zlib-1.2.11-3-wrap.zip
-patch_hash = f07dc491ab3d05daf00632a0591e2ae61b470615b5b73bcf9b3f061fff65cff0