aclocal.m4 | 2
configure | 2
debian/changelog | 10 +++
debian/control | 88 +++++++++++++++++-----------------
debian/patches/94_xprint_XSERVER_LIBS | 2
debian/patches/95_xprint_disable_dbus | 30 +++++++++++
debian/patches/series | 1
debian/rules | 2
ltmain.sh | 2
9 files changed, 89 insertions(+), 50 deletions(-)
New commits:
commit ba7f4283c33acbf8625b00486035da1ccfdae888
Author: Drew Parsons <[EMAIL PROTECTED]>
Date: Sat May 10 02:09:56 2008 +1000
reinstate xprint
again
diff --git a/debian/control b/debian/control
index fb9bd70..1c00a3d 100644
--- a/debian/control
+++ b/debian/control
@@ -200,50 +200,50 @@ Description: nested X server
# .
# This package is built from the X.org xserver module.
-#Package: xprint
-#Architecture: any
-#Depends: ${shlibs:Depends}, ${misc:Depends}, xprint-common, libxfont1 (>=
1:1.1)
-#Recommends: xprint-utils
-#Conflicts: xprt (<= 4.3.0.dfsg.1-10)
-#Description: X11 print system (binary)
-# Xprint is an advanced printing system which enables X11 applications
-# to use devices like printers, fax or create documents in formats like
-# PostScript, PDF, PCL, etc.
-# .
-# This package provides Xprt, the Xprint server compiled from
-# xprint.mozdev.org, an X.org subproject. Xprint provides superior support
-# for printing from Mozilla, including non-Latin characters and MathML.
-# TrueType fonts are supported.
-# .
-# Xprint uses ttf2pt1 internally for some font support.
-# .
-# More information about X.Org can be found at:
-# <URL:http://www.X.org>
-# <URL:http://xorg.freedesktop.org>
-# <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
-# .
-# This package is built from the X.org xserver module.
-#
-#Package: xprint-common
-#Architecture: all
-#Depends: xbase-clients, xfonts-encodings, x11-common (>= 1:7.0.12),
${shlibs:Depends}, ${misc:Depends}
-#Recommends: xprint, xfonts-base
-#Conflicts: xprt-common
-#Replaces: xprt-common
-#Description: Xprint - the X11 print system (configuration files)
-# Xprint is an advanced printing system which enables X11 applications
-# to use devices like printers, FAX or create documents in formats like
-# PostScript, PDF, PCL, etc.
-# .
-# This package provides the configuration and Postscript definition files
-# required to run Xprt, the Xprint server. Xprt is provided by xprint.
-# .
-# More information about X.Org can be found at:
-# <URL:http://www.X.org>
-# <URL:http://xorg.freedesktop.org>
-# <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
-# .
-# This package is built from the X.org xserver module.
+Package: xprint
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, xprint-common, libxfont1 (>=
1:1.1)
+Recommends: xprint-utils
+Conflicts: xprt (<= 4.3.0.dfsg.1-10)
+Description: X11 print system (binary)
+ Xprint is an advanced printing system which enables X11 applications
+ to use devices like printers, fax or create documents in formats like
+ PostScript, PDF, PCL, etc.
+ .
+ This package provides Xprt, the Xprint server compiled from
+ xprint.mozdev.org, an X.org subproject. Xprint provides superior support
+ for printing from Mozilla, including non-Latin characters and MathML.
+ TrueType fonts are supported.
+ .
+ Xprint uses ttf2pt1 internally for some font support.
+ .
+ More information about X.Org can be found at:
+ <URL:http://www.X.org>
+ <URL:http://xorg.freedesktop.org>
+ <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
+ .
+ This package is built from the X.org xserver module.
+
+Package: xprint-common
+Architecture: all
+Depends: xbase-clients, xfonts-encodings, x11-common (>= 1:7.0.12),
${shlibs:Depends}, ${misc:Depends}
+Recommends: xprint, xfonts-base
+Conflicts: xprt-common
+Replaces: xprt-common
+Description: Xprint - the X11 print system (configuration files)
+ Xprint is an advanced printing system which enables X11 applications
+ to use devices like printers, FAX or create documents in formats like
+ PostScript, PDF, PCL, etc.
+ .
+ This package provides the configuration and Postscript definition files
+ required to run Xprt, the Xprint server. Xprt is provided by xprint.
+ .
+ More information about X.Org can be found at:
+ <URL:http://www.X.org>
+ <URL:http://xorg.freedesktop.org>
+ <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
+ .
+ This package is built from the X.org xserver module.
Package: xserver-xorg-core-dbg
Architecture: any
diff --git a/debian/rules b/debian/rules
index 2c8dbc0..385e906 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,7 @@ endif
build_xfbdev = --disable-xfbdev
#endif
-BUILD_XPRINT = false
+BUILD_XPRINT = true
ifeq ($(BUILD_XPRINT), true)
confflags += --enable-xprint
else
commit b554a784529f44862f00349c9e1150b22540afac
Author: Drew Parsons <[EMAIL PROTECTED]>
Date: Sat May 10 01:31:24 2008 +1000
autoreconf
configure.ac was changed to disable dbus in xprint
diff --git a/aclocal.m4 b/aclocal.m4
index c375241..fd9a8a9 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -21,7 +21,7 @@ To do so, use the procedure documented by the package,
typically `autoreconf'.])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
+# serial 52 Debian 1.5.26-3 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
diff --git a/configure b/configure
index b6a7a4d..ae56122 100755
--- a/configure
+++ b/configure
@@ -34830,7 +34830,7 @@ echo "${ECHO_T}yes" >&6; }
:
fi
XPRINT_CFLAGS="$XPRINTMODULES_CFLAGS"
- XPRINT_LIBS="$XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB
$RENDER_LIB $COMPOSITE_LIB $RANDR_LIB $XI_LIB $FIXES_LIB $DAMAGE_LIB $XI_LIB
$GLX_LIBS $MIEXT_DAMAGE_LIB $CWRAP_LIBS $XKB_LIB $XKB_STUB_LIB $DIX_LIB
$CONFIG_LIB $MI_LIB $OS_LIB"
+ XPRINT_LIBS="$XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $RENDER_LIB
$COMPOSITE_LIB $RANDR_LIB $XI_LIB $FIXES_LIB $DAMAGE_LIB $XI_LIB $GLX_LIBS
$MIEXT_DAMAGE_LIB $CWRAP_LIBS $XKB_LIB $XKB_STUB_LIB $DIX_LIB $MI_LIB $OS_LIB"
XPRINT_SYS_LIBS="$XPRINTMODULES_LIBS"
xpconfigdir=$libdir/X11/xserver
diff --git a/ltmain.sh b/ltmain.sh
index 0bf3848..bba8b1c 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -43,7 +43,7 @@ EXIT_FAILURE=1
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION="1.5.26 Debian 1.5.26-4"
+VERSION="1.5.26 Debian 1.5.26-3"
TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
commit 4df1b33d15be1eb9952dd096ac4475c0e119c682
Author: Drew Parsons <[EMAIL PROTECTED]>
Date: Sat May 10 01:27:56 2008 +1000
Patch 95_xprint_disable_dbus: disable D-BUS in Xprint
If dbus is enabled in Xprt, it causes Dispatch() to loop without
waiting, using 95% cpu. Adapting from upstream commit
2a3d1421e0cc18822ae8f478fcc272e16a9e9340, we disable dbus in Xprt
using dummy config functions. We use a patch rather than cherry-pick
because of interference in configure.ac by 94_xprint_XSERVER_LIBS, and
for the same reason share some of the dbus disabling with that patch.
Closes: #472180.
diff --git a/debian/changelog b/debian/changelog
index 4d16b9a..0de5078 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,17 @@
xorg-server (2:1.4.1~git20080507-2) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Pass -DPRE_RELEASE=0 in CPPFLAGS, so we don't print the pre-release
warning in the Xorg log.
- -- Julien Cristau <[EMAIL PROTECTED]> Fri, 09 May 2008 17:32:45 +0200
+ [ Drew Parsons ]
+ * Patch 95_xprint_disable_dbus disables dbus in Xprint by providing
+ dummy config functions. Taken from upstream commit
+ 2a3d1421e0cc18822ae8f478fcc272e16a9e9340, with removal of
+ CONFIG_LIB from configure.ac shifted to 94_xprint_XSERVER_LIBS.
+ Closes: #472180.
+
+ -- Drew Parsons <[EMAIL PROTECTED]> Sat, 10 May 2008 03:18:04 +1000
xorg-server (2:1.4.1~git20080507-1) unstable; urgency=low
diff --git a/debian/patches/94_xprint_XSERVER_LIBS
b/debian/patches/94_xprint_XSERVER_LIBS
index 2e74739..3c3a4b0 100644
--- a/debian/patches/94_xprint_XSERVER_LIBS
+++ b/debian/patches/94_xprint_XSERVER_LIBS
@@ -15,7 +15,7 @@
PKG_CHECK_MODULES([XPRINTMODULES], [printproto x11 xfont $XDMCP_MODULES
xau])
XPRINT_CFLAGS="$XPRINTMODULES_CFLAGS"
- XPRINT_LIBS="$XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB
$RENDER_LIB $COMPOSITE_LIB $RANDR_LIB $XI_LIB $FIXES_LIB $DAMAGE_LIB $XI_LIB
$GLX_LIBS $MIEXT_DAMAGE_LIB $CWRAP_LIBS $XKB_LIB $XKB_STUB_LIB"
-+ XPRINT_LIBS="$XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB
$RENDER_LIB $COMPOSITE_LIB $RANDR_LIB $XI_LIB $FIXES_LIB $DAMAGE_LIB $XI_LIB
$GLX_LIBS $MIEXT_DAMAGE_LIB $CWRAP_LIBS $XKB_LIB $XKB_STUB_LIB $DIX_LIB
$CONFIG_LIB $MI_LIB $OS_LIB"
++ XPRINT_LIBS="$XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $RENDER_LIB
$COMPOSITE_LIB $RANDR_LIB $XI_LIB $FIXES_LIB $DAMAGE_LIB $XI_LIB $GLX_LIBS
$MIEXT_DAMAGE_LIB $CWRAP_LIBS $XKB_LIB $XKB_STUB_LIB $DIX_LIB $MI_LIB $OS_LIB"
XPRINT_SYS_LIBS="$XPRINTMODULES_LIBS"
xpconfigdir=$libdir/X11/xserver
diff --git a/debian/patches/95_xprint_disable_dbus
b/debian/patches/95_xprint_disable_dbus
new file mode 100644
index 0000000..1a9c703
--- /dev/null
+++ b/debian/patches/95_xprint_disable_dbus
@@ -0,0 +1,30 @@
+From: Drew Parsons <[EMAIL PROTECTED]>
+Date: Fri, 9 May 2008 13:20:11 +0000 (+1000)
+Subject: Disable D-BUS from Xprint.
+X-Git-Url:
http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commitdiff;h=2a3d1421e0cc18822ae8f478fcc272e16a9e9340
+
+Disable D-BUS from Xprint.
+
+Use dummy config functions to replace those from config/config.c, and
+therefore do not link Xprt with $CONFIG_LIB.
+
+Works around an endlessly spinning loop in dix/dispatch.c::Dispatch()
+(WaitForSomething() not waiting) when built with dbus, which was
+causing Xprt to use 95% cpu.
+---
+
+--- a/hw/xprint/ddxInit.c
++++ b/hw/xprint/ddxInit.c
+@@ -291,6 +291,12 @@ ddxProcessArgument (
+ #include "XIstubs.h"
+ #include "exglobals.h"
+
++/* Place dummy config functions here instead of config/config.c,
++ since Xprint does not use D-BUS */
++void config_init() { }
++void config_fini() { }
++
++
+ int
+ ChangePointerDevice (
+ DeviceIntPtr old_dev,
diff --git a/debian/patches/series b/debian/patches/series
index 8352e06..b48bd45 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -27,3 +27,4 @@
93_spooltodir_check_file_exists
93_xprint_fonts_fix
94_xprint_XSERVER_LIBS
+95_xprint_disable_dbus
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
