[EGIT] [legacy/imlib2] master 02/02: Deal consistently with including Imlib2.h

[Kim Woelders]

kwo pushed a commit to branch master.

http://git.enlightenment.org/legacy/imlib2.git/commit/?id=ac1d4b0520faa627b75c3465ac5b71f71a2281f6

commit ac1d4b0520faa627b75c3465ac5b71f71a2281f6
Author: Kim Woelders 
Date:   Thu Mar 3 06:04:45 2022 +0100

Deal consistently with including Imlib2.h

- Always include config.h before Imlib2.h
  Needed for X_DISPLAY_MISSING.
- Always include config.h and Imlib2.h first
  Should make it more likely to spot stuff missing but required
  in Imlib2.h, like stddef.h.
  gtest.h apparently must be included before X headers though.
- Make sure we use the Imlib2.h here and not the one in /usr/include

Also ensure that the tests build when building without X.
---
 src/bin/imlib2_bumpmap.c  |  3 +--
 src/bin/imlib2_colorspace.c   |  3 +--
 src/bin/imlib2_conv.c | 16 
 src/bin/imlib2_grab.c |  3 +--
 src/bin/imlib2_load.c | 10 +-
 src/bin/imlib2_poly.c |  3 +--
 src/bin/imlib2_show.c |  3 +--
 src/bin/imlib2_test.c |  3 +--
 src/bin/imlib2_view.c |  2 +-
 src/lib/Imlib2.h.in   |  1 +
 src/lib/api.c |  2 +-
 src/lib/api_obsolete.c|  3 +--
 src/lib/image.c   |  5 +++--
 src/lib/script.c  |  5 +++--
 src/modules/filters/Makefile.am   |  2 +-
 src/modules/filters/filter_bumpmap.c  |  7 +--
 src/modules/filters/filter_colormod.c |  7 +--
 src/modules/filters/filter_test.c |  7 +--
 test/Makefile.am  |  4 +++-
 test/test_context.cpp |  4 +++-
 test/test_grab.cpp|  5 +++--
 test/test_load.cpp|  3 ++-
 test/test_load_2.cpp  |  3 ++-
 test/test_rotate.cpp  |  3 ++-
 test/test_save.cpp|  2 +-
 test/test_scale.cpp   |  3 ++-
 26 files changed, 63 insertions(+), 49 deletions(-)

diff --git a/src/bin/imlib2_bumpmap.c b/src/bin/imlib2_bumpmap.c
index c373a91..690ace0 100644
--- a/src/bin/imlib2_bumpmap.c
+++ b/src/bin/imlib2_bumpmap.c
@@ -1,12 +1,11 @@
 #include "config.h"
+#include 
 
 #include 
 #include 
 #include 
 #include 
 
-#include 
-
 Display*disp;
 Window  win;
 
diff --git a/src/bin/imlib2_colorspace.c b/src/bin/imlib2_colorspace.c
index 7a0a4ba..4f5d583 100644
--- a/src/bin/imlib2_colorspace.c
+++ b/src/bin/imlib2_colorspace.c
@@ -1,12 +1,11 @@
 #include "config.h"
+#include 
 
 #include 
 #include 
 #include 
 #include 
 
-#include 
-
 Display*disp;
 Window  win;
 
diff --git a/src/bin/imlib2_conv.c b/src/bin/imlib2_conv.c
index 6a88f94..d204e02 100644
--- a/src/bin/imlib2_conv.c
+++ b/src/bin/imlib2_conv.c
@@ -1,18 +1,18 @@
-#include "config.h"
-/* Convert images between formats, using Imlib2's API. Smart enough to know
- * about edb files; defaults to jpg's.
+/*
+ * Convert images between formats, using Imlib2's API.
+ * Defaults to jpg's.
  */
+#include "config.h"
+#ifndef X_DISPLAY_MISSING
+#define X_DISPLAY_MISSING
+#endif
+#include 
 
 #include 
 #include 
 #include 
 #include 
 
-#ifndef X_DISPLAY_MISSING
-#define X_DISPLAY_MISSING
-#endif
-#include 
-
 #define PROG_NAME "imlib2_conv"
 
 static void usage(int exit_status);
diff --git a/src/bin/imlib2_grab.c b/src/bin/imlib2_grab.c
index e7db343..3004048 100644
--- a/src/bin/imlib2_grab.c
+++ b/src/bin/imlib2_grab.c
@@ -1,12 +1,11 @@
 #include "config.h"
+#include 
 
 #include 
 #include 
 #include 
 #include 
 
-#include 
-
 Display*disp;
 int image_width = 0, image_height = 0;
 
diff --git a/src/bin/imlib2_load.c b/src/bin/imlib2_load.c
index d4345d5..9e46baa 100644
--- a/src/bin/imlib2_load.c
+++ b/src/bin/imlib2_load.c
@@ -1,4 +1,9 @@
 #include "config.h"
