mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-11 04:49:58 +00:00
libgnomeui: remove
* libbonoboui is gone * project is dead - last release 2011 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Andreas Müller
committed by
Armin Kuster
Armin Kuster
parent
f2d6ae5110
commit
190bec6025
-78
@@ -1,78 +0,0 @@
|
|||||||
From 6697fcf9d7f53126b442bf19890640b5f88c8aa4 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
|
||||||
Date: Fri, 29 Jul 2016 21:24:20 +0200
|
|
||||||
Subject: [PATCH] suppress string format literal warning to fix build with gcc6
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
works around:
|
|
||||||
| ../../libgnomeui-2.24.5/libgnomeui/gnome-dateedit.c: In function 'day_selected':
|
|
||||||
| ../../libgnomeui-2.24.5/libgnomeui/gnome-dateedit.c:156:9: error: format not a string literal, format string not checked [-Werror=format-nonliteral]
|
|
||||||
| strftime_date_format, &mtm) == 0)
|
|
||||||
| ^~~~~~~~~~~~~~~~~~~~
|
|
||||||
| ../../libgnomeui-2.24.5/libgnomeui/gnome-dateedit.c: In function 'gnome_date_edit_set_time':
|
|
||||||
| ../../libgnomeui-2.24.5/libgnomeui/gnome-dateedit.c:704:2: error: format not a string literal, format string not checked [-Werror=format-nonliteral]
|
|
||||||
| if (strftime (buffer, sizeof (buffer), strftime_date_format, mytm) == 0)
|
|
||||||
| ^~
|
|
||||||
|
|
||||||
Upstream-Status: Pending
|
|
||||||
|
|
||||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
|
||||||
---
|
|
||||||
libgnomeui/gnome-dateedit.c | 6 ++++++
|
|
||||||
libgnomeui/gnome-gconf-ui.c | 3 +++
|
|
||||||
2 files changed, 9 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/libgnomeui/gnome-dateedit.c b/libgnomeui/gnome-dateedit.c
|
|
||||||
index 69ab699..41541c3 100644
|
|
||||||
--- a/libgnomeui/gnome-dateedit.c
|
|
||||||
+++ b/libgnomeui/gnome-dateedit.c
|
|
||||||
@@ -152,9 +152,12 @@ day_selected (GtkCalendar *calendar, GnomeDateEdit *gde)
|
|
||||||
else
|
|
||||||
mtm.tm_year = year;
|
|
||||||
|
|
||||||
+#pragma GCC diagnostic push
|
|
||||||
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
|
|
||||||
if (strftime (buffer, sizeof (buffer),
|
|
||||||
strftime_date_format, &mtm) == 0)
|
|
||||||
strcpy (buffer, "???");
|
|
||||||
+#pragma GCC diagnostic pop
|
|
||||||
buffer[sizeof(buffer)-1] = '\0';
|
|
||||||
|
|
||||||
/* FIXME: what about set time */
|
|
||||||
@@ -701,8 +704,11 @@ gnome_date_edit_set_time (GnomeDateEdit *gde, time_t the_time)
|
|
||||||
mytm = localtime (&the_time);
|
|
||||||
|
|
||||||
/* Set the date */
|
|
||||||
+#pragma GCC diagnostic push
|
|
||||||
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
|
|
||||||
if (strftime (buffer, sizeof (buffer), strftime_date_format, mytm) == 0)
|
|
||||||
strcpy (buffer, "???");
|
|
||||||
+#pragma GCC diagnostic pop
|
|
||||||
buffer[sizeof(buffer)-1] = '\0';
|
|
||||||
|
|
||||||
str_utf8 = g_locale_to_utf8 (buffer, -1, NULL, NULL, NULL);
|
|
||||||
diff --git a/libgnomeui/gnome-gconf-ui.c b/libgnomeui/gnome-gconf-ui.c
|
|
||||||
index 43c0f44..a84b2c0 100644
|
|
||||||
--- a/libgnomeui/gnome-gconf-ui.c
|
|
||||||
+++ b/libgnomeui/gnome-gconf-ui.c
|
|
||||||
@@ -180,12 +180,15 @@ error_idle_func (gpointer data)
|
|
||||||
"configuration settings may not work properly.");
|
|
||||||
}
|
|
||||||
|
|
||||||
+#pragma GCC diagnostic push
|
|
||||||
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
|
|
||||||
dialog = gtk_message_dialog_new (NULL /* parent */,
|
|
||||||
0 /* flags */,
|
|
||||||
GTK_MESSAGE_ERROR,
|
|
||||||
GTK_BUTTONS_OK,
|
|
||||||
fmt,
|
|
||||||
gnome_program_get_human_readable_name(gnome_program_get()));
|
|
||||||
+#pragma GCC diagnostic pop
|
|
||||||
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
|
|
||||||
g_signal_connect (dialog, "response",
|
|
||||||
G_CALLBACK (gtk_widget_destroy),
|
|
||||||
--
|
|
||||||
2.5.5
|
|
||||||
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
Description: Fix FTBFS with glib 2.54
|
|
||||||
glib-mkenums now expects input files to be UTF-8,
|
|
||||||
fix the encoding of libgnomeui/gnome-scores.h
|
|
||||||
Author: Adrian Bunk <bunk@debian.org>
|
|
||||||
|
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
||||||
Upstream-Status: Pending
|
|
||||||
|
|
||||||
Index: libgnomeui-2.24.5/libgnomeui/gnome-scores.h
|
|
||||||
===================================================================
|
|
||||||
--- libgnomeui-2.24.5.orig/libgnomeui/gnome-scores.h
|
|
||||||
+++ libgnomeui-2.24.5/libgnomeui/gnome-scores.h
|
|
||||||
@@ -27,7 +27,7 @@
|
|
||||||
* "High Scores" Widget
|
|
||||||
*
|
|
||||||
* AUTHOR:
|
|
||||||
- * Horacio J. Peña <horape@compendium.com.ar>
|
|
||||||
+ * Horacio J. Peña <horape@compendium.com.ar>
|
|
||||||
*
|
|
||||||
* This is free software (under the terms of the GNU LGPL)
|
|
||||||
*
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -1,11 +0,0 @@
|
|||||||
--- libgnomeui-2.6.1.1/configure.in.old 2004-08-04 00:28:43.582266664 +0100
|
|
||||||
+++ libgnomeui-2.6.1.1/configure.in 2004-08-04 00:29:27.496590672 +0100
|
|
||||||
@@ -235,7 +235,7 @@
|
|
||||||
|
|
||||||
dnl This is installed from GTK+ 2.0's gdk-pixbuf
|
|
||||||
AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource)
|
|
||||||
-test -z "$GDK_PIXBUF_CSOURCE" && AC_MSG_ERROR([
|
|
||||||
+test -z "$GDK_PIXBUF_CSOURCE" && AC_MSG_WARN([
|
|
||||||
*** You need the gdk-pixbuf-csource tool which is installed
|
|
||||||
*** from GTK+ 2.0's gdk-pixbuf.
|
|
||||||
***
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
DESCRIPTION = "GNOME User Interface Library"
|
|
||||||
LICENSE = "LGPLv2"
|
|
||||||
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605"
|
|
||||||
|
|
||||||
SECTION = "x11/gnome/libs"
|
|
||||||
DEPENDS = "libgnome libgnomecanvas libbonoboui libgnome-keyring intltool-native gnome-common-native"
|
|
||||||
|
|
||||||
inherit distro_features_check gnome
|
|
||||||
|
|
||||||
REQUIRED_DISTRO_FEATURES = "x11"
|
|
||||||
|
|
||||||
FILES_${PN} += "${libdir}/gtk-2.0/*/filesystems/lib*.so \
|
|
||||||
${libdir}/libglade/*/lib*.so \
|
|
||||||
${datadir}/pixmaps/gnome-about-logo.png"
|
|
||||||
FILES_${PN}-dev += "${libdir}/gtk-2.0/*/filesystems/*.la ${libdir}/gtk-2.0/*/filesystems/*.a ${libdir}/libglade/*/*.la"
|
|
||||||
FILES_${PN}-staticdev += "${libdir}/libglade/*/*.a"
|
|
||||||
|
|
||||||
SRC_URI += " \
|
|
||||||
file://0001-suppress-string-format-literal-warning-to-fix-build-.patch \
|
|
||||||
file://gnome-stock-pixbufs.h \
|
|
||||||
file://no-pixbuf-csource.patch \
|
|
||||||
file://05_fix_invalid_utf8.patch \
|
|
||||||
"
|
|
||||||
SRC_URI[archive.md5sum] = "d4bb506b1916015323928faab5aa708b"
|
|
||||||
SRC_URI[archive.sha256sum] = "ae352f2495889e65524c979932c909f4629a58e64290fb0c95333373225d3c0f"
|
|
||||||
GNOME_COMPRESS_TYPE="bz2"
|
|
||||||
|
|
||||||
EXTRA_OECONF = "--disable-gtk-doc"
|
|
||||||
|
|
||||||
do_configure_prepend() {
|
|
||||||
install -m 0644 ${WORKDIR}/gnome-stock-pixbufs.h ${S}/libgnomeui/pixmaps/gnome-stock-pixbufs.h
|
|
||||||
}
|
|
||||||
|
|
||||||
LDFLAGS += "-lm"
|
|
||||||
Reference in New Issue
Block a user