Skip to content

Commit 3f6f644

Browse files
elelayelelay
committed
update to latest upstream
1 parent d18af6b commit 3f6f644

File tree

6 files changed

+187
-174
lines changed

6 files changed

+187
-174
lines changed

‎modulesets/gtk-osx-bootstrap.modules‎

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,12 @@
1212
href="http://www.ijg.org/files/"/>
1313
<repository type="tarball" name="libtiff"
1414
href="http://download.osgeo.org/"/>
15-
<repository type="tarball" name="fontconfig"
16-
href="http://www.freedesktop.org/software/fontconfig/release/"/>
1715
<repository type="tarball" name="icon-theme"
1816
href="http://icon-theme.freedesktop.org/releases/"/>
1917
<repository type="tarball" name="xmlsoft.org"
2018
href="ftp://xmlsoft.org/libxml2/"/>
2119
<repository type="git" name="git.gnome.org"
2220
href="https://gitlab.gnome.org/GNOME"/>
23-
<repository type="tarball" name="harfbuzz"
24-
href="http://www.freedesktop.org/software/harfbuzz/release/"/>
2521
<repository type="tarball" name="itstool" href="http://files.itstool.org/"/>
2622
<repository type="tarball" name="github-tarball" href="https://github.com/"/>
2723
<repository type="tarball" name="ragel"
@@ -137,48 +133,6 @@
137133
hash="sha256:52a3f2209ab95559c1cf0a14f24338001f389615bf00e2585ef3dbc43ecf0a2e"/>
138134
</autotools>
139135

140-
141-
<autotools id="ragel" autogen-sh='autoreconf'>
142-
<branch repo="ragel" module="ragel-6.10.tar.gz" version="6.10">
143-
<patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/ragel-6.9-setiosflags.patch" strip="1"/>
144-
</branch>
145-
</autotools>
146-
147-
<autotools id="harfbuzz" autogen-sh="configure"
148-
autogenargs="--with-coretext --with-icu">
149-
<branch repo="harfbuzz" module="harfbuzz-2.6.4.tar.xz" version="2.6.4"
150-
hash="sha256:9413b8d96132d699687ef914ebb8c50440efc87b3f775d25856d7ec347c03c12">
151-
</branch>
152-
<dependencies>
153-
<dep package="ragel"/>
154-
<dep package="glib"/>
155-
</dependencies>
156-
<after>
157-
<dep package="icu"/>
158-
<dep package="icu55"/>
159-
</after>
160-
</autotools>
161-
162-
<autotools id="freetype" autogen-sh="configure"
163-
skip-autogen="never"
164-
autogenargs="--without-bzip2 --without-harfbuzz">
165-
<branch module="freetype/freetype-2.10.2.tar.gz" version="2.10.2"
166-
repo="sourceforge">
167-
</branch>
168-
<dependencies>
169-
<dep package="zlib"/>
170-
</dependencies>
171-
</autotools>
172-
173-
<autotools id="fontconfig" autogen-sh="autoreconf"
174-
autogenargs="--disable-docs '--with-add-fonts=/System/Library/Fonts,/Library/Fonts,~/Library/Fonts'">
175-
<branch repo="fontconfig" version="2.13.1" module="fontconfig-2.13.1.tar.bz2">
176-
</branch>
177-
<dependencies>
178-
<dep package="freetype"/>
179-
</dependencies>
180-
</autotools>
181-
182136
<autotools id="hicolor-icon-theme" autogen-sh="configure"
183137
supports-non-srcdir-builds="no">
184138
<branch module="hicolor-icon-theme-0.15.tar.xz" repo="icon-theme"
@@ -195,12 +149,4 @@
195149
</dependencies>
196150
</metamodule>
197151

198-
<metamodule id="meta-gtk-osx-freetype">
199-
<dependencies>
200-
<dep package="freetype"/>
201-
<dep package="fontconfig"/>
202-
<dep package="harfbuzz"/>
203-
</dependencies>
204-
</metamodule>
205-
206152
</moduleset>

‎modulesets/gtk-osx-network.modules‎

