rpms/contact-lookup-applet/devel contact-lookup-applet-0.14-api.patch, NONE, 1.1 contact-lookup-applet.spec, 1.18, 1.19

Brian Pepple (bpepple) fedora-extras-commits at redhat.com
Sun Sep 17 18:11:50 UTC 2006


Author: bpepple

Update of /cvs/extras/rpms/contact-lookup-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9773

Modified Files:
	contact-lookup-applet.spec 
Added Files:
	contact-lookup-applet-0.14-api.patch 
Log Message:
* Sun Sep 17 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.14-4
- Rebuild for FC6.
- Add patch to fix build due to EContactPhoto API change.


contact-lookup-applet-0.14-api.patch:

--- NEW FILE contact-lookup-applet-0.14-api.patch ---
diff -Nur contact-lookup-applet-0.14.OLD/src/contact-dialog.c contact-lookup-applet-0.14/src/contact-dialog.c
--- contact-lookup-applet-0.14.OLD/src/contact-dialog.c	2004-09-30 12:46:53.000000000 -0400
+++ contact-lookup-applet-0.14/src/contact-dialog.c	2006-09-17 13:51:36.000000000 -0400
@@ -254,13 +254,13 @@
     max_height = max_height * 4;
     
     photo = e_contact_get (contact, E_CONTACT_PHOTO);
-    if (photo) {
+    if (photo && photo->type == E_CONTACT_PHOTO_TYPE_INLINED) {
       GdkPixbufLoader *loader;
       GdkPixbuf *pixbuf;
 
       loader = gdk_pixbuf_loader_new ();
 
-      if (!gdk_pixbuf_loader_write (loader, photo->data, photo->length, NULL)) {
+      if (!gdk_pixbuf_loader_write (loader, photo->data.inlined.data, photo->data.inlined.length, NULL)) {
         gtk_widget_hide (photo_frame);
       } else if( (pixbuf = gdk_pixbuf_loader_get_pixbuf (loader)) != NULL ) {
         GdkPixbuf *tmp;
diff -Nur contact-lookup-applet-0.14.OLD/src/e-contact-entry.c contact-lookup-applet-0.14/src/e-contact-entry.c
--- contact-lookup-applet-0.14.OLD/src/e-contact-entry.c	2005-12-17 11:34:00.000000000 -0500
+++ contact-lookup-applet-0.14/src/e-contact-entry.c	2006-09-17 13:52:59.000000000 -0400
@@ -261,8 +261,8 @@
 
       loader = gdk_pixbuf_loader_new ();
 
-      if (gdk_pixbuf_loader_write (loader, (guchar *)photo->data,
-			      photo->length, NULL))
+      if (gdk_pixbuf_loader_write (loader, (guchar *)photo->data.inlined.data,
+			      photo->data.inlined.length, NULL))
         pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
 
       if (pixbuf) {


Index: contact-lookup-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/contact-lookup-applet.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- contact-lookup-applet.spec	16 May 2006 18:46:32 -0000	1.18
+++ contact-lookup-applet.spec	17 Sep 2006 18:11:50 -0000	1.19
@@ -1,16 +1,19 @@
 Name:		contact-lookup-applet
 Version:	0.14
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Contact Lookup Applet
 
 Group:		Applications/Communications
 License:	GPL
 URL:		http://www.burtonini.com/blog//computers/contact-lookup-applet-0.13
-Source0:	http://www.burtonini.com/computing/%{name}-%{version}.tar.gz       
+Source0:	http://www.burtonini.com/computing/%{name}-%{version}.tar.gz
+Patch0:		%{name}-%{version}-api.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gnome-panel-devel >= 2.9.4
 BuildRequires:	evolution-data-server-devel >= 1.2.0
+BuildRequires:	perl(XML::Parser)
+BuildRequires:	gettext
 
 
 %description
@@ -21,6 +24,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .photo
 
 
 %build
@@ -49,6 +53,10 @@
 
 
 %changelog
+* Sun Sep 17 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.14-4
+- Rebuild for FC6.
+- Add patch to fix build due to EContactPhoto API change.
+
 * Tue May 16 2006 Brian Pepple <bdpepple at ameritech.net> - 0.14-3
 - Update to 0.14.
 - Drop BR on gettext.




More information about the fedora-extras-commits mailing list