[127409] trunk/dports/multimedia/gtkpod

devans at macports.org devans at macports.org
Mon Oct 27 08:48:07 PDT 2014


Revision: 127409
          https://trac.macports.org/changeset/127409
Author:   devans at macports.org
Date:     2014-10-27 08:48:07 -0700 (Mon, 27 Oct 2014)
Log Message:
-----------
gtkpod: update to version 2.1.4, dependencies, configuration, license, now uses gtk3, no python.

Modified Paths:
--------------
    trunk/dports/multimedia/gtkpod/Portfile
    trunk/dports/multimedia/gtkpod/files/patch-configure.ac.diff
    trunk/dports/multimedia/gtkpod/files/patch-use_extern.diff

Added Paths:
-----------
    trunk/dports/multimedia/gtkpod/files/patch-plugins-clarity-Makefile.am.diff

Removed Paths:
-------------
    trunk/dports/multimedia/gtkpod/files/patch-mp4file.c.diff
    trunk/dports/multimedia/gtkpod/files/patch_glib_2.30_G_CONST_RETURN.diff

Modified: trunk/dports/multimedia/gtkpod/Portfile
===================================================================
--- trunk/dports/multimedia/gtkpod/Portfile	2014-10-27 15:42:50 UTC (rev 127408)
+++ trunk/dports/multimedia/gtkpod/Portfile	2014-10-27 15:48:07 UTC (rev 127409)
@@ -4,30 +4,35 @@
 PortSystem          1.0
 
 name                gtkpod
-version             2.0.2
-revision            1
+version             2.1.4
 categories          multimedia gnome
 platforms           darwin
 maintainers         nomaintainer
-description         gtkpod is a platform independent Graphical User Interface for Apple's iPod using GTK2.gpod is a library to access the contents of an iPod.
+description         gtkpod is a platform independent Graphical User Interface for Apple's iPod using GTK3.
 long_description    ${description} It supports the first to fifth Generation including the iPod mini, iPod Photo, iPod Shuffle, iPod nano, and iPod Video.
 homepage            http://www.gtkpod.org/
 master_sites        sourceforge:gtkpod
-license             GPL-2+ LGPL-2+
-checksums           md5     a24d4b882fa1e71c486ee90d87c7ce45 \
-                    sha1    d93e7618653d00a8bc845fd070305c5b38eea1e8 \
-                    rmd160  0810947c013c137f57599a999f63d07d6710b6c7
+license             GPL-2+
+
+checksums           rmd160  f75a1bb9d8f4eaf25d44da0d1da91c372b123334 \
+                    sha256  ba12b35f3f24a155b68f0ffdaf4d3c5c7d1b8df04843a53306e1c83fc811dfaa
+
 depends_build       port:pkgconfig \
                     port:intltool
-depends_lib         port:anjuta \
+
+depends_lib         port:desktop-file-utils \
+                    port:gtk3 \
+                    path:lib/pkgconfig/glib-2.0.pc:glib2 \
+                    port:anjuta \
                     port:curl \
                     port:faad2 \
                     port:flex \
                     port:flac \
-                    path:lib/pkgconfig/glib-2.0.pc:glib2 \
+                    port:gstreamer010-gst-plugins-base \
                     port:libgpod \
                     port:libid3tag \
                     path:lib/libmp4v2.dylib:mp4v2 \
+                    port:libmusicbrainz3 \
                     port:libvorbis \
                     path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
 
@@ -38,33 +43,21 @@
     }
 }
 
-use_autoconf        yes
+patchfiles          patch-configure.ac.diff \
+                    patch-plugins-clarity-Makefile.am.diff \
+                    patch-use_extern.diff
 
