Skip to content

Update modulesets. #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Update modulesets. #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0b0b350
Update modulesets.
auouymous Jun 2, 2025
d3ae54c
Update modulesets.
auouymous Jun 20, 2025
a10f44f
hack
auouymous Jun 20, 2025
a77c0fa
hack2
auouymous Jun 20, 2025
b1a0aec
hack3
auouymous Jun 22, 2025
63cc3e0
Update modulesets.
auouymous Sep 1, 2025
f038a11
Bump to macos-14.
auouymous Sep 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
github.event_name == 'push' ||
github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name

runs-on: macos-13
runs-on: macos-14
steps:
- uses: actions/checkout@v4
with:
Expand Down
30 changes: 15 additions & 15 deletions github-brotli.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
--- modulesets/gtk-osx.modules
+++ modulesets/gtk-osx.modules
@@ -127,8 +127,9 @@
then build harfbuzz without cairo because cairo requires
harfbuzz.
@@ -109,8 +109,9 @@
path so none of the libraries that depend on it can link. Require
the install name to be an absolute path.
-->
+ <!-- gpodder github action needs to disable BrotliDec -->
<cmake id="freetype-no-harfbuzz"
- cmakeargs="-DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE -D BUILD_SHARED_LIBS=true -D CMAKE_BUILD_TYPE=Release">
+ cmakeargs="-DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE -D BUILD_SHARED_LIBS=true -D CMAKE_BUILD_TYPE=Release -DCMAKE_DISABLE_FIND_PACKAGE_BrotliDec=TRUE">

<branch module="freetype/freetype-2.11.1.tar.gz"
version="2.11.1"
@@ -153,8 +154,9 @@
- cmakeargs='-DFT_DISABLE_HARFBUZZ=ON -DBUILD_SHARED_LIBS=true -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_NAME_DIR="${JHBUILD_PREFIX}/lib"'>
+ cmakeargs='-DFT_DISABLE_HARFBUZZ=ON -DBUILD_SHARED_LIBS=true -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_NAME_DIR="${JHBUILD_PREFIX}/lib" -DCMAKE_DISABLE_FIND_PACKAGE_BrotliDec=TRUE'>
<branch module="freetype/freetype-2.13.3.tar.xz"
version="2.13.3"
hash="sha256:0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289"
@@ -141,8 +141,9 @@
<dep package="icu" />
</dependencies>
</meson>
<!---->
+ <!-- gpodder github action needs to disable BrotliDec -->
<cmake id="freetype"
- cmakeargs="-DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE -D BUILD_SHARED_LIBS=true -D CMAKE_BUILD_TYPE=Release">
+ cmakeargs="-DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE -D BUILD_SHARED_LIBS=true -D CMAKE_BUILD_TYPE=Release -DCMAKE_DISABLE_FIND_PACKAGE_BrotliDec=TRUE">

<branch module="freetype/freetype-2.11.1.tar.gz"
version="2.11.1"
- cmakeargs='-DFT_REQUIRE_HARFBUZZ=ON -DBUILD_SHARED_LIBS=true -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_NAME_DIR="${JHBUILD_PREFIX}/lib"'>
+ cmakeargs='-DFT_REQUIRE_HARFBUZZ=ON -DBUILD_SHARED_LIBS=true -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_NAME_DIR="${JHBUILD_PREFIX}/lib" -DCMAKE_DISABLE_FIND_PACKAGE_BrotliDec=TRUE'>
<branch module="freetype/freetype-2.13.3.tar.xz"
version="2.13.3"
hash="sha256:0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289"
139 changes: 52 additions & 87 deletions modulesets/bootstrap.modules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,47 +2,33 @@
<!--*- mode: nxml -*-->
<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
<moduleset>
<!--
Please format this file using https://github.com/htacg/tidy-html5

