Sent to misc by mistake.
-------- Original Message --------
Subject: Update: grip
Date: Sun, 24 Aug 2008 23:39:38 -0400
From: Steve Shockley <[EMAIL PROTECTED]>
To: Misc <[EMAIL PROTECTED]>
This patch to grip fixes some remaining 64-bit type conversion issues.
Please review for sanity and test if possible.
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/grip/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- Makefile 15 Jun 2008 00:04:50 -0000 1.30
+++ Makefile 25 Aug 2008 01:35:15 -0000
@@ -3,7 +3,7 @@
COMMENT= front-end to external cd audio rippers and mp3 encoders
DISTNAME= grip-3.2.0
-PKGNAME= ${DISTNAME}p10
+PKGNAME= ${DISTNAME}p11
CATEGORIES= audio
HOMEPAGE= http://www.nostatic.org/grip/
Index: patches/patch-src_discedit_c
===================================================================
RCS file: patches/patch-src_discedit_c
diff -N patches/patch-src_discedit_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_discedit_c 25 Aug 2008 01:35:15 -0000
@@ -0,0 +1,46 @@
+$OpenBSD$
+--- src/discedit.c.orig Thu Jul 10 20:38:33 2008
++++ src/discedit.c Thu Jul 10 21:38:34 2008
+@@ -135,7 +135,7 @@ GtkWidget *MakeEditBox(GripInfo *ginfo)
+ id3_genre_count++) {
+ item = gtk_list_item_new_with_label(id3_genre->name);
+ gtk_object_set_user_data(GTK_OBJECT(item),
+- (gpointer)(id3_genre->num));
++ GINT_TO_POINTER(id3_genre->num));
+ uinfo->id3_genre_item_list=g_list_append(uinfo->id3_genre_item_list,item);
+ gtk_signal_connect(GTK_OBJECT(item),"select",
+ GTK_SIGNAL_FUNC(ID3GenreChanged),
+@@ -480,7 +480,7 @@ static void ID3GenreChanged(GtkWidget *widget,gpointer
+
+ ginfo=(GripInfo *)data;
+
+-
ginfo->ddata.data_id3genre=(int)gtk_object_get_user_data(GTK_OBJECT(widget));
++
ginfo->ddata.data_id3genre=GPOINTER_TO_INT(gtk_object_get_user_data(GTK_OBJECT(widget)));
+ /* ginfo->ddata.data_genre=ID32DiscDB(ginfo->ddata.data_id3genre);*/
+ }
+
+@@ -512,7 +512,7 @@ static void SplitTitleArtist(GtkWidget *widget,gpointe
+ int mode;
+
+ ginfo=(GripInfo *)data;
+- mode=(int)gtk_object_get_user_data(GTK_OBJECT(widget));
++ mode=GPOINTER_TO_INT(gtk_object_get_user_data(GTK_OBJECT(widget)));
+
+ for(track=0;track<ginfo->disc.num_tracks;track++) {
+ if(mode==0)
+@@ -614,7 +614,7 @@ static void GetDiscDBGenre(GripInfo *ginfo)
+ for(genre=0;genre<12;genre++) {
+ item=gtk_list_item_new_with_label(DiscDBGenre(genre));
+ gtk_object_set_user_data(GTK_OBJECT(item),
+- (gpointer)genre);
++ GINT_TO_POINTER(genre));
+ gtk_signal_connect(GTK_OBJECT(item), "select",
+ GTK_SIGNAL_FUNC(DiscDBGenreChanged),(gpointer)ginfo);
+ gtk_container_add(GTK_CONTAINER(GTK_COMBO(genre_combo)->list),item);
+@@ -659,5 +659,5 @@ static void DiscDBGenreChanged(GtkWidget *widget,gpoin
+
+ ginfo=(GripInfo *)data;
+
+- ginfo->ddata.data_genre=(int)gtk_object_get_user_data(GTK_OBJECT(widget));
++
ginfo->ddata.data_genre=GPOINTER_TO_INT(gtk_object_get_user_data(GTK_OBJECT(widget)));
+ }
