Mercurial > pidgin
changeset 16234:5b99b9ec194f
merge of '8099d2b88ecd036263e9ed44e1e6a3565cde621a'
and 'ff0d2b14678cd5d7e1be844da3817659711e3ce9'
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Tue, 17 Apr 2007 19:06:13 +0000 |
| parents | c4818bf183a6 (diff) 520637b2a592 (current diff) |
| children | fde43bac6f23 |
| files | |
| diffstat | 16 files changed, 43 insertions(+), 66 deletions(-) [+] |
line wrap: on
line diff
--- a/acinclude.m4 Tue Apr 17 15:30:16 2007 +0000 +++ b/acinclude.m4 Tue Apr 17 19:06:13 2007 +0000 @@ -489,54 +489,6 @@ fi])dnl -dnl This file scares me... -# Check for binary relocation support -# Hongli Lai -# http://autopackage.org/ - -AC_DEFUN([AM_BINRELOC], -[ - AC_ARG_ENABLE(binreloc, - [ --enable-binreloc compile with binary relocation support - (default=enable when available)], - enable_binreloc=$enableval,enable_binreloc=auto) - - BINRELOC_CFLAGS= - BINRELOC_LIBS= - if test "x$enable_binreloc" = "xauto"; then - AC_CACHE_CHECK([whether everything is installed to the same prefix], - [br_cv_valid_prefixes], [ - if test "$bindir" = '${exec_prefix}/bin' -a "$sbindir" = '${exec_prefix}/sbin' -a \ - "$datadir" = '${prefix}/share' -a "$libdir" = '${exec_prefix}/lib' -a \ - "$libexecdir" = '${exec_prefix}/libexec' -a "$sysconfdir" = '${prefix}/etc' - then - br_cv_valid_prefixes=yes - else - br_cv_valid_prefixes=no - fi - ]) - fi - AC_CACHE_CHECK([whether binary relocation support should be enabled], - [br_cv_binreloc], - [if test "x$enable_binreloc" = "xyes"; then - br_cv_binreloc=yes - elif test "x$enable_binreloc" = "xauto"; then - if test "x$br_cv_valid_prefixes" = "xyes"; then - br_cv_binreloc=yes - else - br_cv_binreloc=no - fi - else - br_cv_binreloc=no - fi]) - - if test "x$br_cv_binreloc" = "xyes"; then - BINRELOC_CFLAGS="-DENABLE_BINRELOC" - AC_DEFINE(ENABLE_BINRELOC,,[Use binary relocation?]) - fi - AC_SUBST(BINRELOC_CFLAGS) - AC_SUBST(BINRELOC_LIBS) -]) dnl AM_GCONF_SOURCE_2 dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas dnl (i.e. pass to gconftool-2
--- a/config.h.mingw Tue Apr 17 15:30:16 2007 +0000 +++ b/config.h.mingw Tue Apr 17 19:06:13 2007 +0000 @@ -279,6 +279,9 @@ /* Define to 1 if you have the <nss.h> header file. */ /* #undef HAVE_NSS_H */ +/* Define if we have Pango 1.4 or newer. */ +#define HAVE_PANGO14 1 + /* Define to 1 if you have the <paths.h> header file. */ /* #define HAVE_PATHS_H 1 */
--- a/configure.ac Tue Apr 17 15:30:16 2007 +0000 +++ b/configure.ac Tue Apr 17 19:06:13 2007 +0000 @@ -241,6 +241,10 @@ AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) + dnl We only really need Pango >= 1.4 for decent RTL support + PKG_CHECK_MODULES(pango, [pango >= 1.4.0], + AC_DEFINE(HAVE_PANGO14, 1, [Define if we have Pango 1.4 or newer.]),:) + dnl ####################################################################### dnl # Check for XScreenSaver dnl ####################################################################### @@ -1832,7 +1836,7 @@ dnl ####################################################################### PKG_CHECK_MODULES(CHECK,[check >= 0.9.4],:,[ ifdef([AM_PATH_CHECK], - [AM_PATH_CHECK], + [AM_PATH_CHECK(0.8.2,:,:)], [AC_MSG_RESULT([no, testing is disabled])]) ]) AM_CONDITIONAL(HAVE_CHECK, [test "x$CHECK_LIBS" != "x"])
--- a/pidgin.spec.in Tue Apr 17 15:30:16 2007 +0000 +++ b/pidgin.spec.in Tue Apr 17 19:06:13 2007 +0000 @@ -22,7 +22,6 @@ License: GPL Group: Applications/Internet URL: http://pidgin.im/ -Packager: %{packager} Source: %{name}-@VERSION@.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -68,8 +67,6 @@ # For some reason perl isn't always automatically detected as a requirement :( Requires: perl -# Gadu-Gadu support was split out temporarily (only as gaim) -Provides: gaim-gadugadu = %{epoch}:%{version}-%{release} Obsoletes: gaim %package devel @@ -81,11 +78,14 @@ %package -n libpurple Summary: libpurple library for IM clients like Pidgin and Finch Group: Applications/Internet +Obsoletes: gaim-silc +Obsoletes: gaim-tcl +Obsoletes: gaim-gadugadu %package -n libpurple-devel Summary: Development headers, documentation, and libraries for libpurple Group: Applications/Internet -Requires: libpurple = %{epoch}:%{version} +Requires: libpurple = %{epoch}:%{version} %if 0%{?_with_howl:1} || 0%{?_with_avahi:1} %package -n libpurple-bonjour @@ -115,7 +115,7 @@ Requires: libpurple = %{epoch}:%{version} %package -n finch-devel -Summary: Headers etc. for finch stuffs +Summary: Headers etc. for finch stuffs Group: Applications/Internet Requires: finch = %{epoch}:%{version}, libpurple-devel = %{epoch}:%{version} %endif @@ -427,6 +427,10 @@ %endif %changelog +* Tue Apr 17 2007 Stu Tomlinson <stu@nosnilmot.com> +- Add some Obsolete:s to help upgrades +- Remove explicit Packager: %%{packager} from spec, it was redundant + * Sun Apr 15 2007 Stu Tomlinson <stu@nosnilmot.com> - Fix for building without Finch - Drop -tcl & -silc sub-packages, include them in the main libpurple @@ -493,7 +497,7 @@ - Fix SILC build requirements to work across more distros * Mon Oct 11 2004 John Jolly <john.jolly@gmail.com> -- Added if "%{_vendor}" == "suse" to handle GnuTLS libraries for SuSE +- Added if "%%{_vendor}" == "suse" to handle GnuTLS libraries for SuSE * Sat Oct 2 2004 Stu Tomlinson <stu@nosnilmot.com> - If --with tcl or silc are not specified, make sure the plugins don't @@ -518,7 +522,7 @@ * Sun Jul 20 2003 Bjoern Voigt <bjoern@cs.tu-berlin.de> - Added pkgconfig build dependency. -- if "%{_vendor}" != "MandrakeSoft" now also works with rpm 3.x. +- if "%%{_vendor}" != "MandrakeSoft" now also works with rpm 3.x. - Added Gaim-specific directories to list of Gaim's files. * Wed Jul 16 2003 Ethan Blanton <eblanton@cs.ohiou.edu>
--- a/pidgin/Makefile.mingw Tue Apr 17 15:30:16 2007 +0000 +++ b/pidgin/Makefile.mingw Tue Apr 17 19:06:13 2007 +0000 @@ -39,6 +39,7 @@ -I$(GTK_TOP)/include/gtk-2.0 \ -I$(GTK_TOP)/include/pango-1.0 \ -I$(GTK_TOP)/include/atk-1.0 \ + -I$(GTK_TOP)/include/cairo \ -I$(GTK_TOP)/lib/gtk-2.0/include \ -I$(GTKSPELL_TOP) \ -I$(ASPELL_TOP)/include
--- a/pidgin/gtkconv.c Tue Apr 17 15:30:16 2007 +0000 +++ b/pidgin/gtkconv.c Tue Apr 17 19:06:13 2007 +0000 @@ -4900,33 +4900,35 @@ static void str_embed_direction_chars(char **str) { +#ifdef HAVE_PANGO14 char pre_str[4]; char post_str[10]; - char *ret = g_malloc(strlen(*str)+13); + char *ret; if (PANGO_DIRECTION_RTL == pango_find_base_dir(*str, -1)) { - g_sprintf(pre_str, "%c%c%c", + sprintf(pre_str, "%c%c%c", 0xE2, 0x80, 0xAB); /* RLE */ - g_sprintf(post_str, "%c%c%c%c%c%c%c%c%c", + sprintf(post_str, "%c%c%c%c%c%c%c%c%c", 0xE2, 0x80, 0xAC, /* PDF */ 0xE2, 0x80, 0x8E, /* LRM */ 0xE2, 0x80, 0xAC); /* PDF */ } else { - g_sprintf(pre_str, "%c%c%c", + sprintf(pre_str, "%c%c%c", 0xE2, 0x80, 0xAA); /* LRE */ - g_sprintf(post_str, "%c%c%c%c%c%c%c%c%c", + sprintf(post_str, "%c%c%c%c%c%c%c%c%c", 0xE2, 0x80, 0xAC, /* PDF */ 0xE2, 0x80, 0x8F, /* RLM */ 0xE2, 0x80, 0xAC); /* PDF */ } - g_sprintf(ret, "%s%s%s", pre_str, *str, post_str); + ret = g_strconcat(pre_str, *str, post_str, NULL); g_free(*str); *str = ret; +#endif } /* Returns true if the given HTML contains RTL text */
--- a/pidgin/gtkimhtml.c Tue Apr 17 15:30:16 2007 +0000 +++ b/pidgin/gtkimhtml.c Tue Apr 17 19:06:13 2007 +0000 @@ -4573,12 +4573,14 @@ /* Bi-directional text support */ /* Get to the first non-neutral character */ +#ifdef HAVE_PANGO14 while ((PANGO_DIRECTION_NEUTRAL == pango_unichar_direction(gtk_text_iter_get_char(&non_neutral_iter))) && gtk_text_iter_forward_char(&non_neutral_iter)); if (PANGO_DIRECTION_RTL == pango_unichar_direction(gtk_text_iter_get_char(&non_neutral_iter))) { is_rtl_message = TRUE; g_string_append(str, "<SPAN style=\"direction:rtl;text-align:right;\">"); } +#endif /* First add the tags that are already in progress (we don't care about non-printing tags)*/ tags = gtk_text_iter_get_tags(start);
--- a/pidgin/gtklog.c Tue Apr 17 15:30:16 2007 +0000 +++ b/pidgin/gtklog.c Tue Apr 17 19:06:13 2007 +0000 @@ -226,6 +226,7 @@ GtkTreePath *path = gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), iter); gboolean first = !gtk_tree_path_prev(path); +#if GTK_CHECK_VERSION(2,2,0) if (!gtk_tree_store_remove(treestore, iter) && first) { /* iter was the last child at its level */ @@ -237,6 +238,10 @@ } } gtk_tree_path_free(path); +#else + gtk_tree_store_remove(treestore, iter); + gtk_tree_path_free(path); +#endif } delete_log_cleanup_cb(data);
--- a/pidgin/gtkscrollbook.h Tue Apr 17 15:30:16 2007 +0000 +++ b/pidgin/gtkscrollbook.h Tue Apr 17 19:06:13 2007 +0000 @@ -29,7 +29,7 @@ #include <gtk/gtk.h> #if !GTK_CHECK_VERSION(2,4,0) -#include "purplecombobox.h" +#include "pidgincombobox.h" #endif G_BEGIN_DECLS
--- a/pidgin/pidgincombobox.c Tue Apr 17 15:30:16 2007 +0000 +++ b/pidgin/pidgincombobox.c Tue Apr 17 19:06:13 2007 +0000 @@ -1,4 +1,4 @@ -/* purplecombobox.c +/* pidgincombobox.c * Copyright (C) 2002, 2003 Kristian Rietveld <kris@gtk.org> * * This library is free software; you can redistribute it and/or
--- a/pidgin/pixmaps/Makefile.am Tue Apr 17 15:30:16 2007 +0000 +++ b/pidgin/pixmaps/Makefile.am Tue Apr 17 19:06:13 2007 +0000 @@ -39,7 +39,7 @@ arrow-down.xpm \ arrow-up.xpm \ arrow-right.xpm \ - arrow_left.xpm \ + arrow-left.xpm \ text_bigger.png \ text_normal.png \ text_smaller.png \
--- a/pidgin/plugins/Makefile.mingw Tue Apr 17 15:30:16 2007 +0000 +++ b/pidgin/plugins/Makefile.mingw Tue Apr 17 19:06:13 2007 +0000 @@ -24,6 +24,7 @@ -I$(GTK_TOP)/include/glib-2.0 \ -I$(GTK_TOP)/include/pango-1.0 \ -I$(GTK_TOP)/include/atk-1.0 \ + -I$(GTK_TOP)/include/cairo \ -I$(GTK_TOP)/lib/glib-2.0/include \ -I$(GTK_TOP)/lib/gtk-2.0/include \ -I$(PIDGIN_TREE_TOP) \
--- a/pidgin/plugins/ticker/Makefile.mingw Tue Apr 17 15:30:16 2007 +0000 +++ b/pidgin/plugins/ticker/Makefile.mingw Tue Apr 17 19:06:13 2007 +0000 @@ -18,6 +18,7 @@ -I$(GTK_TOP)/include/glib-2.0 \ -I$(GTK_TOP)/include/pango-1.0 \ -I$(GTK_TOP)/include/atk-1.0 \ + -I$(GTK_TOP)/include/cairo \ -I$(GTK_TOP)/lib/glib-2.0/include \ -I$(GTK_TOP)/lib/gtk-2.0/include \ -I$(PURPLE_TOP) \
--- a/pidgin/plugins/win32/transparency/Makefile.mingw Tue Apr 17 15:30:16 2007 +0000 +++ b/pidgin/plugins/win32/transparency/Makefile.mingw Tue Apr 17 19:06:13 2007 +0000 @@ -19,6 +19,7 @@ -I$(GTK_TOP)/include/glib-2.0 \ -I$(GTK_TOP)/include/pango-1.0 \ -I$(GTK_TOP)/include/atk-1.0 \ + -I$(GTK_TOP)/include/cairo \ -I$(GTK_TOP)/lib/glib-2.0/include \ -I$(GTK_TOP)/lib/gtk-2.0/include \ -I$(PURPLE_TOP) \
--- a/pidgin/plugins/win32/winprefs/Makefile.mingw Tue Apr 17 15:30:16 2007 +0000 +++ b/pidgin/plugins/win32/winprefs/Makefile.mingw Tue Apr 17 19:06:13 2007 +0000 @@ -19,6 +19,7 @@ -I$(GTK_TOP)/include/glib-2.0 \ -I$(GTK_TOP)/include/pango-1.0 \ -I$(GTK_TOP)/include/atk-1.0 \ + -I$(GTK_TOP)/include/cairo \ -I$(GTK_TOP)/lib/glib-2.0/include \ -I$(GTK_TOP)/lib/gtk-2.0/include \ -I$(PURPLE_TOP) \