xorg: remove all traces of XPrint
The XPrint server was removed from Xorg in 2008. (From OE-Core rev: 5b3748d463a6666c0d8e2624092619da8d8e6328) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
Richard Purdie
parent
f29e000832
commit
d6dc72c048
|
|
@ -9,8 +9,8 @@ clients and the server, and the different types of screens and visuals \
|
|||
that are available."
|
||||
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=f3d09e6b9e203a1af489e16c708f4fb3"
|
||||
DEPENDS += "libxtst libxext libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp libxau"
|
||||
PR = "${INC_PR}.0"
|
||||
DEPENDS += "libxtst libxext libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxau"
|
||||
PR = "${INC_PR}.1"
|
||||
PE = "1"
|
||||
|
||||
SRC_URI += "file://disable-xkb.patch"
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ preference options of the display."
|
|||
|
||||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=bea81cc9827cdf1af0e12c2b8228cf8d"
|
||||
DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau"
|
||||
PR = "${INC_PR}.0"
|
||||
DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxau"
|
||||
PR = "${INC_PR}.1"
|
||||
PE = "1"
|
||||
|
||||
SRC_URI += "file://disable-xkb.patch"
|
||||
|
|
|
|||
|
|
@ -1,42 +0,0 @@
|
|||
This patch fixes these new errors:
|
||||
|
||||
| XpNotifyPdm.c:234:10: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
|
||||
| XpNotifyPdm.c:271:10: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
|
||||
| XpNotifyPdm.c:286:10: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
|
||||
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Saul Wold <sgw@linux.intel.com>
|
||||
|
||||
Index: libXp-1.0.1/src/XpNotifyPdm.c
|
||||
===================================================================
|
||||
--- libXp-1.0.1.orig/src/XpNotifyPdm.c
|
||||
+++ libXp-1.0.1/src/XpNotifyPdm.c
|
||||
@@ -231,7 +231,7 @@ XpGetPdmStartParams (
|
||||
/*
|
||||
* Error - cannot determine or establish a selection_display.
|
||||
*/
|
||||
- return( (Status) NULL );
|
||||
+ return( (Status) 0 );
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -268,7 +268,7 @@ XpGetPdmStartParams (
|
||||
XCloseDisplay( *selection_display );
|
||||
*selection_display = (Display *) NULL;
|
||||
}
|
||||
- return( (Status) NULL );
|
||||
+ return( (Status) 0 );
|
||||
}
|
||||
|
||||
status = XmbTextListToTextProperty( *selection_display, list, 6,
|
||||
@@ -283,7 +283,7 @@ XpGetPdmStartParams (
|
||||
XCloseDisplay( *selection_display );
|
||||
*selection_display = (Display *) NULL;
|
||||
}
|
||||
- return( (Status) NULL );
|
||||
+ return( (Status) 0 );
|
||||
}
|
||||
|
||||
*type = text_prop.encoding;
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
require xorg-lib-common.inc
|
||||
|
||||
SUMMARY = "XP: X Printing extension library"
|
||||
|
||||
DESCRIPTION = "libXp provides public APIs to allow client applications \
|
||||
to render to non-display devices, making use of the X Print Service."
|
||||
|
||||
LICENSE = "MIT & MIT-style"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=9504a1264f5ddd4949254a57c0f8d6bb \
|
||||
file://src/XpPage.c;beginline=2;endline=35;md5=2b7d3d2ba5505b19271cf31b6918997e"
|
||||
|
||||
DEPENDS += "libxext libxau printproto"
|
||||
PR = "r1"
|
||||
PE = "1"
|
||||
|
||||
XORG_PN = "libXp"
|
||||
|
||||
CFLAGS_append = " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
|
||||
|
||||
SRC_URI += "file://fix-cast-error.patch"
|
||||
|
||||
SRC_URI[md5sum] = "7ae1d63748e79086bd51a633da1ff1a9"
|
||||
SRC_URI[sha256sum] = "71d1f260005616d646b8c8788365f2b7d93911dac57bb53b65753d9f9e6443d2"
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
require xorg-lib-common.inc
|
||||
|
||||
SUMMARY = "Xprint: Xprint job utility library"
|
||||
|
||||
DESCRIPTION = "libxprintapputil provides utility Xpau APIs allowing \
|
||||
client applications to access information about and control Xprint jobs \
|
||||
from an Xprint server."
|
||||
|
||||
DEPENDS += "libxp libxt libxprintutil"
|
||||
PR = "r1"
|
||||
LIC_FILES_CHKSUM = "file://src/xpapputil.c;beginline=2;endline=27;md5=be811cca90200613a672dc96206a767b"
|
||||
PE = "1"
|
||||
|
||||
XORG_PN = "libXprintAppUtil"
|
||||
|
||||
SRC_URI[md5sum] = "d2de510570aa6714681109b2ba178365"
|
||||
SRC_URI[sha256sum] = "24606446003379dbf499ef57e9294ce622c0f7f8a8f10834db61dc59ef690aa5"
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
require xorg-lib-common.inc
|
||||
LIC_FILES_CHKSUM = "file://src/xprintutil.c;endline=29;md5=22d5a98494dd356a2c6c9c355886f3af"
|
||||
|
||||
SUMMARY = "Xprint: Xprint printer utility library"
|
||||
|
||||
DESCRIPTION = "libxprintutil provides utility Xpu APIs allowing client \
|
||||
applications to access and manipulate information about printer \
|
||||
capabilities from an Xprint server."
|
||||
|
||||
DEPENDS += "libxp libxt"
|
||||
PR = "r1"
|
||||
PE = "1"
|
||||
|
||||
XORG_PN = "libXprintUtil"
|
||||
|
||||
SRC_URI[md5sum] = "22584f1aab1deba253949b562d1f0f45"
|
||||
SRC_URI[sha256sum] = "72b6ae0420b9601f55be147e8d068f670b951ae73a81423ba25be5875d826e6c"
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
require xorg-proto-common.inc
|
||||
|
||||
SUMMARY = "XP: X Printing extension headers"
|
||||
|
||||
DESCRIPTION = "This package provides the wire protocol for the X \
|
||||
Printing extension. This extension provides a way for client \
|
||||
applications to render to non-display devices."
|
||||
|
||||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=658463213f19b48b81f8672d2696069f \
|
||||
file://Print.h;beginline=2;endline=59;md5=db19e065445b3755c09432864dcd8a9b"
|
||||
|
||||
PR = "r0"
|
||||
PE = "1"
|
||||
|
||||
SRC_URI[md5sum] = "99d0e25feea2fead7d8325b7000b41c3"
|
||||
SRC_URI[sha256sum] = "1298316cf43b987365ab7764d61b022a3d7f180b67b423eed3456862d155911a"
|
||||
|
|
@ -13,7 +13,7 @@ PROVIDES = "virtual/xserver-xf86"
|
|||
PROVIDES += "virtual/xserver"
|
||||
|
||||
PE = "2"
|
||||
INC_PR = "r0"
|
||||
INC_PR = "r1"
|
||||
|
||||
XORG_PN = "xorg-server"
|
||||
SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2"
|
||||
|
|
@ -44,7 +44,6 @@ DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util"
|
|||
PACKAGES =+ "${PN}-security-policy \
|
||||
${PN}-sdl \
|
||||
${PN}-fbdev \
|
||||
${PN}-xprint \
|
||||
${PN}-xvfb \
|
||||
${PN}-utils \
|
||||
${PN}-xephyr \
|
||||
|
|
@ -79,7 +78,6 @@ FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \
|
|||
FILES_${PN}-security-policy += "${libdir}/xserver/SecurityPolicy"
|
||||
FILES_${PN}-sdl = "${bindir}/Xsdl"
|
||||
FILES_${PN}-fbdev = "${bindir}/Xfbdev"
|
||||
FILES_${PN}-xprint = "${libdir}/X11/xserver/*/print"
|
||||
FILES_${PN}-xvfb = "${bindir}/Xvfb"
|
||||
FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
|
||||
FILES_${PN}-xephyr = "${bindir}/Xephyr"
|
||||
|
|
|
|||
Loading…
Reference in New Issue