[pkgsrc/trunk]: pkgsrc/x11/xclip Sergey Svishchev writes (in PR 33255), provi...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/eccd76f2b3ad
branches:  trunk
changeset: 529654:eccd76f2b3ad
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Jun 08 17:49:54 2007 +0000

description:
Sergey Svishchev writes (in PR 33255), providing a patch:
kde uses the X clipboard's content negotiation features, which
almost nobody else does, but xclip was doing the wrong thing when
asked for content negotiation stuff (from Debian bug report 172812).

Bump PKGREVISION.

diffstat:

 x11/xclip/Makefile         |   4 +-
 x11/xclip/distinfo         |   3 +-
 x11/xclip/patches/patch-aa |  58 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 62 insertions(+), 3 deletions(-)

diffs (87 lines):

diff -r ed703def3085 -r eccd76f2b3ad x11/xclip/Makefile
--- a/x11/xclip/Makefile        Fri Jun 08 17:30:40 2007 +0000
+++ b/x11/xclip/Makefile        Fri Jun 08 17:49:54 2007 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2006/12/27 13:37:43 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2007/06/08 17:49:54 wiz Exp $
 #
 
 DISTNAME=      xclip-0.08
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    x11
 MASTER_SITES=  http://people.debian.org/~kims/xclip/
 
diff -r ed703def3085 -r eccd76f2b3ad x11/xclip/distinfo
--- a/x11/xclip/distinfo        Fri Jun 08 17:30:40 2007 +0000
+++ b/x11/xclip/distinfo        Fri Jun 08 17:49:54 2007 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 17:36:21 wiz Exp $
+$NetBSD: distinfo,v 1.3 2007/06/08 17:49:54 wiz Exp $
 
 SHA1 (xclip-0.08.tar.gz) = 2b20daab0523a2b4b2cab1f24887481556eadb8b
 RMD160 (xclip-0.08.tar.gz) = 644c0418b44ce533fd39e37ec2dd888a394e8f7d
 Size (xclip-0.08.tar.gz) = 27914 bytes
+SHA1 (patch-aa) = 4a9039454a8494f398daa1dbaae52014d8d5d4dc
diff -r ed703def3085 -r eccd76f2b3ad x11/xclip/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xclip/patches/patch-aa        Fri Jun 08 17:49:54 2007 +0000
@@ -0,0 +1,58 @@
+$NetBSD: patch-aa,v 1.1 2007/06/08 17:49:54 wiz Exp $
+
+KDE integration (from Debian bug 172812)
+
+--- xclib.c.orig       Mon Dec 17 01:14:40 2001
++++ xclib.c    Thu Dec 12 13:16:57 2002
+@@ -100,7 +100,7 @@
+ )
+ {
+       /* a property for other windows to put their selection into */
+-      Atom pty, inc, pty_type;
++      Atom pty, inc, pty_type, targets;
+       int pty_format;
+               
+       /* buffer for XGetWindowProperty to dump data into */
+@@ -111,6 +111,7 @@
+       unsigned char *ltxt;
+ 
+       pty = XInternAtom(dpy, "XCLIP_OUT", False);
++      targets = XInternAtom(dpy, "TARGETS", False);
+ 
+       switch (*context)
+       {
+@@ -353,7 +354,9 @@
+                                        * transfers only)
+                                        */
+       XEvent          res;            /* response to event */
+-      Atom            inc;
++      Atom            inc, targets;
++
++      targets = XInternAtom(dpy, "TARGETS", False);
+ 
+       switch (*context)
+       {
+@@ -369,7 +372,22 @@
+                       *pos = 0;
+               
+                       /* put the data into an property */
+-                      if (len > XC_CHUNK)
++                      if (evt.xselectionrequest.target == targets)
++                      {
++                              Atom types[2] = { targets, XA_STRING };
++                      
++                              /* send data all at once (not using INCR) */
++                              XChangeProperty(
++                                      dpy,
++                                      *win,
++                                      *pty,
++                                      targets,
++                                      8,
++                                      PropModeReplace,
++                                      (unsigned char*) types,
++                                      (int)sizeof(types)
++                             );
++                      } else if (len > XC_CHUNK)
+                       {
+                               /* INCR Atom to set response property to */
+                               inc = XInternAtom(dpy, "INCR", False);