Date: Mon, 7 Aug 2000 07:09:31 GMT From: Root <ymtseng@Dreamer.Dorm13.NCTU.edu.tw> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/20452: kdelibs2 patch fail Message-ID: <200008070709.HAA40677@Dreamer.Dorm13.NCTU.edu.tw>
next in thread | raw e-mail | index | archive | help
>Number: 20452
>Category: ports
>Synopsis: kdelibs2 patch fail
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Aug 07 00:10:02 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: Root
>Release: FreeBSD 4.1-STABLE i386
>Organization:
NCTU CSIE
>Environment:
FreeBSD 4.1-STABLE
>Description:
file kdelibs2/patches/patch-av wrong
>How-To-Repeat:
make patch
>Fix:
diff -ruN patches/patch-av.old patches/patch-av
--- patches/patch-av.old Mon Aug 7 06:53:49 2000
+++ patches/patch-av Mon Aug 7 06:52:55 2000
@@ -1,18 +1,18 @@
---- arts/artsc/artsdsp.c Sun May 7 05:50:11 2000
-+++ arts/artsc/artsdsp.c.new Fri May 12 16:48:51 2000
-@@ -127,7 +127,11 @@
+--- arts/artsc/artsdsp.c.new Mon Aug 7 06:47:08 2000
++++ arts/artsc/artsdsp.c Mon Aug 7 06:50:09 2000
+@@ -173,7 +173,11 @@
return sndfd;
}
+#ifndef __FreeBSD__
- int ioctl (int fd, int request, ...)
+ int ioctl (int fd, ioctl_request_t request, ...)
+#else
+int ioctl (int fd, unsigned long request, ...)
+#endif
{
static int channels;
static int bits;
-@@ -151,7 +155,11 @@
+@@ -197,7 +201,11 @@
return orig_ioctl (fd, request, argp);
else if (sndfd != -1)
{
@@ -24,7 +24,7 @@
artsdspdebug("aRts: hijacking /dev/dsp ioctl (%d : %x - %p)\n",
fd, request, argp);
-@@ -199,6 +207,8 @@
+@@ -258,6 +266,8 @@
return 0;
}
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200008070709.HAA40677>