From 009aa6c8fb67516a14f329367d0a4942003b6a85 Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam.thursfield@codethink.co.uk>
Date: Tue, 4 Jul 2017 12:21:10 +0000
Subject: Update GNOME and GTK+/Clutter stack to latest

This began due to build issues in Clutter with GCC 7, and turned
into a wide-ranging update of GNOME components. Many of these are
needed due to deprecation warnings introduced by the GTK+ upgrade.

The Gettext and GLIB upgrades are needed by GTK+.

The libgdata upgrade was due to deprecation warnings triggered by
GTK+ and this now pulls in autoconf-archive.

Upgrading Clutter requires upgrading Mutter, which in turn requires
new libinput. Note that libinput also required an upgrade to
linux-api-headers (done before). I have updated to Mutter 3.22.3
rather than 3.24 to avoid having to upgrade xrandr.

WebKit has a bug that causes compile failures with GCC 7:
<https://bugs.webkit.org/show_bug.cgi?id=167642>.

The gcrypt upgrade is required to build new WebKit.

gnome-control-center needed to be upgraded which in turn
pulls in network-manager-applet.
---
 gnome/strata/gnome.morph                        | 88 +++++++++++++------------
 gnome/strata/gnome/autoconf-archive.morph       |  3 +
 gnome/strata/gnome/network-manager-applet.morph |  5 ++
 3 files changed, 54 insertions(+), 42 deletions(-)
 create mode 100644 gnome/strata/gnome/network-manager-applet.morph

(limited to 'gnome/strata')

diff --git a/gnome/strata/gnome.morph b/gnome/strata/gnome.morph
index 3a4b3931..0743b1c7 100644
--- a/gnome/strata/gnome.morph
+++ b/gnome/strata/gnome.morph
@@ -38,14 +38,14 @@ chunks:
 - name: clutter
   morph: gnome/strata/gnome/clutter.morph
   repo: upstream:gnome/clutter
-  ref: 8e52f8c61ef2192eaf7f2208a922d3530df47d9b
-  unpetrify-ref: master
+  ref: 2faa83baf3ce9b9c94635311ad79944ab2a73c84
+  unpetrify-ref: 1.26.2
   build-depends:
   - cogl
 - name: clutter-gtk
   repo: upstream:gnome/clutter-gtk
-  ref: 56b09d02f71aa38f9496226641850e6ecf14ef70
-  unpetrify-ref: 1.6.6
+  ref: d48408a24672fa553034a0b3749bee930ad7c49d
+  unpetrify-ref: 1.8.2
   build-system: autotools
   build-depends:
   - clutter
@@ -59,8 +59,8 @@ chunks:
   - clutter-gtk
 - name: gsettings-desktop-schemas
   repo: upstream:gnome/gsettings-desktop-schemas
-  ref: db40812cd79f64c98432efd1b632c5633a27f77e
-  unpetrify-ref: master
+  ref: a5c759a1d9d7e4825f94da30f0f8fb8abc2e3efb
+  unpetrify-ref: 3.24.0
   build-system: autotools
 - name: itstool
   repo: upstream:itstool
@@ -89,8 +89,8 @@ chunks:
   build-system: autotools
 - name: gnome-desktop
   repo: upstream:gnome/gnome-desktop
-  ref: 09d331adeb23aea7ec058dfb39c5224ebe8ae8f6
-  unpetrify-ref: 3.18.2
+  ref: 3feec7a250265747f204e220f7acfe6b8d849dca
+  unpetrify-ref: 3.24.2
   build-depends:
   - gsettings-desktop-schemas
   - iso-codes
@@ -205,8 +205,8 @@ chunks:
 - name: gnome-settings-daemon
   morph: gnome/strata/gnome/gnome-settings-daemon.morph
   repo: upstream:gnome-settings-daemon
-  ref: 8d4904fb35e8aa8b9b0b135b6026464c8e40d254
-  unpetrify-ref: baserock/3.18.0/disable_wacom
+  ref: 2ff67385f2b7c7adb0ab438cb41d114235a8e40a
+  unpetrify-ref: GNOME_SETTINGS_DAEMON_3_24_2
   build-depends:
   - colord
   - gnome-desktop
