debian/changelog | 8 ++ debian/control | 4 - debian/patches/04-delibcwrap.patch | 142 +++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 4 files changed, 153 insertions(+), 2 deletions(-)
New commits: commit ab5e850aa6120180bdf1c7815c11685d87bf919a Author: Julien Cristau <[EMAIL PROTECTED]> Date: Sun Jun 1 15:55:01 2008 +0200 Add armel and armeb to the Architecture field. diff --git a/debian/changelog b/debian/changelog index a4f3867..7909434 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ xfree86-driver-synaptics (0.14.7~git20070706-3) UNRELEASED; urgency=low * Add patch to fix the build with xserver 1.5, which removed the libc wrapper (closes: #471494). + * Add armel and armeb to the Architecture field (closes: #461551). -- Julien Cristau <[EMAIL PROTECTED]> Wed, 12 Mar 2008 16:36:49 +0100 diff --git a/debian/control b/debian/control index cbf581c..acc0959 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-synapti Homepage: http://web.telia.com/~u89404340/touchpad/index.html Package: xfree86-driver-synaptics -Architecture: alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc sparc +Architecture: alpha amd64 arm armeb armel hppa i386 ia64 m68k mips mipsel powerpc sparc Depends: xserver-xorg-input-synaptics (>= 0.14.4-2) Description: dummy package to upgrade to X.Org new modular packages This is a dummy package provided to smooth upgrades from @@ -18,7 +18,7 @@ Description: dummy package to upgrade to X.Org new modular packages It can be safely removed once xserver-xorg-input-synaptics is installed. Package: xserver-xorg-input-synaptics -Architecture: alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc sparc +Architecture: alpha amd64 arm armeb armel hppa i386 ia64 m68k mips mipsel powerpc sparc Depends: ${shlibs:Depends}, ${xserver:Depends}, libxi6 Conflicts: xfree86-driver-synaptics (<< 0.14.4-2), xorg-driver-synaptics Replaces: xfree86-driver-synaptics (<< 0.14.4-2), xorg-driver-synaptics commit ca31da7357861c1996ae51eedf8cb90288979c8e Author: Julien Cristau <[EMAIL PROTECTED]> Date: Sun Jun 1 15:52:08 2008 +0200 Add patch to fix the build with xserver 1.5 The libc wrapper is gone (closes: #471494). diff --git a/debian/changelog b/debian/changelog index 4260c4d..a4f3867 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xfree86-driver-synaptics (0.14.7~git20070706-3) UNRELEASED; urgency=low + + * Add patch to fix the build with xserver 1.5, which removed the libc + wrapper (closes: #471494). + + -- Julien Cristau <[EMAIL PROTECTED]> Wed, 12 Mar 2008 16:36:49 +0100 + xfree86-driver-synaptics (0.14.7~git20070706-2) unstable; urgency=low * 01-synaptics-dont-grab-if-not-on-current-VT.patch from Matthew Garrett in diff --git a/debian/patches/04-delibcwrap.patch b/debian/patches/04-delibcwrap.patch new file mode 100644 index 0000000..3edd3e8 --- /dev/null +++ b/debian/patches/04-delibcwrap.patch @@ -0,0 +1,142 @@ +Patch by Jarod Wilson <[EMAIL PROTECTED]> +Downloaded from http://cvs.fedora.redhat.com/viewcvs/*checkout*/devel/synaptics/synaptics-0.14.6-delibcwrap.patch?rev=1.1 + +--- xserver-xorg-input-synaptics.orig/synaptics.c ++++ xserver-xorg-input-synaptics/synaptics.c +@@ -70,7 +70,6 @@ + #include <misc.h> + #include <xf86.h> + #define NEED_XF86_TYPES +-#include <xf86_ansic.h> + #include <xf86_OSproc.h> + #include <xf86Xinput.h> + #include "mipointer.h" +@@ -236,14 +235,14 @@ + return TRUE; /* Already allocated */ + + if (priv->shm_config) { +- if ((shmid = xf86shmget(SHM_SYNAPTICS, 0, 0)) != -1) +- xf86shmctl(shmid, XF86IPC_RMID, NULL); +- if ((shmid = xf86shmget(SHM_SYNAPTICS, sizeof(SynapticsSHM), +- 0777 | XF86IPC_CREAT)) == -1) { ++ if ((shmid = shmget(SHM_SYNAPTICS, 0, 0)) != -1) ++ shmctl(shmid, IPC_RMID, NULL); ++ if ((shmid = shmget(SHM_SYNAPTICS, sizeof(SynapticsSHM), ++ 0777 | IPC_CREAT)) == -1) { + xf86Msg(X_ERROR, "%s error shmget\n", local->name); + return FALSE; + } +- if ((priv->synpara = (SynapticsSHM*)xf86shmat(shmid, NULL, 0)) == NULL) { ++ if ((priv->synpara = (SynapticsSHM*)shmat(shmid, NULL, 0)) == NULL) { + xf86Msg(X_ERROR, "%s error shmat\n", local->name); + return FALSE; + } +@@ -269,8 +268,8 @@ + return; + + if (priv->shm_config) { +- if ((shmid = xf86shmget(SHM_SYNAPTICS, 0, 0)) != -1) +- xf86shmctl(shmid, XF86IPC_RMID, NULL); ++ if ((shmid = shmget(SHM_SYNAPTICS, 0, 0)) != -1) ++ shmctl(shmid, IPC_RMID, NULL); + } else { + xfree(priv->synpara); + } +@@ -284,7 +283,7 @@ + char *str_par; + double value; + str_par = xf86FindOptionValue(options, optname); +- if ((!str_par) || (xf86sscanf(str_par, "%lf", &value) != 1)) ++ if ((!str_par) || (sscanf(str_par, "%lf", &value) != 1)) + return default_value; + return value; + } +@@ -491,8 +490,8 @@ + priv->fifofd = -1; + if (repeater) { + /* create repeater fifo */ +- if ((xf86mknod(repeater, 666, XF86_S_IFIFO) != 0) && +- (xf86errno != xf86_EEXIST)) { ++ if ((mknod(repeater, 666, S_IFIFO) != 0) && ++ (errno != EEXIST)) { + xf86Msg(X_ERROR, "%s can't create repeater fifo\n", local->name); + } else { + /* open the repeater fifo */ +@@ -501,7 +500,7 @@ + xf86Msg(X_ERROR, "%s repeater device open failed\n", local->name); + } + } +- xf86free(repeater); ++ free(repeater); + } + + if (!QueryHardware(local)) { +@@ -697,7 +696,7 @@ + static int + move_distance(int dx, int dy) + { +- return xf86sqrt(SQR(dx) + SQR(dy)); ++ return sqrt((dx * dx) + (dy * dy)); + } + + /* +@@ -732,14 +731,14 @@ + double xCenter = (priv->synpara->left_edge + priv->synpara->right_edge) / 2.0; + double yCenter = (priv->synpara->top_edge + priv->synpara->bottom_edge) / 2.0; + +- return xf86atan2(-(y - yCenter), x - xCenter); ++ return atan2(-(y - yCenter), x - xCenter); + } + + /* return angle difference */ + static double + diffa(double a1, double a2) + { +- double da = xf86fmod(a2 - a1, 2 * M_PI); ++ double da = fmod(a2 - a1, 2 * M_PI); + if (da < 0) + da += 2 * M_PI; + if (da > M_PI) +@@ -847,7 +846,7 @@ + int c; + while ((c = XisbRead(priv->comm.buffer)) >= 0) { + unsigned char u = (unsigned char)c; +- xf86write(priv->fifofd, &u, 1); ++ write(priv->fifofd, &u, 1); + if (++count >= 3) + break; + } +@@ -1405,10 +1404,10 @@ + + /* save the fraction, report the integer part */ + tmpf = dx * speed + x_edge_speed * dtime + priv->frac_x; +- priv->frac_x = xf86modf(tmpf, &integral); ++ priv->frac_x = modf(tmpf, &integral); + dx = integral; + tmpf = dy * speed + y_edge_speed * dtime + priv->frac_y; +- priv->frac_y = xf86modf(tmpf, &integral); ++ priv->frac_y = modf(tmpf, &integral); + dy = integral; + } + +--- xserver-xorg-input-synaptics.orig/synaptics.h ++++ xserver-xorg-input-synaptics/synaptics.h +@@ -1,6 +1,18 @@ + #ifndef _SYNAPTICS_H_ + #define _SYNAPTICS_H_ + ++#include <errno.h> ++#include <stdio.h> ++#include <string.h> ++#include <sys/ipc.h> ++#include <sys/shm.h> ++#include <sys/types.h> ++#include <sys/stat.h> ++#include <fcntl.h> ++#include <unistd.h> ++#include <math.h> ++#include <stdlib.h> ++ + #include <X11/Xdefs.h> + + /****************************************************************************** diff --git a/debian/patches/series b/debian/patches/series index 43a2697..d67b33b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 01-synaptics-dont-grab-if-not-on-current-VT.patch 02-scandir-dev-input.patch 03-escape-dashes-in-manpages.patch +04-delibcwrap.patch -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]