Date: Saturday, May 6, 2023 @ 17:07:39
  Author: heftig
Revision: 476873

archrelease: copy trunk to staging-x86_64

Added:
  libgpod/repos/staging-x86_64/
  
libgpod/repos/staging-x86_64/0001-323-Segmentation-fault-when-opening-ipod.patch
    (from rev 476872, 
libgpod/trunk/0001-323-Segmentation-fault-when-opening-ipod.patch)
  libgpod/repos/staging-x86_64/PKGBUILD
    (from rev 476872, libgpod/trunk/PKGBUILD)
  libgpod/repos/staging-x86_64/libgpod-0.8.2-pkgconfig_overlinking.patch
    (from rev 476872, libgpod/trunk/libgpod-0.8.2-pkgconfig_overlinking.patch)
  libgpod/repos/staging-x86_64/libgpod-0.8.3-pkgconfig_sharp.patch
    (from rev 476872, libgpod/trunk/libgpod-0.8.3-pkgconfig_sharp.patch)
  libgpod/repos/staging-x86_64/libgpod-udev.patch
    (from rev 476872, libgpod/trunk/libgpod-udev.patch)

-----------------------------------------------------+
 0001-323-Segmentation-fault-when-opening-ipod.patch |   43 ++++++++++
 PKGBUILD                                            |   75 ++++++++++++++++++
 libgpod-0.8.2-pkgconfig_overlinking.patch           |   11 ++
 libgpod-0.8.3-pkgconfig_sharp.patch                 |   17 ++++
 libgpod-udev.patch                                  |   15 +++
 5 files changed, 161 insertions(+)

Copied: 
libgpod/repos/staging-x86_64/0001-323-Segmentation-fault-when-opening-ipod.patch
 (from rev 476872, 
libgpod/trunk/0001-323-Segmentation-fault-when-opening-ipod.patch)
===================================================================
--- staging-x86_64/0001-323-Segmentation-fault-when-opening-ipod.patch          
                (rev 0)
+++ staging-x86_64/0001-323-Segmentation-fault-when-opening-ipod.patch  
2023-05-06 17:07:39 UTC (rev 476873)
@@ -0,0 +1,43 @@
+From 8dc5015ae036b219c4c9579a156886aa3a722aa5 Mon Sep 17 00:00:00 2001
+From: phantomjinx <[email protected]>
+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/staging-x86_64/PKGBUILD (from rev 476872, 
libgpod/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD                             (rev 0)
+++ staging-x86_64/PKGBUILD     2023-05-06 17:07:39 UTC (rev 476873)
@@ -0,0 +1,75 @@
+# Contributor: Daniel Isenmann <[email protected]>
+# Contributor: William Rea <[email protected]>
+
+pkgname=libgpod
+pkgver=0.8.3
+pkgrel=15
+pkgdesc="A shared library to access the contents of an iPod"
+url="http://www.gtkpod.org/libgpod/";
+arch=(x86_64)
+license=(LGPL)
+depends=(
+  gdk-pixbuf2
+  libimobiledevice
+  libplist
+  sg3_utils
+  sqlite
+  usbmuxd
+)
+makedepends=(
+  docbook-xsl
+  gtk-doc
+  intltool
+)
+provides=(libgpod.so)
+options=(!emptydirs)
+source=(
+  
https://downloads.sourceforge.net/sourceforge/gtkpod/${pkgname}-${pkgver}.tar.bz2
+  0001-323-Segmentation-fault-when-opening-ipod.patch
+  libgpod-0.8.2-pkgconfig_overlinking.patch
+  libgpod-0.8.3-pkgconfig_sharp.patch
+  libgpod-udev.patch
+)
+sha256sums=('638a7959d04e95f1e62abad02bd33702e4e8dfef98485ac7d9d50395c37e955d'
+            'b181131ee5b42673074f8217155b4f147623cc63dd382ee4bfa2cb81cd281b20'
+            '02daa2b46d0cfdee14c9d96eabf903ba4638694e669c5cb0ec462076837ac2ff'
+            '8e61c2a26c9144f2d76dae84ebb0b6ac9a73c53e4411fd4046c3938e0bbe5e23'
+            '35786054ebbfab1d247d51e7c7dc7618f8ed9fc17ad3c8b590d89190728452ea')
+b2sums=('e9bc54d23be7f54a17eea3f8a07d7bf6a28224d9c0b0f90fb9d44d97af6cf64c31096de5d9fa4b446e1a9463a6e8f3a59929d73bf52ad8d638732868c3c1b7d0'
+        
'4d984ba1d0a8da1e9a28e06cfebe5501a580ffe528a851e3470855f298db78067fedb14c5cb48c6165f0b571e27259cb30bb848d4b9a4724174a25eaa695ff3f'
+        
'74d924d61ce33c4fd0219e8dedb505bd66cd40e9912efb2dbbb5df31c2bea943ea4a4eb8b9e9baf2762966b02efae3f77c73293f8a4a581f6a43be4cc22eb727'
+        
'd3cb8ceaf14811c7bdee072229c838a4b9d7bd8c53ec76d2d0177c954730271b75174e559657d0948ccb5f921170e4d6636d4f1a36b329970f6b32da236ce390'
+        
'cbf5e305dd2b219149c09763eaf405f9e50944a2a12310caec31770378828241ce06b1747ba78552261724e37de052eefa145589600c77aeefdcc3a86a0b8a23')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../0001-323-Segmentation-fault-when-opening-ipod.patch
+  patch -Np1 -i ../libgpod-0.8.2-pkgconfig_overlinking.patch
+  patch -Np1 -i ../libgpod-0.8.3-pkgconfig_sharp.patch
+  patch -Np0 -i ../libgpod-udev.patch
+  sed -e 's|libplist >= 1.0|libplist-2.0 >= 2.2|' -i configure.ac # support 
libplist 2.2
+  sed -e 's|plist_dict_insert_item|plist_dict_set_item|' -i 
tools/ipod-lockdown.c # support libplist 2.3
+  autoreconf -vi
+}
+
+build() {
+  local configure_options=(
+    --prefix=/usr
+    --enable-udev
+    --with-mono=no
+    --with-python=no
+    --with-udev-dir=/usr/lib/udev
+  )
+
+  cd $pkgname-$pkgver
+  ./configure "${configure_options[@]}"
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="${pkgdir}" install
+}
+
+# vim:set sw=2 sts=-1 et:

