Re: Bug#736765: USB mouse attach event not processed
Control: forwarded -1 http://lists.x.org/archives/xorg-devel/2014-February/040633.html
On Thu, Feb 13, 2014 at 09:24:08PM +0100, Julien Cristau wrote:
> On Thu, Feb 13, 2014 at 16:06:49 +0000, Robert Millan wrote:
>
> > ++#if XORG_VERSION_CURRENT < 10800000
>
> These don't belong here. We know what version we're building.
>
> Also in general I'd prefer to wait until the patch is at least sent to
> xorg-devel before taking it.
Hi Julien,
The patch is in xorg-devel. I've also removed the XORG_VERSION_CURRENT
cruft you pointed out. Would you consider it now?
Latest version is in URL above. I'm attaching the Debian part as a
separate patch.
--
Robert Millan
diff -Nur -x .pc xorg-server-1.14.5.old/debian/control xorg-server-1.14.5/debian/control
--- xorg-server-1.14.5.old/debian/control 2014-02-08 01:52:23.000000000 +0100
+++ xorg-server-1.14.5/debian/control 2014-02-08 01:53:10.249920492 +0100
@@ -49,8 +49,6 @@
libpciaccess-dev (>= 0.12.901),
libgcrypt-dev,
nettle-dev,
- libdbus-1-dev [kfreebsd-any],
- libhal-dev [kfreebsd-any],
libudev-dev (>= 151-3) [linux-any],
libselinux1-dev (>= 2.0.80) [linux-any],
libaudit-dev [linux-any],
@@ -90,6 +88,7 @@
xserver-common (>= ${source:Version}),
keyboard-configuration [linux-any kfreebsd-any],
udev (>= 149) [linux-any],
+ devd [kfreebsd-any],
${shlibs:Depends},
${misc:Depends},
Recommends: libgl1-mesa-dri (>= 7.10.2-4)
@@ -150,6 +149,7 @@
x11-xkb-utils-udeb,
# disabled: keyboard-configuration [linux-any kfreebsd-any],
udev-udeb (>= 149) [linux-any],
+ devd-udeb [kfreebsd-any],
${shlibs:Depends},
${misc:Depends},
Provides:
diff -Nur -x .pc xorg-server-1.14.5.old/debian/rules xorg-server-1.14.5/debian/rules
--- xorg-server-1.14.5.old/debian/rules 2014-02-08 01:52:23.000000000 +0100
+++ xorg-server-1.14.5/debian/rules 2014-02-08 01:55:28.331918289 +0100
@@ -57,17 +57,15 @@
dri = --enable-dri --enable-dri2
endif
-config_backend = --disable-config-dbus
+config_backend = --disable-config-dbus --disable-config-hal
ifeq ($(DEB_HOST_ARCH_OS), linux)
- config_backend += --enable-config-udev --disable-config-hal
+ config_backend += --enable-config-udev
else ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
config_backend += --disable-config-udev
- config_backend_main += --enable-config-hal
- config_backend_udeb += --disable-config-hal
libs = $(shell pkg-config --libs libbsd-overlay)
cppflags = $(shell pkg-config --cflags libbsd-overlay)
else # hurd
- config_backend += --disable-config-udev --disable-config-hal
+ config_backend += --disable-config-udev
endif
vars = $(shell DEB_BUILD_MAINT_OPTIONS="hardening=+pie" DEB_LDFLAGS_MAINT_APPEND="-Wl,-Bsymbolic" DEB_CPPFLAGS_MAINT_APPEND="-DPRE_RELEASE=0 $(cppflags)" dpkg-buildflags --export=configure) LIBS="$(libs)"
Reply to: