[gnome-notes/136-implement-the-list-row-pattern-in-main-view: 2/8] Libgd removal



commit 617d9d22cc37d9ae74305240562edc113d2e6cdb
Author: Isaque Galdino <igaldino gmail com>
Date:   Sun Feb 16 21:29:10 2020 -0300

    Libgd removal

 .gitmodules                               |  3 ---
 data/meson.build                          | 17 -----------------
 data/org.gnome.Notes.gschema.xml          |  5 -----
 meson.build                               | 13 -------------
 src/bjb-note-view.c                       |  1 -
 src/bjb-window-base.c                     |  1 -
 src/libbiji/provider/biji-memo-provider.c |  2 --
 subprojects/libgd                         |  1 -
 8 files changed, 43 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 4867ab8..3732cec 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -62,23 +62,6 @@ install_data(
   install_dir: bijiben_pkgdatadir
 )
 
-# https://github.com/mesonbuild/meson/issues/1687
-custom_target('gsettings-enums',
-  input: '../subprojects/libgd/libgd/gd-main-view.h',
-  output: 'org.gnome.bijiben.enums.xml',
-  install: true,
-  install_dir: join_paths(bijiben_datadir, 'glib-2.0', 'schemas'),
-  capture: true,
-  command: ['glib-mkenums',
-    '--comments', '<!-- @comment@ -->',
-    '--fhead', '<schemalist>',
-    '--vhead', '  <@type@ id="org.gnome.bijiben.@EnumName@">',
-    '--vprod', '    <value nick="@valuenick@" value="@valuenum@"/>',
-    '--vtail', '  </@type@>',
-    '--ftail', '</schemalist>',
-    '@INPUT@'
-  ]
-)
 install_data(
   'org.gnome.Notes.gschema.xml',
   install_dir: join_paths(bijiben_datadir, 'glib-2.0', 'schemas')
diff --git a/data/org.gnome.Notes.gschema.xml b/data/org.gnome.Notes.gschema.xml
index 0e8f466..08f864f 100644
--- a/data/org.gnome.Notes.gschema.xml
+++ b/data/org.gnome.Notes.gschema.xml
@@ -39,11 +39,6 @@
       <summary>Window position</summary>
       <description>Window position (x and y).</description>
     </key>
-    <key name="view-type" enum="org.gnome.bijiben.GdMainViewType">
-      <summary>How to show note items</summary>
-      <description>Whether to show note items in icon view or list view.</description>
-      <default>'icon'</default>
-    </key>
     <key name="text-size" enum="org.gnome.bijiben.BjbTextSizeType">
       <summary>Text size used by note editor.</summary>
       <description>There are three text sizes available: small, medium (default) and large.</description>
diff --git a/meson.build b/meson.build
index 7e24e3a..1c0684e 100644
--- a/meson.build
+++ b/meson.build
@@ -87,18 +87,6 @@ endif
 
 add_project_arguments(common_flags, language: 'c')
 
-libgd = subproject(
-  'libgd',
-  default_options: [
-    'static=true',
-    'with-view-common=true',
-    'with-gtk-hacks=true',
-    'with-main-view=true',
-    'with-tagged-entry=true'
-  ]
-)
-libgd_dep = libgd.get_variable('libgd_dep')
-
 tracker_sparql_dep = dependency('tracker-sparql-2.0', required: false)
 if not tracker_sparql_dep.found()
   tracker_sparql_dep = dependency('tracker-sparql-1.0', required: false)
@@ -108,7 +96,6 @@ if not tracker_sparql_dep.found()
 endif
 
 bijiben_deps = [
-  libgd_dep,
   tracker_sparql_dep,
   dependency('gio-unix-2.0'),
   dependency('glib-2.0', version: '>= 2.53.4'),
diff --git a/src/bjb-note-view.c b/src/bjb-note-view.c
index 7c4f35c..a0eec67 100644
--- a/src/bjb-note-view.c
+++ b/src/bjb-note-view.c
@@ -19,7 +19,6 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <libbiji/libbiji.h>
-#include <libgd/gd.h>
 
 #include "bjb-application.h"
 #include "bjb-editor-toolbar.h"
diff --git a/src/bjb-window-base.c b/src/bjb-window-base.c
index 91cf26a..3ad1682 100644
--- a/src/bjb-window-base.c
+++ b/src/bjb-window-base.c
@@ -4,7 +4,6 @@
 #include <stdlib.h>
 
 #include <libbiji/libbiji.h>
-#include <libgd/gd.h>
 
 #include "bjb-application.h"
 #include "bjb-empty-results-box.h"
diff --git a/src/libbiji/provider/biji-memo-provider.c b/src/libbiji/provider/biji-memo-provider.c
index f4d0031..6e36a93 100644
--- a/src/libbiji/provider/biji-memo-provider.c
+++ b/src/libbiji/provider/biji-memo-provider.c
@@ -26,8 +26,6 @@
 
 
 #include <libecal/libecal.h>        /* ECalClient      */
-#include <libgd/gd.h>               /* Embed in frame  */
-
 #include "biji-memo-provider.h"
 #include "biji-memo-note.h"
 


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