(#128448) Fix xprint (Ed Catmur). Still needs a dep added on xplsprinters when xprint is in USE, but arches haven't keyworded it yet.

(Portage version: 2.1_pre9-r3)

8 files changed, 308 insertions, 13 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 6098d850154b..9423ee112199 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.105 2006/04/21 09:12:50 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.106 2006/04/23 22:32:14 spyderous Exp $
+
+  23 Apr 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/xorg-server-1.0.2-Xprt-build.patch,
+  +files/1.0.2-Xprint-xprintdir.patch,
+  +files/xorg-server-1.0.2-xprint-init.patch,
+  +files/1.0.99.901-Xprint-xprintdir.patch, xorg-server-1.0.2-r3.ebuild,
+  xorg-server-1.0.99.901-r1.ebuild:
+  (#128448) Fix xprint (Ed Catmur). Still needs a dep added on xplsprinters
+  when xprint is in USE, but arches haven't keyworded it yet.
 
 *xorg-server-1.0.99.901-r1 (21 Apr 2006)
 
diff --git a/x11-base/xorg-server/files/1.0.2-Xprint-xprintdir.patch b/x11-base/xorg-server/files/1.0.2-Xprint-xprintdir.patch
new file mode 100644
index 000000000000..0992565fc943
--- /dev/null
+++ b/x11-base/xorg-server/files/1.0.2-Xprint-xprintdir.patch
@@ -0,0 +1,12 @@
+diff -urN xorg-server-1.0.2.orig/Xprint/Makefile.am xorg-server-1.0.2/Xprint/Makefile.am
+--- xorg-server-1.0.2.orig/Xprint/Makefile.am	2006-04-23 14:26:07.000000000 -0700
++++ xorg-server-1.0.2/Xprint/Makefile.am	2006-04-23 14:26:23.000000000 -0700
+@@ -4,7 +4,7 @@
+ 
+ Xprt_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
+ 	-DXPRINT -DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_  \
+-	-DXPRINTDIR=\"$(prefix)/lib/X11/xserver\"    \
++	-DXPRINTDIR=\"$(libdir)/X11/xserver\"    \
+ 	-DXPRASTERDDX -DXPPCLDDX -DXPMONOPCLDDX -DXPPSDDX
+ 
+ Xprt_LDFLAGS = -L$(top_srcdir)
diff --git a/x11-base/xorg-server/files/1.0.99.901-Xprint-xprintdir.patch b/x11-base/xorg-server/files/1.0.99.901-Xprint-xprintdir.patch
new file mode 100644
index 000000000000..5a91db4572fe
--- /dev/null
+++ b/x11-base/xorg-server/files/1.0.99.901-Xprint-xprintdir.patch
@@ -0,0 +1,11 @@
+--- xserver/xorg/Xprint/Makefile.am	2006/04/21 13:38:39	1.1
++++ xserver/xorg/Xprint/Makefile.am	2006/04/21 13:38:52
+@@ -4,7 +4,7 @@ bin_PROGRAMS = Xprt
+ 
+ Xprt_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
+ 	-DXPRINT -DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_  \
+-	-DXPRINTDIR=\"$(prefix)/X11/xserver\"    \
++	-DXPRINTDIR=\"$(libdir)/X11/xserver\"    \
+ 	-DXPRASTERDDX -DXPPCLDDX -DXPMONOPCLDDX -DXPPSDDX
+ 
+ Xprt_LDFLAGS = -L$(top_srcdir)
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.0.99.901-r1 b/x11-base/xorg-server/files/digest-xorg-server-1.0.99.901-r1
index bf488330ebe8..170ec42ff655 100644
--- a/x11-base/xorg-server/files/digest-xorg-server-1.0.99.901-r1
+++ b/x11-base/xorg-server/files/digest-xorg-server-1.0.99.901-r1
@@ -1,6 +1,6 @@
 MD5 61beda590bfc5b4a12e979d5f2d70d7a MesaLib-6.5.tar.bz2 3062363
 RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd MesaLib-6.5.tar.bz2 3062363
 SHA256 dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd MesaLib-6.5.tar.bz2 3062363
-MD5 9100da4b892b8f8bf741db7ac371476e xorg-server-1.0.99.901.tar.bz2 6317980
-RMD160 7824f82b876d207ba5363f02e6dde1d0ec40e407 xorg-server-1.0.99.901.tar.bz2 6317980
-SHA256 c0d029ebf35bc1f1039a2ac57e97958857c5bda86bc9792164cdc08815259898 xorg-server-1.0.99.901.tar.bz2 6317980
+MD5 fd6c43bf6ca416cb11b3c40a0be33a9b xorg-server-1.0.99.901.tar.bz2 1730071
+RMD160 bbb285c986c84bd0179e7f30bceeeeeba6ba4762 xorg-server-1.0.99.901.tar.bz2 1730071
+SHA256 84935ba1a6cac96199f5d07655957a340a7ed327ad9b90ce7090a0c6e4bd709b xorg-server-1.0.99.901.tar.bz2 1730071
diff --git a/x11-base/xorg-server/files/xorg-server-1.0.2-Xprt-build.patch b/x11-base/xorg-server/files/xorg-server-1.0.2-Xprt-build.patch
new file mode 100644
index 000000000000..85f9db0f97ea
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.0.2-Xprt-build.patch
@@ -0,0 +1,241 @@
+Index: configure.ac
+===================================================================
+RCS file: /cvs/xorg/xserver/xorg/configure.ac,v
+retrieving revision 1.157
+diff -u -r1.157 configure.ac
+--- configure.ac	30 Dec 2005 12:05:47 -0000	1.157
++++ configure.ac	6 Jan 2006 16:05:21 -0000
+@@ -1632,6 +1632,7 @@
+ Xprint/Makefile
+ Xprint/doc/Makefile
+ Xprint/pcl/Makefile
++Xprint/pcl-mono/Makefile
+ Xprint/raster/Makefile
+ Xprint/ps/Makefile
+ Xprint/etc/Makefile
+Index: Xprint/Makefile.am
+===================================================================
+RCS file: /cvs/xorg/xserver/xorg/Xprint/Makefile.am,v
+retrieving revision 1.6
+diff -u -r1.6 Makefile.am
+--- Xprint/Makefile.am	2 Dec 2005 06:02:38 -0000	1.6
++++ Xprint/Makefile.am	6 Jan 2006 16:05:22 -0000
+@@ -1,13 +1,17 @@
+-SUBDIRS = doc pcl raster ps etc
++SUBDIRS = doc pcl pcl-mono raster ps etc
+ 
+ bin_PROGRAMS = Xprt
+ 
+ Xprt_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
+-	-DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_  \
+-	-DXPRINTDIR=\"$(prefix)/X11/xserver\"  
++	-DXPRINT -DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_  \
++	-DXPRINTDIR=\"$(prefix)/lib/X11/xserver\"    \
++	-DXPRASTERDDX -DXPPCLDDX -DXPMONOPCLDDX -DXPPSDDX
+ 
+ Xprt_LDFLAGS = -L$(top_srcdir)
+-Xprt_LDADD = @XPRINT_LIBS@ pcl/libpcl.la raster/libraster.la
++Xprt_LDADD = @XPRINT_LIBS@ ps/libps.la raster/libraster.la  \
++	pcl/libpcl.la pcl-mono/libpcl.la  \
++	../mfb/libmfb.la ../mi/libmi.la  \
++	../cfb32/libcfb32.la ../cfb/libcfb.la ../Xext/libXext.la
+ 
+ miinitext-wrapper.c:
+ 	echo "#include \"$(top_srcdir)/mi/miinitext.c\"" >> $@
+Index: Xprint/ddxInit.c
+===================================================================
+RCS file: /cvs/xorg/xserver/xorg/Xprint/ddxInit.c,v
+retrieving revision 1.7
+diff -u -r1.7 ddxInit.c
+--- Xprint/ddxInit.c	3 Jul 2005 07:01:09 -0000	1.7
++++ Xprint/ddxInit.c	6 Jan 2006 16:05:22 -0000
+@@ -85,6 +85,11 @@
+ 
+     pScreenInfo->numPixmapFormats = 0; /* get them in PrinterInitOutput */
+     screenInfo.numVideoScreens = 0;
++    
++#ifdef PRINT_ONLY_SERVER
++    PrinterInitOutput(pScreenInfo, argc, argv);
++#endif
++
+ }
+ 
+ static void
+Index: Xprint/pcl/Makefile.am
+===================================================================
+RCS file: /cvs/xorg/xserver/xorg/Xprint/pcl/Makefile.am,v
+retrieving revision 1.3
+diff -u -r1.3 Makefile.am
+--- Xprint/pcl/Makefile.am	2 Dec 2005 06:02:38 -0000	1.3
++++ Xprint/pcl/Makefile.am	6 Jan 2006 16:05:22 -0000
+@@ -1,31 +1,6 @@
+ noinst_LTLIBRARIES = libpcl.la
+ 
+-INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
++PCL_DRIVER = -DXP_PCL_COLOR
+ 
+-AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
+-	-D_XP_PRINT_SERVER_ -DPSZ=8
++include ../pcl/Makefile.am.inc
+ 
+-libpcl_la_SOURCES =		\
+-	PclArc.c		\
+-	PclArea.c		\
+-	PclAttr.c		\
+-	PclAttVal.c		\
+-	PclColor.c		\
+-	PclCursor.c		\
+-	PclDef.h		\
+-	PclFonts.c		\
+-	PclGC.c			\
+-	Pcl.h			\
+-	PclInit.c		\
+-	PclLine.c		\
+-	Pclmap.h		\
+-	PclMisc.c		\
+-	PclPixel.c		\
+-	PclPixmap.c		\
+-	PclPolygon.c		\
+-	PclPrint.c		\
+-	PclSFonts.c		\
+-	PclSFonts.h		\
+-	PclSpans.c		\
+-	PclText.c		\
+-	PclWindow.c
+Index: cfb/Makefile.am
+===================================================================
+RCS file: /cvs/xorg/xserver/xorg/cfb/Makefile.am,v
+retrieving revision 1.7
+diff -u -r1.7 Makefile.am
+--- cfb/Makefile.am	2 Dec 2005 06:02:39 -0000	1.7
++++ cfb/Makefile.am	6 Jan 2006 16:05:22 -0000
+@@ -9,7 +9,7 @@
+ 
+ libcfb_la_LIBADD = ../mfb/libmfb.la
+ 
+-AM_CFLAGS = -DPSZ=8 $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
++AM_CFLAGS = -DPSZ=8 $(DIX_CFLAGS) $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+ 
+ INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support
+ 
+Index: cfb/Makefile.am.inc
+===================================================================
+RCS file: /cvs/xorg/xserver/xorg/cfb/Makefile.am.inc,v
+retrieving revision 1.2
+diff -u -r1.2 Makefile.am.inc
+--- cfb/Makefile.am.inc	21 Sep 2005 00:24:10 -0000	1.2
++++ cfb/Makefile.am.inc	6 Jan 2006 16:05:22 -0000
+@@ -138,3 +138,16 @@
+ cfbglrop8.c:
+ 	echo "#define GLYPHROP" > $@
+ 	echo "#include \"$(top_srcdir)/cfb/cfbglblt8.c\"" >> $@
++
++
++if XPRINT
++
++PLATFORMDEFS = -DXFREE86
++
++cfb8bit.c:   compiler.h
++
++compiler.h:
++	echo "#include \"$(top_srcdir)/hw/xfree86/common/compiler.h\"" >> $@
++
++endif
++
+Index: cfb16/Makefile.am
+===================================================================
+RCS file: /cvs/xorg/xserver/xorg/cfb16/Makefile.am,v
+retrieving revision 1.4
+diff -u -r1.4 Makefile.am
+--- cfb16/Makefile.am	2 Dec 2005 06:02:39 -0000	1.4
++++ cfb16/Makefile.am	6 Jan 2006 16:05:22 -0000
+@@ -6,4 +6,4 @@
+ 
+ INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support
+ 
+-AM_CFLAGS = -DPSZ=16 $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
++AM_CFLAGS = -DPSZ=16 $(DIX_CFLAGS) $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+Index: cfb24/Makefile.am
+===================================================================
+RCS file: /cvs/xorg/xserver/xorg/cfb24/Makefile.am,v
+retrieving revision 1.4
+diff -u -r1.4 Makefile.am
+--- cfb24/Makefile.am	2 Dec 2005 06:02:39 -0000	1.4
++++ cfb24/Makefile.am	6 Jan 2006 16:05:22 -0000
+@@ -6,6 +6,6 @@
+ 
+ EXTRA_DIST = cfbrrop24.h
+ 
+-AM_CFLAGS = -DPSZ=24 $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
++AM_CFLAGS = -DPSZ=24 $(DIX_CFLAGS) $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+ 
+ INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support
+Index: cfb32/Makefile.am
+===================================================================
+RCS file: /cvs/xorg/xserver/xorg/cfb32/Makefile.am,v
+retrieving revision 1.4
+diff -u -r1.4 Makefile.am
+--- cfb32/Makefile.am	2 Dec 2005 06:02:39 -0000	1.4
++++ cfb32/Makefile.am	6 Jan 2006 16:05:22 -0000
+@@ -6,4 +6,4 @@
+ 
+ INCLUDES = $(CFB_INCLUDES) $(DIX_CFLAGS) -I$(top_srcdir)/hw/xfree86/os-support
+ 
+-AM_CFLAGS = -DPSZ=32 @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
++AM_CFLAGS = -DPSZ=32  $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+Index: mi/miinitext.c
+===================================================================
+RCS file: /cvs/xorg/xserver/xorg/mi/miinitext.c,v
+retrieving revision 1.28
+diff -u -r1.28 miinitext.c
+--- mi/miinitext.c	29 Dec 2005 00:19:33 -0000	1.28
++++ mi/miinitext.c	6 Jan 2006 16:05:27 -0000
+@@ -250,7 +250,7 @@
+ #include <X11/extensions/lbxstr.h>
+ #endif
+ #ifdef XPRINT
+-#include "Print.h"
++#include <X11/extensions/Print.h>
+ #endif
+ #ifdef XAPPGROUP
+ #define _XAG_SERVER_
+--- Xprint/pcl-mono/Makefile.am	2006/04/13 22:11:44	1.1
++++ Xprint/pcl-mono/Makefile.am	2006/04/13 22:11:49
+@@ -0,0 +1,5 @@
++noinst_LTLIBRARIES = libpcl.la
++
++PCL_DRIVER = -DXP_PCL_MONO
++
++include ../pcl/Makefile.am.inc
+--- Xprint/pcl/Makefile.am.inc	2006/04/13 22:11:44     1.1
++++ Xprint/pcl/Makefile.am.inc	2006/04/13 22:11:49
+@@ -0,0 +1,29 @@
++INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
++ 
++AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
++	-D_XP_PRINT_SERVER_ -DPSZ=8 $(PCL_DRIVER)
++ 
++libpcl_la_SOURCES =		\
++	$(srcdir)/../pcl/PclArc.c	\
++	$(srcdir)/../pcl/PclArea.c	\
++	$(srcdir)/../pcl/PclAttr.c	\
++	$(srcdir)/../pcl/PclAttVal.c	\
++	$(srcdir)/../pcl/PclColor.c	\
++	$(srcdir)/../pcl/PclCursor.c	\
++	$(srcdir)/../pcl/PclDef.h	\
++	$(srcdir)/../pcl/PclFonts.c	\
++	$(srcdir)/../pcl/PclGC.c	\
++	$(srcdir)/../pcl/Pcl.h		\
++	$(srcdir)/../pcl/PclInit.c	\
++	$(srcdir)/../pcl/PclLine.c	\
++	$(srcdir)/../pcl/Pclmap.h	\
++	$(srcdir)/../pcl/PclMisc.c	\
++	$(srcdir)/../pcl/PclPixel.c	\
++	$(srcdir)/../pcl/PclPixmap.c	\
++	$(srcdir)/../pcl/PclPolygon.c	\
++	$(srcdir)/../pcl/PclPrint.c	\
++	$(srcdir)/../pcl/PclSFonts.c	\
++	$(srcdir)/../pcl/PclSFonts.h	\
++	$(srcdir)/../pcl/PclSpans.c	\
++	$(srcdir)/../pcl/PclText.c	\
++	$(srcdir)/../pcl/PclWindow.c
diff --git a/x11-base/xorg-server/files/xorg-server-1.0.2-xprint-init.patch b/x11-base/xorg-server/files/xorg-server-1.0.2-xprint-init.patch
new file mode 100644
index 000000000000..a4783abbeca1
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.0.2-xprint-init.patch
@@ -0,0 +1,15 @@
+--- Xprint/etc/init.d/Makefile.am	2006/04/14 04:47:28	1.1
++++ Xprint/etc/init.d/Makefile.am	2006/04/14 05:26:42
+@@ -1 +1,12 @@
++include $(top_srcdir)/cpprules.in
++
++noinst_PRE = xprint
++BUILT_SOURCES = $(noinst_PRE)
++CLEANFILES = $(noinst_PRE) xprint.pre
++
++CPP_FILES_FLAGS = -DProjectRoot='"$(PROJECTROOT)"' -DOS_LINUX
++
++xprint.pre: xprint.cpp
++	$(SED) -e 's/^\(\s\+\)#/\1XCOMM/' $< > $@
++
+ EXTRA_DIST = xprint.cpp
diff --git a/x11-base/xorg-server/xorg-server-1.0.2-r3.ebuild b/x11-base/xorg-server/xorg-server-1.0.2-r3.ebuild
index da72b69283a5..47d8c5c09cc0 100644
--- a/x11-base/xorg-server/xorg-server-1.0.2-r3.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.0.2-r3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.0.2-r3.ebuild,v 1.4 2006/04/17 23:27:06 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.0.2-r3.ebuild,v 1.5 2006/04/23 22:32:14 spyderous Exp $
 
 # Must be before x-modular eclass is inherited
 # Hack to make sure autoreconf gets run
-#SNAPSHOT="yes"
+SNAPSHOT="yes"
 
 inherit flag-o-matic x-modular multilib
 
@@ -20,6 +20,9 @@ PATCHES="${FILESDIR}/${P}-Sbus.patch
 	${FILESDIR}/${P}-64bit-fix-indirect-vertex-array.patch
 	${FILESDIR}/${P}-64bit-fix-have-dix-config.patch
 	${FILESDIR}/${P}-64bit-fix-for-glx.patch
+	${FILESDIR}/${P}-Xprt-build.patch
+	${FILESDIR}/${P}-xprint-init.patch
+	${FILESDIR}/${PV}-Xprint-xprintdir.patch
 	${FILESDIR}/${PV}-try-to-fix-xorgcfg.patch
 	${FILESDIR}/${PV}-fix-xorgconfig-rgbpath-and-mouse.patch
 	${DISTDIR}/${PV}-overlay-window.patch.bz2"
@@ -170,9 +173,10 @@ switch_opengl_implem() {
 xprint_src_install() {
 	# RH-style init script, we provide a wrapper
 	exeinto /usr/$(get_libdir)/misc
-	# Actually a shell script, someone messed up
-	newexe ${S}/Xprint/etc/init.d/xprint.cpp xprint
-	sed -e 's/XCOMM/#/' -i ${D}/usr/$(get_libdir)/misc/xprint
+	doexe ${S}/Xprint/etc/init.d/xprint
+	# Patch init script for fonts location
+	sed -e 's:/lib/X11/fonts/:/share/fonts/:g' \
+		-i ${D}/usr/$(get_libdir)/misc/xprint
 	# Install the wrapper
 	newinitd ${FILESDIR}/xprint.init xprint
 	# Install profile scripts
diff --git a/x11-base/xorg-server/xorg-server-1.0.99.901-r1.ebuild b/x11-base/xorg-server/xorg-server-1.0.99.901-r1.ebuild
index b2da1fcaf0de..d15f88e130aa 100644
--- a/x11-base/xorg-server/xorg-server-1.0.99.901-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.0.99.901-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.0.99.901-r1.ebuild,v 1.1 2006/04/21 09:12:50 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.0.99.901-r1.ebuild,v 1.2 2006/04/23 22:32:14 spyderous Exp $
 
 # Must be before x-modular eclass is inherited
 # Hack to make sure autoreconf gets run
@@ -16,6 +16,8 @@ MESA_P="${MESA_PN}-${MESA_PV}"
 MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
 
 PATCHES="${FILESDIR}/${PN}-1.0.2-Sbus.patch
+	${FILESDIR}/${PN}-1.0.2-xprint-init.patch
+	${FILESDIR}/${PV}-Xprint-xprintdir.patch
 	${FILESDIR}/1.0.2-try-to-fix-xorgcfg.patch
 	${FILESDIR}/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch
 	${FILESDIR}/${PV}-fix-kdrive-build.patch
@@ -258,9 +260,10 @@ switch_opengl_implem() {
 xprint_src_install() {
 	# RH-style init script, we provide a wrapper
 	exeinto /usr/$(get_libdir)/misc
-	# Actually a shell script, someone messed up
-	newexe ${S}/Xprint/etc/init.d/xprint.cpp xprint
-	sed -e 's/XCOMM/#/' -i ${D}/usr/$(get_libdir)/misc/xprint
+	doexe ${S}/Xprint/etc/init.d/xprint
+	# Patch init script for fonts location
+	sed -e 's:/lib/X11/fonts/:/share/fonts/:g' \
+		-i ${D}/usr/$(get_libdir)/misc/xprint
 	# Install the wrapper
 	newinitd ${FILESDIR}/xprint.init xprint
 	# Install profile scripts