summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x-armv7-versatile.morph13
-rw-r--r--x-x86_64-generic.morph13
2 files changed, 2 insertions, 24 deletions
diff --git a/x-armv7-versatile.morph b/x-armv7-versatile.morph
index 66feab2f..ea05d117 100644
--- a/x-armv7-versatile.morph
+++ b/x-armv7-versatile.morph
@@ -128,17 +128,6 @@
]
},
{
- "name": "fontutils",
- "repo": "upstream:fontutils",
- "ref": "baserock/morph",
- "build-depends": [
- "xorg-lib-libXaw",
- "xorg-lib-libXfont",
- "xorg-lib-libXt",
- "xorg-lib-libfontenc"
- ]
- },
- {
"name": "libsha1",
"repo": "upstream:libsha1",
"ref": "baserock/morph",
@@ -149,10 +138,10 @@
"repo": "upstream:xserver",
"ref": "baserock/morph",
"build-depends": [
- "fontutils",
"libsha1",
"mesa-x",
"pixman",
+ "xorg-font-util",
"xorg-lib-libXaw",
"xorg-lib-libXfont",
"xorg-lib-libXmu",
diff --git a/x-x86_64-generic.morph b/x-x86_64-generic.morph
index 13b4f437..5b193f03 100644
--- a/x-x86_64-generic.morph
+++ b/x-x86_64-generic.morph
@@ -128,17 +128,6 @@
]
},
{
- "name": "fontutils",
- "repo": "upstream:fontutils",
- "ref": "baserock/morph",
- "build-depends": [
- "xorg-lib-libXaw",
- "xorg-lib-libXfont",
- "xorg-lib-libXt",
- "xorg-lib-libfontenc"
- ]
- },
- {
"name": "libsha1",
"repo": "upstream:libsha1",
"ref": "baserock/morph",
@@ -149,10 +138,10 @@
"repo": "upstream:xserver",
"ref": "baserock/morph",
"build-depends": [
- "fontutils",
"libsha1",
"mesa-x",
"pixman",
+ "xorg-font-util",
"xorg-lib-libXaw",
"xorg-lib-libXfont",
"xorg-lib-libXmu",