[38247] trunk/dports/net/pidgin/files
simon at macports.org
simon at macports.org
Sun Jul 13 11:25:04 PDT 2008
Revision: 38247
http://trac.macosforge.org/projects/macports/changeset/38247
Author: simon at macports.org
Date: 2008-07-13 11:25:04 -0700 (Sun, 13 Jul 2008)
Log Message:
-----------
net/pidgin: Updated patches for 2.4.3, closes #15968. Thanks to jonathan at imbored.us.
Modified Paths:
--------------
trunk/dports/net/pidgin/files/gtkdocklet-quartz.diff
trunk/dports/net/pidgin/files/patch-configure.ac.diff
trunk/dports/net/pidgin/files/patch-configure.diff
Modified: trunk/dports/net/pidgin/files/gtkdocklet-quartz.diff
===================================================================
--- trunk/dports/net/pidgin/files/gtkdocklet-quartz.diff 2008-07-13 18:04:25 UTC (rev 38246)
+++ trunk/dports/net/pidgin/files/gtkdocklet-quartz.diff 2008-07-13 18:25:04 UTC (rev 38247)
@@ -1,6 +1,7 @@
-diff -Naur configure.ac configure.ac
---- configure.ac 2008-02-09 21:18:34.000000000 +0100
-+++ configure.ac 2008-02-09 21:51:11.000000000 +0100
+Index: configure.ac
+===================================================================
+--- configure.ac.orig 2008-07-13 14:21:44.000000000 +0200
++++ configure.ac 2008-07-13 14:21:54.000000000 +0200
@@ -361,6 +361,10 @@
[AC_HELP_STRING([--disable-gestures],
[compile without the gestures plugin])],
@@ -12,8 +13,8 @@
AC_PATH_XTRA
# We can't assume that $x_libraries will be set, because autoconf does not
-@@ -541,6 +545,16 @@
- ])
+@@ -570,6 +574,16 @@
+ ])])
fi
+ dnl #######################################################################
@@ -29,7 +30,7 @@
else # GTK
enable_cap=no
-@@ -555,6 +569,7 @@
+@@ -584,6 +598,7 @@
AM_CONDITIONAL(BUILD_GEVOLUTION, test "x$enable_gevolution" = "xyes")
AM_CONDITIONAL(ENABLE_CAP, test "x$enable_cap" = "xyes")
AM_CONDITIONAL(ENABLE_GESTURES, test "x$enable_gestures" = "xyes")
@@ -37,7 +38,7 @@
dnl #######################################################################
-@@ -2304,6 +2319,7 @@
+@@ -2387,6 +2402,7 @@
echo Build console UI.............. : $enable_consoleui
echo Build for X11................. : $with_x
echo
@@ -45,9 +46,10 @@
echo Enable Gestures............... : $enable_gestures
echo Protocols to build dynamically : $DYNAMIC_PRPLS
echo Protocols to link statically.. : $STATIC_PRPLS
-diff -Naur pidgin/Makefile.am pidgin/Makefile.am
---- pidgin/Makefile.am 2008-02-09 21:18:32.000000000 +0100
-+++ pidgin/Makefile.am 2008-02-09 21:51:11.000000000 +0100
+Index: pidgin/Makefile.am
+===================================================================
+--- pidgin/Makefile.am.orig 2008-07-02 02:46:18.000000000 +0200
++++ pidgin/Makefile.am 2008-07-13 14:21:54.000000000 +0200
@@ -73,7 +73,6 @@
bin_PROGRAMS = pidgin
@@ -64,9 +66,9 @@
gtkeventloop.c \
gtkexpander.c \
gtkft.c \
-@@ -121,6 +119,15 @@
- gtkwhiteboard.c \
- minidialog.c
+@@ -122,6 +120,15 @@
+ minidialog.c \
+ pidgintooltip.c
+if GTK_STATUS_ICON
+pidgin_SOURCES += \
@@ -80,9 +82,10 @@
pidgin_headers = \
eggtrayicon.h \
gtkaccount.h \
-diff -Naur pidgin/gtkdocklet-gtk.c pidgin/gtkdocklet-gtk.c
---- pidgin/gtkdocklet-gtk.c 1970-01-01 01:00:00.000000000 +0100
-+++ pidgin/gtkdocklet-gtk.c 2008-02-09 21:51:11.000000000 +0100
+Index: pidgin/gtkdocklet-gtk.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ pidgin/gtkdocklet-gtk.c 2008-07-13 14:21:54.000000000 +0200
@@ -0,0 +1,195 @@
+/*
+ * System tray icon (aka docklet) plugin for Purple
@@ -279,10 +282,11 @@
+{
+ pidgin_docklet_set_ui_ops(&ui_ops);
+}
-diff -Naur pidgin/gtkdocklet-x11.c pidgin/gtkdocklet-x11.c
---- pidgin/gtkdocklet-x11.c 2008-02-09 21:18:32.000000000 +0100
-+++ pidgin/gtkdocklet-x11.c 2008-02-09 21:51:11.000000000 +0100
-@@ -313,10 +313,11 @@
+Index: pidgin/gtkdocklet-x11.c
+===================================================================
+--- pidgin/gtkdocklet-x11.c.orig 2008-07-02 02:46:19.000000000 +0200
++++ pidgin/gtkdocklet-x11.c 2008-07-13 14:21:54.000000000 +0200
+@@ -314,10 +314,11 @@
docklet_x11_blank_icon,
docklet_x11_set_tooltip,
#if GTK_CHECK_VERSION(2,2,0)
@@ -296,14 +300,15 @@
};
void
-diff -Naur pidgin/gtkdocklet.c pidgin/gtkdocklet.c
---- pidgin/gtkdocklet.c 2008-02-09 21:18:32.000000000 +0100
-+++ pidgin/gtkdocklet.c 2008-02-09 21:51:11.000000000 +0100
+Index: pidgin/gtkdocklet.c
+===================================================================
+--- pidgin/gtkdocklet.c.orig 2008-07-02 02:46:19.000000000 +0200
++++ pidgin/gtkdocklet.c 2008-07-13 14:21:54.000000000 +0200
@@ -62,7 +62,7 @@
* docklet status and utility functions
**************************************************************************/
static gboolean
--docklet_blink_icon()
+-docklet_blink_icon(gpointer data)
+docklet_blink_icon_cb()
{
static gboolean blinked = FALSE;
@@ -335,9 +340,10 @@
}
}
-diff -Naur pidgin/gtkdocklet.h pidgin/gtkdocklet.h
---- pidgin/gtkdocklet.h 2008-02-09 21:18:32.000000000 +0100
-+++ pidgin/gtkdocklet.h 2008-02-09 21:51:11.000000000 +0100
+Index: pidgin/gtkdocklet.h
+===================================================================
+--- pidgin/gtkdocklet.h.orig 2008-07-02 02:46:19.000000000 +0200
++++ pidgin/gtkdocklet.h 2008-07-13 14:21:54.000000000 +0200
@@ -35,6 +35,7 @@
void (*blank_icon)(void);
void (*set_tooltip)(gchar *);
@@ -346,291 +352,11 @@
};
-diff -Naur pidgin/pidginstock.c pidgin/pidginstock.c
---- pidgin/pidginstock.c 2008-02-09 21:18:32.000000000 +0100
-+++ pidgin/pidginstock.c 2008-02-09 21:51:11.000000000 +0100
-@@ -208,39 +208,39 @@
-
- filename = g_build_filename(DATADIR, "pixmaps", "pidgin", dir, size, file, NULL);
- source = gtk_icon_source_new();
-- gtk_icon_source_set_filename(source, filename);
-+ gtk_icon_source_set_filename(source, filename);
- gtk_icon_source_set_direction(source, GTK_TEXT_DIR_LTR);
-- gtk_icon_source_set_direction_wildcarded(source, !rtl);
-+ gtk_icon_source_set_direction_wildcarded(source, !rtl);
- gtk_icon_source_set_size(source, sizeid);
-- gtk_icon_source_set_size_wildcarded(source, FALSE);
-- gtk_icon_source_set_state_wildcarded(source, TRUE);
-- gtk_icon_set_add_source(iconset, source);
-+ gtk_icon_source_set_size_wildcarded(source, FALSE);
-+ gtk_icon_source_set_state_wildcarded(source, TRUE);
-+ gtk_icon_set_add_source(iconset, source);
- gtk_icon_source_free(source);
-
- if (sizeid == gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL)) {
- source = gtk_icon_source_new();
-- gtk_icon_source_set_filename(source, filename);
-- gtk_icon_source_set_direction_wildcarded(source, TRUE);
-- gtk_icon_source_set_size(source, GTK_ICON_SIZE_MENU);
-- gtk_icon_source_set_size_wildcarded(source, FALSE);
-- gtk_icon_source_set_state_wildcarded(source, TRUE);
-- gtk_icon_set_add_source(iconset, source);
-- gtk_icon_source_free(source);
-+ gtk_icon_source_set_filename(source, filename);
-+ gtk_icon_source_set_direction_wildcarded(source, TRUE);
-+ gtk_icon_source_set_size(source, GTK_ICON_SIZE_MENU);
-+ gtk_icon_source_set_size_wildcarded(source, FALSE);
-+ gtk_icon_source_set_state_wildcarded(source, TRUE);
-+ gtk_icon_set_add_source(iconset, source);
-+ gtk_icon_source_free(source);
- }
-- g_free(filename);
-+ g_free(filename);
-
-- if (rtl) {
-+ if (rtl) {
- filename = g_build_filename(DATADIR, "pixmaps", "pidgin", dir, size, "rtl", file, NULL);
-- source = gtk_icon_source_new();
-- gtk_icon_source_set_filename(source, filename);
-- gtk_icon_source_set_direction(source, GTK_TEXT_DIR_RTL);
-- gtk_icon_source_set_size(source, sizeid);
-- gtk_icon_source_set_size_wildcarded(source, FALSE);
-- gtk_icon_source_set_state_wildcarded(source, TRUE);
-- gtk_icon_set_add_source(iconset, source);
-+ source = gtk_icon_source_new();
-+ gtk_icon_source_set_filename(source, filename);
-+ gtk_icon_source_set_direction(source, GTK_TEXT_DIR_RTL);
-+ gtk_icon_source_set_size(source, sizeid);
-+ gtk_icon_source_set_size_wildcarded(source, FALSE);
-+ gtk_icon_source_set_state_wildcarded(source, TRUE);
-+ gtk_icon_set_add_source(iconset, source);
- g_free(filename);
- gtk_icon_source_free(source);
-- }
-+ }
-
-
- }
-@@ -249,36 +249,36 @@
- static void
- do_alphashift (GdkPixbuf *dest, GdkPixbuf *src)
- {
-- gint i, j;
-- gint width, height, has_alpha, srcrowstride, destrowstride;
-- guchar *target_pixels;
-- guchar *original_pixels;
-- guchar *pixsrc;
-- guchar *pixdest;
-- guchar a;
--
-- has_alpha = gdk_pixbuf_get_has_alpha (src);
-- if (!has_alpha)
-- return;
--
-- width = gdk_pixbuf_get_width (src);
-- height = gdk_pixbuf_get_height (src);
-- srcrowstride = gdk_pixbuf_get_rowstride (src);
-- destrowstride = gdk_pixbuf_get_rowstride (dest);
-- target_pixels = gdk_pixbuf_get_pixels (dest);
-- original_pixels = gdk_pixbuf_get_pixels (src);
--
-- for (i = 0; i < height; i++) {
-- pixdest = target_pixels + i*destrowstride;
-- pixsrc = original_pixels + i*srcrowstride;
-- for (j = 0; j < width; j++) {
-- *(pixdest++) = *(pixsrc++);
-- *(pixdest++) = *(pixsrc++);
-- *(pixdest++) = *(pixsrc++);
-- a = *(pixsrc++);
-- *(pixdest++) = a / 2;
-- }
-- }
-+ gint i, j;
-+ gint width, height, has_alpha, srcrowstride, destrowstride;
-+ guchar *target_pixels;
-+ guchar *original_pixels;
-+ guchar *pixsrc;
-+ guchar *pixdest;
-+ guchar a;
-+
-+ has_alpha = gdk_pixbuf_get_has_alpha (src);
-+ if (!has_alpha)
-+ return;
-+
-+ width = gdk_pixbuf_get_width (src);
-+ height = gdk_pixbuf_get_height (src);
-+ srcrowstride = gdk_pixbuf_get_rowstride (src);
-+ destrowstride = gdk_pixbuf_get_rowstride (dest);
-+ target_pixels = gdk_pixbuf_get_pixels (dest);
-+ original_pixels = gdk_pixbuf_get_pixels (src);
-+
-+ for (i = 0; i < height; i++) {
-+ pixdest = target_pixels + i*destrowstride;
-+ pixsrc = original_pixels + i*srcrowstride;
-+ for (j = 0; j < width; j++) {
-+ *(pixdest++) = *(pixsrc++);
-+ *(pixdest++) = *(pixsrc++);
-+ *(pixdest++) = *(pixsrc++);
-+ a = *(pixsrc++);
-+ *(pixdest++) = a / 2;
-+ }
-+ }
- }
-
- /* TODO: This is almost certainly not the best way to do this, but it's late, I'm tired,
-@@ -297,43 +297,43 @@
- do_alphashift(pixbuf, pixbuf);
-
- source = gtk_icon_source_new();
-- gtk_icon_source_set_pixbuf(source, pixbuf);
-+ gtk_icon_source_set_pixbuf(source, pixbuf);
- gtk_icon_source_set_direction(source, GTK_TEXT_DIR_LTR);
-- gtk_icon_source_set_direction_wildcarded(source, !rtl);
-+ gtk_icon_source_set_direction_wildcarded(source, !rtl);
- gtk_icon_source_set_size(source, sizeid);
-- gtk_icon_source_set_size_wildcarded(source, FALSE);
-- gtk_icon_source_set_state_wildcarded(source, TRUE);
-- gtk_icon_set_add_source(iconset, source);
-+ gtk_icon_source_set_size_wildcarded(source, FALSE);
-+ gtk_icon_source_set_state_wildcarded(source, TRUE);
-+ gtk_icon_set_add_source(iconset, source);
- gtk_icon_source_free(source);
-
- if (sizeid == gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL)) {
- source = gtk_icon_source_new();
-- gtk_icon_source_set_pixbuf(source, pixbuf);
-- gtk_icon_source_set_direction_wildcarded(source, TRUE);
-- gtk_icon_source_set_size(source, GTK_ICON_SIZE_MENU);
-- gtk_icon_source_set_size_wildcarded(source, FALSE);
-- gtk_icon_source_set_state_wildcarded(source, TRUE);
-- gtk_icon_set_add_source(iconset, source);
-- gtk_icon_source_free(source);
-+ gtk_icon_source_set_pixbuf(source, pixbuf);
-+ gtk_icon_source_set_direction_wildcarded(source, TRUE);
-+ gtk_icon_source_set_size(source, GTK_ICON_SIZE_MENU);
-+ gtk_icon_source_set_size_wildcarded(source, FALSE);
-+ gtk_icon_source_set_state_wildcarded(source, TRUE);
-+ gtk_icon_set_add_source(iconset, source);
-+ gtk_icon_source_free(source);
- }
-- g_free(filename);
-+ g_free(filename);
- g_object_unref(pixbuf);
-
-- if (rtl) {
-+ if (rtl) {
- filename = g_build_filename(DATADIR, "pixmaps", "pidgin", dir, size, "rtl", file, NULL);
- pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
- do_alphashift(pixbuf, pixbuf);
- source = gtk_icon_source_new();
-- gtk_icon_source_set_pixbuf(source, pixbuf);
-- gtk_icon_source_set_direction(source, GTK_TEXT_DIR_RTL);
-- gtk_icon_source_set_size(source, sizeid);
-- gtk_icon_source_set_size_wildcarded(source, FALSE);
-- gtk_icon_source_set_state_wildcarded(source, TRUE);
-- gtk_icon_set_add_source(iconset, source);
-+ gtk_icon_source_set_pixbuf(source, pixbuf);
-+ gtk_icon_source_set_direction(source, GTK_TEXT_DIR_RTL);
-+ gtk_icon_source_set_size(source, sizeid);
-+ gtk_icon_source_set_size_wildcarded(source, FALSE);
-+ gtk_icon_source_set_state_wildcarded(source, TRUE);
-+ gtk_icon_set_add_source(iconset, source);
- g_free(filename);
- g_object_unref(pixbuf);
- gtk_icon_source_free(source);
-- }
-+ }
-
-
- }
-@@ -420,24 +420,24 @@
- "11", sized_stock_icons[i].filename);
- if (sized_stock_icons[i].extra_small)
- add_sized_icon(iconset, extra_small,
-- sized_stock_icons[i].dir, sized_stock_icons[i].rtl,
-- "16", sized_stock_icons[i].filename);
-- if (sized_stock_icons[i].small)
-- add_sized_icon(iconset, small,
-- sized_stock_icons[i].dir, sized_stock_icons[i].rtl,
-- "22", sized_stock_icons[i].filename);
-- if (sized_stock_icons[i].medium)
-- add_sized_icon(iconset, medium,
-- sized_stock_icons[i].dir, sized_stock_icons[i].rtl,
-- "32", sized_stock_icons[i].filename);
-- if (sized_stock_icons[i].large)
-- add_sized_icon(iconset, large,
-- sized_stock_icons[i].dir, sized_stock_icons[i].rtl,
-- "48", sized_stock_icons[i].filename);
-- if (sized_stock_icons[i].huge)
-- add_sized_icon(iconset, huge,
-- sized_stock_icons[i].dir, sized_stock_icons[i].rtl,
-- "64", sized_stock_icons[i].filename);
-+ sized_stock_icons[i].dir, sized_stock_icons[i].rtl,
-+ "16", sized_stock_icons[i].filename);
-+ if (sized_stock_icons[i].small)
-+ add_sized_icon(iconset, small,
-+ sized_stock_icons[i].dir, sized_stock_icons[i].rtl,
-+ "22", sized_stock_icons[i].filename);
-+ if (sized_stock_icons[i].medium)
-+ add_sized_icon(iconset, medium,
-+ sized_stock_icons[i].dir, sized_stock_icons[i].rtl,
-+ "32", sized_stock_icons[i].filename);
-+ if (sized_stock_icons[i].large)
-+ add_sized_icon(iconset, large,
-+ sized_stock_icons[i].dir, sized_stock_icons[i].rtl,
-+ "48", sized_stock_icons[i].filename);
-+ if (sized_stock_icons[i].huge)
-+ add_sized_icon(iconset, huge,
-+ sized_stock_icons[i].dir, sized_stock_icons[i].rtl,
-+ "64", sized_stock_icons[i].filename);
-
- gtk_icon_factory_add(icon_factory, sized_stock_icons[i].name, iconset);
- gtk_icon_set_unref(iconset);
-@@ -452,23 +452,23 @@
- add_translucent_sized_icon(iconset, extra_small,
- sized_stock_icons[i].dir, sized_stock_icons[i].rtl,
- "16", sized_stock_icons[i].filename);
-- if (sized_stock_icons[i].small)
-- add_translucent_sized_icon(iconset, small,
-- sized_stock_icons[i].dir, sized_stock_icons[i].rtl,
-- "22", sized_stock_icons[i].filename);
-- if (sized_stock_icons[i].medium)
-- add_translucent_sized_icon(iconset, medium,
-- sized_stock_icons[i].dir, sized_stock_icons[i].rtl,
-- "32", sized_stock_icons[i].filename);
-- if (sized_stock_icons[i].large)
-- add_translucent_sized_icon(iconset, large,
-- sized_stock_icons[i].dir, sized_stock_icons[i].rtl,
-- "48", sized_stock_icons[i].filename);
-- if (sized_stock_icons[i].huge)
-- add_translucent_sized_icon(iconset, huge,
-- sized_stock_icons[i].dir, sized_stock_icons[i].rtl,
-- "64", sized_stock_icons[i].filename);
--
-+ if (sized_stock_icons[i].small)
-+ add_translucent_sized_icon(iconset, small,
-+ sized_stock_icons[i].dir, sized_stock_icons[i].rtl,
-+ "22", sized_stock_icons[i].filename);
-+ if (sized_stock_icons[i].medium)
-+ add_translucent_sized_icon(iconset, medium,
-+ sized_stock_icons[i].dir, sized_stock_icons[i].rtl,
-+ "32", sized_stock_icons[i].filename);
-+ if (sized_stock_icons[i].large)
-+ add_translucent_sized_icon(iconset, large,
-+ sized_stock_icons[i].dir, sized_stock_icons[i].rtl,
-+ "48", sized_stock_icons[i].filename);
-+ if (sized_stock_icons[i].huge)
-+ add_translucent_sized_icon(iconset, huge,
-+ sized_stock_icons[i].dir, sized_stock_icons[i].rtl,
-+ "64", sized_stock_icons[i].filename);
-+
- gtk_icon_factory_add(icon_factory, sized_stock_icons[i].translucent_name, iconset);
- gtk_icon_set_unref(iconset);
- }
-diff -Naur pidgin/win32/gtkdocklet-win32.c pidgin/win32/gtkdocklet-win32.c
---- pidgin/win32/gtkdocklet-win32.c 2008-02-09 21:18:32.000000000 +0100
-+++ pidgin/win32/gtkdocklet-win32.c 2008-02-09 21:51:11.000000000 +0100
-@@ -658,7 +658,8 @@
+Index: pidgin/win32/gtkdocklet-win32.c
+===================================================================
+--- pidgin/win32/gtkdocklet-win32.c.orig 2008-07-02 02:46:24.000000000 +0200
++++ pidgin/win32/gtkdocklet-win32.c 2008-07-13 14:21:54.000000000 +0200
+@@ -661,7 +661,8 @@
winpidgin_tray_update_icon,
winpidgin_tray_blank_icon,
winpidgin_tray_set_tooltip,
Modified: trunk/dports/net/pidgin/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/net/pidgin/files/patch-configure.ac.diff 2008-07-13 18:04:25 UTC (rev 38246)
+++ trunk/dports/net/pidgin/files/patch-configure.ac.diff 2008-07-13 18:25:04 UTC (rev 38247)
@@ -1,6 +1,8 @@
---- configure.ac 2007-12-07 09:36:58.000000000 -0500
-+++ configure.ac 2008-03-30 16:27:11.000000000 -0400
-@@ -123,14 +123,6 @@
+Index: configure.ac
+===================================================================
+--- configure.ac.orig 2008-07-02 02:46:08.000000000 +0200
++++ configure.ac 2008-07-13 13:05:57.000000000 +0200
+@@ -131,14 +131,6 @@
], [])
], [])
Modified: trunk/dports/net/pidgin/files/patch-configure.diff
===================================================================
--- trunk/dports/net/pidgin/files/patch-configure.diff 2008-07-13 18:04:25 UTC (rev 38246)
+++ trunk/dports/net/pidgin/files/patch-configure.diff 2008-07-13 18:25:04 UTC (rev 38247)
@@ -1,6 +1,8 @@
---- configure.orig 2008-05-30 13:34:35.000000000 +0200
-+++ configure 2008-05-30 13:35:00.000000000 +0200
-@@ -20818,17 +20818,6 @@
+Index: configure
+===================================================================
+--- configure.orig 2008-07-02 02:47:08.000000000 +0200
++++ configure 2008-07-13 13:06:07.000000000 +0200
+@@ -20886,17 +20886,6 @@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080713/83ae5ecf/attachment-0001.html
More information about the macports-changes
mailing list