steve,
it seems my private mail to you didn't make it to you, so let's try it
here :)
please find attached an update for grip to the latest version.
could you integrate the patch below into the update and review it?
cheers,
jasper
On Mon, Aug 25, 2008 at 11:20:00AM -0400, Steve Shockley wrote:
> 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)));
> + }
--
"Intelligence should guide our actions, but in harmony with the
texture of the situation at hand"
-- Francisco Varela
* id3.c: put a zero byte before the id3v1 track number
* discdb.c: string parsing fixes to support i18n
* discdb.c: better handling of non-UTF-8 local discdb files
* various: tweaks to filesystem-safe character escaping
* cdplay.c: allow retrieving of non-UTF-8 discdb entries
* discdb.c: fixed a possible buffer overflow crash
* rip.c: better error message if ripping is done with no disc in
the drive
* rip.c/cdplay.c/discedit.c/grip.c/gripcfg.c: converted some
warnings to use gnome_app_warning
* various: notification area support added
* discdb.c: fixed a problem keeping proxy support from working
* discedit.c: do not show the multi-artist UI when no disc is
present
* discedit.c: removed stray debugging when editing disc titile
* rip.c: fixed track number being off by one when auto-naming
empty tracks
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 13 Aug 2008 08:35:47 -0000
@@ -2,32 +2,28 @@
COMMENT= front-end to external cd audio rippers and mp3 encoders
-DISTNAME= grip-3.2.0
-PKGNAME= ${DISTNAME}p10
+DISTNAME= grip-3.3.1
CATEGORIES= audio
HOMEPAGE= http://www.nostatic.org/grip/
MAINTAINER= Steve Shockley <[EMAIL PROTECTED]>
-# GPL: http://www.nostatic.org/grip/doc/ar01s09.html
+# GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c freetype crypto m X11 Xft ICE Xrender stdc++ SM \
- Xcomposite Xdamage \
- pthread ssl fontconfig z Xau Xdmcp expat \
- glitz png gthread-2.0 gnomevfs-2 glib-2.0 \
- gmodule-2.0 gobject-2.0 gtk-x11-2.0 \
- bonobo-activation art_lgpl_2 bonobo-2 atk-1.0 \
- gconf-2 pangox-1.0 bonoboui-2 popt \
- pangoft2-1.0 gnomecanvas-2 xml2 \
- pangoxft-1.0 ORBit-2 pango-1.0 \
- gdk_pixbuf-2.0 gdk-x11-2.0 gnome-2 \
- cairo pangocairo-1.0 idn \
- Xcursor Xext Xfixes Xi Xinerama Xrandr gnome-keyring \
- audiofile esd gailutil pixman-1
+
+WANTLIB= ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp \
+ Xext Xfixes Xft Xi Xinerama Xrandr Xrender art_lgpl_2 \
+ atk-1.0 audiofile bonobo-2 bonobo-activation bonoboui-2 \
+ c cairo crypto esd expat fontconfig freetype gailutil \
+ gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0 glib-2.0 glitz gmodule-2.0 \
+ gnome-2 gnome-keyring gnomecanvas-2 gnomevfs-2 gobject-2.0 \
+ gthread-2.0 gtk-x11-2.0 idn m pango-1.0 pangocairo-1.0 \
+ pangoft2-1.0 pangox-1.0 pangoxft-1.0 pixman-1 png popt \
+ pthread ssl stdc++ xml2 z
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=grip/}
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/grip/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo 5 Apr 2007 15:37:42 -0000 1.6
+++ distinfo 13 Aug 2008 08:35:47 -0000
@@ -1,5 +1,5 @@
-MD5 (grip-3.2.0.tar.gz) = m1GTOgPdfX3fuzZD/ILC0A==
-RMD160 (grip-3.2.0.tar.gz) = sWLOS8wI6im/alBK5c1uxaXz6Wk=
-SHA1 (grip-3.2.0.tar.gz) = 3RNbaJ3Qhp+WUqG/5z3L5Cpkdb4=
-SHA256 (grip-3.2.0.tar.gz) = WlGmfygoqmeaRru5XNxTRtbUUW+Lp0t3RLYEnMvoBco=
-SIZE (grip-3.2.0.tar.gz) = 722039
+MD5 (grip-3.3.1.tar.gz) = S0IzmZufK8hccRCSVT6pqg==
+RMD160 (grip-3.3.1.tar.gz) = 7FI0V7BlBebsmGBbrcrNUIVZlnY=
+SHA1 (grip-3.3.1.tar.gz) = WO9R+935gaGJ+LWzl3TjvWhiEn0=
+SHA256 (grip-3.3.1.tar.gz) = 1GOUoQYu0Gb5xjOwEP0QWeY9nteRu7eoW8ZWfPD9Zv0=
+SIZE (grip-3.3.1.tar.gz) = 812562
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/audio/grip/patches/patch-configure,v
retrieving revision 1.5
diff -u -r1.5 patch-configure
--- patches/patch-configure 13 May 2008 14:20:25 -0000 1.5
+++ patches/patch-configure 13 Aug 2008 08:35:47 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.5 2008/05/13 14:20:25 naddy Exp $
---- configure.orig Mon Apr 26 19:19:32 2004
-+++ configure Tue May 13 16:15:31 2008
-@@ -4140,7 +4140,7 @@ done
+--- configure.orig Sat Jun 25 20:40:07 2005
++++ configure Wed Aug 13 10:22:43 2008
+@@ -4313,7 +4313,7 @@ done
@@ -10,7 +10,7 @@
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
-@@ -9124,7 +9124,7 @@ echo "$as_me: error: curl libs are missing" >&2;}
+@@ -9454,7 +9454,7 @@ echo "$as_me: error: curl libs are missing" >&2;}
fi
@@ -19,16 +19,16 @@
cat >>confdefs.h <<_ACEOF
-@@ -10653,7 +10653,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+@@ -11149,7 +11149,7 @@ fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
if test "$ac_cv_search_ID3Tag_Link" = no; then
- for ac_lib in "id3 -lz -lstdc++"; do
+ for ac_lib in "id3 -lm -lz -lstdc++"; do
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -10770,7 +10770,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ /* confdefs.h. */
+@@ -11275,7 +11275,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: /cvs/ports/audio/grip/patches/patch-src_Makefile_in,v
retrieving revision 1.3
diff -u -r1.3 patch-src_Makefile_in
--- patches/patch-src_Makefile_in 13 May 2008 14:20:25 -0000 1.3
+++ patches/patch-src_Makefile_in 13 Aug 2008 08:35:47 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_Makefile_in,v 1.3 2008/05/13 14:20:25 naddy Exp $
---- src/Makefile.in.orig Thu Apr 15 19:51:47 2004
-+++ src/Makefile.in Tue May 13 16:15:31 2008
+--- src/Makefile.in.orig Sat Jan 29 19:34:17 2005
++++ src/Makefile.in Wed Aug 13 10:22:43 2008
@@ -108,7 +108,6 @@ install_sh = @install_sh@
INCLUDES = -I$(top_srcdir) -I$(includedir) \
-DGNOME_ICONDIR=\""$(datadir)/pixmaps"\" \
@@ -9,7 +9,7 @@
-DPREFIX=\""$(prefix)"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
-DDATADIR=\""$(datadir)"\" \
-@@ -199,7 +198,7 @@ LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS
+@@ -203,7 +202,7 @@ LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
CXXLD = $(CXX)
Index: patches/patch-src_discdb_c
===================================================================
RCS file: patches/patch-src_discdb_c
diff -N patches/patch-src_discdb_c
--- patches/patch-src_discdb_c 13 May 2008 14:20:25 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-src_discdb_c,v 1.3 2008/05/13 14:20:25 naddy Exp $
---- src/discdb.c.orig Thu Apr 15 20:23:37 2004
-+++ src/discdb.c Tue May 13 16:15:31 2008
-@@ -311,7 +311,7 @@ gboolean DiscDBDoQuery(DiscInfo *disc,DiscDBServer *se
- query->query_match=MATCH_EXACT;
- query->query_matches=0;
-
-- while((inbuffer=DiscDBReadLine(&dataptr))) {
-+ while(query->query_matches < MAX_INEXACT_MATCHES &&
(inbuffer=DiscDBReadLine(&dataptr))) {
- query->query_list[query->query_matches].list_genre=
- DiscDBGenreValue(g_strstrip(strtok(inbuffer," ")));
-
-@@ -331,7 +331,7 @@ gboolean DiscDBDoQuery(DiscInfo *disc,DiscDBServer *se
- query->query_match=MATCH_INEXACT;
- query->query_matches=0;
-
-- while((inbuffer=DiscDBReadLine(&dataptr))) {
-+ while(query->query_matches < MAX_INEXACT_MATCHES &&
(inbuffer=DiscDBReadLine(&dataptr))) {
- query->query_list[query->query_matches].list_genre=
- DiscDBGenreValue(g_strstrip(strtok(inbuffer," ")));
-
Index: patches/patch-src_grip_c
===================================================================
RCS file: /cvs/ports/audio/grip/patches/patch-src_grip_c,v
retrieving revision 1.5
diff -u -r1.5 patch-src_grip_c
--- patches/patch-src_grip_c 13 May 2008 14:20:25 -0000 1.5
+++ patches/patch-src_grip_c 13 Aug 2008 08:35:47 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_grip_c,v 1.5 2008/05/13 14:20:25 naddy Exp $
---- src/grip.c.orig Thu Apr 15 20:23:54 2004
-+++ src/grip.c Tue May 13 16:15:31 2008
-@@ -732,7 +732,7 @@ static void DoLoadConfig(GripInfo *ginfo)
+--- src/grip.c.orig Sat Jun 25 20:00:55 2005
++++ src/grip.c Wed Aug 13 10:22:43 2008
+@@ -762,7 +762,7 @@ static void DoLoadConfig(GripInfo *ginfo)
*ginfo->version='\0';
Index: patches/patch-src_grip_h
===================================================================
RCS file: /cvs/ports/audio/grip/patches/patch-src_grip_h,v
retrieving revision 1.2
diff -u -r1.2 patch-src_grip_h
--- patches/patch-src_grip_h 30 Jun 2005 22:34:29 -0000 1.2
+++ patches/patch-src_grip_h 13 Aug 2008 08:35:47 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_grip_h,v 1.2 2005/06/30 22:34:29 alek Exp $
---- src/grip.h.orig Mon Jun 6 11:07:53 2005
-+++ src/grip.h Mon Jun 6 11:08:25 2005
-@@ -48,7 +48,7 @@
+--- src/grip.h.orig Sat Jan 29 19:34:17 2005
++++ src/grip.h Wed Aug 13 10:22:43 2008
+@@ -49,7 +49,7 @@
#define RRand(range) (random()%(range))
Index: patches/patch-src_launch_c
===================================================================
RCS file: /cvs/ports/audio/grip/patches/patch-src_launch_c,v
retrieving revision 1.1
diff -u -r1.1 patch-src_launch_c
--- patches/patch-src_launch_c 13 May 2008 14:20:25 -0000 1.1
+++ patches/patch-src_launch_c 13 Aug 2008 08:35:47 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_launch_c,v 1.1 2008/05/13 14:20:25 naddy Exp $
---- src/launch.c.orig Tue May 13 16:15:44 2008
-+++ src/launch.c Tue May 13 16:16:05 2008
-@@ -243,7 +243,7 @@ void ArgsToLocale(GString **args)
+--- src/launch.c.orig Sat Jun 25 20:00:55 2005
++++ src/launch.c Wed Aug 13 10:22:43 2008
+@@ -261,7 +261,7 @@ void ArgsToLocale(GString **args)
char *new_str;
GString *new_arg;
int pos;
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/audio/grip/pkg/DESCR,v
retrieving revision 1.4
diff -u -r1.4 DESCR
--- pkg/DESCR 30 Jun 2005 22:34:29 -0000 1.4
+++ pkg/DESCR 13 Aug 2008 08:35:47 -0000
@@ -4,6 +4,3 @@
MP3 (and other audio format) encoders, letting you take a disc and
transform it easily straight into MP3s. Internet disc lookups are
supported for retrieving track information from disc database servers.
-
-To encode MP3s an external encoder (like audio/lame or audio/bladeenc)
-is needed.
Index: pkg/MESSAGE
===================================================================
RCS file: pkg/MESSAGE
diff -N pkg/MESSAGE
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/MESSAGE 13 Aug 2008 08:35:47 -0000
@@ -0,0 +1,2 @@
+To be able to encode MP3s, please use an external encoder like
+audio/lame or audio/bladeenc.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/grip/pkg/PLIST,v
retrieving revision 1.9
diff -u -r1.9 PLIST
--- pkg/PLIST 15 Dec 2007 18:56:35 -0000 1.9
+++ pkg/PLIST 13 Aug 2008 08:35:47 -0000
@@ -1,8 +1,6 @@
@comment $OpenBSD: PLIST,v 1.9 2007/12/15 18:56:35 ajacoutot Exp $
-bin/grip
[EMAIL PROTECTED] bin/grip
share/applications/grip.desktop
-share/gnome/
-share/gnome/help/
share/gnome/help/grip/
share/gnome/help/grip/C/
share/gnome/help/grip/C/cdconfig.png
@@ -60,16 +58,20 @@
share/locale/es/LC_MESSAGES/grip.mo
share/locale/fi/LC_MESSAGES/grip.mo
share/locale/fr/LC_MESSAGES/grip.mo
+share/locale/hu/LC_MESSAGES/grip.mo
share/locale/it/LC_MESSAGES/grip.mo
share/locale/ja/LC_MESSAGES/grip.mo
+share/locale/nl/LC_MESSAGES/grip.mo
+share/locale/pl_PL/
+share/locale/pl_PL/LC_MESSAGES/
+share/locale/pl_PL/LC_MESSAGES/grip.mo
share/locale/pt_BR/LC_MESSAGES/grip.mo
share/locale/ru/LC_MESSAGES/grip.mo
share/locale/zh_CN/LC_MESSAGES/grip.mo
-share/locale/zh_HK/
-share/locale/zh_HK/LC_MESSAGES/
share/locale/zh_HK/LC_MESSAGES/grip.mo
share/locale/zh_TW/LC_MESSAGES/grip.mo
share/pixmaps/
share/pixmaps/gripicon.png
+share/pixmaps/griptray.png
@exec %D/bin/update-desktop-database
@unexec %D/bin/update-desktop-database
