mirror of
https://git.yoctoproject.org/poky
synced 2026-02-15 21:23:04 +01:00
gtk+3: update to 3.12.2
fix-build-when-wayland-backend-enabled.patch removed as the issue is fixed in upstream. (From OE-Core rev: 59fe6f91b39c4aa67e7e1734c3731d49c7ea8376) Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
4cdc9fd08c
commit
28500e5209
@@ -49,7 +49,11 @@ LIBV = "3.0.0"
|
||||
FILES_${PN}-demo = "${bindir}/gtk3-demo \
|
||||
${bindir}/gtk3-demo-application \
|
||||
${bindir}/gtk3-widget-factory \
|
||||
${datadir}/gtk-3.0/demo"
|
||||
${datadir}/gtk-3.0/demo \
|
||||
${datadir}/applications/gtk3-demo.desktop \
|
||||
${datadir}/applications/gtk3-widget-factory.desktop \
|
||||
${datadir}/icons/hicolor/*/apps/gtk3-demo.png \
|
||||
${datadir}/icons/hicolor/*/apps/gtk3-widget-factory.png"
|
||||
|
||||
# The demo uses PNG files and mime type sniffing, so ensure that these
|
||||
# dependencies are present.
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
Fix build when wayland backend enabled
|
||||
|
||||
Upstream-Status: Submitted
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=710584
|
||||
|
||||
Author: Emilio Pozuelo Monfort
|
||||
|
||||
--- gtk+-3.10.7/gtk/gtkapplication.c
|
||||
+++ gtk+-3.10.7/gtk/gtkapplication.c
|
||||
@@ -144,7 +144,6 @@
|
||||
|
||||
gboolean register_session;
|
||||
|
||||
-#ifdef GDK_WINDOWING_X11
|
||||
guint next_id;
|
||||
|
||||
GDBusConnection *session_bus;
|
||||
@@ -161,7 +160,6 @@
|
||||
GDBusProxy *client_proxy;
|
||||
gchar *app_id;
|
||||
gchar *client_path;
|
||||
-#endif
|
||||
|
||||
#ifdef GDK_WINDOWING_QUARTZ
|
||||
GMenu *combined;
|
||||
@@ -299,6 +297,8 @@
|
||||
g_free (application->priv->client_path);
|
||||
}
|
||||
|
||||
+#endif
|
||||
+
|
||||
const gchar *
|
||||
gtk_application_get_app_menu_object_path (GtkApplication *application)
|
||||
{
|
||||
@@ -311,8 +311,6 @@
|
||||
return application->priv->menubar_path;
|
||||
}
|
||||
|
||||
-#endif
|
||||
-
|
||||
#ifdef GDK_WINDOWING_QUARTZ
|
||||
|
||||
typedef struct {
|
||||
@@ -4,12 +4,11 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
|
||||
|
||||
SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \
|
||||
file://hardcoded_libtool.patch \
|
||||
file://fix-build-when-wayland-backend-enabled.patch \
|
||||
file://fix-flags-for-native.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "18a81944a8506231529a76bf2b68372b"
|
||||
SRC_URI[sha256sum] = "b7e9de15385031cff43897e7e59f6692eaabf500f36eef80e6b9d6486ad49427"
|
||||
SRC_URI[md5sum] = "0d6d8f9f79132b3b47475d047b369b1c"
|
||||
SRC_URI[sha256sum] = "61d74eea74231b1ea4b53084a9d6fc9917ab0e1d71b69d92cbf60a4b4fb385d0"
|
||||
|
||||
S = "${WORKDIR}/gtk+-${PV}"
|
||||
|
||||
Reference in New Issue
Block a user