diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2017-07-05 11:46:54 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2017-07-05 11:50:38 +0000 |
| commit | 1eb8dced189aef2d9e058579647eace4a9083c9f (patch) | |
| tree | e8d2586af7da9e8bf758a9f724fbccbaaf869b84 | |
| parent | 9da884ef291ca3caf15c3b3a6fd804e033b936ff (diff) | |
| download | definitions-1eb8dced189aef2d9e058579647eace4a9083c9f.tar.gz | |
Update to latest WebKit and gcrypt
WebKit has a bug that causes compile failures with GCC 7:
https://bugs.webkit.org/show_bug.cgi?id=167642
gcrypt upgrade is required to build new WebKit.
| -rw-r--r-- | gnome/strata/gnome.morph | 4 | ||||
| -rw-r--r-- | strata/foundation.morph | 4 | ||||
| -rw-r--r-- | strata/foundation/libgcrypt.morph | 5 |
3 files changed, 9 insertions, 4 deletions
diff --git a/gnome/strata/gnome.morph b/gnome/strata/gnome.morph index 6eaffa34..b8460eb1 100644 --- a/gnome/strata/gnome.morph +++ b/gnome/strata/gnome.morph @@ -306,8 +306,8 @@ chunks: - name: WebKitGtk morph: gnome/strata/gnome/WebKitGtk.morph repo: upstream:WebKitGtk-tarball - ref: a4e969f4965059196ca948db781e52f7cfebf19e - unpetrify-ref: webkitgtk-2.12.3 + ref: 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c + unpetrify-ref: webkitgtk-2.16.5 build-depends: - libnotify - name: gnome-online-accounts diff --git a/strata/foundation.morph b/strata/foundation.morph index cb8ea2dc..50d1e63b 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -42,8 +42,8 @@ chunks: - name: libgcrypt morph: strata/foundation/libgcrypt.morph repo: upstream:libgcrypt - ref: e74d6f537498fea347b6073ba90c55d2693c4696 - unpetrify-ref: baserock/libgcrypt-1.5.5 + ref: b16176769672a659b9a7c1d23325270338323385 + unpetrify-ref: baserock/libgcrypt-1.7.8 build-depends: - libgpg-error - name: systemd diff --git a/strata/foundation/libgcrypt.morph b/strata/foundation/libgcrypt.morph index 78018a48..ccd5cb8a 100644 --- a/strata/foundation/libgcrypt.morph +++ b/strata/foundation/libgcrypt.morph @@ -1,5 +1,10 @@ name: libgcrypt kind: chunk build-system: autotools + pre-configure-commands: - autoreconf -fi + +configure-commands: +# libgcrypt documentation requires fig2dev, which we don't have +- ./configure --prefix="$PREFIX" --disable-doc |