@@ -263,23 +263,17 @@ chunks:
   ref: 07237ff25d6171e1b548118442ddba4259a53ba5
   unpetrify-ref: master
   build-system: autotools
-- name: libxkbcommon-x11
-  repo: upstream:xorg-lib-libxkbcommon
-  ref: c43c3c866eb9d52cd8f61e75cbef1c30d07f3a28
-  unpetrify-ref: xkbcommon-0.5.0
-  build-system: autotools
 - name: mutter
   morph: gnome/strata/gnome/mutter.morph
   repo: upstream:mutter
-  ref: b975676c5ddd9401d4acfc4d0b9317dd8956656b
-  unpetrify-ref: baserock/3.18.0-25-gb975676
+  ref: a8b06afba6e9210171303bfef13f5bbddecc3668
+  unpetrify-ref: 3.22.4
   build-depends:
   - clutter
   - cogl
   - gnome-desktop
   - gnome-settings-daemon
   - gsettings-desktop-schemas
-  - libxkbcommon-x11
   - startup-notification
   - upower
   - zenity
@@ -306,15 +300,15 @@ 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
   morph: gnome/strata/gnome/gnome-online-accounts.morph
   repo: upstream:gnome/gnome-online-accounts
-  ref: d08463aefde22f36898f4e79798d365359e57614
-  unpetrify-ref: 3.18.1
+  ref: f5169b28bfef03f0c82b538784bb4c66a2a0034c
+  unpetrify-ref: 3.24.1
   build-depends:
   - librest
   - telepathy-glib
@@ -327,12 +321,18 @@ chunks:
   ref: 9ff9d2902caf8a85c5019c11214d73e67053ba69
   unpetrify-ref: liboauth-0.9.7
   build-system: autotools
+- name: autoconf-archive
+  morph: gnome/strata/gnome/autoconf-archive.morph
+  repo: upstream:autoconf-archive
+  ref: 77e8330ea91e1f2be52ea8d348c72f56f1337dfb
+  unpetrify-ref: baserock/v2017.03.21
 - name: libgdata
   morph: gnome/strata/gnome/libgdata.morph
   repo: upstream:libgdata
-  ref: ed52192fcd3cde2c0d7f0ab0d9e300fcdbc373a8
-  unpetrify-ref: baserock/LIBGDATA_0_17_3-16-ged52192
+  ref: 19f9f9420146bc51c7dc6dba2102c7d94bae149a
+  unpetrify-ref: 0.17.8
   build-depends:
+  - autoconf-archive
   - gnome-online-accounts
   - liboauth
 - name: krb5
@@ -394,9 +394,10 @@ chunks:
   - gnome-online-accounts
   - librest
 - name: network-manager-applet
+  morph: gnome/strata/gnome/network-manager-applet.morph
   repo: upstream:gnome/network-manager-applet
-  ref: bbcc673af29066cfc6f0e12f04c0dd3f9937fb3a
-  unpetrify-ref: baserock/0.9.10-beta1-344-gbbcc673
+  ref: 04e2bd752b231bdd87fe3b83a6e540ee812144ad
+  unpetrify-ref: 1.8.2
   build-system: autotools
   build-depends:
   - iso-codes
@@ -600,13 +601,13 @@ chunks:
   - telepathy-glib
 - name: grilo
   repo: upstream:gnome/grilo
-  ref: e470c0cd72231d2a86f419a584df3d635bc6b62f
-  unpetrify-ref: baserock/grilo-0.2.14-17-ge470c0c
+  ref: 53b44b711a4558c0511dbe73d928971fd2c7bb30
+  unpetrify-ref: grilo-0.3.3
   build-system: autotools
 - name: grilo-plugins
   repo: upstream:gnome/grilo-plugins
-  ref: e23b0fa5f6656d53b977693bf55174bd2ccd172d
-  unpetrify-ref: baserock/grilo-plugins-0.2.16-17-ge23b0fa
+  ref: 9e4026978b4069468a6fe6d3e961c4d1a9c88051
+  unpetrify-ref: grilo-0.3.4
   build-system: autotools
   build-depends:
   - gnome-online-accounts
