diff options
author | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
---|---|---|
committer | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
commit | 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch) | |
tree | bf879bea7ef8517ba8c3d1286ef300401d3d484c /rxvt-unicode | |
parent | 101e2f1623def0a355d20aacb8bd93810703e834 (diff) |
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded
2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.
BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'rxvt-unicode')
-rw-r--r-- | rxvt-unicode/files/signedchar.patch | 0 | ||||
-rw-r--r-- | rxvt-unicode/files/xwc.patch | 0 | ||||
-rw-r--r-- | rxvt-unicode/rxvt-unicode-3.1/xim.patch | 142 | ||||
-rw-r--r-- | rxvt-unicode/rxvt-unicode-3.7/gcc34.patch | 36 | ||||
-rw-r--r-- | rxvt-unicode/rxvt-unicode_3.1.bb | 0 | ||||
-rw-r--r-- | rxvt-unicode/rxvt-unicode_3.7.bb | 0 | ||||
-rw-r--r-- | rxvt-unicode/rxvt-unicode_4.1.bb | 0 |
7 files changed, 0 insertions, 178 deletions
diff --git a/rxvt-unicode/files/signedchar.patch b/rxvt-unicode/files/signedchar.patch deleted file mode 100644 index e69de29bb2..0000000000 --- a/rxvt-unicode/files/signedchar.patch +++ /dev/null diff --git a/rxvt-unicode/files/xwc.patch b/rxvt-unicode/files/xwc.patch deleted file mode 100644 index e69de29bb2..0000000000 --- a/rxvt-unicode/files/xwc.patch +++ /dev/null diff --git a/rxvt-unicode/rxvt-unicode-3.1/xim.patch b/rxvt-unicode/rxvt-unicode-3.1/xim.patch deleted file mode 100644 index 7ea5b9054a..0000000000 --- a/rxvt-unicode/rxvt-unicode-3.1/xim.patch +++ /dev/null @@ -1,142 +0,0 @@ ---- rxvt-unicode-3.1/src/rxvtcolor.C~ 2004-05-10 19:46:33.000000000 +0100 -+++ rxvt-unicode-3.1/src/rxvtcolor.C 2004-06-27 18:15:28.000000000 +0100 -@@ -102,6 +102,8 @@ - put (*this->begin ()); - } - -+#ifdef USE_XIM -+ - ///////////////////////////////////////////////////////////////////////////// - - static void -@@ -141,6 +143,8 @@ - - ///////////////////////////////////////////////////////////////////////////// - -+#endif -+ - rxvt_display::rxvt_display (const char *id) - : refcounted (id) - , x_ev (this, &rxvt_display::x_cb) -@@ -185,7 +189,9 @@ - fcntl (fd, F_SETFD, FD_CLOEXEC); - - XSelectInput (display, root, PropertyChangeMask); -+#ifdef USE_XIM - xa_xim_servers = XInternAtom (display, "XIM_SERVERS", 0); -+#endif - - flush (); - -@@ -200,12 +206,16 @@ - XCloseDisplay (display); - } - -+#ifdef USE_XIM -+ - void rxvt_display::im_change_cb () - { - for (im_watcher **i = imw.begin (); i != imw.end (); ++i) - (*i)->call (); - } - -+#endif -+ - void rxvt_display::x_cb (io_watcher &w, short revents) - { - do -@@ -215,10 +225,12 @@ - - //printf ("T %d w %lx\n", xev.type, xev.xany.window);//D - -+#ifdef USE_XIM - if (xev.type == PropertyNotify - && xev.xany.window == root - && xev.xproperty.atom == xa_xim_servers) - im_change_cb (); -+#endif - - for (int i = xw.size (); i--; ) - { -@@ -258,6 +270,8 @@ - xw[w->active - 1] = 0; - } - -+#ifdef USE_XIM -+ - void rxvt_display::reg (im_watcher *w) - { - imw.push_back (w); -@@ -267,6 +281,7 @@ - { - imw.erase (find (imw.begin (), imw.end (), w)); - } -+#endif - - void rxvt_display::set_selection_owner (rxvt_term *owner) - { -@@ -276,6 +291,8 @@ - selection_owner = owner; - } - -+#ifdef USE_XIM -+ - rxvt_xim *rxvt_display::get_xim (const char *locale, const char *modifiers) - { - char *id; -@@ -302,6 +319,8 @@ - xims.put (xim); - } - -+#endif -+ - Atom rxvt_display::atom (const char *name) - { - return XInternAtom (display, name, False); ---- rxvt-unicode-3.1/src/rxvtcolor.h~ 2004-04-02 19:59:08.000000000 +0100 -+++ rxvt-unicode-3.1/src/rxvtcolor.h 2004-06-27 18:13:24.000000000 +0100 -@@ -61,16 +61,20 @@ - }; - - struct rxvt_display : refcounted { -+#ifdef USE_XIM - Atom xa_xim_servers; -+#endif - - io_manager_vec<xevent_watcher> xw; - - io_watcher x_ev; void x_cb (io_watcher &w, short revents); - -+#ifdef USE_XIM - refcache<rxvt_xim> xims; - vector<im_watcher *> imw; - - void im_change_cb (); -+#endif - - //public - Display *display; -@@ -94,12 +98,15 @@ - - void set_selection_owner (rxvt_term *owner); - -+#ifdef USE_XIM - rxvt_xim *get_xim (const char *locale, const char *modifiers); - void put_xim (rxvt_xim *xim); -+#endif - - Atom atom (const char *name); - }; - -+#ifdef USE_XIM - struct im_watcher : watcher, callback0<void> { - template<class O1, class O2> - im_watcher (O1 *object, void (O2::*method) ()) -@@ -115,6 +122,7 @@ - display->unreg (this); - } - }; -+#endif - - struct xevent_watcher : watcher, callback1<void, XEvent &> { - Window window; diff --git a/rxvt-unicode/rxvt-unicode-3.7/gcc34.patch b/rxvt-unicode/rxvt-unicode-3.7/gcc34.patch deleted file mode 100644 index b6ca2de64a..0000000000 --- a/rxvt-unicode/rxvt-unicode-3.7/gcc34.patch +++ /dev/null @@ -1,36 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- rxvt-unicode-3.7/src/command.C~gcc34 -+++ rxvt-unicode-3.7/src/command.C -@@ -4250,7 +4250,7 @@ - { - if (v_buflen == 0) - { -- ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); -+ ssize_t written = write (pty.pty, data, min (len, int(MAX_PTY_WRITE))); - - if ((unsigned int)written == len) - return; -@@ -4268,7 +4268,7 @@ - - for (;;) - { -- int written = write (pty.pty, v_buffer, min (MAX_PTY_WRITE, v_buflen)); -+ int written = write (pty.pty, v_buffer, min (int(MAX_PTY_WRITE), v_buflen)); - - if (written > 0) - { ---- rxvt-unicode-3.7/src/rxvtutil.C~gcc34 -+++ rxvt-unicode-3.7/src/rxvtutil.C -@@ -6,6 +6,8 @@ - - class byteorder byteorder; - -+static unsigned int byteorder::byteorder::e; -+ - byteorder::byteorder () - { - union { diff --git a/rxvt-unicode/rxvt-unicode_3.1.bb b/rxvt-unicode/rxvt-unicode_3.1.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/rxvt-unicode/rxvt-unicode_3.1.bb +++ /dev/null diff --git a/rxvt-unicode/rxvt-unicode_3.7.bb b/rxvt-unicode/rxvt-unicode_3.7.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/rxvt-unicode/rxvt-unicode_3.7.bb +++ /dev/null diff --git a/rxvt-unicode/rxvt-unicode_4.1.bb b/rxvt-unicode/rxvt-unicode_4.1.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/rxvt-unicode/rxvt-unicode_4.1.bb +++ /dev/null |