summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Dale <richard.dale@codethink.co.uk>2014-11-18 12:54:24 (GMT)
committerRichard Dale <richard.dale@codethink.co.uk>2014-11-25 16:35:35 (GMT)
commit788ed3bc536839379e355520a016ab10d4cc31de (patch)
tree2946bf0842d02265e435fd25cf1f20eee1325160
parentdc132d3d9880c65d4630ca298f5ea0d405639b75 (diff)
downloaddefinitions-788ed3bc536839379e355520a016ab10d4cc31de.tar.gz
Update refs of Qt5 chunks to Qt5.3.2
Split off QtWebKit and QtMultimedia into their own strata Update refs of Enligtement chunks to the current release Fix refs to point to current releases
-rw-r--r--strata/c2man/c2man.morph11
-rw-r--r--strata/enlightenment.morph45
-rw-r--r--strata/enlightenment/bullet3.morph8
-rw-r--r--strata/enlightenment/efl.morph5
-rw-r--r--strata/lua.morph7
-rw-r--r--strata/lua/luajit2.morph7
-rw-r--r--strata/qt5-sdk.morph9
-rw-r--r--strata/qt5-sdk/qt-creator.morph1
-rw-r--r--strata/qt5-tools-qtmultimedia.morph13
-rw-r--r--strata/qt5-tools-qtwebkit.morph35
-rw-r--r--strata/qt5-tools.morph153
-rw-r--r--strata/qt5-tools/qtbase.morph2
-rw-r--r--strata/qt5-tools/qtconnectivity.morph10
-rw-r--r--strata/qt5-tools/qtlocation.morph10
-rw-r--r--strata/qt5-tools/qtwebsockets.morph10
-rw-r--r--systems/qt5-devel-system-x86_64-generic.morph6
16 files changed, 204 insertions, 128 deletions
diff --git a/strata/c2man/c2man.morph b/strata/c2man/c2man.morph
new file mode 100644
index 0000000..93390d2
--- /dev/null
+++ b/strata/c2man/c2man.morph
@@ -0,0 +1,11 @@
+name: c2man
+kind: chunk
+configure-commands:
+- ./Configure -d -e
+build-commands:
+- make LEX=flex
+install-commands:
+- mkdir -p $DESTDIR$PREFIX/bin
+- mkdir -p $DESTDIR$PREFIX/lib
+- mkdir -p $DESTDIR$PREFIX/man
+- make install bin=$DESTDIR$PREFIX/bin privlib=$DESTDIR$PREFIX/lib/c2man mansrc=$DESTDIR$PREFIX/man
diff --git a/strata/enlightenment.morph b/strata/enlightenment.morph
index 7ef6e22..7f3fe25 100644
--- a/strata/enlightenment.morph
+++ b/strata/enlightenment.morph
@@ -6,42 +6,62 @@ build-depends:
- morph: strata/x-generic.morph
- morph: strata/lua.morph
- morph: strata/audio-bluetooth.morph
-- morph: strata/multimedia-gstreamer-0.10.morph
+- morph: strata/multimedia.morph
- morph: strata/connman-common.morph
chunks:
+- name: luajit2
+ morph: strata/lua/luajit2.morph
+ repo: upstream:luajit2
+ ref: 880ca300e8fb7b432b9d25ed377db2102e4cb63d
+ unpetrify-ref: v2.0.3
+ build-depends: []
+- name: fribidi
+ repo: upstream:fribidi
+ ref: c9916f2ab289126a32febcc4754efc73a011fb0c
+ unpetrify-ref: baserock/morph/0.19.6
+ build-depends: []
+- name: bullet3
+ morph: strata/enlightenment/bullet3.morph
+ repo: upstream:bullet3
+ ref: 940059ddb3c4476bb9860f79f35b0b1230857f54
+ unpetrify-ref: baserock/morph
+ build-depends: []
- name: efl
morph: strata/enlightenment/efl.morph
repo: upstream:enlightenment/efl
- ref: 8f9b565e79552f09a39507ce802786b1fe773d2d
- unpetrify-ref: baserock/morph
- build-depends: []
+ ref: 3013a7c5cbd728dd9bc5516ffb4bd4f505888bd4
+ unpetrify-ref: v1.12.0
+ build-depends:
+ - bullet3
+ - fribidi
+ - luajit2
- name: elementary
morph: strata/enlightenment/elementary.morph
repo: upstream:enlightenment/elementary
- ref: e4c97ddffea9c91a291e1a6a7c6ebd1bbf47629a
- unpetrify-ref: baserock/morph
+ ref: c4fbbbf984b7bd1553191c26459bce4589122ad5
+ unpetrify-ref: v1.12.0
build-depends:
- efl
- name: evas_generic_loaders
morph: strata/enlightenment/evas_generic_loaders.morph
repo: upstream:enlightenment/evas_generic_loaders
- ref: ddbdaa35201f4ef64f1a3f3b067a99e84c14565a
- unpetrify-ref: baserock/morph
+ ref: 5d4415ec1e64930452f7d17cbec4c28a0efa8402
+ unpetrify-ref: v1.12.0
build-depends:
- efl
- name: enlightenment
morph: strata/enlightenment/enlightenment.morph
repo: upstream:enlightenment/enlightenment
- ref: 041b8d14a22f9e4c7f34abe8b0f9a3a1f5933146
- unpetrify-ref: baserock/morph
+ ref: 55165e2576823780a1053b03c5230cc8df8957b5
+ unpetrify-ref: v0.19.1
build-depends:
- efl
- elementary
- name: imlib2
morph: strata/enlightenment/imlib2.morph
repo: upstream:enlightenment/imlib2
- ref: 6d02661a4c57771888304960ce62d4fdf587be8f
- unpetrify-ref: baserock/morph
+ ref: f2f20dc5791a175be398a17fcdc4852a79079d47
+ unpetrify-ref: baserock/1.4.6
build-depends:
- efl
- elementary
@@ -50,7 +70,6 @@ chunks:
morph: strata/enlightenment/libast.morph
repo: upstream:enlightenment/libast
ref: 0dbc0a5df55474bf61ca166be40e8de2d9e3a031
- unpetrify-ref: baserock/morph
build-depends:
- efl
- elementary
diff --git a/strata/enlightenment/bullet3.morph b/strata/enlightenment/bullet3.morph
new file mode 100644
index 0000000..74cb097
--- /dev/null
+++ b/strata/enlightenment/bullet3.morph
@@ -0,0 +1,8 @@
+name: bullet
+kind: chunk
+configure-commands:
+- cmake -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_SHARED_LIBS=ON
+build-commands:
+- make
+install-commands:
+- make DESTDIR="$DESTDIR" install
diff --git a/strata/enlightenment/efl.morph b/strata/enlightenment/efl.morph
index ca1c0b5..b2a013a 100644
--- a/strata/enlightenment/efl.morph
+++ b/strata/enlightenment/efl.morph
@@ -1,9 +1,8 @@
name: efl
kind: chunk
configure-commands:
-- ./autogen.sh --prefix=/usr --with-tests=none --disable-fribidi --disable-image-loader-gif
- --disable-image-loader-tiff --disable-pulseaudio --disable-gstreamer --disable-audio
- --disable-physics
+- ./autogen.sh --prefix=/usr --with-tests=none --disable-image-loader-gif --enable-systemd
+ --disable-image-loader-tiff
build-commands:
- make VPATH=/usr/lib64
install-commands:
diff --git a/strata/lua.morph b/strata/lua.morph
index 5ac3102..b7ccba1 100644
--- a/strata/lua.morph
+++ b/strata/lua.morph
@@ -10,3 +10,10 @@ chunks:
ref: 948063437e0350d9ef1649ec3a76d0c24a5c8642
unpetrify-ref: baserock/5.1-morph
build-depends: []
+- name: luajit2
+ morph: strata/lua/luajit2.morph
+ repo: upstream:lua
+ repo: upstream:luajit2
+ ref: master
+ build-depends:
+ - lua
diff --git a/strata/lua/luajit2.morph b/strata/lua/luajit2.morph
new file mode 100644
index 0000000..72f34f0
--- /dev/null
+++ b/strata/lua/luajit2.morph
@@ -0,0 +1,7 @@
+name: luajit2
+kind: chunk
+build-commands:
+- make PREFIX="$PREFIX"
+install-commands:
+- make install PREFIX="$PREFIX" DESTDIR="$DESTDIR"
+
diff --git a/strata/qt5-sdk.morph b/strata/qt5-sdk.morph
index f0b3cc2..0d877a6 100644
--- a/strata/qt5-sdk.morph
+++ b/strata/qt5-sdk.morph
@@ -3,16 +3,11 @@ kind: stratum
description: Qt5 Desktop Environment, IDE and Example Apps
build-depends:
- morph: strata/qt5-tools.morph
+- morph: strata/qt5-tools-qtwebkit.morph
chunks:
- name: qt-creator
morph: strata/qt5-sdk/qt-creator.morph
repo: upstream:qt-creator
- ref: d5a6b10634c1a3271012e9578e016772ef077d59
+ ref: v3.2.1
unpetrify-ref: baserock/morph/2.7
build-depends: []
-- name: snowshoe
- morph: strata/qt5-sdk/snowshoe.morph
- repo: upstream:snowshoe
- ref: 098f931de58072edd5d591cdc4a2ad3c05e83991
- unpetrify-ref: baserock/morph
- build-depends: []
diff --git a/strata/qt5-sdk/qt-creator.morph b/strata/qt5-sdk/qt-creator.morph
index 76d9f7d..91fae58 100644
--- a/strata/qt5-sdk/qt-creator.morph
+++ b/strata/qt5-sdk/qt-creator.morph
@@ -6,4 +6,3 @@ build-commands:
- make
install-commands:
- make install INSTALL_ROOT=$DESTDIR
-- ./qhelpgenerator.sh
diff --git a/strata/qt5-tools-qtmultimedia.morph b/strata/qt5-tools-qtmultimedia.morph
new file mode 100644
index 0000000..6482db6
--- /dev/null
+++ b/strata/qt5-tools-qtmultimedia.morph
@@ -0,0 +1,13 @@
+name: qt5-tools-qtmultimedia
+kind: stratum
+description: Qt5 QtMultimedia Development Libraries and Tools
+build-depends:
+- morph: strata/qt5-tools.morph
+- morph: strata/multimedia-gstreamer-0.10.morph
+chunks:
+- name: qtmultimedia
+ morph: strata/qt5-tools/qtmultimedia.morph
+ repo: upstream:qt5/qtmultimedia
+ ref: b3c2dca466042cf362ffb8d803bf05c9b8a0f95f
+ unpetrify-ref: v5.3.2
+ build-depends: []
diff --git a/strata/qt5-tools-qtwebkit.morph b/strata/qt5-tools-qtwebkit.morph
new file mode 100644
index 0000000..1d74694
--- /dev/null
+++ b/strata/qt5-tools-qtwebkit.morph
@@ -0,0 +1,35 @@
+name: qt5-tools-qtwebkit
+kind: stratum
+description: Qt5 WebKit Development Libraries and Tools
+build-depends:
+- morph: strata/multimedia.morph
+- morph: strata/qt5-tools.morph
+- morph: strata/ruby.morph
+chunks:
+- name: qtwebkit
+ morph: strata/qt5-tools/qtwebkit.morph
+ repo: upstream:qt5/qtwebkit
+ ref: 13f80d34ae84c3231118c8013beee55badab8929
+ unpetrify-ref: v5.3.2
+ build-depends: []
+- name: qtwebkit-examples
+ morph: strata/qt5-tools/qtwebkit-examples.morph
+ repo: upstream:qt5/qtwebkit-examples
+ ref: bce5056b9e16a943357e362455a46685d3f22093
+ unpetrify-ref: v5.3.2
+ build-depends:
+ - qtwebkit
+- name: qttools
+ morph: strata/qt5-tools/qttools.morph
+ repo: upstream:qt5/qttools
+ ref: 8c79a098b8b7da4832ebca1884ee833a2c2078a7
+ unpetrify-ref: v5.3.2
+ build-depends:
+ - qtwebkit
+- name: qttranslations
+ morph: strata/qt5-tools/qttranslations.morph
+ repo: upstream:qt5/qttranslations
+ ref: cf4d6f7e73bb410ed0aa3d64dffb2b6b242cdfe0
+ unpetrify-ref: v5.3.2
+ build-depends:
+ - qttools
diff --git a/strata/qt5-tools.morph b/strata/qt5-tools.morph
index 1c784bf..34e57bc 100644
--- a/strata/qt5-tools.morph
+++ b/strata/qt5-tools.morph
@@ -4,7 +4,6 @@ description: Qt5 Development Libraries and Tools
build-depends:
- morph: strata/tools.morph
- morph: strata/x-generic.morph
-- morph: strata/multimedia-gstreamer-0.10.morph
chunks:
- name: icu
morph: strata/qt5-tools/icu.morph
@@ -12,179 +11,129 @@ chunks:
ref: ba023548a3bff7277cbea4acade3042ce9d8949e
unpetrify-ref: baserock/morph
build-depends: []
-- name: ruby-1.8
- morph: strata/qt5-tools/ruby-1.8.morph
- repo: upstream:ruby
- ref: 7a24f1710028d568ad61d0aa49d5178260178d77
- unpetrify-ref: baserock/morph/ruby_1_8_7
- build-depends: []
-- name: ruby-1.9
- morph: strata/qt5-tools/ruby-1.9.morph
- repo: upstream:ruby
- ref: cb3ea602294b5038b5f7ac21d3875a2b52342956
- unpetrify-ref: baserock/morph/ruby_1_9_3
- build-depends:
- - ruby-1.8
- name: qtbase
morph: strata/qt5-tools/qtbase.morph
repo: upstream:qt5/qtbase
- ref: 55f24d7e91e7c906cf4e3a3ef7a4d95ff094a7a8
- unpetrify-ref: baserock/morph
+ ref: 05670f586ffe05425b7542a27fcca31bddf231aa
+ unpetrify-ref: v5.3.2
build-depends:
- icu
- name: qtsvg
morph: strata/qt5-tools/qtsvg.morph
repo: upstream:qt5/qtsvg
- ref: 552bf3adcc48c669f9dfbda5818142fb18c9e957
- unpetrify-ref: baserock/morph
- build-depends:
- - qtbase
-- name: qtjsbackend
- morph: strata/qt5-tools/qtjsbackend.morph
- repo: upstream:qt5/qtjsbackend
- ref: c6978bf56f599a3da8c03b1a7e58102aa84223e7
- unpetrify-ref: baserock/morph
+ ref: 35a2f0880831d38c60d2b4820dac808f48f6f3a8
+ unpetrify-ref: v5.3.2
build-depends:
- qtbase
- name: qtscript
morph: strata/qt5-tools/qtscript.morph
repo: upstream:qt5/qtscript
- ref: d20e99b3bdbcf77b69a92a2ba1b3ca1f1379e7c8
- unpetrify-ref: baserock/morph
+ ref: 71f6dee8791c95fd862ca3651d7f4b7d6b9f440e
+ unpetrify-ref: v5.3.2
build-depends:
- qtbase
- - qtjsbackend
- name: qtdeclarative
morph: strata/qt5-tools/qtdeclarative.morph
repo: upstream:qt5/qtdeclarative
- ref: 774d0310883a9526210c4530bbb9d0af26d88699
- unpetrify-ref: baserock/morph
+ ref: a67aa6abc6a406b00ef58a7e07fd39012bfa3eb1
+ unpetrify-ref: v5.3.2
build-depends:
- qtbase
- - qtjsbackend
- qtscript
- name: qtquick1
morph: strata/qt5-tools/qtquick1.morph
repo: upstream:qt5/qtquick1
- ref: b13755a2411dca01e65bb443a399ed130d5dd738
- unpetrify-ref: baserock/morph
+ ref: 8e7fa2b5aa2e2e4371c4b73926d0e6ad2ebdbd96
+ unpetrify-ref: v5.3.2
build-depends:
- qtbase
- - qtjsbackend
- qtscript
- name: qt3d
morph: strata/qt5-tools/qt3d.morph
repo: upstream:qt5/qt3d
- ref: 805fbf45a54f1b69f4b13f6dc9f962b07c017d3b
+ ref: bdb98baf8253c69949a8c259369203da9ffb269c
unpetrify-ref: baserock/morph
build-depends:
- qtbase
- - qtjsbackend
- qtscript
- qtdeclarative
- name: qtquickcontrols
morph: strata/qt5-tools/qtquickcontrols.morph
repo: upstream:qt5/qtquickcontrols
- ref: acf9e50d52c4d09a1aed9490bb2f3c5de7dce9bb
- unpetrify-ref: baserock/morph
+ ref: bc91574cca8b6f24968ab4e1cc11fe1fd10f3061
+ unpetrify-ref: v5.3.2
build-depends:
- qtbase
- - qtjsbackend
- qtdeclarative
- name: qtsensors
morph: strata/qt5-tools/qtsensors.morph
repo: upstream:qt5/qtsensors
- ref: cd22d77e07af6046be24d0322187a86c9a3c4d1d
- unpetrify-ref: baserock/morph
+ ref: fd3e65ef5ab6eb8e4b5bdad380d1f6862799856c
+ unpetrify-ref: v5.3.2
build-depends:
- qtbase
- name: qtserialport
morph: strata/qt5-tools/qtserialport.morph
repo: upstream:qt5/qtserialport
- ref: b1abca2eee45e7b8ecf71cb5cd1e77a2821fcac2
- unpetrify-ref: baserock/morph
+ ref: 286d64c202f461cb8ff5a4cc4c2320af8195b8f0
+ unpetrify-ref: v5.3.2
build-depends:
- qtbase
- name: qtx11extras
morph: strata/qt5-tools/qtx11extras.morph
repo: upstream:qt5/qtx11extras
- ref: 3b33afd2814c88002e2efc4955e5b1851aff0c58
- unpetrify-ref: baserock/morph
- build-depends:
- - qtbase
-- name: qtwebkit
- morph: strata/qt5-tools/qtwebkit.morph
- repo: upstream:qt5/qtwebkit
- ref: 15a558c03ea7a35f97dfc0b16024d026d20920be
- unpetrify-ref: baserock/morph
- build-depends:
- - qtbase
- - icu
- - ruby-1.9
- - qtjsbackend
- - qtdeclarative
-- name: qtwebkit-examples
- morph: strata/qt5-tools/qtwebkit-examples.morph
- repo: upstream:qt5/qtwebkit-examples
- ref: fdaa2bb5e47d6ca1d3e8c681f88eae0b9d4ae351
- unpetrify-ref: baserock/morph
- build-depends:
- - qtbase
- - qtjsbackend
- - qtdeclarative
- - qtwebkit
-- name: qtmultimedia
- morph: strata/qt5-tools/qtmultimedia.morph
- repo: upstream:qt5/qtmultimedia
- ref: 8b73d090f87f88ee3ae4efc437ac866d05df76be
- unpetrify-ref: baserock/morph
+ ref: 2d84caf5ef1b5dace0d678df4581db3c955be6ee
+ unpetrify-ref: v5.3.2
build-depends:
- qtbase
- name: qtxmlpatterns
morph: strata/qt5-tools/qtxmlpatterns.morph
repo: upstream:qt5/qtxmlpatterns
- ref: ed713a904ee55f1c345d2d6c35e77892be96977e
- unpetrify-ref: baserock/morph
+ ref: 78c2367e22d87b529610117f5b6abef6934abdcf
+ unpetrify-ref: v5.3.2
build-depends:
- qtbase
- name: qtdoc
morph: strata/qt5-tools/qtdoc.morph
repo: upstream:qt5/qtdoc
- ref: 674abef4f06bdde57a272d69750e2a4ac5027ea9
- unpetrify-ref: baserock/morph
+ ref: 688019893d2cbd9ccdc4d75c550bca4530a46ee4
+ unpetrify-ref: v5.3.2
build-depends:
- qtbase
- name: qtgraphicaleffects
morph: strata/qt5-tools/qtgraphicaleffects.morph
repo: upstream:qt5/qtgraphicaleffects
- ref: e41d08f95d74d7309fc976cb62141b78239de975
- unpetrify-ref: baserock/morph
+ ref: 82abf6975b6737259ee656564e5ec7f8ad1d0508
+ unpetrify-ref: v5.3.2
build-depends:
- qtbase
- - qtjsbackend
- qtdeclarative
- name: qtimageformats
morph: strata/qt5-tools/qtimageformats.morph
repo: upstream:qt5/qtimageformats
- ref: 3f7f6126d9832e03a4dcaaca5279220f00126e89
- unpetrify-ref: baserock/morph
- build-depends:
- - qtbase
-- name: qttools
- morph: strata/qt5-tools/qttools.morph
- repo: upstream:qt5/qttools
- ref: 1369d91dd095cd4ea2febe759ef6446e41bd2d80
- unpetrify-ref: baserock/morph
- build-depends:
- - qtbase
- - qtjsbackend
- - qtdeclarative
- - qtwebkit
-- name: qttranslations
- morph: strata/qt5-tools/qttranslations.morph
- repo: upstream:qt5/qttranslations
- ref: e91af8e6363a4538f08992b6af51d17b91453080
- unpetrify-ref: baserock/morph
- build-depends:
- - qtbase
- - qttools
+ ref: 85e621e3ecf449bb0587bd4da97ca66179b24f31
+ unpetrify-ref: v5.3.2
+ build-depends:
+ - qtbase
+- name: qtconnectivity
+ morph: strata/qt5-tools/qtconnectivity.morph
+ repo: upstream:qt5/qtconnectivity
+ ref: 8a33a9b43dcc5e7f9a77237a660a3759286e6b86
+ unpetrify-ref: v5.3.2
+ build-depends:
+ - qtbase
+- name: qtlocation
+ morph: strata/qt5-tools/qtlocation.morph
+ repo: upstream:qt5/qtlocation
+ ref: a36d9e67e3b8168cb4d1eb76eda96ebb8242fd20
+ unpetrify-ref: v5.3.2
+ build-depends:
+ - qtbase
+- name: qtwebsockets
+ morph: strata/qt5-tools/qtwebsockets.morph
+ repo: upstream:qt5/qtwebsockets
+ ref: 00f77bdc5beb62e980216cfee906ab7aa1d1c4f7
+ unpetrify-ref: v5.3.2
+ build-depends:
+ - qtbase
+
diff --git a/strata/qt5-tools/qtbase.morph b/strata/qt5-tools/qtbase.morph
index 1427c4c..9b2a20c 100644
--- a/strata/qt5-tools/qtbase.morph
+++ b/strata/qt5-tools/qtbase.morph
@@ -5,6 +5,8 @@ configure-commands:
build-commands:
- make
- touch /qtbase.build/src/corelib/corelib.pro
+- touch /qtbase.build/qmake/qmake.pro
+- touch /qtbase.build/qmake/qmake-docs.pro
- ./bin/qmake -set QDOC /qtbase.build/bin/qdoc
- make html_docs
- ./bin/qmake -unset QDOC
diff --git a/strata/qt5-tools/qtconnectivity.morph b/strata/qt5-tools/qtconnectivity.morph
new file mode 100644
index 0000000..d112371
--- /dev/null
+++ b/strata/qt5-tools/qtconnectivity.morph
@@ -0,0 +1,10 @@
+name: qtconnectivity
+kind: chunk
+configure-commands:
+- qmake
+build-commands:
+- make
+- make html_docs
+install-commands:
+- make install INSTALL_ROOT=$DESTDIR
+- make install_html_docs INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-tools/qtlocation.morph b/strata/qt5-tools/qtlocation.morph
new file mode 100644
index 0000000..14a527f
--- /dev/null
+++ b/strata/qt5-tools/qtlocation.morph
@@ -0,0 +1,10 @@
+name: qtlocation
+kind: chunk
+configure-commands:
+- qmake
+build-commands:
+- make
+- make html_docs
+install-commands:
+- make install INSTALL_ROOT=$DESTDIR
+- make install_html_docs INSTALL_ROOT=$DESTDIR
diff --git a/strata/qt5-tools/qtwebsockets.morph b/strata/qt5-tools/qtwebsockets.morph
new file mode 100644
index 0000000..e1cac87
--- /dev/null
+++ b/strata/qt5-tools/qtwebsockets.morph
@@ -0,0 +1,10 @@
+name: qtwebsockets
+kind: chunk
+configure-commands:
+- qmake
+build-commands:
+- make
+- make html_docs
+install-commands:
+- make install INSTALL_ROOT=$DESTDIR
+- make install_html_docs INSTALL_ROOT=$DESTDIR
diff --git a/systems/qt5-devel-system-x86_64-generic.morph b/systems/qt5-devel-system-x86_64-generic.morph
index 6cb9377..1a78ff4 100644
--- a/systems/qt5-devel-system-x86_64-generic.morph
+++ b/systems/qt5-devel-system-x86_64-generic.morph
@@ -12,8 +12,8 @@ strata:
morph: strata/foundation.morph
- name: audio-bluetooth
morph: strata/audio-bluetooth.morph
-- name: multimedia-gstreamer-0.10
- morph: strata/multimedia-gstreamer-0.10.morph
+- name: multimedia
+ morph: strata/multimedia.morph
- name: bsp-x86_64-generic
morph: strata/bsp-x86_64-generic.morph
- name: tools
@@ -24,6 +24,8 @@ strata:
morph: strata/x-generic.morph
- name: qt5-tools
morph: strata/qt5-tools.morph
+- name: qt5-tools-qtwebkit
+ morph: strata/qt5-tools-qtwebkit.morph
- name: qt5-sdk
morph: strata/qt5-sdk.morph
- name: lua