summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gtk+
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-07-05 23:06:35 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-12 23:10:15 +0100
commit7f6f998af2e5bba3871b5fbfeb805da0ff46742e (patch)
tree7eb3b39ae3e8967f309286bbc483ff8bb2cd44b1 /meta/recipes-gnome/gtk+
parente5f9326f26f3ebd77dab8b396cf956cf5ef8077f (diff)
downloadpoky-7f6f998af2e5bba3871b5fbfeb805da0ff46742e.tar.gz
gtk+3: update 0003-Add-disable-opengl-configure-option.patch
The patch contained git style patch like: | diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx-with-gl-context.h | similarity index 100% | rename from gdk/x11/gdkx.h | rename to gdk/x11/gdkx-with-gl-context.h Which can't be applied by older patch tool such as patch 2.6.1. So update the patch. (From OE-Core rev: f9ac2c33c9a168f8b0fa2eca321f5377bad11fee) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gtk+')
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch184
1 files changed, 153 insertions, 31 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch b/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch
index 8552f53e3e..0912c44ff3 100644
--- a/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch
+++ b/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch
@@ -20,32 +20,31 @@ Long-term it would be good to find an alternative solution to this
20Upstream-Status: Inappropriate [Evil eye expected from upstream] 20Upstream-Status: Inappropriate [Evil eye expected from upstream]
21Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> 21Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
22--- 22---
23 configure.ac | 13 +++++-- 23 configure.ac | 13 +++++++++++--
24 demos/gtk-demo/glarea.c | 13 +++++++ 24 demos/gtk-demo/glarea.c | 13 +++++++++++++
25 docs/tools/Makefile.am | 9 +++-- 25 docs/tools/Makefile.am | 9 +++++++--
26 docs/tools/widgets.c | 4 ++- 26 docs/tools/widgets.c | 4 +++-
27 gdk/gdkdisplay.c | 4 ++- 27 gdk/gdkdisplay.c | 4 +++-
28 gdk/gdkgl.c | 10 ++++++ 28 gdk/gdkgl.c | 10 ++++++++++
29 gdk/gdkglcontext.c | 6 ++++ 29 gdk/gdkglcontext.c | 6 ++++++
30 gdk/gdkwindow.c | 13 +++++++ 30 gdk/gdkwindow.c | 13 +++++++++++++
31 gdk/x11/Makefile.am | 30 +++++++++++++--- 31 gdk/x11/Makefile.am | 30 ++++++++++++++++++++++++++----
32 gdk/x11/gdkdisplay-x11.c | 6 +++- 32 gdk/x11/gdkdisplay-x11.c | 6 +++++-
33 gdk/x11/gdkscreen-x11.c | 5 +++ 33 gdk/x11/gdkscreen-x11.c | 5 +++++
34 gdk/x11/gdkwindow-x11.c | 4 +++ 34 gdk/x11/gdkwindow-x11.c | 4 ++++
35 gdk/x11/gdkx-autocleanups.h | 2 ++ 35 gdk/x11/gdkx-autocleanups.h | 2 ++
36 gdk/x11/{gdkx.h => gdkx-with-gl-context.h} | 0 36 gdk/x11/gdkx-with-gl-context.h | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
37 gdk/x11/gdkx-without-gl-context.h | 58 ++++++++++++++++++++++++++++++ 37 gdk/x11/gdkx-without-gl-context.h | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
38 gtk/Makefile.am | 3 +- 38 gdk/x11/gdkx.h | 59 -----------------------------------------------------------
39 gtk/gtkglarea.c | 20 ++++++++++- 39 gtk/Makefile.am | 3 +--
40 gtk/inspector/general.c | 6 ++++ 40 gtk/gtkglarea.c | 20 +++++++++++++++++++-
41 tests/Makefile.am | 10 ++++-- 41 gtk/inspector/general.c | 6 ++++++
42 testsuite/gtk/objects-finalize.c | 2 ++ 42 tests/Makefile.am | 10 +++++++---
43 20 files changed, 201 insertions(+), 17 deletions(-) 43 testsuite/gtk/objects-finalize.c | 2 ++
44 rename gdk/x11/{gdkx.h => gdkx-with-gl-context.h} (100%) 44 21 files changed, 260 insertions(+), 76 deletions(-)
45 create mode 100644 gdk/x11/gdkx-without-gl-context.h
46 45
47diff --git a/configure.ac b/configure.ac 46diff --git a/configure.ac b/configure.ac
48index e27da49..a3e9beb 100644 47index a01824e..dde9dc5 100644
49--- a/configure.ac 48--- a/configure.ac
50+++ b/configure.ac 49+++ b/configure.ac
51@@ -342,6 +342,15 @@ AC_ARG_ENABLE(mir-backend, 50@@ -342,6 +342,15 @@ AC_ARG_ENABLE(mir-backend,
@@ -549,10 +548,71 @@ index edb0ea7..a317d61 100644
549 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Keymap, g_object_unref) 548 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Keymap, g_object_unref)
550 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Screen, g_object_unref) 549 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Screen, g_object_unref)
551 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Visual, g_object_unref) 550 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Visual, g_object_unref)
552diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx-with-gl-context.h 551diff --git a/gdk/x11/gdkx-with-gl-context.h b/gdk/x11/gdkx-with-gl-context.h
553similarity index 100% 552new file mode 100644
554rename from gdk/x11/gdkx.h 553index 0000000..ae05fa6
555rename to gdk/x11/gdkx-with-gl-context.h 554--- /dev/null
555+++ b/gdk/x11/gdkx-with-gl-context.h
556@@ -0,0 +1,59 @@
557+/* GDK - The GIMP Drawing Kit
558+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
559+ *
560+ * This library is free software; you can redistribute it and/or
561+ * modify it under the terms of the GNU Lesser General Public
562+ * License as published by the Free Software Foundation; either
563+ * version 2 of the License, or (at your option) any later version.
564+ *
565+ * This library is distributed in the hope that it will be useful,
566+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
567+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
568+ * Lesser General Public License for more details.
569+ *
570+ * You should have received a copy of the GNU Lesser General Public
571+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
572+ */
573+
574+/*
575+ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
576+ * file for a list of people on the GTK+ Team. See the ChangeLog
577+ * files for a list of changes. These files are distributed with
578+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
579+ */
580+
581+#ifndef __GDK_X_H__
582+#define __GDK_X_H__
583+
584+#include <gdk/gdk.h>
585+
586+#include <X11/Xlib.h>
587+#include <X11/Xutil.h>
588+
589+#define __GDKX_H_INSIDE__
590+
591+#include <gdk/x11/gdkx11applaunchcontext.h>
592+#include <gdk/x11/gdkx11cursor.h>
593+#include <gdk/x11/gdkx11device.h>
594+#include <gdk/x11/gdkx11device-core.h>
595+#include <gdk/x11/gdkx11device-xi2.h>
596+#include <gdk/x11/gdkx11devicemanager.h>
597+#include <gdk/x11/gdkx11devicemanager-core.h>
598+#include <gdk/x11/gdkx11devicemanager-xi2.h>
599+#include <gdk/x11/gdkx11display.h>
600+#include <gdk/x11/gdkx11displaymanager.h>
601+#include <gdk/x11/gdkx11dnd.h>
602+#include <gdk/x11/gdkx11glcontext.h>
603+#include <gdk/x11/gdkx11keys.h>
604+#include <gdk/x11/gdkx11property.h>
605+#include <gdk/x11/gdkx11screen.h>
606+#include <gdk/x11/gdkx11selection.h>
607+#include <gdk/x11/gdkx11utils.h>
608+#include <gdk/x11/gdkx11visual.h>
609+#include <gdk/x11/gdkx11window.h>
610+
611+#include <gdk/x11/gdkx-autocleanups.h>
612+
613+#undef __GDKX_H_INSIDE__
614+
615+#endif /* __GDK_X_H__ */
556diff --git a/gdk/x11/gdkx-without-gl-context.h b/gdk/x11/gdkx-without-gl-context.h 616diff --git a/gdk/x11/gdkx-without-gl-context.h b/gdk/x11/gdkx-without-gl-context.h
557new file mode 100644 617new file mode 100644
558index 0000000..c9e2617 618index 0000000..c9e2617
@@ -617,6 +677,71 @@ index 0000000..c9e2617
617+#undef __GDKX_H_INSIDE__ 677+#undef __GDKX_H_INSIDE__
618+ 678+
619+#endif /* __GDK_X_H__ */ 679+#endif /* __GDK_X_H__ */
680diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h
681deleted file mode 100644
682index ae05fa6..0000000
683--- a/gdk/x11/gdkx.h
684+++ /dev/null
685@@ -1,59 +0,0 @@
686-/* GDK - The GIMP Drawing Kit
687- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
688- *
689- * This library is free software; you can redistribute it and/or
690- * modify it under the terms of the GNU Lesser General Public
691- * License as published by the Free Software Foundation; either
692- * version 2 of the License, or (at your option) any later version.
693- *
694- * This library is distributed in the hope that it will be useful,
695- * but WITHOUT ANY WARRANTY; without even the implied warranty of
696- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
697- * Lesser General Public License for more details.
698- *
699- * You should have received a copy of the GNU Lesser General Public
700- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
701- */
702-
703-/*
704- * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
705- * file for a list of people on the GTK+ Team. See the ChangeLog
706- * files for a list of changes. These files are distributed with
707- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
708- */
709-
710-#ifndef __GDK_X_H__
711-#define __GDK_X_H__
712-
713-#include <gdk/gdk.h>
714-
715-#include <X11/Xlib.h>
716-#include <X11/Xutil.h>
717-
718-#define __GDKX_H_INSIDE__
719-
720-#include <gdk/x11/gdkx11applaunchcontext.h>
721-#include <gdk/x11/gdkx11cursor.h>
722-#include <gdk/x11/gdkx11device.h>
723-#include <gdk/x11/gdkx11device-core.h>
724-#include <gdk/x11/gdkx11device-xi2.h>
725-#include <gdk/x11/gdkx11devicemanager.h>
726-#include <gdk/x11/gdkx11devicemanager-core.h>
727-#include <gdk/x11/gdkx11devicemanager-xi2.h>
728-#include <gdk/x11/gdkx11display.h>
729-#include <gdk/x11/gdkx11displaymanager.h>
730-#include <gdk/x11/gdkx11dnd.h>
731-#include <gdk/x11/gdkx11glcontext.h>
732-#include <gdk/x11/gdkx11keys.h>
733-#include <gdk/x11/gdkx11property.h>
734-#include <gdk/x11/gdkx11screen.h>
735-#include <gdk/x11/gdkx11selection.h>
736-#include <gdk/x11/gdkx11utils.h>
737-#include <gdk/x11/gdkx11visual.h>
738-#include <gdk/x11/gdkx11window.h>
739-
740-#include <gdk/x11/gdkx-autocleanups.h>
741-
742-#undef __GDKX_H_INSIDE__
743-
744-#endif /* __GDK_X_H__ */
620diff --git a/gtk/Makefile.am b/gtk/Makefile.am 745diff --git a/gtk/Makefile.am b/gtk/Makefile.am
621index 6a53a2b..49a35e6 100644 746index 6a53a2b..49a35e6 100644
622--- a/gtk/Makefile.am 747--- a/gtk/Makefile.am
@@ -827,6 +952,3 @@ index e0ebee0..703643c 100644
827 /* Not allowed to finalize a GdkPixbufLoader without calling gdk_pixbuf_loader_close() */ 952 /* Not allowed to finalize a GdkPixbufLoader without calling gdk_pixbuf_loader_close() */
828 all_types[i] != GDK_TYPE_PIXBUF_LOADER && 953 all_types[i] != GDK_TYPE_PIXBUF_LOADER &&
829 all_types[i] != gdk_pixbuf_simple_anim_iter_get_type()) 954 all_types[i] != gdk_pixbuf_simple_anim_iter_get_type())
830--
8312.1.4
832