Lines changed: 40 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
<branch repo="ftp.gnu.org" version="3.5.1"
4949
module="nettle/nettle-3.5.1.tar.gz"
5050
hash="sha256:75cca1998761b02e16f2db56da52992aef622bf55a3b45ec538bc2eedadc9419">
51+
<patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/libnettle-cc-for-build-return.patch" strip="1"/>
5152
</branch>
5253
<dependencies>
5354
<dep package="gmp"/>
@@ -71,10 +72,9 @@
7172
<!-- Building with p11-kit support breaks g-ir-scanner, for some weird reason. -->
7273
<autotools id="gnutls" autogen-sh="autoreconf"
7374
autogenargs="--disable-gtk-doc-html --without-p11-kit">
74-
<branch repo="gnutls" version="3.6.12"
75-
hash="sha256:bfacf16e342949ffd977a9232556092c47164bd26e166736cf3459a870506c4b"
76-
module="gcrypt/gnutls/v3.6/gnutls-3.6.12.tar.xz">
77-
<patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/gnutls-yes-weak-imports.patch" strip="1"/>
75+
<branch repo="gnutls" version="3.6.14"
76+
hash="sha256:5630751adec7025b8ef955af4d141d00d252a985769f51b4059e5affa3d39d63"
77+
module="gcrypt/gnutls/v3.6/gnutls-3.6.14.tar.xz">
7878
</branch>
7979
<dependencies>
8080
<dep package="libunistring"/>
@@ -85,29 +85,28 @@
8585
</autotools>
8686

8787
<autotools id="libgcrypt" autogen-sh="configure">
88-
<branch repo="gnutls" version="1.8.5"
89-
hash="sha256:3b4a2a94cb637eff5bdebbcaf46f4d95c4f25206f459809339cdada0eb577ac3"
90-
module="gcrypt/libgcrypt/libgcrypt-1.8.5.tar.bz2"/>
88+
<branch repo="gnutls" version="1.8.6"
89+
hash="sha256:626aafee84af9d2ce253d2c143dc1c0902dda045780cc241f39970fc60be05bc"
90+
module="gcrypt/libgcrypt/libgcrypt-1.8.6.tar.bz2"/>
9191
</autotools>
9292

93-
<autotools id="glib-networking" autogen-sh="configure"
94-
autogenargs="--without-ca-certificates set_more_warnings=no">
95-
<branch module="glib-networking/2.50/glib-networking-2.50.0.tar.xz"
96-
hash="sha256:3f1a442f3c2a734946983532ce59ed49120319fdb10c938447c373d5e5286bee"
97-
version="2.50.0"/>
93+
<meson id="glib-networking" mesonargs="-Dopenssl=enabled">
94+
<branch module="glib-networking/2.65/glib-networking-2.65.1.tar.xz"
95+
hash="sha256:45a4a22651f0268b45c26ab4a16282f06f2995fdaf5aa8d221e535099cdd7783"
96+
version="2.65.1"/>
9897
<dependencies>
9998
<dep package="gnutls"/>
10099
<dep package="glib"/>
101100
</dependencies>
102-
</autotools>
101+
</meson>
103102

104103
<autotools id="libpsl" autogen-sh='configure'>
105104
<branch repo="github-tarball" version="0.21.0"
106105
hash="sha256:41bd1c75a375b85c337b59783f5deb93dbb443fb0a52d257f403df7bd653ee12"
107106
module="rockdaboot/libpsl/releases/download/libpsl-0.21.0/libpsl-0.21.0.tar.gz"/>
108107
</autotools>
109108

110-
<meson id="libsoup" mesonargs="-Dintrospection=disabled">
109+
<meson id="libsoup" mesonargs="-Dvapi=disabled">
111110
<branch module="libsoup/2.68/libsoup-2.68.4.tar.xz" version="2.68.4"
112111
hash="sha256:2d50b12922cc516ab6a7c35844d42f9c8a331668bbdf139232743d82582b3294">
113112
</branch>
@@ -162,7 +161,6 @@
162161
<dep package="enchant"/>
163162
<dep package="icu55"/>
164163
<dep package="libsoup"/>
165-
<dep package="meta-gtk-osx-freetype"/>
166164
</dependencies>
167165
<after>
168166
<dep package="meta-gtk-osx-gtk"/>
@@ -186,7 +184,6 @@
186184
<dep package="enchant"/>
187185
<dep package="icu55"/>
188186
<dep package="libsoup"/>
189-
<dep package="meta-gtk-osx-freetype"/>
190187
</dependencies>
191188
<after>
192189
<dep package="meta-gtk-osx-gtk3"/>
@@ -196,36 +193,46 @@
196193
</autotools>
197194