-# python-related tweaks 
-set python.branch   2.7
-set python.prefix   ${frameworks_dir}/Python.framework/Versions/${python.branch}
-set python.bin      ${python.prefix}/bin/python${python.branch}
-configure.args-append  --prefix=${python.prefix}
-configure.env-append    PYGOBJECT_CODEGEN=${python.prefix}/bin/pygobject-codegen-2.0
-configure.pkg_config_path  ${python.prefix}/lib/pkgconfig
-options         python.link_binaries python.link_binaries_suffix
-default python.link_binaries yes
-default python.link_binaries_suffix {-${python.branch}}
-post-destroot {
-    if {${python.link_binaries}} {
-        foreach bin [glob -nocomplain -tails -directory "${destroot}${python.prefix}/bin" *] {
-            if {[catch {file type "${destroot}${prefix}/bin/${bin}${python.link_binaries_suffix}"}]} {
-                ln -s "${python.prefix}/bin/${bin}" "${destroot}${prefix}/bin/${bin}${python.link_binaries_suffix}"
-            }
-        }
-    }
-}
+use_autoreconf      yes
+autoreconf.args     -fvi
 
-patchfiles          patch-configure.ac.diff \
-                    patch-mp4file.c.diff \
-                    patch-use_extern.diff \
-                    patch_glib_2.30_G_CONST_RETURN.diff
+configure.args      --disable-schemas-compile \
+                    --disable-silent-rules
 
+post-activate {
+    system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
+    system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
+}
+
 livecheck.type      regex
 livecheck.url       http://sourceforge.net/projects/gtkpod/files/gtkpod/
 livecheck.regex     "${name}-(\\d+(?:\\.\\d+)*)"

Modified: trunk/dports/multimedia/gtkpod/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/multimedia/gtkpod/files/patch-configure.ac.diff	2014-10-27 15:42:50 UTC (rev 127408)
+++ trunk/dports/multimedia/gtkpod/files/patch-configure.ac.diff	2014-10-27 15:48:07 UTC (rev 127409)
@@ -1,13 +1,20 @@
-Index: configure.ac
-===================================================================
---- configure.ac.orig	2011-09-26 18:49:56.000000000 +0200
-+++ configure.ac	2011-09-26 18:50:27.000000000 +0200
-@@ -334,7 +334,7 @@
+--- configure.ac.orig	2013-08-25 14:26:42.000000000 -0700
++++ configure.ac	2014-10-27 04:26:57.000000000 -0700
+@@ -98,7 +98,7 @@
+ PKG_CHECK_MODULES(CURL, [libcurl >= 7.10.0], [have_curl="yes"], [have_curl="no"])
+ PKG_CHECK_MODULES(WEBKIT, [webkitgtk-3.0 >= 1.3], [have_webkit="yes"], [have_webkit="no"])
+ PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.10 >= 0.10.25 gstreamer-base-0.10 >= 0.10.25 gstreamer-plugins-base-0.10 >= 0.10.25 gstreamer-interfaces-0.10 >= 0.10.25 gstreamer-pbutils-0.10 >= 0.10.25, [have_gstreamer="yes"], [have_gstreamer="no"])
+-PKG_CHECK_MODULES(VORBISFILE, vorbisfile >= 1.3.1, [have_vorbis="yes"], [have_vorbis="no"])
++PKG_CHECK_MODULES(VORBISFILE, vorbisfile >= 1.3.1 vorbis, [have_vorbis="yes"], [have_vorbis="no"])
+ PKG_CHECK_MODULES(FLAC, flac >= 1.2.1, [have_flac="yes"], [have_flac="no"])
+ PKG_CHECK_MODULES(BRASERO, libbrasero-media3 >= 3.0, [have_brasero="yes"], [have_brasero="no"])		
+ 
+@@ -446,7 +446,7 @@
  AC_SUBST(GTKPOD_CFLAGS)
  AC_SUBST(GTKPOD_LIBS)
  
--LDFLAGS="-no-undefined -Wl,--as-needed"
-+LDFLAGS="-no-undefined"
+-LDFLAGS="$LDFLAGS -no-undefined -Wl,--as-needed"
++LDFLAGS="$LDFLAGS -no-undefined"
  GTKPOD_PLUGIN_LDFLAGS="$LDFLAGS -module -avoid-version"
  AC_SUBST(GTKPOD_PLUGIN_LDFLAGS)
  

