Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Reviewed by Žan Doberšek.

Sync pixman version to same version used in Flatpak SDK.

* gtk/jhbuild.modules: Remove pixman '--disable-arm-iwmmxt' build
option since now GCC minimum version is higher than 4.9.
* wpe/jhbuild.modules:

Canonical link: https://commits.webkit.org/254555@main
  • Loading branch information
dpino committed Sep 16, 2022
1 parent 6801b3e commit 9990379
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
13 changes: 5 additions & 8 deletions Tools/gtk/jhbuild.modules
Expand Up @@ -110,15 +110,12 @@
</branch>
</autotools>

<!-- FIXME: Pixman 0.32.6 ARM iwMMXt fast path isn't buildable with GCC 4.9 and
ARM traditional instruction set. It causes a build failure on Raspbian.
This workaround can be removed once we raise the minimum GCC version
for WebKitGTK above 4.9 -->
<autotools id="pixman" autogen-sh="configure"
autogenargs="--enable-gtk=no --disable-arm-iwmmxt">
<branch module="releases/pixman-0.34.0.tar.gz" version="0.34.0"
<autotools id="pixman"
autogen-sh="configure"
autogenargs="--enable-gtk=no">
<branch module="releases/pixman-${version}.tar.gz" version="0.40.0"
repo="cairographics.org"
hash="sha1:a1b1683c1a55acce9d928fea1ab6ceb79142ddc7"/>
hash="sha256:6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc"/>
</autotools>

<autotools id="fonts" supports-non-srcdir-builds="no"
Expand Down
4 changes: 2 additions & 2 deletions Tools/wpe/jhbuild.modules
Expand Up @@ -164,9 +164,9 @@
<autotools id="pixman"
autogen-sh="configure"
autogenargs="--enable-gtk=no">
<branch module="releases/pixman-0.34.0.tar.gz" version="0.34.0"
<branch module="releases/pixman-${version}.tar.gz" version="0.40.0"
repo="cairographics.org"
hash="sha1:a1b1683c1a55acce9d928fea1ab6ceb79142ddc7"/>
hash="sha256:6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc"/>
</autotools>

<autotools id="cairo"
Expand Down

0 comments on commit 9990379

Please sign in to comment.