diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2020-08-12 15:01:41 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2020-08-13 22:32:07 -0700 |
| commit | a6f710f6cd320cedfc613a2c56b9586f884432d4 (patch) | |
| tree | f8ea7ca284ed46df4a1fe63a9ecbcde3802a1314 /meta-xfce | |
| parent | 5a35fe8124789ea54cebf5a102dbcd890583ca56 (diff) | |
| download | meta-openembedded-contrib-a6f710f6cd320cedfc613a2c56b9586f884432d4.tar.gz | |
imsettings: Upgrade to 1.8.2
Add a patch to fix build with -fno-common
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-xfce')
| -rw-r--r-- | meta-xfce/recipes-extended/imsettings/imsettings/imsettings-gcc10.patch | 31 | ||||
| -rw-r--r-- | meta-xfce/recipes-extended/imsettings/imsettings_1.8.2.bb (renamed from meta-xfce/recipes-extended/imsettings/imsettings_1.8.1.bb) | 7 |
2 files changed, 35 insertions, 3 deletions
diff --git a/meta-xfce/recipes-extended/imsettings/imsettings/imsettings-gcc10.patch b/meta-xfce/recipes-extended/imsettings/imsettings/imsettings-gcc10.patch new file mode 100644 index 0000000000..53280581b0 --- /dev/null +++ b/meta-xfce/recipes-extended/imsettings/imsettings/imsettings-gcc10.patch @@ -0,0 +1,31 @@ +Fix build with -fno-common + +Imported from https://src.fedoraproject.org/rpms/imsettings/raw/master/f/imsettings-gcc10.patch + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +diff -pruN imsettings-1.8.2.orig/imsettings-daemon/imsettings-proc.c imsettings-1.8.2/imsettings-daemon/imsettings-proc.c +--- imsettings-1.8.2.orig/imsettings-daemon/imsettings-proc.c 2019-01-18 20:52:58.000000000 +0900 ++++ imsettings-1.8.2/imsettings-daemon/imsettings-proc.c 2020-01-29 13:33:07.051676780 +0900 +@@ -84,7 +84,7 @@ static gboolean _stop_process + + G_DEFINE_TYPE_WITH_PRIVATE (IMSettingsProc, imsettings_proc, G_TYPE_OBJECT); + +-guint signals[LAST_SIGNAL] = { 0 }; ++static guint signals[LAST_SIGNAL] = { 0 }; + + /*< private >*/ + static gboolean +diff -pruN imsettings-1.8.2.orig/imsettings-daemon/imsettings-server.c imsettings-1.8.2/imsettings-daemon/imsettings-server.c +--- imsettings-1.8.2.orig/imsettings-daemon/imsettings-server.c 2019-11-14 14:08:03.000000000 +0900 ++++ imsettings-1.8.2/imsettings-daemon/imsettings-server.c 2020-01-29 13:32:50.827832726 +0900 +@@ -91,7 +91,7 @@ GDBusInterfaceVTable __iface_vtable = { + NULL, + NULL, + }; +-guint signals[LAST_SIGNAL]; ++static guint signals[LAST_SIGNAL]; + + G_DEFINE_TYPE_WITH_PRIVATE (IMSettingsServer, imsettings_server, G_TYPE_OBJECT); + G_LOCK_DEFINE_STATIC (logger); diff --git a/meta-xfce/recipes-extended/imsettings/imsettings_1.8.1.bb b/meta-xfce/recipes-extended/imsettings/imsettings_1.8.2.bb index c8f495edb7..bb7ff42355 100644 --- a/meta-xfce/recipes-extended/imsettings/imsettings_1.8.1.bb +++ b/meta-xfce/recipes-extended/imsettings/imsettings_1.8.2.bb @@ -16,9 +16,10 @@ DEPENDS = "gtk+3 libnotify" REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI = "https://bitbucket.org/tagoh/imsettings/downloads/${BPN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "c04341a008d8c60e1532f033f4020f44" -SRC_URI[sha256sum] = "ebf578299a10c6a1fea9047be6577df6d2b6470d3cc9d40f8a6589a3c13c4c8b" +SRC_URI = "https://bitbucket.org/tagoh/imsettings/downloads/${BPN}-${PV}.tar.bz2 \ + file://imsettings-gcc10.patch \ + " +SRC_URI[sha256sum] = "412abf3165dbee3cbe03db0c296bab103569a49029429d038569c586ebe9efa9" EXTRA_OECONF = "--with-xinputsh=50-xinput.sh \ --disable-static \ |