198195
<!-- This is the stable release of WebKitGTK, for GTK 3.x. Use it if you need
199-
the WebKit2 API (most applications do.)
196+
the WebKit2 API.
200197
ENABLE_MINIBROWSER: This is enabled because it's an easy test of whether the
201198
library is working correctly: run "jhbuild run MiniBrowser".
202-
ENABLE_PLUGIN_PROCESS_GTK2: Requires both GTK 2.x and 3.x. Currently not
203-
supported.
199+
USE_SYSTEMD: macOS doesn't have systemd.
204200
ENABLE_VIDEO, ENABLE_WEB_AUDIO: Requires gstreamer. If you want video and
205201
audio, fix this in your .jhbuildrc-custom. You may need some extra
206202
patches, this is untested.
207-
ENABLE_CREDENTIAL_STORAGE: Requires libsecret. No module for this yet.
208-
ENABLE_GEOLOCATION: Requires geoclue. No module for this yet.
209-
ENABLE_OPENGL: Untested.
210-
USE_LIBNOTIFY: Requires libnotify. No module for this yet.
211-
USE_LIBHYPHEN: Requires libhyphen. No module for this yet.
212-
-->
203+
ENABLE_CREDENTIAL_STORAGE: Requires libsecret. No module for this.
204+
ENABLE_GEOLOCATION: Requires geoclue. No module for this.
205+
ENABLE_GRAPHICS_CONTEXT_GL: Known to not work with quartz.
206+
USE_LIBNOTIFY: Requires libnotify. No module for this.
207+
USE_LIBHYPHEN: Requires libhyphen. No module for this.
208+
USE_LIBSECRET: Requires libsecret. No module for this.
209+
ENABLE_TOUCH_EVENTS: Seems not to be needed.
210+
USE_OPENJPEG: Requires openjpeg. No module for this.
211+
USE_WOFF2: Requires Woff2. No module for this
212+
USE_WPE_RENDERER: For embedded systems, not Macs. -->
213213
<cmake id="webkit2gtk3"
214-
cmakeargs='-DPORT=GTK -DENABLE_X11_TARGET=OFF -DENABLE_QUARTZ_TARGET=ON -DENABLE_INTROSPECTION=OFF -DENABLE_OPENGL=OFF -DENABLE_PLUGIN_PROCESS_GTK2=OFF -DENABLE_VIDEO=OFF -DENABLE_WEB_AUDIO=OFF -DENABLE_GEOLOCATION=OFF -DUSE_LIBNOTIFY=OFF -DUSE_LIBHYPHEN=OFF -DUSE_LIBSECRET=OFF -DENABLE_TOUCH_EVENTS=OFF -DCMAKE_CXX_FLAGS="-stdlib=libc++"'>
215-
<branch repo="webkit.org" module="webkitgtk-2.16.6.tar.xz" version="2.16.6">
216-
<patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/Webkit-2.16-build-without-OpenGL.patch" strip="1"/>
217-
<patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/Webkit-2.16-Fix-some-includes.patch" strip="1"/>
218-
<patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/webkit-2.16-No-stringview-lifetime.patch" strip="1"/>
219-
<patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/webkit-2.16-main-thread.patch" strip="1"/>
220-
214+
cmakeargs='-DPORT=GTK -DENABLE_X11_TARGET=OFF -DENABLE_QUARTZ_TARGET=ON -DENABLE_MINIBROWSER=ON -DENABLE_INTROSPECTION=OFF -DUSE_SYSTEMD=OFF -DENABLE_VIDEO=OFF -DENABLE_WEB_AUDIO=OFF -DENABLE_GEOLOCATION=OFF -DUSE_LIBNOTIFY=OFF -DUSE_LIBHYPHEN=OFF -DUSE_LIBSECRET=OFF -DENABLE_TOUCH_EVENTS=OFF -DUSE_OPENJPEG=OFF -DUSE_WOFF2=OFF -DUSE_WPE_RENDERER=OFF -DENABLE_GRAPHICS_CONTEXT_GL=OFF -DCMAKE_CXX_FLAGS="-stdlib=libc++" -DCMAKE_MACOSX_RPATH=OFF'>
215+
<branch repo="webkit.org" module="webkitgtk-2.30.2.tar.xz" version="2.30.2">
216+
<patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/patch-webkit2gtk-macports.diff" strip="0"/>
217+
<patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/patch-webkit2gtk-272-macports.diff" strip="0"/>
218+
<patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/patch-webkit2gtk-2282-unprotected-egl-changes.diff" strip="0"/>
219+
<patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/patch-webkit2gtk-2282-os-log-availability.diff" strip="0"/>
220+
<patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/patch-bundle-link-webcore.diff" strip="0"/>
221+
<patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/webkit-clang-fixes.patch" strip="0"/>
222+
<patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/0001-Prevent-WebKitWebProcess-from-being-in-the-dock-or-p.patch" strip="1"/>
223+
<patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/WebKit2Gtk3-2.30.1-Disable-AUDIT_TOKEN-for-Gtk-builds.patch" strip="1"/>
224+
<patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/WebKit2Gtk3-2.30.1-Disable-WebKitGenericCueAPIEnabled.patch" strip="1"/>
225+
<patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/WebKit2Gtk3-2.30.1-Enable-and-fix-build-of-JSCustomXPathNSResolver.patch" strip="1"/>
226+
<patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/WebKit2Gtk3-2.30.1-Extend-UNIX_DOMAIN_SOCKETS-precedence-over-Mac-and-Win.patch" strip="1"/>
227+
<patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/WebKit2Gtk3-2.30.1-Fix-Socket-signal-defines-for-Darwin-and-maybe-BSD.patch" strip="1"/>
228+
<patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/WebKit2Gtk3-2.30.1-Force-FindICU-instead-of-inserting-heade.patch" strip="1"/>
221229
</branch>
222230
<dependencies>
223231
<dep package="libwebp"/>
224232
<dep package="enchant"/>
225233
<dep package="icu"/>
226234
<dep package="libsoup"/>
227235
<dep package="libgcrypt"/>
228-
<dep package="meta-gtk-osx-freetype"/>
229236
</dependencies>
230237
<after>
231238
<dep package="meta-gtk-osx-gtk3"/>

