pkg/40493: update of libgpod breaks gtkpod update request to 0.99.14 [PATCH]

[charlie%tigress.com@localhost]

>Number:         40493
>Category:       pkg
>Synopsis:       update of libgpod breaks gtkpod update request to 0.99.14 
>[PATCH]
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Tue Jan 27 01:05:00 +0000 2009
>Originator:     charlie%tigress.com@localhost
>Release:        
>Organization:
        
>Description:
Try to compile gtkpod from pkgsrc. The compile will fail with undefs
structure membders at details.c.

libgtop was updated some days ago and the version in pkgsrc is not
compatible with the newer libgpod.
>How-To-Repeat:
Try compiling.
>Fix:
Update to gtkpod 0.99.14.
Apply the following patches, remove outdated patch-ad and patch-ae,
rebuilf distinfo. Compile, install and feel happy.


--- ./Makefile.orig     2009-01-26 22:08:15.000000000 +0100
+++ ./Makefile  2009-01-26 21:52:51.000000000 +0100
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.21 2008/12/04 16:55:42 wiz Exp $
 #
 
-DISTNAME=      gtkpod-0.99.12
-PKGREVISION=   1
+DISTNAME=      gtkpod-0.99.14
 CATEGORIES=    audio
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=gtkpod/}


--- ./patches/patch-bj.orig     2009-01-26 22:09:08.000000000 +0100
+++ ./patches/patch-bj  2009-01-26 21:59:31.000000000 +0100
@@ -1,17 +1,8 @@
 $NetBSD: patch-bj,v 1.3 2008/01/06 17:04:14 rillig Exp $
 
---- src/file_convert.c.orig    2007-12-18 04:37:43.000000000 +0000
-+++ src/file_convert.c 2008-01-06 18:00:56.000000000 +0000
-@@ -216,7 +216,7 @@ struct _ConvTrack
-     gchar *fname_root;      /* filename root of converted file          */
-     gchar *fname_extension; /* filename extension of converted file     */
-     GPid  pid;              /* PID of child doing the conversion        */
--    gint  stderr;           /* stderr of child doing the conversion     */
-+    gint  Cstderr;          /* stderr of child doing the conversion     */
-     Track *track;           /* for reference, don't access inside threads! */
-     iTunesDB *itdb;         /* for reference, don't access inside threads! */
-     gint  threadnum;        /* number of thread working on this track   */
-@@ -647,7 +647,11 @@ static void conversion_prefs_changed (Co
+--- src/file_convert.c.orig    2009-01-18 06:52:32.000000000 +0100
++++ src/file_convert.c
+@@ -668,7 +668,11 @@ static void conversion_prefs_changed (Co
      conv->max_threads_num = prefs_get_int (FILE_CONVERT_MAX_THREADS_NUM);
      if (conv->max_threads_num == 0)
      {   /* set to maximum available number of processors */
@@ -23,21 +14,3 @@
        /* paranoia mode on */
        if (conv->max_threads_num <= 0)
        {
-@@ -2308,7 +2312,7 @@ static gboolean conversion_convert_track
-                                 &ctr->pid,    /* child's PID    */
-                                 NULL,         /* child's stdin  */
-                                 NULL,         /* child's stdout */
--                                &ctr->stderr, /* child's stderr */
-+                                &ctr->Cstderr,/* child's stderr */
-                                 &error);
- 
-           child_pid = ctr->pid;
-@@ -2334,7 +2338,7 @@ static gboolean conversion_convert_track
-               gint status;
- 
-               /* set up i/o channel to main thread */
--              ctr->gio_channel = g_io_channel_unix_new (ctr->stderr);
-+              ctr->gio_channel = g_io_channel_unix_new (ctr->Cstderr);
-               g_io_channel_set_flags (ctr->gio_channel,
-                                       G_IO_FLAG_NONBLOCK, NULL);
-               g_io_channel_set_close_on_unref (ctr->gio_channel, TRUE);

>Unformatted:
 Architecture: i386
 Machine: i386