summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVanilla I. Shu <vanilla@FreeBSD.org>2005-09-25 03:36:01 +0000
committerVanilla I. Shu <vanilla@FreeBSD.org>2005-09-25 03:36:01 +0000
commit1a60648e4b93d77c41ed4ae2154846bb82d851d5 (patch)
treeba1a0ec9cf9f992774b8746a3736849533cd877b
parentAdd some patchs to make it compatible with current ecore library, (diff)
Add some patches to make it compatible with current ecore library,
and bump version. Notified by: kris@ Obtained from: E's cvs
Notes
Notes: svn path=/head/; revision=143509
Diffstat
-rw-r--r--x11-toolkits/ewl/Makefile1
-rw-r--r--x11-toolkits/ewl/files/patch-src_bin_ewl_test.h19
-rw-r--r--x11-toolkits/ewl/files/patch-src_lib_Ewl.h.in28
-rw-r--r--x11-toolkits/ewl/files/patch-src_lib_emacros.h19
-rw-r--r--x11-toolkits/ewl/files/patch-src_lib_ewl_config.c145
-rw-r--r--x11-toolkits/ewl/files/patch-src_lib_ewl_private.h52
6 files changed, 264 insertions, 0 deletions
diff --git a/x11-toolkits/ewl/Makefile b/x11-toolkits/ewl/Makefile
index b968c3b41ca7..f678f7555bec 100644
--- a/x11-toolkits/ewl/Makefile
+++ b/x11-toolkits/ewl/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ewl
PORTVERSION= 0.0.4.004
+pORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= http://enlightenment.freedesktop.org/files/
diff --git a/x11-toolkits/ewl/files/patch-src_bin_ewl_test.h b/x11-toolkits/ewl/files/patch-src_bin_ewl_test.h
new file mode 100644
index 000000000000..9a3f7c1e01c0
--- /dev/null
+++ b/x11-toolkits/ewl/files/patch-src_bin_ewl_test.h
@@ -0,0 +1,19 @@
+--- src/bin/ewl_test.h.orig Mon Jul 11 08:14:53 2005
++++ src/bin/ewl_test.h Sun Sep 25 11:25:52 2005
+@@ -1,5 +1,15 @@
+ #include "Ewl.h"
+-#include <ewl-config.h>
++#include <ewl_macros.h>
++#ifdef HAVE_CONFIG_H
++#include "ewl-config.h"
++#endif
++
++#include <stdlib.h>
++#include <stdio.h>
++#include <string.h>
++#include <dirent.h>
++#include <limits.h>
++#include <sys/stat.h>
+
+ #if HAVE___ATTRIBUTE__
+ #define __UNUSED__ __attribute__((unused))
diff --git a/x11-toolkits/ewl/files/patch-src_lib_Ewl.h.in b/x11-toolkits/ewl/files/patch-src_lib_Ewl.h.in
new file mode 100644
index 000000000000..3838b3061f64
--- /dev/null
+++ b/x11-toolkits/ewl/files/patch-src_lib_Ewl.h.in
@@ -0,0 +1,28 @@
+--- src/lib/Ewl.h.in.orig Mon Jul 11 08:14:53 2005
++++ src/lib/Ewl.h.in Sun Sep 25 11:14:35 2005
+@@ -255,23 +255,10 @@
+ #endif
+
+ #include <Evas.h>
+-#include <Edje.h>
+ #include <Ecore.h>
+-#include <Edb.h>
+-
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#include <limits.h>
+-#include <ctype.h>
+-#include <sys/types.h>
+-#include <sys/stat.h>
+-#include <unistd.h>
+-
+-#ifndef PATH_MAX
+-#define PATH_MAX 4096
+-#endif
++#include <Ecore_Data.h>
+
++#include <ewl_private.h>
+ #include <ewl_enums.h>
+
+ #include <ewl_object.h>
diff --git a/x11-toolkits/ewl/files/patch-src_lib_emacros.h b/x11-toolkits/ewl/files/patch-src_lib_emacros.h
new file mode 100644
index 000000000000..1ea820b9d6d2
--- /dev/null
+++ b/x11-toolkits/ewl/files/patch-src_lib_emacros.h
@@ -0,0 +1,19 @@
+--- src/lib/ewl_macros.h.orig Mon Mar 28 22:32:27 2005
++++ src/lib/ewl_macros.h Sun Sep 25 10:58:16 2005
+@@ -58,10 +58,12 @@
+ */
+ #define ZERO(ptr, type, num) ptr = memset(ptr, 0, sizeof(type) * (num))
+
+-#if HAVE___ATTRIBUTE__
+-#define __UNUSED__ __attribute__((unused))
+-#else
+-#define __UNUSED__
++#ifndef MIN
++#define MIN(x, y) (((x) > (y)) ? (y) : (x))
++#endif
++
++#ifndef MAX
++#define MAX(x, y) (((x) > (y)) ? (x) : (y))
+ #endif
+
+ #endif /* __EWL_MACROS_H__ */
diff --git a/x11-toolkits/ewl/files/patch-src_lib_ewl_config.c b/x11-toolkits/ewl/files/patch-src_lib_ewl_config.c
new file mode 100644
index 000000000000..3c73c10bf38c
--- /dev/null
+++ b/x11-toolkits/ewl/files/patch-src_lib_ewl_config.c
@@ -0,0 +1,145 @@
+--- src/lib/ewl_config.c.orig Mon Mar 28 22:32:26 2005
++++ src/lib/ewl_config.c Sun Sep 25 11:20:04 2005
+@@ -210,8 +210,8 @@
+
+ cc = ewl_config_int_get("/ewl/theme/color_classes/count");
+ prop = ecore_config_get("/ewl/theme/color_classes/count");
+- prop->flags &= ~PF_MODIFIED;
+- prop->flags |= PF_SYSTEM;
++ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
++ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
+
+ for (i = 0; i < cc; i++) {
+ char *name;
+@@ -221,8 +221,8 @@
+ "/ewl/theme/color_classes/%d/name", i);
+ name = ewl_config_str_get(key);
+ prop = ecore_config_get(key);
+- prop->flags &= ~PF_MODIFIED;
+- prop->flags |= PF_SYSTEM;
++ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
++ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
+
+ if (name) {
+ int r, g, b, a;
+@@ -233,85 +233,85 @@
+ "/ewl/theme/color_classes/%d/r", i);
+ r = ewl_config_int_get(key);
+ prop = ecore_config_get(key);
+- prop->flags &= ~PF_MODIFIED;
+- prop->flags |= PF_SYSTEM;
++ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
++ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
+
+ snprintf(key, PATH_MAX,
+ "/ewl/theme/color_classes/%d/g", i);
+ g = ewl_config_int_get(key);
+ prop = ecore_config_get(key);
+- prop->flags &= ~PF_MODIFIED;
+- prop->flags |= PF_SYSTEM;
++ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
++ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
+
+ snprintf(key, PATH_MAX,
+ "/ewl/theme/color_classes/%d/b", i);
+ b = ewl_config_int_get(key);
+ prop = ecore_config_get(key);
+- prop->flags &= ~PF_MODIFIED;
+- prop->flags |= PF_SYSTEM;
++ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
++ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
+
+ snprintf(key, PATH_MAX,
+ "/ewl/theme/color_classes/%d/a", i);
+ a = ewl_config_int_get(key);
+ prop = ecore_config_get(key);
+- prop->flags &= ~PF_MODIFIED;
+- prop->flags |= PF_SYSTEM;
++ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
++ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
+
+ snprintf(key, PATH_MAX,
+ "/ewl/theme/color_classes/%d/r2", i);
+ r2 = ewl_config_int_get(key);
+ prop = ecore_config_get(key);
+- prop->flags &= ~PF_MODIFIED;
+- prop->flags |= PF_SYSTEM;
++ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
++ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
+
+ snprintf(key, PATH_MAX,
+ "/ewl/theme/color_classes/%d/g2", i);
+ g2 = ewl_config_int_get(key);
+ prop = ecore_config_get(key);
+- prop->flags &= ~PF_MODIFIED;
+- prop->flags |= PF_SYSTEM;
++ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
++ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
+
+ snprintf(key, PATH_MAX,
+ "/ewl/theme/color_classes/%d/b2", i);
+ b2 = ewl_config_int_get(key);
+ prop = ecore_config_get(key);
+- prop->flags &= ~PF_MODIFIED;
+- prop->flags |= PF_SYSTEM;
++ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
++ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
+
+ snprintf(key, PATH_MAX,
+ "/ewl/theme/color_classes/%d/a2", i);
+ a2 = ewl_config_int_get(key);
+ prop = ecore_config_get(key);
+- prop->flags &= ~PF_MODIFIED;
+- prop->flags |= PF_SYSTEM;
++ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
++ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
+
+ snprintf(key, PATH_MAX,
+ "/ewl/theme/color_classes/%d/r3", i);
+ r3 = ewl_config_int_get(key);
+ prop = ecore_config_get(key);
+- prop->flags &= ~PF_MODIFIED;
+- prop->flags |= PF_SYSTEM;
++ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
++ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
+
+ snprintf(key, PATH_MAX,
+ "/ewl/theme/color_classes/%d/g3", i);
+ g3 = ewl_config_int_get(key);
+ prop = ecore_config_get(key);
+- prop->flags &= ~PF_MODIFIED;
+- prop->flags |= PF_SYSTEM;
++ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
++ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
+
+ snprintf(key, PATH_MAX,
+ "/ewl/theme/color_classes/%d/b3", i);
+ b3 = ewl_config_int_get(key);
+ prop = ecore_config_get(key);
+- prop->flags &= ~PF_MODIFIED;
+- prop->flags |= PF_SYSTEM;
++ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
++ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
+
+ snprintf(key, PATH_MAX,
+ "/ewl/theme/color_classes/%d/a3", i);
+ a3 = ewl_config_int_get(key);
+ prop = ecore_config_get(key);
+- prop->flags &= ~PF_MODIFIED;
+- prop->flags |= PF_SYSTEM;
++ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
++ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
+
+ edje_color_class_set(name, r, g, b, a,
+ r2, g2, b2, a2,
+@@ -389,8 +389,8 @@
+
+ for(i = 0; keys[i] != NULL; i++) {
+ prop = ecore_config_get(keys[i]);
+- prop->flags &= ~PF_MODIFIED;
+- prop->flags |= PF_SYSTEM;
++ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
++ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
+ }
+
+ ecore_config_listen("ewl_debug_enable", "/ewl/debug/enable",
diff --git a/x11-toolkits/ewl/files/patch-src_lib_ewl_private.h b/x11-toolkits/ewl/files/patch-src_lib_ewl_private.h
new file mode 100644
index 000000000000..d0ae2a222307
--- /dev/null
+++ b/x11-toolkits/ewl/files/patch-src_lib_ewl_private.h
@@ -0,0 +1,52 @@
+--- /dev/null Sun Sep 25 11:15:00 2005
++++ src/lib/ewl_private.h Mon Sep 5 22:20:30 2005
+@@ -0,0 +1,49 @@
++#ifndef _EWL_PRIVATE_H
++#define _EWL_PRIVATE_H
++
++#include <Ecore_Config.h>
++#include <Ecore_File.h>
++#include <Edje.h>
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <limits.h>
++#include <ctype.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <unistd.h>
++#include <math.h>
++#include <assert.h>
++#include <time.h>
++#include <regex.h>
++
++#ifdef HAVE_CONFIG_H
++#include "ewl-config.h"
++#endif
++
++#ifdef HAVE_EVAS_ENGINE_FB_H
++#include <Ecore_Fb.h>
++#include <Evas_Engine_FB.h>
++#endif
++
++#ifdef HAVE_EVAS_ENGINE_GL_X11_H
++#include <Evas_Engine_GL_X11.h>
++#endif
++
++#ifdef HAVE_EVAS_ENGINE_SOFTWARE_X11_H
++#include <Ecore_X.h>
++#include <Evas_Engine_Software_X11.h>
++#endif
++
++#ifndef PATH_MAX
++#define PATH_MAX 4096
++#endif
++
++#if HAVE___ATTRIBUTE__
++#define __UNUSED__ __attribute__((unused))
++#else
++#define __UNUSED__
++#endif
++
++#endif
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-01 17:23:38 +0000