‎modulesets/gtk-osx-python.modules‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@
9494
</autotools>
9595

9696
<autotools id="python3" autogenargs="--enable-shared" autogen-sh="configure">
97-
<branch repo="python" module="3.8.2/Python-3.8.2.tar.xz" version="3.8.2"
98-
hash="sha256:2646e7dc233362f59714c6193017bb2d6f7b38d6ab4a0cb5fbac5c36c4d845df"
97+
<branch repo="python" module="3.8.5/Python-3.8.5.tar.xz" version="3.8.5"
98+
hash="md5:35b5a3d0254c1c59be9736373d429db7"
9999
/>
100100
<dependencies>
101101
<dep package='readline'/>

‎modulesets/gtk-osx-random.modules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ Libglade itself is deprecated. This is the last release. -->
254254
</dependencies>
255255
</autotools>
256256

257-
<autotools id="gtkspell3" autogen-sh="configure">
257+
<autotools id="gtkspell3" autogen-sh="configure" autogenargs="--enable-vala=no">
258258
<branch module="gtkspell/gtkspell3-3.0.9.tar.xz" repo="sourceforge"
259259
version="3.0.9">
260260
<patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/0001-Enable-use-of-XDG_DATA_DIRS-for-locating-iso-code-fi.patch" strip="1"/>

0 commit comments

Comments
 (0)