[arch-commits] CVS update of arch/build/network/gaim (4 files)
Jan de Groot
jgc at archlinux.org
Wed May 2 18:04:13 UTC 2007
Date: Wednesday, May 2, 2007 @ 14:04:13
Author: jgc
Path: /home/cvs-arch/arch/build/network/gaim
Removed: PKGBUILD (1.90) gaim-0.76-xinput.patch (1.1)
gaim-2.0.0-beta3-transparent.patch (1.1)
gaim-2.0.0-beta3-utf8-name-crash.patch (1.1)
Remove GAIM, we have pidgin now!
----------------------------------------+
PKGBUILD | 26 -
gaim-0.76-xinput.patch | 15 -
gaim-2.0.0-beta3-transparent.patch | 409 -------------------------------
gaim-2.0.0-beta3-utf8-name-crash.patch | 13
4 files changed, 463 deletions(-)
Index: arch/build/network/gaim/PKGBUILD
diff -u arch/build/network/gaim/PKGBUILD:1.90 arch/build/network/gaim/PKGBUILD:removed
--- arch/build/network/gaim/PKGBUILD:1.90 Thu Feb 1 19:17:05 2007
+++ arch/build/network/gaim/PKGBUILD Wed May 2 14:04:13 2007
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD,v 1.90 2007/02/02 00:17:05 jgc Exp $
-# Contributor: Lucien Immink <l.immink at student.fnt.hvu.nl>
-# Maintainer: dorphell <dorphell at archlinux.org>
-pkgname=gaim
-pkgver=2.0.0b6
-pkgrel=1
-pkgdesc="A GTK+-based messaging client"
-arch=(i686 x86_64)
-url="http://gaim.sourceforge.net"
-depends=('startup-notification' 'gnutls>=1.6.0' 'gtkspell' 'libxss' 'dbus-glib' 'libxml2>=2.6.27')
-makedepends=('pkgconfig' 'perlxml' 'tk')
-options=('nolibtool')
-source=(http://heanet.dl.sourceforge.net/sourceforge/gaim/gaim-2.0.0beta6.tar.bz2)
-
-build() {
- cd ${startdir}/src/${pkgname}-2.0.0beta6
- ./configure --prefix=/usr --disable-perl \
- --enable-gtkspell --enable-gnutls=yes \
- --enable-nss=no --disable-gevolution \
- --enable-dbus --disable-mono \
- --disable-debug
- make || return 1
- make DESTDIR=${startdir}/pkg install
- # Delete bonjour plugin, requires avahi from extra
- rm -f ${startdir}/pkg/usr/lib/gaim/libbonjour.so
-}
Index: arch/build/network/gaim/gaim-0.76-xinput.patch
diff -u arch/build/network/gaim/gaim-0.76-xinput.patch:1.1 arch/build/network/gaim/gaim-0.76-xinput.patch:removed
--- arch/build/network/gaim/gaim-0.76-xinput.patch:1.1 Mon May 29 17:21:07 2006
+++ arch/build/network/gaim/gaim-0.76-xinput.patch Wed May 2 14:04:13 2007
@@ -1,15 +0,0 @@
-diff -urN gaim-0.75.99-20040318cvs.orig/src/gtkconv.c gaim-0.75.99-20040318cvs/src/gtkconv.c
---- gaim-0.75.99-20040318cvs.orig/src/gtkconv.c 2004-03-16 10:31:48.000000000 -1000
-+++ gaim-0.75.99-20040318cvs/src/gtkconv.c 2004-03-16 12:50:59.689509499 -1000
-@@ -1390,6 +1390,11 @@
- if (!(event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)) &&
- gaim_prefs_get_bool("/gaim/gtk/conversations/enter_sends"))
- {
-+ if (gtk_im_context_filter_keypress (GTK_TEXT_VIEW (entry)->im_context, event))
-+ {
-+ GTK_TEXT_VIEW (entry)->need_im_reset = TRUE;
-+ return TRUE;
-+ }
- send_cb(NULL, conv);
- return TRUE;
- }
Index: arch/build/network/gaim/gaim-2.0.0-beta3-transparent.patch
diff -u arch/build/network/gaim/gaim-2.0.0-beta3-transparent.patch:1.1 arch/build/network/gaim/gaim-2.0.0-beta3-transparent.patch:removed
--- arch/build/network/gaim/gaim-2.0.0-beta3-transparent.patch:1.1 Sun Oct 8 11:44:17 2006
+++ arch/build/network/gaim/gaim-2.0.0-beta3-transparent.patch Wed May 2 14:04:13 2007
@@ -1,409 +0,0 @@
---- gaim-2.0.0beta3/plugins/docklet/docklet-x11.c.transparent 2006-09-30 10:39:14.000000000 -0400
-+++ gaim-2.0.0beta3/plugins/docklet/docklet-x11.c 2006-09-30 10:39:41.000000000 -0400
-@@ -254,6 +254,7 @@
-
- docklet = egg_tray_icon_new("Gaim");
- box = gtk_event_box_new();
-+ gtk_event_box_set_visible_window (box, FALSE);
- image = gtk_image_new();
-
- g_signal_connect(G_OBJECT(docklet), "embedded", G_CALLBACK(docklet_x11_embedded_cb), NULL);
---- gaim-2.0.0beta3/plugins/docklet/eggtrayicon.c.transparent 2005-12-21 13:36:09.000000000 -0500
-+++ gaim-2.0.0beta3/plugins/docklet/eggtrayicon.c 2006-09-30 10:38:56.000000000 -0400
-@@ -20,11 +20,17 @@
-
- #include <config.h>
- #include <string.h>
-+#include <libintl.h>
-
- #include "eggtrayicon.h"
-
-+#include <gdkconfig.h>
-+#if defined (GDK_WINDOWING_X11)
- #include <gdk/gdkx.h>
- #include <X11/Xatom.h>
-+#elif defined (GDK_WINDOWING_WIN32)
-+#include <gdk/gdkwin32.h>
-+#endif
-
- #define _(x) x
- #define N_(x) x
-@@ -54,9 +60,14 @@
- static void egg_tray_icon_realize (GtkWidget *widget);
- static void egg_tray_icon_unrealize (GtkWidget *widget);
-
-+static void egg_tray_icon_add (GtkContainer *container,
-+ GtkWidget *widget);
-+
-+#ifdef GDK_WINDOWING_X11
- static void egg_tray_icon_update_manager_window (EggTrayIcon *icon,
- gboolean dock_if_realized);
- static void egg_tray_icon_manager_window_destroyed (EggTrayIcon *icon);
-+#endif
-
- GType
- egg_tray_icon_get_type (void)
-@@ -65,10 +76,6 @@
-
- if (our_type == 0)
- {
-- our_type = g_type_from_name("EggTrayIcon");
--
-- if (our_type == 0)
-- {
- static const GTypeInfo our_info =
- {
- sizeof (EggTrayIconClass),
-@@ -79,17 +86,10 @@
- NULL, /* class_data */
- sizeof (EggTrayIcon),
- 0, /* n_preallocs */
-- (GInstanceInitFunc) egg_tray_icon_init,
-- NULL /* value_table */
-+ (GInstanceInitFunc) egg_tray_icon_init
- };
-
- our_type = g_type_register_static (GTK_TYPE_PLUG, "EggTrayIcon", &our_info, 0);
-- }
-- else if (parent_class == NULL)
-- {
-- /* we're reheating the old class from a previous instance - engage ugly hack =( */
-- egg_tray_icon_class_init((EggTrayIconClass *)g_type_class_peek(our_type));
-- }
- }
-
- return our_type;
-@@ -109,6 +109,7 @@
- {
- GObjectClass *gobject_class = (GObjectClass *)klass;
- GtkWidgetClass *widget_class = (GtkWidgetClass *)klass;
-+ GtkContainerClass *container_class = (GtkContainerClass *)klass;
-
- parent_class = g_type_class_peek_parent (klass);
-
-@@ -117,6 +118,8 @@
- widget_class->realize = egg_tray_icon_realize;
- widget_class->unrealize = egg_tray_icon_unrealize;
-
-+ container_class->add = egg_tray_icon_add;
-+
- g_object_class_install_property (gobject_class,
- PROP_ORIENTATION,
- g_param_spec_enum ("orientation",
-@@ -125,6 +128,14 @@
- GTK_TYPE_ORIENTATION,
- GTK_ORIENTATION_HORIZONTAL,
- G_PARAM_READABLE));
-+
-+#if defined (GDK_WINDOWING_X11)
-+ /* Nothing */
-+#elif defined (GDK_WINDOWING_WIN32)
-+ g_warning ("Port eggtrayicon to Win32");
-+#else
-+ g_warning ("Port eggtrayicon to this GTK+ backend");
-+#endif
- }
-
- static void
-@@ -146,6 +157,8 @@
- }
- }
-
-+#ifdef GDK_WINDOWING_X11
-+
- static void
- egg_tray_icon_get_orientation_property (EggTrayIcon *icon)
- {
-@@ -160,13 +173,9 @@
- gulong bytes_after;
- int error, result;
-
-- g_return_if_fail(icon->manager_window != None);
--
--#if GTK_CHECK_VERSION(2,1,0)
-+ g_assert (icon->manager_window != None);
-+
- xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
--#else
-- xdisplay = gdk_display;
--#endif
-
- gdk_error_trap_push ();
- type = None;
-@@ -226,13 +235,15 @@
- egg_tray_icon_manager_window_destroyed (icon);
- }
- }
--
- return GDK_FILTER_CONTINUE;
- }
-
-+#endif
-+
- static void
- egg_tray_icon_unrealize (GtkWidget *widget)
- {
-+#ifdef GDK_WINDOWING_X11
- EggTrayIcon *icon = EGG_TRAY_ICON (widget);
- GdkWindow *root_window;
-
-@@ -240,28 +251,23 @@
- {
- GdkWindow *gdkwin;
-
--#if GTK_CHECK_VERSION(2,1,0)
- gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (widget),
- icon->manager_window);
--#else
-- gdkwin = gdk_window_lookup (icon->manager_window);
--#endif
-
- gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon);
- }
-
--#if GTK_CHECK_VERSION(2,1,0)
- root_window = gdk_screen_get_root_window (gtk_widget_get_screen (widget));
--#else
-- root_window = gdk_window_lookup (gdk_x11_get_default_root_xwindow ());
--#endif
-
- gdk_window_remove_filter (root_window, egg_tray_icon_manager_filter, icon);
-
- if (GTK_WIDGET_CLASS (parent_class)->unrealize)
- (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
-+#endif
- }
-
-+#ifdef GDK_WINDOWING_X11
-+
- static void
- egg_tray_icon_send_manager_message (EggTrayIcon *icon,
- long message,
-@@ -283,12 +289,8 @@
- ev.data.l[3] = data2;
- ev.data.l[4] = data3;
-
--#if GTK_CHECK_VERSION(2,1,0)
- display = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
--#else
-- display = gdk_display;
--#endif
--
-+
- gdk_error_trap_push ();
- XSendEvent (display,
- icon->manager_window, False, NoEventMask, (XEvent *)&ev);
-@@ -315,12 +317,8 @@
- if (icon->manager_window != None)
- return;
-
--#if GTK_CHECK_VERSION(2,1,0)
- xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
--#else
-- xdisplay = gdk_display;
--#endif
--
-+
- XGrabServer (xdisplay);
-
- icon->manager_window = XGetSelectionOwner (xdisplay,
-@@ -337,13 +335,9 @@
- {
- GdkWindow *gdkwin;
-
--#if GTK_CHECK_VERSION(2,1,0)
- gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
- icon->manager_window);
--#else
-- gdkwin = gdk_window_lookup (icon->manager_window);
--#endif
--
-+
- gdk_window_add_filter (gdkwin, egg_tray_icon_manager_filter, icon);
-
- if (dock_if_realized && GTK_WIDGET_REALIZED (icon))
-@@ -360,13 +354,9 @@
-
- g_return_if_fail (icon->manager_window != None);
-
--#if GTK_CHECK_VERSION(2,1,0)
- gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
- icon->manager_window);
--#else
-- gdkwin = gdk_window_lookup (icon->manager_window);
--#endif
--
-+
- gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon);
-
- icon->manager_window = None;
-@@ -374,11 +364,45 @@
- egg_tray_icon_update_manager_window (icon, TRUE);
- }
-
-+#endif
-+
-+static gboolean
-+transparent_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data)
-+{
-+ gdk_window_clear_area (widget->window, event->area.x, event->area.y,
-+ event->area.width, event->area.height);
-+ return FALSE;
-+}
-+
-+static void
-+make_transparent_again (GtkWidget *widget, GtkStyle *previous_style,
-+ gpointer user_data)
-+{
-+ gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
-+}
-+
-+static void
-+make_transparent (GtkWidget *widget, gpointer user_data)
-+{
-+ if (GTK_WIDGET_NO_WINDOW (widget) || GTK_WIDGET_APP_PAINTABLE (widget))
-+ return;
-+
-+ gtk_widget_set_app_paintable (widget, TRUE);
-+ gtk_widget_set_double_buffered (widget, FALSE);
-+ gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
-+ g_signal_connect (widget, "expose_event",
-+ G_CALLBACK (transparent_expose_event), NULL);
-+ g_signal_connect_after (widget, "style_set",
-+ G_CALLBACK (make_transparent_again), NULL);
-+}
-+
- static void
- egg_tray_icon_realize (GtkWidget *widget)
- {
-+#ifdef GDK_WINDOWING_X11
- EggTrayIcon *icon = EGG_TRAY_ICON (widget);
-- gint screen;
-+ GdkScreen *screen;
-+ GdkDisplay *display;
- Display *xdisplay;
- char buffer[256];
- GdkWindow *root_window;
-@@ -386,18 +410,16 @@
- if (GTK_WIDGET_CLASS (parent_class)->realize)
- GTK_WIDGET_CLASS (parent_class)->realize (widget);
-
--#if GTK_CHECK_VERSION(2,1,0)
-- screen = gdk_screen_get_number (gtk_widget_get_screen (widget));
-- xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (widget));
--#else
-- screen = XScreenNumberOfScreen (DefaultScreenOfDisplay (gdk_display));
-- xdisplay = gdk_display;
--#endif
-+ make_transparent (widget, NULL);
-+
-+ screen = gtk_widget_get_screen (widget);
-+ display = gdk_screen_get_display (screen);
-+ xdisplay = gdk_x11_display_get_xdisplay (display);
-
- /* Now see if there's a manager window around */
- g_snprintf (buffer, sizeof (buffer),
- "_NET_SYSTEM_TRAY_S%d",
-- screen);
-+ gdk_screen_get_number (screen));
-
- icon->selection_atom = XInternAtom (xdisplay, buffer, False);
-
-@@ -414,18 +436,22 @@
- egg_tray_icon_update_manager_window (icon, FALSE);
- egg_tray_icon_send_dock_request (icon);
-
--#if GTK_CHECK_VERSION(2,1,0)
-- root_window = gdk_screen_get_root_window (gtk_widget_get_screen (widget));
--#else
-- root_window = gdk_window_lookup (gdk_x11_get_default_root_xwindow ());
--#endif
--
-+ root_window = gdk_screen_get_root_window (screen);
-+
- /* Add a root window filter so that we get changes on MANAGER */
- gdk_window_add_filter (root_window,
- egg_tray_icon_manager_filter, icon);
-+#endif
-+}
-+
-+static void
-+egg_tray_icon_add (GtkContainer *container, GtkWidget *widget)
-+{
-+ g_signal_connect (widget, "realize",
-+ G_CALLBACK (make_transparent), NULL);
-+ GTK_CONTAINER_CLASS (parent_class)->add (container, widget);
- }
-
--#if GTK_CHECK_VERSION(2,1,0)
- EggTrayIcon *
- egg_tray_icon_new_for_screen (GdkScreen *screen, const char *name)
- {
-@@ -433,7 +459,6 @@
-
- return g_object_new (EGG_TYPE_TRAY_ICON, "screen", screen, "title", name, NULL);
- }
--#endif
-
- EggTrayIcon*
- egg_tray_icon_new (const gchar *name)
-@@ -453,17 +478,20 @@
- g_return_val_if_fail (timeout >= 0, 0);
- g_return_val_if_fail (message != NULL, 0);
-
-+#ifdef GDK_WINDOWING_X11
- if (icon->manager_window == None)
- return 0;
-+#endif
-
- if (len < 0)
- len = strlen (message);
-
- stamp = icon->stamp++;
-
-+#ifdef GDK_WINDOWING_X11
- /* Get ready to send the message */
- egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_BEGIN_MESSAGE,
-- (Window)gtk_plug_get_id (GTK_PLUG (icon)),
-+ icon->manager_window,
- timeout, len, stamp);
-
- /* Now to send the actual message */
-@@ -473,14 +501,10 @@
- XClientMessageEvent ev;
- Display *xdisplay;
-
--#if GTK_CHECK_VERSION(2,1,0)
- xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
--#else
-- xdisplay = gdk_display;
--#endif
--
-+
- ev.type = ClientMessage;
-- ev.window = (Window)gtk_plug_get_id (GTK_PLUG (icon));
-+ ev.window = icon->manager_window;
- ev.format = 8;
- ev.message_type = XInternAtom (xdisplay,
- "_NET_SYSTEM_TRAY_MESSAGE_DATA", False);
-@@ -501,6 +525,7 @@
- XSync (xdisplay, False);
- }
- gdk_error_trap_pop ();
-+#endif
-
- return stamp;
- }
-@@ -511,10 +536,11 @@
- {
- g_return_if_fail (EGG_IS_TRAY_ICON (icon));
- g_return_if_fail (id > 0);
--
-+#ifdef GDK_WINDOWING_X11
- egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_CANCEL_MESSAGE,
- (Window)gtk_plug_get_id (GTK_PLUG (icon)),
- id, 0, 0);
-+#endif
- }
-
- GtkOrientation
Index: arch/build/network/gaim/gaim-2.0.0-beta3-utf8-name-crash.patch
diff -u arch/build/network/gaim/gaim-2.0.0-beta3-utf8-name-crash.patch:1.1 arch/build/network/gaim/gaim-2.0.0-beta3-utf8-name-crash.patch:removed
--- arch/build/network/gaim/gaim-2.0.0-beta3-utf8-name-crash.patch:1.1 Sun Oct 8 11:44:17 2006
+++ arch/build/network/gaim/gaim-2.0.0-beta3-utf8-name-crash.patch Wed May 2 14:04:13 2007
@@ -1,13 +0,0 @@
-Index: src/gtkblist.c
-===================================================================
---- src/gtkblist.c (revision 16086)
-+++ src/gtkblist.c (revision 16087)
-@@ -3428,7 +3428,7 @@
- len = g_utf8_strlen(normalized, -1);
- log_attrs = g_new(PangoLogAttr, len + 1);
-
-- pango_get_log_attrs(normalized, len, -1, NULL, log_attrs, len + 1);
-+ pango_get_log_attrs(normalized, strlen(normalized), -1, NULL, log_attrs, len + 1);
-
- word = normalized;
- result = TRUE;
More information about the arch-commits
mailing list