[arch-commits] Commit in libgpod/repos/extra-x86_64 (9 files)

Jan de Groot jgc at archlinux.org
Fri May 15 22:11:42 UTC 2020


    Date: Friday, May 15, 2020 @ 22:11:42
  Author: jgc
Revision: 383740

archrelease: copy trunk to extra-x86_64

Added:
  libgpod/repos/extra-x86_64/0001-323-Segmentation-fault-when-opening-ipod.patch
    (from rev 383739, libgpod/trunk/0001-323-Segmentation-fault-when-opening-ipod.patch)
  libgpod/repos/extra-x86_64/PKGBUILD
    (from rev 383739, libgpod/trunk/PKGBUILD)
  libgpod/repos/extra-x86_64/libgpod-0.8.2-pkgconfig_overlinking.patch
    (from rev 383739, libgpod/trunk/libgpod-0.8.2-pkgconfig_overlinking.patch)
  libgpod/repos/extra-x86_64/libgpod-fixswig.patch
    (from rev 383739, libgpod/trunk/libgpod-fixswig.patch)
  libgpod/repos/extra-x86_64/libgpod-udev.patch
    (from rev 383739, libgpod/trunk/libgpod-udev.patch)
Deleted:
  libgpod/repos/extra-x86_64/0001-323-Segmentation-fault-when-opening-ipod.patch
  libgpod/repos/extra-x86_64/PKGBUILD
  libgpod/repos/extra-x86_64/libgpod-0.8.2-pkgconfig_overlinking.patch
  libgpod/repos/extra-x86_64/libgpod-fixswig.patch

-----------------------------------------------------+
 0001-323-Segmentation-fault-when-opening-ipod.patch |   86 +++++++++---------
 PKGBUILD                                            |   85 +++++++++--------
 libgpod-0.8.2-pkgconfig_overlinking.patch           |   22 ++--
 libgpod-fixswig.patch                               |   28 ++---
 libgpod-udev.patch                                  |   15 +++
 5 files changed, 127 insertions(+), 109 deletions(-)

