<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[127409] trunk/dports/multimedia/gtkpod</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/127409">127409</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-10-27 08:48:07 -0700 (Mon, 27 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>gtkpod: update to version 2.1.4, dependencies, configuration, license, now uses gtk3, no python.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediagtkpodPortfile">trunk/dports/multimedia/gtkpod/Portfile</a></li>
<li><a href="#trunkdportsmultimediagtkpodfilespatchconfigureacdiff">trunk/dports/multimedia/gtkpod/files/patch-configure.ac.diff</a></li>
<li><a href="#trunkdportsmultimediagtkpodfilespatchuse_externdiff">trunk/dports/multimedia/gtkpod/files/patch-use_extern.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediagtkpodfilespatchpluginsclarityMakefileamdiff">trunk/dports/multimedia/gtkpod/files/patch-plugins-clarity-Makefile.am.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediagtkpodfilespatchmp4filecdiff">trunk/dports/multimedia/gtkpod/files/patch-mp4file.c.diff</a></li>
<li><a href="#trunkdportsmultimediagtkpodfilespatch_glib_230_G_CONST_RETURNdiff">trunk/dports/multimedia/gtkpod/files/patch_glib_2.30_G_CONST_RETURN.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmultimediagtkpodPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/gtkpod/Portfile (127408 => 127409)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -4,30 +4,35 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name gtkpod
</span><del>-version 2.0.2
-revision 1
</del><ins>+version 2.1.4
</ins><span class="cx"> categories multimedia gnome
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers nomaintainer
</span><del>-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.
</del><ins>+description gtkpod is a platform independent Graphical User Interface for Apple's iPod using GTK3.
</ins><span class="cx"> long_description ${description} It supports the first to fifth Generation including the iPod mini, iPod Photo, iPod Shuffle, iPod nano, and iPod Video.
</span><span class="cx"> homepage http://www.gtkpod.org/
</span><span class="cx"> master_sites sourceforge:gtkpod
</span><del>-license GPL-2+ LGPL-2+
-checksums md5 a24d4b882fa1e71c486ee90d87c7ce45 \
- sha1 d93e7618653d00a8bc845fd070305c5b38eea1e8 \
- rmd160 0810947c013c137f57599a999f63d07d6710b6c7
</del><ins>+license GPL-2+
+
+checksums rmd160 f75a1bb9d8f4eaf25d44da0d1da91c372b123334 \
+ sha256 ba12b35f3f24a155b68f0ffdaf4d3c5c7d1b8df04843a53306e1c83fc811dfaa
+
</ins><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool
</span><del>-depends_lib port:anjuta \
</del><ins>+
+depends_lib port:desktop-file-utils \
+ port:gtk3 \
+ path:lib/pkgconfig/glib-2.0.pc:glib2 \
+ port:anjuta \
</ins><span class="cx"> port:curl \
</span><span class="cx"> port:faad2 \
</span><span class="cx"> port:flex \
</span><span class="cx"> port:flac \
</span><del>- path:lib/pkgconfig/glib-2.0.pc:glib2 \
</del><ins>+ port:gstreamer010-gst-plugins-base \
</ins><span class="cx"> port:libgpod \
</span><span class="cx"> port:libid3tag \
</span><span class="cx"> path:lib/libmp4v2.dylib:mp4v2 \
</span><ins>+ port:libmusicbrainz3 \
</ins><span class="cx"> port:libvorbis \
</span><span class="cx"> path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
</span><span class="cx">
</span><span class="lines">@@ -38,33 +43,21 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-use_autoconf yes
</del><ins>+patchfiles patch-configure.ac.diff \
+ patch-plugins-clarity-Makefile.am.diff \
+ patch-use_extern.diff
</ins><span class="cx">
</span><del>-# 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}"
- }
- }
- }
-}
</del><ins>+use_autoreconf yes
+autoreconf.args -fvi
</ins><span class="cx">
</span><del>-patchfiles patch-configure.ac.diff \
- patch-mp4file.c.diff \
- patch-use_extern.diff \
- patch_glib_2.30_G_CONST_RETURN.diff
</del><ins>+configure.args --disable-schemas-compile \
+ --disable-silent-rules
</ins><span class="cx">
</span><ins>+post-activate {
+ system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
+ system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
+}
+
</ins><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.url http://sourceforge.net/projects/gtkpod/files/gtkpod/
</span><span class="cx"> livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)"
</span></span></pre></div>
<a id="trunkdportsmultimediagtkpodfilespatchconfigureacdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/gtkpod/files/patch-configure.ac.diff (127408 => 127409)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,13 +1,20 @@
</span><del>-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 @@
</del><ins>+--- 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 @@
</ins><span class="cx"> AC_SUBST(GTKPOD_CFLAGS)
</span><span class="cx"> AC_SUBST(GTKPOD_LIBS)
</span><span class="cx">
</span><del>--LDFLAGS="-no-undefined -Wl,--as-needed"
-+LDFLAGS="-no-undefined"
</del><ins>+-LDFLAGS="$LDFLAGS -no-undefined -Wl,--as-needed"
++LDFLAGS="$LDFLAGS -no-undefined"
</ins><span class="cx"> GTKPOD_PLUGIN_LDFLAGS="$LDFLAGS -module -avoid-version"
</span><span class="cx"> AC_SUBST(GTKPOD_PLUGIN_LDFLAGS)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsmultimediagtkpodfilespatchmp4filecdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/multimedia/gtkpod/files/patch-mp4file.c.diff (127408 => 127409)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,24 +0,0 @@
</span><del>-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;
</del></span></pre></div>
<a id="trunkdportsmultimediagtkpodfilespatchpluginsclarityMakefileamdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/gtkpod/files/patch-plugins-clarity-Makefile.am.diff (0 => 127409)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+--- 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
+
</ins></span></pre></div>
<a id="trunkdportsmultimediagtkpodfilespatchuse_externdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/gtkpod/files/patch-use_extern.diff (127408 => 127409)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,27 +1,19 @@
</span><del>-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);
- }
-+
</del><ins>+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"
+
</ins><span class="cx"> +GtkPodApp *gtkpod_app;
</span><span class="cx"> +guint gtkpod_app_signals[LAST_SIGNAL];
</span><del>-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;
</del><ins>++
+ static void gtkpod_app_base_init(GtkPodAppInterface* klass) {
+ static gboolean initialized = FALSE;
</ins><span class="cx">
</span><del>- /* predefined IDs for use with gtkpod_confirmation() */
--enum {
-+typedef enum {
- CONF_ID_IPOD_DIR = 0,
- CONF_ID_GTKPOD_WARNING,
- CONF_ID_DANGLING0,
</del><ins>+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
</ins><span class="cx"> @@ -245,7 +245,7 @@
</span><span class="cx"> FileType* gtkpod_get_filetype(gchar *name);
</span><span class="cx"> GList *gtkpod_get_filetypes();
</span><span class="lines">@@ -32,10 +24,9 @@
</span><span class="cx"> +extern guint gtkpod_app_signals[LAST_SIGNAL];
</span><span class="cx">
</span><span class="cx"> #endif /* GTKPOD_APP_IFACE_H_ */
</span><del>-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
</del><ins>+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
</ins><span class="cx"> @@ -41,6 +41,8 @@
</span><span class="cx"> #define PREFERENCE_ICON "core_prefs-gtkpod-category"
</span><span class="cx"> #define PREFERENCE_ICON_STOCK_ID "core_prefs-preference-icon"
</span><span class="lines">@@ -45,10 +36,9 @@
</span><span class="cx"> /* Parent class. Part of standard class definition */
</span><span class="cx"> static gpointer parent_class;
</span><span class="cx">
</span><del>-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
</del><ins>+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
</ins><span class="cx"> @@ -61,6 +61,6 @@
</span><span class="cx"> AnjutaPluginClass parent_class;
</span><span class="cx"> };
</span><span class="lines">@@ -57,10 +47,9 @@
</span><span class="cx"> +extern CorePrefsPlugin *core_prefs_plugin;
</span><span class="cx">
</span><span class="cx"> #endif /* PLUGIN_H_ */
</span><del>-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
</del><ins>+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
</ins><span class="cx"> @@ -37,6 +37,8 @@
</span><span class="cx"> #include "details.h"
</span><span class="cx"> #include "details_editor_actions.h"
</span><span class="lines">@@ -70,10 +59,9 @@
</span><span class="cx"> /* Parent class. Part of standard class definition */
</span><span class="cx"> static gpointer parent_class;
</span><span class="cx">
</span><del>-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
</del><ins>+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
</ins><span class="cx"> @@ -52,6 +52,6 @@
</span><span class="cx"> AnjutaPluginClass parent_class;
</span><span class="cx"> };
</span><span class="lines">@@ -82,10 +70,9 @@
</span><span class="cx"> +extern DetailsEditorPlugin *details_editor_plugin;
</span><span class="cx">
</span><span class="cx"> #endif /* PLUGIN_H_ */
</span><del>-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
</del><ins>+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
</ins><span class="cx"> @@ -37,6 +37,8 @@
</span><span class="cx"> #include "info.h"
</span><span class="cx"> #include "infoview.h"
</span><span class="lines">@@ -95,10 +82,9 @@
</span><span class="cx"> /* Parent class. Part of standard class definition */
</span><span class="cx"> static gpointer parent_class;
</span><span class="cx">
</span><del>-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
</del><ins>+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
</ins><span class="cx"> @@ -50,6 +50,6 @@
</span><span class="cx"> AnjutaPluginClass parent_class;
</span><span class="cx"> };
</span><span class="lines">@@ -107,10 +93,9 @@
</span><span class="cx"> +extern InfoDisplayPlugin *info_display_plugin;
</span><span class="cx">
</span><span class="cx"> #endif /* PLUGIN_H_ */
</span><del>-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
</del><ins>+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
</ins><span class="cx"> @@ -38,6 +38,8 @@
</span><span class="cx"> #include "photo_editor_actions.h"
</span><span class="cx"> #include "plugin.h"
</span><span class="lines">@@ -120,10 +105,9 @@
</span><span class="cx"> /* Parent class. Part of standard class definition */
</span><span class="cx"> static gpointer parent_class;
</span><span class="cx">
</span><del>-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
</del><ins>+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
</ins><span class="cx"> @@ -59,6 +59,6 @@
</span><span class="cx"> AnjutaPluginClass parent_class;
</span><span class="cx"> };
</span><span class="lines">@@ -132,10 +116,9 @@
</span><span class="cx"> +extern PhotoEditorPlugin *photo_editor_plugin;
</span><span class="cx">
</span><span class="cx"> #endif /* PLUGIN_H_ */
</span><del>-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
</del><ins>+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
</ins><span class="cx"> @@ -37,6 +37,8 @@
</span><span class="cx"> #include "repository.h"
</span><span class="cx"> #include "repository_actions.h"
</span><span class="lines">@@ -145,10 +128,9 @@
</span><span class="cx"> /* Parent class. Part of standard class definition */
</span><span class="cx"> static gpointer parent_class;
</span><span class="cx">
</span><del>-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
</del><ins>+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
</ins><span class="cx"> @@ -51,6 +51,6 @@
</span><span class="cx"> AnjutaPluginClass parent_class;
</span><span class="cx"> };
</span><span class="lines">@@ -157,29 +139,3 @@
</span><span class="cx"> +extern RepositoryEditorPlugin *repository_editor_plugin;
</span><span class="cx">
</span><span class="cx"> #endif /* PLUGIN_H_ */
</span><del>-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);
</del></span></pre></div>
<a id="trunkdportsmultimediagtkpodfilespatch_glib_230_G_CONST_RETURNdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/multimedia/gtkpod/files/patch_glib_2.30_G_CONST_RETURN.diff (127408 => 127409)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,59 +0,0 @@
</span><del>---- 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);
</del></span></pre>
</div>
</div>
</body>
</html>