Skip to content

Commit a523933

Browse files
auouymousauouymous
committed
Update modulesets.
1 parent da0d675 commit a523933

19 files changed

+626
-762
lines changed

‎github-brotli.patch

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
--- modulesets/gtk-osx.modules
22
+++ modulesets/gtk-osx.modules
3-
@@ -127,8 +127,9 @@
4-
then build harfbuzz without cairo because cairo requires
5-
harfbuzz.
3+
@@ -109,8 +109,9 @@
4+
path so none of the libraries that depend on it can link. Require
5+
the install name to be an absolute path.
66
-->
77
+ <!-- gpodder github action needs to disable BrotliDec -->
88
<cmake id="freetype-no-harfbuzz"
9-
- cmakeargs="-DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE -D BUILD_SHARED_LIBS=true -D CMAKE_BUILD_TYPE=Release">
10-
+ 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">
11-
12-
<branch module="freetype/freetype-2.11.1.tar.gz"
13-
version="2.11.1"
14-
@@ -153,8 +154,9 @@
9+
- cmakeargs='-DFT_DISABLE_HARFBUZZ=ON -DBUILD_SHARED_LIBS=true -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_NAME_DIR="${JHBUILD_PREFIX}/lib"'>
10+
+ 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'>
11+
<branch module="freetype/freetype-2.13.3.tar.xz"
12+
version="2.13.3"
13+
hash="sha256:0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289"
14+
@@ -141,8 +141,9 @@
15+
<dep package="icu" />
1516
</dependencies>
1617
</meson>
17-
<!---->
1818
+ <!-- gpodder github action needs to disable BrotliDec -->
1919
<cmake id="freetype"
20-
- cmakeargs="-DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE -D BUILD_SHARED_LIBS=true -D CMAKE_BUILD_TYPE=Release">
21-
+ cmakeargs="-DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE -D BUILD_SHARED_LIBS=true -D CMAKE_BUILD_TYPE=Release -DCMAKE_DISABLE_FIND_PACKAGE_BrotliDec=TRUE">
22-
23-
<branch module="freetype/freetype-2.11.1.tar.gz"
24-
version="2.11.1"
20+
- cmakeargs='-DFT_REQUIRE_HARFBUZZ=ON -DBUILD_SHARED_LIBS=true -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_NAME_DIR="${JHBUILD_PREFIX}/lib"'>
21+
+ 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'>
22+
<branch module="freetype/freetype-2.13.3.tar.xz"
23+
version="2.13.3"
24+
hash="sha256:0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289"

‎modulesets/bootstrap.modules

