srcpkgs/gtkglextmm/patches/fix_ftbfs_gtk_2_36.patch

   1 Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/wrap_init.cc
   2 ===================================================================
   3 --- gdkglext/gdkmm/gl/wrap_init.cc      2013-05-16 23:40:48.363207736 +0200
   4 +++ gdkglext/gdkmm/gl/wrap_init.cc      2013-05-16 23:42:40.193801834 +0200
   5 @@ -1,15 +1,8 @@
   6 -
   7 -#include <glib.h>
   8 -
   9  // Disable the 'const' function attribute of the get_type() functions.
  10  // GCC would optimize them out because we don't use the return value.
  11  #undef  G_GNUC_CONST
  12  #define G_GNUC_CONST /* empty */
  13
  14 -#include <gdkmm/gl/wrap_init.h>
  15 -#include <glibmm/error.h>
  16 -#include <glibmm/object.h>
  17 -
  18  // #include the widget headers so that we can call the get_type() static methods:
  19
  20  #include "tokens.h"
  21 @@ -19,6 +12,12 @@
  22  #include "pixmap.h"
  23  #include "window.h"
  24
  25 +#include <glib.h>
  26 +
  27 +#include <gdkmm/gl/wrap_init.h>
  28 +#include <glibmm/error.h>
  29 +#include <glibmm/object.h>
  30 +
  31  extern "C"
  32  {
  33
  34 Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/query.cc
  35 ===================================================================
  36 --- gdkglext/gdkmm/gl/query.cc  2013-05-16 23:40:48.363207736 +0200
  37 +++ gdkglext/gdkmm/gl/query.cc  2013-05-16 23:42:40.193801834 +0200
  38 @@ -17,10 +17,10 @@
  39   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
  40   */
  41
  42 -#include <gdk/gdkglquery.h>
  43 -
  44  #include "query.h"
  45
  46 +#include <gdk/gdkglquery.h>
  47 +
  48  namespace Gdk
  49  {
  50    namespace GL
  51 Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/pixmapext.cc
  52 ===================================================================
  53 --- gdkglext/gdkmm/gl/pixmapext.cc      2013-05-16 23:40:48.363207736 +0200
  54 +++ gdkglext/gdkmm/gl/pixmapext.cc      2013-05-16 23:42:40.193801834 +0200
  55 @@ -17,11 +17,11 @@
  56   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
  57   */
  58
  59 +#include "pixmapext.h"
  60 +
  61  #include <gdk/gdkgldrawable.h>
  62  #include <gdk/gdkglpixmap.h>
  63
  64 -#include "pixmapext.h"
  65 -
  66  namespace Gdk
  67  {
  68    namespace GL
  69 Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/windowext.cc
  70 ===================================================================
  71 --- gdkglext/gdkmm/gl/windowext.cc      2013-05-16 23:40:48.363207736 +0200
  72 +++ gdkglext/gdkmm/gl/windowext.cc      2013-05-16 23:42:40.193801834 +0200
  73 @@ -17,11 +17,11 @@
  74   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
  75   */
  76
  77 +#include "windowext.h"
  78 +
  79  #include <gdk/gdkgldrawable.h>
  80  #include <gdk/gdkglwindow.h>
  81
  82 -#include "windowext.h"
  83 -
  84  namespace Gdk
  85  {
  86    namespace GL
  87 Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/font.cc
  88 ===================================================================
  89 --- gdkglext/gdkmm/gl/font.cc   2004-05-18 08:01:49.000000000 +0200
  90 +++ gdkglext/gdkmm/gl/font.cc   2013-05-16 23:43:07.637456821 +0200
  91 @@ -17,10 +17,10 @@
  92   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
  93   */
  94
  95 -#include <gdk/gdkglfont.h>
  96 -
  97  #include "font.h"
  98
  99 +#include <gdk/gdkglfont.h>
 100 +
 101  namespace Gdk
 102  {
 103    namespace GL
 104 Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/init.cc
 105 ===================================================================
 106 --- gdkglext/gdkmm/gl/init.cc   2003-02-27 10:49:24.000000000 +0100
 107 +++ gdkglext/gdkmm/gl/init.cc   2013-05-16 23:44:38.320316782 +0200
 108 @@ -19,11 +19,11 @@
 109
 110  #include <cstdlib>
 111
 112 -#include <gdk/gdkglinit.h>
 113 -
 114  #include "wrap_init.h"
 115  #include "init.h"
 116
 117 +#include <gdk/gdkglinit.h>
 118 +
 119  namespace Gdk
 120  {
 121    namespace GL