diff options
| -rw-r--r-- | multimedia/gtkpod/gtkpod-gdl362.patch | 59 | ||||
| -rw-r--r-- | multimedia/gtkpod/gtkpod-trackfilter64.patch | 20 | ||||
| -rw-r--r-- | multimedia/gtkpod/gtkpod.SlackBuild | 9 | ||||
| -rw-r--r-- | multimedia/gtkpod/gtkpod.info | 6 |
4 files changed, 5 insertions, 89 deletions
diff --git a/multimedia/gtkpod/gtkpod-gdl362.patch b/multimedia/gtkpod/gtkpod-gdl362.patch deleted file mode 100644 index 36c8bc353a..0000000000 --- a/multimedia/gtkpod/gtkpod-gdl362.patch +++ /dev/null @@ -1,59 +0,0 @@ -Index: gtkpod-2.1.2/src/anjuta-action-callbacks.c -=================================================================== ---- gtkpod-2.1.2.orig/src/anjuta-action-callbacks.c -+++ gtkpod-2.1.2/src/anjuta-action-callbacks.c -@@ -65,7 +65,7 @@ void - on_layout_lock_toggle (GtkAction *action, AnjutaApp *app) - { - if (app->layout_manager) -- g_object_set (app->layout_manager->master, "locked", -+ g_object_set (gdl_dock_layout_get_master (app->layout_manager), "locked", - gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)), - NULL); - } -Index: gtkpod-2.1.2/src/anjuta-app.c -=================================================================== ---- gtkpod-2.1.2.orig/src/anjuta-app.c -+++ gtkpod-2.1.2/src/anjuta-app.c -@@ -252,7 +252,7 @@ static void on_gdl_style_changed(GSettin - else if (g_strcmp0(pr_style, "Tabs") == 0) - style = GDL_SWITCHER_STYLE_TABS; - -- g_object_set(G_OBJECT(app->layout_manager->master), "switcher-style", style, NULL); -+ g_object_set(G_OBJECT(gdl_dock_layout_get_master (app->layout_manager)), "switcher-style", style, NULL); - g_free(pr_style); - } - -@@ -478,14 +478,14 @@ static void anjuta_app_instance_init(Anj - gtk_widget_show(app->dock); - gtk_box_pack_end(GTK_BOX (hbox), app->dock, TRUE, TRUE, 0); - -- dockbar = gdl_dock_bar_new(GDL_DOCK(app->dock)); -+ dockbar = gdl_dock_bar_new(G_OBJECT(app->dock)); - gtk_widget_show(dockbar); - gtk_box_pack_start(GTK_BOX (hbox), dockbar, FALSE, FALSE, 0); - -- app->layout_manager = gdl_dock_layout_new(GDL_DOCK (app->dock)); -+ app->layout_manager = gdl_dock_layout_new(G_OBJECT (app->dock)); - g_signal_connect (app->layout_manager, "notify::dirty", - G_CALLBACK (on_layout_dirty_notify), app); -- g_signal_connect (app->layout_manager->master, "notify::locked", -+ g_signal_connect (gdl_dock_layout_get_master (app->layout_manager), "notify::locked", - G_CALLBACK (on_layout_locked_notify), app); - - /* UI engine */ -Index: gtkpod-2.1.3/src/gtkpod.c -=================================================================== ---- gtkpod-2.1.3.orig/src/gtkpod.c -+++ gtkpod.2.1.3/src/gtkpod.c -@@ -235,8 +235,8 @@ void - session_dir = get_user_session_dir(); - anjuta_shell_session_save(ANJUTA_SHELL(app), session_dir, NULL); - g_free(session_dir); -- -- anjuta_shell_notify_exit(ANJUTA_SHELL(app), NULL); -+ -+ /* anjuta_shell_notify_exit(ANJUTA_SHELL(app), NULL); */ - - if (!gtkpod_cleanup_quit()) { - // Dont want to quit so avoid signalling any destroy event diff --git a/multimedia/gtkpod/gtkpod-trackfilter64.patch b/multimedia/gtkpod/gtkpod-trackfilter64.patch deleted file mode 100644 index a38814fdc3..0000000000 --- a/multimedia/gtkpod/gtkpod-trackfilter64.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/plugins/sorttab_display/normal_sorttab_page.c -+++ b/plugins/sorttab_display/normal_sorttab_page.c -@@ -41,7 +41,7 @@ - #include "normal_sorttab_page.h" - #include "sorttab_display_context_menu.h" - --#define NO_IDLE_SELECTION_CALLBACK -1 -+#define NO_IDLE_SELECTION_CALLBACK 0 - - G_DEFINE_TYPE( NormalSortTabPage, normal_sort_tab_page, GTK_TYPE_TREE_VIEW); - -@@ -570,7 +570,7 @@ - static void _st_selection_changed(GtkTreeSelection *selection, gpointer user_data) { - - NormalSortTabPage *self = NORMAL_SORT_TAB_PAGE(user_data); -- gulong idleId = NO_IDLE_SELECTION_CALLBACK; -+ guint idleId = NO_IDLE_SELECTION_CALLBACK; - - if (self) { - NormalSortTabPagePrivate *priv = NORMAL_SORT_TAB_PAGE_GET_PRIVATE(self);
\ No newline at end of file diff --git a/multimedia/gtkpod/gtkpod.SlackBuild b/multimedia/gtkpod/gtkpod.SlackBuild index b50f9df6fb..0131f7c740 100644 --- a/multimedia/gtkpod/gtkpod.SlackBuild +++ b/multimedia/gtkpod/gtkpod.SlackBuild @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=gtkpod -VERSION=${VERSION:-2.1.3} -BUILD=${BUILD:-3} +VERSION=${VERSION:-2.1.4} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -69,11 +69,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -patch -p1 < $CWD/gtkpod-gdl362.patch - -# Upstream patch to fix showing tracks of selected artist on 64-bit systems -patch -p1 < $CWD/gtkpod-trackfilter64.patch - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/multimedia/gtkpod/gtkpod.info b/multimedia/gtkpod/gtkpod.info index c11445686d..6f05882a5a 100644 --- a/multimedia/gtkpod/gtkpod.info +++ b/multimedia/gtkpod/gtkpod.info @@ -1,8 +1,8 @@ PRGNAM="gtkpod" -VERSION="2.1.3" +VERSION="2.1.4" HOMEPAGE="http://www.gtkpod.org/wiki/Home" -DOWNLOAD="http://downloads.sourceforge.net/gtkpod/gtkpod-2.1.3.tar.gz" -MD5SUM="57f04578de6e3262a436ec574422b144" +DOWNLOAD="http://dl.sourceforge.net/gtkpod/gtkpod-2.1.4.tar.gz" +MD5SUM="66c12ccb529c0f7de9a48a7f0d277c80" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="anjuta" |