[arch-commits] Commit in gtkpod/repos (12 files)

Eric Bélanger eric at archlinux.org
Mon Jan 14 08:37:19 UTC 2013


    Date: Monday, January 14, 2013 @ 03:37:19
  Author: eric
Revision: 175123

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  gtkpod/repos/extra-i686/PKGBUILD
    (from rev 175122, gtkpod/trunk/PKGBUILD)
  gtkpod/repos/extra-i686/gtkpod-2.1.3-gdl-3.6.patch
    (from rev 175122, gtkpod/trunk/gtkpod-2.1.3-gdl-3.6.patch)
  gtkpod/repos/extra-i686/gtkpod.install
    (from rev 175122, gtkpod/trunk/gtkpod.install)
  gtkpod/repos/extra-x86_64/PKGBUILD
    (from rev 175122, gtkpod/trunk/PKGBUILD)
  gtkpod/repos/extra-x86_64/gtkpod-2.1.3-gdl-3.6.patch
    (from rev 175122, gtkpod/trunk/gtkpod-2.1.3-gdl-3.6.patch)
  gtkpod/repos/extra-x86_64/gtkpod.install
    (from rev 175122, gtkpod/trunk/gtkpod.install)
Deleted:
  gtkpod/repos/extra-i686/PKGBUILD
  gtkpod/repos/extra-i686/gtkpod-2.1.2-anjuta.patch
  gtkpod/repos/extra-i686/gtkpod.install
  gtkpod/repos/extra-x86_64/PKGBUILD
  gtkpod/repos/extra-x86_64/gtkpod-2.1.2-anjuta.patch
  gtkpod/repos/extra-x86_64/gtkpod.install

-----------------------------------------+
 extra-i686/PKGBUILD                     |   74 +++++++++++++++---------------
 extra-i686/gtkpod-2.1.2-anjuta.patch    |   11 ----
 extra-i686/gtkpod-2.1.3-gdl-3.6.patch   |   44 +++++++++++++++++
 extra-i686/gtkpod.install               |   24 ++++-----
 extra-x86_64/PKGBUILD                   |   74 +++++++++++++++---------------
 extra-x86_64/gtkpod-2.1.2-anjuta.patch  |   11 ----
 extra-x86_64/gtkpod-2.1.3-gdl-3.6.patch |   44 +++++++++++++++++
 extra-x86_64/gtkpod.install             |   24 ++++-----
 8 files changed, 186 insertions(+), 120 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2013-01-14 08:36:52 UTC (rev 175122)
+++ extra-i686/PKGBUILD	2013-01-14 08:37:19 UTC (rev 175123)
@@ -1,37 +0,0 @@
-# $Id$
-# Contributor: Kevin Piche <kevin at archlinux.org>
-# Contributor: Aaron Griffin <aaron at archlinux.org>
-
-pkgname=gtkpod
-pkgver=2.1.2
-pkgrel=4
-pkgdesc="A platform independent GUI for Apple's iPod using GTK3"
-arch=('i686' 'x86_64')
-url="http://gtkpod.sourceforge.net"
-license=('GPL')
-depends=('libanjuta' 'curl' 'flac' 'libid3tag' 'libgpod' 'awk' 'hicolor-icon-theme' 'dconf' 'libwebkit3')
-makedepends=('flex' 'intltool' 'libvorbis' 'faad2')
-optdepends=('libmp4v2: MP4/h264 support'
-            'vorbis-tools: OGG support'
-	    'libvorbis: OGG support'
-            'id3v2: mp3 conversion support'
-            'faad2: m4a conversion support')
-install=gtkpod.install
-options=('!libtool')
-source=("http://downloads.sourceforge.net/gtkpod/${pkgname}-${pkgver}.tar.gz"
-        "gtkpod-2.1.2-anjuta.patch")
-md5sums=('88fef3f947cbb7ae6b714080733a3b6b'
-         '0a5f4ce0c9ef3d4d8db57290df43db27')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np0 -i "${srcdir}/gtkpod-2.1.2-anjuta.patch"
-  sed -i 's#python#python2#' scripts/sync-palm-jppy.py
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}