Deleted: 0001-323-Segmentation-fault-when-opening-ipod.patch
===================================================================
--- 0001-323-Segmentation-fault-when-opening-ipod.patch	2020-05-15 22:11:39 UTC (rev 383739)
+++ 0001-323-Segmentation-fault-when-opening-ipod.patch	2020-05-15 22:11:42 UTC (rev 383740)
@@ -1,43 +0,0 @@
-From 8dc5015ae036b219c4c9579a156886aa3a722aa5 Mon Sep 17 00:00:00 2001
-From: phantomjinx <p.g.richardson at phantomjinx.co.uk>
-Date: Sat, 9 Aug 2014 19:57:10 +0100
-Subject: [PATCH] #323 Segmentation fault when opening ipod
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-* Patch submitted in bug report from François Melchior / James Burton
----
- src/itdb_itunesdb.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/itdb_itunesdb.c b/src/itdb_itunesdb.c
-index 4cc771a..1e85476 100644
---- a/src/itdb_itunesdb.c
-+++ b/src/itdb_itunesdb.c
-@@ -1156,6 +1156,7 @@ static gboolean playcounts_plist_read (FImport *fimp, GValue *plist_data)
-     GHashTable *pc_dict, *track_dict;
-     GValue *to_parse;
-     GArray *array;
-+    GValue value;
-     gint i;
-     guint32 mac_time;
-     guint64 *dbid;
-@@ -1175,11 +1176,12 @@ static gboolean playcounts_plist_read (FImport *fimp, GValue *plist_data)
- 
-     array = (GArray*)g_value_get_boxed (to_parse);
-     for (i = 0; i < array->len; i++) {
--       if (!G_VALUE_HOLDS (g_array_index (array, GValue *, i), G_TYPE_HASH_TABLE)) {
-+       value = g_array_index (array, GValue, i);
-+       if (!G_VALUE_HOLDS (&value, G_TYPE_HASH_TABLE)) {
-           continue;
-        }
- 
--       track_dict = g_value_get_boxed (g_array_index (array, GValue *, i));
-+       track_dict = g_value_get_boxed (&value);
-        if (track_dict == NULL)
-            continue;
- 
--- 
-2.12.2
-

Copied: libgpod/repos/extra-x86_64/0001-323-Segmentation-fault-when-opening-ipod.patch (from rev 383739, libgpod/trunk/0001-323-Segmentation-fault-when-opening-ipod.patch)
===================================================================
--- 0001-323-Segmentation-fault-when-opening-ipod.patch	                        (rev 0)
+++ 0001-323-Segmentation-fault-when-opening-ipod.patch	2020-05-15 22:11:42 UTC (rev 383740)
@@ -0,0 +1,43 @@
+From 8dc5015ae036b219c4c9579a156886aa3a722aa5 Mon Sep 17 00:00:00 2001
+From: phantomjinx <p.g.richardson at phantomjinx.co.uk>
+Date: Sat, 9 Aug 2014 19:57:10 +0100
+Subject: [PATCH] #323 Segmentation fault when opening ipod
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* Patch submitted in bug report from François Melchior / James Burton
+---
+ src/itdb_itunesdb.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/itdb_itunesdb.c b/src/itdb_itunesdb.c
+index 4cc771a..1e85476 100644
+--- a/src/itdb_itunesdb.c
++++ b/src/itdb_itunesdb.c
+@@ -1156,6 +1156,7 @@ static gboolean playcounts_plist_read (FImport *fimp, GValue *plist_data)
+     GHashTable *pc_dict, *track_dict;
+     GValue *to_parse;
+     GArray *array;
++    GValue value;
+     gint i;
+     guint32 mac_time;
+     guint64 *dbid;
+@@ -1175,11 +1176,12 @@ static gboolean playcounts_plist_read (FImport *fimp, GValue *plist_data)
+ 
+     array = (GArray*)g_value_get_boxed (to_parse);
+     for (i = 0; i < array->len; i++) {
+-       if (!G_VALUE_HOLDS (g_array_index (array, GValue *, i), G_TYPE_HASH_TABLE)) {
++       value = g_array_index (array, GValue, i);
++       if (!G_VALUE_HOLDS (&value, G_TYPE_HASH_TABLE)) {
+           continue;
+        }
+ 
+-       track_dict = g_value_get_boxed (g_array_index (array, GValue *, i));
++       track_dict = g_value_get_boxed (&value);
+        if (track_dict == NULL)
+            continue;
+ 
+-- 
+2.12.2
+

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-15 22:11:39 UTC (rev 383739)
+++ PKGBUILD	2020-05-15 22:11:42 UTC (rev 383740)
@@ -1,41 +0,0 @@
-# Maintainer: Daniel Isenmann <daniel at archlinux.org>
-# Contributor: William Rea <sillywilly at gmail.com>
-
-pkgname=libgpod
-pkgver=0.8.3
-pkgrel=9
-pkgdesc="A shared library to access the contents of an iPod"
-arch=(x86_64)
-license=('LGPL')
-depends=('gdk-pixbuf2' 'sg3_utils' 'libimobiledevice' 'libplist' 'sqlite')
-makedepends=('intltool' 'swig' 'docbook-xsl' 'gtk-sharp-2')
-optdepends=('gtk-sharp-2: Mono bindings')
-url="http://www.gtkpod.org/libgpod/"
-source=(https://downloads.sourceforge.net/sourceforge/gtkpod/${pkgname}-${pkgver}.tar.bz2
-        libgpod-0.8.2-pkgconfig_overlinking.patch
-        libgpod-fixswig.patch
-        0001-323-Segmentation-fault-when-opening-ipod.patch)
-options=('!emptydirs')
-sha256sums=('638a7959d04e95f1e62abad02bd33702e4e8dfef98485ac7d9d50395c37e955d'
-            '02daa2b46d0cfdee14c9d96eabf903ba4638694e669c5cb0ec462076837ac2ff'
-            '86f7054dc53ee2aa756c98dc893af6718bbeb6361a0785a5c93a5592b8cc8cdd'
-            'b181131ee5b42673074f8217155b4f147623cc63dd382ee4bfa2cb81cd281b20')
-
-prepare() {
-  cd $pkgname-$pkgver
-  patch -Np1 -i ../libgpod-0.8.2-pkgconfig_overlinking.patch
-  patch -Np1 -i ../libgpod-fixswig.patch
-  patch -Np1 -i ../0001-323-Segmentation-fault-when-opening-ipod.patch
-}
-
-build() {
-  cd $pkgname-$pkgver
-  MCS=/usr/bin/mcs ./configure --prefix=/usr --with-udev-dir=/usr/lib/udev --enable-udev --with-python=no
-  make PREFIX=/usr
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make PREFIX=/usr DESTDIR="${pkgdir}" install
-}

Copied: libgpod/repos/extra-x86_64/PKGBUILD (from rev 383739, libgpod/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-05-15 22:11:42 UTC (rev 383740)
@@ -0,0 +1,44 @@
+# Maintainer: Daniel Isenmann <daniel at archlinux.org>
+# Contributor: William Rea <sillywilly at gmail.com>
+
+pkgname=libgpod
+pkgver=0.8.3
+pkgrel=10
+pkgdesc="A shared library to access the contents of an iPod"
+arch=(x86_64)
+license=('LGPL')
+depends=('gdk-pixbuf2' 'sg3_utils' 'libimobiledevice' 'libplist' 'sqlite')
+makedepends=('intltool' 'swig' 'docbook-xsl' 'gtk-sharp-2')
+optdepends=('gtk-sharp-2: Mono bindings')
+url="http://www.gtkpod.org/libgpod/"
+source=(https://downloads.sourceforge.net/sourceforge/gtkpod/${pkgname}-${pkgver}.tar.bz2
+        libgpod-0.8.2-pkgconfig_overlinking.patch
+        libgpod-fixswig.patch
+        0001-323-Segmentation-fault-when-opening-ipod.patch
+        libgpod-udev.patch)
+options=('!emptydirs')
+sha256sums=('638a7959d04e95f1e62abad02bd33702e4e8dfef98485ac7d9d50395c37e955d'
+            '02daa2b46d0cfdee14c9d96eabf903ba4638694e669c5cb0ec462076837ac2ff'
+            '86f7054dc53ee2aa756c98dc893af6718bbeb6361a0785a5c93a5592b8cc8cdd'
+            'b181131ee5b42673074f8217155b4f147623cc63dd382ee4bfa2cb81cd281b20'
+            '35786054ebbfab1d247d51e7c7dc7618f8ed9fc17ad3c8b590d89190728452ea')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../libgpod-0.8.2-pkgconfig_overlinking.patch
+  patch -Np1 -i ../libgpod-fixswig.patch
+  patch -Np1 -i ../0001-323-Segmentation-fault-when-opening-ipod.patch
+  patch -Np0 -i ../libgpod-udev.patch
+}
+
+build() {
+  cd $pkgname-$pkgver
+  MCS=/usr/bin/mcs ./configure --prefix=/usr --with-udev-dir=/usr/lib/udev --enable-udev --with-python=no
+  make PREFIX=/usr
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make PREFIX=/usr DESTDIR="${pkgdir}" install
+}

Deleted: libgpod-0.8.2-pkgconfig_overlinking.patch
===================================================================
--- libgpod-0.8.2-pkgconfig_overlinking.patch	2020-05-15 22:11:39 UTC (rev 383739)
+++ libgpod-0.8.2-pkgconfig_overlinking.patch	2020-05-15 22:11:42 UTC (rev 383740)
@@ -1,11 +0,0 @@
-diff -up libgpod-0.8.2/libgpod-1.0.pc.in.pkgconfig_overlinking libgpod-0.8.2/libgpod-1.0.pc.in
---- libgpod-0.8.2/libgpod-1.0.pc.in.pkgconfig_overlinking	2011-04-15 03:37:34.000000000 -0500
-+++ libgpod-0.8.2/libgpod-1.0.pc.in	2012-08-10 13:53:00.294631805 -0500
-@@ -6,6 +6,6 @@ includedir=@includedir@
- Name: libgpod
- Description: A library to manipulate songs and playlists stored on an ipod
- Version: @VERSION@
--Requires: glib-2.0 >= 2.8.0 gobject-2.0 @GDKPIXBUF_REQ@ @LIBIMOBILEDEVICE_REQ@
-+Requires.private: glib-2.0 >= 2.8.0 gobject-2.0 @GDKPIXBUF_REQ@ @LIBIMOBILEDEVICE_REQ@
- Libs: -L${libdir} -lgpod
- Cflags: -I${includedir}/gpod-1.0

Copied: libgpod/repos/extra-x86_64/libgpod-0.8.2-pkgconfig_overlinking.patch (from rev 383739, libgpod/trunk/libgpod-0.8.2-pkgconfig_overlinking.patch)
===================================================================
--- libgpod-0.8.2-pkgconfig_overlinking.patch	                        (rev 0)
+++ libgpod-0.8.2-pkgconfig_overlinking.patch	2020-05-15 22:11:42 UTC (rev 383740)
@@ -0,0 +1,11 @@
+diff -up libgpod-0.8.2/libgpod-1.0.pc.in.pkgconfig_overlinking libgpod-0.8.2/libgpod-1.0.pc.in
+--- libgpod-0.8.2/libgpod-1.0.pc.in.pkgconfig_overlinking	2011-04-15 03:37:34.000000000 -0500
++++ libgpod-0.8.2/libgpod-1.0.pc.in	2012-08-10 13:53:00.294631805 -0500
+@@ -6,6 +6,6 @@ includedir=@includedir@
+ Name: libgpod
+ Description: A library to manipulate songs and playlists stored on an ipod
+ Version: @VERSION@
+-Requires: glib-2.0 >= 2.8.0 gobject-2.0 @GDKPIXBUF_REQ@ @LIBIMOBILEDEVICE_REQ@
++Requires.private: glib-2.0 >= 2.8.0 gobject-2.0 @GDKPIXBUF_REQ@ @LIBIMOBILEDEVICE_REQ@
+ Libs: -L${libdir} -lgpod
+ Cflags: -I${includedir}/gpod-1.0

Deleted: libgpod-fixswig.patch
===================================================================
--- libgpod-fixswig.patch	2020-05-15 22:11:39 UTC (rev 383739)
+++ libgpod-fixswig.patch	2020-05-15 22:11:42 UTC (rev 383740)
@@ -1,14 +0,0 @@
---- libgpod-0.8.3/bindings/python/gpod.i.in	2015-02-12 08:43:11.058975384 +0100
-+++ libgpod-0.8.3/bindings/python/gpod.i.in.orig	2015-02-12 08:44:08.185561253 +0100
-@@ -298,9 +298,11 @@ PyObject* sw_get_photo(GList *list, gint
- %include "gpod_doc.i"
- %include "@top_builddir@/config.h"
- 
-+/*
- # be nicer to decode these utf8 strings into Unicode objects in the C
- # layer. Here we are leaving it to the Python side, and just giving
- # them utf8 encoded Strings.
-+*/ 
- typedef char gchar;
- 
- %typemap(in) time_t {

Copied: libgpod/repos/extra-x86_64/libgpod-fixswig.patch (from rev 383739, libgpod/trunk/libgpod-fixswig.patch)
===================================================================
--- libgpod-fixswig.patch	                        (rev 0)
+++ libgpod-fixswig.patch	2020-05-15 22:11:42 UTC (rev 383740)
@@ -0,0 +1,14 @@
+--- libgpod-0.8.3/bindings/python/gpod.i.in	2015-02-12 08:43:11.058975384 +0100
++++ libgpod-0.8.3/bindings/python/gpod.i.in.orig	2015-02-12 08:44:08.185561253 +0100
+@@ -298,9 +298,11 @@ PyObject* sw_get_photo(GList *list, gint
+ %include "gpod_doc.i"
+ %include "@top_builddir@/config.h"
+ 
++/*
+ # be nicer to decode these utf8 strings into Unicode objects in the C
+ # layer. Here we are leaving it to the Python side, and just giving
+ # them utf8 encoded Strings.
++*/ 
+ typedef char gchar;
+ 
+ %typemap(in) time_t {

Copied: libgpod/repos/extra-x86_64/libgpod-udev.patch (from rev 383739, libgpod/trunk/libgpod-udev.patch)
===================================================================
--- libgpod-udev.patch	                        (rev 0)
+++ libgpod-udev.patch	2020-05-15 22:11:42 UTC (rev 383740)
@@ -0,0 +1,15 @@
+--- tools/90-libgpod.rules.in~	2011-07-24 06:03:29.000000000 -0500
++++ tools/90-libgpod.rules.in	2019-10-15 15:50:28.279770507 -0500
+@@ -16,10 +16,10 @@
+ 
+ 
+ # "iPods" using the afc protocol (iPhone, iPod Touch, ...)
+-ACTION=="add|change", ENV{USBMUX_SUPPORTED}=="1", IMPORT{program}+="@udevdir@/iphone-set-info", GOTO="libgpod_end"
++ACTION=="add|change", ENV{USBMUX_SUPPORTED}=="1", IMPORT{program}=="@udevdir@/iphone-set-info", GOTO="libgpod_end"
+ # with a new enough usbmuxd, the rule below is not useful since it will
+ # take care of setting USBMUX_SUPPORTED for all supported devices. Keep
+ # this rule for now until distros ship a new enough usbmuxd
+-ACTION=="add|change", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="129[0-9a]", IMPORT{program}+="@udevdir@/iphone-set-info"
++ACTION=="add|change", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="129[0-9a]", IMPORT{program}=="@udevdir@/iphone-set-info"
+ 
+ LABEL="libgpod_end"


More information about the arch-commits mailing list