Deleted: trunk/dports/multimedia/gtkpod/files/patch-mp4file.c.diff
===================================================================
--- trunk/dports/multimedia/gtkpod/files/patch-mp4file.c.diff	2014-10-27 15:42:50 UTC (rev 127408)
+++ trunk/dports/multimedia/gtkpod/files/patch-mp4file.c.diff	2014-10-27 15:48:07 UTC (rev 127409)
@@ -1,24 +0,0 @@
-Index: plugins/filetype_m4a/mp4file.c
-===================================================================
---- plugins/filetype_m4a/mp4file.c.orig 2011-06-04 15:46:23.000000000 +0200
-+++ plugins/filetype_m4a/mp4file.c  2011-09-26 18:02:31.000000000 +0200
-@@ -144,7 +144,6 @@
- 
- #define DEFAULT(x)
- 
--typedef int bool;
- typedef void* MP4FileHandle;
- typedef u_int32_t MP4TrackId;
- typedef u_int32_t MP4SampleId;
-Index: plugins/filetype_mp4/mp4file.c
-===================================================================
---- plugins/filetype_mp4/mp4file.c.orig 2011-06-04 15:46:23.000000000 +0200
-+++ plugins/filetype_mp4/mp4file.c  2011-09-26 18:02:37.000000000 +0200
-@@ -144,7 +144,6 @@
- 
- #define DEFAULT(x)
- 
--typedef int bool;
- typedef void* MP4FileHandle;
- typedef u_int32_t MP4TrackId;
- typedef u_int32_t MP4SampleId;

Added: trunk/dports/multimedia/gtkpod/files/patch-plugins-clarity-Makefile.am.diff
===================================================================
--- trunk/dports/multimedia/gtkpod/files/patch-plugins-clarity-Makefile.am.diff	                        (rev 0)
+++ trunk/dports/multimedia/gtkpod/files/patch-plugins-clarity-Makefile.am.diff	2014-10-27 15:48:07 UTC (rev 127409)
@@ -0,0 +1,16 @@
+--- plugins/clarity/Makefile.am.orig	2013-06-16 15:51:45.000000000 -0700
++++ plugins/clarity/Makefile.am	2014-10-27 05:16:51.000000000 -0700
+@@ -45,9 +45,11 @@
+ 
+ # Plugin dependencies
+ libclarity_la_LIBADD = \
+-    $(LIBGTKPOD_LIBS) \
++    $(GTKPOD_LIBS) \
+     $(LIBANJUTA_LIBS) \
+-    $(CLUTTER_GTK_LIBS)
++    $(CLUTTER_GTK_LIBS) \
++    $(CURL_LIBS)
++
+ 
+ endif
+ 

Modified: trunk/dports/multimedia/gtkpod/files/patch-use_extern.diff
===================================================================
--- trunk/dports/multimedia/gtkpod/files/patch-use_extern.diff	2014-10-27 15:42:50 UTC (rev 127408)
+++ trunk/dports/multimedia/gtkpod/files/patch-use_extern.diff	2014-10-27 15:48:07 UTC (rev 127409)
@@ -1,27 +1,19 @@
-Index: libgtkpod/gtkpod_app_iface.c
-===================================================================
---- libgtkpod/gtkpod_app_iface.c.orig	2011-09-26 20:00:07.000000000 +0200
-+++ libgtkpod/gtkpod_app_iface.c	2011-09-26 20:01:52.000000000 +0200
-@@ -695,3 +695,6 @@
-     GtkPodAppInterface *gp_iface = GTKPOD_APP_GET_INTERFACE (gtkpod_app);
-     return g_hash_table_get_keys(gp_iface->filetypes);
- }
-+
+diff -ur libgtkpod.orig/gtkpod_app_iface.c libgtkpod/gtkpod_app_iface.c
+--- libgtkpod.orig/gtkpod_app_iface.c	2013-08-28 14:09:09.000000000 -0700
++++ libgtkpod/gtkpod_app_iface.c	2014-10-26 15:07:26.000000000 -0700
+@@ -37,6 +37,9 @@
+ #include "context_menus.h"
+ #include "prefs.h"
+ 
 +GtkPodApp *gtkpod_app;
 +guint gtkpod_app_signals[LAST_SIGNAL];
