libgpod: fix ftbfs
This commit is contained in:
@@ -0,0 +1,31 @@
|
||||
--- a/src/ithumb-writer.c
|
||||
+++ b/src/ithumb-writer.c
|
||||
@@ -728,7 +728,7 @@ ithumb_writer_handle_rotation (GdkPixbuf
|
||||
{
|
||||
return gdk_pixbuf_rotate_simple (pixbuf, *rotation);
|
||||
}
|
||||
- return g_object_ref (G_OBJECT (pixbuf));
|
||||
+ return GDK_PIXBUF(g_object_ref (G_OBJECT (pixbuf)));
|
||||
}
|
||||
|
||||
/* On the iPhone, thumbnails are presented as squares in a grid.
|
||||
@@ -968,7 +968,7 @@ ithumb_writer_write_thumbnail (iThumbWri
|
||||
else if (thumb->data_type == ITDB_THUMB_TYPE_PIXBUF)
|
||||
{
|
||||
Itdb_Thumb_Pixbuf *thumb_pixbuf = (Itdb_Thumb_Pixbuf *)thumb;
|
||||
- pixbuf = g_object_ref (G_OBJECT (thumb_pixbuf->pixbuf));
|
||||
+ pixbuf = GDK_PIXBUF(g_object_ref (G_OBJECT (thumb_pixbuf->pixbuf)));
|
||||
}
|
||||
|
||||
if (pixbuf == NULL)
|
||||
--- a/tools/generic-callout.c
|
||||
+++ b/tools/generic-callout.c
|
||||
@@ -664,7 +664,7 @@ static gboolean write_sysinfo_extended (
|
||||
}
|
||||
|
||||
|
||||
-static char *get_info_from_usb (usb_bus_number, usb_device_number)
|
||||
+static char *get_info_from_usb (gint usb_bus_number, gint usb_device_number)
|
||||
{
|
||||
#ifdef HAVE_LIBUSB
|
||||
return read_sysinfo_extended_from_usb (usb_bus_number,
|
||||
+17
-11
@@ -1,11 +1,17 @@
|
||||
# Template file for 'libgpod'
|
||||
pkgname=libgpod
|
||||
version=0.8.3
|
||||
revision=4
|
||||
revision=5
|
||||
build_style=gnu-configure
|
||||
configure_args="--with-udev-dir=/usr/lib/udev --enable-udev"
|
||||
hostmakedepends="intltool pkg-config automake gettext-devel glib-devel libtool gtk-doc"
|
||||
makedepends="gdk-pixbuf-devel libimobiledevice-devel sg3_utils-devel sqlite-devel"
|
||||
configure_args="--with-udev-dir=/usr/lib/udev --enable-udev
|
||||
ac_cv_path_INTLTOOL_UPDATE=/usr/bin/false
|
||||
ac_cv_path_INTLTOOL_MERGE=/usr/bin/false
|
||||
ac_cv_path_INTLTOOL_EXTRACT=/usr/bin/false
|
||||
ac_cv_path_INTLTOOL_PERL=/usr/bin/true
|
||||
"
|
||||
hostmakedepends="pkg-config gettext glib-devel gtk-doc"
|
||||
makedepends="gdk-pixbuf-devel libimobiledevice-devel sg3_utils-devel sqlite-devel
|
||||
taglib-devel libglib-devel"
|
||||
short_desc="Shared library to access the contents of an iPod"
|
||||
maintainer="Orphaned <orphan@voidlinux.org>"
|
||||
license="LGPL-2.1-only"
|
||||
@@ -14,16 +20,16 @@ distfiles="${SOURCEFORGE_SITE}/gtkpod/$pkgname-$version.tar.bz2"
|
||||
checksum=638a7959d04e95f1e62abad02bd33702e4e8dfef98485ac7d9d50395c37e955d
|
||||
|
||||
post_patch() {
|
||||
vsed -i configure.ac -e '/PKG_CHECK_MODULES/s/libplist\b/libplist-2.0/g'
|
||||
}
|
||||
|
||||
pre_configure() {
|
||||
autoreconf -fi
|
||||
vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
|
||||
vsed -i configure -e '
|
||||
/DATADIRNAME=/s/=.*/=share/
|
||||
s/libplist [>]/libplist-2.0 >/g
|
||||
/INTLTOOL_APPLIED_VERSION=/s/=.*/=0.21/
|
||||
'
|
||||
}
|
||||
|
||||
libgpod-devel_package() {
|
||||
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
|
||||
depends="${sourcepkg}>=${version}_${revision}
|
||||
libglib-devel gdk-pixbuf-devel libimobiledevice-devel"
|
||||
short_desc+=" - development files"
|
||||
pkg_install() {
|
||||
vmove usr/include
|
||||
|
||||
Reference in New Issue
Block a user