grim/glibre

Remove gdl so we can compile again

2019-08-06, Gary Kramlich
e13296b9e125
Parents fb2b1e25464f
Children 11fe2758493f
Remove gdl so we can compile again
2 files changed, 8 insertions(+), 149 deletions(-)
  • +0 -4
    CMakeLists.txt
  • +8 -145
    glibre.c
    • --- a/CMakeLists.txt Wed Feb 08 23:54:36 2012 -0600
    +++ b/CMakeLists.txt Tue Aug 06 21:40:27 2019 -0500
    @@ -17,7 +17,6 @@
    pkg_check_modules(GLIB REQUIRED glib-2.0>=2.24.0)
    pkg_check_modules(GTK2 REQUIRED gtk+-3.0>=3.0.0)
    -pkg_check_modules(GDL REQUIRED gdl-3.0>=3.0)
    ###############################################################################
    # Build Info
    @@ -32,13 +31,11 @@
    include_directories(
    ${GLIB_INCLUDE_DIRS}
    ${GTK2_INCLUDE_DIRS}
    - ${GDL_INCLUDE_DIRS}
    )
    link_directories(
    ${GLIB_LIBRARY_DIRS}
    ${GTK2_LIBRARY_DIRS}
    - ${GDL_LIBRARY_DIRS}
    )
    add_executable(glibre
    @@ -47,7 +44,6 @@
    target_link_libraries(glibre
    ${GTK2_LIBRARIES}
    - ${GDL_LIBRARIES}
    )
    ###############################################################################
    --- a/glibre.c Wed Feb 08 23:54:36 2012 -0600
    +++ b/glibre.c Tue Aug 06 21:40:27 2019 -0500
    @@ -19,25 +19,19 @@
    #include <gdk/gdk.h>
    #include <gtk/gtk.h>
    -#include <gdl/gdl.h>
    -
    typedef struct {
    GtkWidget *window;
    GtkWidget *dock;
    GtkWidget *dockbar;
    - GdlDockLayout *layout;
    GRegex *regex;
    - GtkWidget *regex_dock;
    GtkWidget *regex_entry;
    - GtkWidget *method_dock;
    GtkWidget *method_one;
    GtkWidget *method_all;
    GtkWidget *method_split;
    - GtkWidget *compile_dock;
    GtkWidget *c_caseless;
    GtkWidget *c_multiline;
    GtkWidget *c_dotall;
    @@ -52,7 +46,6 @@
    GtkWidget *c_newline_cr;
    GtkWidget *c_newline_lf;
    - GtkWidget *match_dock;
    GtkWidget *m_anchored;
    GtkWidget *m_notbol;
    GtkWidget *m_noteol;
    @@ -62,17 +55,13 @@
    GtkWidget *m_newline_lf;
    GtkWidget *m_newline_any;
    - GtkWidget *replace_dock;
    GtkWidget *replace_entry;
    - GtkWidget *data_dock;
    GtkWidget *data_entry;
    - GtkWidget *groups_dock;
    GtkTreeStore *groups_store;
    GtkWidget *groups_tree;
    - GtkWidget *results_dock;
    GtkWidget *results_entry;
    } GlibReWindow;
    @@ -312,14 +301,6 @@
    g_key_file_free(key_file);
    g_free(conf_file);
    - /* now grab the layout */
    - layout_file = glibre_config_file("layout.xml");
    -
    - if(gdl_dock_layout_load_from_file(window.layout, layout_file))
    - gdl_dock_layout_load_layout(window.layout, "__default__");
    -
    - g_free(layout_file);
    -
    glibre_update();
    loaded = TRUE;
    }
    @@ -434,11 +415,6 @@
    g_free(conf_file);
    g_free(data);
    -
    - /* now save the layout */
    - layout_file = glibre_config_file("layout.xml");
    - gdl_dock_layout_save_to_file(window.layout, layout_file);
    - g_free(layout_file);
    }
    #define glibre_check_flag(widget, value) { \
    @@ -691,7 +667,6 @@
    static void
    glibre_view_edit_cb(GtkMenuItem *w, gpointer d) {
    - gdl_dock_layout_run_manager(window.layout);
    }
    static void
    @@ -729,7 +704,6 @@
    GtkWidget *menubar = NULL, *menu = NULL, *item = NULL;
    GtkTreeViewColumn *col = NULL;
    GtkCellRenderer *rend = NULL;
    - GdlDockMaster *master = NULL;
    ag = gtk_accel_group_new();
    @@ -795,58 +769,21 @@
    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
    /**************************************************************************
    - * Setup the docking stuff
    - *************************************************************************/
    - window.dock = gdl_dock_new();
    - window.layout = gdl_dock_layout_new(GDL_DOCK(window.dock));
    -
    - window.dockbar = gdl_dock_bar_new(GDL_DOCK(window.dock));
    - gdl_dock_bar_set_style(GDL_DOCK_BAR(window.dockbar), GDL_DOCK_BAR_TEXT);
    -
    - gtk_box_pack_start(GTK_BOX(ovbox), window.dockbar, FALSE, FALSE, 0);
    - gtk_box_pack_end(GTK_BOX(ovbox), window.dock, TRUE, TRUE, 0);
    - gtk_container_set_border_width(GTK_CONTAINER(window.dock), 8);
    -
    - master = GDL_DOCK_OBJECT_GET_MASTER(window.dock);
    - g_object_set(G_OBJECT(master), "switcher-style", GDL_SWITCHER_STYLE_TABS,
    - NULL);
    -
    - /**************************************************************************
    * create the regex text view
    *************************************************************************/
    - window.regex_dock = gdl_dock_item_new("regex", "Regex",
    - GDL_DOCK_ITEM_BEH_NORMAL |
    - GDL_DOCK_ITEM_BEH_CANT_CLOSE |
    - GDL_DOCK_ITEM_BEH_CANT_ICONIFY);
    - gdl_dock_add_item(GDL_DOCK(window.dock), GDL_DOCK_ITEM(window.regex_dock),
    - GDL_DOCK_CENTER);
    - gdl_dock_item_show_grip(GDL_DOCK_ITEM(window.regex_dock));
    -
    sw = glibre_create_scrolled_window();
    - gtk_container_add(GTK_CONTAINER(window.regex_dock), sw);
    + gtk_box_pack_start(GTK_BOX(ovbox), sw, TRUE, TRUE, 0);
    window.regex_entry = gtk_text_view_new();
    g_signal_connect(gtk_text_view_get_buffer(GTK_TEXT_VIEW(window.regex_entry)),
    "changed", G_CALLBACK(glibre_entry_changed_cb), NULL);
    gtk_container_add(GTK_CONTAINER(sw), window.regex_entry);
    - gtk_widget_show_all(GTK_WIDGET(window.regex_dock));
    -
    /**************************************************************************
    * build the method dock and it's children
    **************************************************************************/
    - window.method_dock = gdl_dock_item_new("method", "Method",
    - GDL_DOCK_ITEM_BEH_NORMAL |
    - GDL_DOCK_ITEM_BEH_CANT_CLOSE |
    - GDL_DOCK_ITEM_BEH_CANT_ICONIFY);
    - gdl_dock_add_item(GDL_DOCK(window.dock), GDL_DOCK_ITEM(window.method_dock),
    - GDL_DOCK_LEFT);
    - gdl_dock_item_dock_to(GDL_DOCK_ITEM(window.method_dock),
    - GDL_DOCK_ITEM(window.regex_dock),
    - GDL_DOCK_LEFT, -1);
    -
    vbox = gtk_vbox_new(FALSE, 0);
    - gtk_container_add(GTK_CONTAINER(window.method_dock), vbox);
    + gtk_box_pack_start(GTK_BOX(ovbox), vbox, TRUE, TRUE, 0);
    window.method_one = gtk_radio_button_new_with_label(NULL, "Match One");
    g_signal_connect(window.method_one, "toggled",
    @@ -867,23 +804,11 @@
    G_CALLBACK(glibre_toggle_toggled_cb), NULL);
    gtk_box_pack_start(GTK_BOX(vbox), window.method_split, FALSE, FALSE, 0);
    - gtk_widget_show_all(GTK_WIDGET(window.method_dock));
    -
    /**************************************************************************
    * build the compile option dock and it's children
    **************************************************************************/
    - window.compile_dock = gdl_dock_item_new("compile-flags", "Compile Options",
    - GDL_DOCK_ITEM_BEH_NORMAL |
    - GDL_DOCK_ITEM_BEH_CANT_CLOSE |
    - GDL_DOCK_ITEM_BEH_CANT_ICONIFY);
    - gdl_dock_add_item(GDL_DOCK(window.dock), GDL_DOCK_ITEM(window.compile_dock),
    - GDL_DOCK_LEFT);
    - gdl_dock_item_dock_to(GDL_DOCK_ITEM(window.compile_dock),
    - GDL_DOCK_ITEM(window.method_dock),
    - GDL_DOCK_BOTTOM, -1);
    -
    vbox = gtk_vbox_new(FALSE, 0);
    - gtk_container_add(GTK_CONTAINER(window.compile_dock), vbox);
    + gtk_box_pack_start(GTK_BOX(ovbox), vbox, TRUE, TRUE, 0);
    window.c_caseless = gtk_check_button_new_with_label("Caseless");
    g_signal_connect(window.c_caseless, "toggled",
    @@ -950,23 +875,11 @@
    G_CALLBACK(glibre_toggle_toggled_cb), NULL);
    gtk_box_pack_start(GTK_BOX(vbox), window.c_newline_lf, FALSE, FALSE, 0);
    - gtk_widget_show_all(GTK_WIDGET(window.compile_dock));
    -
    /**************************************************************************
    * build the match option dock and it's children
    **************************************************************************/
    - window.match_dock = gdl_dock_item_new("match-options", "Match Options",
    - GDL_DOCK_ITEM_BEH_NORMAL |
    - GDL_DOCK_ITEM_BEH_CANT_CLOSE |
    - GDL_DOCK_ITEM_BEH_CANT_ICONIFY);
    - gdl_dock_add_item(GDL_DOCK(window.dock), GDL_DOCK_ITEM(window.match_dock),
    - GDL_DOCK_LEFT);
    - gdl_dock_item_dock_to(GDL_DOCK_ITEM(window.match_dock),
    - GDL_DOCK_ITEM(window.compile_dock),
    - GDL_DOCK_BOTTOM, -1);
    -
    vbox = gtk_vbox_new(FALSE, 0);
    - gtk_container_add(GTK_CONTAINER(window.match_dock), vbox);
    + gtk_box_pack_start(GTK_BOX(ovbox), vbox, TRUE, TRUE, 0);
    window.m_anchored = gtk_check_button_new_with_label("Anchored");
    g_signal_connect(window.m_anchored, "toggled",
    @@ -1008,69 +921,33 @@
    G_CALLBACK(glibre_toggle_toggled_cb), NULL);
    gtk_box_pack_start(GTK_BOX(vbox), window.m_newline_any, FALSE, FALSE, 0);
    - gtk_widget_show_all(GTK_WIDGET(window.match_dock));
    -
    /**************************************************************************
    * Replacement
    *************************************************************************/
    - window.replace_dock = gdl_dock_item_new("replacement", "Replacement",
    - GDL_DOCK_ITEM_BEH_NORMAL |
    - GDL_DOCK_ITEM_BEH_CANT_CLOSE |
    - GDL_DOCK_ITEM_BEH_CANT_ICONIFY);
    - gdl_dock_add_item(GDL_DOCK(window.dock), GDL_DOCK_ITEM(window.replace_dock),
    - GDL_DOCK_CENTER);
    - gdl_dock_item_dock_to(GDL_DOCK_ITEM(window.replace_dock),
    - GDL_DOCK_ITEM(window.regex_dock),
    - GDL_DOCK_BOTTOM, -1);
    -
    sw = glibre_create_scrolled_window();
    - gtk_container_add(GTK_CONTAINER(window.replace_dock), sw);
    + gtk_box_pack_start(GTK_BOX(ovbox), sw, TRUE, TRUE, 0);
    window.replace_entry = gtk_text_view_new();
    g_signal_connect(gtk_text_view_get_buffer(GTK_TEXT_VIEW(window.replace_entry)),
    "changed", G_CALLBACK(glibre_entry_changed_cb), NULL);
    gtk_container_add(GTK_CONTAINER(sw), window.replace_entry);
    - gtk_widget_show_all(GTK_WIDGET(window.replace_dock));
    -
    /**************************************************************************
    * Data
    *************************************************************************/
    - window.data_dock = gdl_dock_item_new("data", "Data",
    - GDL_DOCK_ITEM_BEH_NORMAL |
    - GDL_DOCK_ITEM_BEH_CANT_CLOSE |
    - GDL_DOCK_ITEM_BEH_CANT_ICONIFY);
    - gdl_dock_add_item(GDL_DOCK(window.dock), GDL_DOCK_ITEM(window.data_dock),
    - GDL_DOCK_CENTER);
    - gdl_dock_item_dock_to(GDL_DOCK_ITEM(window.data_dock),
    - GDL_DOCK_ITEM(window.replace_dock),
    - GDL_DOCK_BOTTOM, -1);
    -
    sw = glibre_create_scrolled_window();
    - gtk_container_add(GTK_CONTAINER(window.data_dock), sw);
    + gtk_box_pack_start(GTK_BOX(ovbox), sw, TRUE, TRUE, 0);
    window.data_entry = gtk_text_view_new();
    g_signal_connect(gtk_text_view_get_buffer(GTK_TEXT_VIEW(window.data_entry)),
    "changed", G_CALLBACK(glibre_entry_changed_cb), NULL);
    gtk_container_add(GTK_CONTAINER(sw), window.data_entry);
    - gtk_widget_show_all(GTK_WIDGET(window.data_dock));
    -
    /**************************************************************************
    * Groups
    *************************************************************************/
    - window.groups_dock = gdl_dock_item_new("matches", "Matches",
    - GDL_DOCK_ITEM_BEH_NORMAL |
    - GDL_DOCK_ITEM_BEH_CANT_CLOSE |
    - GDL_DOCK_ITEM_BEH_CANT_ICONIFY);
    - gdl_dock_add_item(GDL_DOCK(window.dock), GDL_DOCK_ITEM(window.groups_dock),
    - GDL_DOCK_CENTER);
    - gdl_dock_item_dock_to(GDL_DOCK_ITEM(window.groups_dock),
    - GDL_DOCK_ITEM(window.data_dock),
    - GDL_DOCK_BOTTOM, -1);
    -
    sw = glibre_create_scrolled_window();
    - gtk_container_add(GTK_CONTAINER(window.groups_dock), sw);
    + gtk_box_pack_start(GTK_BOX(ovbox), sw, TRUE, TRUE, 0);
    window.groups_store = gtk_tree_store_new(2, G_TYPE_STRING, G_TYPE_STRING);
    @@ -1090,29 +967,15 @@
    NULL);
    gtk_tree_view_append_column(GTK_TREE_VIEW(window.groups_tree), col);
    - gtk_widget_show_all(GTK_WIDGET(window.groups_dock));
    -
    /**************************************************************************
    * Results
    *************************************************************************/
    - window.results_dock = gdl_dock_item_new("results", "Results",
    - GDL_DOCK_ITEM_BEH_NORMAL |
    - GDL_DOCK_ITEM_BEH_CANT_CLOSE |
    - GDL_DOCK_ITEM_BEH_CANT_ICONIFY);
    - gdl_dock_add_item(GDL_DOCK(window.dock), GDL_DOCK_ITEM(window.results_dock),
    - GDL_DOCK_CENTER);
    - gdl_dock_item_dock_to(GDL_DOCK_ITEM(window.results_dock),
    - GDL_DOCK_ITEM(window.groups_dock),
    - GDL_DOCK_BOTTOM, -1);
    -
    sw = glibre_create_scrolled_window();
    - gtk_container_add(GTK_CONTAINER(window.results_dock), sw);
    + gtk_box_pack_start(GTK_BOX(ovbox), sw, TRUE, TRUE, 0);
    window.results_entry = gtk_text_view_new();
    gtk_text_view_set_editable(GTK_TEXT_VIEW(window.results_entry), FALSE);
    gtk_container_add(GTK_CONTAINER(sw), window.results_entry);
    -
    - gtk_widget_show_all(GTK_WIDGET(window.results_dock));
    }
    /******************************************************************************