--- a/modulesets/gnome.modules Wed Mar 17 03:37:35 2021 -0500
+++ b/modulesets/gnome.modules Wed Mar 17 03:37:55 2021 -0500
@@ -4,6 +4,7 @@
<repository type="tarball" name="download.gnome.org" href="https://download.gnome.org/sources/"/>
<repository type="tarball" name="xmlsoft.org" href="ftp://xmlsoft.org/"/>
+ <repository type="git" name="gitlab.gnome.org/GNOME" href="https://gitlab.gnome.org/GNOME/"/> <include href="system.modules"/>
<include href="x11.modules"/>
@@ -52,6 +53,7 @@
+ <dep package="gobject-introspection"/> @@ -97,6 +99,136 @@
+ <meson id="glib-networking" mesonargs="-Dinstalled_tests=true"> + <if condition-set="freebsd"> + <mesonargs value="-Dca_certificates_path=/usr/local/share/certs/ca-root-nss.crt"/> + <if condition-set="macos"> + <mesonargs value="-Dpkcs11_support=false -Dtls_support=false"/> + <branch repo="download.gnome.org" + module="glib-networking/2.66/glib-networking-${version}.tar.xz" + hash="sha256:c5d7be2437fdd196eebfb70c4517b96d3ba7ec13bd496318b8f02dea383e0099"/> + <dep package="libproxy"/> + <dep package="gsettings-desktop-schemas"/> + <dep package="gnutls"/> + <if condition-unset="macos"> + <dep package="p11-kit"/> + <meson id="gobject-introspection"> + <branch repo="download.gnome.org" + module="gobject-introspection/1.67/gobject-introspection-${version}.tar.xz" + hash="sha256:9635184d668794609f9fe661c5bde11c106385d26c3babe291c24e3655987e47"> + <dep package="python3-devel"/> + <dep package="python3-markdown"/> + <autotools id="gspell"> + <branch repo="download.gnome.org" + module="gspell/1.9/gspell-${version}.tar.xz" + hash="sha256:dcbb769dfdde8e3c0a8ed3102ce7e661abbf7ddf85df08b29915e92cd723abdd"> + <dep package="gtk+-3"/> + <dep package="enchant-2"/> + <if condition-set="macos"> + <dep package="gtk-mac-integration"/> + <branch repo="download.gnome.org" + module="gssdp/1.2/gssdp-${version}.tar.xz" + hash="sha256:a263dcb6730e3b3dc4bbbff80cf3fab4cd364021981d419db6dd5a8e148aa7e8"/> + <dep package="libsoup"/> + <dep package="gobject-introspection"/> + <meson id="gupnp" mesonargs="-Dcontext_manager=network-manager"> + <branch repo="download.gnome.org" + module="gupnp/1.2/gupnp-${version}.tar.xz" + hash="sha256:f7a0307ea51f5e44d1b832f493dd9045444a3a4e211ef85dfd9aa5dd6eaea7d1"/> + <dep package="libsoup"/> + <dep package="libxml2"/> + <dep package="shared-mime-info"/> + <dep package="gobject-introspection"/> + <if condition-set="linux"> + <dep package="NetworkManager"/> + <branch repo="download.gnome.org" + module="gupnp-igd/1.2/gupnp-igd-${version}.tar.xz" + hash="sha256:4b5120098aa13edd27818ba9ee4d7fe961bf540bf50d056ff703c61545e02be1"/> + <meson id="libgudev" mesonargs="-Dtests=disabled"> + <branch repo="download.gnome.org" + module="libgudev/${version}/libgudev-${version}.tar.xz" + <dep package="gobject-introspection"/> + <meson id="libsoup" mesonargs="-Dtls_check=false -Dvapi=enabled -Dsysprof=disabled"> + <branch repo="download.gnome.org" + module="libsoup/2.72/libsoup-${version}.tar.xz" + hash="sha256:170c3f8446b0f65f8e4b93603349172b1085fb8917c181d10962f02bb85f5387"/> + <dep package="libxml2"/> + <dep package="libpsl"/> + <dep package="sqlite3"/> + <dep package="gobject-introspection"/> + <dep package="brotli"/> + <dep package="glib-networking"/> <autotools id="libxml2" autogen-sh="configure">
<branch repo="xmlsoft.org"
module="libxml2/libxml2-${version}.tar.gz"
@@ -109,6 +241,11 @@
+ <autotools id="m4-common"> + <branch repo="gitlab.gnome.org/GNOME" <branch repo="download.gnome.org"
module="pango/1.48/pango-${version}.tar.xz"
@@ -120,6 +257,7 @@
<dep package="freetype2"/>
+ <dep package="gobject-introspection"/> @@ -130,6 +268,20 @@
+ <branch repo="download.gnome.org" + module="pygobject/3.38/pygobject-${version}.tar.xz" + hash="sha256:0372d1bb9122fc19f500a249b1f38c2bb67485000f5887497b4b205b3e7084d5"> + <dep package="pycairo"/> + <dep package="python3-devel"/> + <dep package="gobject-introspection"/> <meson id="gtk+-3" mesonargs="-Dbroadway_backend=true -Dman=false">
<mesonargs value="-Dx11_backend=true"/>
@@ -169,10 +321,12 @@
<dep package="gdk-pixbuf"/>
+ <dep package="gobject-introspection"/> <dep package="libepoxy"/>
<dep package="libXcursor"/>
+ <dep package="libXrandr"/> <if condition-unset="quartz">
<dep package="at-spi2-atk"/>
@@ -194,4 +348,20 @@
<dep package="shared-mime-info"/>
+ <autotools id="vala" supports-non-srcdir-builds="no"> + <branch repo="download.gnome.org" + module="vala/0.48/vala-${version}.tar.xz" + hash="sha256:dca57de29f4ce18ee8c6b1e4f1b37ca3843d19dae5c455fceebccc5ae3ffe347"> + <dep package="graphviz"/> + <dep package="m4-common"/> + <dep package="vala-bootstrap"/> --- a/modulesets/purple3.modules Wed Mar 17 03:37:35 2021 -0500
+++ b/modulesets/purple3.modules Wed Mar 17 03:37:55 2021 -0500
@@ -29,7 +29,7 @@
- <meson id="talkatu" mesonargs="-Dhelp2man=false">
+ <meson id="talkatu" mesonargs="-Dhelp2man=false -Ddoc=false"> <branch repo="keep.imfreedom.org" checkoutdir="talkatu" module="talkatu/talkatu"/>
@@ -40,7 +40,7 @@
- <meson id="gplugin" mesonargs="-Dlua=false -Dperl5=false -Dhelp2man=false">
+ <meson id="gplugin" mesonargs="-Dlua=false -Dperl5=false -Dhelp2man=false -Ddoc=false"> <branch repo="keep.imfreedom.org" checkoutdir="gplugin" module="gplugin/gplugin"/>
@@ -51,7 +51,7 @@
- <meson id="pidgin3" mesonargs="-Dconsoleui=false">
+ <meson id="pidgin3" mesonargs="-Dconsoleui=false -Ddoc=false"> <branch repo="keep.imfreedom.org" checkoutdir="pidgin3" module="pidgin/pidgin"/>
--- a/modulesets/system.modules Wed Mar 17 03:37:35 2021 -0500
+++ b/modulesets/system.modules Wed Mar 17 03:37:55 2021 -0500
@@ -2,16 +2,38 @@
<!DOCTYPE moduleset SYSTEM "moduleset.dtd">
<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
+ <repository type="git" name="salsa.debian.org" href="https://salsa.debian.org/"/> <repository type="system" name="system"/>
<repository type="tarball" name="downloads.sourceforge.net" href="https://downloads.sourceforge.net/"/>
<repository type="tarball" name="fontconfig" href="https://www.freedesktop.org/software/fontconfig/release/"/>
<repository type="tarball" name="ftp.gnu.org" href="https://ftp.gnu.org/gnu/"/>
<repository type="tarball" name="gitlab.freedesktop.org" href="https://gitlab.freedesktop.org/"/>
<repository type="tarball" name="igj" href="http://www.ijg.org/files/"/>
+ <repository type="tarball" name="nice.freedesktop.org" href="https://nice.freedesktop.org/releases/"/> <repository type="tarball" name="pcre" href="https://ftp.pcre.org/pub/pcre/"/>
+ <repository type="tarball" name="pypi.org" href="https://pypi.org/packages/source/"/> + <repository type="tarball" name="sqlite" href="https://www.sqlite.org/"/> <repository type="tarball" name="tarball.github.com" href="https://github.com/"/>
<repository type="tarball" name="www.cairographics.org" href="https://www.cairographics.org/releases/"/>
+ <systemmodule id="bison"> + <branch repo="system" version="2.4"/> + <dep type="path" name="bison"/> + <branch repo="tarball.github.com" + module="google/brotli/archive/v${version}.tar.gz" + rename-tarball="brotli-${version}.tar.gz" + hash="sha256:f9e8d81d0405ba66d181529af42a3354f838c939095ff99930da6aa9cdf6fe46"> + <patch file="brotli-minus-r.patch"/> <autotools id="cairo" autogen-sh="configure">
<branch repo="www.cairographics.org"
module="cairo-${version}.tar.xz"
@@ -53,6 +75,50 @@
<branch repo="system" version="1.3"/>
+ <autotools id="enchant-2" + autogenargs="--with-hunspell --with-hunspell-dir=/usr/share/myspell"> + <if condition-set="freebsd"> + <autogenargs value="--with-hunspell-dir=/usr/local/share/hunspell"/> + <branch repo="tarball.github.com" + module="AbiWord/enchant/releases/download/v${version}/enchant-${version}.tar.gz" + hash="sha256:6b9bc58ae714ee7f5335ade966f4ac5718d5339e280cc9e1cca9ab278c06227e"> + <dep package="hunspell"/> + <systemmodule id="expat"> + <branch repo="system"/> + <systemmodule id="flex"> + <branch repo="system" version="2.0"/> + <dep type="path" name="flex"/> + <autotools id="fontconfig" autogen-sh="autoreconf" autogenargs="--disable-docs"> + <branch repo="fontconfig" + module="fontconfig-${version}.tar.gz" + hash="sha256:9f0d852b39d75fc655f9f53850eb32555394f36104a044bb2b2fc9e66dbbfa7f"> + <dep package="freetype2"/> <autotools id="freetype2" autogen-sh="configure">
<branch repo="downloads.sourceforge.net"
module="freetype/freetype-${version}.tar.xz"
@@ -65,17 +131,6 @@
- <autotools id="fontconfig" autogen-sh="autoreconf" autogenargs="--disable-docs">
- <branch repo="fontconfig"
- module="fontconfig-${version}.tar.gz"
- hash="sha256:9f0d852b39d75fc655f9f53850eb32555394f36104a044bb2b2fc9e66dbbfa7f">
- <dep package="freetype2"/>
<branch repo="tarball.github.com"
module="fribidi/fribidi/releases/download/v${version}/fribidi-${version}.tar.xz"
@@ -101,6 +156,12 @@
+ <systemmodule id="gnutls"> + <pkg-config>gnutls.pc</pkg-config> <systemmodule id="gperf">
@@ -108,6 +169,22 @@
+ <branch repo="tarball.github.com" + module="ebassi/graphene/releases/download/${version}/graphene-${version}.tar.xz" + <dep package="gobject-introspection"/> + <systemmodule id="graphviz"> + <pkg-config>libgvc.pc</pkg-config> + <branch repo="system" version="2.26.0"/> <meson id="harfbuzz" mesonargs="-Ddocs=disabled -Dgobject=disabled">
<branch repo="tarball.github.com"
module="harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
@@ -121,6 +198,26 @@
+ <systemmodule id="hunspell"> + <pkg-config>hunspell.pc</pkg-config> + <branch repo="system"/> + <autotools id="iso-codes"> + <pkg-config>iso-codes.pc</pkg-config> + <branch repo="salsa.debian.org" + checkoutdir="iso-codes" + module="iso-codes-team/iso-codes.git" + revision="iso-codes-3.79"/> + <systemmodule id="itstool"> + <branch repo="system"/> + <dep type="path" name="itstool"/> <branch repo="tarball.github.com"
module="anholt/libepoxy/releases/download/${version}/libepoxy-${version}.tar.xz"
@@ -162,6 +259,20 @@
+ <meson id="libnice" mesonargs="-Dgupnp=enabled"> + <pkg-config>nice.pc</pkg-config> + <branch repo="nice.freedesktop.org" + module="libnice-${version}.tar.gz" + hash="sha256:5eabd25ba2b54e817699832826269241abaa1cf78f9b240d1435f936569273f4"/> + <dep package="gnutls"/> + <dep package="gst-plugins-base"/> + <dep package="gupnp-igd"/> module="pcre-${version}.tar.bz2"
@@ -181,6 +292,18 @@
+ <autotools id="libpsl" autogenargs="--enable-runtime=libicu --enable-builtin=libicu"> + <branch repo="tarball.github.com" + module="rockdaboot/libpsl/releases/download/${version}/libpsl-${version}.tar.gz" + checkoutdir="libpsl-${version}" + hash="sha256:ac6ce1e1fbd4d0254c4ddb9d37f1fa99dec83619c1253328155206b896210d4c"/> + <dep package="libicu"/> <systemmodule id="meson">
@@ -205,6 +328,43 @@
+ <branch repo="tarball.github.com" + module="pygobject/pycairo/releases/download/v${version}/pycairo-${version}.tar.gz" + hash="sha256:5695a10cb7f9ae0d01f665b56602a845b0a8cb17e2123bfece10c2e58552468c"/> + <dep package="python3-devel"/> + <systemmodule id="python3-devel"> + <pkg-config>python3.pc</pkg-config> + <distutils id="python3-markdown" python3="1"> + <branch repo="pypi.org" + module="m/markdown/Markdown-${version}.tar.gz" + checkoutdir="python3-markdown-${version}" + hash="sha256:1fafe3f1ecabfb514a5285fca634a53c1b32a81cb0feb154264d55bf2ff22c17"> + <dep package="python3-setuptools"/> + <distutils id="python3-setuptools" python3="1"> + <branch repo="pypi.org" + module="s/setuptools/setuptools-${version}.zip" + checkoutdir="python3-setuptools-${version}" + hash="sha256:66b86bbae7cc7ac2e867f52dc08a6bd064d938bac59dfec71b9b565dd36d6012"/> <meson id="shared-mime-info">
<branch repo="gitlab.freedesktop.org"
module="xdg/shared-mime-info/-/archive/${version}/shared-mime-info-${version}.tar.bz2"
@@ -213,10 +373,68 @@
+ <dep package="itstool"/> + <autotools id="sqlite3" autogenargs="--enable-threadsafe" autogen-sh="configure"> + module="2021/sqlite-autoconf-3350100.tar.gz" + hash="sha3:eb59c06cde96a8e90f31eb92f636d78b571aaa1a8cb7a9eba794e7dc65b95060"/> + <meson id="wayland" mesonargs="-Ddocumentation=false"> + <branch repo="gitlab.freedesktop.org" + module="wayland/wayland/-/archive/${version}/wayland-${version}.tar.bz2" + checkoutdir="wayland-${version}" + hash="sha256:a84410f22bd44e993c3285187b1632f93fc9b5ffeb460e8929406c69ae70bdea"/> + <dep package="libffi"/> + <!-- expat needed by default 'scanner' option --> + <!-- Deps needed for default 'documentation' option --> + <dep package="xsltproc"/> + <systemmodule id="wayland-egl"> + <pkg-config>wayland-egl.pc</pkg-config> + <autotools id="wayland-protocols"> + <branch repo="gitlab.freedesktop.org" + module="wayland/wayland-protocols/-/archive/${version}/wayland-protocols-${version}.tar.bz2" + checkoutdir="wayland-protocols-${version}" + hash="sha256:4fcdb7ecacc4c97dd299a465aedc91e24aa2ccfe1154a6de55a5b1736acad4eb"/> + <if condition-set="linux"> + <dep package="wayland"/> + <systemmodule id="xmlto"> + <branch repo="system"/> + <dep type="path" name="xmlto"/> + <systemmodule id="libxslt"> + <pkg-config>libxslt.pc</pkg-config> <branch repo="downloads.sourceforge.net"
module="libpng/zlib-${version}.tar.gz"
--- a/modulesets/x11.modules Wed Mar 17 03:37:35 2021 -0500
+++ b/modulesets/x11.modules Wed Mar 17 03:37:55 2021 -0500
@@ -25,9 +25,9 @@
- <systemmodule id="xkbcommon-x11">
- <pkg-config>xkbcommon-x11.pc</pkg-config>
- <branch repo="system"/>
+ <systemmodule id="libXrandr"> + <pkg-config>xrandr.pc</pkg-config> + <branch repo="system" version="1.3"/> <systemmodule id="libXtst">
@@ -35,9 +35,19 @@
<branch repo="system" version="1"/>
+ <systemmodule id="x11-xcb"> + <pkg-config>x11-xcb.pc</pkg-config> + <branch repo="system"/> <pkg-config>xi.pc</pkg-config>
+ <systemmodule id="xkbcommon-x11"> + <pkg-config>xkbcommon-x11.pc</pkg-config> + <branch repo="system"/> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/brotli-minus-r.patch Wed Mar 17 03:37:55 2021 -0500
@@ -0,0 +1,29 @@
+--- scripts/libbrotlicommon.pc.in 2020-08-27 09:12:55.000000000 -0500 ++++ scripts/libbrotlicommon.pc.in.2 2021-03-17 03:15:38.257126509 -0500
+@@ -7,5 +7,5 @@ Name: libbrotlicommon + URL: https://github.com/google/brotli + Description: Brotli common dictionary library + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -R${libdir} -lbrotlicommon ++Libs: -L${libdir} -lbrotlicommon + Cflags: -I${includedir} +--- scripts/libbrotlidec.pc.in 2020-08-27 09:12:55.000000000 -0500 ++++ scripts/libbrotlidec.pc.in.2 2021-03-17 03:15:48.517255679 -0500
+@@ -7,6 +7,6 @@ Name: libbrotlidec + URL: https://github.com/google/brotli + Description: Brotli decoder library + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -R${libdir} -lbrotlidec ++Libs: -L${libdir} -lbrotlidec + Requires.private: libbrotlicommon >= 1.0.2 + Cflags: -I${includedir} +--- scripts/libbrotlienc.pc.in 2020-08-27 09:12:55.000000000 -0500 ++++ scripts/libbrotlienc.pc.in.2 2021-03-17 03:16:00.285404040 -0500
+@@ -7,6 +7,6 @@ Name: libbrotlienc + URL: https://github.com/google/brotli + Description: Brotli encoder library + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -R${libdir} -lbrotlienc ++Libs: -L${libdir} -lbrotlienc + Requires.private: libbrotlicommon >= 1.0.2 + Cflags: -I${includedir}