rpms/eterm/F-10 Eterm-0.9.5-drop-kde-cut-paste.patch, NONE, 1.1 eterm.spec, 1.10, 1.11

[Terje Røsten]

Author: terjeros

Update of /cvs/extras/rpms/eterm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18062/F-10

Modified Files:
	eterm.spec 
Added Files:
	Eterm-0.9.5-drop-kde-cut-paste.patch 
Log Message:
Sync with rawhide.



Eterm-0.9.5-drop-kde-cut-paste.patch:

--- NEW FILE Eterm-0.9.5-drop-kde-cut-paste.patch ---
diff -uNr -x '*~' Eterm-0.9.5.orig/src/screen.c Eterm-0.9.5/src/screen.c
--- Eterm-0.9.5.orig/src/screen.c	2008-05-15 00:26:36.000000000 +0200
+++ Eterm-0.9.5/src/screen.c	2008-11-10 16:49:11.000000000 +0100
@@ -3320,7 +3320,7 @@
         target_list[0] = (Atom32) props[PROP_SELECTION_TARGETS];
         target_list[1] = (Atom32) XA_STRING;
         XChangeProperty(Xdisplay, rq->requestor, rq->property, rq->target,
-                        8, PropModeReplace, (unsigned char *) target_list,
+                        (8 * sizeof(target_list[0])), PropModeReplace, (unsigned char *) target_list,
                         (sizeof(target_list) / sizeof(target_list[0])));
         ev.xselection.property = rq->property;
 #if defined(MULTI_CHARSET) && defined(HAVE_X11_XMU_ATOMS_H)
@@ -3333,8 +3333,8 @@
         xtextp.nitems = 0;
         if (XmbTextListToTextProperty(Xdisplay, l, 1, XCompoundTextStyle, &xtextp) == Success) {
             if (xtextp.nitems > 0 && xtextp.value != NULL) {
-                XChangeProperty(Xdisplay, rq->requestor, rq->property, XA_COMPOUND_TEXT(Xdisplay),
-                                8, PropModeReplace, xtextp.value, xtextp.nitems);
+                XChangeProperty(Xdisplay, rq->requestor, rq->property, XA_COMPOUND_TEXT(Xdisplay), 8, PropModeReplace, xtextp.value,
+                                xtextp.nitems);
                 ev.xselection.property = rq->property;
             }
         }


Index: eterm.spec
===================================================================
RCS file: /cvs/extras/rpms/eterm/F-10/eterm.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- eterm.spec	12 Aug 2008 18:10:00 -0000	1.10
+++ eterm.spec	11 Nov 2008 18:03:58 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:       Enlightened terminal emulator
 Name:          eterm
 Version:       0.9.5
-Release:       1%{?dist}
+Release:       2%{?dist}
 License:       BSD
 Group:         User Interface/Desktops
 Source0:       http://www.eterm.org/download/Eterm-%{version}.tar.gz
@@ -9,6 +9,7 @@
 Source2:       %{name}.png
 Patch1:        Eterm-0.9.4-no-rpath.patch
 Patch2:        Eterm-0.9.4-automake-1.10.patch
+Patch3:        Eterm-0.9.5-drop-kde-cut-paste.patch
 URL:           http://www.eterm.org/
 Requires:      imlib2 bitmap-fonts
 BuildRequires: imlib2-devel libast-devel libXmu-devel 
@@ -30,6 +31,7 @@
 %setup -a 1 -q -n Eterm-%{version}
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 # Touching Makefile.am
@@ -98,6 +100,9 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Mon Nov 10 2008 Terje Røsten <terje.rosten at ntnu.no> - 0.9.5-2
+- Add patch to remove KDE cut-paste patch
+
 * Tue Aug 12 2008 Terje Røsten <terje.rosten at ntnu.no> - 0.9.5-1
 - 0.9.5
 - Remove CVE-2008-1692 patch now upstream