From: <tr...@us...> - 2009-10-16 03:42:06
|
Revision: 2216 http://pkgbuild.svn.sourceforge.net/pkgbuild/?rev=2216&view=rev Author: trisk Date: 2009-10-16 03:41:48 +0000 (Fri, 16 Oct 2009) Log Message: ----------- 2009-10-15 Albert Lee <tr...@op...> * SFEctrlproxy.spec: Add patch3, patch4 * SFExorg-input-wacom.spec: Add SUNWncurses dependency for wacdump, xidump. * base-specs/xf86-input-synaptics.spec: Bump to 1.1.99.1. Drop patch3. * patches/ctrlproxy-03-daemon.diff: Support systems without daemon(). * patches/ctrlproxy-04-services.diff: Don't require system service port definitions. * patches/xf86-input-synaptics-01-alps-tap.diff, patches/xf86-input-synaptics-02-synclient.diff, patches/xf86-input-synaptics-05-solaris.diff: Update for 1.1.99.1. Modified Paths: -------------- spec-files-extra/trunk/ChangeLog spec-files-extra/trunk/SFEctrlproxy.spec spec-files-extra/trunk/SFExorg-input-wacom.spec spec-files-extra/trunk/base-specs/xf86-input-synaptics.spec spec-files-extra/trunk/patches/xf86-input-synaptics-01-alps-tap.diff spec-files-extra/trunk/patches/xf86-input-synaptics-02-synclient.diff spec-files-extra/trunk/patches/xf86-input-synaptics-05-solaris.diff Added Paths: ----------- spec-files-extra/trunk/patches/ctrlproxy-03-daemon.diff spec-files-extra/trunk/patches/ctrlproxy-04-services.diff Modified: spec-files-extra/trunk/ChangeLog =================================================================== --- spec-files-extra/trunk/ChangeLog 2009-10-13 23:59:26 UTC (rev 2215) +++ spec-files-extra/trunk/ChangeLog 2009-10-16 03:41:48 UTC (rev 2216) @@ -1,3 +1,16 @@ +2009-10-15 Albert Lee <tr...@op...> + + * SFEctrlproxy.spec: Add patch3, patch4 + * SFExorg-input-wacom.spec: Add SUNWncurses dependency for wacdump, + xidump. + * base-specs/xf86-input-synaptics.spec: Bump to 1.1.99.1. Drop patch3. + * patches/ctrlproxy-03-daemon.diff: Support systems without daemon(). + * patches/ctrlproxy-04-services.diff: Don't require system service port + definitions. + * patches/xf86-input-synaptics-01-alps-tap.diff, + patches/xf86-input-synaptics-02-synclient.diff, + patches/xf86-input-synaptics-05-solaris.diff: Update for 1.1.99.1. + 2009-10-13 Brian Cameron <bri...@su...> * SFEgnome-zeitgeist.spec, SFEzeitgeist.spec, SFEethos.spec: No Modified: spec-files-extra/trunk/SFEctrlproxy.spec =================================================================== --- spec-files-extra/trunk/SFEctrlproxy.spec 2009-10-13 23:59:26 UTC (rev 2215) +++ spec-files-extra/trunk/SFEctrlproxy.spec 2009-10-16 03:41:48 UTC (rev 2216) @@ -13,6 +13,8 @@ Source: http://www.ctrlproxy.org/releases/ctrlproxy-%{version}.tar.gz Patch1: ctrlproxy-01-solaris.diff Patch2: ctrlproxy-02-sunpro.diff +Patch3: ctrlproxy-03-daemon.diff +Patch4: ctrlproxy-04-services.diff Url: http://www.ctrlproxy.org/ License: GPLv3 SUNW_BaseDir: %{_basedir} @@ -50,6 +52,8 @@ %setup -q -n ctrlproxy-%{version} %patch1 -p1 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 %build @@ -112,6 +116,9 @@ %{_sysconfdir}/* %changelog +* Tue Oct 15 2009 - tr...@op... +- Add patch3. +- Add patch4. * Wed Oct 07 2009 - tr...@op... - Update dependencies. - Add patch3. Modified: spec-files-extra/trunk/SFExorg-input-wacom.spec =================================================================== --- spec-files-extra/trunk/SFExorg-input-wacom.spec 2009-10-13 23:59:26 UTC (rev 2215) +++ spec-files-extra/trunk/SFExorg-input-wacom.spec 2009-10-16 03:41:48 UTC (rev 2216) @@ -28,6 +28,8 @@ Requires: SUNWhal BuildRequires: SUNWhea Requires: SUNWTcl +Requires: SUNWncurses +BuildRequires: SUNWncurses-devel %package devel Summary: %{summary} - development files @@ -106,6 +108,8 @@ %{_prefix}/X11/include/* %changelog +* Wed Sep 23 2009 - Albert Lee <tr...@op...> +- Add SUNWncurses dependency for wacdump, xidump * Sun Sep 20 2009 - Albert Lee <tr...@op...> - Fix %{_datadir} ownership * Sun Sep 20 2009 - Albert Lee <tr...@op...> Modified: spec-files-extra/trunk/base-specs/xf86-input-synaptics.spec =================================================================== --- spec-files-extra/trunk/base-specs/xf86-input-synaptics.spec 2009-10-13 23:59:26 UTC (rev 2215) +++ spec-files-extra/trunk/base-specs/xf86-input-synaptics.spec 2009-10-16 03:41:48 UTC (rev 2216) @@ -7,11 +7,11 @@ %define src_name xf86-input-synaptics Summary: Synaptics/ALPS input device driver for X.org -Version: 1.1.3 +Version: 1.1.99.1 Source: http://xorg.freedesktop.org/archive/individual/driver/%{src_name}-%{version}.tar.bz2 Patch1: xf86-input-synaptics-01-alps-tap.diff Patch2: xf86-input-synaptics-02-synclient.diff -Patch3: xf86-input-synaptics-03-alignment.diff +#Patch3: xf86-input-synaptics-03-alignment.diff Patch4: xf86-input-synaptics-04-syndaemon.diff Patch5: xf86-input-synaptics-05-solaris.diff SUNW_BaseDir: %{_basedir} @@ -22,7 +22,7 @@ %setup -q -n%{src_name}-%{version} %patch1 -p1 %patch2 -p1 -%patch3 -p1 +#%patch3 -p1 %patch4 -p1 %patch5 -p1 @@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Oct 15 2009 - Albert Lee <tr...@op...> +- Bump to 1.1.99.1 +- Drop patch3 * Sun Sep 20 2009 - Albert Lee <tr...@op...> - Bump to 1.1.3 - Update X prefix path check Added: spec-files-extra/trunk/patches/ctrlproxy-03-daemon.diff =================================================================== --- spec-files-extra/trunk/patches/ctrlproxy-03-daemon.diff (rev 0) +++ spec-files-extra/trunk/patches/ctrlproxy-03-daemon.diff 2009-10-16 03:41:48 UTC (rev 2216) @@ -0,0 +1,80 @@ +--- ctrlproxy-3.0.8.orig/src/main.c Sat Dec 6 12:36:34 2008 ++++ ctrlproxy-3.0.8/src/main.c Wed Oct 7 15:27:42 2009 +@@ -322,7 +322,7 @@ + } + + if (isdaemon) { +-#ifdef HAVE_DAEMON ++#if defined(HAVE_DAEMON) || defined(HAVE_FORK) + #ifdef SIGTTOU + signal(SIGTTOU, SIG_IGN); + #endif +--- ctrlproxy-3.0.8.orig/lib/util.c Sat Dec 6 12:36:33 2008 ++++ ctrlproxy-3.0.8/lib/util.c Wed Oct 7 15:29:11 2009 +@@ -26,6 +26,13 @@ + #include <fcntl.h> + #include <glib/gstdio.h> + ++#ifndef HAVE_DAEMON ++#include <sys/types.h> ++#include <sys/stat.h> ++#include <fcntl.h> ++#include <unistd.h> ++#endif ++ + static inline int str_cmphelper(const char *a, const char *b, char sh, char sl, char eh, char el) + { + int i; +@@ -152,3 +159,41 @@ + return len - inbytes_left; + } + ++#ifndef HAVE_DAEMON ++#ifdef HAVE_FORK ++int daemon(int nochdir, int noclose) ++{ ++ int fd, i; ++ ++ switch (fork()) { ++ case 0: ++ break; ++ case -1: ++ return -1; ++ default: ++ _exit(0); ++ } ++ ++ if (!nochdir) { ++ chdir("/"); ++ } ++ ++ if (setsid() < 0) { ++ return -1; ++ } ++ ++ if (!noclose) { ++ if ((fd = open("/dev/null", O_RDWR)) >= 0) { ++ for (i = 0; i < 3; i++) { ++ dup2(fd, i); ++ } ++ if (fd > 2) { ++ close(fd); ++ } ++ } ++ } ++ ++ return 0; ++} ++#endif ++#endif +--- ctrlproxy-3.0.8.orig/daemon/main.c Sat Dec 6 12:36:33 2008 ++++ ctrlproxy-3.0.8/daemon/main.c Wed Oct 7 15:27:09 2009 +@@ -491,7 +491,7 @@ + } + + if (isdaemon) { +-#ifdef HAVE_DAEMON ++#if defined(HAVE_DAEMON) || defined(HAVE_FORK) + #ifdef SIGTTOU + signal(SIGTTOU, SIG_IGN); + #endif Added: spec-files-extra/trunk/patches/ctrlproxy-04-services.diff =================================================================== --- spec-files-extra/trunk/patches/ctrlproxy-04-services.diff (rev 0) +++ spec-files-extra/trunk/patches/ctrlproxy-04-services.diff 2009-10-16 03:41:48 UTC (rev 2216) @@ -0,0 +1,14 @@ +--- ctrlproxy-3.0.8.orig/lib/url.c Sat Dec 6 12:36:33 2008 ++++ ctrlproxy-3.0.8/lib/url.c Sun Oct 11 11:56:43 2009 +@@ -57,9 +57,9 @@ + } + + if (*ssl) { +- *port = g_strdup("ircs"); ++ *port = g_strdup("994"); + } else { +- *port = g_strdup("ircd"); ++ *port = g_strdup("6667"); + } + + if (q != NULL) { Modified: spec-files-extra/trunk/patches/xf86-input-synaptics-01-alps-tap.diff =================================================================== --- spec-files-extra/trunk/patches/xf86-input-synaptics-01-alps-tap.diff 2009-10-13 23:59:26 UTC (rev 2215) +++ spec-files-extra/trunk/patches/xf86-input-synaptics-01-alps-tap.diff 2009-10-16 03:41:48 UTC (rev 2216) @@ -1,58 +1,26 @@ -diff -ur xf86-input-synaptics-1.0.0.orig/src/alpscomm.c xf86-input-synaptics-1.0.0/src/alpscomm.c ---- xf86-input-synaptics-1.0.0.orig/src/alpscomm.c Fri Oct 3 04:20:48 2008 -+++ xf86-input-synaptics-1.0.0/src/alpscomm.c Sun Mar 8 16:19:21 2009 -@@ -161,6 +161,7 @@ - { - int x = 0, y = 0, z = 0; - int left = 0, right = 0, middle = 0; -+ int gesture; - int i; - - /* Handle guest packets */ -@@ -183,7 +184,11 @@ - y = (packet[4] & 0x7f) | ((packet[3] & 0x70) << (7-4)); - z = packet[5]; - -- if (z == 127) { /* DualPoint stick is relative, not absolute */ -+ /* Hardware tap mode uses the fin and ges bits */ -+ gesture = packet[2] & 3; -+ z = (gesture == 1) ? -1 : packet[5]; -+ -+ if (z == 127 && !gesture) { /* DualPoint stick is relative, not absolute */ - if (x > 383) - x = x - 768; - if (y > 255) -@@ -201,15 +206,12 @@ - for (i = 0; i < 8; i++) - hw->multi[i] = FALSE; - -- if (z > 0) { -- hw->x = x; -- hw->y = y; -- } -+ hw->x = x; -+ hw->y = y; - hw->z = z; - hw->numFingers = (z > 0) ? 1 : 0; - hw->fingerWidth = 5; - -- left |= (packet[2] ) & 1; - left |= (packet[3] ) & 1; - right |= (packet[3] >> 1) & 1; - if (packet[0] == 0xff) { -diff -ur xf86-input-synaptics-1.0.0.orig/src/synaptics.c xf86-input-synaptics-1.0.0/src/synaptics.c ---- xf86-input-synaptics-1.0.0.orig/src/synaptics.c Mon Jan 26 05:45:41 2009 -+++ xf86-input-synaptics-1.0.0/src/synaptics.c Mon Mar 9 00:53:51 2009 -@@ -1074,7 +1074,7 @@ - +diff -ur xf86-input-synaptics-1.0.0.orig/src/synapticsstr.h xf86-input-synaptics-1.0.0/src/synapticsstr.h +--- xf86-input-synaptics-1.0.0.orig/src/synapticsstr.h Mon Jan 26 05:45:41 2009 ++++ xf86-input-synaptics-1.0.0/src/synapticsstr.h Sun Mar 8 16:19:21 2009 +@@ -63,6 +63,7 @@ + enum TapState { + TS_START, /* No tap/drag in progress */ + TS_1, /* After first touch */ ++ TS_HW_TAP, /* After first hardware tap */ + TS_MOVE, /* Pointer movement enabled */ + TS_2A, /* After first release */ + TS_2B, /* After second/third/... release */ +--- xf86-input-synaptics-1.1.99.1.orig/src/synaptics.c 2009-09-03 18:10:37.000000000 -0400 ++++ xf86-input-synaptics-1.1.99.1/src/synaptics.c 2009-09-25 01:45:22.814867651 -0400 +@@ -1241,7 +1241,7 @@ /* finger detection thru pressure and threshold */ - finger = ((hw->z > para->finger_press) && priv->finger_state < FS_PRESSED) ? FS_PRESSED -- : ((hw->z > para->finger_high) && priv->finger_state < FS_TOUCHED) ? FS_TOUCHED -+ : (((hw->z > para->finger_high) || (hw->z < 0)) && priv->finger_state < FS_TOUCHED) ? FS_TOUCHED - : ((hw->z < para->finger_low) && priv->finger_state > FS_UNTOUCHED) ? FS_UNTOUCHED - : priv->finger_state; - -@@ -1178,6 +1178,7 @@ + if (hw->z > para->finger_press && priv->finger_state < FS_PRESSED) + finger = FS_PRESSED; +- else if (hw->z > para->finger_high && priv->finger_state < FS_TOUCHED) ++ else if ((hw->z > para->finger_high || hw->z < 0) && priv->finger_state < FS_TOUCHED) + finger = FS_TOUCHED; + else if (hw->z < para->finger_low && priv->finger_state > FS_UNTOUCHED) + finger = FS_UNTOUCHED; +@@ -1348,6 +1348,7 @@ priv->tap_max_fingers = 0; break; case TS_1: @@ -60,7 +28,7 @@ priv->tap_button_state = TBS_BUTTON_UP; break; case TS_2A: -@@ -1225,6 +1226,7 @@ +@@ -1398,6 +1399,7 @@ switch (priv->tap_state) { case TS_1: @@ -68,7 +36,7 @@ case TS_3: case TS_5: return para->tap_time; -@@ -1277,7 +1279,7 @@ +@@ -1450,7 +1452,7 @@ switch (priv->tap_state) { case TS_START: if (touch) @@ -77,7 +45,7 @@ break; case TS_1: if (move) { -@@ -1297,6 +1299,27 @@ +@@ -1474,6 +1476,27 @@ SetTapState(priv, TS_2A, hw->millis); } break; @@ -105,7 +73,7 @@ case TS_MOVE: if (move && priv->moving_state == MS_TRACKSTICK) { SetMovingState(priv, MS_TOUCHPAD_RELATIVE, hw->millis); -@@ -1426,6 +1449,7 @@ +@@ -1611,6 +1634,7 @@ moving_state = MS_TOUCHPAD_RELATIVE; break; case TS_1: @@ -113,14 +81,44 @@ case TS_3: case TS_5: if (hw->numFingers == 1) -diff -ur xf86-input-synaptics-1.0.0.orig/src/synapticsstr.h xf86-input-synaptics-1.0.0/src/synapticsstr.h ---- xf86-input-synaptics-1.0.0.orig/src/synapticsstr.h Mon Jan 26 05:45:41 2009 -+++ xf86-input-synaptics-1.0.0/src/synapticsstr.h Sun Mar 8 16:19:21 2009 -@@ -63,6 +63,7 @@ - enum TapState { - TS_START, /* No tap/drag in progress */ - TS_1, /* After first touch */ -+ TS_HW_TAP, /* After first hardware tap */ - TS_MOVE, /* Pointer movement enabled */ - TS_2A, /* After first release */ - TS_2B, /* After second/third/... release */ +--- xf86-input-synaptics-1.1.99.1.orig/src/alpscomm.c 2009-08-21 05:11:56.000000000 -0400 ++++ xf86-input-synaptics-1.1.99.1/src/alpscomm.c 2009-09-25 01:42:46.547317852 -0400 +@@ -153,6 +153,7 @@ + { + int x = 0, y = 0, z = 0; + int left = 0, right = 0, middle = 0; ++ int gesture; + int i; + + /* Handle guest packets */ +@@ -175,7 +176,11 @@ + y = (packet[4] & 0x7f) | ((packet[3] & 0x70) << (7-4)); + z = packet[5]; + +- if (z == 127) { /* DualPoint stick is relative, not absolute */ ++ /* Hardware tap mode uses the fin and ges bits */ ++ gesture = packet[2] & 3; ++ z = (gesture == 1) ? -1 : packet[5]; ++ ++ if (z == 127 && !gesture) { /* DualPoint stick is relative, not absolute */ + if (x > 383) + x = x - 768; + if (y > 255) +@@ -193,15 +198,12 @@ + for (i = 0; i < 8; i++) + hw->multi[i] = FALSE; + +- if (z > 0) { +- hw->x = x; +- hw->y = y; +- } ++ hw->x = x; ++ hw->y = y; + hw->z = z; + hw->numFingers = (z > 0) ? 1 : 0; + hw->fingerWidth = 5; + +- left |= (packet[2] ) & 1; + left |= (packet[3] ) & 1; + right |= (packet[3] >> 1) & 1; + if (packet[0] == 0xff) { Modified: spec-files-extra/trunk/patches/xf86-input-synaptics-02-synclient.diff =================================================================== --- spec-files-extra/trunk/patches/xf86-input-synaptics-02-synclient.diff 2009-10-13 23:59:26 UTC (rev 2215) +++ spec-files-extra/trunk/patches/xf86-input-synaptics-02-synclient.diff 2009-10-16 03:41:48 UTC (rev 2216) @@ -1,5 +1,5 @@ ---- xf86-input-synaptics-1.0.0.orig/tools/synclient.c Mon Jan 26 05:45:41 2009 -+++ xf86-input-synaptics-1.0.0/tools/synclient.c Sun Mar 8 12:45:45 2009 +--- xf86-input-synaptics-1.1.3.orig/tools/synclient.c 2009-08-02 21:04:24.000000000 -0400 ++++ xf86-input-synaptics-1.1.3/tools/synclient.c 2009-09-10 11:52:09.787558852 -0400 @@ -36,6 +36,7 @@ #include <sys/time.h> #include <unistd.h> @@ -8,16 +8,16 @@ #include <stddef.h> #include <math.h> -@@ -174,9 +175,10 @@ - if (eqp) { - int j; - int found = 0; -- *eqp = 0; -+ int len = eqp - cmd; - for (j = 0; params[j].name; j++) { -- if (strcasecmp(cmd, params[j].name) == 0) { -+ if ((strncasecmp(cmd, params[j].name, len) == 0) && -+ (params[j].name[len] == '\0')) { - found = 1; - break; - } +@@ -258,9 +259,10 @@ + if (eqp) { + int j; + int found = 0; +- *eqp = 0; ++ int len = eqp - cmd; + for (j = 0; params[j].name; j++) { +- if (strcasecmp(cmd, params[j].name) == 0) { ++ if ((strncasecmp(cmd, params[j].name, len) == 0) && ++ (params[j].name[len] == '\0')) { + found = 1; + break; + } Modified: spec-files-extra/trunk/patches/xf86-input-synaptics-05-solaris.diff =================================================================== --- spec-files-extra/trunk/patches/xf86-input-synaptics-05-solaris.diff 2009-10-13 23:59:26 UTC (rev 2215) +++ spec-files-extra/trunk/patches/xf86-input-synaptics-05-solaris.diff 2009-10-16 03:41:48 UTC (rev 2216) @@ -1,13 +1,12 @@ ---- xf86-input-synaptics-1.1.3.orig/src/ps2comm.c Sun Aug 2 21:04:24 2009 -+++ xf86-input-synaptics-1.1.3/src/ps2comm.c Sun Sep 20 14:33:48 2009 -@@ -399,7 +399,10 @@ +--- xf86-input-synaptics-1.1.99.1.orig/src/ps2comm.c 2009-08-21 05:11:56.000000000 -0400 ++++ xf86-input-synaptics-1.1.99.1/src/ps2comm.c 2009-09-25 02:24:00.324586398 -0400 +@@ -406,7 +406,9 @@ break; } -+ /* xf86WaitForInput() loops select() with EINTR on Solaris */ -+ #if !(defined(__sun) && defined(__SVR4)) ++#if !(defined(__sun) && defined(__SVR4)) xf86WaitForInput(fd, 20000); -+ #endif ++#endif xf86FlushInput(fd); - if (ps2_synaptics_identify(fd, &synhw)) { + if (ps2_synaptics_identify(fd, synhw)) { return TRUE; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |