summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2010-06-25 09:30:40 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2010-06-25 09:53:19 +0200
commitc34bf3cb88a9e99a22905fee4970dac914ee8a4f (patch)
tree401ef90c76a6943b3be8707ce76f70132b90e473
parent2531ea35b2d93c07bdff8d8f2cde72db971fe4cb (diff)
recipes: use libxt/libxft/libxdmcp/libxscrnsaver/liblbxutil/libxau/libxext instead of xt/xft/xdmcp/libxss/lbxutil/xau/xext providers
* there is only one provider, so use it directly as othere recipes does Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--recipes/blackbox/blackbox_0.70.1.bb2
-rw-r--r--recipes/fvwm/fvwm_2.5.26.bb2
-rw-r--r--recipes/icewm/icewm_1.2.30.bb2
-rw-r--r--recipes/ipaq-sleep/ipaq-sleep_0.9.bb2
-rw-r--r--recipes/ipatience/ipatience_0.1.bb2
-rw-r--r--recipes/mozilla/minimo_cvs.bb2
-rw-r--r--recipes/obsolete/xorg-xserver/xorg-xserver-common.inc2
-rw-r--r--recipes/qt/qt-x11-free_3.3.6.bb2
-rw-r--r--recipes/qt/qt-x11-free_3.3.7.bb2
-rw-r--r--recipes/qt4/qt4-x11-free.inc2
-rw-r--r--recipes/uim/uim_1.3.1.bb2
-rw-r--r--recipes/xorg-app/xterm_207.bb2
-rw-r--r--recipes/xorg-app/xterm_251.bb2
-rw-r--r--recipes/xorg-lib/libxext_1.0.5.bb2
-rw-r--r--recipes/xorg-lib/libxrender_0.9.4.bb2
-rw-r--r--recipes/xorg-lib/libxrender_0.9.5.bb2
-rw-r--r--recipes/xorg-lib/libxrender_0.9.6.bb2
-rw-r--r--recipes/xorg-xserver/xorg-xserver-common.inc2
-rw-r--r--recipes/xstroke/xstroke_0.6.bb2
19 files changed, 19 insertions, 19 deletions
diff --git a/recipes/blackbox/blackbox_0.70.1.bb b/recipes/blackbox/blackbox_0.70.1.bb
index 8ac16ddee4..1ee209be81 100644
--- a/recipes/blackbox/blackbox_0.70.1.bb
+++ b/recipes/blackbox/blackbox_0.70.1.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Blackbox Window Manager"
SECTION = "x11/wm"
LICENSE = "GPL"
-DEPENDS = "libx11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft"
+DEPENDS = "libx11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr libxft"
PR = "r1"
SRC_URI = "${SOURCEFORGE_MIRROR}/blackboxwm/blackbox-0.70.1.tar.gz \
diff --git a/recipes/fvwm/fvwm_2.5.26.bb b/recipes/fvwm/fvwm_2.5.26.bb
index cccda600de..cb36fba503 100644
--- a/recipes/fvwm/fvwm_2.5.26.bb
+++ b/recipes/fvwm/fvwm_2.5.26.bb
@@ -1,7 +1,7 @@
SECTION = "x11/wm"
DESCRIPTION = "FVWM Window Manager"
LICENSE = "GPL"
-DEPENDS = "virtual/libx11 libxext libxfixes libxpm xrandr xft libxml2 zlib libice libxau libxcb libxcursor libxdmcp libxrender libpng librsvg fontconfig libstroke"
+DEPENDS = "virtual/libx11 libxext libxfixes libxpm xrandr libxft libxml2 zlib libice libxau libxcb libxcursor libxdmcp libxrender libpng librsvg fontconfig libstroke"
SRC_URI="ftp://ftp.fvwm.org/pub/fvwm/version-2/${P}.tar.bz2 \
file://oe-configure.ac.patch \
diff --git a/recipes/icewm/icewm_1.2.30.bb b/recipes/icewm/icewm_1.2.30.bb
index f14a44f541..3b54d4f95a 100644
--- a/recipes/icewm/icewm_1.2.30.bb
+++ b/recipes/icewm/icewm_1.2.30.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "IceWM Window Manager"
SECTION = "x11/wm"
LICENSE = "GPL"
-DEPENDS = "virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft mkfontdir-native"
+DEPENDS = "virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr libxft mkfontdir-native"
RRECOMMENDS_${PN} = "ttf-dejavu-sans"
PR = "r3"
diff --git a/recipes/ipaq-sleep/ipaq-sleep_0.9.bb b/recipes/ipaq-sleep/ipaq-sleep_0.9.bb
index 91ae6cb471..b42e7d50cc 100644
--- a/recipes/ipaq-sleep/ipaq-sleep_0.9.bb
+++ b/recipes/ipaq-sleep/ipaq-sleep_0.9.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Automatic sleep/suspend control daemon"
SECTION = "x11/base"
LICENSE = "GPL"
-DEPENDS = "apmd virtual/xserver libxext virtual/libx11 libxau xscrnsaverh libxss"
+DEPENDS = "apmd virtual/xserver libxext virtual/libx11 libxau xscrnsaverh libxscrnsaver"
DISTRO_APM ?= "apm"
RDEPENDS_${PN} = "${DISTRO_APM}"
PR = "r8"
diff --git a/recipes/ipatience/ipatience_0.1.bb b/recipes/ipatience/ipatience_0.1.bb
index 1e2cf99f8f..033757672c 100644
--- a/recipes/ipatience/ipatience_0.1.bb
+++ b/recipes/ipatience/ipatience_0.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Patience game"
LICENSE = "GPL"
SECTION = "x11"
PRIORITY = "optional"
-DEPENDS = "virtual/libx11 xft libxtst libxpm fltk"
+DEPENDS = "virtual/libx11 libxft libxtst libxpm fltk"
SRCDATE = "20061112"
PR = "r0"
diff --git a/recipes/mozilla/minimo_cvs.bb b/recipes/mozilla/minimo_cvs.bb
index 3c274ea28b..708acbf91e 100644
--- a/recipes/mozilla/minimo_cvs.bb
+++ b/recipes/mozilla/minimo_cvs.bb
@@ -4,7 +4,7 @@ LICENSE = "MPL GPL LGPL"
HOMEPAGE = "http://www.mozilla.org/projects/minimo/"
PRIORITY = "optional"
-DEPENDS = "libxrender xt xft fontconfig freetype libidl dbus-glib pango atk gtk+ libidl-native zip-native"
+DEPENDS = "libxrender libxt libxft fontconfig freetype libidl dbus-glib pango atk gtk+ libidl-native zip-native"
CVSSVR="cvs-mirror.mozilla.org"
BRTAG = "MOZILLA_1_8_BRANCH"
diff --git a/recipes/obsolete/xorg-xserver/xorg-xserver-common.inc b/recipes/obsolete/xorg-xserver/xorg-xserver-common.inc
index a72812c22f..79905d2106 100644
--- a/recipes/obsolete/xorg-xserver/xorg-xserver-common.inc
+++ b/recipes/obsolete/xorg-xserver/xorg-xserver-common.inc
@@ -14,7 +14,7 @@ DISTRO_XORG_CONFIG_MANAGER_shr ?= ""
CONFIG_MANAGER_OPTION += "${@['--disable-config-hal','--enable-config-hal',''][bb.data.getVar('DISTRO_XORG_CONFIG_MANAGER',d) in ['hal']]}"
CONFIG_MANAGER_OPTION += "${@['--disable-config-udev','--enable-config-udev',''][bb.data.getVar('DISTRO_XORG_CONFIG_MANAGER',d) in ['udev']]}"
-DEPENDS = "fontconfig freetype flex-native lbxutil kbproto \
+DEPENDS = "fontconfig freetype flex-native liblbxutil kbproto \
xf86driproto drm glproto randrproto renderproto fixesproto damageproto \
xcmiscproto xextproto xproto xf86miscproto xf86vidmodeproto xf86bigfontproto \
scrnsaverproto bigreqsproto resourceproto fontsproto inputproto \
diff --git a/recipes/qt/qt-x11-free_3.3.6.bb b/recipes/qt/qt-x11-free_3.3.6.bb
index 8a8d5d93d8..789e6fb45d 100644
--- a/recipes/qt/qt-x11-free_3.3.6.bb
+++ b/recipes/qt/qt-x11-free_3.3.6.bb
@@ -1,4 +1,4 @@
-DEPENDS = "uicmoc3-native freetype virtual/libx11 xft libxext libxrender libxrandr libxcursor mysql virtual/libgl"
+DEPENDS = "uicmoc3-native freetype virtual/libx11 libxft libxext libxrender libxrandr libxcursor mysql virtual/libgl"
PROVIDES = "qt3x11"
PR = "r3"
diff --git a/recipes/qt/qt-x11-free_3.3.7.bb b/recipes/qt/qt-x11-free_3.3.7.bb
index 1d4d5f978c..100d38d9cb 100644
--- a/recipes/qt/qt-x11-free_3.3.7.bb
+++ b/recipes/qt/qt-x11-free_3.3.7.bb
@@ -1,4 +1,4 @@
-DEPENDS = "uicmoc3-native freetype virtual/libx11 libxmu xft libxext libxrender libxrandr libxcursor mysql virtual/libgl"
+DEPENDS = "uicmoc3-native freetype virtual/libx11 libxmu libxft libxext libxrender libxrandr libxcursor mysql virtual/libgl"
PROVIDES = "qt3x11"
PR = "r3"
diff --git a/recipes/qt4/qt4-x11-free.inc b/recipes/qt4/qt4-x11-free.inc
index fc96f033fc..f4fa83ec12 100644
--- a/recipes/qt4/qt4-x11-free.inc
+++ b/recipes/qt4/qt4-x11-free.inc
@@ -3,7 +3,7 @@ SECTION = "x11/libs"
PRIORITY = "optional"
HOMEPAGE = "http://www.trolltech.com"
LICENSE = "GPL QPL"
-DEPENDS += "virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor"
+DEPENDS += "virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
INC_PR = "r17"
diff --git a/recipes/uim/uim_1.3.1.bb b/recipes/uim/uim_1.3.1.bb
index dad686520e..7012356d60 100644
--- a/recipes/uim/uim_1.3.1.bb
+++ b/recipes/uim/uim_1.3.1.bb
@@ -1,5 +1,5 @@
require uim.inc
-DEPENDS = "gtk+ uim-native anthy fontconfig libxft xt glib-2.0 ncurses"
+DEPENDS = "gtk+ uim-native anthy fontconfig libxft libxt glib-2.0 ncurses"
SECTION_uim-gtk2.0 = "x11/inputmethods"
PR = "r3"
diff --git a/recipes/xorg-app/xterm_207.bb b/recipes/xorg-app/xterm_207.bb
index 66c7e0f5dd..a419500b21 100644
--- a/recipes/xorg-app/xterm_207.bb
+++ b/recipes/xorg-app/xterm_207.bb
@@ -1,7 +1,7 @@
require xorg-app-common.inc
DESCRIPTION = "xterm is the standard terminal emulator for the X Window System."
-DEPENDS = "libxaw xproto virtual/libx11 xextproto xext xau libxpm ncurses"
+DEPENDS = "libxaw xproto virtual/libx11 xextproto libxext libxau libxpm ncurses"
SRC_URI = "${XORG_MIRROR}/development/X11R7.0-RC4/extras/${PN}-${PV}.tar.gz"
diff --git a/recipes/xorg-app/xterm_251.bb b/recipes/xorg-app/xterm_251.bb
index 2369bb902b..a30309ac74 100644
--- a/recipes/xorg-app/xterm_251.bb
+++ b/recipes/xorg-app/xterm_251.bb
@@ -1,7 +1,7 @@
require xorg-app-common.inc
DESCRIPTION = "xterm is the standard terminal emulator for the X Window System."
-DEPENDS = "libxaw xproto virtual/libx11 xextproto xext xau libxpm ncurses"
+DEPENDS = "libxaw xproto virtual/libx11 xextproto libxext libxau libxpm ncurses"
SRC_URI = "ftp://invisible-island.net/xterm/${PN}-${PV}.tgz"
diff --git a/recipes/xorg-lib/libxext_1.0.5.bb b/recipes/xorg-lib/libxext_1.0.5.bb
index 16be6da05e..fc3380fd41 100644
--- a/recipes/xorg-lib/libxext_1.0.5.bb
+++ b/recipes/xorg-lib/libxext_1.0.5.bb
@@ -1,6 +1,6 @@
require xorg-lib-common.inc
DESCRIPTION = "X11 miscellaneous extension library"
-DEPENDS += "xproto virtual/libx11 xextproto libxau xdmcp"
+DEPENDS += "xproto virtual/libx11 xextproto libxau libxdmcp"
PE = "1"
PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxrender_0.9.4.bb b/recipes/xorg-lib/libxrender_0.9.4.bb
index 1296223a12..42cfb0592c 100644
--- a/recipes/xorg-lib/libxrender_0.9.4.bb
+++ b/recipes/xorg-lib/libxrender_0.9.4.bb
@@ -1,7 +1,7 @@
require xorg-lib-common.inc
DESCRIPTION = "X11 Rendering Extension client library"
LICENSE = "BSD-X"
-DEPENDS += "virtual/libx11 renderproto xproto xdmcp"
+DEPENDS += "virtual/libx11 renderproto xproto libxdmcp"
PE = "1"
PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxrender_0.9.5.bb b/recipes/xorg-lib/libxrender_0.9.5.bb
index e9babf810c..ce6a4c417b 100644
--- a/recipes/xorg-lib/libxrender_0.9.5.bb
+++ b/recipes/xorg-lib/libxrender_0.9.5.bb
@@ -1,7 +1,7 @@
require xorg-lib-common.inc
DESCRIPTION = "X11 Rendering Extension client library"
LICENSE = "BSD-X"
-DEPENDS += "virtual/libx11 renderproto xproto xdmcp"
+DEPENDS += "virtual/libx11 renderproto xproto libxdmcp"
PE = "1"
PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxrender_0.9.6.bb b/recipes/xorg-lib/libxrender_0.9.6.bb
index ce748d7720..d6d7ec6662 100644
--- a/recipes/xorg-lib/libxrender_0.9.6.bb
+++ b/recipes/xorg-lib/libxrender_0.9.6.bb
@@ -1,7 +1,7 @@
require xorg-lib-common.inc
DESCRIPTION = "X11 Rendering Extension client library"
LICENSE = "BSD-X"
-DEPENDS += "virtual/libx11 renderproto xproto xdmcp"
+DEPENDS += "virtual/libx11 renderproto xproto libxdmcp"
PE = "1"
PR = "${INC_PR}.0"
diff --git a/recipes/xorg-xserver/xorg-xserver-common.inc b/recipes/xorg-xserver/xorg-xserver-common.inc
index 848784efa8..adf7c96175 100644
--- a/recipes/xorg-xserver/xorg-xserver-common.inc
+++ b/recipes/xorg-xserver/xorg-xserver-common.inc
@@ -14,7 +14,7 @@ DISTRO_XORG_CONFIG_MANAGER_shr ?= ""
CONFIG_MANAGER_OPTION += "${@['--disable-config-hal','--enable-config-hal',''][bb.data.getVar('DISTRO_XORG_CONFIG_MANAGER',d) in ['hal']]}"
CONFIG_MANAGER_OPTION += "${@['--disable-config-udev','--enable-config-udev',''][bb.data.getVar('DISTRO_XORG_CONFIG_MANAGER',d) in ['udev']]}"
-DEPENDS = "fontconfig freetype flex-native lbxutil kbproto \
+DEPENDS = "fontconfig freetype flex-native liblbxutil kbproto \
xf86driproto drm glproto randrproto renderproto fixesproto damageproto \
xcmiscproto xextproto xproto xf86miscproto xf86vidmodeproto xf86bigfontproto \
scrnsaverproto bigreqsproto resourceproto fontsproto inputproto \
diff --git a/recipes/xstroke/xstroke_0.6.bb b/recipes/xstroke/xstroke_0.6.bb
index cd95d3d092..372a5b92cc 100644
--- a/recipes/xstroke/xstroke_0.6.bb
+++ b/recipes/xstroke/xstroke_0.6.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Gesture recognition input method for X11"
LICENSE = "GPL"
SECTION = "x11"
PRIORITY = "optional"
-DEPENDS = "virtual/libx11 xft libxtst libxpm"
+DEPENDS = "virtual/libx11 libxft libxtst libxpm"
PR = "r2"
SRC_URI = "http://www.oesources.org/source/current/xstroke-0.6.tar.gz \