Copied: gtkpod/repos/extra-i686/PKGBUILD (from rev 175122, gtkpod/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2013-01-14 08:37:19 UTC (rev 175123)
@@ -0,0 +1,37 @@
+# $Id$
+# Contributor: Kevin Piche <kevin at archlinux.org>
+# Contributor: Aaron Griffin <aaron at archlinux.org>
+
+pkgname=gtkpod
+pkgver=2.1.3
+pkgrel=1
+pkgdesc="A platform independent GUI for Apple's iPod using GTK3"
+arch=('i686' 'x86_64')
+url="http://gtkpod.sourceforge.net"
+license=('GPL')
+depends=('libanjuta' 'curl' 'flac' 'libid3tag' 'libgpod' 'awk' 'hicolor-icon-theme' 'dconf' 'libwebkit3')
+makedepends=('flex' 'intltool' 'libvorbis' 'faad2')
+optdepends=('libmp4v2: MP4/h264 support'
+            'vorbis-tools: OGG support'
+	    'libvorbis: OGG support'
+            'id3v2: mp3 conversion support'
+            'faad2: m4a conversion support')
+install=gtkpod.install
+options=('!libtool')
+source=("http://downloads.sourceforge.net/gtkpod/${pkgname}-${pkgver}.tar.gz"
+        gtkpod-2.1.3-gdl-3.6.patch)
+md5sums=('57f04578de6e3262a436ec574422b144'
+         '8d725015081bd89bc8f9a4521d170aef')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i "${srcdir}/gtkpod-2.1.3-gdl-3.6.patch"
+  sed -i 's#python#python2#' scripts/sync-palm-jppy.py
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}

Deleted: extra-i686/gtkpod-2.1.2-anjuta.patch
===================================================================
--- extra-i686/gtkpod-2.1.2-anjuta.patch	2013-01-14 08:36:52 UTC (rev 175122)
+++ extra-i686/gtkpod-2.1.2-anjuta.patch	2013-01-14 08:37:19 UTC (rev 175123)
@@ -1,11 +0,0 @@
---- src/anjuta-app.c~	2012-06-01 03:14:23.000000000 -0500
-+++ src/anjuta-app.c	2012-07-25 08:15:37.289630966 -0500
-@@ -501,7 +501,7 @@
-     g_list_free(plugins_dirs);
- 
-     /* Preferences */
--    app->preferences = anjuta_preferences_new(app->plugin_manager);
-+    app->preferences = anjuta_preferences_new(app->plugin_manager, PREF_SCHEMA);
-     g_object_add_weak_pointer(G_OBJECT (app->preferences), (gpointer) &app->preferences);
- 
-     g_signal_connect(app->settings, "changed::" GDL_STYLE, G_CALLBACK(on_gdl_style_changed), app);

Copied: gtkpod/repos/extra-i686/gtkpod-2.1.3-gdl-3.6.patch (from rev 175122, gtkpod/trunk/gtkpod-2.1.3-gdl-3.6.patch)
===================================================================
--- extra-i686/gtkpod-2.1.3-gdl-3.6.patch	                        (rev 0)
+++ extra-i686/gtkpod-2.1.3-gdl-3.6.patch	2013-01-14 08:37:19 UTC (rev 175123)
@@ -0,0 +1,44 @@
+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 */

Deleted: extra-i686/gtkpod.install
===================================================================
--- extra-i686/gtkpod.install	2013-01-14 08:36:52 UTC (rev 175122)
+++ extra-i686/gtkpod.install	2013-01-14 08:37:19 UTC (rev 175123)
@@ -1,12 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}

Copied: gtkpod/repos/extra-i686/gtkpod.install (from rev 175122, gtkpod/trunk/gtkpod.install)
===================================================================
--- extra-i686/gtkpod.install	                        (rev 0)
+++ extra-i686/gtkpod.install	2013-01-14 08:37:19 UTC (rev 175123)
@@ -0,0 +1,12 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  glib-compile-schemas usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2013-01-14 08:36:52 UTC (rev 175122)
+++ extra-x86_64/PKGBUILD	2013-01-14 08:37:19 UTC (rev 175123)
@@ -1,37 +0,0 @@
-# $Id$
-# Contributor: Kevin Piche <kevin at archlinux.org>
-# Contributor: Aaron Griffin <aaron at archlinux.org>
-
-pkgname=gtkpod
-pkgver=2.1.2
-pkgrel=4
-pkgdesc="A platform independent GUI for Apple's iPod using GTK3"
-arch=('i686' 'x86_64')
-url="http://gtkpod.sourceforge.net"
-license=('GPL')
-depends=('libanjuta' 'curl' 'flac' 'libid3tag' 'libgpod' 'awk' 'hicolor-icon-theme' 'dconf' 'libwebkit3')
-makedepends=('flex' 'intltool' 'libvorbis' 'faad2')
-optdepends=('libmp4v2: MP4/h264 support'
-            'vorbis-tools: OGG support'
-	    'libvorbis: OGG support'
-            'id3v2: mp3 conversion support'
-            'faad2: m4a conversion support')
-install=gtkpod.install
-options=('!libtool')
-source=("http://downloads.sourceforge.net/gtkpod/${pkgname}-${pkgver}.tar.gz"
-        "gtkpod-2.1.2-anjuta.patch")
-md5sums=('88fef3f947cbb7ae6b714080733a3b6b'
-         '0a5f4ce0c9ef3d4d8db57290df43db27')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np0 -i "${srcdir}/gtkpod-2.1.2-anjuta.patch"
-  sed -i 's#python#python2#' scripts/sync-palm-jppy.py
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}