Lines changed: 52 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -2,47 +2,33 @@
22
<!--*- mode: nxml -*-->
33
<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
44
<moduleset>
5-
<!--
6-
Please format this file using https://github.com/htacg/tidy-html5
7-
8-
tidy -config ../tidy.conf -m bootstrap.modules
9-
-->
5+
<!-- Please format this file using the following command:
6+
tidy -config ../tidy.conf -m bootstrap.modules; sed -i "" '/^ *$/d' bootstrap.modules
7+
You can get 'tidy' here: https://github.com/htacg/tidy-html5 -->
108
<repository name="ftp.gnu.org"
119
href="https://ftp.gnu.org/gnu/"
1210
type="tarball" />
1311
<repository name="pkgconf"
1412
href="https://distfiles.ariadne.space/pkgconf/"
1513
type="tarball" />
16-
<repository name="sourceforge"
17-
href="http://downloads.sourceforge.net/sourceforge/"
18-
type="tarball" />
19-
<repository name="tukaani.org"
20-
href="http://tukaani.org/"
21-
type="tarball" />
2214
<repository name="cmake"
2315
href="https://cmake.org/files/"
2416
type="tarball" />
25-
<repository name="cpan"
26-
href="http://search.cpan.org/CPAN/"
27-
type="tarball" />
2817
<repository name="intltool"
2918
href="http://launchpad.net/intltool/trunk/"
3019
type="tarball" />
3120
<repository name="github"
3221
href="https://github.com"
3322
type="tarball" />
34-
<!---->
3523
<autotools id="xz"
3624
autogen-sh="configure"
3725
bootstrap="true">
38-
<branch module="xz/xz-5.6.2.tar.bz2"
39-
version="5.6.2"
40-
hash="sha256:e12aa03cbd200597bd4ce11d97be2d09a6e6d39a9311ce72c91ac7deacde3171"
41-
repo="tukaani.org" />
26+
<branch module="tukaani-project/xz/releases/download/v5.6.4/xz-5.6.4.tar.bz2"
27+
version="5.6.4"
28+
hash="sha256:176d510c30d80a23b8050bbc048f2ecaacb823ae48b6821727ed6591f0df9200"
29+
repo="github" />
4230
</autotools>
43-
<!--
44-
gnu make 4.xx, needed to unbreak parallel builds for the webkit
45-
-->
31+
<!-- gnu make 4.xx, needed to unbreak parallel builds for the webkit -->
4632
<autotools id="gnumake"
4733
autogen-sh="configure"
4834
autogenargs="--disable-dependency-tracking"
@@ -52,52 +38,45 @@
5238
hash="sha256:581f4d4e872da74b3941c874215898a7d35802f03732bdccee1d4a7979105d18"
5339
repo="ftp.gnu.org" />
5440
</autotools>
55-
<!---->
5641
<autotools id="libiconv"
5742
autogen-sh="configure"
5843
autogenargs="--disable-debug --disable-dependency-tracking --enable-extra-encodings">
59-
60-
<branch module="libiconv/libiconv-1.17.tar.gz"
61-
version="1.17"
62-
hash="sha256:8f74213b56238c85a50a5329f77e06198771e70dd9a739779f4c02f65d971313"
44+
<branch module="libiconv/libiconv-1.18.tar.gz"
45+
version="1.18"
46+
hash="sha256:3b08f5f4f9b4eb82f151a7040bfd6fe6c6fb922efe4b1659c66ea933276965e8"
47+
repo="ftp.gnu.org" />
48+
</autotools>
49+
<autotools id="libunistring"
50+
autogen-sh="configure">
51+
<branch module="libunistring/libunistring-1.3.tar.gz"
52+
version="1.3"
53+
hash="sha256:8ea8ccf86c09dd801c8cac19878e804e54f707cf69884371130d20bde68386b7"
6354
repo="ftp.gnu.org" />
64-
<!---->
6555
</autotools>
66-
<autotools id="libunistring" autogen-sh="configure">
67-
<branch repo="ftp.gnu.org" module="libunistring/libunistring-1.2.tar.gz"
68-
version="1.2">
69-
</branch>
70-
</autotools>
71-
<!---->
7256
<autotools id="gettext"
7357
autogen-sh="configure"
7458
autogenargs="--without-emacs --disable-java --disable-native-java --disable-libasprintf --disable-csharp --with-included-glib --with-included-libcroco">
75-
76-
<branch module="gettext/gettext-0.22.5.tar.xz"
77-
version="0.22.5"
78-
hash="sha256:fe10c37353213d78a5b83d48af231e005c4da84db5ce88037d88355938259640"
59+
<branch module="gettext/gettext-0.23.1.tar.xz"
60+
version="0.23.1"
61+
hash="sha256:c1f97a72a7385b7e71dd07b5fea6cdaf12c9b88b564976b23bd8c11857af2970"
7962
repo="ftp.gnu.org" />
8063
<dependencies>
8164
<dep package="libiconv" />
8265
<dep package="libunistring" />
8366
</dependencies>
8467
</autotools>
85-
<!--
86-
cmakes ./configure is picky about invalid flags so we manually set it
87-
-->
68+
<!-- cmakes ./configure is picky about invalid flags so we manually set it -->
8869
<autotools id="cmake"
8970
autogen-sh="bootstrap"
9071
autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s"
9172
bootstrap="true">
92-
<branch module="v3.29/cmake-3.29.3.tar.gz"
93-
version="3.29.3"
94-
hash="sha256:252aee1448d49caa04954fd5e27d189dd51570557313e7b281636716a238bccb"
73+
<branch module="v3.31/cmake-3.31.5.tar.gz"
74+
version="3.31.5"
75+
hash="sha256:66fb53a145648be56b46fa9e8ccade3a4d0dfc92e401e52ce76bdad1fea43d27"
9576
repo="cmake" />
9677
</autotools>
97-
<!--
98-
The version of m4 provided with Xcode is now too old, see
99-
https://savannah.gnu.org/support/index.php?110397
100-
-->
78+
<!-- The version of m4 provided with Xcode is now too old, see
79+
https://savannah.gnu.org/support/index.php?110397 -->
10180
<autotools id="m4"
10281
autogen-sh="configure"
10382
bootstrap="true">
@@ -106,7 +85,6 @@
10685
hash="sha256:63aede5c6d33b6d9b13511cd0be2cac046f2e70fd0a07aa9573a04a82783af96"
10786
repo="ftp.gnu.org" />
10887
</autotools>
109-
<!---->
11088
<autotools id="autoconf"
11189
autogen-sh="configure"
11290
bootstrap="true">
@@ -119,66 +97,58 @@
11997
<dep package="xz" />
12098
</dependencies>
12199
</autotools>
122-
<!---->
123100
<autotools id="autoconf-archive"
124101
autogen-sh="configure"
125102
bootstrap="true">
126-
<branch module="autoconf-archive/autoconf-archive-2023.02.20.tar.xz"
127-
version="2023-02-20"
128-
hash="sha256:71d4048479ae28f1f5794619c3d72df9c01df49b1c628ef85fde37596dc31a33"
103+
<branch module="autoconf-archive/autoconf-archive-2024.10.16.tar.xz"
104+
version="202410-162-20"
105+
hash="sha256:7bcd5d001916f3a50ed7436f4f700e3d2b1bade3ed803219c592d62502a57363"
129106
repo="ftp.gnu.org" />
130107
</autotools>
131-
<!---->
132108
<autotools id="libtool"
133109
autogen-sh="configure"
134110
bootstrap="true">
135-
<branch module="libtool/libtool-2.4.7.tar.gz"
136-
version="2.4.7"
137-
hash="sha256:04e96c2404ea70c590c546eba4202a4e12722c640016c12b9b2f1ce3d481e9a8"
111+
<branch module="libtool/libtool-2.5.4.tar.gz"
112+
version="2.5.4"
113+
hash="sha256:da8ebb2ce4dcf46b90098daf962cffa68f4b4f62ea60f798d0ef12929ede6adf"
138114
repo="ftp.gnu.org">
139115
<patch file="libtool-apple-sort.patch"
140116
strip="1" />
141117
</branch>
142118
</autotools>
143-
<!---->
144119
<autotools id="automake"
145120
autogen-sh="configure"
146121
bootstrap="true">
147-
<branch module="automake/automake-1.16.5.tar.xz"
148-
version="1.16.5"
149-
hash="sha256:f01d58cd6d9d77fbdca9eb4bbd5ead1988228fdb73d6f7a201f5f8d6b118b469"
122+
<branch module="automake/automake-1.17.tar.xz"
123+
version="1.17"
124+
hash="sha256:8920c1fc411e13b90bf704ef9db6f29d540e76d232cb3b2c9f4dc4cc599bd990"
150125
repo="ftp.gnu.org" />
151126
<dependencies>
152127
<dep package="autoconf" />
153128
</dependencies>
154129
</autotools>
155-
<!---->
156130
<meson id="pkgconf"
157-
mesonargs="-Dwith-system-libdir=/usr/lib -Dwith-system-includedir=/usr/include" >
158-
<branch module="pkgconf-2.2.0.tar.xz"
159-
version="2.2.0"
160-
hash="sha256:b06ff63a83536aa8c2f6422fa80ad45e4833f590266feb14eaddfe1d4c853c69"
161-
repo="pkgconf" >
162-
<patch file="pkgconf-link-pkg-config.patch" strip="1" />
131+
mesonargs="-Dwith-system-libdir=/usr/lib -Dwith-system-includedir=/usr/include">
132+
<branch module="pkgconf-2.3.0.tar.xz"
133+
version="2.3.0"
134+
hash="sha256:3a9080ac51d03615e7c1910a0a2a8df08424892b5f13b0628a204d3fcce0ea8b"
135+
repo="pkgconf">
136+
<patch file="pkgconf-link-pkg-config.patch"
137+
strip="1" />
163138
</branch>
164139
</meson>
165-
<!--
166-
macOS provides 2.3 (presumably the last GPL2 version, gstreamer
167-
requires 2.4.
168-
-->
140+
<!-- macOS provides 2.3 (presumably the last GPL2 version, gstreamer requires 2.4. -->
169141
<autotools id="bison"
170142
autogen-sh="configure">
171143
<branch module="bison/bison-3.8.2.tar.xz"
172144
version="3.8.2"
173145
hash="sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2"
174146
repo="ftp.gnu.org" />
175147
<dependencies>
176-
<dep package='flex' />
148+
<dep package="flex" />
177149
</dependencies>
178150
</autotools>
179-
<!--
180-
As of 29 March 2021 Flex hasn't had an update since May 2017.
181-
-->
151+
<!-- As of 29 March 2021 Flex hasn't had an update since May 2017. -->
182152
<autotools id="flex"
183153
autogen-sh="configure"
184154
autogenargs="--disable-libfl">
@@ -187,13 +157,11 @@
187157
hash="sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995"
188158
repo="github" />
189159
</autotools>
190-
<!--
191-
This is generated by tarring up the needed docbook stylesheets
192-
for gtk-doc to work. If someone wants to work on a setup that
193-
uses the real docbook source from upstream, feel free to do so,
194-
it used to be a huge amount of work, but might be easier these
195-
days.
196-
-->
160+
<!-- This is generated by tarring up the needed docbook stylesheets
161+
for gtk-doc to work. If someone wants to work on a setup that
162+
uses the real docbook source from upstream, feel free to do so,
163+
it used to be a huge amount of work, but might be easier these
164+
days. -->
197165
<autotools id="gtk-osx-docbook"
198166
autogen-sh="configure"
199167
supports-non-srcdir-builds="no">
@@ -202,19 +170,17 @@
202170
hash="sha256:fcf497688a1d531b192301bd09c55adefda5a662729a58eb8a895166e38ef219"
203171
repo="github" />
204172
</autotools>
205-
<!---->
206173
<autotools id="intltool"
207174
autogen-sh="configure">
208175
<branch module="0.51.0/+download/intltool-0.51.0.tar.gz"
209176
version="0.51.0"
210177
hash="sha256:67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd"
211178
repo="intltool" />
212179
</autotools>
213-
<!---->
214180
<metamodule id="meta-bootstrap">
215181
<dependencies>
216182
<dep package="xz" />
217-
<dep package="libiconv"/>
183+
<dep package="libiconv" />
218184
<dep package="gettext" />
219185
<dep package="cmake" />
220186
<dep package="autoconf-archive" />
@@ -228,5 +194,4 @@
228194
<dep package="gnumake" />
229195
</dependencies>
230196
</metamodule>
231-
<!---->
232197
</moduleset>

0 commit comments

Comments
 (0)