+#ifndef X_DISPLAY_MISSING
+#define X_DISPLAY_MISSING
+#endif
+#include 
+
 #include 
 #include 
 #include 
@@ -11,11 +16,6 @@
 #include 
 #endif
 
-#ifndef X_DISPLAY_MISSING
-#define X_DISPLAY_MISSING
-#endif
-#include 
-
 #define PROG_NAME "imlib2_load"
 
 static char progress_called;
diff --git a/src/bin/imlib2_poly.c b/src/bin/imlib2_poly.c
index 3e7ab62..f3153e6 100644
--- a/src/bin/imlib2_poly.c
+++ b/src/bin/imlib2_poly.c
@@ -1,12 +1,11 @@
 #include "config.h"
+#include 
 
 #include 
 #include 
 #include 
 #include 
 
-#include 
-
 Display*disp;
 Window  win;
 
diff --git a/src/bin/imlib2_show.c b/src/bin/imlib2_show.c
index a8d75c2..7025def 100644
--- a/src/bin/imlib2_show.c
+++ b/src/bin/imlib2_show.c
@@ -1,4 +1,5 @@
 #include "config.h"
+#include 
 
 #include 
 #include 
@@ -10,8 +11,6 @@
 #include 
 #include 
 
-#include 
-
 Display*disp;
 Window  win;
 
diff --git a/src/bin/imlib2_test.c b/src/bin/imlib2_test.c
index 42dab64..4762723 100644
--- a/src/bin/imlib2_test.c

[EGIT] [legacy/imlib2] master 01/02: imlib2: allow compilation without x headers

[Tobias Stoeckmann]

kwo pushed a commit to branch master.

http://git.enlightenment.org/legacy/imlib2.git/commit/?id=b70777f38af12740b600fcec3f9a113949c4

commit b70777f38af12740b600fcec3f9a113949c4
Author: Tobias Stoeckmann 
Date:   Wed Mar 2 21:52:17 2022 +0100

imlib2: allow compilation without x headers

Although configure can be called to ignore x headers, eventually the
compilation of api_obsolete.c fails because the configuration results
in config.h are not evaluated.

For successful compilation with `./configure --without-x` and adding
config.h I also needed stddef.h, which is added as well.
---
 src/lib/api_obsolete.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/lib/api_obsolete.c b/src/lib/api_obsolete.c
index 67b50e8..5215bef 100644
--- a/src/lib/api_obsolete.c
+++ b/src/lib/api_obsolete.c
@@ -1,6 +1,8 @@
 /*
  * Obsolete, useless code
  */
+#include 
+#include "config.h"
 #include "Imlib2.h"
 
 EAPI void

-- 

[EGIT] [admin/devs] master 01/01: update ssh key

[Carsten Haitzler (Rasterman)]

raster pushed a commit to branch master.

http://git.enlightenment.org/admin/devs.git/commit/?id=70c70819f1c643d267604abb4b0ff9680322dd4b

commit 70c70819f1c643d267604abb4b0ff9680322dd4b
Author: Carsten Haitzler (Rasterman) 
Date:   Wed Mar 2 17:55:20 2022 +

update ssh key
---
 developers/netstar/id_ed25519.pub | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/developers/netstar/id_ed25519.pub 
b/developers/netstar/id_ed25519.pub
index 6db34dc..6132dcf 100644
--- a/developers/netstar/id_ed25519.pub
+++ b/developers/netstar/id_ed25519.pub
@@ -1 +1 @@
-ssh-ed25519 
C3NzaC1lZDI1NTE5IGTabycrfCpuQMyki6+ukDiUAwc/hoUQBwcr1WFPti+x 
nets...@gmail.com
+ssh-ed25519 
C3NzaC1lZDI1NTE5ID2wuKmWTouhPGUu8GQFLCCOsg34Ua7bufAxFhGbGagW 
nets...@gmail.com

-- 

[EGIT] [core/enlightenment] master 01/01: remove unused var.

[Carsten Haitzler]

raster pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=6dac5c5cd08dbb17653fbd7a91b33d6ac4fef979

commit 6dac5c5cd08dbb17653fbd7a91b33d6ac4fef979
Author: Carsten Haitzler 
Date:   Wed Mar 2 11:44:02 2022 +

remove unused var.
---
 src/bin/e_comp_x.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c
index 04aaa1a62..95a05dfac 100644
--- a/src/bin/e_comp_x.c
+++ b/src/bin/e_comp_x.c
@@ -2621,7 +2621,7 @@ _e_comp_x_e_client_obj_get(Evas_Object *o)
 static Eina_Bool
 _e_comp_x_mouse_in_fix_check_timer_cb(void *data EINA_UNUSED)
 {
-   E_Client *ec = NULL, *cec;
+   E_Client *ec = NULL;
Eina_List *l, *in_list;
Evas_Object *o;
int x, y;

--