rpms/twitux/devel twitux-libsoup24.patch, NONE, 1.1 twitux.spec, 1.2, 1.3
Brian Pepple (bpepple)
fedora-extras-commits at redhat.com
Wed Feb 6 15:12:15 UTC 2008
- Previous message (by thread): rpms/iproute/devel iproute2-backwardcompat.patch, NONE, 1.1 .cvsignore, 1.23, 1.24 iproute.spec, 1.78, 1.79 sources, 1.23, 1.24
- Next message (by thread): rpms/iproute/devel iproute2-tex.patch,NONE,1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: bpepple
Update of /cvs/pkgs/rpms/twitux/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7349
Modified Files:
twitux.spec
Added Files:
twitux-libsoup24.patch
Log Message:
* Wed Feb 6 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.60-3
- Add BR for gnome-keyring-devel & dbus-devel.
- Add patch to use libsoup-2.4 api. (Thanks to Dan Winship)
twitux-libsoup24.patch:
--- NEW FILE twitux-libsoup24.patch ---
diff -ur twitux-0.60.OLD/configure twitux-0.60/configure
--- twitux-0.60.OLD/configure 2007-12-29 17:06:04.000000000 -0500
+++ twitux-0.60/configure 2008-02-06 09:51:28.000000000 -0500
@@ -22810,7 +22810,7 @@
glib-2.0 >= \$GLIB_REQUIRED
libgnomeui-2.0 >= \$LIBGNOME_REQUIRED
gnome-vfs-2.0 >= \$LIBGNOMEVFS_REQUIRED
- libsoup-2.2
+ libsoup-2.4
libnotify
\$iso_codes_pkgconfig
\$dbus_pkgconfig
@@ -22822,7 +22822,7 @@
glib-2.0 >= $GLIB_REQUIRED
libgnomeui-2.0 >= $LIBGNOME_REQUIRED
gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED
- libsoup-2.2
+ libsoup-2.4
libnotify
$iso_codes_pkgconfig
$dbus_pkgconfig
@@ -22837,7 +22837,7 @@
glib-2.0 >= $GLIB_REQUIRED
libgnomeui-2.0 >= $LIBGNOME_REQUIRED
gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED
- libsoup-2.2
+ libsoup-2.4
libnotify
$iso_codes_pkgconfig
$dbus_pkgconfig
@@ -22861,7 +22861,7 @@
glib-2.0 >= \$GLIB_REQUIRED
libgnomeui-2.0 >= \$LIBGNOME_REQUIRED
gnome-vfs-2.0 >= \$LIBGNOMEVFS_REQUIRED
- libsoup-2.2
+ libsoup-2.4
libnotify
\$iso_codes_pkgconfig
\$dbus_pkgconfig
@@ -22873,7 +22873,7 @@
glib-2.0 >= $GLIB_REQUIRED
libgnomeui-2.0 >= $LIBGNOME_REQUIRED
gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED
- libsoup-2.2
+ libsoup-2.4
libnotify
$iso_codes_pkgconfig
$dbus_pkgconfig
@@ -22888,7 +22888,7 @@
glib-2.0 >= $GLIB_REQUIRED
libgnomeui-2.0 >= $LIBGNOME_REQUIRED
gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED
- libsoup-2.2
+ libsoup-2.4
libnotify
$iso_codes_pkgconfig
$dbus_pkgconfig
@@ -22918,7 +22918,7 @@
glib-2.0 >= $GLIB_REQUIRED
libgnomeui-2.0 >= $LIBGNOME_REQUIRED
gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED
- libsoup-2.2
+ libsoup-2.4
libnotify
$iso_codes_pkgconfig
$dbus_pkgconfig
@@ -22931,7 +22931,7 @@
glib-2.0 >= $GLIB_REQUIRED
libgnomeui-2.0 >= $LIBGNOME_REQUIRED
gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED
- libsoup-2.2
+ libsoup-2.4
libnotify
$iso_codes_pkgconfig
$dbus_pkgconfig
@@ -22947,7 +22947,7 @@
glib-2.0 >= $GLIB_REQUIRED
libgnomeui-2.0 >= $LIBGNOME_REQUIRED
gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED
- libsoup-2.2
+ libsoup-2.4
libnotify
$iso_codes_pkgconfig
$dbus_pkgconfig
@@ -22969,7 +22969,7 @@
glib-2.0 >= $GLIB_REQUIRED
libgnomeui-2.0 >= $LIBGNOME_REQUIRED
gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED
- libsoup-2.2
+ libsoup-2.4
libnotify
$iso_codes_pkgconfig
$dbus_pkgconfig
diff -ur twitux-0.60.OLD/configure.in twitux-0.60/configure.in
--- twitux-0.60.OLD/configure.in 2007-12-29 16:51:46.000000000 -0500
+++ twitux-0.60/configure.in 2008-02-06 09:48:33.000000000 -0500
@@ -140,7 +140,7 @@
glib-2.0 >= $GLIB_REQUIRED
libgnomeui-2.0 >= $LIBGNOME_REQUIRED
gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED
- libsoup-2.2
+ libsoup-2.4
libnotify
$iso_codes_pkgconfig
$dbus_pkgconfig
diff -ur twitux-0.60.OLD/src/twitux-network.c twitux-0.60/src/twitux-network.c
--- twitux-0.60.OLD/src/twitux-network.c 2007-12-30 10:47:40.000000000 -0500
+++ twitux-0.60/src/twitux-network.c 2008-02-06 09:48:33.000000000 -0500
@@ -46,39 +46,45 @@
} TwituxImage;
static void network_get_data (const gchar *url,
- SoupMessageCallbackFn callback,
+ SoupSessionCallback callback,
gpointer data);
static void network_post_data (const gchar *url,
gchar *formdata,
- SoupMessageCallbackFn callback);
+ SoupSessionCallback callback);
static gboolean network_check_http (gint status_code);
static gchar *network_save_data (SoupMessage *msg,
const char *file);
static void network_parser_free_lists (void);
/* libsoup callbacks */
-static void network_cb_on_login (SoupMessage *msg,
+static void network_cb_on_login (SoupSession *session,
+ SoupMessage *msg,
gpointer user_data);
-static void network_cb_on_post (SoupMessage *msg,
+static void network_cb_on_post (SoupSession *session,
+ SoupMessage *msg,
gpointer user_data);
-static void network_cb_on_message (SoupMessage *msg,
+static void network_cb_on_message (SoupSession *session,
+ SoupMessage *msg,
gpointer user_data);
-static void network_cb_on_timeline (SoupMessage *msg,
+static void network_cb_on_timeline (SoupSession *session,
+ SoupMessage *msg,
gpointer user_data);
-static void network_cb_on_users (SoupMessage *msg,
+static void network_cb_on_users (SoupSession *session,
+ SoupMessage *msg,
gpointer user_data);
-static void network_cb_on_image (SoupMessage *msg,
+static void network_cb_on_image (SoupSession *session,
+ SoupMessage *msg,
gpointer user_data);
-static void network_cb_on_add (SoupMessage *msg,
+static void network_cb_on_add (SoupSession *session,
+ SoupMessage *msg,
gpointer user_data);
-static void network_cb_on_del (SoupMessage *msg,
+static void network_cb_on_del (SoupSession *session,
+ SoupMessage *msg,
gpointer user_data);
static void network_cb_on_auth (SoupSession *session,
SoupMessage *msg,
- const char *auth_type,
- const char *auth_realm,
- char **username,
- char **password,
+ SoupAuth *auth,
+ gboolean retrying,
gpointer data);
/* Autoreload timeout functions */
@@ -130,7 +136,7 @@
&port);
if (server && server[0]) {
- SoupUri *suri;
+ SoupURI *suri;
check_proxy = FALSE;
twitux_conf_get_bool (conf,
@@ -220,10 +226,6 @@
"authenticate",
G_CALLBACK (network_cb_on_auth),
NULL);
- g_signal_connect (soup_connection,
- "reauthenticate",
- G_CALLBACK (network_cb_on_auth),
- NULL);
/* Verify cedentials */
network_get_data (TWITUX_API_LOGIN, network_cb_on_login, NULL);
@@ -446,7 +448,7 @@
/* Get data from net */
static void
network_get_data (const gchar *url,
- SoupMessageCallbackFn callback,
+ SoupSessionCallback callback,
gpointer data)
{
SoupMessage *msg;
@@ -463,7 +465,7 @@
static void
network_post_data (const gchar *url,
gchar *formdata,
- SoupMessageCallbackFn callback)
+ SoupSessionCallback callback)
{
SoupMessage *msg;
@@ -471,16 +473,16 @@
msg = soup_message_new ("POST", url);
- soup_message_add_header (msg->request_headers,
- "X-Twitter-Client", PACKAGE_NAME);
- soup_message_add_header (msg->request_headers,
- "X-Twitter-Client-Version", PACKAGE_VERSION);
- soup_message_add_header (msg->request_headers,
- "X-Twitter-Client-URL", TWITUX_HEADER_URL);
+ soup_message_headers_append (msg->request_headers,
+ "X-Twitter-Client", PACKAGE_NAME);
+ soup_message_headers_append (msg->request_headers,
+ "X-Twitter-Client-Version", PACKAGE_VERSION);
+ soup_message_headers_append (msg->request_headers,
+ "X-Twitter-Client-URL", TWITUX_HEADER_URL);
soup_message_set_request (msg,
"application/x-www-form-urlencoded",
- SOUP_BUFFER_USER_OWNED,
+ SOUP_MEMORY_TAKE,
formdata,
strlen (formdata));
@@ -526,8 +528,8 @@
/* Save */
if (g_file_set_contents (tmp_file,
- msg->response.body,
- msg->response.length,
+ msg->response_body->data,
+ msg->response_body->length,
NULL)) {
return tmp_file;
}
@@ -582,10 +584,8 @@
static void
network_cb_on_auth (SoupSession *session,
SoupMessage *msg,
- const char *auth_type,
- const char *auth_realm,
- char **username,
- char **password,
+ SoupAuth *auth,
+ gboolean retrying,
gpointer data)
{
TwituxConf *conf;
@@ -612,10 +612,8 @@
#endif
/* verify that the password has been set */
- if (!G_STR_EMPTY (user_passwd)) {
- *username = g_strdup (user_id);
- *password = g_strdup (user_passwd);
- }
+ if (!G_STR_EMPTY (user_passwd))
+ soup_auth_authenticate (auth, user_id, user_passwd);
if (user_id)
g_free (user_id);
@@ -627,7 +625,8 @@
/* On verify credentials */
static void
-network_cb_on_login (SoupMessage *msg,
+network_cb_on_login (SoupSession *session,
+ SoupMessage *msg,
gpointer user_data)
{
twitux_debug (DEBUG_DOMAIN,
@@ -645,13 +644,10 @@
/* On post a tweet */
static void
-network_cb_on_post (SoupMessage *msg,
+network_cb_on_post (SoupSession *session,
+ SoupMessage *msg,
gpointer user_data)
{
- /* Free buffer memory
- * Review: we need to free something more? */
- g_free (msg->request.body);
-
if (network_check_http (msg->status_code)) {
twitux_app_set_statusbar_msg (_("Status Sent"));
}
@@ -663,13 +659,10 @@
/* On send a direct message */
static void
-network_cb_on_message (SoupMessage *msg,
+network_cb_on_message (SoupSession *session,
+ SoupMessage *msg,
gpointer user_data)
{
- /* Free buffer memory
- * Review: we need to free something more? */
- g_free (msg->request.body);
-
if (network_check_http (msg->status_code)) {
twitux_app_set_statusbar_msg (_("Message Sent"));
}
@@ -681,7 +674,8 @@
/* On get a timeline */
static void
-network_cb_on_timeline (SoupMessage *msg,
+network_cb_on_timeline (SoupSession *session,
+ SoupMessage *msg,
gpointer user_data)
{
gchar *file;
@@ -735,7 +729,8 @@
/* On get user followers */
static void
-network_cb_on_users (SoupMessage *msg,
+network_cb_on_users (SoupSession *session,
+ SoupMessage *msg,
gpointer user_data)
{
gboolean friends = GPOINTER_TO_INT(user_data);
@@ -778,7 +773,8 @@
/* On get a image */
static void
-network_cb_on_image (SoupMessage *msg,
+network_cb_on_image (SoupSession *session,
+ SoupMessage *msg,
gpointer user_data)
{
TwituxImage *image = (TwituxImage *)user_data;
@@ -790,8 +786,8 @@
if (network_check_http (msg->status_code)) {
/* Save image data */
if (g_file_set_contents (image->src,
- msg->response.body,
- msg->response.length,
+ msg->response_body->data,
+ msg->response_body->length,
NULL)) {
/* Set image from file here (image_file) */
twitux_app_set_image (image->src,image->iter);
@@ -805,7 +801,8 @@
/* On add a user */
static void
-network_cb_on_add (SoupMessage *msg,
+network_cb_on_add (SoupSession *session,
+ SoupMessage *msg,
gpointer user_data)
{
TwituxUser *user;
@@ -842,7 +839,8 @@
/* On remove a user */
static void
-network_cb_on_del (SoupMessage *msg,
+network_cb_on_del (SoupSession *session,
+ SoupMessage *msg,
gpointer user_data)
{
twitux_debug (DEBUG_DOMAIN,
Index: twitux.spec
===================================================================
RCS file: /cvs/pkgs/rpms/twitux/devel/twitux.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- twitux.spec 30 Jan 2008 14:33:53 -0000 1.2
+++ twitux.spec 6 Feb 2008 15:11:41 -0000 1.3
@@ -1,17 +1,19 @@
Name: twitux
Version: 0.60
-Release: 2.1%{?dist}
+Release: 3%{?dist}
Summary: Twitux is a Twitter client for the Gnome desktop
Group: Applications/Internet
License: GPLv2+
URL: http://live.gnome.org/DanielMorales/Twitux
Source0: http://suruware.com/twitux/twitux-%{version}.tar.bz2
+Patch0: %{name}-libsoup24.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: perl-XML-Parser, libsexy-devel, aspell-devel, iso-codes-devel
BuildRequires: openssl-devel, GConf2-devel, libsoup-devel, libnotify-devel
BuildRequires: gettext, desktop-file-utils, libglade2-devel, libgnomeui-devel
+BuildRequires: gnome-keyring-devel, dbus-devel
Requires(pre): GConf2
Requires(post): GConf2, desktop-file-utils
Requires(preun):GConf2
@@ -24,6 +26,7 @@
%prep
%setup -q
+%patch0 -p1 -b .libsoup
%build
@@ -35,7 +38,7 @@
rm -rf $RPM_BUILD_ROOT
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT
-desktop-file-install \
+desktop-file-install \
--delete-original \
--vendor fedora \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -91,6 +94,10 @@
%changelog
+* Wed Feb 6 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.60-3
+- Add BR for gnome-keyring-devel & dbus-devel.
+- Add patch to use libsoup-2.4 api. (Thanks to Dan Winship)
+
* Wed Jan 30 2008 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.60-2.1
- Rebuild for newer libsoup.
- Previous message (by thread): rpms/iproute/devel iproute2-backwardcompat.patch, NONE, 1.1 .cvsignore, 1.23, 1.24 iproute.spec, 1.78, 1.79 sources, 1.23, 1.24
- Next message (by thread): rpms/iproute/devel iproute2-tex.patch,NONE,1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list