Commit 028a1c81 authored by Luca Giambonini's avatar Luca Giambonini

glib2 group update, generale removed !libtool

parent e234d6cd
......@@ -3,8 +3,8 @@
#
pkgname=at-spi2-atk
pkgver=2.6.2
pkgrel=2
pkgver=2.11.5
pkgrel=1
pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi"
arch=('x86_64')
url="http://www.gnome.org"
......@@ -12,9 +12,8 @@ license=('GPL2')
depends=('at-spi2-core' 'libx11' 'atk')
makedepends=('intltool')
install=at-spi2-atk.install
options=('!libtool')
source=("http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz")
md5sums=('7e43d24b64d156119b2b0879393cc94d')
source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
md5sums=('090a03e90fbfb5c6c49a87b983eb41ac')
build() {
cd $pkgname-$pkgver
......
......@@ -5,7 +5,7 @@
# contributor Ionut Biru <ibiru@archlinux.org>
pkgname=at-spi2-core
pkgver=2.6.3
pkgver=2.11.5
pkgrel=1
pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
arch=('x86_64')
......@@ -13,9 +13,8 @@ url="http://www.gnome.org"
license=('GPL2')
depends=('dbus-core' 'glib2' 'libxtst')
makedepends=('intltool' 'gobject-introspection')
options=('!libtool')
source=("http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz")
md5sums=('eb1d3ca3332af8862791d3ff7dcfd20a')
md5sums=('d61793f50af00cd5d9262c2d12d40ac6')
build() {
cd $pkgname-$pkgver
......
......@@ -4,17 +4,16 @@
# maintainer abveritas@chakra-project.org
pkgname=atk
pkgver=2.6.0
pkgver=2.11.6
pkgrel=1
pkgdesc="A library providing a set of interfaces for accessibility"
arch=('x86_64')
license=('LGPL')
depends=('glib2')
makedepends=('gobject-introspection')
options=('!libtool')
source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz")
url='http://www.gtk.org/'
md5sums=('6b34e2a63dda4429b5692be7ca3aa5bf')
md5sums=('fdf709e19eee2e22f206f906eeb3c2da')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
......
......@@ -5,7 +5,7 @@
pkgname=avahi
pkgver=0.6.31
pkgrel=10
pkgrel=11
pkgdesc="A multicast/unicast DNS-SD framework"
arch=('x86_64')
url="http://www.avahi.org/"
......
......@@ -4,7 +4,7 @@
pkgname=bumblebee
pkgver=3.2.1
pkgrel=1
pkgrel=2
pkgdesc="Bumblebee brings Optimus Support for Linux Through VirtualGL. You need to install proper drivers separately. Can be used with Nouveau or Nvidia"
arch=('x86_64')
depends=('virtualgl' 'glib2')
......
......@@ -3,25 +3,22 @@
# maintainer abveritas@chakra-project.org
pkgname=cairo
pkgver=1.12.14
pkgrel=4
_ubuntu_diff_version=${pkgver}-0ubuntu1
pkgver=1.12.16
pkgrel=1
_ubuntu_diff_version=${pkgver}-0ubuntu2
pkgdesc="Cairo vector graphics library"
arch=('x86_64')
license=('LGPL' 'MPL')
url="http://cairographics.org/"
depends=('libpng>=1.6.0' 'libxrender' 'libxext' 'fontconfig>=2.8.0' 'pixman' 'glib2' 'sh' 'mesa>=9.0' 'libgl' 'lzo2')
depends=('libpng>=1.6.0' 'libxrender' 'libxext' 'fontconfig>=2.8.0' 'pixman' 'glib2' 'sh' 'mesa>=9.0' 'libgl' 'lzo2' 'librsvg')
makedepends=('librsvg' 'poppler-glib' 'libspectre' 'valgrind' 'ttf-dejavu' 'gsfonts' 'xorg-server')
provides=('cairo-xcb' 'cairo-ubuntu')
replaces=('cairo-xcb' 'cairo-ubuntu')
conflicts=('cairo-ubuntu')
options=('!libtool')
source=("http://cairographics.org/releases/${pkgname}-${pkgver}.tar.xz"
"http://archive.ubuntu.com/ubuntu/pool/main/c/cairo/cairo_${_ubuntu_diff_version}.debian.tar.gz"
"libpng16.patch")
sha1sums=('9106ab09b2e7b9f90521b18dd4a7e9577eba6c15'
'c4c89d212f1e3a131ea4e228562c91a0a632118f'
'c9911f185637d266ce1d2985bd6fb7d0df3d75b2')
"http://archive.ubuntu.com/ubuntu/pool/main/c/cairo/cairo_${_ubuntu_diff_version}.debian.tar.gz")
sha1sums=('4f6e337d5d3edd7ea79d1426f575331552b003ec'
'95d873fda436a1cc29cda1310f155ef0e3258c05')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
......@@ -31,7 +28,6 @@ prepare() {
patch -Np1 -i "$srcdir/debian/patches/$_f"
done
patch -p1 < ../libpng16.patch
}
build() {
......@@ -51,6 +47,14 @@ build() {
make
}
check() {
cd $pkgname-$pkgver
make -k test || /bin/true
# results:
# 2014-02-11: 154 Passed, 352 Failed [2 crashed, 9 expected], 29 Skipped
}
package() {
cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
......
From 2dd2c826a5b367d32cf2d48ed69754795990c5db Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Tue, 16 Apr 2013 09:58:56 +0000
Subject: png: Avoid marking the surface as in error after a png warning
It turns out that libpng will continue to load an image after throwing a
warning, and that libpng16 now throws warnings for images that libpng15
and earlier loaded without error. As we were happily loading those
images into cairo surfaces before, we are therefore being overzealous
in throwing an error now - so just squelch the warning.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
diff --git a/src/cairo-png.c b/src/cairo-png.c
index e74a4a8..068617d 100644
--- a/src/cairo-png.c
+++ b/src/cairo-png.c
@@ -149,13 +149,13 @@ static void
png_simple_warning_callback (png_structp png,
png_const_charp error_msg)
{
- cairo_status_t *error = png_get_error_ptr (png);
-
- /* default to the most likely error */
- if (*error == CAIRO_STATUS_SUCCESS)
- *error = _cairo_error (CAIRO_STATUS_NO_MEMORY);
-
- /* png does not expect to abort and will try to tidy up after a warning */
+ /* png does not expect to abort and will try to tidy up and continue
+ * loading the image after a warning. So we also want to return the
+ * (incorrect?) surface.
+ *
+ * We use our own warning callback to squelch any attempts by libpng
+ * to write to stderr as we may not be in control of that output.
+ */
}
--
cgit v0.9.0.2-2-gbebe
......@@ -8,7 +8,7 @@
pkgname=cdemu-daemon
pkgver=2.1.1
pkgrel=2
pkgrel=3
pkgdesc=("CD/DVD-ROM device emulator daemon")
arch=('x86_64')
backup=('etc/conf.d/cdemu-daemon'
......
......@@ -6,18 +6,17 @@
pkgname=dbus-c++
pkgver=0.9.0
pkgrel=2
pkgrel=3
pkgdesc="dbus-c++ attempts to provide a C++ API for D-BUS"
url="http://sourceforge.net/projects/dbus-cplusplus/"
arch=('i686' 'x86_64')
arch=('x86_64')
license=('GPL')
depends=('dbus>=1.2.0' 'glib2')
depends=('dbus' 'glib2')
makedepends=('autoconf' 'automake')
source=("http://sourceforge.net/projects/dbus-cplusplus/files/dbus-c%2B%2B/0.9.0/libdbus-c%2B%2B-0.9.0.tar.gz"
"patch-gcc47.patch")
md5sums=('e752116f523fa88ef041e63d3dee4de2'
'9319b402b15f37d881b51bc758368900')
options=('!libtool')
'9319b402b15f37d881b51bc758368900')
build() {
cd "${srcdir}/libdbus-c++-${pkgver}"
......
......@@ -6,14 +6,14 @@
pkgname=dbus-glib
pkgver=0.100.2
pkgrel=1
pkgrel=2
pkgdesc="GLib bindings for DBUS"
arch=('i686' 'x86_64')
arch=('x86_64')
license=('GPL')
url="http://www.freedesktop.org/wiki/Software/DBusBindings"
depends=('dbus' 'glib2')
makedepends=('pkgconfig')
options=('!libtool' '!emptydirs')
options=('!emptydirs')
source=("http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz")
md5sums=('ad0920c7e3aad669163bb59171cf138e')
......
......@@ -2,15 +2,15 @@
# Maintainer: Alexander Fehr <pizzapunk gmail com>
pkgname=desktop-file-utils
pkgver=0.19
pkgver=0.22
pkgrel=1
pkgdesc="Command line utilities for working with desktop entries"
arch=('i686' 'x86_64')
arch=('x86_64')
url="http://www.freedesktop.org/wiki/Software/desktop-file-utils"
license=('GPL')
depends=('glib2')
source=(http://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-${pkgver}.tar.xz)
md5sums=('cbb2427593b7f6d36e52e9d221fce82f')
md5sums=('c6b9f9aac1ea143091178c23437e6cd0')
build() {
cd "${srcdir}/desktop-file-utils-${pkgver}"
......
......@@ -4,13 +4,12 @@
pkgname=eggdbus
pkgver=0.6
pkgrel=4
pkgrel=5
pkgdesc="Experimental D-Bus bindings for GObject"
arch=('x86_64')
license=('LGPL')
url="http://www.freedesktop.org/wiki/Software/Policykit"
depends=('glib2' 'dbus-glib')
options=('!libtool')
source=("http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz")
md5sums=('b43d2a6c523fcb8b9d0b0300c4222386')
......
......@@ -5,7 +5,7 @@
pkgname=fluidsynth
pkgver=1.1.6
pkgrel=3
pkgrel=4
pkgdesc="A real-time software synthesizer based on the SoundFont 2 specifications"
arch=('x86_64')
url="http://www.fluidsynth.org/"
......
#
# Platform Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=fuseiso
pkgver=20070708
pkgrel=2
pkgrel=3
pkgdesc="FUSE module to mount ISO filesystem images"
arch=('i686' 'x86_64')
arch=('x86_64')
url="http://fuse.sourceforge.net/wiki/index.php/FuseIso"
license=('GPL')
depends=('fuse' 'glib2' 'zlib')
makedepends=('pkgconfig')
source=(http://ubiz.ru/dm/${pkgname}-${pkgver}.tar.bz2)
source=(https://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
md5sums=('4bb50412b6d01f337565e28afddca3a5')
build() {
......
......@@ -7,11 +7,11 @@
pkgname=gamin
pkgver=0.1.10
pkgrel=1
pkgrel=2
pkgdesc='File and directory monitoring system defined to be a subset of the FAM (File Alteration Monitor).'
url='http://www.gnome.org/~veillard/gamin'
license=('GPL2')
arch=('i686' 'x86_64')
arch=('x86_64')
depends=('glib2')
makedepends=('python2')
optdepends=('python2: for the Python module.')
......
......@@ -3,7 +3,7 @@
# maintainer abveritas@chakra-project.org
pkgname=gdk-pixbuf2
pkgver=2.28.2
pkgver=2.30.4
pkgrel=1
pkgdesc="An image loading library"
arch=('x86_64')
......@@ -11,10 +11,9 @@ url="http://www.gtk.org/"
license=('LGPL2.1')
depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11')
makedepends=('gobject-introspection')
options=('!libtool')
install=gdk-pixbuf2.install
source=("http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-${pkgver}.tar.xz")
sha1sums=('9876d0a20f592f8fb2a52d4a86ec43d607661beb')
sha1sums=('1f92ef9246ed70003cbb104128c0d24720830d53')
build() {
cd "${srcdir}/gdk-pixbuf-${pkgver}"
......
......@@ -2,14 +2,14 @@
pkgname=glib-perl
pkgver=1.304
pkgrel=1
pkgrel=2
pkgdesc="Perl wrappers for glib 2.x, including GObject"
arch=(x86_64)
arch=('x86_64')
license=('LGPL')
url="http://gtk2-perl.sourceforge.net/"
options=('!emptydirs')
depends=('glib2>=2.24.1' 'perl>=5.14.2')
makedepends=('perl-extutils-depends>=0.302' 'perl-extutils-pkgconfig>=1.12')
depends=('glib2' 'perl')
makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig')
source=("http://sourceforge.net/projects/gtk2-perl/files/Glib/${pkgver}/Glib-${pkgver}.tar.gz")
md5sums=('62e454da4eb8eccdb59452c8bfd8565c')
......
......@@ -5,15 +5,14 @@
pkgbase=glibmm
pkgname=('glibmm' 'glibmm-docs')
pkgver=2.34.1
pkgver=2.38.1
pkgrel=1
arch=('x86_64')
license=('LGPL')
makedepends=('glib2' 'libsigc++2.0' 'pkgconfig')
source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
options=('!libtool')
url="http://gtkmm.sourceforge.net/"
md5sums=('25dccf8e95abcde034a002b450a43125')
md5sums=('50d86a77398cd473ff13c4c9382e39bd')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
......
......@@ -2,7 +2,7 @@
# contributor Jan de Groot <jgc@archlinux.org>
pkgname=gstreamer
pkgver=1.2.1
pkgver=1.2.3
pkgrel=1
pkgdesc="GStreamer Multimedia Framework"
arch=('x86_64')
......@@ -11,9 +11,8 @@ url="http://gstreamer.freedesktop.org/"
depends=('libxml2' 'glib2')
optdepends=('sh: feedback script')
makedepends=('intltool' 'pkgconfig' 'gobject-introspection')
options=('!libtool')
source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz)
md5sums=('55d50f48a496799dbb0b195c9c6c6153')
md5sums=('8155b9c7574ccaa361cc504e8e0e72dc')
build() {
cd "${srcdir}/gstreamer-${pkgver}"
......
......@@ -5,14 +5,13 @@
pkgname=gstreamer0.10
pkgver=0.10.36
pkgrel=6
pkgrel=7
pkgdesc="GStreamer Multimedia Framework"
arch=('x86_64')
license=('LGPL')
url="http://gstreamer.freedesktop.org/"
depends=('libxml2' 'glib2')
makedepends=('intltool' 'pkgconfig' 'gobject-introspection')
options=('!libtool')
source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz)
md5sums=('15389c73e091b1dda915279c388b9cb2')
......
......@@ -4,7 +4,7 @@
# contributor Jan de Groot <jgc@archlinux.org>
pkgname=harfbuzz
pkgver=0.9.21
pkgver=0.9.26
pkgrel=1
pkgdesc="OpenType text shaping engine."
arch=('x86_64')
......@@ -13,9 +13,8 @@ license=('MIT')
depends=('icu' 'glib2' 'freetype2' 'graphite')
makedepends=('icu' 'cairo')
optdepends=('cairo: hb-view program')
options=(!libtool)
source=("http://www.freedesktop.org/software/harfbuzz/release/${pkgname}-${pkgver}.tar.bz2")
sha256sums=('a0d36f883d98f2375f9b2a03c8a6c361b161a76d4b58ea9d08be59e39e73dae8')
md5sums=('a2b6cbd437f22dd5dc93d377696c9204')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
......
......@@ -4,7 +4,7 @@
# maintainer abveritas[at]chakra-project[dot]org>
pkgname=lensfun
pkgver=0.2.7
pkgver=0.2.8
pkgrel=1
pkgdesc="Database of photographic lenses and a library that allows advanced access to the database"
arch=('x86_64')
......@@ -13,11 +13,15 @@ license=('LGPL3')
depends=('glibc' 'glib2')
makedepends=('python2' 'libpng')
source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
md5sums=('6061cc2d00a42d3e62512878426fc841')
md5sums=('db2988505e7432c6b331aa597789c639')
build() {
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' configure
}
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
./configure \
--prefix=/usr \
--libdir=/usr/lib
......
......@@ -4,13 +4,12 @@
pkgname=libbonobo
_pkgver=2.32
pkgver="${_pkgver}.1"
pkgrel=3
pkgrel=4
pkgdesc="A set of language and system independant CORBA interfaces for creating reusable components"
arch=('x86_64')
license=('GPL' 'LGPL')
depends=('orbit2' 'libxml2' 'dbus-glib' 'glib2')
depends=('orbit2' 'libxml2' 'dbus-glib' 'glib2' 'popt')
makedepends=('intltool' 'pkgconfig')
options=('!libtool')
backup=('etc/bonobo-activation/bonobo-activation-config.xml')
replaces=('bonobo-activation')
url="http://www.gnome.org"
......@@ -20,6 +19,11 @@ install=libbonobo.install
md5sums=('27fa902d4fdf6762ee010e7053aaf77b'
'6392efaca30a26f826eafc4b8ccbc01f')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
sed -i "s#-DG_DISABLE_DEPRECATED##" activation-server/Makefile.in
}
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr --sysconfdir=/etc \
......
......@@ -4,24 +4,31 @@
# maintainer abveritas[at]chakra-project[dot]org>
pkgname=libgdiplus
pkgver=2.10
pkgrel=4
pkgver=2.10.9
pkgrel=1
pkgdesc="An Open Source Implementation of the GDI+ API"
arch=('x86_64')
license=('MPL' 'LGPL')
url="http://www.mono-project.com"
depends=('libtiff>=3.9.2-2' 'cairo>=1.8.10' 'giflib' 'glib2>=2.24.0' 'libexif')
depends=('libtiff' 'cairo' 'giflib' 'glib2' 'libexif')
makedepends=('pkgconfig')
options=('!libtool')
source=("http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
'libpng15.patch')
md5sums=('451966e8f637e3a1f02d1d30f900255d'
'a2d143676bbaceeb88b4c34069e93986')
libpng15.patch
libgdiplus0-giflib5.patch
libgdiplus-2.10.9-gold.patch)
md5sums=('b4615c14584b5d73cbb9757c28887654'
'a2d143676bbaceeb88b4c34069e93986'
'ad97558c721106eea03c7808b501814b'
'95fb92750c131ce9287419c3ac5fcb76')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -p0 -i "${srcdir}/libpng15.patch"
patch -Np1 -i ../libgdiplus0-giflib5.patch
patch -Np1 -i ../libgdiplus-2.10.9-gold.patch
sed -i -e 's/-L\${libjpeg_prefix}\/lib -ljpeg/-ljpeg/' configure
}
build() {
......
tests/Makefile.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 97f5f4e..c02ca25 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -228,7 +228,7 @@ DEPS = \
$(top_builddir)/src/libgdiplus.la
LDADDS = \
- $(top_builddir)/src/libgdiplus.la
+ $(top_builddir)/src/libgdiplus.la -lX11 -lglib-2.0
testgdi_DEPENDENCIES = $(TEST_DEPS)
testgdi_LDADD = $(LDADDS)
diff --git a/src/gifcodec.c b/src/gifcodec.c
index 8dee0eb..564beed 100644
--- a/src/gifcodec.c
+++ b/src/gifcodec.c
@@ -39,8 +39,10 @@ GUID gdip_gif_image_format_guid = {0xb96b3cb0U, 0x0728U, 0x11d3U, {0x9d, 0x7b, 0
#include "gifcodec.h"
+#if GIFLIB_MAJOR < 5
/* giflib declares this incorrectly as EgifOpen */
extern GifFileType *EGifOpen(void *userData, OutputFunc writeFunc);
+#endif
/* Data structure used for callback */
typedef struct
@@ -105,7 +107,7 @@ gdip_gif_inputfunc (GifFileType *gif, GifByteType *data, int len)
*/
static int
-AddExtensionBlockMono(SavedImage *New, int Len, BYTE ExtData[])
+AddExtensionBlockMono(SavedImage *New, int Len, int func, BYTE ExtData[])
{
ExtensionBlock *ep;
@@ -129,7 +131,7 @@ AddExtensionBlockMono(SavedImage *New, int Len, BYTE ExtData[])
if (ExtData) {
memcpy(ep->Bytes, ExtData, Len);
- ep->Function = New->Function;
+ ep->Function = func;
}
return (GIF_OK);
@@ -232,20 +234,20 @@ DGifSlurpMono(GifFileType * GifFile, SavedImage *TrailingExtensions)
}
case EXTENSION_RECORD_TYPE: {
- if (DGifGetExtension(GifFile, &temp_save.Function, &ExtData) == GIF_ERROR) {
+ int func;
+ if (DGifGetExtension(GifFile, &func, &ExtData) == GIF_ERROR) {
return (GIF_ERROR);
}
while (ExtData != NULL) {
/* Create an extension block with our data */
- if (AddExtensionBlockMono(&temp_save, ExtData[0], &ExtData[1]) == GIF_ERROR) {
+ if (AddExtensionBlockMono(&temp_save, func, ExtData[0], &ExtData[1]) == GIF_ERROR) {
return (GIF_ERROR);
}
if (DGifGetExtensionNext(GifFile, &ExtData) == GIF_ERROR) {
return (GIF_ERROR);
}
- temp_save.Function = 0;
}
break;
}
@@ -303,12 +305,19 @@ gdip_load_gif_image (void *stream, GpImage **image, BOOL from_file)
result = NULL;
loop_counter = FALSE;
+#if GIFLIB_MAJOR < 5
if (from_file) {
gif = DGifOpen(stream, &gdip_gif_fileinputfunc);
} else {
gif = DGifOpen (stream, &gdip_gif_inputfunc);
}
-
+#else
+ if (from_file)
+ gif = DGifOpen(stream, &gdip_gif_fileinputfunc, NULL);
+ else
+ gif = DGifOpen(stream, &gdip_gif_inputfunc, NULL);
+#endif
+
if (gif == NULL) {
goto error;
}
@@ -660,11 +669,22 @@ gdip_save_gif_image (void *stream, GpImage *image, BOOL from_file)
return InvalidParameter;
}
+#if GIFLIB_MAJOR < 5
if (from_file) {
fp = EGifOpenFileName (stream, 0);
} else {
fp = EGifOpen (stream, gdip_gif_outputfunc);
}
+#else
+ if (from_file)
+ fp = EGifOpenFileName (stream, 0, NULL);
+ else
+ fp = EGifOpen (stream, gdip_gif_outputfunc, NULL);
+#define MakeMapObject GifMakeMapObject
+#define FreeMapObject GifFreeMapObject
+#define QuantizeBuffer GifQuantizeBuffer
+#define BitSize GifBitSize
+#endif
if (!fp) {
return FileNotFound;
@@ -848,8 +868,15 @@ gdip_save_gif_image (void *stream, GpImage *image, BOOL from_file)
Buffer[0] = 1;
Buffer[1] = ptr[0];
Buffer[2] = ptr[1];
+#if GIFLIB_MAJOR < 5
EGifPutExtensionFirst(fp, APPLICATION_EXT_FUNC_CODE, 11, "NETSCAPE2.0");
EGifPutExtensionLast(fp, APPLICATION_EXT_FUNC_CODE, 3, Buffer);
+#else
+ EGifPutExtensionLeader(fp, APPLICATION_EXT_FUNC_CODE);
+ EGifPutExtensionBlock(fp, 11, "NETSCAPE2.0");
+ EGifPutExtensionBlock(fp, 3, Buffer);
+ EGifPutExtensionTrailer(fp);
+#endif
}
}
......@@ -4,17 +4,17 @@
# maintainer abveritas[at]chakra-project[dot]org>
pkgname=libgnome-keyring
pkgver=3.6.0
pkgver=3.10.1
pkgrel=1
pkgdesc="GNOME keyring client library"
arch=('x86_64')
license=('GPL' 'LGPL')
depends=('dbus-core>=1.4.0' 'libgcrypt>=1.4.6' 'glib2>=2.34.0')
depends=('dbus-core' 'libgcrypt' 'glib2')
makedepends=('intltool' 'gobject-introspection' 'python2')
options=('!libtool' '!emptydirs')
options=('!emptydirs')
url="http://www.gnome.org"
source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.6/${pkgname}-${pkgver}.tar.xz")
md5sums=('4d8a8e81e6f5413c2c0c472380988e6e')
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
md5sums=('9b7834bf6630160878a0aa7cb5df7dfc')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
......
......@@ -4,7 +4,7 @@
# maintainer abveritas@chakra-project.org
pkgname=libgsf
pkgver=1.14.25
pkgver=1.14.28
pkgrel=1
arch=('x86_64')
pkgdesc="The GNOME Structured File Library is a utility library for reading and writing structured file formats"
......@@ -12,9 +12,8 @@ url="http://www.gnome.org/"
license=('GPL' 'LGPL')
depends=('libxml2' 'glib2' 'bzip2')
makedepends=('intltool' 'pkgconfig' 'python2' 'gobject-introspection')
options=('!libtool')
source=("http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/1.14/${pkgname}-${pkgver}.tar.xz")
md5sums=('a66a2c6fc327bc62bebe3f988c4f45f3')
md5sums=('48cc1409951419c5e2be1a16f749adb2')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
......
......@@ -2,14 +2,14 @@
pkgname=libidl2
pkgver=0.8.14
pkgrel=5
pkgrel=6
pkgdesc="A front-end for CORBA 2.2 IDL and Netscape's XPIDL"
arch=('x86_64')
license=('LGPL')
depends=('glib2>=2.32.0' 'texinfo')
depends=('glib2' 'texinfo')
makedepends=('pkgconfig')
install=libidl2.install
options=('!libtool' '!emptydirs')
options=('!emptydirs')
source=("http://ftp.gnome.org/pub/gnome/sources/libIDL/0.8/libIDL-${pkgver}.tar.bz2")
url="http://www.gnome.org"
md5sums=('bb8e10a218fac793a52d404d14adedcb')
......
......@@ -2,14 +2,13 @@
pkgname=libimobiledevice
pkgver=1.1.5
pkgrel=1
pkgrel=
pkgdesc="Is a software library that talks the protocols to support iPhone and iPod Touch devices on Linux"
url="http://libimobiledevice.org/"
arch=('x86_64')
license=('GPL2' 'LGPL2.1')
depends=('gnutls' 'glib2' 'libplist' 'usbmuxd' 'libgcrypt')
makedepends=('python2')
options=('!libtool')
source=("http://libimobiledevice.org/downloads/${pkgname}-${pkgver}.tar.bz2")
md5sums=('d9debdcf71508dee2c85b60b28ccddd4')
......