From 71ad9575f5f414b4c2ffc363c09623ecb6b3cddb Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Tue, 11 Jan 2022 13:15:48 +0100 Subject: imsettings: upgrade 1.8.2 -> 1.8.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller Signed-off-by: Khem Raj --- .../imsettings/imsettings/imsettings-gcc10.patch | 12 -------- .../imsettings/imsettings_1.8.2.bb | 34 ---------------------- .../imsettings/imsettings_1.8.3.bb | 34 ++++++++++++++++++++++ 3 files changed, 34 insertions(+), 46 deletions(-) delete mode 100644 meta-xfce/recipes-extended/imsettings/imsettings_1.8.2.bb create mode 100644 meta-xfce/recipes-extended/imsettings/imsettings_1.8.3.bb diff --git a/meta-xfce/recipes-extended/imsettings/imsettings/imsettings-gcc10.patch b/meta-xfce/recipes-extended/imsettings/imsettings/imsettings-gcc10.patch index 53280581b0..35f1cfec43 100644 --- a/meta-xfce/recipes-extended/imsettings/imsettings/imsettings-gcc10.patch +++ b/meta-xfce/recipes-extended/imsettings/imsettings/imsettings-gcc10.patch @@ -5,18 +5,6 @@ Imported from https://src.fedoraproject.org/rpms/imsettings/raw/master/f/imsetti Upstream-Status: Pending Signed-off-by: Khem Raj -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 diff --git a/meta-xfce/recipes-extended/imsettings/imsettings_1.8.2.bb b/meta-xfce/recipes-extended/imsettings/imsettings_1.8.2.bb deleted file mode 100644 index bc7d1bc0e8..0000000000 --- a/meta-xfce/recipes-extended/imsettings/imsettings_1.8.2.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "Delivery framework for general Input Method configuration" -DESCRIPTION = "IMSettings is a framework that delivers Input Method \ -settings and applies the changes so they take effect \ -immediately without any need to restart applications \ -or the desktop. \ -This package contains the core DBus services and some utilities." -HOMEPAGE = "http://code.google.com/p/imsettings/" -SECTION = "Applications/System" - -LICENSE = "LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" - -inherit autotools gtk-doc gobject-introspection gettext features_check - -DEPENDS = "gtk+3 libnotify" - -REQUIRED_DISTRO_FEATURES = "x11" - -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 \ - " - -PACKAGECONFIG ??= "xfce" -PACKAGECONFIG[xfce] = ",,xfconf" -PACKAGECONFIG[xim] = ",,libgxim" - -RDEPENDS:${PN} += "bash" - -FILES:${PN} += "${datadir}/dbus-1/*" diff --git a/meta-xfce/recipes-extended/imsettings/imsettings_1.8.3.bb b/meta-xfce/recipes-extended/imsettings/imsettings_1.8.3.bb new file mode 100644 index 0000000000..c94d5e893c --- /dev/null +++ b/meta-xfce/recipes-extended/imsettings/imsettings_1.8.3.bb @@ -0,0 +1,34 @@ +SUMMARY = "Delivery framework for general Input Method configuration" +DESCRIPTION = "IMSettings is a framework that delivers Input Method \ +settings and applies the changes so they take effect \ +immediately without any need to restart applications \ +or the desktop. \ +This package contains the core DBus services and some utilities." +HOMEPAGE = "http://code.google.com/p/imsettings/" +SECTION = "Applications/System" + +LICENSE = "LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" + +inherit autotools gtk-doc gobject-introspection gettext features_check + +DEPENDS = "gtk+3 libnotify" + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI = "https://bitbucket.org/tagoh/imsettings/downloads/${BPN}-${PV}.tar.bz2 \ + file://imsettings-gcc10.patch \ + " +SRC_URI[sha256sum] = "45986b9ca1b87b760a5dbaecd9a2b77d080adc47868a0512826077175d5b3ee3" + +EXTRA_OECONF = "--with-xinputsh=50-xinput.sh \ + --disable-static \ + " + +PACKAGECONFIG ??= "xfce" +PACKAGECONFIG[xfce] = ",,xfconf" +PACKAGECONFIG[xim] = ",,libgxim" + +RDEPENDS:${PN} += "bash" + +FILES:${PN} += "${datadir}/dbus-1/*" -- cgit v1.2.3-54-g00ecf