[arch-commits] Commit in edje/trunk (PKGBUILD changeset_76449.diff)

[Ronald van Haren]

    Date: Wednesday, November 21, 2012 @ 15:20:58
  Author: ronald
Revision: 171860

upgpkg: edje 1.7.1-2

add backport for enlightenment17 alpha4

Added:
  edje/trunk/changeset_76449.diff
Modified:
  edje/trunk/PKGBUILD

----------------------+
 PKGBUILD             |   10 +++++++---
 changeset_76449.diff |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-11-21 20:10:14 UTC (rev 171859)
+++ PKGBUILD	2012-11-21 20:20:58 UTC (rev 171860)
@@ -9,15 +9,19 @@
 arch=('i686' 'x86_64')
 url="http://www.enlightenment.org"
 license=('BSD')
-depends=('eina' 'ecore' 'evas' 'eio' 'lua51' 'shared-mime-info' 'embryo')
+depends=('eina' 'ecore' 'evas' 'eio' 'lua' 'shared-mime-info' 'embryo')
 optdepends=('python2: inkscape2edc')
 install=edje.install
 options=('!libtool' '!emptydirs')
-source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('65e983041fa4405f14c23239d35dcce65ac1bbe4')
+source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz
+	changeset_76449.diff)
+sha1sums=('65e983041fa4405f14c23239d35dcce65ac1bbe4'
+          '032b96634bdd6bacba0b2cec87d648f54f9ebc05')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
+
+  patch -Np3 -i ${srcdir}/changeset_76449.diff
   
   export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
   export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"

Added: changeset_76449.diff
===================================================================
--- changeset_76449.diff	                        (rev 0)
+++ changeset_76449.diff	2012-11-21 20:20:58 UTC (rev 171860)
@@ -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;