various: Update remaining XORG_MIRROR SRC_URIs to match upstream changes

diff --git a/packages/xdpyinfo/xdpyinfo_1.0.1.bb b/packages/xdpyinfo/xdpyinfo_1.0.1.bb
index 41d9807..a8972e1 100644 (file)
--- a/packages/xdpyinfo/xdpyinfo_1.0.1.bb
+++ b/packages/xdpyinfo/xdpyinfo_1.0.1.bb
@@ -3,8 +3,9 @@ DEPENDS = "libx11 libxext libxtst"
 DESCRIPTION = "X display information utility"
 SECTION = "x11/base"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/xdpyinfo-1.0.1.tar.bz2 \
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-1.0.1.tar.bz2 \
           file://disable-xkb.patch;patch=1"
+S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
 
 EXTRA_OECONF = "--disable-xkb"
 

diff --git a/packages/xev/xev_1.0.1.bb b/packages/xev/xev_1.0.1.bb
index 4f00093..2d0f79b 100644 (file)
--- a/packages/xev/xev_1.0.1.bb
+++ b/packages/xev/xev_1.0.1.bb
@@ -5,7 +5,8 @@ MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 SECTION = "x11/base"
 DEPENDS = "libx11 libxau"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-${PV}.tar.bz2 \
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-${PV}.tar.bz2 \
           file://diet-x11.patch;patch=1"
+S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
 
 inherit autotools

diff --git a/packages/xhost/xhost_1.0.0.bb b/packages/xhost/xhost_1.0.0.bb
index baacf25..220de1b 100644 (file)
--- a/packages/xhost/xhost_1.0.0.bb
+++ b/packages/xhost/xhost_1.0.0.bb
@@ -4,6 +4,7 @@ DESCRIPTION = "server access control program for X"
 MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "x11/base"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-${PV}.tar.bz2"
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-${PV}.tar.bz2"
+S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
 
 inherit autotools pkgconfig 

diff --git a/packages/xmodmap/xmodmap_1.0.0.bb b/packages/xmodmap/xmodmap_1.0.0.bb
index 5714036..d65c84b 100644 (file)
--- a/packages/xmodmap/xmodmap_1.0.0.bb
+++ b/packages/xmodmap/xmodmap_1.0.0.bb
@@ -5,6 +5,7 @@ SECTION = "x11/base"
 
 DEPENDS = "libx11"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/xmodmap-1.0.0.tar.bz2"
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-1.0.0.tar.bz2"
+S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
 
 inherit autotools pkgconfig 

diff --git a/packages/xorg-data/data-common.inc b/packages/xorg-data/data-common.inc
index 4d01e47..47dc922 100644 (file)
--- a/packages/xorg-data/data-common.inc
+++ b/packages/xorg-data/data-common.inc
@@ -2,7 +2,8 @@ DESCRIPTION = "X data files"
 SECTION = "x11/data"
 LICENSE= "MIT-X"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/data/${PN}-${PV}.tar.bz2"
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/data/${PN}-X11R7.0-${PV}.tar.bz2"
+S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
 
 inherit autotools pkgconfig
 

diff --git a/packages/xorg-fonts/font-common.inc b/packages/xorg-fonts/font-common.inc
index 0acd274..37d478b 100644 (file)
--- a/packages/xorg-fonts/font-common.inc
+++ b/packages/xorg-fonts/font-common.inc
@@ -2,7 +2,8 @@ DESCRIPTION = "X font files"
 SECTION = "x11/fonts"
 LICENSE= "MIT-X"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/font/${PN}-${PV}.tar.bz2"
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/font/${PN}-X11R7.0-${PV}.tar.bz2"
+S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
 FONT_DIR = "${datadir}/share/fonts"
 DEPENDS = "encodings mkfontscale mkfontdir"
 

diff --git a/packages/xrandr/xrandr_1.0.1.bb b/packages/xrandr/xrandr_1.0.1.bb
index 51f8f1c..db750c8 100644 (file)
--- a/packages/xrandr/xrandr_1.0.1.bb
+++ b/packages/xrandr/xrandr_1.0.1.bb
@@ -3,7 +3,7 @@ DEPENDS = "libxrandr libx11 libxext"
 DESCRIPTION = "X Resize and Rotate extension command."
 SECTION = "x11/base"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/xrandr-1.0.1.tar.bz2"
-S = "${WORKDIR}/${PN}-${PV}"
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-1.0.1.tar.bz2"
+S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
 
 inherit autotools pkgconfig 

diff --git a/packages/xrdb/xrdb_1.0.1.bb b/packages/xrdb/xrdb_1.0.1.bb
index 7d6b588..5703556 100644 (file)
--- a/packages/xrdb/xrdb_1.0.1.bb
+++ b/packages/xrdb/xrdb_1.0.1.bb
@@ -5,7 +5,7 @@ SECTION = "x11/base"
 LICENSE = "xrdb"
 PR = "r0"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/xrdb-1.0.1.tar.bz2"
-S = "${WORKDIR}/${PN}-${PV}"
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-1.0.1.tar.bz2"
+S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
 
 inherit autotools pkgconfig 

diff --git a/packages/xset/xset_1.0.1.bb b/packages/xset/xset_1.0.1.bb
index 793e6d4..55f3a0d 100644 (file)
--- a/packages/xset/xset_1.0.1.bb
+++ b/packages/xset/xset_1.0.1.bb
@@ -8,8 +8,9 @@ CFLAGS += "-D_GNU_SOURCE"
 
 SECTION = "x11/base"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-${PV}.tar.bz2 \
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-${PV}.tar.bz2 \
           file://disable-xkb.patch;patch=1"
+S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
 
 EXTRA_OECONF = "--disable-xkb"