Date: Saturday, December 22, 2012 @ 11:23:23 Author: ronald Revision: 173756
archrelease: copy trunk to extra-i686, extra-x86_64 Added: edje/repos/extra-i686/PKGBUILD (from rev 173755, edje/trunk/PKGBUILD) edje/repos/extra-i686/changeset_76449.diff (from rev 173755, edje/trunk/changeset_76449.diff) edje/repos/extra-i686/edje.install (from rev 173755, edje/trunk/edje.install) edje/repos/extra-x86_64/PKGBUILD (from rev 173755, edje/trunk/PKGBUILD) edje/repos/extra-x86_64/changeset_76449.diff (from rev 173755, edje/trunk/changeset_76449.diff) edje/repos/extra-x86_64/edje.install (from rev 173755, edje/trunk/edje.install) Deleted: edje/repos/extra-i686/PKGBUILD edje/repos/extra-i686/changeset_76449.diff edje/repos/extra-i686/edje.install edje/repos/extra-x86_64/PKGBUILD edje/repos/extra-x86_64/changeset_76449.diff edje/repos/extra-x86_64/edje.install -----------------------------------+ extra-i686/PKGBUILD | 104 ++++++++++++++++++------------------ extra-i686/changeset_76449.diff | 92 +++++++++++++++---------------- extra-i686/edje.install | 32 +++++------ extra-x86_64/PKGBUILD | 104 ++++++++++++++++++------------------ extra-x86_64/changeset_76449.diff | 92 +++++++++++++++---------------- extra-x86_64/edje.install | 32 +++++------ 6 files changed, 228 insertions(+), 228 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2012-12-22 16:22:44 UTC (rev 173755) +++ extra-i686/PKGBUILD 2012-12-22 16:23:23 UTC (rev 173756) @@ -1,52 +0,0 @@ -# $Id$ -# Maintainer: Ronald van Haren <ron...@archlinux.org> -# Contributor: Gustavo Sverzut Barbieri <barbi...@gmail.com> - -pkgname=edje -pkgver=1.7.3 -pkgrel=2 -pkgdesc="A graphical design and layout library based on Evas" -arch=('i686' 'x86_64') -url="http://www.enlightenment.org" -license=('BSD') -depends=('eina' 'ecore' 'evas' 'eio' 'lua51' 'shared-mime-info' 'embryo') -optdepends=('python2: inkscape2edc') -install=edje.install -options=('!libtool' '!emptydirs') -source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('7882ee5cdf67a53a543b06d27a9f06f833b1b5da') - -build() { - cd $srcdir/$pkgname-$pkgver - - export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}" - export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}" - export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed ${LDFLAGS}" - - # python2 fix - sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' utils/inkscape2edc - - ./configure \ - --prefix=/usr \ - --disable-static \ - --disable-sndfile \ - --disable-remix \ - --disable-vorbisenc \ - --disable-alsa \ - --disable-flac \ - --disable-tests \ - --disable-coverage \ - --enable-amalgamation \ - --disable-doc - make -} - -package(){ - cd $srcdir/$pkgname-$pkgver - - make DESTDIR=$pkgdir install - - # install license files - install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \ - $pkgdir/usr/share/licenses/$pkgname/COPYING -} Copied: edje/repos/extra-i686/PKGBUILD (from rev 173755, edje/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2012-12-22 16:23:23 UTC (rev 173756) @@ -0,0 +1,52 @@ +# $Id$ +# Maintainer: Ronald van Haren <ron...@archlinux.org> +# Contributor: Gustavo Sverzut Barbieri <barbi...@gmail.com> + +pkgname=edje +pkgver=1.7.4 +pkgrel=1 +pkgdesc="A graphical design and layout library based on Evas" +arch=('i686' 'x86_64') +url="http://www.enlightenment.org" +license=('BSD') +depends=('eina' 'ecore' 'evas' 'eio' 'lua51' 'shared-mime-info' 'embryo') +optdepends=('python2: inkscape2edc') +install=edje.install +options=('!libtool' '!emptydirs') +source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) +sha1sums=('a5138ea6cf94a4219a542b571ef17cfc70b32711') + +build() { + cd $srcdir/$pkgname-$pkgver + + export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}" + export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}" + export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed ${LDFLAGS}" + + # python2 fix + sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' utils/inkscape2edc + + ./configure \ + --prefix=/usr \ + --disable-static \ + --disable-sndfile \ + --disable-remix \ + --disable-vorbisenc \ + --disable-alsa \ + --disable-flac \ + --disable-tests \ + --disable-coverage \ + --enable-amalgamation \ + --disable-doc + make +} + +package(){ + cd $srcdir/$pkgname-$pkgver + + make DESTDIR=$pkgdir install + + # install license files + install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \ + $pkgdir/usr/share/licenses/$pkgname/COPYING +} Deleted: extra-i686/changeset_76449.diff =================================================================== --- extra-i686/changeset_76449.diff 2012-12-22 16:22:44 UTC (rev 173755) +++ extra-i686/changeset_76449.diff 2012-12-22 16:23:23 UTC (rev 173756) @@ -1,46 +0,0 @@ -Index: /trunk/edje/src/bin/edje_cc_out.c -=================================================================== ---- /trunk/edje/src/bin/edje_cc_out.c (revision 76448) -+++ /trunk/edje/src/bin/edje_cc_out.c (revision 76449) -@@ -1882,25 +1882,30 @@ - for (i = 0 ; i < pc->programs.fnmatch_count ; i++) - { -- if (!strcmp(pl->u.ep->name, pc->programs.fnmatch[i]->name)) -+ if (pl->u.ep->name && pc->programs.fnmatch[i]->name && -+ !strcmp(pl->u.ep->name, pc->programs.fnmatch[i]->name)) - data_queue_anonymous_lookup(pc, pc->programs.fnmatch[i], dest); - } - for (i = 0 ; i < pc->programs.strcmp_count ; i++) - { -- if (!strcmp(pl->u.ep->name, pc->programs.strcmp[i]->name)) -+ if (pl->u.ep->name && pc->programs.strcmp[i]->name && -+ !strcmp(pl->u.ep->name, pc->programs.strcmp[i]->name)) - data_queue_anonymous_lookup(pc, pc->programs.strcmp[i], dest); - } - for (i = 0 ; i < pc->programs.strncmp_count ; i++) - { -- if (!strcmp(pl->u.ep->name, pc->programs.strncmp[i]->name)) -+ if (pl->u.ep->name && pc->programs.strncmp[i]->name && -+ !strcmp(pl->u.ep->name, pc->programs.strncmp[i]->name)) - data_queue_anonymous_lookup(pc, pc->programs.strncmp[i], dest); - } - for (i = 0 ; i < pc->programs.strrncmp_count ; i++) - { -- if (!strcmp(pl->u.ep->name, pc->programs.strrncmp[i]->name)) -+ if (pl->u.ep->name && pc->programs.strrncmp[i]->name && -+ !strcmp(pl->u.ep->name, pc->programs.strrncmp[i]->name)) - data_queue_anonymous_lookup(pc, pc->programs.strrncmp[i], dest); - } - for (i = 0 ; i < pc->programs.nocmp_count ; i++) - { -- if (!strcmp(pl->u.ep->name, pc->programs.nocmp[i]->name)) -+ if (pl->u.ep->name && pc->programs.nocmp[i]->name && -+ !strcmp(pl->u.ep->name, pc->programs.nocmp[i]->name)) - data_queue_anonymous_lookup(pc, pc->programs.nocmp[i], dest); - } -@@ -2450,4 +2455,5 @@ - { - Code_Lookup *cl; -+ - cl = mem_alloc(SZ(Code_Lookup)); - cl->ptr = ptr; Copied: edje/repos/extra-i686/changeset_76449.diff (from rev 173755, edje/trunk/changeset_76449.diff) =================================================================== --- extra-i686/changeset_76449.diff (rev 0) +++ extra-i686/changeset_76449.diff 2012-12-22 16:23:23 UTC (rev 173756) @@ -0,0 +1,46 @@ +Index: /trunk/edje/src/bin/edje_cc_out.c +=================================================================== +--- /trunk/edje/src/bin/edje_cc_out.c (revision 76448) ++++ /trunk/edje/src/bin/edje_cc_out.c (revision 76449) +@@ -1882,25 +1882,30 @@ + for (i = 0 ; i < pc->programs.fnmatch_count ; i++) + { +- if (!strcmp(pl->u.ep->name, pc->programs.fnmatch[i]->name)) ++ if (pl->u.ep->name && pc->programs.fnmatch[i]->name && ++ !strcmp(pl->u.ep->name, pc->programs.fnmatch[i]->name)) + data_queue_anonymous_lookup(pc, pc->programs.fnmatch[i], dest); + } + for (i = 0 ; i < pc->programs.strcmp_count ; i++) + { +- if (!strcmp(pl->u.ep->name, pc->programs.strcmp[i]->name)) ++ if (pl->u.ep->name && pc->programs.strcmp[i]->name && ++ !strcmp(pl->u.ep->name, pc->programs.strcmp[i]->name)) + data_queue_anonymous_lookup(pc, pc->programs.strcmp[i], dest); + } + for (i = 0 ; i < pc->programs.strncmp_count ; i++) + { +- if (!strcmp(pl->u.ep->name, pc->programs.strncmp[i]->name)) ++ if (pl->u.ep->name && pc->programs.strncmp[i]->name && ++ !strcmp(pl->u.ep->name, pc->programs.strncmp[i]->name)) + data_queue_anonymous_lookup(pc, pc->programs.strncmp[i], dest); + } + for (i = 0 ; i < pc->programs.strrncmp_count ; i++) + { +- if (!strcmp(pl->u.ep->name, pc->programs.strrncmp[i]->name)) ++ if (pl->u.ep->name && pc->programs.strrncmp[i]->name && ++ !strcmp(pl->u.ep->name, pc->programs.strrncmp[i]->name)) + data_queue_anonymous_lookup(pc, pc->programs.strrncmp[i], dest); + } + for (i = 0 ; i < pc->programs.nocmp_count ; i++) + { +- if (!strcmp(pl->u.ep->name, pc->programs.nocmp[i]->name)) ++ if (pl->u.ep->name && pc->programs.nocmp[i]->name && ++ !strcmp(pl->u.ep->name, pc->programs.nocmp[i]->name)) + data_queue_anonymous_lookup(pc, pc->programs.nocmp[i], dest); + } +@@ -2450,4 +2455,5 @@ + { + Code_Lookup *cl; ++ + cl = mem_alloc(SZ(Code_Lookup)); + cl->ptr = ptr; Deleted: extra-i686/edje.install =================================================================== --- extra-i686/edje.install 2012-12-22 16:22:44 UTC (rev 173755) +++ extra-i686/edje.install 2012-12-22 16:23:23 UTC (rev 173756) @@ -1,16 +0,0 @@ -post_install() { - update-mime-database usr/share/mime > /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - - - - - Copied: edje/repos/extra-i686/edje.install (from rev 173755, edje/trunk/edje.install) =================================================================== --- extra-i686/edje.install (rev 0) +++ extra-i686/edje.install 2012-12-22 16:23:23 UTC (rev 173756) @@ -0,0 +1,16 @@ +post_install() { + update-mime-database usr/share/mime > /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + + + + + Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2012-12-22 16:22:44 UTC (rev 173755) +++ extra-x86_64/PKGBUILD 2012-12-22 16:23:23 UTC (rev 173756) @@ -1,52 +0,0 @@ -# $Id$ -# Maintainer: Ronald van Haren <ron...@archlinux.org> -# Contributor: Gustavo Sverzut Barbieri <barbi...@gmail.com> - -pkgname=edje -pkgver=1.7.3 -pkgrel=2 -pkgdesc="A graphical design and layout library based on Evas" -arch=('i686' 'x86_64') -url="http://www.enlightenment.org" -license=('BSD') -depends=('eina' 'ecore' 'evas' 'eio' 'lua51' 'shared-mime-info' 'embryo') -optdepends=('python2: inkscape2edc') -install=edje.install -options=('!libtool' '!emptydirs') -source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('7882ee5cdf67a53a543b06d27a9f06f833b1b5da') - -build() { - cd $srcdir/$pkgname-$pkgver - - export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}" - export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}" - export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed ${LDFLAGS}" - - # python2 fix - sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' utils/inkscape2edc - - ./configure \ - --prefix=/usr \ - --disable-static \ - --disable-sndfile \ - --disable-remix \ - --disable-vorbisenc \ - --disable-alsa \ - --disable-flac \ - --disable-tests \ - --disable-coverage \ - --enable-amalgamation \ - --disable-doc - make -} - -package(){ - cd $srcdir/$pkgname-$pkgver - - make DESTDIR=$pkgdir install - - # install license files - install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \ - $pkgdir/usr/share/licenses/$pkgname/COPYING -} Copied: edje/repos/extra-x86_64/PKGBUILD (from rev 173755, edje/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2012-12-22 16:23:23 UTC (rev 173756) @@ -0,0 +1,52 @@ +# $Id$ +# Maintainer: Ronald van Haren <ron...@archlinux.org> +# Contributor: Gustavo Sverzut Barbieri <barbi...@gmail.com> + +pkgname=edje +pkgver=1.7.4 +pkgrel=1 +pkgdesc="A graphical design and layout library based on Evas" +arch=('i686' 'x86_64') +url="http://www.enlightenment.org" +license=('BSD') +depends=('eina' 'ecore' 'evas' 'eio' 'lua51' 'shared-mime-info' 'embryo') +optdepends=('python2: inkscape2edc') +install=edje.install +options=('!libtool' '!emptydirs') +source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) +sha1sums=('a5138ea6cf94a4219a542b571ef17cfc70b32711') + +build() { + cd $srcdir/$pkgname-$pkgver + + export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}" + export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}" + export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed ${LDFLAGS}" + + # python2 fix + sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' utils/inkscape2edc + + ./configure \ + --prefix=/usr \ + --disable-static \ + --disable-sndfile \ + --disable-remix \ + --disable-vorbisenc \ + --disable-alsa \ + --disable-flac \ + --disable-tests \ + --disable-coverage \ + --enable-amalgamation \ + --disable-doc + make +} + +package(){ + cd $srcdir/$pkgname-$pkgver + + make DESTDIR=$pkgdir install + + # install license files + install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \ + $pkgdir/usr/share/licenses/$pkgname/COPYING +} Deleted: extra-x86_64/changeset_76449.diff =================================================================== --- extra-x86_64/changeset_76449.diff 2012-12-22 16:22:44 UTC (rev 173755) +++ extra-x86_64/changeset_76449.diff 2012-12-22 16:23:23 UTC (rev 173756) @@ -1,46 +0,0 @@ -Index: /trunk/edje/src/bin/edje_cc_out.c -=================================================================== ---- /trunk/edje/src/bin/edje_cc_out.c (revision 76448) -+++ /trunk/edje/src/bin/edje_cc_out.c (revision 76449) -@@ -1882,25 +1882,30 @@ - for (i = 0 ; i < pc->programs.fnmatch_count ; i++) - { -- if (!strcmp(pl->u.ep->name, pc->programs.fnmatch[i]->name)) -+ if (pl->u.ep->name && pc->programs.fnmatch[i]->name && -+ !strcmp(pl->u.ep->name, pc->programs.fnmatch[i]->name)) - data_queue_anonymous_lookup(pc, pc->programs.fnmatch[i], dest); - } - for (i = 0 ; i < pc->programs.strcmp_count ; i++) - { -- if (!strcmp(pl->u.ep->name, pc->programs.strcmp[i]->name)) -+ if (pl->u.ep->name && pc->programs.strcmp[i]->name && -+ !strcmp(pl->u.ep->name, pc->programs.strcmp[i]->name)) - data_queue_anonymous_lookup(pc, pc->programs.strcmp[i], dest); - } - for (i = 0 ; i < pc->programs.strncmp_count ; i++) - { -- if (!strcmp(pl->u.ep->name, pc->programs.strncmp[i]->name)) -+ if (pl->u.ep->name && pc->programs.strncmp[i]->name && -+ !strcmp(pl->u.ep->name, pc->programs.strncmp[i]->name)) - data_queue_anonymous_lookup(pc, pc->programs.strncmp[i], dest); - } - for (i = 0 ; i < pc->programs.strrncmp_count ; i++) - { -- if (!strcmp(pl->u.ep->name, pc->programs.strrncmp[i]->name)) -+ if (pl->u.ep->name && pc->programs.strrncmp[i]->name && -+ !strcmp(pl->u.ep->name, pc->programs.strrncmp[i]->name)) - data_queue_anonymous_lookup(pc, pc->programs.strrncmp[i], dest); - } - for (i = 0 ; i < pc->programs.nocmp_count ; i++) - { -- if (!strcmp(pl->u.ep->name, pc->programs.nocmp[i]->name)) -+ if (pl->u.ep->name && pc->programs.nocmp[i]->name && -+ !strcmp(pl->u.ep->name, pc->programs.nocmp[i]->name)) - data_queue_anonymous_lookup(pc, pc->programs.nocmp[i], dest); - } -@@ -2450,4 +2455,5 @@ - { - Code_Lookup *cl; -+ - cl = mem_alloc(SZ(Code_Lookup)); - cl->ptr = ptr; Copied: edje/repos/extra-x86_64/changeset_76449.diff (from rev 173755, edje/trunk/changeset_76449.diff) =================================================================== --- extra-x86_64/changeset_76449.diff (rev 0) +++ extra-x86_64/changeset_76449.diff 2012-12-22 16:23:23 UTC (rev 173756) @@ -0,0 +1,46 @@ +Index: /trunk/edje/src/bin/edje_cc_out.c +=================================================================== +--- /trunk/edje/src/bin/edje_cc_out.c (revision 76448) ++++ /trunk/edje/src/bin/edje_cc_out.c (revision 76449) +@@ -1882,25 +1882,30 @@ + for (i = 0 ; i < pc->programs.fnmatch_count ; i++) + { +- if (!strcmp(pl->u.ep->name, pc->programs.fnmatch[i]->name)) ++ if (pl->u.ep->name && pc->programs.fnmatch[i]->name && ++ !strcmp(pl->u.ep->name, pc->programs.fnmatch[i]->name)) + data_queue_anonymous_lookup(pc, pc->programs.fnmatch[i], dest); + } + for (i = 0 ; i < pc->programs.strcmp_count ; i++) + { +- if (!strcmp(pl->u.ep->name, pc->programs.strcmp[i]->name)) ++ if (pl->u.ep->name && pc->programs.strcmp[i]->name && ++ !strcmp(pl->u.ep->name, pc->programs.strcmp[i]->name)) + data_queue_anonymous_lookup(pc, pc->programs.strcmp[i], dest); + } + for (i = 0 ; i < pc->programs.strncmp_count ; i++) + { +- if (!strcmp(pl->u.ep->name, pc->programs.strncmp[i]->name)) ++ if (pl->u.ep->name && pc->programs.strncmp[i]->name && ++ !strcmp(pl->u.ep->name, pc->programs.strncmp[i]->name)) + data_queue_anonymous_lookup(pc, pc->programs.strncmp[i], dest); + } + for (i = 0 ; i < pc->programs.strrncmp_count ; i++) + { +- if (!strcmp(pl->u.ep->name, pc->programs.strrncmp[i]->name)) ++ if (pl->u.ep->name && pc->programs.strrncmp[i]->name && ++ !strcmp(pl->u.ep->name, pc->programs.strrncmp[i]->name)) + data_queue_anonymous_lookup(pc, pc->programs.strrncmp[i], dest); + } + for (i = 0 ; i < pc->programs.nocmp_count ; i++) + { +- if (!strcmp(pl->u.ep->name, pc->programs.nocmp[i]->name)) ++ if (pl->u.ep->name && pc->programs.nocmp[i]->name && ++ !strcmp(pl->u.ep->name, pc->programs.nocmp[i]->name)) + data_queue_anonymous_lookup(pc, pc->programs.nocmp[i], dest); + } +@@ -2450,4 +2455,5 @@ + { + Code_Lookup *cl; ++ + cl = mem_alloc(SZ(Code_Lookup)); + cl->ptr = ptr; Deleted: extra-x86_64/edje.install =================================================================== --- extra-x86_64/edje.install 2012-12-22 16:22:44 UTC (rev 173755) +++ extra-x86_64/edje.install 2012-12-22 16:23:23 UTC (rev 173756) @@ -1,16 +0,0 @@ -post_install() { - update-mime-database usr/share/mime > /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - - - - - Copied: edje/repos/extra-x86_64/edje.install (from rev 173755, edje/trunk/edje.install) =================================================================== --- extra-x86_64/edje.install (rev 0) +++ extra-x86_64/edje.install 2012-12-22 16:23:23 UTC (rev 173756) @@ -0,0 +1,16 @@ +post_install() { + update-mime-database usr/share/mime > /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + + + + +