[gdk-pixbuf/wip/hadess/remove-xlib: 2/3] Remove obsolete Xlib helper library

[Bastien Nocera <hadess src gnome org>]

commit 45f8941024079dec34c03f90d7e1f76071b4932b
Author: Bastien Nocera <hadess hadess net>
Date:   Sat Mar 2 18:12:19 2019 +0100

    Remove obsolete Xlib helper library

 CONTRIBUTING.md                                    |    5 -
 contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c | 1336 -------
 contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-private.h  |   28 -
 contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-render.c   |  408 ---
 contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.c          |   75 -
 contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h          |   92 -
 contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.c       | 3740 --------------------
 contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h       |  233 --
 contrib/gdk-pixbuf-xlib/meson.build                |   43 -
 docs/gdk-pixbuf-sections.txt                       |   57 -
 docs/gdk-pixbuf.xml                                |    8 -
 docs/meson.build                                   |    6 +-
 meson.build                                        |    6 -
 13 files changed, 1 insertion(+), 6036 deletions(-)
---
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d3fd1f006..8766083b1 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -202,8 +202,6 @@ contribution.
 
 ```
 ├── build-aux
-├── contrib
-│   └── gdk-pixbuf-xlib
 ├── docs
 ├── gdk-pixbuf
 │   └── pixops
@@ -219,9 +217,6 @@ contribution.
 ```
 
  - `build-aux`: Ancillary files, necessary to build GdkPixbuf
- - `contrib`: Additional functionality outside the main GdkPixbuf API
-  - `gdk-pixbuf-xlib`: Xlib integration API; this library is considered
-    deprecated, and should not be used in newly written code
  - `docs`: The GdkPixbuf API reference
  - `gdk-pixbuf`: The core GdkPixbuf source
   - `pixops`: Platform-specific code for pixel operations
diff --git a/docs/gdk-pixbuf-sections.txt b/docs/gdk-pixbuf-sections.txt
index 8ed84635c..c083d5ad3 100644
--- a/docs/gdk-pixbuf-sections.txt
+++ b/docs/gdk-pixbuf-sections.txt
@@ -374,60 +374,3 @@ GDK_PIXBUF_ANIMATION_CLASS
 <SUBSECTION Private>
 gdk_pixbuf_format_get_type
 </SECTION>
-
-<SECTION>
-<FILE>gdk-pixbuf-xlib-init</FILE>
-gdk_pixbuf_xlib_init
-gdk_pixbuf_xlib_init_with_depth
-</SECTION>
-
-<SECTION>
-<FILE>gdk-pixbuf-xlib-rendering</FILE>
-gdk_pixbuf_xlib_render_threshold_alpha
-gdk_pixbuf_xlib_render_to_drawable
-gdk_pixbuf_xlib_render_to_drawable_alpha
-gdk_pixbuf_xlib_render_pixmap_and_mask
-</SECTION>
-
-<SECTION>
-<FILE>gdk-pixbuf-xlib-from-drawables</FILE>
-gdk_pixbuf_xlib_get_from_drawable
-</SECTION>
-
-<SECTION>
-<FILE>gdk-pixbuf-xlib-rgb</FILE>
-XlibRgbCmap
-XlibRgbDither
-xlib_rgb_init
-xlib_rgb_init_with_depth
-xlib_rgb_xpixel_from_rgb
-xlib_rgb_gc_set_foreground
-xlib_rgb_gc_set_background
-xlib_draw_rgb_image
-xlib_draw_rgb_image_dithalign
-xlib_draw_rgb_32_image
-xlib_draw_gray_image
-xlib_rgb_cmap_new
-xlib_rgb_cmap_free
-xlib_draw_indexed_image
-xlib_rgb_ditherable
-xlib_rgb_set_verbose
-xlib_rgb_set_install
-xlib_rgb_set_min_colors
-xlib_rgb_get_cmap
-xlib_rgb_get_visual
-xlib_rgb_get_visual_info
-xlib_rgb_get_depth
-xlib_rgb_get_display
-xlib_rgb_get_screen
-<SUBSECTION Private>
-Bool
-Colormap
-Display
-Drawable
-GC
-Pixmap
-Screen
-Visual
-</SECTION>
-
diff --git a/docs/gdk-pixbuf.xml b/docs/gdk-pixbuf.xml
index 84454f5c2..f1e0db018 100644
--- a/docs/gdk-pixbuf.xml
+++ b/docs/gdk-pixbuf.xml
@@ -90,14 +90,6 @@
       <xi:include href="xml/gdk-pixbuf-loader.xml" />
     </chapter>
 
-    <chapter id="Xlib">
-      <title>Xlib integration (deprecated)</title>
-      <xi:include href="xml/gdk-pixbuf-xlib-init.xml" />
-      <xi:include href="xml/gdk-pixbuf-xlib-rendering.xml" />
-      <xi:include href="xml/gdk-pixbuf-xlib-from-drawables.xml" />
-      <xi:include href="xml/gdk-pixbuf-xlib-rgb.xml" />
-    </chapter>
-
     <chapter id="Gdk">
       <title>GDK integration (deprecated)</title>
       <xi:include href="xml/gdk-pixbuf-rendering.xml" />
diff --git a/docs/meson.build b/docs/meson.build
index 0d90b4755..bf4ac3e46 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -21,7 +21,6 @@ private_headers = [
   'gdk-pixbuf-marshal.h',
   'gdk-pixbuf-private.h',
   'gdk-pixbuf-scaled-anim.h',
-  'gdk-pixbuf-xlib-private.h',
   'io-ani-animation.h',
   'io-gdip-animation.h',
   'io-gdip-native.h',
@@ -39,10 +38,7 @@ endif
 if get_option('docs')
   gnome.gtkdoc('gdk-pixbuf',
                main_xml: 'gdk-pixbuf.xml',
-               src_dir: [
-                 gdk_pixbuf_inc,
-                 gdkpixbuf_xlib_inc,
-               ],
+               src_dir: [ gdk_pixbuf_inc ],
                dependencies: gdkpixbuf_dep,
                gobject_typesfile: 'gdk-pixbuf.types',
                scan_args: [
diff --git a/meson.build b/meson.build
index 6c5fa36cb..b0d04d2d6 100644
--- a/meson.build
+++ b/meson.build
@@ -405,12 +405,6 @@ gnome = import('gnome')
 
 subdir('gdk-pixbuf')
 
-gdkpixbuf_xlib_inc = []
-if get_option('x11')
-  x11_dep = dependency('x11')
-  subdir('contrib/gdk-pixbuf-xlib')
-endif
-
 # i18n
 subdir('po')