package/efl/0002-ecore_x-Remove-XPrint-usage.patch

   1 From 434572355c7e929b84210b2f795634d38f13c913 Mon Sep 17 00:00:00 2001
   2 From: Derek Foreman <derekf@osg.samsung.com>
   3 Date: Tue, 6 Oct 2015 13:13:01 -0400
   4 Subject: [PATCH] ecore_x: Remove XPrint usage
   5
   6 Summary:
   7 Xprint has been deprecated since 2008.
   8
   9 It's recently (August 2015) been removed from debian.
  10
  11 Reviewers: zmike, devilhorns
  12
  13 Subscribers: cedric
  14
  15 Differential Revision: https://phab.enlightenment.org/D3150
  16 ---
  17  configure.ac                           |  1 -
  18  src/lib/ecore_x/xlib/ecore_x.c         | 78 ----------------------------------
  19  src/lib/ecore_x/xlib/ecore_x_private.h |  3 --
  20  3 files changed, 82 deletions(-)
  21
  22 diff --git a/configure.ac b/configure.ac
  23 index 9c17946..c34191c 100644
  24 --- a/configure.ac
  25 +++ b/configure.ac
  26 @@ -3624,7 +3624,6 @@ if test "x${want_x11_xlib}" = "xyes" ; then
  27     ECORE_CHECK_X_EXTENSION([Xdpms], [dpms.h], [Xext], [DPMSQueryExtension])
  28     ECORE_CHECK_X_EXTENSION([Xfixes], [Xfixes.h], [Xfixes], [XFixesExpandRegion])
  29     ECORE_CHECK_X_EXTENSION([Xinerama], [Xinerama.h], [Xinerama], [XineramaQueryScreens])
  30 -   ECORE_CHECK_X_EXTENSION([Xprint], [Print.h], [Xp], [XpQueryScreens])
  31     ECORE_CHECK_X_EXTENSION([Xrandr], [Xrandr.h], [Xrandr], [XRRGetScreenResourcesCurrent])
  32     ECORE_CHECK_X_EXTENSION([Xrender], [Xrender.h], [Xrender], [XRenderFindVisualFormat])
  33     ECORE_CHECK_X_EXTENSION([Xtest], [XTest.h], [Xtst], [XTestFakeKeyEvent])
  34 diff --git a/src/lib/ecore_x/xlib/ecore_x.c b/src/lib/ecore_x/xlib/ecore_x.c
  35 index 096f64d..8e2057e 100644
  36 --- a/src/lib/ecore_x/xlib/ecore_x.c
  37 +++ b/src/lib/ecore_x/xlib/ecore_x.c
  38 @@ -1219,9 +1219,6 @@ ecore_x_window_root_list(int *num_ret)
  39  {
  40     int num, i;
  41     Ecore_X_Window *roots;
  42 -#ifdef ECORE_XPRINT
  43 -   int xp_base, xp_err_base;
  44 -#endif /* ifdef ECORE_XPRINT */
  45
  46     if (!num_ret)
  47       return NULL;
  48 @@ -1229,80 +1226,6 @@ ecore_x_window_root_list(int *num_ret)
  49     *num_ret = 0;
  50
  51     LOGFN(__FILE__, __LINE__, __FUNCTION__);
  52 -#ifdef ECORE_XPRINT
  53 -   num = ScreenCount(_ecore_x_disp);
  54 -   if (XpQueryExtension(_ecore_x_disp, &xp_base, &xp_err_base))
  55 -     {
  56 -        Screen **ps = NULL;
  57 -        int psnum = 0;
  58 -
  59 -        ps = XpQueryScreens(_ecore_x_disp, &psnum);
  60 -        if (ps)
  61 -          {
  62 -             int overlap, j;
  63 -
  64 -             overlap = 0;
  65 -             for (i = 0; i < num; i++)
  66 -               {
  67 -                  for (j = 0; j < psnum; j++)
  68 -                    {
  69 -                       if (ScreenOfDisplay(_ecore_x_disp, i) == ps[j])
  70 -                         overlap++;
  71 -                    }
  72 -               }
  73 -             roots = malloc(MAX((num - overlap) * sizeof(Ecore_X_Window), 1));
  74 -             if (roots)
  75 -               {
  76 -                  int k;
  77 -
  78 -                  k = 0;
  79 -                  for (i = 0; i < num; i++)
  80 -                    {
  81 -                       int is_print;
  82 -
  83 -                       is_print = 0;
  84 -                       for (j = 0; j < psnum; j++)
  85 -                         {
  86 -                            if (ScreenOfDisplay(_ecore_x_disp, i) == ps[j])
  87 -                              {
  88 -                                 is_print = 1;
  89 -                                 break;
  90 -                              }
  91 -                         }
  92 -                       if (!is_print)
  93 -                         {
  94 -                            roots[k] = RootWindow(_ecore_x_disp, i);
  95 -                            k++;
  96 -                         }
  97 -                    }
  98 -                  *num_ret = k;
  99 -               }
 100 -
 101 -             XFree(ps);
 102 -          }
 103 -        else
 104 -          {
 105 -             roots = malloc(num * sizeof(Ecore_X_Window));
 106 -             if (!roots)
 107 -               return NULL;
 108 -
 109 -             *num_ret = num;
 110 -             for (i = 0; i < num; i++)
 111 -               roots[i] = RootWindow(_ecore_x_disp, i);
 112 -          }
 113 -     }
 114 -   else
 115 -     {
 116 -        roots = malloc(num * sizeof(Ecore_X_Window));
 117 -        if (!roots)
 118 -          return NULL;
 119 -
 120 -        *num_ret = num;
 121 -        for (i = 0; i < num; i++)
 122 -          roots[i] = RootWindow(_ecore_x_disp, i);
 123 -     }
 124 -
 125 -#else /* ifdef ECORE_XPRINT */
 126     num = ScreenCount(_ecore_x_disp);
 127     roots = malloc(num * sizeof(Ecore_X_Window));
 128     if (!roots)
 129 @@ -1311,7 +1234,6 @@ ecore_x_window_root_list(int *num_ret)
 130     *num_ret = num;
 131     for (i = 0; i < num; i++)
 132       roots[i] = RootWindow(_ecore_x_disp, i);
 133 -#endif /* ifdef ECORE_XPRINT */
 134     return roots;
 135  }
 136
 137 diff --git a/src/lib/ecore_x/xlib/ecore_x_private.h b/src/lib/ecore_x/xlib/ecore_x_private.h
 138 index 97b3858..07c09fb 100644
 139 --- a/src/lib/ecore_x/xlib/ecore_x_private.h
 140 +++ b/src/lib/ecore_x/xlib/ecore_x_private.h
 141 @@ -19,9 +19,6 @@
 142  #ifdef ECORE_XCURSOR
 143  #include <X11/Xcursor/Xcursor.h>
 144  #endif /* ifdef ECORE_XCURSOR */
 145 -#ifdef ECORE_XPRINT
 146 -#include <X11/extensions/Print.h>
 147 -#endif /* ifdef ECORE_XPRINT */
 148  #ifdef ECORE_XINERAMA
 149  #include <X11/extensions/Xinerama.h>
 150  #endif /* ifdef ECORE_XINERAMA */
 151 --
 152 2.4.3
 153