summaryrefslogtreecommitdiff
path: root/strata
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2017-07-04 12:21:10 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2017-07-11 15:49:15 +0000
commit009aa6c8fb67516a14f329367d0a4942003b6a85 (patch)
tree3e850082dd021bf30b05a985e3cb218aa6fb9264 /strata
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.
Diffstat (limited to 'strata')
-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
11 files changed, 42 insertions, 19 deletions
diff --git a/strata/NetworkManager-common.morph b/strata/NetworkManager-common.morph
index 720a277f..28a0f3bb 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 9b9a93de..4964fa2e 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 8d8f5d7d..d9defc76 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 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
diff --git a/strata/glib-common.morph b/strata/glib-common.morph
index 218c206e..fd1018a3 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 8b1c7b00..e1090557 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 280d671e..dd429739 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 a2df41cd..c9b8fc20 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 00000000..89ee1961
--- /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 cdcfae4c..5db5868e 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