summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2017-07-04 12:21:10 (GMT)
committerSam Thursfield <sam.thursfield@codethink.co.uk>2017-07-11 15:49:15 (GMT)
commit009aa6c8fb67516a14f329367d0a4942003b6a85 (patch)
tree3e850082dd021bf30b05a985e3cb218aa6fb9264
parent2a6ed6a55e03b6ff214f9f42b5b7e175300ad52f (diff)
downloaddefinitions-009aa6c8fb67516a14f329367d0a4942003b6a85.tar.gz
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.
-rw-r--r--gnome/strata/gnome.morph88
-rw-r--r--gnome/strata/gnome/autoconf-archive.morph3
-rw-r--r--gnome/strata/gnome/network-manager-applet.morph5
-rw-r--r--strata/NetworkManager-common.morph5
-rw-r--r--strata/NetworkManager-common/NetworkManager.morph3
-rw-r--r--strata/core.morph4
-rw-r--r--strata/foundation.morph4
-rw-r--r--strata/foundation/libgcrypt.morph5
-rw-r--r--strata/glib-common.morph4
-rw-r--r--strata/gtk-deps.morph4
-rw-r--r--strata/gtk3.morph11
-rw-r--r--strata/input-common.morph9
-rw-r--r--strata/input-common/libinput.morph8
-rw-r--r--strata/wayland-generic.morph4
14 files changed, 96 insertions, 61 deletions
diff --git a/gnome/strata/gnome.morph b/gnome/strata/gnome.morph
index 3a4b393..0743b1c 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 de05f0a..5420b68 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 0000000..8b144ed
--- /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
diff --git a/strata/NetworkManager-common.morph b/strata/NetworkManager-common.morph
index 720a277..28a0f3b 100644
--- a/strata/NetworkManager-common.morph
+++ b/strata/NetworkManager-common.morph
@@ -6,6 +6,7 @@ build-depends:
- morph: strata/device-management.morph
- morph: strata/network-security.morph
- morph: strata/privileges-management.morph
+- morph: strata/python-pygobject.morph
chunks:
- name: libmbim
repo: upstream:libmbim
@@ -38,8 +39,8 @@ chunks:
- name: NetworkManager
morph: strata/NetworkManager-common/NetworkManager.morph
repo: upstream:NetworkManager
- ref: 8f6d416768cf69932999b1fc2ab4231321761657
- unpetrify-ref: 1.2.2
+ ref: 9ed1921ce3b8f1b856d97128913b33c7eeeed6e9
+ unpetrify-ref: 1.8.2
build-depends:
- ModemManager
- libndp
diff --git a/strata/NetworkManager-common/NetworkManager.morph b/strata/NetworkManager-common/NetworkManager.morph
index 9b9a93d..4964fa2 100644
--- a/strata/NetworkManager-common/NetworkManager.morph
+++ b/strata/NetworkManager-common/NetworkManager.morph
@@ -2,7 +2,8 @@ name: NetworkManager
kind: chunk
build-system: autotools
configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --with-session-tracking=systemd --disable-ppp --enable-more-warnings=yes
+- NOCONFIGURE=1 ./autogen.sh
+- PYTHON=python3 ./configure --prefix="$PREFIX" --sysconfdir=/etc --with-session-tracking=systemd --disable-ppp --enable-more-warnings=yes --disable-gtk-doc
system-integration:
ModemManager-misc:
00-enable-NetworkManager-unit:
diff --git a/strata/core.morph b/strata/core.morph
index 8d8f5d7..d9defc7 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -159,8 +159,8 @@ chunks:
- name: gettext-tarball
morph: strata/core/gettext-tarball.morph
repo: upstream:gettext-tarball
- ref: 482840e61f86ca321838a91e902c41d40c098bbb
- unpetrify-ref: gettext-0.19.4
+ ref: 6eb5949dd99d174393465069c2fd0bab32deddcc
+ unpetrify-ref: gettext-0.19.7
build-depends:
- libexpat
- name: git-minimal
diff --git a/strata/foundation.morph b/strata/foundation.morph
index cb8ea2d..50d1e63 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 78018a4..ccd5cb8 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
diff --git a/strata/glib-common.morph b/strata/glib-common.morph
index 218c206..fd1018a 100644
--- a/strata/glib-common.morph
+++ b/strata/glib-common.morph
@@ -18,8 +18,8 @@ chunks:
- name: glib
morph: strata/glib-common/glib.morph
repo: upstream:glib
- ref: ee1434632b1b397e5355ef31a79fc1d8b89156a0
- unpetrify-ref: 2.48.1
+ ref: 90bb8778f2eabf00bee5bff1259c48f1e7b791b8
+ unpetrify-ref: 2.52.3
- name: gobject-introspection
repo: upstream:gobject-introspection
ref: 42bf17a25c7379689fe78f31f332a64e3eded5d2
diff --git a/strata/gtk-deps.morph b/strata/gtk-deps.morph
index 8b1c7b0..e109055 100644
--- a/strata/gtk-deps.morph
+++ b/strata/gtk-deps.morph
@@ -19,8 +19,8 @@ chunks:
- name: gdk-pixbuf
morph: strata/gtk-deps/gdk-pixbuf.morph
repo: upstream:gdk-pixbuf
- ref: 807bdc165f3c560d12326ebfd12820ef3130664b
- unpetrify-ref: 2.34.0
+ ref: d8ae54bc5e3e31d43acf410a6689be2d40567b03
+ unpetrify-ref: 2.36.6
- name: atk
repo: upstream:atk
ref: 5a0a8577d29eba636aa0573c469a6200cc93db30
diff --git a/strata/gtk3.morph b/strata/gtk3.morph
index 280d671..dd42973 100644
--- a/strata/gtk3.morph
+++ b/strata/gtk3.morph
@@ -6,8 +6,15 @@ build-depends:
- morph: strata/wayland-generic.morph
- morph: strata/x-common.morph
chunks:
+- name: libxkbcommon-x11
+ repo: upstream:xorg-lib-libxkbcommon
+ ref: 877fe59ac362b4e9afb2979b6e0bc837950a1dad
+ unpetrify-ref: xkbcommon-0.7.1
+ build-system: autotools
- name: gtk3
morph: strata/gtk3/gtk3.morph
repo: upstream:gtk+
- ref: bbf775301a08b9a578ef7f647bc35fe13e816241
- unpetrify-ref: 3.20.6
+ ref: 74d51e86af1e983e4eab317da87fdcfc70aac32a
+ unpetrify-ref: 3.22.16
+ build-depends:
+ - libxkbcommon-x11
diff --git a/strata/input-common.morph b/strata/input-common.morph
index a2df41c..c9b8fc2 100644
--- a/strata/input-common.morph
+++ b/strata/input-common.morph
@@ -24,13 +24,14 @@ chunks:
build-system: autotools
- name: libwacom
repo: upstream:linuxwacom/libwacom
- ref: c707d0f98c79260cb72b5d2bdded50b4e816e350
- unpetrify-ref: libwacom-0.15
+ ref: 46774c4b0ece2ee326ca5f913303f055de240c64
+ unpetrify-ref: libwacom-0.25
build-system: autotools
- name: libinput
+ morph: strata/input-common/libinput.morph
repo: upstream:libinput
- ref: 45e5847bf3e755532b2b6a62b74b85fcdadf2e36
- unpetrify-ref: 1.2.0
+ ref: 401728a1574ef886ddb7fa19cd8ed196420d7931
+ unpetrify-ref: 1.8.0
build-system: autotools
build-depends:
- mtdev
diff --git a/strata/input-common/libinput.morph b/strata/input-common/libinput.morph
new file mode 100644
index 0000000..89ee196
--- /dev/null
+++ b/strata/input-common/libinput.morph
@@ -0,0 +1,8 @@
+name: libinput
+kind: chunk
+
+build-system: autotools
+
+configure-commands:
+ - NOCONFIGURE=1 ./autogen.sh
+ - ./configure --prefix="$PREFIX" --disable-documentation --disable-debug-gui --disable-tests
diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph
index cdcfae4..5db5868 100644
--- a/strata/wayland-generic.morph
+++ b/strata/wayland-generic.morph
@@ -10,8 +10,8 @@ chunks:
unpetrify-ref: 1.11.0
- name: wayland-protocols
repo: upstream:wayland-protocols
- ref: 65d09ef404fb26cb513f4f836e904f415c425a8f
- unpetrify-ref: "1.4"
+ ref: 26c99346ab5f2273fe5581bc4f6397bbb834f747
+ unpetrify-ref: "1.8"
build-system: autotools
build-depends:
- wayland