summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Firth <dan.firth@codethink.co.uk>2016-11-28 11:42:40 (GMT)
committerDaniel Firth <dan.firth@codethink.co.uk>2016-11-28 14:34:58 (GMT)
commit226c4e1a1a1067783699e97d62baa98fdeb0a009 (patch)
tree190ddce55b4d95ce2628401a282d2b4d1c83afab
parent41bbc2d71d8eaaef12f41a0200cd691646bce568 (diff)
downloaddefinitions-staging/transitize.tar.gz
Fix several implicitly transitive build-dependencies in gnome-system.staging/transitize
Chunks in strata should declare all build-depends of their sibling chunks explicitly, so that the build tool does not need to overcompensate by bringing them in transitively. These were discovered using a baserock V10 version of ybd and then backported.
-rw-r--r--strata/x-common.morph39
1 files changed, 39 insertions, 0 deletions
diff --git a/strata/x-common.morph b/strata/x-common.morph
index bcb8ad9..a1149ae 100644
--- a/strata/x-common.morph
+++ b/strata/x-common.morph
@@ -160,6 +160,7 @@ chunks:
build-system: autotools
build-depends:
- xcb-libxcb
+ - xorg-lib-libXau
submodules:
m4:
url: upstream:xcb/util-common-m4
@@ -170,6 +171,7 @@ chunks:
build-system: autotools
build-depends:
- xcb-libxcb
+ - xorg-lib-libXau
submodules:
m4:
url: upstream:xcb/util-common-m4
@@ -180,6 +182,7 @@ chunks:
build-system: autotools
build-depends:
- xcb-libxcb
+ - xorg-lib-libXau
submodules:
m4:
url: upstream:xcb/util-common-m4
@@ -190,6 +193,7 @@ chunks:
build-system: autotools
build-depends:
- xcb-libxcb
+ - xorg-lib-libXau
- xcb-util
submodules:
m4:
@@ -206,6 +210,7 @@ chunks:
build-system: autotools
build-depends:
- xcb-libxcb
+ - xorg-lib-libXau
- xorg-lib-libxtrans
- xorg-proto-inputproto
- xorg-proto-kbproto
@@ -218,6 +223,7 @@ chunks:
unpetrify-ref: baserock/morph
build-system: autotools
build-depends:
+ - xcb-libxcb
- xorg-lib-libX11
- xorg-lib-libXau
- xorg-proto-x11proto
@@ -228,6 +234,8 @@ chunks:
unpetrify-ref: libXfixes-5.0.1
build-system: autotools
build-depends:
+ - xcb-libxcb
+ - xorg-lib-libXau
- xorg-lib-libXext
- xorg-proto-fixesproto
- name: xorg-lib-libXi
@@ -236,9 +244,12 @@ chunks:
unpetrify-ref: libXi-1.7.5
build-system: autotools
build-depends:
+ - xcb-libxcb
+ - xorg-lib-libXau
- xorg-lib-libX11
- xorg-lib-libXext
- xorg-lib-libXfixes
+ - xorg-proto-fixesproto
- xorg-proto-inputproto
- xorg-proto-x11proto
- xorg-proto-xextproto
@@ -248,6 +259,8 @@ chunks:
unpetrify-ref: baserock/morph
build-system: autotools
build-depends:
+ - xcb-libxcb
+ - xorg-lib-libXau
- xorg-lib-libX11
- xorg-lib-libXfixes
- xorg-proto-compositeproto
@@ -257,6 +270,8 @@ chunks:
unpetrify-ref: baserock/morph
build-system: autotools
build-depends:
+ - xcb-libxcb
+ - xorg-lib-libXau
- xorg-lib-libX11
- xorg-proto-renderproto
- name: xorg-lib-libXrandr
@@ -265,6 +280,8 @@ chunks:
unpetrify-ref: baserock/morph
build-system: autotools
build-depends:
+ - xcb-libxcb
+ - xorg-lib-libXau
- xorg-lib-libX11
- xorg-lib-libXext
- xorg-lib-libXrender
@@ -287,6 +304,8 @@ chunks:
unpetrify-ref: baserock/morph
build-system: autotools
build-depends:
+ - xcb-libxcb
+ - xorg-lib-libXau
- xorg-lib-libX11
- xorg-lib-libXext
- xorg-lib-libXi
@@ -299,6 +318,8 @@ chunks:
unpetrify-ref: baserock/morph
build-system: autotools
build-depends:
+ - xcb-libxcb
+ - xorg-lib-libXau
- xorg-lib-libXfixes
- xorg-proto-damageproto
- name: xorg-lib-libXcursor
@@ -307,6 +328,7 @@ chunks:
unpetrify-ref: baserock/morph
build-system: autotools
build-depends:
+ - xcb-libxcb
- xorg-lib-libXrender
- xorg-lib-libXfixes
- xorg-proto-fixesproto
@@ -318,6 +340,8 @@ chunks:
unpetrify-ref: libICE-1.0.9
build-system: autotools
build-depends:
+ - xcb-libxcb
+ - xorg-lib-libXau
- xorg-proto-x11proto
- xorg-lib-libxtrans
- name: xorg-lib-libSM
@@ -326,32 +350,45 @@ chunks:
unpetrify-ref: libSM-1.2.2
build-system: autotools
build-depends:
+ - xcb-libxcb
+ - xorg-lib-libXau
+ - xorg-proto-x11proto
- xorg-lib-libICE
+ - xorg-lib-libxtrans
- name: xorg-lib-libXt
repo: upstream:xorg-lib-libXt
ref: e7411e7e5299116604ff1f01d9415802607f1051
unpetrify-ref: libXt-1.1.5
build-system: autotools
build-depends:
+ - xcb-libxcb
+ - xorg-lib-libXau
- xorg-proto-kbproto
- xorg-lib-libX11
- xorg-lib-libSM
+ - xorg-lib-libICE
- name: xorg-lib-libXmu
repo: upstream:xorg-lib-libXmu
ref: 2539e539eafdac88177c8ee30b043c5d52f017e4
unpetrify-ref: libXmu-1.1.2
build-system: autotools
build-depends:
+ - xcb-libxcb
+ - xorg-lib-libXau
- xorg-lib-libX11
- xorg-lib-libXext
- xorg-lib-libXt
- xorg-proto-xextproto
+ - xorg-lib-libICE
+ - xorg-lib-libSM
- name: xorg-lib-libXv
repo: upstream:xorg-lib-libXv
ref: 736d7ac5a94c7aa6761d50ab58339a3d9a116c51
unpetrify-ref: libXv-1.0.10
build-system: autotools
build-depends:
+ - xcb-libxcb
+ - xorg-lib-libXau
- xorg-lib-libX11
- xorg-lib-libXext
- xorg-proto-xextproto
@@ -362,5 +399,7 @@ chunks:
unpetrify-ref: baserock/morph
build-system: autotools
build-depends:
+ - xcb-libxcb
+ - xorg-lib-libXau
- xorg-lib-libX11
- xorg-proto-kbproto