[95545] trunk/dports/multimedia/gtkpod

[rmstonecipher at macports.org]

Revision: 95545
          https://trac.macports.org/changeset/95545
Author:   rmstonecipher at macports.org
Date:     2012-07-15 20:12:20 -0700 (Sun, 15 Jul 2012)
Log Message:
-----------
multimedia/gtkpod added patch due to replace G_CONST_RETURN deprecated in glib 2.30.x, added missing library dependencies

Modified Paths:
--------------
    trunk/dports/multimedia/gtkpod/Portfile

Added Paths:
-----------
    trunk/dports/multimedia/gtkpod/files/patch_glib_2.30_G_CONST_RETURN.diff

Modified: trunk/dports/multimedia/gtkpod/Portfile
===================================================================
--- trunk/dports/multimedia/gtkpod/Portfile	2012-07-16 03:10:52 UTC (rev 95544)
+++ trunk/dports/multimedia/gtkpod/Portfile	2012-07-16 03:12:20 UTC (rev 95545)
@@ -18,11 +18,16 @@
 depends_build       port:pkgconfig \
                     port:intltool
 depends_lib         port:anjuta \
+                    port:curl \
+                    port:faad2 \
                     port:flex \
+                    port:flac \
                     path:lib/pkgconfig/glib-2.0.pc:glib2 \
                     port:libgpod \
                     port:libid3tag \
-                    path:lib/libmp4v2.dylib:mp4v2
+                    path:lib/libmp4v2.dylib:mp4v2 \
+                    port:libvorbis \
+                    port:webkit-gtk
 
 use_autoconf        yes
 
@@ -48,7 +53,8 @@
 
 patchfiles          patch-configure.ac.diff \
                     patch-mp4file.c.diff \
-                    patch-use_extern.diff
+                    patch-use_extern.diff \
+                    patch_glib_2.30_G_CONST_RETURN.diff
 
 livecheck.type      regex
 livecheck.url       http://sourceforge.net/projects/gtkpod/files/gtkpod/

Added: trunk/dports/multimedia/gtkpod/files/patch_glib_2.30_G_CONST_RETURN.diff
===================================================================
--- trunk/dports/multimedia/gtkpod/files/patch_glib_2.30_G_CONST_RETURN.diff	                        (rev 0)
+++ trunk/dports/multimedia/gtkpod/files/patch_glib_2.30_G_CONST_RETURN.diff	2012-07-16 03:12:20 UTC (rev 95545)
@@ -0,0 +1,59 @@
+--- plugins/photo_editor/display_photo.c.orig	2012-07-14 22:32:53.000000000 -0500
++++ plugins/photo_editor/display_photo.c	2012-07-14 22:33:31.000000000 -0500
+@@ -1153,7 +1153,7 @@
+     /* Leaf through all the files inside the directory and check if they are image
+      * files. If they are then add them to the database.
+      */
+-    G_CONST_RETURN gchar *filename;
++    const gchar *filename;
+     GPtrArray* filename_arr = g_ptr_array_new();
+     unsigned u;
+ 
+--- libgtkpod/file.c.orig	2012-07-14 22:32:15.000000000 -0500
++++ libgtkpod/file.c	2012-07-14 22:35:14.000000000 -0500
+@@ -395,7 +395,7 @@
+         GDir *dir = g_dir_open(name, 0, NULL);
+         block_widgets();
+         if (dir != NULL) {
+-            G_CONST_RETURN gchar *next;
++            const gchar *next;
+             do {
+                 next = g_dir_read_name(dir);
+                 if (next != NULL) {
+--- libgtkpod/misc.c.orig	2012-07-14 22:32:22.000000000 -0500
++++ libgtkpod/misc.c	2012-07-14 22:37:31.000000000 -0500
+@@ -161,7 +161,7 @@
+ /* Concats @base_dir and @rel_dir if and only if @rel_dir is not
+  * absolute (does not start with '~' or '/'). Otherwise simply return
+  * a copy of @rel_dir. Must free return value after use */
+-gchar *concat_dir_if_relative(G_CONST_RETURN gchar *base_dir, G_CONST_RETURN gchar *rel_dir) {
++gchar *concat_dir_if_relative(const gchar *base_dir, const gchar *rel_dir) {
+     /* sanity */
+     if (!rel_dir || !*rel_dir)
+         return g_build_filename(base_dir, rel_dir, NULL);
+--- libgtkpod/misc.h.orig	2012-07-14 22:32:32.000000000 -0500
++++ libgtkpod/misc.h	2012-07-14 22:38:38.000000000 -0500
+@@ -80,9 +80,9 @@
+ void add_new_pl_or_spl_user_name (iTunesDB *itdb, gchar *dflt, gint32 pos);
+ void create_add_files_fileselector (void);
+ void create_add_playlists_fileselector (void);
+-gchar *concat_dir (G_CONST_RETURN gchar *dir, G_CONST_RETURN gchar *file);
+-gchar *concat_dir_if_relative (G_CONST_RETURN gchar *base_dir,
+-			       G_CONST_RETURN gchar *rel_dir);
++gchar *concat_dir (const gchar *dir, const gchar *file);
++gchar *concat_dir_if_relative (const gchar *base_dir,
++			       const gchar *rel_dir);
+ float get_ms_since (GTimeVal *old_time, gboolean update);
+ gint get_sort_tab_number (gchar *text);
+ gboolean parse_tracks_from_string (gchar **s, Track **track);
+--- libgtkpod/syncdir.c.orig	2012-07-14 22:32:40.000000000 -0500
++++ libgtkpod/syncdir.c	2012-07-14 22:39:42.000000000 -0500
+@@ -319,7 +319,7 @@
+     if (g_file_test(dirname, G_FILE_TEST_IS_DIR)) {
+         GDir *dir = g_dir_open(dirname, 0, NULL);
+         if (dir != NULL) {
+-            G_CONST_RETURN gchar *next;
++            const gchar *next;
+             while ((next = g_dir_read_name(dir))) {
+                 gchar *filename = g_build_filename(dirname, next, NULL);
+                 FileType *filetype = determine_filetype(filename);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120715/31fa192c/attachment.html>