Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/allegro/PKGBUILD
	community/erlang/PKGBUILD
	community/python-openbabel/PKGBUILD
	core/vi/PKGBUILD
	extra/accountsservice/PKGBUILD
	extra/calligra/PKGBUILD
	kde-unstable/kactivities/PKGBUILD
	kde-unstable/kdeaccessibility-jovie/PKGBUILD
	kde-unstable/kdeaccessibility-kaccessible/PKGBUILD
	kde-unstable/kdeaccessibility-kmag/PKGBUILD
	kde-unstable/kdeaccessibility-kmousetool/PKGBUILD
	kde-unstable/kdeaccessibility-kmouth/PKGBUILD
	kde-unstable/kdeadmin/PKGBUILD
	kde-unstable/kdeartwork/PKGBUILD
	kde-unstable/kdebase-konsole/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	kde-unstable/kdebase-workspace/kde-np.pam
	kde-unstable/kdebase-workspace/kde.pam
	kde-unstable/kdebase-workspace/kdebase-workspace.install
	kde-unstable/kdebase/PKGBUILD
	kde-unstable/kdebindings-kimono/PKGBUILD
	kde-unstable/kdebindings-korundum/PKGBUILD
	kde-unstable/kdebindings-korundum/ruby19.patch
	kde-unstable/kdebindings-kross/PKGBUILD
	kde-unstable/kdebindings-perlkde/PKGBUILD
	kde-unstable/kdebindings-perlqt/PKGBUILD
	kde-unstable/kdebindings-python/PKGBUILD
	kde-unstable/kdebindings-qtruby/PKGBUILD
	kde-unstable/kdebindings-qyoto/PKGBUILD
	kde-unstable/kdebindings-smokegen/PKGBUILD
	kde-unstable/kdebindings-smokekde/PKGBUILD
	kde-unstable/kdebindings-smokeqt/PKGBUILD
	kde-unstable/kdeedu-analitza/PKGBUILD
	kde-unstable/kdeedu-blinken/PKGBUILD
	kde-unstable/kdeedu-cantor/PKGBUILD
	kde-unstable/kdeedu-kalgebra/PKGBUILD
	kde-unstable/kdeedu-kalzium/PKGBUILD
	kde-unstable/kdeedu-kalzium/kdeedu-kalzium.install
	kde-unstable/kdeedu-kanagram/PKGBUILD
	kde-unstable/kdeedu-kbruch/PKGBUILD
	kde-unstable/kdeedu-kgeography/PKGBUILD
	kde-unstable/kdeedu-khangman/PKGBUILD
	kde-unstable/kdeedu-kig/PKGBUILD
	kde-unstable/kdeedu-kiten/PKGBUILD
	kde-unstable/kdeedu-klettres/PKGBUILD
	kde-unstable/kdeedu-kmplot/PKGBUILD
	kde-unstable/kdeedu-kstars/PKGBUILD
	kde-unstable/kdeedu-ktouch/PKGBUILD
	kde-unstable/kdeedu-kturtle/PKGBUILD
	kde-unstable/kdeedu-kwordquiz/PKGBUILD
	kde-unstable/kdeedu-marble/PKGBUILD
	kde-unstable/kdeedu-marble/kdeedu-marble.install
	kde-unstable/kdeedu-pairs/PKGBUILD
	kde-unstable/kdeedu-parley/PKGBUILD
	kde-unstable/kdeedu-rocs/PKGBUILD
	kde-unstable/kdeedu-step/PKGBUILD
	kde-unstable/kdegraphics-gwenview/PKGBUILD
	kde-unstable/kdegraphics-kamera/PKGBUILD
	kde-unstable/kdegraphics-kcolorchooser/PKGBUILD
	kde-unstable/kdegraphics-kgamma/PKGBUILD
	kde-unstable/kdegraphics-kolourpaint/PKGBUILD
	kde-unstable/kdegraphics-kruler/PKGBUILD
	kde-unstable/kdegraphics-ksaneplugin/PKGBUILD
	kde-unstable/kdegraphics-ksnapshot/PKGBUILD
	kde-unstable/kdegraphics-mobipocket/PKGBUILD
	kde-unstable/kdegraphics-okular/PKGBUILD
	kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD
	kde-unstable/kdegraphics-svgpart/PKGBUILD
	kde-unstable/kdegraphics-thumbnailers/PKGBUILD
	kde-unstable/kdemultimedia-audiocd-kio/PKGBUILD
	kde-unstable/kdemultimedia-dragonplayer/PKGBUILD
	kde-unstable/kdemultimedia-ffmpegthumbs/PKGBUILD
	kde-unstable/kdemultimedia-juk/PKGBUILD
	kde-unstable/kdemultimedia-kmix/PKGBUILD
	kde-unstable/kdemultimedia-kscd/PKGBUILD
	kde-unstable/kdemultimedia-mplayerthumbs/PKGBUILD
	kde-unstable/kdenetwork/PKGBUILD
	kde-unstable/kdepim-runtime/PKGBUILD
	kde-unstable/kdepim/PKGBUILD
	kde-unstable/kdepim/fix-build.patch
	kde-unstable/kdepimlibs/PKGBUILD
	kde-unstable/kdeplasma-addons/PKGBUILD
	kde-unstable/kdesdk-kate/PKGBUILD
	kde-unstable/kdesdk-kate/pkgbuild-syntax-highlight.patch
	kde-unstable/kdesdk/PKGBUILD
	kde-unstable/kdetoys/PKGBUILD
	kde-unstable/kdeutils-filelight/PKGBUILD
	kde-unstable/kdeutils-kcalc/PKGBUILD
	kde-unstable/kdeutils-kcharselect/PKGBUILD
	kde-unstable/kdeutils-kdf/PKGBUILD
	kde-unstable/kdeutils-kfloppy/PKGBUILD
	kde-unstable/kdeutils-kgpg/PKGBUILD
	kde-unstable/kdeutils-kremotecontrol/PKGBUILD
	kde-unstable/kdeutils-ktimer/PKGBUILD
	kde-unstable/kdeutils-kwallet/PKGBUILD
	kde-unstable/kdeutils-superkaramba/PKGBUILD
	kde-unstable/kdeutils-sweeper/PKGBUILD
	kde-unstable/kdewebdev/PKGBUILD
	kde-unstable/libkcddb/PKGBUILD
	kde-unstable/libkcompactdisc/PKGBUILD
	kde-unstable/libkdcraw/PKGBUILD
	kde-unstable/libkdeedu/PKGBUILD
	kde-unstable/libkexiv2/PKGBUILD
	kde-unstable/libkipi/PKGBUILD
	kde-unstable/libksane/PKGBUILD
	kde-unstable/nepomuk-core/PKGBUILD

1 files changed, 46 insertions, 0 deletions

diff --git a/extra/edje/changeset_76449.diff b/extra/edje/changeset_76449.diff
new file mode 100644
index 000000000..1a1406b4e
--- /dev/null
+++ b/extra/edje/changeset_76449.diff
@@ -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;