[arch-commits] Commit in efl/repos (12 files)
Sven-Hendrik Haase
svenstaro at archlinux.org
Sun Oct 16 06:25:18 UTC 2016
Date: Sunday, October 16, 2016 @ 06:25:17
Author: svenstaro
Revision: 278857
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
efl/repos/extra-i686/PKGBUILD
(from rev 278856, efl/trunk/PKGBUILD)
efl/repos/extra-i686/efl-1.10.0-giflib-5.1.0.patch
(from rev 278856, efl/trunk/efl-1.10.0-giflib-5.1.0.patch)
efl/repos/extra-i686/eina_doxygen.patch
(from rev 278856, efl/trunk/eina_doxygen.patch)
efl/repos/extra-x86_64/PKGBUILD
(from rev 278856, efl/trunk/PKGBUILD)
efl/repos/extra-x86_64/efl-1.10.0-giflib-5.1.0.patch
(from rev 278856, efl/trunk/efl-1.10.0-giflib-5.1.0.patch)
efl/repos/extra-x86_64/eina_doxygen.patch
(from rev 278856, efl/trunk/eina_doxygen.patch)
Deleted:
efl/repos/extra-i686/PKGBUILD
efl/repos/extra-i686/efl-1.10.0-giflib-5.1.0.patch
efl/repos/extra-i686/eina_doxygen.patch
efl/repos/extra-x86_64/PKGBUILD
efl/repos/extra-x86_64/efl-1.10.0-giflib-5.1.0.patch
efl/repos/extra-x86_64/eina_doxygen.patch
--------------------------------------------+
/PKGBUILD | 144 +++++++++++++++++++++++++++
/efl-1.10.0-giflib-5.1.0.patch | 78 ++++++++++++++
/eina_doxygen.patch | 20 +++
extra-i686/PKGBUILD | 72 -------------
extra-i686/efl-1.10.0-giflib-5.1.0.patch | 39 -------
extra-i686/eina_doxygen.patch | 10 -
extra-x86_64/PKGBUILD | 72 -------------
extra-x86_64/efl-1.10.0-giflib-5.1.0.patch | 39 -------
extra-x86_64/eina_doxygen.patch | 10 -
9 files changed, 242 insertions(+), 242 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-10-16 06:25:04 UTC (rev 278856)
+++ extra-i686/PKGBUILD 2016-10-16 06:25:17 UTC (rev 278857)
@@ -1,72 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald at archlinux.org>
-# Contributor: Enlightenment Developers <enlightenment-devel at enlightenment.org>
-
-pkgbase=efl
-pkgname=('efl' 'efl-docs')
-pkgver=1.18.0
-pkgrel=1
-pkgdesc="Enlightenment Foundation Libraries"
-arch=('i686' 'x86_64')
-url="http://www.enlightenment.org"
-license=('BSD' 'LGPL2.1' 'GPL2' 'custom')
-depends=('bullet' 'libjpeg-turbo' 'gst-plugins-base'
- 'luajit' 'curl' 'fribidi' 'libpulse' 'libxcomposite'
- 'libxinerama' 'libxrandr' 'libxss' 'libinput'
- 'libxcursor' 'libxp' 'libwebp' 'shared-mime-info'
- 'libxkbcommon' 'wayland' 'lz4' 'openjpeg' 'avahi'
- 'libspectre' 'libraw' 'librsvg' 'vlc')
-optdepends=('python2: einabench-cmp' 'libreoffice: thumbnailing for DOC/PPT/XLS files')
-makedepends=('doxygen' 'python' 'texlive-core' 'ghostscript' 'imagemagick')
-options=('!emptydirs')
-source=(http://download.enlightenment.org/rel/libs/${pkgname}/$pkgname-$pkgver.tar.xz
- 'eina_doxygen.patch')
-sha1sums=('656ccdae1ac02bca2788f9e8a222cdd02bf110ac'
- 'ef2b961e793c711685623a149ab55b1bec9a3676')
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- sed -i 's/env python$/&2/' src/scripts/eina/eina-bench-cmp
-
- # fix docs building
- patch -Np0 -i ${srcdir}/eina_doxygen.patch
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- export CFLAGS="$CFLAGS -fvisibility=hidden"
-
- ./configure --prefix=/usr \
- --disable-static --disable-tslib --enable-fb \
- --enable-xinput22 --enable-multisense --enable-systemd \
- --enable-image-loader-webp --enable-harfbuzz --enable-wayland \
- --enable-liblz4 --enable-drm --enable-elput
-
- make
- make -j1 doc || return 0 # don't fail on the docs
-}
-
-package_efl(){
- replaces=('elementary' 'evas_generic_loaders' 'emotion_generic_players')
-
- cd "${srcdir}/${pkgname}-${pkgver}"
- make -j1 DESTDIR=${pkgdir} install
-
- # install non-standard license files
- install -Dm644 "${srcdir}/${pkgname}-${pkgver}/licenses/COPYING.BSD" \
- "${pkgdir}/usr/share/licenses/${pkgname}/COPYING.BSD"
- install -Dm644 "${srcdir}/${pkgname}-${pkgver}/licenses/COPYING.SMALL" \
- "${pkgdir}/usr/share/licenses/${pkgname}/COPYING.SMALL"
-}
-
-package_efl-docs() {
- pkgdesc="Documentation for the Enlightenment Foundation Libraries"
- depends=()
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- install -d "${pkgdir}/usr/share/doc/${pkgbase}"
- cp -a doc/html "${pkgdir}/usr/share/doc/${pkgbase}/html"
- cp -a doc/latex "${pkgdir}/usr/share/doc/${pkgbase}/latex"
-}
-
Copied: efl/repos/extra-i686/PKGBUILD (from rev 278856, efl/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-10-16 06:25:17 UTC (rev 278857)
@@ -0,0 +1,72 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald at archlinux.org>
+# Contributor: Enlightenment Developers <enlightenment-devel at enlightenment.org>
+
+pkgbase=efl
+pkgname=('efl' 'efl-docs')
+pkgver=1.18.0
+pkgrel=2
+pkgdesc="Enlightenment Foundation Libraries"
+arch=('i686' 'x86_64')
+url="http://www.enlightenment.org"
+license=('BSD' 'LGPL2.1' 'GPL2' 'custom')
+depends=('bullet' 'libjpeg-turbo' 'gst-plugins-base'
+ 'luajit' 'curl' 'fribidi' 'libpulse' 'libxcomposite'
+ 'libxinerama' 'libxrandr' 'libxss' 'libinput'
+ 'libxcursor' 'libxp' 'libwebp' 'shared-mime-info'
+ 'libxkbcommon' 'wayland' 'lz4' 'openjpeg' 'avahi'
+ 'libspectre' 'libraw' 'librsvg' 'vlc')
+optdepends=('python2: einabench-cmp' 'libreoffice: thumbnailing for DOC/PPT/XLS files')
+makedepends=('doxygen' 'python' 'texlive-core' 'ghostscript' 'imagemagick')
+options=('!emptydirs')
+source=(http://download.enlightenment.org/rel/libs/${pkgname}/$pkgname-$pkgver.tar.xz
+ 'eina_doxygen.patch')
+sha1sums=('656ccdae1ac02bca2788f9e8a222cdd02bf110ac'
+ 'ef2b961e793c711685623a149ab55b1bec9a3676')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ sed -i 's/env python$/&2/' src/scripts/eina/eina-bench-cmp
+
+ # fix docs building
+ patch -Np0 -i ${srcdir}/eina_doxygen.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ export CFLAGS="$CFLAGS -fvisibility=hidden"
+
+ ./configure --prefix=/usr \
+ --disable-static --disable-tslib --enable-fb \
+ --enable-xinput22 --enable-multisense --enable-systemd \
+ --enable-image-loader-webp --enable-harfbuzz --enable-wayland \
+ --enable-liblz4 --enable-drm --enable-elput
+
+ make
+ make -j1 doc || return 0 # don't fail on the docs
+}
+
+package_efl(){
+ replaces=('elementary' 'evas_generic_loaders' 'emotion_generic_players')
+
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make -j1 DESTDIR=${pkgdir} install
+
+ # install non-standard license files
+ install -Dm644 "${srcdir}/${pkgname}-${pkgver}/licenses/COPYING.BSD" \
+ "${pkgdir}/usr/share/licenses/${pkgname}/COPYING.BSD"
+ install -Dm644 "${srcdir}/${pkgname}-${pkgver}/licenses/COPYING.SMALL" \
+ "${pkgdir}/usr/share/licenses/${pkgname}/COPYING.SMALL"
+}
+
+package_efl-docs() {
+ pkgdesc="Documentation for the Enlightenment Foundation Libraries"
+ depends=()
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ install -d "${pkgdir}/usr/share/doc/${pkgbase}"
+ cp -a doc/html "${pkgdir}/usr/share/doc/${pkgbase}/html"
+ cp -a doc/latex "${pkgdir}/usr/share/doc/${pkgbase}/latex"
+}
+
Deleted: extra-i686/efl-1.10.0-giflib-5.1.0.patch
===================================================================
--- extra-i686/efl-1.10.0-giflib-5.1.0.patch 2016-10-16 06:25:04 UTC (rev 278856)
+++ extra-i686/efl-1.10.0-giflib-5.1.0.patch 2016-10-16 06:25:17 UTC (rev 278857)
@@ -1,39 +0,0 @@
-diff -rupN a/src/modules/evas/loaders/gif/evas_image_load_gif.c b/src/modules/evas/loaders/gif/evas_image_load_gif.c
---- a/src/modules/evas/loaders/gif/evas_image_load_gif.c 2014-05-19 16:10:12.000000000 +0000
-+++ b/src/modules/evas/loaders/gif/evas_image_load_gif.c 2014-06-01 11:05:50.963850389 +0000
-@@ -528,7 +528,7 @@ evas_image_load_file_head_gif2(void *loa
- ret = EINA_TRUE;
-
- on_error: // jump here on any errors to clean up
-- if (gif) DGifCloseFile(gif);
-+ if (gif) DGifCloseFile(gif, NULL);
- if (fi.map) eina_file_map_free(f, fi.map);
- return ret;
- }
-@@ -606,7 +606,7 @@ open_file:
- // start as we have nothnig to build on
- if ((index > 0) && (index < loader->imgnum) && (animated->animated))
- {
-- if (loader->gif) DGifCloseFile(loader->gif);
-+ if (loader->gif) DGifCloseFile(loader->gif, NULL);
- if ((loader->fi.map) && (loader->f))
- eina_file_map_free(loader->f, loader->fi.map);
- loader->gif = NULL;
-@@ -764,7 +764,7 @@ open_file:
- loader->imgnum = imgnum;
- if ((animated->frame_count <= 1) || (rec == TERMINATE_RECORD_TYPE))
- {
-- if (loader->gif) DGifCloseFile(loader->gif);
-+ if (loader->gif) DGifCloseFile(loader->gif, NULL);
- if ((loader->fi.map) && (loader->f))
- eina_file_map_free(loader->f, loader->fi.map);
- loader->gif = NULL;
-@@ -848,7 +848,7 @@ static void
- evas_image_load_file_close_gif2(void *loader_data)
- {
- Loader_Info *loader = loader_data;
-- if (loader->gif) DGifCloseFile(loader->gif);
-+ if (loader->gif) DGifCloseFile(loader->gif, NULL);
- if ((loader->fi.map) && (loader->f))
- eina_file_map_free(loader->f, loader->fi.map);
- free(loader);
Copied: efl/repos/extra-i686/efl-1.10.0-giflib-5.1.0.patch (from rev 278856, efl/trunk/efl-1.10.0-giflib-5.1.0.patch)
===================================================================
--- extra-i686/efl-1.10.0-giflib-5.1.0.patch (rev 0)
+++ extra-i686/efl-1.10.0-giflib-5.1.0.patch 2016-10-16 06:25:17 UTC (rev 278857)
@@ -0,0 +1,39 @@
+diff -rupN a/src/modules/evas/loaders/gif/evas_image_load_gif.c b/src/modules/evas/loaders/gif/evas_image_load_gif.c
+--- a/src/modules/evas/loaders/gif/evas_image_load_gif.c 2014-05-19 16:10:12.000000000 +0000
++++ b/src/modules/evas/loaders/gif/evas_image_load_gif.c 2014-06-01 11:05:50.963850389 +0000
+@@ -528,7 +528,7 @@ evas_image_load_file_head_gif2(void *loa
+ ret = EINA_TRUE;
+
+ on_error: // jump here on any errors to clean up
+- if (gif) DGifCloseFile(gif);
++ if (gif) DGifCloseFile(gif, NULL);
+ if (fi.map) eina_file_map_free(f, fi.map);
+ return ret;
+ }
+@@ -606,7 +606,7 @@ open_file:
+ // start as we have nothnig to build on
+ if ((index > 0) && (index < loader->imgnum) && (animated->animated))
+ {
+- if (loader->gif) DGifCloseFile(loader->gif);
++ if (loader->gif) DGifCloseFile(loader->gif, NULL);
+ if ((loader->fi.map) && (loader->f))
+ eina_file_map_free(loader->f, loader->fi.map);
+ loader->gif = NULL;
+@@ -764,7 +764,7 @@ open_file:
+ loader->imgnum = imgnum;
+ if ((animated->frame_count <= 1) || (rec == TERMINATE_RECORD_TYPE))
+ {
+- if (loader->gif) DGifCloseFile(loader->gif);
++ if (loader->gif) DGifCloseFile(loader->gif, NULL);
+ if ((loader->fi.map) && (loader->f))
+ eina_file_map_free(loader->f, loader->fi.map);
+ loader->gif = NULL;
+@@ -848,7 +848,7 @@ static void
+ evas_image_load_file_close_gif2(void *loader_data)
+ {
+ Loader_Info *loader = loader_data;
+- if (loader->gif) DGifCloseFile(loader->gif);
++ if (loader->gif) DGifCloseFile(loader->gif, NULL);
+ if ((loader->fi.map) && (loader->f))
+ eina_file_map_free(loader->f, loader->fi.map);
+ free(loader);
Deleted: extra-i686/eina_doxygen.patch
===================================================================
--- extra-i686/eina_doxygen.patch 2016-10-16 06:25:04 UTC (rev 278856)
+++ extra-i686/eina_doxygen.patch 2016-10-16 06:25:17 UTC (rev 278857)
@@ -1,10 +0,0 @@
---- src/lib/eina/eina_hamster.h 2013-02-16 12:52:32.000000000 +0100
-+++ src/lib/eina/eina_hamster.h.new 2014-09-16 22:19:04.820163522 +0200
-@@ -24,7 +24,6 @@
- *
- * @brief These functions provide hamster calls.
- *
-- * @{
- */
-
- /**
Copied: efl/repos/extra-i686/eina_doxygen.patch (from rev 278856, efl/trunk/eina_doxygen.patch)
===================================================================
--- extra-i686/eina_doxygen.patch (rev 0)
+++ extra-i686/eina_doxygen.patch 2016-10-16 06:25:17 UTC (rev 278857)
@@ -0,0 +1,10 @@
+--- src/lib/eina/eina_hamster.h 2013-02-16 12:52:32.000000000 +0100
++++ src/lib/eina/eina_hamster.h.new 2014-09-16 22:19:04.820163522 +0200
+@@ -24,7 +24,6 @@
+ *
+ * @brief These functions provide hamster calls.
+ *
+- * @{
+ */
+
+ /**
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2016-10-16 06:25:04 UTC (rev 278856)
+++ extra-x86_64/PKGBUILD 2016-10-16 06:25:17 UTC (rev 278857)
@@ -1,72 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald at archlinux.org>
-# Contributor: Enlightenment Developers <enlightenment-devel at enlightenment.org>
-
-pkgbase=efl
-pkgname=('efl' 'efl-docs')
-pkgver=1.18.0
-pkgrel=1
-pkgdesc="Enlightenment Foundation Libraries"
-arch=('i686' 'x86_64')
-url="http://www.enlightenment.org"
-license=('BSD' 'LGPL2.1' 'GPL2' 'custom')
-depends=('bullet' 'libjpeg-turbo' 'gst-plugins-base'
- 'luajit' 'curl' 'fribidi' 'libpulse' 'libxcomposite'
- 'libxinerama' 'libxrandr' 'libxss' 'libinput'
- 'libxcursor' 'libxp' 'libwebp' 'shared-mime-info'
- 'libxkbcommon' 'wayland' 'lz4' 'openjpeg' 'avahi'
- 'libspectre' 'libraw' 'librsvg' 'vlc')
-optdepends=('python2: einabench-cmp' 'libreoffice: thumbnailing for DOC/PPT/XLS files')
-makedepends=('doxygen' 'python' 'texlive-core' 'ghostscript' 'imagemagick')
-options=('!emptydirs')
-source=(http://download.enlightenment.org/rel/libs/${pkgname}/$pkgname-$pkgver.tar.xz
- 'eina_doxygen.patch')
-sha1sums=('656ccdae1ac02bca2788f9e8a222cdd02bf110ac'
- 'ef2b961e793c711685623a149ab55b1bec9a3676')
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- sed -i 's/env python$/&2/' src/scripts/eina/eina-bench-cmp
-
- # fix docs building
- patch -Np0 -i ${srcdir}/eina_doxygen.patch
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- export CFLAGS="$CFLAGS -fvisibility=hidden"
-
- ./configure --prefix=/usr \
- --disable-static --disable-tslib --enable-fb \
- --enable-xinput22 --enable-multisense --enable-systemd \
- --enable-image-loader-webp --enable-harfbuzz --enable-wayland \
- --enable-liblz4 --enable-drm --enable-elput
-
- make
- make -j1 doc || return 0 # don't fail on the docs
-}
-
-package_efl(){
- replaces=('elementary' 'evas_generic_loaders' 'emotion_generic_players')
-
- cd "${srcdir}/${pkgname}-${pkgver}"
- make -j1 DESTDIR=${pkgdir} install
-
- # install non-standard license files
- install -Dm644 "${srcdir}/${pkgname}-${pkgver}/licenses/COPYING.BSD" \
- "${pkgdir}/usr/share/licenses/${pkgname}/COPYING.BSD"
- install -Dm644 "${srcdir}/${pkgname}-${pkgver}/licenses/COPYING.SMALL" \
- "${pkgdir}/usr/share/licenses/${pkgname}/COPYING.SMALL"
-}
-
-package_efl-docs() {
- pkgdesc="Documentation for the Enlightenment Foundation Libraries"
- depends=()
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- install -d "${pkgdir}/usr/share/doc/${pkgbase}"
- cp -a doc/html "${pkgdir}/usr/share/doc/${pkgbase}/html"
- cp -a doc/latex "${pkgdir}/usr/share/doc/${pkgbase}/latex"
-}
-
Copied: efl/repos/extra-x86_64/PKGBUILD (from rev 278856, efl/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-10-16 06:25:17 UTC (rev 278857)
@@ -0,0 +1,72 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald at archlinux.org>
+# Contributor: Enlightenment Developers <enlightenment-devel at enlightenment.org>
+
+pkgbase=efl
+pkgname=('efl' 'efl-docs')
+pkgver=1.18.0
+pkgrel=2
+pkgdesc="Enlightenment Foundation Libraries"
+arch=('i686' 'x86_64')
+url="http://www.enlightenment.org"
+license=('BSD' 'LGPL2.1' 'GPL2' 'custom')
+depends=('bullet' 'libjpeg-turbo' 'gst-plugins-base'
+ 'luajit' 'curl' 'fribidi' 'libpulse' 'libxcomposite'
+ 'libxinerama' 'libxrandr' 'libxss' 'libinput'
+ 'libxcursor' 'libxp' 'libwebp' 'shared-mime-info'
+ 'libxkbcommon' 'wayland' 'lz4' 'openjpeg' 'avahi'
+ 'libspectre' 'libraw' 'librsvg' 'vlc')
+optdepends=('python2: einabench-cmp' 'libreoffice: thumbnailing for DOC/PPT/XLS files')
+makedepends=('doxygen' 'python' 'texlive-core' 'ghostscript' 'imagemagick')
+options=('!emptydirs')
+source=(http://download.enlightenment.org/rel/libs/${pkgname}/$pkgname-$pkgver.tar.xz
+ 'eina_doxygen.patch')
+sha1sums=('656ccdae1ac02bca2788f9e8a222cdd02bf110ac'
+ 'ef2b961e793c711685623a149ab55b1bec9a3676')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ sed -i 's/env python$/&2/' src/scripts/eina/eina-bench-cmp
+
+ # fix docs building
+ patch -Np0 -i ${srcdir}/eina_doxygen.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ export CFLAGS="$CFLAGS -fvisibility=hidden"
+
+ ./configure --prefix=/usr \
+ --disable-static --disable-tslib --enable-fb \
+ --enable-xinput22 --enable-multisense --enable-systemd \
+ --enable-image-loader-webp --enable-harfbuzz --enable-wayland \
+ --enable-liblz4 --enable-drm --enable-elput
+
+ make
+ make -j1 doc || return 0 # don't fail on the docs
+}
+
+package_efl(){
+ replaces=('elementary' 'evas_generic_loaders' 'emotion_generic_players')
+
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make -j1 DESTDIR=${pkgdir} install
+
+ # install non-standard license files
+ install -Dm644 "${srcdir}/${pkgname}-${pkgver}/licenses/COPYING.BSD" \
+ "${pkgdir}/usr/share/licenses/${pkgname}/COPYING.BSD"
+ install -Dm644 "${srcdir}/${pkgname}-${pkgver}/licenses/COPYING.SMALL" \
+ "${pkgdir}/usr/share/licenses/${pkgname}/COPYING.SMALL"
+}
+
+package_efl-docs() {
+ pkgdesc="Documentation for the Enlightenment Foundation Libraries"
+ depends=()
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ install -d "${pkgdir}/usr/share/doc/${pkgbase}"
+ cp -a doc/html "${pkgdir}/usr/share/doc/${pkgbase}/html"
+ cp -a doc/latex "${pkgdir}/usr/share/doc/${pkgbase}/latex"
+}
+
Deleted: extra-x86_64/efl-1.10.0-giflib-5.1.0.patch
===================================================================
--- extra-x86_64/efl-1.10.0-giflib-5.1.0.patch 2016-10-16 06:25:04 UTC (rev 278856)
+++ extra-x86_64/efl-1.10.0-giflib-5.1.0.patch 2016-10-16 06:25:17 UTC (rev 278857)
@@ -1,39 +0,0 @@
-diff -rupN a/src/modules/evas/loaders/gif/evas_image_load_gif.c b/src/modules/evas/loaders/gif/evas_image_load_gif.c
---- a/src/modules/evas/loaders/gif/evas_image_load_gif.c 2014-05-19 16:10:12.000000000 +0000
-+++ b/src/modules/evas/loaders/gif/evas_image_load_gif.c 2014-06-01 11:05:50.963850389 +0000
-@@ -528,7 +528,7 @@ evas_image_load_file_head_gif2(void *loa
- ret = EINA_TRUE;
-
- on_error: // jump here on any errors to clean up
-- if (gif) DGifCloseFile(gif);
-+ if (gif) DGifCloseFile(gif, NULL);
- if (fi.map) eina_file_map_free(f, fi.map);
- return ret;
- }
-@@ -606,7 +606,7 @@ open_file:
- // start as we have nothnig to build on
- if ((index > 0) && (index < loader->imgnum) && (animated->animated))
- {
-- if (loader->gif) DGifCloseFile(loader->gif);
-+ if (loader->gif) DGifCloseFile(loader->gif, NULL);
- if ((loader->fi.map) && (loader->f))
- eina_file_map_free(loader->f, loader->fi.map);
- loader->gif = NULL;
-@@ -764,7 +764,7 @@ open_file:
- loader->imgnum = imgnum;
- if ((animated->frame_count <= 1) || (rec == TERMINATE_RECORD_TYPE))
- {
-- if (loader->gif) DGifCloseFile(loader->gif);
-+ if (loader->gif) DGifCloseFile(loader->gif, NULL);
- if ((loader->fi.map) && (loader->f))
- eina_file_map_free(loader->f, loader->fi.map);
- loader->gif = NULL;
-@@ -848,7 +848,7 @@ static void
- evas_image_load_file_close_gif2(void *loader_data)
- {
- Loader_Info *loader = loader_data;
-- if (loader->gif) DGifCloseFile(loader->gif);
-+ if (loader->gif) DGifCloseFile(loader->gif, NULL);
- if ((loader->fi.map) && (loader->f))
- eina_file_map_free(loader->f, loader->fi.map);
- free(loader);
Copied: efl/repos/extra-x86_64/efl-1.10.0-giflib-5.1.0.patch (from rev 278856, efl/trunk/efl-1.10.0-giflib-5.1.0.patch)
===================================================================
--- extra-x86_64/efl-1.10.0-giflib-5.1.0.patch (rev 0)
+++ extra-x86_64/efl-1.10.0-giflib-5.1.0.patch 2016-10-16 06:25:17 UTC (rev 278857)
@@ -0,0 +1,39 @@
+diff -rupN a/src/modules/evas/loaders/gif/evas_image_load_gif.c b/src/modules/evas/loaders/gif/evas_image_load_gif.c
+--- a/src/modules/evas/loaders/gif/evas_image_load_gif.c 2014-05-19 16:10:12.000000000 +0000
++++ b/src/modules/evas/loaders/gif/evas_image_load_gif.c 2014-06-01 11:05:50.963850389 +0000
+@@ -528,7 +528,7 @@ evas_image_load_file_head_gif2(void *loa
+ ret = EINA_TRUE;
+
+ on_error: // jump here on any errors to clean up
+- if (gif) DGifCloseFile(gif);
++ if (gif) DGifCloseFile(gif, NULL);
+ if (fi.map) eina_file_map_free(f, fi.map);
+ return ret;
+ }
+@@ -606,7 +606,7 @@ open_file:
+ // start as we have nothnig to build on
+ if ((index > 0) && (index < loader->imgnum) && (animated->animated))
+ {
+- if (loader->gif) DGifCloseFile(loader->gif);
++ if (loader->gif) DGifCloseFile(loader->gif, NULL);
+ if ((loader->fi.map) && (loader->f))
+ eina_file_map_free(loader->f, loader->fi.map);
+ loader->gif = NULL;
+@@ -764,7 +764,7 @@ open_file:
+ loader->imgnum = imgnum;
+ if ((animated->frame_count <= 1) || (rec == TERMINATE_RECORD_TYPE))
+ {
+- if (loader->gif) DGifCloseFile(loader->gif);
++ if (loader->gif) DGifCloseFile(loader->gif, NULL);
+ if ((loader->fi.map) && (loader->f))
+ eina_file_map_free(loader->f, loader->fi.map);
+ loader->gif = NULL;
+@@ -848,7 +848,7 @@ static void
+ evas_image_load_file_close_gif2(void *loader_data)
+ {
+ Loader_Info *loader = loader_data;
+- if (loader->gif) DGifCloseFile(loader->gif);
++ if (loader->gif) DGifCloseFile(loader->gif, NULL);
+ if ((loader->fi.map) && (loader->f))
+ eina_file_map_free(loader->f, loader->fi.map);
+ free(loader);
Deleted: extra-x86_64/eina_doxygen.patch
===================================================================
--- extra-x86_64/eina_doxygen.patch 2016-10-16 06:25:04 UTC (rev 278856)
+++ extra-x86_64/eina_doxygen.patch 2016-10-16 06:25:17 UTC (rev 278857)
@@ -1,10 +0,0 @@
---- src/lib/eina/eina_hamster.h 2013-02-16 12:52:32.000000000 +0100
-+++ src/lib/eina/eina_hamster.h.new 2014-09-16 22:19:04.820163522 +0200
-@@ -24,7 +24,6 @@
- *
- * @brief These functions provide hamster calls.
- *
-- * @{
- */
-
- /**
Copied: efl/repos/extra-x86_64/eina_doxygen.patch (from rev 278856, efl/trunk/eina_doxygen.patch)
===================================================================
--- extra-x86_64/eina_doxygen.patch (rev 0)
+++ extra-x86_64/eina_doxygen.patch 2016-10-16 06:25:17 UTC (rev 278857)
@@ -0,0 +1,10 @@
+--- src/lib/eina/eina_hamster.h 2013-02-16 12:52:32.000000000 +0100
++++ src/lib/eina/eina_hamster.h.new 2014-09-16 22:19:04.820163522 +0200
+@@ -24,7 +24,6 @@
+ *
+ * @brief These functions provide hamster calls.
+ *
+- * @{
+ */
+
+ /**
More information about the arch-commits
mailing list