[arch-commits] Commit in efl/repos/extra-i686 (8 files)

Ronald van Haren ronald at archlinux.org
Tue Dec 23 16:08:42 UTC 2014


    Date: Tuesday, December 23, 2014 @ 17:08:42
  Author: ronald
Revision: 227962

archrelease: copy trunk to extra-i686

Added:
  efl/repos/extra-i686/PKGBUILD
    (from rev 227961, efl/trunk/PKGBUILD)
  efl/repos/extra-i686/efl-1.10.0-giflib-5.1.0.patch
    (from rev 227961, efl/trunk/efl-1.10.0-giflib-5.1.0.patch)
  efl/repos/extra-i686/efl.install
    (from rev 227961, efl/trunk/efl.install)
  efl/repos/extra-i686/eina_doxygen.patch
    (from rev 227961, 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/efl.install
  efl/repos/extra-i686/eina_doxygen.patch

-------------------------------+
 PKGBUILD                      |  144 ++++++++++++++++++++--------------------
 efl-1.10.0-giflib-5.1.0.patch |   78 ++++++++++-----------
 efl.install                   |   32 ++++----
 eina_doxygen.patch            |   20 ++---
 4 files changed, 137 insertions(+), 137 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2014-12-23 16:02:11 UTC (rev 227961)
+++ PKGBUILD	2014-12-23 16:08:42 UTC (rev 227962)
@@ -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.12.1
-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'
-         'libxcursor' 'libxp' 'libwebp' 'shared-mime-info'
-         'libxkbcommon' 'wayland' 'lz4')
-optdepends=('python2: einabench-cmp')
-makedepends=('doxygen' 'python' 'texlive-core' 'ghostscript')
-replaces=('ecore' 'edje' 'eet' 'eeze' 'efreet' 'eina' 'eio' 'embryo'
-          'emotion' 'ethumb' 'evas')
-options=('!emptydirs')
-source=(http://download.enlightenment.org/rel/libs/${pkgname}/$pkgname-$pkgver.tar.xz
-	'eina_doxygen.patch')
-install=efl.install
-sha1sums=('578f99e4e8f8914819cc822e81689543060f7baf'
-          '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
-
-  make
-  make -j1 doc
-}
-
-package_efl(){
-  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 227961, efl/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2014-12-23 16:08:42 UTC (rev 227962)
@@ -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.12.2
+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'
+         'libxcursor' 'libxp' 'libwebp' 'shared-mime-info'
+         'libxkbcommon' 'wayland' 'lz4' 'openjpeg' 'avahi')
+optdepends=('python2: einabench-cmp')
+makedepends=('doxygen' 'python' 'texlive-core' 'ghostscript')
+replaces=('ecore' 'edje' 'eet' 'eeze' 'efreet' 'eina' 'eio' 'embryo'
+          'emotion' 'ethumb' 'evas')
+options=('!emptydirs')
+source=(http://download.enlightenment.org/rel/libs/${pkgname}/$pkgname-$pkgver.tar.xz
+	'eina_doxygen.patch')
+install=efl.install
+sha1sums=('86afc95ae8ad14b48d7312e4fe58279fe4577a47'
+          '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
+
+  make
+  make -j1 doc
+}
+
+package_efl(){
+  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: efl-1.10.0-giflib-5.1.0.patch
===================================================================
--- efl-1.10.0-giflib-5.1.0.patch	2014-12-23 16:02:11 UTC (rev 227961)
+++ efl-1.10.0-giflib-5.1.0.patch	2014-12-23 16:08:42 UTC (rev 227962)
@@ -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 227961, efl/trunk/efl-1.10.0-giflib-5.1.0.patch)
===================================================================
--- efl-1.10.0-giflib-5.1.0.patch	                        (rev 0)
+++ efl-1.10.0-giflib-5.1.0.patch	2014-12-23 16:08:42 UTC (rev 227962)
@@ -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: efl.install
===================================================================
--- efl.install	2014-12-23 16:02:11 UTC (rev 227961)
+++ efl.install	2014-12-23 16:08:42 UTC (rev 227962)
@@ -1,16 +0,0 @@
-post_install() {
-  update-mime-database usr/share/mime > /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-
-
-
-

Copied: efl/repos/extra-i686/efl.install (from rev 227961, efl/trunk/efl.install)
===================================================================
--- efl.install	                        (rev 0)
+++ efl.install	2014-12-23 16:08:42 UTC (rev 227962)
@@ -0,0 +1,16 @@
+post_install() {
+  update-mime-database usr/share/mime > /dev/null
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+
+
+
+
+

Deleted: eina_doxygen.patch
===================================================================
--- eina_doxygen.patch	2014-12-23 16:02:11 UTC (rev 227961)
+++ eina_doxygen.patch	2014-12-23 16:08:42 UTC (rev 227962)
@@ -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 227961, efl/trunk/eina_doxygen.patch)
===================================================================
--- eina_doxygen.patch	                        (rev 0)
+++ eina_doxygen.patch	2014-12-23 16:08:42 UTC (rev 227962)
@@ -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