Initial commit
This commit is contained in:
Your Name
+27
@@ -0,0 +1,27 @@
|
||||
From e1a12b73c25d1ad0f267b22ac5d799bc1fbd0fa4 Mon Sep 17 00:00:00 2001
|
||||
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||||
Date: Tue, 30 May 2017 14:55:49 +0300
|
||||
Subject: [PATCH] Don't use AC_CANONICAL_HOST
|
||||
|
||||
This won't work when building allarch (and is only used to find out if
|
||||
target is windows).
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||||
|
||||
---
|
||||
configure.ac | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 6ddc49b..39752bb 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3,7 +3,6 @@ AC_PREREQ(2.53)
|
||||
|
||||
AC_INIT([adwaita-icon-theme], [43],
|
||||
[http://bugzilla.gnome.org/enter_bug.cgi?product=adwaita-icon-theme])
|
||||
-AC_CANONICAL_HOST
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
AC_CONFIG_SRCDIR([index.theme.in])
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
SUMMARY = "GTK+ icon theme"
|
||||
DESCRIPTION = "The Adwaita icon theme is the default icon theme of the GNOME desktop \
|
||||
This package package contains an icon theme for Gtk+ 3 applications."
|
||||
HOMEPAGE = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
|
||||
BUGTRACKER = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme/issues"
|
||||
SECTION = "x11/gnome"
|
||||
|
||||
LICENSE = "LGPL-3.0-only | CC-BY-SA-3.0"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=c84cac88e46fc07647ea07e6c24eeb7c \
|
||||
file://COPYING_CCBYSA3;md5=96143d33de3a79321b1006c4e8ed07e7 \
|
||||
file://COPYING_LGPL;md5=e6a600fd5e1d9cbde2d983680233ad02"
|
||||
|
||||
inherit allarch autotools pkgconfig gettext gtk-icon-cache gnomebase
|
||||
|
||||
SRC_URI += " file://0001-Don-t-use-AC_CANONICAL_HOST.patch"
|
||||
|
||||
SRC_URI[archive.sha256sum] = "2e3ac77d32a6aa5554155df37e8f0a0dd54fc5a65fd721e88d505f970da32ec6"
|
||||
|
||||
DEPENDS += "librsvg-native"
|
||||
|
||||
PACKAGES = "${PN}-cursors ${PN}-symbolic-hires ${PN}-symbolic ${PN}-hires ${PN}"
|
||||
|
||||
RREPLACES:${PN} = "gnome-icon-theme"
|
||||
RCONFLICTS:${PN} = "gnome-icon-theme"
|
||||
RPROVIDES:${PN} = "gnome-icon-theme"
|
||||
|
||||
FILES:${PN}-cursors = "${prefix}/share/icons/Adwaita/cursors/"
|
||||
FILES:${PN}-symbolic-hires = "${prefix}/share/icons/Adwaita/96x96/*/*.symbolic.png \
|
||||
${prefix}/share/icons/Adwaita/64x64/*/*.symbolic.png \
|
||||
${prefix}/share/icons/Adwaita/48x48/*/*.symbolic.png \
|
||||
${prefix}/share/icons/Adwaita/32x32/*/*.symbolic.png"
|
||||
FILES:${PN}-symbolic = "${prefix}/share/icons/Adwaita/16x16/*/*.symbolic.png \
|
||||
${prefix}/share/icons/Adwaita/24x24/*/*.symbolic.png \
|
||||
${prefix}/share/icons/Adwaita/scalable/*/*-symbolic*.svg"
|
||||
FILES:${PN}-hires = "${prefix}/share/icons/Adwaita/256x256/ \
|
||||
${prefix}/share/icons/Adwaita/512x512/"
|
||||
FILES:${PN} = "${prefix}/share/icons/Adwaita/ \
|
||||
${prefix}/share/pkgconfig/adwaita-icon-theme.pc"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
@@ -0,0 +1,28 @@
|
||||
Upstream-Status: Pending
|
||||
|
||||
In some circumstances, gconf isn't able to save configurations
|
||||
because ~/.config folder aka root_dir doesn't exist.
|
||||
This issue was not seen before because ~/.config directory is shared
|
||||
between several packages and one of those packages usually creates it
|
||||
by the time gconf wants to use it.
|
||||
|
||||
This patch makes sure that gconf creates the .config directory if it
|
||||
doesn't exist, along with the gconf directory inside it.
|
||||
|
||||
Signed-off-by: Jaewon Lee <jaewon.lee@xilinx.com>
|
||||
Signed-off-by: Alejandro Hernandez <alejandr@xilinx.com>
|
||||
|
||||
|
||||
Index: GConf-3.2.6/backends/markup-backend.c
|
||||
===================================================================
|
||||
--- GConf-3.2.6.orig/backends/markup-backend.c
|
||||
+++ GConf-3.2.6/backends/markup-backend.c
|
||||
@@ -276,7 +276,7 @@ resolve_address (const char *address,
|
||||
/* dir_mode without search bits */
|
||||
file_mode = dir_mode & (~0111);
|
||||
}
|
||||
- else if (g_mkdir (root_dir, dir_mode) < 0)
|
||||
+ else if (g_mkdir_with_parents (root_dir, dir_mode) < 0)
|
||||
{
|
||||
/* Error out even on EEXIST - shouldn't happen anyway */
|
||||
gconf_set_error (err, GCONF_ERROR_FAILED,
|
||||
@@ -0,0 +1,60 @@
|
||||
gconf: use python3
|
||||
|
||||
Convert gsettings-schema-convert to use python3.
|
||||
|
||||
Upstream-Status: Inappropriate [gconf is deprecated]
|
||||
|
||||
Signed-off-by: Joe Slater <joe.slater@windriver.com>
|
||||
|
||||
|
||||
--- a/gsettings/gsettings-schema-convert
|
||||
+++ b/gsettings/gsettings-schema-convert
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/env python3
|
||||
# vim: set ts=4 sw=4 et: coding=UTF-8
|
||||
#
|
||||
# Copyright (c) 2010, Novell, Inc.
|
||||
@@ -603,7 +603,7 @@ class SimpleSchemaParser:
|
||||
for line in lines:
|
||||
current_line_nb += 1
|
||||
self.parse_line(line)
|
||||
- except GSettingsSchemaConvertException, e:
|
||||
+ except GSettingsSchemaConvertException as e:
|
||||
raise GSettingsSchemaConvertException('%s:%s: %s' % (os.path.basename(self.file), current_line_nb, e))
|
||||
|
||||
return self.root
|
||||
@@ -1095,7 +1095,7 @@ def main(args):
|
||||
try:
|
||||
parser = GConfSchemaParser(argfile, options.gettext_domain, options.schema_id, options.keep_underscores)
|
||||
schema_root = parser.parse()
|
||||
- except SyntaxError, e:
|
||||
+ except SyntaxError as e:
|
||||
raise GSettingsSchemaConvertException('\'%s\' does not look like a valid gconf schema file: %s' % (argfile, e))
|
||||
else:
|
||||
# autodetect if file is XML or not
|
||||
@@ -1104,7 +1104,7 @@ def main(args):
|
||||
schema_root = parser.parse()
|
||||
if not options.simple and not options.xml:
|
||||
options.simple = True
|
||||
- except SyntaxError, e:
|
||||
+ except SyntaxError as e:
|
||||
parser = SimpleSchemaParser(argfile)
|
||||
schema_root = parser.parse()
|
||||
if not options.simple and not options.xml:
|
||||
@@ -1127,13 +1127,13 @@ def main(args):
|
||||
fout = open(options.output, 'w')
|
||||
fout.write(output)
|
||||
fout.close()
|
||||
- except GSettingsSchemaConvertException, e:
|
||||
+ except GSettingsSchemaConvertException as e:
|
||||
fout.close()
|
||||
if os.path.exists(options.output):
|
||||
os.unlink(options.output)
|
||||
raise e
|
||||
|
||||
- except GSettingsSchemaConvertException, e:
|
||||
+ except GSettingsSchemaConvertException as e:
|
||||
print >> sys.stderr, '%s' % e
|
||||
return 1
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
Upstream-Status: Pending
|
||||
|
||||
Remove '+' from invalid characters list
|
||||
|
||||
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
|
||||
|
||||
Index: GConf-3.2.5/gconf/gconf-backend.c
|
||||
===================================================================
|
||||
--- GConf-3.2.5.orig/gconf/gconf-backend.c
|
||||
+++ GConf-3.2.5/gconf/gconf-backend.c
|
||||
@@ -37,7 +37,7 @@ static const char invalid_chars[] =
|
||||
/* Space is common in user names (and thus home directories) on Windows */
|
||||
" "
|
||||
#endif
|
||||
- "\t\r\n\"$&<>,+=#!()'|{}[]?~`;%\\";
|
||||
+ "\t\r\n\"$&<>,=#!()'|{}[]?~`;%\\";
|
||||
|
||||
static gboolean
|
||||
gconf_address_valid (const char *address,
|
||||
@@ -0,0 +1,95 @@
|
||||
Fixes errors such as this in the rootfs generation:
|
||||
|
||||
(gconftool-2.real:10095): GConf-WARNING **: Client failed to connect to the D-BUS daemon:
|
||||
Using X11 for dbus-daemon autolaunch was disabled at compile time, set your DBUS_SESSION_BUS_ADDRESS instead
|
||||
|
||||
Upstream-Status: Backport
|
||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||
|
||||
From b0895e1998ebc83ab030ec0f17c0685439f5b404 Mon Sep 17 00:00:00 2001
|
||||
From: Ray Strode <rstrode@redhat.com>
|
||||
Date: Mon, 15 Apr 2013 09:57:34 -0400
|
||||
Subject: [PATCH] dbus: Don't spew to console when unable to connect to dbus
|
||||
daemon
|
||||
|
||||
Instead pass the error up for the caller to decide what to do.
|
||||
|
||||
This prevent untrappable warning messages from showing up at the
|
||||
console if gconftool --makefile-install-rule is called.
|
||||
---
|
||||
gconf/gconf-dbus.c | 24 ++++++++++++------------
|
||||
1 file changed, 12 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/gconf/gconf-dbus.c b/gconf/gconf-dbus.c
|
||||
index 5610fcf..048e3ea 100644
|
||||
--- a/gconf/gconf-dbus.c
|
||||
+++ b/gconf/gconf-dbus.c
|
||||
@@ -105,7 +105,7 @@ static GHashTable *engines_by_db = NULL;
|
||||
static GHashTable *engines_by_address = NULL;
|
||||
static gboolean dbus_disconnected = FALSE;
|
||||
|
||||
-static gboolean ensure_dbus_connection (void);
|
||||
+static gboolean ensure_dbus_connection (GError **error);
|
||||
static gboolean ensure_service (gboolean start_if_not_found,
|
||||
GError **err);
|
||||
static gboolean ensure_database (GConfEngine *conf,
|
||||
@@ -383,7 +383,7 @@ gconf_engine_detach (GConfEngine *conf)
|
||||
}
|
||||
|
||||
static gboolean
|
||||
-ensure_dbus_connection (void)
|
||||
+ensure_dbus_connection (GError **err)
|
||||
{
|
||||
DBusError error;
|
||||
|
||||
@@ -392,7 +392,9 @@ ensure_dbus_connection (void)
|
||||
|
||||
if (dbus_disconnected)
|
||||
{
|
||||
- g_warning ("The connection to DBus was broken. Can't reinitialize it.");
|
||||
+ g_set_error (err, GCONF_ERROR,
|
||||
+ GCONF_ERROR_NO_SERVER,
|
||||
+ "The connection to DBus was broken. Can't reinitialize it.");
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
@@ -402,7 +404,10 @@ ensure_dbus_connection (void)
|
||||
|
||||
if (!global_conn)
|
||||
{
|
||||
- g_warning ("Client failed to connect to the D-BUS daemon:\n%s", error.message);
|
||||
+ g_set_error (err, GCONF_ERROR,
|
||||
+ GCONF_ERROR_NO_SERVER,
|
||||
+ "Client failed to connect to the D-BUS daemon:\n%s",
|
||||
+ error.message);
|
||||
|
||||
dbus_error_free (&error);
|
||||
return FALSE;
|
||||
@@ -431,13 +436,8 @@ ensure_service (gboolean start_if_not_found,
|
||||
|
||||
if (global_conn == NULL)
|
||||
{
|
||||
- if (!ensure_dbus_connection ())
|
||||
- {
|
||||
- g_set_error (err, GCONF_ERROR,
|
||||
- GCONF_ERROR_NO_SERVER,
|
||||
- _("No D-BUS daemon running\n"));
|
||||
- return FALSE;
|
||||
- }
|
||||
+ if (!ensure_dbus_connection (err))
|
||||
+ return FALSE;
|
||||
|
||||
g_assert (global_conn != NULL);
|
||||
}
|
||||
@@ -2512,7 +2512,7 @@ gconf_ping_daemon (void)
|
||||
{
|
||||
if (global_conn == NULL)
|
||||
{
|
||||
- if (!ensure_dbus_connection ())
|
||||
+ if (!ensure_dbus_connection (NULL))
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
SUMMARY = "GNOME configuration system"
|
||||
DESCRIPTION = "GConf is a system for storing application preferences. \
|
||||
It is intended for user preferences; not configuration of something like \
|
||||
Apache, or arbitrary data storage."
|
||||
SECTION = "x11/gnome"
|
||||
HOMEPAGE = "https://gitlab.gnome.org/Archive/gconf"
|
||||
LICENSE = "LGPL-2.0-or-later"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
|
||||
|
||||
DEPENDS = "glib-2.0 glib-2.0-native dbus dbus-glib libxml2 intltool-native"
|
||||
|
||||
inherit gnomebase gtk-doc gettext gobject-introspection gio-module-cache
|
||||
|
||||
SRC_URI = "${GNOME_MIRROR}/GConf/${@gnome_verdir("${PV}")}/GConf-${PV}.tar.xz;name=archive \
|
||||
file://remove_plus_from_invalid_characters_list.patch \
|
||||
file://unable-connect-dbus.patch \
|
||||
file://create_config_directory.patch \
|
||||
file://python3.patch \
|
||||
"
|
||||
|
||||
SRC_URI[archive.md5sum] = "2b16996d0e4b112856ee5c59130e822c"
|
||||
SRC_URI[archive.sha256sum] = "1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c"
|
||||
|
||||
S = "${WORKDIR}/GConf-${PV}"
|
||||
|
||||
EXTRA_OECONF = "--enable-shared --disable-static \
|
||||
--disable-orbit --with-openldap=no --disable-gtk"
|
||||
|
||||
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)}"
|
||||
# We really don't want Polkit for native
|
||||
PACKAGECONFIG:class-native = ""
|
||||
|
||||
PACKAGECONFIG[polkit] = "--enable-defaults-service,--disable-defaults-service,polkit"
|
||||
PACKAGECONFIG[debug] = "--enable-debug=yes, --enable-debug=minimum"
|
||||
|
||||
do_install:append() {
|
||||
# this directory need to be created to avoid an Error 256 at gdm launch
|
||||
install -d ${D}${sysconfdir}/gconf/gconf.xml.system
|
||||
|
||||
# this stuff is unusable
|
||||
rm -f ${D}${libdir}/GConf/*/*.*a
|
||||
rm -f ${D}${libdir}/gio/*/*.*a
|
||||
}
|
||||
|
||||
do_install:append:class-native() {
|
||||
create_wrapper ${D}/${bindir}/gconftool-2 \
|
||||
GCONF_BACKEND_DIR=${STAGING_LIBDIR_NATIVE}/GConf/2
|
||||
}
|
||||
|
||||
FILES:${PN} += "${libdir}/GConf/* \
|
||||
${libdir}/gio/*/*.so \
|
||||
${datadir}/polkit* \
|
||||
${datadir}/dbus-1/services/*.service \
|
||||
${datadir}/dbus-1/system-services/*.service \
|
||||
"
|
||||
RDEPENDS:${PN} = "python3-xml"
|
||||
|
||||
FILES:${PN}-dev += "${datadir}/sgml/gconf/gconf-1.0.dtd"
|
||||
|
||||
BBCLASSEXTEND = "native"
|
||||
Reference in New Issue
Block a user