[xchat-gnome/f15/master] Update to 0.26.2, as tagged in upstream git.
Bill Nottingham
notting at fedoraproject.org
Thu Apr 7 20:29:03 UTC 2011
commit 076b08e8dcb743a61881e203bf53cdd78d859e00
Author: Bill Nottingham <notting at redhat.com>
Date: Thu Apr 7 15:42:29 2011 -0400
Update to 0.26.2, as tagged in upstream git.
xchat-gnome-nm09.patch | 149 ++++++++++++++++++++++++++++++++++++++++++++++++
xchat-gnome.spec | 49 ++++++----------
2 files changed, 167 insertions(+), 31 deletions(-)
---
diff --git a/xchat-gnome-nm09.patch b/xchat-gnome-nm09.patch
new file mode 100644
index 0000000..2d0f225
--- /dev/null
+++ b/xchat-gnome-nm09.patch
@@ -0,0 +1,149 @@
+diff -up xchat-gnome-0.26.1/plugins/net-monitor/net-monitor.c.recent-nm xchat-gnome-0.26.1/plugins/net-monitor/net-monitor.c
+--- xchat-gnome-0.26.1/plugins/net-monitor/net-monitor.c.recent-nm 2009-03-15 09:08:06.000000000 -0500
++++ xchat-gnome-0.26.1/plugins/net-monitor/net-monitor.c 2011-03-25 18:10:33.621834647 -0500
+@@ -23,7 +23,6 @@
+ */
+
+ #include <config.h>
+-#define DBUS_API_SUBJECT_TO_CHANGE
+ #include <dbus/dbus.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+@@ -54,13 +53,18 @@ typedef enum
+
+ typedef enum
+ {
+- NM_STATE_UNKNOWN = 0,
+- NM_STATE_ASLEEP,
+- NM_STATE_CONFIGURE_AP,
+- NM_STATE_CONFIGURE_DEV,
+- NM_STATE_CONFIGURE_IP,
+- NM_STATE_CONNECTED,
+- NM_STATE_DISCONNECTED,
++ NM_STATE_UNKNOWN = 0,
++ NM_OLD_STATE_ASLEEP = 1,
++ NM_OLD_STATE_CONNECTING = 4,
++ NM_OLD_STATE_CONNECTED = 5,
++ NM_OLD_STATE_DISCONNECTED = 6,
++ NM_STATE_ASLEEP = 10,
++ NM_STATE_DISCONNECTED = 20,
++ NM_STATE_DISCONNECTING = 30,
++ NM_STATE_CONNECTING = 40,
++ NM_STATE_CONNECTED_LOCAL = 50,
++ NM_STATE_CONNECTED_SITE = 60,
++ NM_STATE_CONNECTED_GLOBAL = 70
+ } NetworkManagerState;
+
+ enum {
+@@ -180,50 +184,6 @@ set_network_mode (NetworkStatus status)
+ }
+ }
+
+-static NetworkStatus
+-check_device_state (const char *path)
+-{
+- DBusMessage *message, *reply;
+- DBusMessageIter iter;
+- DBusError error;
+- NetworkStatus network_mode;
+-
+- message = dbus_message_new_method_call (NM_SERVICE, path, NM_INTERFACE, "getLinkActive");
+- if (message == NULL) {
+- g_warning ("Net Monitor: Couldn't allocate dbus message : %s: %s\n", error.name, error.message);
+- /* just guess that we're up */
+- return NETWORK_UP;
+- }
+-
+- dbus_error_init (&error);
+- reply = dbus_connection_send_with_reply_and_block (bus, message, -1, &error);
+-
+- if (dbus_error_is_set (&error)) {
+- g_warning ("Net Monitor: Error retrieving device state: %s: %s\n", error.name, error.message);
+- network_mode = NETWORK_UP;
+- } else {
+- dbus_message_iter_init (reply, &iter);
+-
+- if (dbus_message_iter_get_arg_type (&iter) == DBUS_TYPE_BOOLEAN) {
+- dbus_bool_t active;
+-
+- dbus_message_iter_get_basic (&iter, &active);
+- network_mode = active ? NETWORK_UP : NETWORK_DOWN;
+- } else {
+- g_warning ("Net Monitor: got bad reply from NetworkManager\n");
+- network_mode = NETWORK_UP;
+- }
+- }
+-
+- if (reply)
+- dbus_message_unref (reply);
+-
+- if (message)
+- dbus_message_unref (message);
+-
+- return network_mode;
+-}
+-
+ static void
+ determine_network_status ()
+ {
+@@ -232,7 +192,7 @@ determine_network_status ()
+ DBusError error;
+ NetworkStatus network_mode = NETWORK_DOWN;
+
+- message = dbus_message_new_method_call (NM_SERVICE, NM_OBJECT_PATH, NM_INTERFACE, "getDevices");
++ message = dbus_message_new_method_call (NM_SERVICE, NM_OBJECT_PATH, NM_INTERFACE, "state");
+ if (message == NULL) {
+ g_warning ("Net Monitor: Couldn't allocate dbus message : %s: %s\n", error.name, error.message);
+ /* just guess that we're up */
+@@ -248,24 +208,15 @@ determine_network_status ()
+ network_mode = NETWORK_UP;
+ } else {
+ dbus_message_iter_init (reply, &iter);
+- if (dbus_message_iter_get_arg_type (&iter) == DBUS_TYPE_ARRAY) {
+- DBusMessageIter child;
+-
+- dbus_message_iter_recurse (&iter, &child);
+-
+- while (dbus_message_iter_get_arg_type (&child) != DBUS_TYPE_INVALID) {
+- const char *path;
+- gboolean state;
+-
+- /* Check the state of this individual device. If any one
+- * device is active, the network is up */
+- dbus_message_iter_get_basic (&child, &path);
+- state = check_device_state (path);
+- if (state == NETWORK_UP)
+- network_mode = NETWORK_UP;
++ if (dbus_message_iter_get_arg_type (&iter) == DBUS_TYPE_UINT32) {
++ dbus_uint32_t state;
+
+- dbus_message_iter_next (&child);
+- }
++ dbus_message_iter_get_basic (&iter, &state);
++ if (state == NM_OLD_STATE_CONNECTED ||
++ state == NM_STATE_CONNECTED_LOCAL ||
++ state == NM_STATE_CONNECTED_SITE ||
++ state == NM_STATE_CONNECTED_GLOBAL)
++ network_mode = NETWORK_UP;
+ } else {
+ g_warning ("Net Monitor: got bad reply from NetworkManager\n");
+ network_mode = NETWORK_UP;
+@@ -284,16 +235,12 @@ determine_network_status ()
+ static DBusHandlerResult
+ filter_func (DBusConnection *connection, DBusMessage *message, void *data)
+ {
+- if (dbus_message_is_signal (message, NM_INTERFACE, "DeviceNoLongerActive")) {
++ if (dbus_message_is_signal (message, NM_INTERFACE, "StateChanged") ||
++ dbus_message_is_signal (message, NM_INTERFACE, "StateChange")) {
+ determine_network_status ();
+ return DBUS_HANDLER_RESULT_HANDLED;
+ }
+
+- if (dbus_message_is_signal (message, NM_INTERFACE, "DeviceNowActive")) {
+- set_network_mode (NETWORK_UP);
+- return DBUS_HANDLER_RESULT_HANDLED;
+- }
+-
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+ }
+
diff --git a/xchat-gnome.spec b/xchat-gnome.spec
index ca04beb..be58e3c 100644
--- a/xchat-gnome.spec
+++ b/xchat-gnome.spec
@@ -1,32 +1,23 @@
+%global gitrev 40c5bf988
+
Name: xchat-gnome
-Version: 0.26.1
-Release: 17%{?dist}
+Version: 0.26.2
+Release: 0.git%{gitrev}%{?dist}
Summary: GNOME front-end to xchat
Group: Applications/Internet
License: GPLv2+
-URL: http://%{name}.navi.cx/
-Source0: http://ftp.acc.umu.se/pub/gnome/sources/%{name}/0.26/%{name}-%{version}.tar.bz2
+URL: http://live.gnome.org/Xchat-Gnome
+# Generated from git, tarball wasn't released.
+# To generate:
+# git clone git://git.gnome.org/xchat-gnome
+# git archive --format=tar --prefix=xchat-gnome-0.26.2/ XCHAT_GNOME_0_26_2 > xchat-gnome-0.26.2-%{gitrev}.ta
+# bzip2 xchat-gnome-0.26.2-%{gitrev}.tar
+Source0: http://ftp.gnome.org/pub/gnome/sources/%{name}/0.26/%{name}-%{version}-%{gitrev}.tar.bz2
# Patch specific to Fedora to use .xchat-gnome, instead of .xchat2
Patch0: %{name}-0.23.92-config.patch
-# Patch to fix pressing "enter" in the middle of editing channel topic.
-# RH Bug #483839
-Patch1: xchat-topic-update.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=550662
-Patch2: %{name}-crasher.patch
-# http://git.gnome.org/browse/xchat-gnome/commit/?id=ac131cab5e5429525aed592b504bae9d6ee92069
-Patch3: status_fix.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=564820
-Patch4: %{name}-DSOLink.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=608515
-Patch5: 0001-Added-port-numbers-for-Freenode.patch
-Patch6: xg-depreciated-macros.patch
-# https://bugzilla.gnome.org/599781
-Patch7: 0001-Fix-DCC-transfer-timeouts-when-dcc_auto_send-2.patch
-# FTBFS, upstream commit 8d35b36baa8204b68c9520ec92327e34c1d7c580
-Patch8: xchat-gnome-0.26.1-deprecated-symbol.patch
# Patch for libnotify 0.70 (just drop one parameter from one function)
-Patch9: xchat-gnome-0.26.1-libnotify.patch
+Patch1: xchat-gnome-0.26.1-libnotify.patch
# Patch to work with recent NetworkManager (0.7+)
Patch10: xchat-gnome-0.26.1-recent-network-manager.patch
# Kill libgnomeui
@@ -76,15 +67,7 @@ common settings will be included in the main user interface. .
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1 -b .config
-%patch1 -p1 -b .topic
-%patch2 -p1 -b .crasher
-%patch3 -p1 -b .status
-%patch4 -p1 -b .dsolink
-%patch5 -p1 -b .freenode
-%patch6 -p1 -b .macros
-%patch7 -p1 -b .dcc
-%patch8 -p1 -b .symbol
-%patch9 -p1 -b .notify
+%patch1 -p1 -b .notify
%patch10 -p1 -b .recent-nm
%patch11 -p1 -b .add-libegg
%patch12 -p1 -b .kill-libgnomeui
@@ -92,10 +75,11 @@ common settings will be included in the main user interface. .
%build
-autoreconf -i
+./autogen.sh
%configure --disable-tcl \
--disable-scrollkeeper \
--disable-schemas-install \
+ --disable-maintainer-mode \
--disable-static
make %{?_smp_mflags}
@@ -155,6 +139,9 @@ fi
%changelog
+* Thu Apr 07 2011 Bill Nottingham <notting at redhat.com> - 0.26.2-1
+- update to 0.26.2
+
* Fri Mar 25 2011 Dan Williams <dcbw at redhat.com> - 0.26.1-17
- Update for NetworkManager 0.9
- Update for recent GTK/GNOME API changes
More information about the scm-commits
mailing list