-Index: libgtkpod/gtkpod_app_iface.h
-===================================================================
---- libgtkpod/gtkpod_app_iface.h.orig	2011-09-26 20:00:07.000000000 +0200
-+++ libgtkpod/gtkpod_app_iface.h	2011-09-26 20:01:52.000000000 +0200
-@@ -80,7 +80,7 @@
- } CONF_STATE;
++
+ static void gtkpod_app_base_init(GtkPodAppInterface* klass) {
+     static gboolean initialized = FALSE;
  
- /* predefined IDs for use with gtkpod_confirmation() */
--enum {
-+typedef enum {
-     CONF_ID_IPOD_DIR = 0,
-     CONF_ID_GTKPOD_WARNING,
-     CONF_ID_DANGLING0,
+diff -ur libgtkpod.orig/gtkpod_app_iface.h libgtkpod/gtkpod_app_iface.h
+--- libgtkpod.orig/gtkpod_app_iface.h	2013-08-02 11:49:32.000000000 -0700
++++ libgtkpod/gtkpod_app_iface.h	2014-10-26 15:08:30.000000000 -0700
 @@ -245,7 +245,7 @@
  FileType* gtkpod_get_filetype(gchar *name);
  GList *gtkpod_get_filetypes();
@@ -32,10 +24,9 @@
 +extern guint gtkpod_app_signals[LAST_SIGNAL];
  
  #endif /* GTKPOD_APP_IFACE_H_ */
-Index: plugins/core_preferences/plugin.c
-===================================================================
---- plugins/core_preferences/plugin.c.orig	2011-09-26 20:00:07.000000000 +0200
-+++ plugins/core_preferences/plugin.c	2011-09-26 20:01:52.000000000 +0200
+diff -ur plugins.orig/core_preferences/plugin.c plugins/core_preferences/plugin.c
+--- plugins.orig/core_preferences/plugin.c	2013-04-27 14:51:06.000000000 -0700
++++ plugins/core_preferences/plugin.c	2014-10-26 16:22:15.000000000 -0700
 @@ -41,6 +41,8 @@
  #define PREFERENCE_ICON "core_prefs-gtkpod-category"
  #define PREFERENCE_ICON_STOCK_ID "core_prefs-preference-icon"
@@ -45,10 +36,9 @@
  /* Parent class. Part of standard class definition */
  static gpointer parent_class;
  
-Index: plugins/core_preferences/plugin.h
-===================================================================
---- plugins/core_preferences/plugin.h.orig	2011-09-26 20:00:07.000000000 +0200
-+++ plugins/core_preferences/plugin.h	2011-09-26 20:01:52.000000000 +0200
+diff -ur plugins.orig/core_preferences/plugin.h plugins/core_preferences/plugin.h
+--- plugins.orig/core_preferences/plugin.h	2012-05-11 14:24:21.000000000 -0700
++++ plugins/core_preferences/plugin.h	2014-10-26 16:22:15.000000000 -0700
 @@ -61,6 +61,6 @@
      AnjutaPluginClass parent_class;
  };
@@ -57,10 +47,9 @@
 +extern CorePrefsPlugin *core_prefs_plugin;
  
  #endif /* PLUGIN_H_ */
-Index: plugins/details_editor/plugin.c
-===================================================================
---- plugins/details_editor/plugin.c.orig	2011-09-26 20:00:07.000000000 +0200
-+++ plugins/details_editor/plugin.c	2011-09-26 20:01:52.000000000 +0200
+diff -ur plugins.orig/details_editor/plugin.c plugins/details_editor/plugin.c
+--- plugins.orig/details_editor/plugin.c	2013-04-27 14:51:15.000000000 -0700
++++ plugins/details_editor/plugin.c	2014-10-26 16:22:15.000000000 -0700
 @@ -37,6 +37,8 @@
  #include "details.h"
  #include "details_editor_actions.h"
@@ -70,10 +59,9 @@
  /* Parent class. Part of standard class definition */
  static gpointer parent_class;
  
-Index: plugins/details_editor/plugin.h
-===================================================================
---- plugins/details_editor/plugin.h.orig	2011-09-26 20:00:07.000000000 +0200
-+++ plugins/details_editor/plugin.h	2011-09-26 20:01:52.000000000 +0200
+diff -ur plugins.orig/details_editor/plugin.h plugins/details_editor/plugin.h
+--- plugins.orig/details_editor/plugin.h	2012-05-11 14:24:09.000000000 -0700
++++ plugins/details_editor/plugin.h	2014-10-26 16:22:15.000000000 -0700
 @@ -52,6 +52,6 @@
      AnjutaPluginClass parent_class;
  };
@@ -82,10 +70,9 @@
 +extern DetailsEditorPlugin *details_editor_plugin;
  
  #endif /* PLUGIN_H_ */
-Index: plugins/info_display/plugin.c
-===================================================================
---- plugins/info_display/plugin.c.orig	2011-09-26 20:00:07.000000000 +0200
-+++ plugins/info_display/plugin.c	2011-09-26 20:01:52.000000000 +0200
+diff -ur plugins.orig/info_display/plugin.c plugins/info_display/plugin.c
+--- plugins.orig/info_display/plugin.c	2013-08-09 13:35:06.000000000 -0700
++++ plugins/info_display/plugin.c	2014-10-26 16:22:15.000000000 -0700
 @@ -37,6 +37,8 @@
  #include "info.h"
  #include "infoview.h"
@@ -95,10 +82,9 @@
  /* Parent class. Part of standard class definition */
  static gpointer parent_class;
  
-Index: plugins/info_display/plugin.h
-===================================================================
---- plugins/info_display/plugin.h.orig	2011-09-26 20:00:07.000000000 +0200
-+++ plugins/info_display/plugin.h	2011-09-26 20:01:52.000000000 +0200
+diff -ur plugins.orig/info_display/plugin.h plugins/info_display/plugin.h
+--- plugins.orig/info_display/plugin.h	2012-05-11 14:24:11.000000000 -0700
++++ plugins/info_display/plugin.h	2014-10-26 16:22:15.000000000 -0700
 @@ -50,6 +50,6 @@
      AnjutaPluginClass parent_class;
  };
