gedit-collaboration-libinfinity.patch

   1 --- gedit-collaboration-3.6.1/configure.ac.orig 2013-02-24 19:37:22.000000000 +0100
   2 +++ gedit-collaboration-3.6.1/configure.ac      2015-05-13 18:53:32.278596386 +0200
   3 @@ -62,9 +62,9 @@
   4  PKG_CHECK_MODULES(GEDIT, [
   5         gedit >= $GEDIT_REQUIRED_VERSION,
   6         gtk+-3.0 >= 3.3.15
   7 -       libinfinity-0.5 >= $INFINITY_REQUIRED_VERSION
   8 -       libinfgtk-0.5 >= $INFINITY_REQUIRED_VERSION
   9 -       libinftextgtk-0.5 >= $INFINITY_REQUIRED_VERSION
  10 +       libinfinity-0.6 >= $INFINITY_REQUIRED_VERSION
  11 +       libinfgtk3-0.6 >= $INFINITY_REQUIRED_VERSION
  12 +       libinftextgtk3-0.6 >= $INFINITY_REQUIRED_VERSION
  13         libxml-2.0
  14  ])
  15
  16 #--- gedit-collaboration-3.6.1/src/gedit-collaboration.c.orig   2012-09-12 08:23:03.000000000 +0200
  17 #+++ gedit-collaboration-3.6.1/src/gedit-collaboration.c        2015-05-13 21:26:05.548212260 +0200
  18 #@@ -40,13 +40,13 @@ gedit_collaboration_get_sv (GtkWidget *w
  19 #                             gdouble   *sat,
  20 #                             gdouble   *val)
  21 # {
  22 #-      GdkColor color;
  23 #-      GtkStyle *style;
  24 #+      GdkRGBA color;
  25 #+      GtkStyleContext *style;
  26 #       gdouble r, g, b;
  27 #       gdouble h;
  28 #
  29 #-      style = gtk_widget_get_style (widget);
  30 #-      color = style->base[gtk_widget_get_state (widget)];
  31 #+      style = gtk_widget_get_style_context (widget);
  32 #+      gtk_style_context_get_color(style, gtk_widget_get_state_flags (widget), &color);
  33 #
  34 #       r = color.red / 65535.0;
  35 #       g = color.green / 65535.0;
  36 --- gedit-collaboration-3.6.1/src/gedit-collaboration-manager.h.orig    2012-09-12 08:23:03.000000000 +0200
  37 +++ gedit-collaboration-3.6.1/src/gedit-collaboration-manager.h 2015-05-13 21:15:50.988238050 +0200
  38 @@ -60,10 +60,10 @@ GeditCollaborationManager *gedit_collabo
  39                                                              InfIo       *io);
  40
  41  InfcNotePlugin *gedit_collaboration_manager_get_note_plugin (GeditCollaborationManager *manager);
  42 -InfcNodeRequest *gedit_collaboration_manager_subscribe (GeditCollaborationManager *manager,
  43 +InfRequest *gedit_collaboration_manager_subscribe (GeditCollaborationManager *manager,
  44                                                          GeditCollaborationUser    *user,
  45                                                          InfcBrowser               *browser,
  46 -                                                        const InfcBrowserIter     *iter);
  47 +                                                        const InfRequestResult    *iter);
  48
  49  void gedit_collaboration_manager_clear_colors (GeditCollaborationManager *manager,
  50                                                 GeditTab                  *tab);