From 7e5e0be1af62584244662daa1989ffd8206c7298 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Fri, 30 Sep 2005 17:59:20 +0000 Subject: e17, efl: major upgrade to newer versions - Upgraded shapshot-based packages to newest released snapshots - Upgraded CVS-based packages to use a newer date - Moved e and e-wm to use snapshots as a default instead of CVS - Updated patches to work with newer versions - Added patches to fix problems introduced in newer versions - Added a patch to disable the splash for e-wm (causes a segfault) - entrance now uses ecore_config instead of edb - Added pulling of m4 directories for a few packages and running of aclocal due to autotools problems - elitaire currently does not compile, removed from e-image --- packages/elitaire/elitaire_0.0.4.bb | 12 ------------ packages/elitaire/elitaire_0.0.5.bb | 13 +++++++++++++ packages/elitaire/files/fix-ewl-and-gettext.patch | 21 --------------------- packages/elitaire/files/math.patch | 14 ++++++++++++++ 4 files changed, 27 insertions(+), 33 deletions(-) delete mode 100644 packages/elitaire/elitaire_0.0.4.bb create mode 100644 packages/elitaire/elitaire_0.0.5.bb create mode 100644 packages/elitaire/files/math.patch (limited to 'packages/elitaire') diff --git a/packages/elitaire/elitaire_0.0.4.bb b/packages/elitaire/elitaire_0.0.4.bb deleted file mode 100644 index 5891fba9ae..0000000000 --- a/packages/elitaire/elitaire_0.0.4.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "EFL-based solitaire" -DEPENDS = "evas-x11 ecore-x11 edje esmart-x11 ewl" -LICENSE = "MIT" -SECTION = "e/apps" -MAINTAINER = "Justin Patrin " -PR = "r0" - -SRC_URI = "http://www.mowem.de/elitaire/elitaire-0.0.4.tar.bz2 \ - file://fix-ewl-and-gettext.patch;patch=1" - -inherit autotools pkgconfig binconfig - diff --git a/packages/elitaire/elitaire_0.0.5.bb b/packages/elitaire/elitaire_0.0.5.bb new file mode 100644 index 0000000000..ac3aebebbf --- /dev/null +++ b/packages/elitaire/elitaire_0.0.5.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "EFL-based solitaire" +DEPENDS = "evas-x11 ecore-x11 edje esmart-x11 ewl" +LICENSE = "MIT" +SECTION = "e/apps" +MAINTAINER = "Justin Patrin " +PR = "r0" + +SRC_URI = "http://www.mowem.de/elitaire/elitaire-${PV}.tar.bz2 \ + file://fix-ewl-and-gettext.patch;patch=1 \ + file://math.patch;patch=1" + +inherit autotools pkgconfig binconfig + diff --git a/packages/elitaire/files/fix-ewl-and-gettext.patch b/packages/elitaire/files/fix-ewl-and-gettext.patch index f84ec06d34..f572124f94 100644 --- a/packages/elitaire/files/fix-ewl-and-gettext.patch +++ b/packages/elitaire/files/fix-ewl-and-gettext.patch @@ -1,24 +1,3 @@ -diff -Nur elitaire-0.0.4~/src/Eli_App.h elitaire-0.0.4/src/Eli_App.h ---- elitaire-0.0.4~/src/Eli_App.h 2005-08-18 19:02:30.000000000 -0700 -+++ elitaire-0.0.4/src/Eli_App.h 2005-08-18 19:02:40.000000000 -0700 -@@ -3,7 +3,7 @@ - #include - #include - #include --#include -+#include - #include"ewl_context_menu.h" - #include"Elitaire.h" - -diff -Nur elitaire-0.0.4~/src/ewl_context_menu.c elitaire-0.0.4/src/ewl_context_menu.c ---- elitaire-0.0.4~/src/ewl_context_menu.c 2005-08-18 19:02:30.000000000 -0700 -+++ elitaire-0.0.4/src/ewl_context_menu.c 2005-08-18 19:02:40.000000000 -0700 -@@ -1,4 +1,4 @@ --#include -+#include - #include"ewl_context_menu.h" - - void ewl_context_menu_expand_cb(Ewl_Widget *w, void *ev_data , diff -Nur elitaire-0.0.4~/src/intl.h elitaire-0.0.4/src/intl.h --- elitaire-0.0.4~/src/intl.h 2005-08-18 19:02:30.000000000 -0700 +++ elitaire-0.0.4/src/intl.h 2005-08-18 19:06:05.000000000 -0700 diff --git a/packages/elitaire/files/math.patch b/packages/elitaire/files/math.patch new file mode 100644 index 0000000000..550507f370 --- /dev/null +++ b/packages/elitaire/files/math.patch @@ -0,0 +1,14 @@ +--- elitaire-0.0.4/src/Elitaire.h~ 2005-08-15 06:32:32.000000000 -0700 ++++ elitaire-0.0.4/src/Elitaire.h 2005-09-29 19:19:25.000000000 -0700 +@@ -3,6 +3,11 @@ + #include + #include + #include"intl.h" ++#include ++ ++#ifndef ABS ++#define ABS(x) ((x) >= 0 ? (x) : -(x)) ++#endif + + struct Elitaire{ + -- cgit v1.2.3