@@ -107,10 +93,9 @@
 +extern InfoDisplayPlugin *info_display_plugin;
  
  #endif /* PLUGIN_H_ */
-Index: plugins/photo_editor/plugin.c
-===================================================================
---- plugins/photo_editor/plugin.c.orig	2011-09-26 20:00:07.000000000 +0200
-+++ plugins/photo_editor/plugin.c	2011-09-26 20:01:52.000000000 +0200
+diff -ur plugins.orig/photo_editor/plugin.c plugins/photo_editor/plugin.c
+--- plugins.orig/photo_editor/plugin.c	2013-04-27 14:51:32.000000000 -0700
++++ plugins/photo_editor/plugin.c	2014-10-26 16:22:15.000000000 -0700
 @@ -38,6 +38,8 @@
  #include "photo_editor_actions.h"
  #include "plugin.h"
@@ -120,10 +105,9 @@
  /* Parent class. Part of standard class definition */
  static gpointer parent_class;
  
-Index: plugins/photo_editor/plugin.h
-===================================================================
---- plugins/photo_editor/plugin.h.orig	2011-09-26 20:00:07.000000000 +0200
-+++ plugins/photo_editor/plugin.h	2011-09-26 20:01:52.000000000 +0200
+diff -ur plugins.orig/photo_editor/plugin.h plugins/photo_editor/plugin.h
+--- plugins.orig/photo_editor/plugin.h	2012-05-11 14:24:14.000000000 -0700
++++ plugins/photo_editor/plugin.h	2014-10-26 16:22:15.000000000 -0700
 @@ -59,6 +59,6 @@
      AnjutaPluginClass parent_class;
  };
