xorg-server: Changes to 'ubuntu'
debian/changelog |7 +++
hw/xfree86/common/xf86Config.c |8
hw/xfree86/common/xf86Init.c | 31 ---
3 files changed, 35 insertions(+), 11 deletions(-)
New commits:
commit 3a70935e497c908419a2704e699e615d148718d3
Author: Chase Douglas
Date: Fri Mar 23 17:27:57 2012 -0700
Fix crash at startup due to input option abi break (LP: #931397)
* Fix crash at startup due to input option abi break (LP: #931397)
- Revert two commits from upstream 1.12 input stack
diff --git a/debian/changelog b/debian/changelog
index 4bc443c..07f3208 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.11.4-0ubuntu8) UNRELEASED; urgency=low
+
+ * Fix crash at startup due to input option abi break (LP: #931397)
+- Revert two commits from upstream 1.12 input stack
+
+ -- Chase Douglas Fri, 23 Mar 2012 17:26:12 -0700
+
xorg-server (2:1.11.4-0ubuntu7) precise; urgency=low
* debian/patches/111_armel-drv-fallbacks.patch:
commit c3eea9872d90bd64bf1470518553ccdb80a85ce6
Author: Chase Douglas
Date: Fri Mar 23 17:25:04 2012 -0700
Revert "xfree86: use NewInputDeviceRequest for xorg.conf devices too"
This commit uses the new 1.12 input option abi. We are sticking with the
1.11 option abi. This ends up causing memory corruption and segfaults.
This reverts commit 7ee1621364d2b6230bb1c02bbdb5b6abb74ad2ff.
Signed-off-by: Chase Douglas
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index f93724b..b831d9a 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -1239,10 +1239,6 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool
implicitLayout)
if (foundPointer) {
Pointer->options = xf86AddNewOption(Pointer->options,
"CorePointer", "on");
- Pointer->options = xf86AddNewOption(Pointer->options,
- "driver",
confInput->inp_driver);
- Pointer->options = xf86AddNewOption(Pointer->options,
- "identifier",
confInput->inp_identifier);
servlayoutp->inputs = addDevice(servlayoutp->inputs, Pointer);
}
}
@@ -1333,10 +1329,6 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool
implicitLayout)
if (foundKeyboard) {
Keyboard->options = xf86AddNewOption(Keyboard->options,
"CoreKeyboard", "on");
- Keyboard->options = xf86AddNewOption(Keyboard->options,
-"driver",
confInput->inp_driver);
- Keyboard->options = xf86AddNewOption(Keyboard->options,
-"identifier",
confInput->inp_identifier);
servlayoutp->inputs = addDevice(servlayoutp->inputs, Keyboard);
}
}
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index e4abfae..5ee68cd 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -791,6 +791,21 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
NULL);
}
+static InputInfoPtr
+duplicateDevice(InputInfoPtr pInfo)
+{
+InputInfoPtr dup = calloc(1, sizeof(InputInfoRec));
+if (dup) {
+dup->name = strdup(pInfo->name);
+dup->driver = strdup(pInfo->driver);
+dup->options = xf86OptionListDuplicate(pInfo->options);
+/* type_name is a const string */
+dup->type_name = pInfo->type_name;
+dup->fd = -1;
+}
+return dup;
+}
+
/**
* Initialize all supported input devices present and referenced in the
* xorg.conf.
@@ -807,8 +822,20 @@ InitInput(int argc, char **argv)
/* Initialize all configured input devices */
for (pInfo = xf86ConfigLayout.inputs; pInfo && *pInfo; pInfo++) {
+InputInfoPtr dup;
+/* Replace obsolete keyboard driver with kbd */
+if (!xf86NameCmp((*pInfo)->driver, "keyboard")) {
+strcpy((*pInfo)->driver, "kbd");
+}
+
+/* Data passed into xf86NewInputDevice will be freed on shutdown.
+ * Duplicate from xf86ConfigLayout.inputs, otherwise we don't have any
+ * xorg.conf input devices in the second generation
+ */
+dup = duplicateDevice(*pInfo);
+
/* If one fails, the others will too */
-if (NewInputDeviceRequest((*pInfo)->options, NULL, &dev) == BadAlloc)
+if (xf86NewInputDevice(dup, &dev, TRUE) == BadAlloc)
break;
}
commit f9a799a5c022d36bf02fe6ac397ef75e40c0e530
Author: Chase Douglas
Date: Fri Mar 23 17:23:41 2012 -0700
Revert "xfree86: duplicate name and driver from pInfo for
NewInputDeviceRequest"
This commit uses the new 1.12 input option abi. We are sticking with the
1.11 option abi. This ends
xorg-server: Changes to 'upstream-1.11+input'
hw/xfree86/common/xf86Config.c |8
hw/xfree86/common/xf86Init.c | 31 ---
2 files changed, 28 insertions(+), 11 deletions(-)
New commits:
commit c3eea9872d90bd64bf1470518553ccdb80a85ce6
Author: Chase Douglas
Date: Fri Mar 23 17:25:04 2012 -0700
Revert "xfree86: use NewInputDeviceRequest for xorg.conf devices too"
This commit uses the new 1.12 input option abi. We are sticking with the
1.11 option abi. This ends up causing memory corruption and segfaults.
This reverts commit 7ee1621364d2b6230bb1c02bbdb5b6abb74ad2ff.
Signed-off-by: Chase Douglas
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index f93724b..b831d9a 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -1239,10 +1239,6 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool
implicitLayout)
if (foundPointer) {
Pointer->options = xf86AddNewOption(Pointer->options,
"CorePointer", "on");
- Pointer->options = xf86AddNewOption(Pointer->options,
- "driver",
confInput->inp_driver);
- Pointer->options = xf86AddNewOption(Pointer->options,
- "identifier",
confInput->inp_identifier);
servlayoutp->inputs = addDevice(servlayoutp->inputs, Pointer);
}
}
@@ -1333,10 +1329,6 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool
implicitLayout)
if (foundKeyboard) {
Keyboard->options = xf86AddNewOption(Keyboard->options,
"CoreKeyboard", "on");
- Keyboard->options = xf86AddNewOption(Keyboard->options,
-"driver",
confInput->inp_driver);
- Keyboard->options = xf86AddNewOption(Keyboard->options,
-"identifier",
confInput->inp_identifier);
servlayoutp->inputs = addDevice(servlayoutp->inputs, Keyboard);
}
}
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index e4abfae..5ee68cd 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -791,6 +791,21 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
NULL);
}
+static InputInfoPtr
+duplicateDevice(InputInfoPtr pInfo)
+{
+InputInfoPtr dup = calloc(1, sizeof(InputInfoRec));
+if (dup) {
+dup->name = strdup(pInfo->name);
+dup->driver = strdup(pInfo->driver);
+dup->options = xf86OptionListDuplicate(pInfo->options);
+/* type_name is a const string */
+dup->type_name = pInfo->type_name;
+dup->fd = -1;
+}
+return dup;
+}
+
/**
* Initialize all supported input devices present and referenced in the
* xorg.conf.
@@ -807,8 +822,20 @@ InitInput(int argc, char **argv)
/* Initialize all configured input devices */
for (pInfo = xf86ConfigLayout.inputs; pInfo && *pInfo; pInfo++) {
+InputInfoPtr dup;
+/* Replace obsolete keyboard driver with kbd */
+if (!xf86NameCmp((*pInfo)->driver, "keyboard")) {
+strcpy((*pInfo)->driver, "kbd");
+}
+
+/* Data passed into xf86NewInputDevice will be freed on shutdown.
+ * Duplicate from xf86ConfigLayout.inputs, otherwise we don't have any
+ * xorg.conf input devices in the second generation
+ */
+dup = duplicateDevice(*pInfo);
+
/* If one fails, the others will too */
-if (NewInputDeviceRequest((*pInfo)->options, NULL, &dev) == BadAlloc)
+if (xf86NewInputDevice(dup, &dev, TRUE) == BadAlloc)
break;
}
commit f9a799a5c022d36bf02fe6ac397ef75e40c0e530
Author: Chase Douglas
Date: Fri Mar 23 17:23:41 2012 -0700
Revert "xfree86: duplicate name and driver from pInfo for
NewInputDeviceRequest"
This commit uses the new 1.12 input option abi. We are sticking with the
1.11 option abi. This ends up causing memory corruption and segfaults.
This reverts commit 4b7dd4523c11ef4952b78e4164b2fa7b34588867.
Signed-off-by: Chase Douglas
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 0a47140..e4abfae 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -807,8 +807,6 @@ InitInput(int argc, char **argv)
/* Initialize all configured input devices */
for (pInfo = xf86ConfigLayout.inputs; pInfo && *pInfo; pInfo++) {
-(*pInfo)->options = xf86AddNewOption((*pInfo)->options, "driver",
(*pInfo)->driver);
-(*pInfo)->options = xf86AddNewOption((*pInfo)->options, "identifier",
(*pInfo)->name);
/* If one fails, the others will too */
if (NewInputDeviceRequest((*pInfo)->options, NULL, &dev) == BadAlloc)
break;
--
To
x11-utils: Changes to 'debian-unstable'
debian/changelog | 13
debian/rules |2
listres/ChangeLog | 150
listres/Makefile.am| 36
listres/Makefile.in| 316 +
listres/aclocal.m4 | 1890 ---
listres/config.guess | 18
listres/config.sub | 76
listres/configure | 7009 ++---
listres/configure.ac | 26
listres/listres.c | 25
listres/listres.man| 83
listres/man/Makefile.am| 12
listres/man/Makefile.in| 414 ++
listres/man/listres.man| 83
luit/ChangeLog | 122
luit/Makefile.in |2
luit/aclocal.m4| 1168 +-
luit/charset.c |2
luit/charset.h |1
luit/config.h.in |6
luit/configure | 6140 ++-
luit/configure.ac | 10
luit/iso2022.c | 19
luit/luit.c|4
luit/luit.h| 20
luit/man/Makefile.in |2
luit/man/luit.man |4
luit/sys.c | 16
xdpyinfo/ChangeLog | 122
xdpyinfo/Makefile.am | 23
xdpyinfo/Makefile.in | 300 +
xdpyinfo/aclocal.m4| 514 ++-
xdpyinfo/configure | 121
xdpyinfo/configure.ac | 41
xdpyinfo/man/Makefile.am | 12
xdpyinfo/man/Makefile.in | 439 ++
xdpyinfo/man/xdpyinfo.man | 69
xdpyinfo/xdpyinfo.c| 196 -
xdpyinfo/xdpyinfo.man | 72
xev/ChangeLog | 130
xev/Makefile.am| 23
xev/Makefile.in| 302 +
xev/aclocal.m4 | 984 -
xev/configure | 5517 +++-
xev/configure.ac | 21
xev/man/Makefile.am| 12
xev/man/Makefile.in| 414 ++
xev/man/xev.man| 61
xev/xev.c | 308 +
xev/xev.man| 61
xfd/ChangeLog | 111
xfd/Makefile.am| 32
xfd/Makefile.in| 293 +
xfd/aclocal.m4 | 1075 --
xfd/config.h.in|3
xfd/configure | 5730 -
xfd/configure.ac | 20
xfd/grid.c | 108
xfd/grid.h |2
xfd/gridP.h|6
xfd/m4/ax_define_dir.m4| 49
xfd/man/Makefile.am| 12
xfd/man/Makefile.in| 418 ++
xfd/man/xfd.man| 201 +
xfd/xfd.c | 72
xfd/xfd.man| 201 -
xfontsel/COPYING |8
xfontsel/ChangeLog | 102
xfontsel/Makefile.am | 23
xfontsel/Makefile.in | 285 +
xfontsel/ULabel.c | 33
xfontsel/ULabel.h | 11
xfontsel/ULabelP.h | 18
xfontsel/aclocal.m4| 1168 +-
xfontsel/app-defaults/XFontSel |8
xfontsel/configure | 5873 ++
xfontsel/configure.ac | 15
xfontsel/man/Makefile.am | 12
xfontsel/man/Makefile.in | 417 ++
xfontsel/man/xfontsel.man | 227 +
xfontsel/xfontsel.c| 48
xfontsel/xfontsel.man | 229 -
83 files changed, 39380 insertions(+), 4841 deletions(-)
New commits:
commit da37dee89380963a9d43dd7548e26a75cdc4d27c
Author: Robert Hooker
Date: Fri Mar 23 17:19:41 2012 -0400
debian/rules: Pass --disable-selective-werror to configure to work around
util-macros craziness.
Needed for luit 1.1.1.
diff --git a/debian/changelog b/debian/changelog
index 06e9369..e546a34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ x11-utils (7.7~1) UNRELEASED; urgency=low
* xev 1.2.0
* xfd 1.1.1
* xfontsel 1.0.4
+ * Build with --disable-selective-werror to work around build problems
+caused by excessive -Werror's set in new xutils-dev.
- -- Robert Hooker Fri, 23 Mar 2012 17:09:24 -0400
+ -- Robert Hooker Fri, 23 Mar 2012 17:17:03 -0400
x11-utils (7.6+4) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index cc5e74e..65f3350 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,7 +49,7 @@ $(STAMP_DIR)/build-%: $(STAMP_DIR)/genscripts
$(STAMP_DIR)/patch
cd $*-build && \
../$*/configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
- CFLAGS="$(CFLAGS)"
+ --disable-selective-werror CFLAGS="$(CFLAGS)"
cd $*-build && $(MAKE)
>$@
commit 4af862516db3724751c6f43f7b4c77ad429b094c
Author: Robert Hooker
Date: Fri Mar 23
x11-apps: Changes to 'debian-unstable'
bitmap/BitEdit.c | 255 bitmap/Bitmap.c | 613 +- bitmap/Bitmap.h | 18 bitmap/BitmapP.h | 16 bitmap/ChangeLog | 187 bitmap/CutPaste.c | 40 bitmap/Dialog.c | 52 bitmap/Graphics.c | 478 - bitmap/Handlers.c | 302 - bitmap/Makefile.am| 10 bitmap/Makefile.in| 19 bitmap/ReqMach.c | 68 bitmap/Requests.h | 10 bitmap/aclocal.m4 | 1127 +++- bitmap/app-defaults/Bitmap|6 bitmap/app-defaults/Bitmap-nocase |6 bitmap/atobm.c| 36 bitmap/bmtoa.c| 39 bitmap/config.h.in|9 bitmap/configure | 6472 ++-- bitmap/configure.ac | 36 bitmap/man/Makefile.in|3 bitmap/man/bitmap.man |2 debian/changelog |8 xcursorgen/ChangeLog | 72 xcursorgen/Makefile.am| 15 xcursorgen/Makefile.in| 293 - xcursorgen/aclocal.m4 | 1168 +++- xcursorgen/autogen.sh | 13 xcursorgen/configure | 5873 ++ xcursorgen/configure.ac | 11 xcursorgen/man/Makefile.am| 12 xcursorgen/man/Makefile.in| 414 + xcursorgen/man/xcursorgen.man | 64 xcursorgen/xcursorgen.c | 22 xcursorgen/xcursorgen.man | 64 xload/ChangeLog | 186 xload/Makefile.am | 20 xload/Makefile.in | 285 - xload/aclocal.m4 | 1168 +++- xload/config.h.in | 41 xload/configure | 9987 ++ xload/configure.ac| 24 xload/get_load.c | 339 - xload/get_rload.c |1 xload/man/Makefile.am | 12 xload/man/Makefile.in | 419 + xload/man/xload.man | 109 xload/mkinstalldirs | 111 xload/xload.c |6 xload/xload.h |1 xload/xload.man | 113 xlogo/ChangeLog | 67 xlogo/Makefile.am | 24 xlogo/Makefile.in | 300 - xlogo/RenderLogo.c|4 xlogo/aclocal.m4 | 1078 +++- xlogo/configure | 6103 ++- xlogo/configure.ac| 16 xlogo/man/Makefile.am | 12 xlogo/man/Makefile.in | 417 + xlogo/man/xlogo.man | 90 xlogo/xlogo.man | 90 63 files changed, 32892 insertions(+), 5964 deletions(-) New commits: commit fb1173c9222bf6feecd5893e95a91018c1474d4b Author: Robert Hooker Date: Fri Mar 23 16:41:17 2012 -0400 xlogo 1.0.4 diff --git a/debian/changelog b/debian/changelog index 37205ef..ae8349a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,9 +10,10 @@ x11-apps (7.7~1) UNRELEASED; urgency=low * bitmap 1.0.6 * xcursorgen 1.0.5 * xload 1.1.1 + * xlogo 1.0.4 * Drop oclock-ftbfs.diff, upstream. - -- Robert Hooker Fri, 23 Mar 2012 16:39:31 -0400 + -- Robert Hooker Fri, 23 Mar 2012 16:40:58 -0400 x11-apps (7.6+5) unstable; urgency=low diff --git a/xlogo/ChangeLog b/xlogo/ChangeLog index 9eda074..6a8b287 100644 --- a/xlogo/ChangeLog +++ b/xlogo/ChangeLog @@ -1,3 +1,70 @@ +commit 81f58b56464520fde4e64c0764bc58d5d197b849 +Author: Alan Coopersmith +Date: Thu Mar 22 22:49:50 2012 -0700 + +xlogo 1.0.4 + +Signed-off-by: Alan Coopersmith + +commit 18e61546798d20b7b1c15a2ff5d554bee7ec6bdf +Author: Jeremy Huddleston +Date: Sun Sep 25 00:53:50 2011 -0700 + +Require xt >= 1.0 for appdefaultdir + +https://bugs.freedesktop.org/show_bug.cgi?id=7237 + +Signed-off-by: Jeremy Huddleston + +commit 0e96450836cc876d213e02491394da3f6fa7575d +Author: Gaetan Nadon +Date: Wed Jan 19 10:06:56 2011 -0500 + +config: move man pages into their own directory + +Use services provided by XORG_MANPAGE_SECTIONS. +Use standard Makefile for man pages. + +Signed-off-by: Gaetan Nadon + +commit 7c7b2beb9b94790f9f08049163b85a37d253f0f6 +Author: Gaetan Nadon +Date: Thu Jan 13 17:15:36 2011 -0500 + +man: replace hard coded man page section with substitution strings + +Signed-off-by: Gaetan Nadon + +commit 7a21422aa690f4734da047ee03ea49723acda342 +Author: Gaetan Nadon +Date: Wed Jan 12 16:28:02 2011 -0500 + +config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS + +This silences an Autoconf warning + +commit d1fe51c3209702740a2b073fa690aa2ce138bc7e +Author: Gaetan Nadon +Date: Wed Jan 12 15:29:50 2011 -0500 + +config: replace deprecated AC
Processed: tagging 664962
Processing commands for cont...@bugs.debian.org: > tags 664962 + upstream fixed-upstream Bug #664962 [x11-xkb-utils] xkbevd(1): Missing "f" after an escape to show font change in the manual Added tag(s) upstream and fixed-upstream. > thanks Stopping processing here. Please contact me if you need assistance. -- 664962: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=664962 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/handler.s.c.1332527584660.transcr...@bugs.debian.org
Bug#664962: xkbevd(1): Missing "f" after an escape to show font change in the manual
On Wed, Mar 21, 2012 at 21:11:00 +, Bjarni Ingi Gislason wrote: > Package: x11-xkb-utils > Version: 7.6+4 > Severity: minor > Tags: patch > > From "groff": > > :41: warning: escape character ignored before `P' > > Some spaces corrected. > > Patch is in the attachment, is for version 7.6+4. > Thanks, pushed upstream (as two separate commits for the escape sequence and whitespace). Cheers, Julien -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20120323183344.ga22...@radis.cristau.org
xserver-xorg-input-synaptics: Changes to 'ubuntu'
ChangeLog | 119
conf/50-synaptics.conf| 18 +
configure.ac |2
debian/changelog | 13 +
debian/patches/130_dont_enable_rightbutton_area.patch | 43
debian/patches/200_fix_clickfinger_non-clickpads.patch| 96 --
debian/patches/200_fix_four_tap.patch | 129 ++
debian/patches/201_fix_clickfinger_clickpad_actions.patch | 115
debian/patches/series |4
man/synaptics.man |2
src/eventcomm.c |3
src/synaptics.c | 51 -
src/synapticsstr.h|2
src/synproto.c| 13 +
src/synproto.h|1
15 files changed, 384 insertions(+), 227 deletions(-)
New commits:
commit 20d3435c18d7ec85089dee9d47eba4bfb4b512b2
Author: Chase Douglas
Date: Fri Mar 23 11:05:23 2012 -0700
Fix erroneous tap actions on four-touch tap (LP: #963327)
* Fix erroneous tap actions on four-touch tap (LP: #963327)
- Add temporary patch 200_fix_four_tap.patch
diff --git a/debian/changelog b/debian/changelog
index 8a95dfa..5d12796 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ xserver-xorg-input-synaptics (1.5.99.902-0ubuntu1) UNRELEASED;
urgency=low
- 201_fix_clickfinger_clickpad_actions.patch
* Revert upstream behavior change: enabling right button area by default
- Too late to enable in Precise
+ * Fix erroneous tap actions on four-touch tap (LP: #963327)
+- Add temporary patch 200_fix_four_tap.patch
- -- Chase Douglas Fri, 23 Mar 2012 11:00:10 -0700
+ -- Chase Douglas Fri, 23 Mar 2012 11:02:18 -0700
xserver-xorg-input-synaptics (1.5.99.901-0ubuntu2) precise; urgency=low
diff --git a/debian/patches/200_fix_four_tap.patch
b/debian/patches/200_fix_four_tap.patch
new file mode 100644
index 000..ef06691
--- /dev/null
+++ b/debian/patches/200_fix_four_tap.patch
@@ -0,0 +1,129 @@
+From 6e0268808fe6d7dfdb5beb198bf067df56452f15 Mon Sep 17 00:00:00 2001
+From: Chase Douglas
+Date: Fri, 23 Mar 2012 10:34:44 -0700
+Subject: [PATCH xf86-input-synaptics 1/2] Count number of multitouch touches
+ for multitouch finger count
+
+The evdev protocol only goes up to three touches for non-multitouch
+devices. If you perform a four touch tap, the finger count will only go
+up to three touches if you roll your fingers, or will always be 0 if all
+four touches land at the same time.
+
+This change ensures the correct finger count is reported.
+
+Signed-off-by: Chase Douglas
+---
+I test build with HAVE_MULTITOUCH undefined to be sure it didn't break
+anything.
+
+ src/eventcomm.c | 16 ++--
+ 1 files changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/src/eventcomm.c b/src/eventcomm.c
+index 3721c91..b485377 100644
+--- a/src/eventcomm.c
b/src/eventcomm.c
+@@ -72,6 +72,7 @@ struct eventcomm_proto_data
+ int axis_map[MT_ABS_SIZE];
+ int cur_slot;
+ ValuatorMask **last_mt_vals;
++int num_touches;
+ #endif
+ };
+
+@@ -565,6 +566,7 @@ EventProcessTouchEvent(InputInfoPtr pInfo, struct
SynapticsHwState *hw,
+ if (ev->value >= 0)
+ {
+ hw->slot_state[slot_index] = SLOTSTATE_OPEN;
++proto_data->num_touches++;
+
+ if (slot_index >= 0)
+ valuator_mask_copy(hw->mt_mask[slot_index],
+@@ -574,7 +576,10 @@ EventProcessTouchEvent(InputInfoPtr pInfo, struct
SynapticsHwState *hw,
+ "Attempted to copy values from out-of-range "
+ "slot, touch events may be incorrect.\n");
+ } else
++{
+ hw->slot_state[slot_index] = SLOTSTATE_CLOSE;
++proto_data->num_touches--;
++}
+ } else
+ {
+ int map = proto_data->axis_map[ev->code - ABS_MT_TOUCH_MAJOR];
+@@ -607,10 +612,17 @@ EventProcessTouchEvent(InputInfoPtr pInfo, struct
SynapticsHwState *hw,
+ * @param comm Assembled information from previous events.
+ * @return The number of fingers currently set.
+ */
+-static int count_fingers(const struct CommData *comm)
++static int count_fingers(InputInfoPtr pInfo, const struct CommData *comm)
+ {
++SynapticsPrivate *priv = (SynapticsPrivate *)pInfo->private;
++struct eventcomm_proto_data *proto_data = priv->proto_data;
+ int fingers = 0;
+
++#ifdef HAVE_MULTITOUCH
++if (priv->has_touch)
++return proto_data->num_touches;
++#endif
++
+ if (comm->oneFinger)
+ fingers = 1;
+ else if (comm->twoFingers)
+@@ -653,7 +665,7 @@ EventRea
xserver-xorg-input-synaptics: Changes to 'ubuntu'
debian/changelog | 14 +
debian/patches/129_disable_three_touch_tap.patch | 11 +
debian/patches/200_fix_clickfinger_non-clickpads.patch| 96 +++
debian/patches/201_fix_clickfinger_clickpad_actions.patch | 115 ++
debian/patches/series |5
5 files changed, 241 insertions(+)
New commits:
commit 809a6d8264878c8b3a5a7f01f46a4dfc9ab7fff0
Author: Chase Douglas
Date: Wed Mar 21 16:00:38 2012 -0700
releasing version 1.5.99.901-0ubuntu2
diff --git a/debian/changelog b/debian/changelog
index 01a26a2..c8d3d6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-synaptics (1.5.99.901-0ubuntu2) UNRELEASED; urgency=low
+xserver-xorg-input-synaptics (1.5.99.901-0ubuntu2) precise; urgency=low
* Disable three touch tap in favor of uTouch gestures (LP: #961725)
- See
@@ -10,7 +10,7 @@ xserver-xorg-input-synaptics (1.5.99.901-0ubuntu2)
UNRELEASED; urgency=low
* Fix click action finger count calculation (LP: #961738)
- Add temporary patch 201_fix_clickfinger_clickpad_actions.patch
- -- Chase Douglas Wed, 21 Mar 2012 15:53:15 -0700
+ -- Chase Douglas Wed, 21 Mar 2012 16:00:26 -0700
xserver-xorg-input-synaptics (1.5.99.901-0ubuntu1) precise; urgency=low
commit 7eb637f7a447636de56987821e72e60110c3170c
Author: Chase Douglas
Date: Wed Mar 21 15:54:15 2012 -0700
Fix click action finger count calculation (LP: #961738)
* Fix click action finger count calculation (LP: #961738)
- Add temporary patch 201_fix_clickfinger_clickpad_actions.patch
diff --git a/debian/changelog b/debian/changelog
index dc6c14d..01a26a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,10 @@ xserver-xorg-input-synaptics (1.5.99.901-0ubuntu2) UNRELEASED;
urgency=low
- Add 129_disable_three_touch_tap.patch
* Fix click actions for non-clickpad touchpads (LP: #960108)
- Add temporary patch 200_fix_clickfinger_non-clickpads.patch
+ * Fix click action finger count calculation (LP: #961738)
+- Add temporary patch 201_fix_clickfinger_clickpad_actions.patch
- -- Chase Douglas Wed, 21 Mar 2012 15:46:35 -0700
+ -- Chase Douglas Wed, 21 Mar 2012 15:53:15 -0700
xserver-xorg-input-synaptics (1.5.99.901-0ubuntu1) precise; urgency=low
diff --git a/debian/patches/201_fix_clickfinger_clickpad_actions.patch
b/debian/patches/201_fix_clickfinger_clickpad_actions.patch
new file mode 100644
index 000..0d82a93
--- /dev/null
+++ b/debian/patches/201_fix_clickfinger_clickpad_actions.patch
@@ -0,0 +1,115 @@
+From 5201038f7d4a58f78d9bcbf340fb4a50958c6ab0 Mon Sep 17 00:00:00 2001
+From: Chase Douglas
+Date: Wed, 21 Mar 2012 12:43:58 -0700
+Subject: [PATCH 1/2] Keep track of which touch slots are open
+
+This change adds a new touch slot state that denotes when the slot is
+open but does not have any new data to report.
+
+Signed-off-by: Chase Douglas
+---
+ src/eventcomm.c |3 ++-
+ src/synproto.c | 13 -
+ src/synproto.h |1 +
+ 3 files changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/src/eventcomm.c b/src/eventcomm.c
+index f199c24..3721c91 100644
+--- a/src/eventcomm.c
b/src/eventcomm.c
+@@ -557,7 +557,8 @@ EventProcessTouchEvent(InputInfoPtr pInfo, struct
SynapticsHwState *hw,
+ {
+ int slot_index = last_mt_vals_slot(priv);
+
+-if (hw->slot_state[slot_index] == SLOTSTATE_EMPTY)
++if (hw->slot_state[slot_index] == SLOTSTATE_EMPTY ||
++hw->slot_state[slot_index] == SLOTSTATE_OPEN_EMPTY)
+ hw->slot_state[slot_index] = SLOTSTATE_UPDATE;
+ if (ev->code == ABS_MT_TRACKING_ID)
+ {
+diff --git a/src/synproto.c b/src/synproto.c
+index bdf2d21..19a13e5 100644
+--- a/src/synproto.c
b/src/synproto.c
+@@ -152,7 +152,18 @@ SynapticsResetTouchHwState(struct SynapticsHwState *hw)
+ for (j = 2; j < valuator_mask_num_valuators(hw->mt_mask[i]); j++)
+ valuator_mask_unset(hw->mt_mask[i], j);
+
+-hw->slot_state[i] = SLOTSTATE_EMPTY;
++switch (hw->slot_state[i])
++{
++case SLOTSTATE_OPEN:
++case SLOTSTATE_OPEN_EMPTY:
++case SLOTSTATE_UPDATE:
++hw->slot_state[i] = SLOTSTATE_OPEN_EMPTY;
++break;
++
++default:
++hw->slot_state[i] = SLOTSTATE_EMPTY;
++break;
++}
+ }
+ #endif
+ }
+diff --git a/src/synproto.h b/src/synproto.h
+index 95ebc92..e16aeb0 100644
+--- a/src/synproto.h
b/src/synproto.h
+@@ -42,6 +42,7 @@ enum SynapticsSlotState
+ SLOTSTATE_EMPTY = 0,
+ SLOTSTATE_OPEN,
+ SLOTSTATE_CLOSE,
++SLOTSTATE_OPEN_EMPTY,
+ SLOTSTATE_UPDATE,
+ };
+
+--
+1.7.9.1
+
+From c229afff677daef0e5960cf334b29f1a0af38fcf Mon Sep 17 00:00:00 2001
+From: Chase Douglas
+Date: Wed, 21 Mar 2012 12:45:09 -0700
+Subject: [PATCH 2/2] Include open but unchanged to
Bug#665390: xserver-xorg-input-mouse: FTBFS[kfreebsd-amd64]:
Package: src:xserver-xorg-input-mouse Version: 1:1.7.2-1 Severity: serious Tags: sid wheezy User: debian-...@lists.debian.org Usertags: kfreebsd X-Debbugs-Cc: debian-...@lists.debian.org Justification: fails to build from source (but built successfully in the past) Hi! Your package failed to build on the kfreebsd-amd64 buildds: CC bsd_mouse.lo In file included from /usr/include/xorg/privates.h:145:0, from /usr/include/xorg/cursor.h:54, from /usr/include/xorg/scrnintstr.h:54, from /usr/include/xorg/xf86str.h:39, from /usr/include/xorg/xf86.h:44, from ../../src/bsd_mouse.c:32: /usr/include/xorg/dix.h:532:22: warning: redundant redeclaration of 'ffs' [-Wredundant-decls] ../../src/bsd_mouse.c: In function 'CheckProtocol': ../../src/bsd_mouse.c:142:30: error: array subscript is above array bounds [-Werror=array-bounds] cc1: some warnings being treated as errors make[3]: *** [bsd_mouse.lo] Error 1 Full build log at https://buildd.debian.org/status/fetch.php?pkg=xserver-xorg-input-mouse&arch=kfreebsd-amd64&ver=1%3A1.7.2-1&stamp=1332204550 Regards Christoph If you have further questions please mail debian-...@lists.debian.org -- 9FED 5C6C E206 B70A 5857 70CA 9655 22B9 D49A E731 Debian Developer | Lisp Hacker | CaCert Assurer -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/87398zyzlu@hepworth.siccegge.de
Bug#665371: xserver-xorg: Change of the X console
Package: xserver-xorg Version: 1:7.6+12 Severity: normal Dear Maintainer, *** Please consider answering these questions, where appropriate *** * What led up to the situation? When I switch from X to consoles are black. * What exactly did you do (or not do) that was effective (or ineffective)? t when I close the laptop lid are no longer consoles or turn black and just hangs on reboot when they are all dead processes. * What was the outcome of this action? As I said before the change of the X console are black and if I restart crashes kill FAIR to all processes. * What outcome did you expect instead? Well, should not bring such problems. Just say that the graphics card has no problems, but it works normal, 50 to 60 degrees Celsius. The X working properly, does not fail or cause problems. Using native Nvidia driver. Thank's. *** End of the template - remove these lines *** -- Package-specific info: X server symlink status: lrwxrwxrwx 1 root root 13 Sep 13 2011 /etc/X11/X -> /usr/bin/Xorg -rwxr-xr-x 1 root root 2044072 Mar 5 05:21 /usr/bin/Xorg VGA-compatible devices on PCI bus: -- 01:00.0 VGA compatible controller [0300]: nVidia Corporation G84 [GeForce 8600M GT] [10de:0407] (rev a1) Xorg X server configuration file status: -rw-r--r-- 1 root root 6493 Mar 23 14:17 /etc/X11/xorg.conf Contents of /etc/X11/xorg.conf: --- # nvidia-xconfig: X configuration file generated by nvidia-xconfig # nvidia-xconfig: version 295.20 (buildmeis...@swio-display-x86-rhel47-01.nvidia.com) Mon Feb 6 21:30:26 PST 2012 # /etc/X11/xorg.conf (xorg X Window System server configuration file) # # This file was generated by dexconf, the Debian X Configuration tool, using # values from the debconf database. # # Edit this file with caution, and see the /etc/X11/xorg.conf manual page. # (Type "man /etc/X11/xorg.conf" at the shell prompt.) # # This file is automatically updated on xserver-xorg package upgrades *only* # if it has not been modified since the last upgrade of the xserver-xorg # package. # # If you have edited this file but would like it to be automatically updated # again, run the following command: # sudo dpkg-reconfigure -phigh xserver-xorg #Section "InputDevice" #Identifier "Configured Mouse" #Driver "mouse" #Option "CorePointer" #Option "Device" "/dev/input/mice" #Option "Protocol" "ImPS/2" #Option "Emulate3Buttons" "true" #Option "ZAxisMapping" "4 5" #EndSection #Section "InputDevice" ## generated from default #Identifier "Mouse0" #Driver "mouse" #Option "Protocol" "auto" #Option "Device" "/dev/input/mice" #Option "Emulate3Buttons" "yes" #Option "ZAxisMapping" "4 5" #EndSection #Section "DRI" #Mode 0660 #EndSection Section "ServerLayout" #InputDevice"Configured Mouse" #InputDevice"Mouse0" Identifier "Default Layout" Screen "Default Screen" 0 0 InputDevice"Mouse0" "CorePointer" InputDevice"Generic Keyboard" InputDevice"Synaptics Touchpad" EndSection Section "Files" # path to defoma fonts FontPath"/usr/share/fonts/X11/misc" FontPath"/usr/share/fonts/X11/cyrillic" FontPath"/usr/share/fonts/X11/100dpi/:unscaled" FontPath"/usr/share/fonts/X11/75dpi/:unscaled" FontPath"/usr/share/fonts/X11/Type1" FontPath"/usr/share/fonts/X11/100dpi" FontPath"/usr/share/fonts/X11/75dpi" FontPath"/usr/share/fonts/truetype/freefont" FontPath"/usr/share/fonts/truetype/sjfonts" FontPath"/usr/share/fonts/truetype/ttf-dejavu" FontPath"/usr/share/fonts/truetype/ttf-liberation" FontPath"/usr/local/share/fonts" FontPath"/usr/share/fonts/truetype/msttcorefonts" FontPath"/usr/share/fonts/truetype/dustin" FontPath"/usr/share/ghostscript/fonts" FontPath"/usr/share/fonts/type1/gsfonts" EndSection Section "Module" Load "i2c" Load "bitmap" Load "dbe" Load "extmod" Load "freetype" Load "type1" Load "glx" Load "int10" Load "record" Load "vbe" #Load "v4l" #Load "v4l2" EndSection Section "ServerFlags" Option "Xinerama" "0" Option "AllowMouseFail" Option "DontZap" "on" Option "DontVTSwitch" "false" #Option "IgnoreABI" "false" Option "RandR" "on" Option "BlankTime" "0" Option "StandbyTime" "0" Option "SuspendTime" "0" Option "OffTime" "0" Option "AllowEmptyInput" "false" Option "AutoAd