tidy -config ../tidy.conf -m bootstrap.modules
-->
<!-- Please format this file using the following command:
tidy -config ../tidy.conf -m bootstrap.modules; sed -i "" '/^ *$/d' bootstrap.modules
You can get 'tidy' here: https://github.com/htacg/tidy-html5 -->
<repository name="ftp.gnu.org"
href="https://ftp.gnu.org/gnu/"
type="tarball" />
<repository name="pkgconf"
href="https://distfiles.ariadne.space/pkgconf/"
type="tarball" />
<repository name="sourceforge"
href="http://downloads.sourceforge.net/sourceforge/"
type="tarball" />
<repository name="tukaani.org"
href="http://tukaani.org/"
type="tarball" />
<repository name="cmake"
href="https://cmake.org/files/"
type="tarball" />
<repository name="cpan"
href="http://search.cpan.org/CPAN/"
type="tarball" />
<repository name="intltool"
href="http://launchpad.net/intltool/trunk/"
type="tarball" />
<repository name="github"
href="https://github.com"
type="tarball" />
<!---->
<autotools id="xz"
autogen-sh="configure"
bootstrap="true">
<branch module="xz/xz-5.6.2.tar.bz2"
version="5.6.2"
hash="sha256:e12aa03cbd200597bd4ce11d97be2d09a6e6d39a9311ce72c91ac7deacde3171"
repo="tukaani.org" />
<branch module="tukaani-project/xz/releases/download/v5.6.4/xz-5.6.4.tar.bz2"
version="5.6.4"
hash="sha256:176d510c30d80a23b8050bbc048f2ecaacb823ae48b6821727ed6591f0df9200"
repo="github" />
</autotools>
<!--
gnu make 4.xx, needed to unbreak parallel builds for the webkit
-->
<!-- gnu make 4.xx, needed to unbreak parallel builds for the webkit -->
<autotools id="gnumake"
autogen-sh="configure"
autogenargs="--disable-dependency-tracking"
Expand All @@ -52,52 +38,45 @@
hash="sha256:581f4d4e872da74b3941c874215898a7d35802f03732bdccee1d4a7979105d18"
repo="ftp.gnu.org" />
</autotools>
<!---->
<autotools id="libiconv"
autogen-sh="configure"
autogenargs="--disable-debug --disable-dependency-tracking --enable-extra-encodings">

<branch module="libiconv/libiconv-1.17.tar.gz"
version="1.17"
hash="sha256:8f74213b56238c85a50a5329f77e06198771e70dd9a739779f4c02f65d971313"
<branch module="libiconv/libiconv-1.18.tar.gz"
version="1.18"
hash="sha256:3b08f5f4f9b4eb82f151a7040bfd6fe6c6fb922efe4b1659c66ea933276965e8"
repo="ftp.gnu.org" />
</autotools>
<autotools id="libunistring"
autogen-sh="configure">
<branch module="libunistring/libunistring-1.3.tar.gz"
version="1.3"
hash="sha256:8ea8ccf86c09dd801c8cac19878e804e54f707cf69884371130d20bde68386b7"
repo="ftp.gnu.org" />
<!---->
</autotools>
<autotools id="libunistring" autogen-sh="configure">
<branch repo="ftp.gnu.org" module="libunistring/libunistring-1.2.tar.gz"
version="1.2">
</branch>
</autotools>
<!---->
<autotools id="gettext"
autogen-sh="configure"
autogenargs="--without-emacs --disable-java --disable-native-java --disable-libasprintf --disable-csharp --with-included-glib --with-included-libcroco">

