[gentoo-commits] repo/gentoo:master commit in: sys-apps/gnome-disk-utility/files/, sys-apps/gnome-disk-utility/

[gentoo-commits] repo/gentoo:master commit in: sys-apps/gnome-disk-utility/files/, sys-apps/gnome-disk-utility/

[Mart Raudsepp]

commit:     31a967f27b20276b029d831e6943e3d10951dd77
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 25 20:12:19 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Apr 25 20:17:33 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31a967f2

sys-apps/gnome-disk-utility: remove old

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 sys-apps/gnome-disk-utility/Manifest               |   1 -
 .../gnome-disk-utility/files/elogind-support.patch | 114 ---------------------
 .../gnome-disk-utility-3.32.1.ebuild               |  67 ------------
 3 files changed, 182 deletions(-)

diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest
index 678a7760a48..119ebab6095 100644
--- a/sys-apps/gnome-disk-utility/Manifest
+++ b/sys-apps/gnome-disk-utility/Manifest
@@ -1,2 +1 @@
-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

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 10ebcdc9f53..00000000000
--- 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 cba48c95092..00000000000
--- 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
-}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/gnome-disk-utility/files/, sys-apps/gnome-disk-utility/

[Sam James]

commit:     bb4c69bb3eec7768ec55dfa21a1ec60be70d63ac
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 20 10:52:57 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 20 10:52:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb4c69bb

sys-apps/gnome-disk-utility: fix build with meson 0.61

Closes: https://bugs.gentoo.org/831552
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../gnome-disk-utility-41.0-meson-0.61-build.patch | 28 ++++++++++++++++++++++
 .../gnome-disk-utility-41.0.ebuild                 |  6 ++++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-41.0-meson-0.61-build.patch b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-41.0-meson-0.61-build.patch
new file mode 100644
index 000000000000..c28b9002575e
--- /dev/null
+++ b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-41.0-meson-0.61-build.patch
@@ -0,0 +1,28 @@
+https://gitlab.gnome.org/GNOME/gnome-disk-utility/-/commit/46ed7d26873b9741dff61f9df8e7778a8dc6f5cc
+https://bugs.gentoo.org/831552
+
+From: rvalue <i@rvalue.moe>
+Date: Fri, 17 Dec 2021 12:29:30 +0000
+Subject: [PATCH] build: fix arguments of i18n.merge_file
+
+`i18n.merge_file` has been ignoring positional arguments for a time
+and explicitly rejects with error since meson 0.60.0
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -11,7 +11,6 @@ desktops = [
+ 
+ foreach desktop: desktops
+   i18n.merge_file (
+-    desktop,
+     type: 'desktop',
+     input: desktop + '.in',
+     output: desktop,
+@@ -38,7 +37,6 @@ install_data(
+ info = 'org.gnome.DiskUtility.appdata.xml'
+ 
+ i18n.merge_file(
+-  info,
+   input: info + '.in',
+   output: info,
+   po_dir: po_dir,
+GitLab

diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-41.0.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-41.0.ebuild
index 8a105cdcc510..29b765c1c98d 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-41.0.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-41.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -43,6 +43,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-meson-0.61-build.patch
+)
+
 src_configure() {
 	local emesonargs=(
 		-Dlogind=$(usex systemd libsystemd $(usex elogind libelogind none))