Skip to content

Commit 0bc79b4

Browse files
dpinophiln
authored andcommitted
[JHBuild] [WPE] Update modules 'wayland' and 'wayland-protocols'
Fix error while building Cog: Run-time dependency wayland-protocols found: YES 1.12 Tools/wpe/cog/platform/wayland/meson.build:94:12: ERROR: Problem encountered: Cannot find protocol text-input-unstable-v3, file does not exist: WPEWebKit/WebKitBuild/DependenciesWPE/Root/share/wayland-protocols/unstable/text-input/text-input-unstable-v3.xml
1 parent 9a849f7 commit 0bc79b4

1 file changed

Lines changed: 20 additions & 6 deletions

File tree

Tools/wpe/jhbuild.modules

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<dep package="libxml2"/>
2525
<dep package="openjpeg"/>
2626
<dep package="shared-mime-info"/>
27+
<dep package="wayland"/>
2728
<dep package="wayland-protocols"/>
2829
<dep package="wpebackend-fdo"/>
2930
<dep package="xdg-dbus-proxy"/>
@@ -41,6 +42,8 @@
4142
href="https://download.gnome.org"/>
4243
<repository type="tarball" name="cairographics.org"
4344
href="http://cairographics.org"/>
45+
<repository type="git" name="git.freedesktop.org"
46+
href="https://gitlab.freedesktop.org"/>
4447
<repository type="tarball" name="freedesktop.org"
4548
href="http://www.freedesktop.org"/>
4649
<repository type="tarball" name="wayland.freedesktop.org"
@@ -225,12 +228,23 @@
225228
version="1.4.3" repo="github-tarball"/>
226229
</autotools>
227230

228-
<autotools id="wayland-protocols" autogen-sh="configure">
229-
<branch module="releases/wayland-protocols-${version}.tar.xz"
230-
version="1.12"
231-
repo="wayland.freedesktop.org"
232-
hash="sha256:3b19e8a9e1e19474756a7069db23b90ca9b8ebb438448c6063b4a7fc89b7c8b2"/>
233-
</autotools>
231+
<meson id="wayland" mesonargs="-Ddocumentation=false -Ddtd_validation=false -Dtests=false">
232+
<pkg-config>wayland-server.pc</pkg-config>
233+
<branch module="wayland/wayland"
234+
version="1.20.0"
235+
tag="1.20.0"
236+
checkoutdir="wayland"
237+
repo="git.freedesktop.org" />
238+
</meson>
239+
240+
<meson id="wayland-protocols">
241+
<pkg-config>wayland-protocols.pc</pkg-config>
242+
<branch module="wayland/wayland-protocols"
243+
version="1.24"
244+
tag="1.24"
245+
checkoutdir="wayland-protocols"
246+
repo="git.freedesktop.org" />
247+
</meson>
234248

235249
<cmake id="openjpeg">
236250
<branch repo="github-tarball"

0 commit comments

Comments
 (0)