From 9bebac99a0171a341f014daf22a79a4c8a056bb2 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 18 Dec 2018 15:38:40 +0800 Subject: usermode: 1.112 -> 1.113 Drop backported patches - 0001-Missing-n-in-translated-string.patch - 0001-Include-sys-sysmacros.h-for-major-minor.patch Signed-off-by: Hongxu Jia Signed-off-by: Khem Raj --- ...1-Include-sys-sysmacros.h-for-major-minor.patch | 25 ----------------- .../0001-Missing-n-in-translated-string.patch | 28 ------------------- .../recipes-support/usermode/usermode_1.112.bb | 31 ---------------------- .../recipes-support/usermode/usermode_1.113.bb | 29 ++++++++++++++++++++ 4 files changed, 29 insertions(+), 84 deletions(-) delete mode 100644 meta-gnome/recipes-support/usermode/usermode/0001-Include-sys-sysmacros.h-for-major-minor.patch delete mode 100644 meta-gnome/recipes-support/usermode/usermode/0001-Missing-n-in-translated-string.patch delete mode 100644 meta-gnome/recipes-support/usermode/usermode_1.112.bb create mode 100644 meta-gnome/recipes-support/usermode/usermode_1.113.bb diff --git a/meta-gnome/recipes-support/usermode/usermode/0001-Include-sys-sysmacros.h-for-major-minor.patch b/meta-gnome/recipes-support/usermode/usermode/0001-Include-sys-sysmacros.h-for-major-minor.patch deleted file mode 100644 index 277f6e21b0..0000000000 --- a/meta-gnome/recipes-support/usermode/usermode/0001-Include-sys-sysmacros.h-for-major-minor.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 75539659396b18110d5a52a8a32845254b4d8eca Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 11 Aug 2018 18:25:47 -0700 -Subject: [PATCH] Include sys/sysmacros.h for major/minor - -usermount.c:238: undefined reference to `major' - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - usermount.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/usermount.c b/usermount.c -index 4107027..21ef77f 100644 ---- a/usermount.c -+++ b/usermount.c -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/meta-gnome/recipes-support/usermode/usermode/0001-Missing-n-in-translated-string.patch b/meta-gnome/recipes-support/usermode/usermode/0001-Missing-n-in-translated-string.patch deleted file mode 100644 index 9db700e96b..0000000000 --- a/meta-gnome/recipes-support/usermode/usermode/0001-Missing-n-in-translated-string.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 7cbc6441cd06e0c0bb51ac37c8f22b0fd51f12f2 Mon Sep 17 00:00:00 2001 -From: Jiri Kucera -Date: Wed, 11 Apr 2018 17:13:44 +0200 -Subject: [PATCH] Missing \n in translated string - -Upstream-Status: Backport - -Signed-off-by: Hongxu Jia ---- - po/tr.po | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/po/tr.po b/po/tr.po -index 84e5021..a28e947 100644 ---- a/po/tr.po -+++ b/po/tr.po -@@ -408,7 +408,7 @@ msgstr "Grafik pencere açılamadı ve uçbirim denetimi bulunamadı.\n" - #: ../../po/../userpasswd.c:37 - #, c-format - msgid "Unexpected command-line arguments\n" --msgstr "Beklenmeyen komut satırı argümanları" -+msgstr "Beklenmeyen komut satırı argümanları\n" - - #: ../../po/../userinfo.c:411 - #, c-format --- -2.7.4 - diff --git a/meta-gnome/recipes-support/usermode/usermode_1.112.bb b/meta-gnome/recipes-support/usermode/usermode_1.112.bb deleted file mode 100644 index 82ccf3eda7..0000000000 --- a/meta-gnome/recipes-support/usermode/usermode_1.112.bb +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION = "The usermode contains the userhelper program, which can be used to allow configured \ -programs to be run with superuser privileges by ordinary users, and several \ -graphical tools for users: \ -* userinfo allows users to change their finger information. \ -* usermount lets users mount, unmount, and format filesystems. \ -* userpasswd allows users to change their passwords. \ -" -HOMEPAGE = "https://pagure.io/usermode" -LICENSE = "GPLv2+" -DEPENDS = "libuser ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} \ - gtk+ desktop-file-utils-native \ - startup-notification intltool-native \ - util-linux \ -" - -SRC_URI = "https://releases.pagure.org/${BPN}/${BPN}-${PV}.tar.xz \ - file://0001-fix-compile-failure-against-musl-C-library.patch \ - file://0001-Makefile.am-Link-with-libm-for-powl-API.patch \ - file://0001-Missing-n-in-translated-string.patch \ - file://0001-Include-sys-sysmacros.h-for-major-minor.patch \ - " -SRC_URI[md5sum] = "a766a9f7600f573fb6de4655d4162196" -SRC_URI[sha256sum] = "37c4d667209da14082c08df6e48fe955d1532efebd5322f13f94683c6cc10370" - -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -inherit distro_features_check autotools gettext pkgconfig - -EXTRA_OEMAKE += "INSTALL='install -p'" - -REQUIRED_DISTRO_FEATURES = "x11 pam" diff --git a/meta-gnome/recipes-support/usermode/usermode_1.113.bb b/meta-gnome/recipes-support/usermode/usermode_1.113.bb new file mode 100644 index 0000000000..0527836269 --- /dev/null +++ b/meta-gnome/recipes-support/usermode/usermode_1.113.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "The usermode contains the userhelper program, which can be used to allow configured \ +programs to be run with superuser privileges by ordinary users, and several \ +graphical tools for users: \ +* userinfo allows users to change their finger information. \ +* usermount lets users mount, unmount, and format filesystems. \ +* userpasswd allows users to change their passwords. \ +" +HOMEPAGE = "https://pagure.io/usermode" +LICENSE = "GPLv2+" +DEPENDS = "libuser ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} \ + gtk+ desktop-file-utils-native \ + startup-notification intltool-native \ + util-linux \ +" + +SRC_URI = "https://releases.pagure.org/${BPN}/${BPN}-${PV}.tar.xz \ + file://0001-fix-compile-failure-against-musl-C-library.patch \ + file://0001-Makefile.am-Link-with-libm-for-powl-API.patch \ + " +SRC_URI[md5sum] = "eadfbff18578b645096b6fa61854b41d" +SRC_URI[sha256sum] = "99fbfd248b411ed0e7c44d1957b0ecde699b5a968a4db5d37228e82e7b1ba092" + +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +inherit distro_features_check autotools gettext pkgconfig + +EXTRA_OEMAKE += "INSTALL='install -p'" + +REQUIRED_DISTRO_FEATURES = "x11 pam" -- cgit 1.2.3-korg