Package: quilt
Version: 0.60-10
Severity: normal
Hello,
I tried to apply a patch with quilt and it fails patching a wrong file.
the patch in question:
Index: xserver-xorg-video-sismirage-0/src/sis_mergedfb.c
===================================================================
--- xserver-xorg-video-sismirage-0.orig/src/sis_mergedfb.c 2013-09-14
16:57:22.725471777 +0000
+++ xserver-xorg-video-sismirage-0/src/sis_mergedfb.c 2013-09-14
19:47:39.769459372 +0000
@@ -3356,13 +3356,13 @@
REQUEST_SIZE_MATCH(xXineramaSelectInputReq);
- pWin = SecurityLookupWindow(stuff->window, client, SecurityWriteAccess);
+ dixLookupWindow(&pWin, stuff->window, client, DixWriteAccess);
if(!pWin)
return BadWindow;
pHead = (SiSXineramaEventPtr *)SecurityLookupIDByType(client,
pWin->drawable.id, EventType,
- SecurityWriteAccess);
+ DixWriteAccess);
if(stuff->enable & (XineramaLayoutChangeNotifyMask)) {
the message:
quilt push
Applying patch do-not-use-SecurityWriteAccess.patch
patching file SecurityLookupWindow
Hunk #1 FAILED at 3356.
1 out of 1 hunk FAILED -- rejects in file SecurityLookupWindow
Patch do-not-use-SecurityWriteAccess.patch does not apply (enforce with -f)
I do not see how this patch results in patching SecurityLookupWindow.
patch(1) can apply the patch normally. Only quilt fails.
Thanks
Michal
-- System Information:
Debian Release: 7.1
APT prefers stable
APT policy: (666, 'stable'), (666, 'stable-updates'), (500,
'oldstable-updates'), (500, 'unstable'), (500, 'testing'), (500, 'oldstable')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-4-amd64 (SMP w/1 CPU core)
Locale: LANG=cs_CZ.UTF-8, LC_CTYPE=cs_CZ.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages quilt depends on:
ii bsdmainutils 9.0.3
ii bzip2 1.0.6-4
ii diffstat 1.55-3
ii gettext 0.18.1.1-9
ii patch 2.6.1-3
ii perl 5.14.2-21
Versions of packages quilt recommends:
ii less 444-4
Versions of packages quilt suggests:
ii exim4-daemon-light [mail-transport-agent] 4.80-7
pn graphviz <none>
ii procmail 3.22-20
-- no debconf information
Index: xserver-xorg-video-sismirage-0/src/sis_mergedfb.c
===================================================================
--- xserver-xorg-video-sismirage-0.orig/src/sis_mergedfb.c 2013-09-14 16:57:22.725471777 +0000
+++ xserver-xorg-video-sismirage-0/src/sis_mergedfb.c 2013-09-14 19:47:39.769459372 +0000
@@ -3356,13 +3356,13 @@
REQUEST_SIZE_MATCH(xXineramaSelectInputReq);
- pWin = SecurityLookupWindow(stuff->window, client, SecurityWriteAccess);
+ dixLookupWindow(&pWin, stuff->window, client, DixWriteAccess);
if(!pWin)
return BadWindow;
pHead = (SiSXineramaEventPtr *)SecurityLookupIDByType(client,
pWin->drawable.id, EventType,
- SecurityWriteAccess);
+ DixWriteAccess);
if(stuff->enable & (XineramaLayoutChangeNotifyMask)) {