Copied: libgpod/repos/staging-x86_64/libgpod-0.8.2-pkgconfig_overlinking.patch 
(from rev 476872, libgpod/trunk/libgpod-0.8.2-pkgconfig_overlinking.patch)
===================================================================
--- staging-x86_64/libgpod-0.8.2-pkgconfig_overlinking.patch                    
        (rev 0)
+++ staging-x86_64/libgpod-0.8.2-pkgconfig_overlinking.patch    2023-05-06 
17:07:39 UTC (rev 476873)
@@ -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

Copied: libgpod/repos/staging-x86_64/libgpod-0.8.3-pkgconfig_sharp.patch (from 
rev 476872, libgpod/trunk/libgpod-0.8.3-pkgconfig_sharp.patch)
===================================================================
--- staging-x86_64/libgpod-0.8.3-pkgconfig_sharp.patch                          
(rev 0)
+++ staging-x86_64/libgpod-0.8.3-pkgconfig_sharp.patch  2023-05-06 17:07:39 UTC 
(rev 476873)
@@ -0,0 +1,17 @@
+diff -Nurp libgpod-0.8.3/bindings/mono/libgpod-sharp/Makefile.am 
libgpod-0.8.3-pkgconfig_sharp/bindings/mono/libgpod-sharp/Makefile.am
+--- libgpod-0.8.3/bindings/mono/libgpod-sharp/Makefile.am      2013-07-09 
09:37:38.000000000 +0000
++++ libgpod-0.8.3-pkgconfig_sharp/bindings/mono/libgpod-sharp/Makefile.am      
2023-02-05 21:34:47.042376473 +0000
+@@ -23,12 +23,12 @@ libgpod-sharp.dll.config: $(top_srcdir)/
+       sed "s/@DLNAME@/$(dlname)/g" $< >$@
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+-pkgconfig_DATA = libgpod-sharp.pc
+ EXTRAS = \
+       libgpod-sharp.pc.in
+ 
+ if HAVE_MONO
+ include $(srcdir)/../Makefile.include
++pkgconfig_DATA = libgpod-sharp.pc
+ module_SCRIPTS += libgpod-sharp.dll.config
+ EXTRA_DIST += libgpod-sharp.dll.config.in
+ DISTCLEANFILES += libgpod-sharp.dll.config

Copied: libgpod/repos/staging-x86_64/libgpod-udev.patch (from rev 476872, 
libgpod/trunk/libgpod-udev.patch)
===================================================================
--- staging-x86_64/libgpod-udev.patch                           (rev 0)
+++ staging-x86_64/libgpod-udev.patch   2023-05-06 17:07:39 UTC (rev 476873)
@@ -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"

Reply via email to