rpms/mugshot/FC-6 mugshot-1.1.39-64bit.patch, NONE, 1.1 mugshot.spec, 1.2, 1.3
Owen Taylor (otaylor)
fedora-extras-commits at redhat.com
Mon Mar 26 21:11:52 UTC 2007
Author: otaylor
Update of /cvs/extras/rpms/mugshot/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32270
Modified Files:
mugshot.spec
Added Files:
mugshot-1.1.39-64bit.patch
Log Message:
Fix some minor 64-bit problems (merge from devel)
mugshot-1.1.39-64bit.patch:
--- NEW FILE mugshot-1.1.39-64bit.patch ---
--- mugshot-1.1.39/src/hippo-dbus-server.c.64bit 2007-03-26 12:34:18.000000000 -0400
+++ mugshot-1.1.39/src/hippo-dbus-server.c 2007-03-26 16:31:59.000000000 -0400
@@ -1097,7 +1097,7 @@
if (!proxy)
return reply;
- g_debug("GetApplicationInfo(%lld, %s, %s, %s)\n", endpoint, application_id, package_names, desktop_names);
+ g_debug("GetApplicationInfo(%" G_GUINT64_FORMAT ", %s, %s, %s)\n", endpoint, application_id, package_names, desktop_names);
request = hippo_application_request_new(listener, endpoint, application_id, package_names, desktop_names);
do_get_application_info(request);
@@ -1162,7 +1162,7 @@
if (!proxy)
return reply;
- g_debug("InstallApplication(%lld, %s, %s, %s)\n", endpoint, application_id, package_names, desktop_names);
+ g_debug("InstallApplication(%" G_GUINT64_FORMAT ", %s, %s, %s)\n", endpoint, application_id, package_names, desktop_names);
request = hippo_application_request_new(listener, endpoint, application_id, package_names, desktop_names);
do_install_application(request);
--- mugshot-1.1.39/src/hippo-idle.c.64bit 2007-03-23 11:32:28.000000000 -0400
+++ mugshot-1.1.39/src/hippo-idle.c 2007-03-26 16:31:59.000000000 -0400
@@ -1,12 +1,14 @@
/* -*- mode; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
#include <config.h>
-#include "hippo-idle.h"
+#include <string.h>
#include <X11/Xlib.h>
#include <X11/Xatom.h>
#include <X11/extensions/scrnsaver.h>
#include <gdk/gdkx.h>
+#include "hippo-idle.h"
+
typedef struct HippoApplicationInfo HippoApplicationInfo;
struct HippoApplicationInfo {
--- mugshot-1.1.39/common-dist/hippo/hippo-connection.c.64bit 2007-03-26 14:55:07.000000000 -0400
+++ mugshot-1.1.39/common-dist/hippo/hippo-connection.c 2007-03-26 16:32:20.000000000 -0400
@@ -4492,6 +4492,6 @@
lm_message_unref(message);
- g_debug("Sent external IQ: %s (%d content characters)", element, strlen(content));
+ g_debug("Sent external IQ: %s (%d content characters)", element, (int)strlen(content));
return connection->external_iq_serial;
}
Index: mugshot.spec
===================================================================
RCS file: /cvs/extras/rpms/mugshot/FC-6/mugshot.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mugshot.spec 26 Mar 2007 20:13:41 -0000 1.2
+++ mugshot.spec 26 Mar 2007 21:11:19 -0000 1.3
@@ -1,6 +1,6 @@
Name: mugshot
Version: 1.1.39
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Companion software for mugshot.org
Group: Applications/Internet
@@ -21,7 +21,10 @@
#
# See http://mugshot.org/trademark for full details.
#
-%define about_message ""
+%define about_message "Adapted for Fedora"
+
+# Patch from svn (r5314) for a couple of wrong printf format arguments
+Patch0: mugshot-1.1.39-64bit.patch
BuildRequires: glib2-devel >= 2.6
BuildRequires: gtk2-devel >= 2.6
@@ -57,6 +60,7 @@
%prep
%setup -q
+%patch0 -p1 -b .64bit
%build
%configure --with-about-message=%{about_message}
@@ -209,6 +213,9 @@
%{_sysconfdir}/gconf/schemas/*.schemas
%changelog
+* Mon Mar 26 2007 Owen Taylor <otaylor at redhat.com> - 1.1.39-3
+- Fix some minor 64-bit problems
+
* Mon Mar 26 2007 Owen Taylor <otaylor at fresnel.dumbhippo.com> - 1.1.39-1
- 1.1.39
- Package mugshot.desktop for the menus as well
More information about the fedora-extras-commits
mailing list