[gnome-characters/bilelmoussaoui/gtk4: 2/27] lib-gc: drop gtk dependency




commit 6c3093a384f5a4120534ff52a3a81433af2a6de5
Author: Bilal Elmoussaoui <bil elmoussaoui gmail com>
Date:   Fri Nov 19 11:27:58 2021 +0100

    lib-gc: drop gtk dependency
    
    The clipboard API is fixed in GTK 4

 lib/gc.c        | 11 -----------
 lib/gc.h        |  6 ------
 lib/meson.build |  2 +-
 meson.build     |  4 +---
 4 files changed, 2 insertions(+), 21 deletions(-)
---
diff --git a/lib/gc.c b/lib/gc.c
index e2592ea..d4b4c75 100644
--- a/lib/gc.c
+++ b/lib/gc.c
@@ -1250,17 +1250,6 @@ gc_filter_characters (GcCategory           category,
   return result;
 }
 
-/**
- * gc_gtk_clipboard_get:
- *
- * Returns: (transfer none): a #GtkClipboard.
- */
-GtkClipboard *
-gc_gtk_clipboard_get (void)
-{
-  return gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
-}
-
 void
 gc_pango_layout_disable_fallback (PangoLayout *layout)
 {
diff --git a/lib/gc.h b/lib/gc.h
index c575b09..3bd8c0e 100644
--- a/lib/gc.h
+++ b/lib/gc.h
@@ -110,12 +110,6 @@ gboolean              gc_character_is_invisible
                                             (gunichar              uc);
 gint                  gc_character_width    (gunichar              uc);
 
-
-/* GTK+ support.  gtk_clipboard_get() takes an GdkAtom as the first
-   argument, but GdkAtom is not accessible through GI.  */
-
-GtkClipboard         *gc_gtk_clipboard_get  (void);
-
 /* Pango support.  PangoAttrFallback is not accessible from GI.  */
 void                  gc_pango_layout_disable_fallback
                                             (PangoLayout          *layout);
diff --git a/lib/meson.build b/lib/meson.build
index e6c06ac..62de48e 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -38,7 +38,7 @@ gnome.generate_gir(
   identifier_prefix: characters_ns,
   symbol_prefix: characters_ns.to_lower(),
   header: gc_h,
-  includes: ['Gio-2.0', 'Gtk-3.0'],
+  includes: ['Gio-2.0'],
   install: true,
   install_dir_gir: join_paths(characters_pkgdatadir, 'gir-' + characters_gir_version),
   install_dir_typelib: join_paths(characters_pkglibdir, 'girepository-' + characters_gir_version)
diff --git a/meson.build b/meson.build
index 1daaaf8..fd814ab 100644
--- a/meson.build
+++ b/meson.build
@@ -44,8 +44,7 @@ assert(cc.links(libunistring_src, name: 'libunistring support', args: '-lunistri
 
 # Just check that gjs-1.0 is present and recent enough
 dependency('gjs-1.0', version: '>= 1.50')
-
-
+dependency('gtk4')
 libhandy = dependency ('libhandy-1', version: '>= 1.1', required: false)
 if not libhandy.found()
   libhandy_subproject = subproject(
@@ -66,7 +65,6 @@ endif
 
 libgc_deps = [
   dependency('gio-2.0'),
-  dependency('gtk+-3.0'),
   dependency('pango'),
   libhandy,
   declare_dependency(link_args: '-lunistring')


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]