@@ -132,10 +116,9 @@
 +extern PhotoEditorPlugin *photo_editor_plugin;
  
  #endif /* PLUGIN_H_ */
-Index: plugins/repository_editor/plugin.c
-===================================================================
---- plugins/repository_editor/plugin.c.orig	2011-09-26 20:00:07.000000000 +0200
-+++ plugins/repository_editor/plugin.c	2011-09-26 20:01:52.000000000 +0200
+diff -ur plugins.orig/repository_editor/plugin.c plugins/repository_editor/plugin.c
+--- plugins.orig/repository_editor/plugin.c	2013-04-27 14:51:39.000000000 -0700
++++ plugins/repository_editor/plugin.c	2014-10-26 16:22:15.000000000 -0700
 @@ -37,6 +37,8 @@
  #include "repository.h"
  #include "repository_actions.h"
@@ -145,10 +128,9 @@
  /* Parent class. Part of standard class definition */
  static gpointer parent_class;
  
-Index: plugins/repository_editor/plugin.h
-===================================================================
---- plugins/repository_editor/plugin.h.orig	2011-09-26 20:00:07.000000000 +0200
-+++ plugins/repository_editor/plugin.h	2011-09-26 20:01:52.000000000 +0200
+diff -ur plugins.orig/repository_editor/plugin.h plugins/repository_editor/plugin.h
+--- plugins.orig/repository_editor/plugin.h	2012-05-11 14:24:19.000000000 -0700
++++ plugins/repository_editor/plugin.h	2014-10-26 16:22:15.000000000 -0700
 @@ -51,6 +51,6 @@
      AnjutaPluginClass parent_class;
  };
@@ -157,29 +139,3 @@
 +extern RepositoryEditorPlugin *repository_editor_plugin;
  
  #endif /* PLUGIN_H_ */
-Index: plugins/sorttab_display/display_sorttabs.c
-===================================================================
---- plugins/sorttab_display/display_sorttabs.c.orig	2011-09-26 20:00:07.000000000 +0200
-+++ plugins/sorttab_display/display_sorttabs.c	2011-09-26 20:01:52.000000000 +0200
-@@ -83,6 +83,8 @@
- 
- GtkBuilder *cal_xml;
- 
-+GtkPaned *sorttab_parent;
-+
- /* ---------------------------------------------------------------- */
- /*                                                                  */
- /* Section for filter tab display (callback)                        */
-Index: plugins/sorttab_display/display_sorttabs.h
-===================================================================
---- plugins/sorttab_display/display_sorttabs.h.orig	2011-09-26 20:00:07.000000000 +0200
-+++ plugins/sorttab_display/display_sorttabs.h	2011-09-26 20:01:52.000000000 +0200
-@@ -119,7 +119,7 @@
- #define SP_SHIFT 9
- #define SP_MASK ((1<<SP_SHIFT)-1)
- 
--GtkPaned *sorttab_parent;
-+extern GtkPaned *sorttab_parent;
- 
- void st_create_tabs(GtkPaned *parent, gchar *glade_path);
- void st_init(ST_CAT_item new_category, guint32 inst);

Deleted: 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	2014-10-27 15:42:50 UTC (rev 127408)
+++ trunk/dports/multimedia/gtkpod/files/patch_glib_2.30_G_CONST_RETURN.diff	2014-10-27 15:48:07 UTC (rev 127409)
@@ -1,59 +0,0 @@
---- 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: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141027/b2d85e33/attachment-0001.html>


More information about the macports-changes mailing list