diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-05-14 11:09:11 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-05-14 11:09:11 +0100 |
commit | deba8115d2c2af26df42966b91ef04ff4dd79cde (patch) | |
tree | 9a48f42594e1a9e6b2020d5535a784314434d7a7 /sys-apps/gnome-disk-utility | |
parent | 38423c67c8a23f6a1bc42038193182e2da3116eb (diff) |
gentoo resync : 14.05.2020
Diffstat (limited to 'sys-apps/gnome-disk-utility')
-rw-r--r-- | sys-apps/gnome-disk-utility/Manifest | 3 | ||||
-rw-r--r-- | sys-apps/gnome-disk-utility/files/elogind-support.patch | 114 | ||||
-rw-r--r-- | sys-apps/gnome-disk-utility/gnome-disk-utility-3.32.1.ebuild | 67 |
3 files changed, 0 insertions, 184 deletions
diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest index 0164ad350b11..4b731d95d2b0 100644 --- a/sys-apps/gnome-disk-utility/Manifest +++ b/sys-apps/gnome-disk-utility/Manifest @@ -1,6 +1,3 @@ -AUX elogind-support.patch 4363 BLAKE2B 060db5cb921d8b51d7eb3acd76186649b3d3887ebd72aaca79dfcdc44a602591d3d9ee11047af1655678e6a9f5c2fd445e67cb66b65cc1ac0a244db22b8f9c1d SHA512 1f7ec2af9e2764f338d5d903ce506a8416d21cf03be6c2dc927d3fde67420c5a9066244db0e3837468fa2bea0527643bfb55dc6db8524e8122467d13e19db418 -DIST gnome-disk-utility-3.32.1.tar.xz 1370900 BLAKE2B 4986169bff7f438b4a9dc9fe10ea69521c41afaa268bfebdf195ff3fedc14e0d8204e66b258c71f599867c0279c781ca5ceb175381dcc8004c41d97be92ebf46 SHA512 80c4e2fb1ca6136579203c3df73da4c8ef7d496ab73166096768d72b3473d11e9ae199d4aa1878c49ec4280ea98d2136e084a03bba50c2728be4c5e4d508967c DIST gnome-disk-utility-3.34.5.tar.xz 1385256 BLAKE2B d13202abf77c62cdbf483486d7ed8204016111042f29fc810f0a55a9cd3dd48553d523523348e73a5d3dc3c3133939577b14227f2f5122471076cd93482dde15 SHA512 04c1ba0865b3947cfc332e479faae7b404f70907d04446bfe471d8fa2f8f5c921b1d59ab0f82fad13f4183401dacf3a516ee7ec439e94dc3e073a8dd62021a51 -EBUILD gnome-disk-utility-3.32.1.ebuild 1628 BLAKE2B 93d66bb65cde741ff9516b2f988dbc4969bf062f69f9641b2986d4cf19e239b9c497039ea2664f0bee4acc5c6a7b565ef0b77e7bd82b6a8144e95e01d83dccf0 SHA512 6405ec7f54dbe3f6ff8272c7fd529369052bbbe5ded1cae4a2f48f8ef74067e7aa768cb63d86043cd87ad24ce176728722303075ef82e089f3721b9135fcedc4 EBUILD gnome-disk-utility-3.34.5.ebuild 1384 BLAKE2B 37135b54a03394ffb218821ade9332fb528994772bfcb69a0e665376ee4ce8107906ad865e2ace1db9949ba48be319b4297f9383bfb27945da3bb1839dca1283 SHA512 024bbfe9275316bd5e6beac2fca0bddbf1450310c9df2724ac6f67aa4cf1c1f00899dfd1a6ddbafd5ac8acb13e633ecb7fa44bfc0441e9efc68e6bad700ff52e MISC metadata.xml 597 BLAKE2B 6a1f81b2d7758158e8469a0544ce2ca45af42d24379391870b55fd97fd6dd963228136329af658851ecead1c14bf5a92658e6fde18223842451a9d85ccd628de SHA512 40904280037c0754d3481458bf024f83382e65122188f8fece8cd361cab57e01dfbc7b85da631b4265aaa6107567e376f4291e9f6e60e5e89bc747908c8e496c diff --git a/sys-apps/gnome-disk-utility/files/elogind-support.patch b/sys-apps/gnome-disk-utility/files/elogind-support.patch deleted file mode 100644 index 10ebcdc9f53d..000000000000 --- a/sys-apps/gnome-disk-utility/files/elogind-support.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 2c09cf164f654a5ed2bc153db30710999842c7a5 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp <leio@gentoo.org> -Date: Tue, 9 Apr 2019 13:16:46 +0300 -Subject: [PATCH] build: add elogind support for seat retrieval - ---- - meson.build | 21 ++++++++++++--------- - meson_options.txt | 3 ++- - src/libgdu/gduutils.c | 4 ++-- - src/libgdu/meson.build | 5 +---- - 4 files changed, 17 insertions(+), 16 deletions(-) - -diff --git a/meson.build b/meson.build -index a5149c8e..ac641928 100644 ---- a/meson.build -+++ b/meson.build -@@ -3,7 +3,7 @@ project( - version: '3.32.0', - license: 'GPL2.0', - default_options: 'buildtype=debugoptimized', -- meson_version: '>= 0.43.0' -+ meson_version: '>= 0.47.0' - ) - - gdu_name = 'gnome-disk-utility' -@@ -75,13 +75,16 @@ libnotify_dep = dependency('libnotify', version: '>= 0.7') - liblzma_dep = dependency('liblzma', version: '>= 5.0.5') - m_dep = cc.find_library('m') - --# *** Check for libsystemd *** --enable_libsystemd = get_option('libsystemd') --if enable_libsystemd -- libsystemd_dep = dependency('libsystemd', version: '>= 209', required: false) -- config_h.set('HAVE_LIBSYSTEMD', libsystemd_dep.found(), -- description: 'Define to 1 if libsystemd is available') -+# *** Check for logind *** -+assert(not (get_option('libsystemd').enabled() and get_option('libelogind').enabled()), 'Can not support systemd and elogind at once') -+if not get_option('libelogind').enabled() -+ logind_dep = dependency('libsystemd', version: '>= 209', required: get_option('libsystemd')) - endif -+if get_option('libelogind').enabled() or not logind_dep.found() -+ logind_dep = dependency('libelogind', version: '>= 209', required: get_option('libelogind')) -+endif -+config_h.set('HAVE_LOGIND', logind_dep.found(), -+ description: 'Define to 1 if logind API is available') - - gnome = import('gnome') - i18n = import('i18n') -@@ -123,9 +126,9 @@ output += ' libexecdir: ' + gdu_libexecdir + '\n' - output += ' localedir: ' + gdu_localedir + '\n' - output += ' mandir: ' + gdu_mandir + '\n' - output += ' sysconfdir: ' + gdu_sysconfdir + '\n\n' --output += ' Use libsystemd: ' + enable_libsystemd.to_string() + '\n' -+output += ' Use logind: ' + logind_dep.found().to_string() + '\n' - output += ' Build g-s-d plug-in: ' + enable_gsd_plugin.to_string() + '\n\n' - output += ' compiler: ' + cc.get_id() + '\n' - output += ' cflags: ' + ' '.join(compiler_flags) + '\n\n' --output += ' (Change with: meson configure BUILDDIR -D libsystemd=true|false -D gsd_plugin=true|false)\n\n' -+output += ' (Change with: meson configure BUILDDIR -D libelogind=auto|enabled|disabled -D libsystemd=auto|enabled|disabled -D gsd_plugin=true|false)\n\n' - message(output) -diff --git a/meson_options.txt b/meson_options.txt -index 952f5d24..895fc115 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -1,2 +1,3 @@ --option('libsystemd', type: 'boolean', value: true, description: 'build with libsystemd') -+option('libelogind', type: 'feature', value: 'auto', description: 'build with libelogind') -+option('libsystemd', type: 'feature', value: 'auto', description: 'build with libsystemd') - option('gsd_plugin', type: 'boolean', value: true, description: 'build gnome-settings-daemon plug-in') -diff --git a/src/libgdu/gduutils.c b/src/libgdu/gduutils.c -index 59a26f3a..bff70304 100644 ---- a/src/libgdu/gduutils.c -+++ b/src/libgdu/gduutils.c -@@ -19,7 +19,7 @@ - # include <features.h> - #endif - --#if defined(HAVE_LIBSYSTEMD) -+#if defined(HAVE_LOGIND) - #include <systemd/sd-login.h> - #endif - -@@ -405,7 +405,7 @@ gdu_options_update_entry_option (GtkWidget *options_entry, - g_free (opts); - } - --#if defined(HAVE_LIBSYSTEMD) -+#if defined(HAVE_LOGIND) - - const gchar * - gdu_utils_get_seat (void) -diff --git a/src/libgdu/meson.build b/src/libgdu/meson.build -index 00f7edd7..0693b229 100644 ---- a/src/libgdu/meson.build -+++ b/src/libgdu/meson.build -@@ -17,14 +17,11 @@ deps = [ - udisk_dep, - gtk_dep, - libsecret_dep, -+ logind_dep, - pwquality_dep, - m_dep - ] - --if enable_libsystemd -- deps += libsystemd_dep --endif -- - cflags = [ - '-DPACKAGE_DATA_DIR="@0@"'.format(gdu_datadir), - '-DG_LOG_DOMAIN="libgdu"', --- -2.17.0 - diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.32.1.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.32.1.ebuild deleted file mode 100644 index cba48c95092d..000000000000 --- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.32.1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit gnome.org gnome2-utils meson xdg - -DESCRIPTION="Disk Utility for GNOME using udisks" -HOMEPAGE="https://wiki.gnome.org/Apps/Disks" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="fat elogind gnome systemd" -REQUIRED_USE="?? ( elogind systemd )" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" - -COMMON_DEPEND=" - >=dev-libs/glib-2.31:2 - >=sys-fs/udisks-2.7.6:2 - >=x11-libs/gtk+-3.16.0:3 - >=app-crypt/libsecret-0.7 - >=dev-libs/libpwquality-1.0.0 - >=media-libs/libcanberra-0.1[gtk3] - >=media-libs/libdvdread-4.2.0:0= - >=x11-libs/libnotify-0.7:= - >=app-arch/xz-utils-5.0.5 - elogind? ( >=sys-auth/elogind-209 ) - systemd? ( >=sys-apps/systemd-209:0= ) -" -RDEPEND="${COMMON_DEPEND} - x11-themes/adwaita-icon-theme - fat? ( sys-fs/dosfstools ) - gnome? ( >=gnome-base/gnome-settings-daemon-3.8 ) -" -# appstream-glib for developer_name tag in appdata (gettext-0.19.8.1 own appdata.its file doesn't have it yet) -# libxml2 for xml-stripblanks in gresource -DEPEND="${COMMON_DEPEND} - dev-libs/appstream-glib - dev-libs/libxml2:2 - dev-libs/libxslt - dev-util/glib-utils - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/elogind-support.patch # https://gitlab.gnome.org/GNOME/gnome-disk-utility/merge_requests/15 -) - -src_configure() { - local emesonargs=( - $(meson_feature elogind libelogind) - $(meson_feature systemd libsystemd) - $(meson_use gnome gsd_plugin) - ) - meson_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} |