Copied: gtkpod/repos/extra-x86_64/PKGBUILD (from rev 175122, gtkpod/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2013-01-14 08:37:19 UTC (rev 175123)
@@ -0,0 +1,37 @@
+# $Id$
+# Contributor: Kevin Piche <kevin at archlinux.org>
+# Contributor: Aaron Griffin <aaron at archlinux.org>
+
+pkgname=gtkpod
+pkgver=2.1.3
+pkgrel=1
+pkgdesc="A platform independent GUI for Apple's iPod using GTK3"
+arch=('i686' 'x86_64')
+url="http://gtkpod.sourceforge.net"
+license=('GPL')
+depends=('libanjuta' 'curl' 'flac' 'libid3tag' 'libgpod' 'awk' 'hicolor-icon-theme' 'dconf' 'libwebkit3')
+makedepends=('flex' 'intltool' 'libvorbis' 'faad2')
+optdepends=('libmp4v2: MP4/h264 support'
+            'vorbis-tools: OGG support'
+	    'libvorbis: OGG support'
+            'id3v2: mp3 conversion support'
+            'faad2: m4a conversion support')
+install=gtkpod.install
+options=('!libtool')
+source=("http://downloads.sourceforge.net/gtkpod/${pkgname}-${pkgver}.tar.gz"
+        gtkpod-2.1.3-gdl-3.6.patch)
+md5sums=('57f04578de6e3262a436ec574422b144'
+         '8d725015081bd89bc8f9a4521d170aef')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i "${srcdir}/gtkpod-2.1.3-gdl-3.6.patch"
+  sed -i 's#python#python2#' scripts/sync-palm-jppy.py
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}

Deleted: extra-x86_64/gtkpod-2.1.2-anjuta.patch
===================================================================
--- extra-x86_64/gtkpod-2.1.2-anjuta.patch	2013-01-14 08:36:52 UTC (rev 175122)
+++ extra-x86_64/gtkpod-2.1.2-anjuta.patch	2013-01-14 08:37:19 UTC (rev 175123)
@@ -1,11 +0,0 @@
---- src/anjuta-app.c~	2012-06-01 03:14:23.000000000 -0500
-+++ src/anjuta-app.c	2012-07-25 08:15:37.289630966 -0500
-@@ -501,7 +501,7 @@
-     g_list_free(plugins_dirs);
- 
-     /* Preferences */
--    app->preferences = anjuta_preferences_new(app->plugin_manager);
-+    app->preferences = anjuta_preferences_new(app->plugin_manager, PREF_SCHEMA);
-     g_object_add_weak_pointer(G_OBJECT (app->preferences), (gpointer) &app->preferences);
- 
-     g_signal_connect(app->settings, "changed::" GDL_STYLE, G_CALLBACK(on_gdl_style_changed), app);

Copied: gtkpod/repos/extra-x86_64/gtkpod-2.1.3-gdl-3.6.patch (from rev 175122, gtkpod/trunk/gtkpod-2.1.3-gdl-3.6.patch)
===================================================================
--- extra-x86_64/gtkpod-2.1.3-gdl-3.6.patch	                        (rev 0)
+++ extra-x86_64/gtkpod-2.1.3-gdl-3.6.patch	2013-01-14 08:37:19 UTC (rev 175123)
@@ -0,0 +1,44 @@
+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 */

Deleted: extra-x86_64/gtkpod.install
===================================================================
--- extra-x86_64/gtkpod.install	2013-01-14 08:36:52 UTC (rev 175122)
+++ extra-x86_64/gtkpod.install	2013-01-14 08:37:19 UTC (rev 175123)
@@ -1,12 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}

Copied: gtkpod/repos/extra-x86_64/gtkpod.install (from rev 175122, gtkpod/trunk/gtkpod.install)
===================================================================
--- extra-x86_64/gtkpod.install	                        (rev 0)
+++ extra-x86_64/gtkpod.install	2013-01-14 08:37:19 UTC (rev 175123)
@@ -0,0 +1,12 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  glib-compile-schemas usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}




More information about the arch-commits mailing list