Attachment #72990 for bug #105941

View | Details | Raw Unified | Return to bug 105941
Collapse All | Expand All




#

PORTNAME=	contacts
PORTVERSION=	0.2
PORTREVISION=	1
CATEGORIES=	deskutils gnome
MASTER_SITES=	http://projects.o-hand.com/sources/contacts/ \
		http://smyru.petronet.pl/freebsd/
DIST_SUBDIR=	gnome2


CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include"

USE_GMAKE=	yes
USE_X_PREFIX=	yes
USE_GNOME=	gtk20 gnomehier evolutiondataserver
USE_AUTOTOOLS=	libtool:15
GCONF_SCHEMAS=	contacts.schemas
# CFLAGS+=	-g

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)contacts/distinfo (-3 / +3 lines)
1	MD5 (gnome2/contacts-0.1.tar.gz) = dc5a650445f0904392039006d929f192	1	MD5 (gnome2/contacts-0.2.tar.gz) = ad8a4297af14930d45a56d17b39cf0d5
2	SHA256 (gnome2/contacts-0.1.tar.gz) = 7add3642aecedb363dbf30674021c6b75c4ef7c772c889b8050590fe996c7e1c	2	SHA256 (gnome2/contacts-0.2.tar.gz) = a8b6ebf62c39b235549c4f11b8a191b0d470a75ddd73a8a39361abd7fdde4cca
3	SIZE (gnome2/contacts-0.1.tar.gz) = 330231	3	SIZE (gnome2/contacts-0.2.tar.gz) = 401486