@@ -622,8 +623,8 @@ chunks:
   build-system: autotools
 - name: gnome-bluetooth
   repo: upstream:gnome/gnome-bluetooth
-  ref: eb2558d45518f7c23c20fa7b13639f013810494e
-  unpetrify-ref: GNOMEBT_V_3_18_0
+  ref: 9219cc1ab433d3237b46146cbab2a7d89c5f09b5
+  unpetrify-ref: GNOMEBT_V_3_20_1
   build-system: autotools
   build-depends:
   - libcanberra
@@ -686,8 +687,8 @@ chunks:
 - name: gnome-control-center
   morph: gnome/strata/gnome/gnome-control-center.morph
   repo: upstream:gnome/gnome-control-center
-  ref: 49da7d8089298ba9e15d8e025db606278802d5ac
-  unpetrify-ref: GNOME_CONTROL_CENTER_3_18_0
+  ref: e44054466a35e637e0b8cb88cf676f94a9f40dc8
+  unpetrify-ref: GNOME_CONTROL_CENTER_3_24_2
   build-depends:
   - accountsservice
   - cheese
@@ -765,8 +766,8 @@ chunks:
 - name: epiphany
   morph: gnome/strata/gnome/epiphany.morph
   repo: upstream:gnome/epiphany
-  ref: 5483823ae71fc5280e2fda9e85557362debb0c2e
-  unpetrify-ref: 3.18.1
+  ref: bdaf345ef07f30fc2f9a59967933acc0d6272ae5
+  unpetrify-ref: 3.22.7
   build-depends:
   - appstream-glib
   - gnome-desktop
@@ -776,10 +777,13 @@ chunks:
   - libwnck
   - startup-notification
   - WebKitGtk
+  submodules:
+    libgd:
+      url: upstream:gnome/libgd
 - name: totem
   repo: upstream:gnome/totem
-  ref: dc21ef2e61f7e8a085a0f98eeec808b6424af988
-  unpetrify-ref: V_3_18_1
+  ref: dec87510f22daf87144eda36e1d97bfcabace1d1
+  unpetrify-ref: 3.24.0
   build-system: autotools
   build-depends:
   - appstream-glib
@@ -907,15 +911,15 @@ chunks:
   - libgfbgraph
 - name: gnome-dictionary
   repo: upstream:gnome/gnome-dictionary
-  ref: e36fac6ee47a71c46afdd55f2110c36a22521bb6
-  unpetrify-ref: 3.18.0
+  ref: 902d1e02391486b152e84e36946d437c31040bb8
+  unpetrify-ref: 3.24.0
   build-system: autotools
   build-depends:
   - yelp-tools
 - name: eog
   repo: upstream:gnome/eog
-  ref: d05bdd7dfbe13910f903c8678e923ff6d92cbc86
-  unpetrify-ref: 3.18.1
+  ref: c665b86c19cec9e9ec783adb062c387ddb46958c
+  unpetrify-ref: 3.24.1
   build-system: autotools
   build-depends:
   - gnome-desktop
diff --git a/gnome/strata/gnome/autoconf-archive.morph b/gnome/strata/gnome/autoconf-archive.morph
index de05f0aa..5420b68a 100644
--- a/gnome/strata/gnome/autoconf-archive.morph
+++ b/gnome/strata/gnome/autoconf-archive.morph
@@ -1,5 +1,8 @@
 name: autoconf-archive
 kind: chunk
 build-system: autotools
+
 pre-configure-commands:
+# Disable documentation, as it requires texinfo
+- sed -e '/^SUBDIRS\s\+=\s\+doc.*$/d' Makefile.am -i
 - ./bootstrap.sh
diff --git a/gnome/strata/gnome/network-manager-applet.morph b/gnome/strata/gnome/network-manager-applet.morph
new file mode 100644
index 00000000..8b144ed8
--- /dev/null
+++ b/gnome/strata/gnome/network-manager-applet.morph
@@ -0,0 +1,5 @@
+name: network-manager-applet
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --without-selinux --without-team
-- 
cgit v1.2.1