<branch module="gettext/gettext-0.22.5.tar.xz"
version="0.22.5"
hash="sha256:fe10c37353213d78a5b83d48af231e005c4da84db5ce88037d88355938259640"
<branch module="gettext/gettext-0.23.1.tar.xz"
version="0.23.1"
hash="sha256:c1f97a72a7385b7e71dd07b5fea6cdaf12c9b88b564976b23bd8c11857af2970"
repo="ftp.gnu.org" />
<dependencies>
<dep package="libiconv" />
<dep package="libunistring" />
</dependencies>
</autotools>
<!--
cmakes ./configure is picky about invalid flags so we manually set it
-->
<!-- cmakes ./configure is picky about invalid flags so we manually set it -->
<autotools id="cmake"
autogen-sh="bootstrap"
autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s"
bootstrap="true">
<branch module="v3.29/cmake-3.29.3.tar.gz"
version="3.29.3"
hash="sha256:252aee1448d49caa04954fd5e27d189dd51570557313e7b281636716a238bccb"
<branch module="v3.31/cmake-3.31.5.tar.gz"
version="3.31.5"
hash="sha256:66fb53a145648be56b46fa9e8ccade3a4d0dfc92e401e52ce76bdad1fea43d27"
repo="cmake" />
</autotools>
<!--
The version of m4 provided with Xcode is now too old, see
https://savannah.gnu.org/support/index.php?110397
-->
<!-- The version of m4 provided with Xcode is now too old, see
https://savannah.gnu.org/support/index.php?110397 -->
<autotools id="m4"
autogen-sh="configure"
bootstrap="true">
Expand All @@ -106,7 +85,6 @@
hash="sha256:63aede5c6d33b6d9b13511cd0be2cac046f2e70fd0a07aa9573a04a82783af96"
repo="ftp.gnu.org" />
</autotools>
<!---->
<autotools id="autoconf"
autogen-sh="configure"
bootstrap="true">
Expand All @@ -119,66 +97,58 @@
<dep package="xz" />
</dependencies>
</autotools>
<!---->
<autotools id="autoconf-archive"
autogen-sh="configure"
bootstrap="true">
<branch module="autoconf-archive/autoconf-archive-2023.02.20.tar.xz"
version="2023-02-20"
hash="sha256:71d4048479ae28f1f5794619c3d72df9c01df49b1c628ef85fde37596dc31a33"
<branch module="autoconf-archive/autoconf-archive-2024.10.16.tar.xz"
version="202410-162-20"
hash="sha256:7bcd5d001916f3a50ed7436f4f700e3d2b1bade3ed803219c592d62502a57363"
repo="ftp.gnu.org" />
</autotools>
<!---->
<autotools id="libtool"
autogen-sh="configure"
bootstrap="true">
<branch module="libtool/libtool-2.4.7.tar.gz"
version="2.4.7"
hash="sha256:04e96c2404ea70c590c546eba4202a4e12722c640016c12b9b2f1ce3d481e9a8"
<branch module="libtool/libtool-2.5.4.tar.gz"
version="2.5.4"
hash="sha256:da8ebb2ce4dcf46b90098daf962cffa68f4b4f62ea60f798d0ef12929ede6adf"
repo="ftp.gnu.org">
<patch file="libtool-apple-sort.patch"
strip="1" />
</branch>
</autotools>
<!---->
<autotools id="automake"
autogen-sh="configure"
bootstrap="true">
<branch module="automake/automake-1.16.5.tar.xz"
version="1.16.5"
hash="sha256:f01d58cd6d9d77fbdca9eb4bbd5ead1988228fdb73d6f7a201f5f8d6b118b469"
<branch module="automake/automake-1.17.tar.xz"
version="1.17"
hash="sha256:8920c1fc411e13b90bf704ef9db6f29d540e76d232cb3b2c9f4dc4cc599bd990"
repo="ftp.gnu.org" />
<dependencies>
<dep package="autoconf" />
</dependencies>
</autotools>
<!---->
<meson id="pkgconf"
mesonargs="-Dwith-system-libdir=/usr/lib -Dwith-system-includedir=/usr/include" >
<branch module="pkgconf-2.2.0.tar.xz"
version="2.2.0"
hash="sha256:b06ff63a83536aa8c2f6422fa80ad45e4833f590266feb14eaddfe1d4c853c69"
repo="pkgconf" >
<patch file="pkgconf-link-pkg-config.patch" strip="1" />
mesonargs="-Dwith-system-libdir=/usr/lib -Dwith-system-includedir=/usr/include">
<branch module="pkgconf-2.3.0.tar.xz"
version="2.3.0"
hash="sha256:3a9080ac51d03615e7c1910a0a2a8df08424892b5f13b0628a204d3fcce0ea8b"
repo="pkgconf">
<patch file="pkgconf-link-pkg-config.patch"
strip="1" />
</branch>
</meson>
<!--
macOS provides 2.3 (presumably the last GPL2 version, gstreamer
requires 2.4.
-->
<!-- macOS provides 2.3 (presumably the last GPL2 version, gstreamer requires 2.4. -->
<autotools id="bison"
autogen-sh="configure">
<branch module="bison/bison-3.8.2.tar.xz"
version="3.8.2"
hash="sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2"
repo="ftp.gnu.org" />
<dependencies>
<dep package='flex' />
<dep package="flex" />
</dependencies>
</autotools>
<!--
As of 29 March 2021 Flex hasn't had an update since May 2017.
-->
<!-- As of 29 March 2021 Flex hasn't had an update since May 2017. -->
<autotools id="flex"
autogen-sh="configure"
autogenargs="--disable-libfl">
Expand All @@ -187,13 +157,11 @@
hash="sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995"
repo="github" />
</autotools>
<!--
This is generated by tarring up the needed docbook stylesheets
for gtk-doc to work. If someone wants to work on a setup that
uses the real docbook source from upstream, feel free to do so,
it used to be a huge amount of work, but might be easier these
days.
-->
<!-- This is generated by tarring up the needed docbook stylesheets
for gtk-doc to work. If someone wants to work on a setup that
uses the real docbook source from upstream, feel free to do so,
it used to be a huge amount of work, but might be easier these
days. -->
<autotools id="gtk-osx-docbook"
autogen-sh="configure"
supports-non-srcdir-builds="no">
Expand All @@ -202,19 +170,17 @@
hash="sha256:fcf497688a1d531b192301bd09c55adefda5a662729a58eb8a895166e38ef219"
repo="github" />
</autotools>
<!---->
<autotools id="intltool"
autogen-sh="configure">
<branch module="0.51.0/+download/intltool-0.51.0.tar.gz"
version="0.51.0"
hash="sha256:67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd"
repo="intltool" />
</autotools>
<!---->
<metamodule id="meta-bootstrap">
<dependencies>
<dep package="xz" />
<dep package="libiconv"/>
<dep package="libiconv" />
<dep package="gettext" />
<dep package="cmake" />
<dep package="autoconf-archive" />
Expand All @@ -228,5 +194,4 @@
<dep package="gnumake" />
</dependencies>
</metamodule>
<!---->
</moduleset>
Loading
Loading