Hello community, here is the log from the commit of package edje for openSUSE:Factory checked in at 2012-12-03 09:33:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/edje (Old) and /work/SRC/openSUSE:Factory/.edje.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "edje", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-11-30 12:21:47.308011256 +0100 +++ /work/SRC/openSUSE:Factory/.edje.new/edje.changes 2012-12-03 09:33:18.000000000 +0100 @@ -0,0 +1,57 @@ +------------------------------------------------------------------- +Wed Nov 21 10:50:49 UTC 2012 - [email protected] + +- removed conditions for SLE10 and CentOS5 as these are not build + targets anymore +- alter description a bit + +------------------------------------------------------------------- +Wed Nov 21 08:17:46 UTC 2012 - [email protected] + +- clean up the spec +- add patch from 76449 needed for alpha4 + +------------------------------------------------------------------- +Tue Nov 20 23:10:39 UTC 2012 - [email protected] + +- attempt to fix license + +------------------------------------------------------------------- +Tue Nov 20 21:59:15 UTC 2012 - [email protected] + +- spec file clean up +- reworking make install acording to other packages + +------------------------------------------------------------------- +Sun Oct 21 00:03:10 UTC 2012 - [email protected] + +- bump to 1.7.1 + +------------------------------------------------------------------- +Sat Sep 22 19:44:45 UTC 2012 - [email protected] + +- make_install --> makeinstall + +------------------------------------------------------------------- +Thu Sep 20 07:43:58 UTC 2012 - [email protected] + +- change pkgconfig dependency to package name + +------------------------------------------------------------------- +Tue Sep 27 14:58:13 UTC 2011 - [email protected] + +- change pkgconfig symbols to package names +- add fontconfig and freetype dependencies + +------------------------------------------------------------------- +Tue Sep 27 13:52:56 UTC 2011 - [email protected] + +- update to 1.0.1 +- spec file clean up +- split away tools in python for conversion + +------------------------------------------------------------------- +Tue Feb 1 20:10:40 UTC 2011 - [email protected] + +- Initial package, version 1.0.0 + New: ---- 0001-edje-don-t-strcmp-ith-NULL.patch edje-1.7.1.tar.bz2 edje.changes edje.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ edje.spec ++++++ # # spec file for package edje # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: edje Version: 1.7.1 Release: 1 License: BSD-2-Clause and GPL-2.0 Summary: Abstract GUI layout and animation object library Url: http://www.enlightenment.org Group: Development/Libraries/C and C++ Source: %{name}-%{version}.tar.bz2 Patch0: 0001-edje-don-t-strcmp-ith-NULL.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool BuildRequires: pkgconfig BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: lua-devel < 5.2 %if 0%{?suse_version} > 1210 BuildRequires: lua51-devel %endif BuildRequires: ecore-devel >= %{version} BuildRequires: eet-devel BuildRequires: eina-devel BuildRequires: embryo-devel BuildRequires: evas-devel >= %{version} BuildRequires: fontconfig-devel BuildRequires: freetype2-devel BuildRequires: python >= 2.5 %description Abstract GUI layout and animation object library. Part of Enlightenment Foundation Libraries. %package -n libedje1 Summary: Edje Dynamic Libraries Group: System/Libraries %description -n libedje1 Headers, static libraries, test programs and documentation for edje %package devel Summary: Edje headers, static libraries, documentation and test programs Group: Development/Libraries/C and C++ Requires: %{name} = %{version} Requires: edje-utils = %{version} Requires: libedje1 = %{version} Requires: lua-devel < 5.2 %if 0%{?suse_version} > 1210 Requires: lua51-devel %endif Requires: ecore-devel Requires: eet-devel Requires: eina-devel Requires: embryo-devel Requires: evas-devel %description devel Headers, static libraries, test programs and documentation for eina %package utils Summary: Edje utils script to convert import from gimp and inkscape Group: Development/Libraries/C and C++ Requires: %{name} = %{version} Requires: python >= 2.5 %description utils Edje utils script to convert import from gimp and inkscape. Part of edje library. %prep %setup -q %patch0 -p2 %build %configure --disable-static --disable-silent-rules make %{?_smp_mflags} %install %if 0%{?fedora_version} || 0%{?centos_version} || 0%{?mandriva_version} make install DESTDIR="%buildroot" %else %makeinstall %endif find %{buildroot}%{_libdir} -name '*.la' -exec rm -v {} \; %post -n libedje1 -p /sbin/ldconfig %postun -n libedje1 -p /sbin/ldconfig %files %defattr(-,root,root) %{_bindir}/edje_* %{_datadir}/mime/packages/edje.xml %dir %{_libdir}/edje %files -n libedje1 %defattr(-, root, root) %{_libdir}/libedje.so.1* %files devel %defattr(-, root, root) %{_includedir}/edje-1/ %{_libdir}/pkgconfig/edje.pc %{_libdir}/libedje.so %{_datadir}/edje/ %files utils %defattr(-,root,root) %{_bindir}/inkscape2edc %{_libdir}/edje/utils %changelog ++++++ 0001-edje-don-t-strcmp-ith-NULL.patch ++++++ >From e0fe62e6896b3cf2ee2e95071fa99692ec6a4d1c Mon Sep 17 00:00:00 2001 From: cedric <cedric@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33> Date: Tue, 11 Sep 2012 08:15:33 +0000 Subject: [PATCH] edje: don't strcmp ith NULL. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk@76449 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- edje/src/bin/edje_cc_out.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/edje/src/bin/edje_cc_out.c b/edje/src/bin/edje_cc_out.c index 888ea5d..64f448a 100644 --- a/edje/src/bin/edje_cc_out.c +++ b/edje/src/bin/edje_cc_out.c @@ -1881,27 +1881,32 @@ data_queue_copied_anonymous_lookup(Edje_Part_Collection *pc, int *src, int *dest { 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); } } @@ -2449,6 +2454,7 @@ static void _data_queue_part_lookup(Edje_Part_Collection *pc, char *name, char *ptr, int len) { Code_Lookup *cl; + cl = mem_alloc(SZ(Code_Lookup)); cl->ptr = ptr; cl->len = len; -- 1.7.10.4 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
