diff options
Diffstat (limited to 'strata/gnome.morph')
| -rw-r--r-- | strata/gnome.morph | 46 |
1 files changed, 42 insertions, 4 deletions
diff --git a/strata/gnome.morph b/strata/gnome.morph index 3a8e0f64..84d89e0e 100644 --- a/strata/gnome.morph +++ b/strata/gnome.morph @@ -70,17 +70,17 @@ chunks: repo: upstream:yelp-xsl ref: 2dcf168dde754d18152b008473269a803d6e650b unpetrify-ref: master + build-system: autotools build-depends: - itstool - build-system: autotools - name: yelp-tools repo: upstream:yelp-tools ref: 6df6bf24e385bbc1ac0b800be8a6e878f18a775c unpetrify-ref: master + build-system: autotools build-depends: - itstool - yelp-xsl - build-system: autotools - name: iso-codes repo: upstream:iso-codes ref: 18ac112b4b84c8f03743565fde3512a637820761 @@ -223,9 +223,9 @@ chunks: repo: upstream:zenity ref: d7135db2bdfdca812c0165f90e4611af9c7c6a50 unpetrify-ref: master + build-system: autotools build-depends: - yelp-tools - build-system: autotools - name: mozjs24 morph: strata/gnome/mozjs24.morph repo: upstream:mozilla/mozjs24 @@ -235,9 +235,9 @@ chunks: repo: upstream:gjs ref: 5d480f519e2b7e95cf1fad2f9f1a8e798fd5fe49 unpetrify-ref: master + build-system: autotools build-depends: - mozjs24 - build-system: autotools - name: telepathy-glib morph: strata/gnome/telepathy-glib.morph repo: upstream:telepathy-glib @@ -262,6 +262,28 @@ chunks: ref: 07237ff25d6171e1b548118442ddba4259a53ba5 unpetrify-ref: master build-system: autotools +<<<<<<< HEAD +- name: libtasn1 + repo: upstream:libtasn1 + ref: 7f3a9c2294cdebd9e63fe007150c181b980865ef + unpetrify-ref: baserock/gnome + build-system: autotools +- name: p11-kit + morph: strata/gnome/p11-kit.morph + repo: upstream:p11-kit + ref: ec9e2450bafa1cda47525b38a28c8f981f43c1e1 + unpetrify-ref: 0.23.1 + build-depends: + - libtasn1 +- name: gcr + repo: upstream:gnome/gcr + ref: 289ba4859fd170285f51e6bbfe91f2aac3b9170d + unpetrify-ref: 3.18.0 + build-system: autotools + build-depends: + - p11-kit +======= +>>>>>>> ee7c42ae4eca2995a58b3c9d0a298dae6f9684b6 - name: libxkbcommon-x11 repo: upstream:xorg-lib-libxkbcommon ref: c43c3c866eb9d52cd8f61e75cbef1c30d07f3a28 @@ -286,9 +308,25 @@ chunks: repo: upstream:libxklavier ref: 65c132a65e90a42e898f07243ef544109ada53c9 unpetrify-ref: master + build-system: autotools build-depends: - iso-codes +<<<<<<< HEAD +- name: m4-common + repo: upstream:m4-common + ref: 4b704704f5e826b73b79ccfddaf215a510c104c4 + unpetrify-ref: baserock/morph + build-system: autotools +- name: libgee + repo: upstream:gnome/libgee + ref: 4301ab58efc217409c588a5527f68990b4e3d220 + unpetrify-ref: master + build-system: autotools + build-depends: + - m4-common +======= build-system: autotools +>>>>>>> ee7c42ae4eca2995a58b3c9d0a298dae6f9684b6 - name: caribou morph: strata/gnome/caribou.morph repo: upstream:caribou |