--- src/contacts-utils.c.orig	Sat Sep 30 02:02:40 2006
+++ src/contacts-utils.c	Sat Sep 30 02:03:54 2006
@@ -180,13 +180,13 @@
 
 /* TODO: Would adding a struct for this be gratuititous? RB: NOT AT ALL */
 static const gchar **contacts_field_types[] = {
-	(gchar *[]){ "TEL", "Home", "Msg", "Work", "Pref", "Voice", "Fax",
+	(const gchar *[]){ "TEL", "Home", "Msg", "Work", "Pref", "Voice", "Fax",
 			    "Cell", "Video", "Pager", "BBS", "Modem", "Car",
 			    "ISDN", "PCS", NULL },
-	(gchar *[]){ "EMAIL", "Internet", "X400", "Pref", NULL },
-	(gchar *[]){ "ADR", "Dom", "Intl", "Postal", "Parcel", "Home", "Work",
+	(const gchar *[]){ "EMAIL", "Internet", "X400", "Pref", NULL },
+	(const gchar *[]){ "ADR", "Dom", "Intl", "Postal", "Parcel", "Home", "Work",
 			    "Pref", NULL },
-	(gchar *[]){ NULL }
+	(const gchar *[]){ NULL }
 };
 
 const gchar **
@@ -357,8 +357,8 @@
 			switch (photo->type) {
 			case E_CONTACT_PHOTO_TYPE_INLINED :
 				gdk_pixbuf_loader_write (loader,
-					photo->inlined.data,
-					photo->inlined.length, NULL);
+					photo->data.inlined.data,
+					photo->data.inlined.length, NULL);
 				break;
 			case E_CONTACT_PHOTO_TYPE_URI :
 			default :
@@ -545,9 +545,9 @@
 				int *length;
 #if HAVE_PHOTO_TYPE
 				new_photo.type = E_CONTACT_PHOTO_TYPE_INLINED;
-				data = &new_photo.inlined.data;
-				length = &new_photo.inlined.length;
-				new_photo.inlined.mime_type = NULL;
+				data = &new_photo.data.inlined.data;
+				length = &new_photo.data.inlined.length;
+				new_photo.data.inlined.mime_type = NULL;
 #else
 				data = &new_photo.data;
 				length = &new_photo.length;

Lines 1-6 Link Here

(-)contacts/pkg-plist (-1 / +3 lines)
1	bin/contacts	1	bin/contacts
2	share/applications/contacts.desktop	2	share/applications/contacts.desktop
3	%%DATADIR%%/contacts.glade	3	%%DATADIR%%/contacts.glade
		4	share/locale/et/LC_MESSAGES/Contacts.mo
		5	share/locale/fr/LC_MESSAGES/Contacts.mo
4	share/pixmaps/oh-contacts.png	6	share/pixmaps/oh-contacts.png
5	@dirrmtry share/applications	7	@dirrmtry share/applications
6	@dirrm share/contacts	8	@dirrm %%DATADIR%%

Return to bug 105941

Lines 6-15 Link Here

(-)contacts/Makefile (-4 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= contacts	8	PORTNAME= contacts
9	PORTVERSION= 0.1	9	PORTVERSION= 0.2
10	PORTREVISION= 1
11	CATEGORIES= deskutils gnome	10	CATEGORIES= deskutils gnome
12	MASTER_SITES= http://www.openedhand.com/~chris/ \	11	MASTER_SITES= http://projects.o-hand.com/sources/contacts/ \
13	http://smyru.petronet.pl/freebsd/	12	http://smyru.petronet.pl/freebsd/
14	DIST_SUBDIR= gnome2	13	DIST_SUBDIR= gnome2
15		14
Lines 19-27 Link Here
19	CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include"	18	CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include"
20		19
21	USE_GMAKE= yes	20	USE_GMAKE= yes
22	USE_X_PREFIX= yes
23	USE_GNOME= gtk20 gnomehier evolutiondataserver	21	USE_GNOME= gtk20 gnomehier evolutiondataserver
24	USE_AUTOTOOLS= libtool:15	22	USE_AUTOTOOLS= libtool:15
		23	GCONF_SCHEMAS= contacts.schemas
25	# CFLAGS+= -g	24	# CFLAGS+= -g
26		25
27	.include <bsd.port.mk>	26	.include <bsd.port.mk>

Lines 1-44 Link Here

(-)contacts/files/patch-src_constacts-utils.c (-44 lines)
1	--- src/contacts-utils.c.orig Sat Sep 30 02:02:40 2006
2	+++ src/contacts-utils.c Sat Sep 30 02:03:54 2006
3	@@ -180,13 +180,13 @@
4
5	/* TODO: Would adding a struct for this be gratuititous? RB: NOT AT ALL */
6	static const gchar **contacts_field_types[] = {
7	- (gchar *[]){ "TEL", "Home", "Msg", "Work", "Pref", "Voice", "Fax",
8	+ (const gchar *[]){ "TEL", "Home", "Msg", "Work", "Pref", "Voice", "Fax",
9	"Cell", "Video", "Pager", "BBS", "Modem", "Car",
10	"ISDN", "PCS", NULL },
11	- (gchar *[]){ "EMAIL", "Internet", "X400", "Pref", NULL },
12	- (gchar *[]){ "ADR", "Dom", "Intl", "Postal", "Parcel", "Home", "Work",
13	+ (const gchar *[]){ "EMAIL", "Internet", "X400", "Pref", NULL },
14	+ (const gchar *[]){ "ADR", "Dom", "Intl", "Postal", "Parcel", "Home", "Work",
15	"Pref", NULL },
16	- (gchar *[]){ NULL }
17	+ (const gchar *[]){ NULL }
18	};
19
20	const gchar **
21	@@ -357,8 +357,8 @@
22	switch (photo->type) {
23	case E_CONTACT_PHOTO_TYPE_INLINED :
24	gdk_pixbuf_loader_write (loader,
25	- photo->inlined.data,
26	- photo->inlined.length, NULL);
27	+ photo->data.inlined.data,
28	+ photo->data.inlined.length, NULL);
29	break;
30	case E_CONTACT_PHOTO_TYPE_URI :
31	default :
32	@@ -545,9 +545,9 @@
33	int *length;
34	#if HAVE_PHOTO_TYPE
35	new_photo.type = E_CONTACT_PHOTO_TYPE_INLINED;
36	- data = &new_photo.inlined.data;
37	- length = &new_photo.inlined.length;
38	- new_photo.inlined.mime_type = NULL;
39	+ data = &new_photo.data.inlined.data;
40	+ length = &new_photo.data.inlined.length;
41	+ new_photo.data.inlined.mime_type = NULL;
42	#else
43	data = &new_photo.data;
44	length = &new_photo.length;