* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-settings-daemon/, ...
@ 2025-03-10 2:25 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2025-03-10 2:25 UTC (permalink / raw
To: gentoo-commits
commit: f89958738ce41b71aa322024d92ae0c9553c1120
Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Mon Dec 9 06:11:26 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 10 02:24:01 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8995873
gnome-extra/cinnamon-settings-daemon: add 6.4.3
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
| 1 +
.../cinnamon-settings-daemon-6.4.3.ebuild | 118 ++++++++++++++++++
...on-settings-daemon-6.4.0-generate-tz-data.patch | 135 +++++++++++++++++++++
3 files changed, 254 insertions(+)
--git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index 39a55c895ccd..1b240f2e9cd8 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -1 +1,2 @@
DIST cinnamon-settings-daemon-6.2.0.tar.gz 578907 BLAKE2B 24b9591f5e6bbacd92f564bfb4f1960c14bca78194dd00746ff4b31f2a6b99d09a701ca939aa39b932141c7c13d998b1a061185bd7b751815dbd8b43d1fceec2 SHA512 c2102ace141448694a4d22331f1b039ccdca41988165f0e1af4446c527be89f8ae2f87e0555a0cf4fa5bbb31e5c866f0c9c7a52174a1664183695695b5eed7be
+DIST cinnamon-settings-daemon-6.4.3.tar.gz 601452 BLAKE2B 1cb9b49c04f03f3c9d8357e3f9570aecd41bfc4abe5c9fa84410d33566906e4ee8ba44947a98958633ca423b394efc07c0dd670206b332f0efcaf3839e682830 SHA512 d21d8e1fa80f54b7bc5bde9e42c939e99247df6cb1c1f00ec0de46f938c476bf3633647fa8a1d9962498d62aecd7a624826f97c145d9bd05aaf3f82180a95a5a
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.4.3.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.4.3.ebuild
new file mode 100644
index 000000000000..6d30ff904984
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.4.3.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit meson flag-o-matic gnome2-utils python-any-r1 xdg
+
+DESCRIPTION="Cinnamon's settings daemon"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-settings-daemon"
+SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2+ LGPL-2.1 LGPL-2.1+ MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="+colord cups input_devices_wacom smartcard systemd wayland"
+
+RDEPEND="
+ >=dev-libs/glib-2.40.0:2[dbus]
+ dev-libs/libgudev
+ >=gnome-base/libgnomekbd-3.6:=
+ >=gnome-extra/cinnamon-desktop-6.4:0=
+ media-libs/fontconfig
+ >=media-libs/lcms-2.2:2
+ || (
+ media-libs/libcanberra-gtk3
+ media-libs/libcanberra[gtk3(-),pulseaudio]
+ )
+ >=media-libs/libpulse-0.9.16[glib]
+ >=sys-auth/polkit-0.97
+ sys-libs/timezone-data:=
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/libnotify-0.7.3
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ >=x11-libs/libxklavier-5.0:=
+ >=x11-libs/pango-1.20.0
+ >=sys-power/upower-0.9.11:=
+
+ colord? ( >=x11-misc/colord-0.1.27:= )
+ cups? (
+ >=net-print/cups-1.4[dbus]
+ app-admin/system-config-printer
+ net-print/cups-pk-helper )
+ input_devices_wacom? (
+ >=x11-libs/gtk+-3.24.41-r1:3[wayland?,X]
+ >=dev-libs/libwacom-0.7:=
+ >=gnome-base/librsvg-2.36.2
+ )
+ !input_devices_wacom? (
+ >=x11-libs/gtk+-3.14.0:3
+ )
+ smartcard? (
+ dev-libs/nspr
+ >=dev-libs/nss-3.11.2
+ )
+ systemd? ( sys-apps/systemd:0= )
+ !systemd? ( sys-auth/elogind )
+"
+DEPEND="
+ ${RDEPEND}
+ dev-libs/libxml2:2
+ x11-base/xorg-proto
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+ dev-util/glib-utils
+ dev-util/gdbus-codegen
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ # Generate tz data header on build
+ # https://github.com/linuxmint/cinnamon-settings-daemon/pull/405
+ "${FILESDIR}/${PN}-6.4.0-generate-tz-data.patch"
+)
+
+src_prepare() {
+ default
+ python_fix_shebang install-scripts plugins/color
+ rm plugins/color/tz-coords.h || die "Error removing stale tz-coords.h"
+}
+
+src_configure() {
+ # The only component that uses gdk backends is the wacom plugin
+ if use input_devices_wacom; then
+ # defang automagic dependencies
+ use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND
+ fi
+
+ # gudev not optional on Linux platforms
+ local emesonargs=(
+ -Duse_gudev=enabled
+ -Duse_polkit=enabled
+ -Duse_logind=enabled
+ -Dgenerate_tz_coords=true
+ -Dzone_tab="${EPREFIX}/usr/share/zoneinfo/zone1970.tab"
+ $(meson_feature colord use_color)
+ $(meson_feature cups use_cups)
+ $(meson_feature smartcard use_smartcard)
+ $(meson_feature input_devices_wacom use_wacom)
+ )
+ meson_src_configure
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-6.4.0-generate-tz-data.patch b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-6.4.0-generate-tz-data.patch
new file mode 100644
index 000000000000..eeb8535fe9f5
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-6.4.0-generate-tz-data.patch
@@ -0,0 +1,135 @@
+From 2f235c32d055d0a2f0683855a283a049a1905e7c Mon Sep 17 00:00:00 2001
+From: Sparky Bluefang <sparky@bluefang-logic.com>
+Date: Mon, 9 Dec 2024 00:24:08 -0500
+Subject: [PATCH] Add options to call generate-tz-header as part of the build
+ process.
+
+---
+ meson_options.txt | 12 +++++++++++
+ plugins/color/generate-tz-header.py | 33 +++++++++++++++++------------
+ plugins/color/meson.build | 14 +++++++++++-
+ 3 files changed, 45 insertions(+), 14 deletions(-)
+
+diff --git a/meson_options.txt b/meson_options.txt
+index e3c89f3..81db2ba 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -58,3 +58,15 @@ option(
+ value: false,
+ description: 'Show additional build warnings'
+ )
++option(
++ 'generate_tz_coords',
++ type: 'boolean',
++ value: false,
++ description: 'Generate TZCoords header from tzdata'
++)
++option(
++ 'zone_tab',
++ type: 'string',
++ value: '/usr/share/zoneinfo/zone.tab',
++ description: 'Path to tzdata zone.tab or zone1970.tab'
++)
+diff --git a/plugins/color/generate-tz-header.py b/plugins/color/generate-tz-header.py
+index cc1d399..d725727 100755
+--- a/plugins/color/generate-tz-header.py
++++ b/plugins/color/generate-tz-header.py
+@@ -1,20 +1,27 @@
+-#!/usr/bin/python3
++#!/usr/bin/env python3
+
+ import re
++from argparse import ArgumentParser
++from pathlib import Path
++
++COORDS_RE = re.compile(r"([+-])([0-9]+)([+-])([0-9]+)")
+
+ d = {}
+
++parser = ArgumentParser(prog='generate-tz-header',
++ description='Generate tz-coords.h header from timezone-data')
++parser.add_argument('-i', '--zone_tab', nargs='?', default='/usr/share/zoneinfo/zone.tab', type=Path)
++parser.add_argument('-o', '--out_file', nargs='?', default='tz-coords.h', type=Path)
++args = parser.parse_args()
+
+-with open("/usr/share/zoneinfo/zone.tab", "r") as f:
++with open(args.zone_tab, "r") as f:
+ for line in f:
+- if line.startswith("#"):
++ line = line.strip()
++ if not line or line.startswith("#"):
+ continue
+
+- res = re.search(r"([A-Z]{2})\s([0-9-+]+)\s([\w/_\-]+)\s", line)
+- code, coords, tz = res.groups()
+-
+- res = re.search(r"([+-]{1})([0-9]+)([+-]{1})([0-9]+)", coords)
+- lat_sign, lat_val, long_sign, long_val = res.groups()
++ coords, tz = line.split('\t')[1:3]
++ lat_sign, lat_val, long_sign, long_val = COORDS_RE.search(coords).groups()
+
+ lat_str = lat_sign + lat_val[0:2] + "." + lat_val[2:]
+ long_str = long_sign + long_val[0:3] + "." + long_val[3:]
+@@ -25,17 +32,17 @@
+ d[tz] = [lat, long]
+
+ header = """
+-// Generated from /usr/share/zoneinfo/zone.tab, used by csd-nightlight.c to calculate sunrise and sunset based on the system timezone
++// Generated from %s, used by csd-nightlight.c to calculate sunrise and sunset based on the system timezone
+
+ typedef struct
+ {
+- const char *timezone;
++ const gchar *timezone;
+ double latitude;
+ double longitude;
+ } TZCoords;
+
+ static TZCoords tz_coord_list[] = {
+-"""
++""" % (args.zone_tab)
+
+ for zone in sorted(d.keys()):
+ latitude, longitude = d[zone]
+@@ -44,7 +51,7 @@
+
+ header += "};"
+
+-with open("tz-coords.h", "w") as f:
++with open(args.out_file, "w") as f:
+ f.write(header)
+
+-quit()
+\ No newline at end of file
++quit()
+diff --git a/plugins/color/meson.build b/plugins/color/meson.build
+index 42638cf..e421e52 100644
+--- a/plugins/color/meson.build
++++ b/plugins/color/meson.build
+@@ -1,5 +1,17 @@
+ plugin_name='color'
+
++if get_option('generate_tz_coords')
++ prog_python = find_program('python3')
++
++ tz_coords_h = custom_target(
++ 'tz_coords_h',
++ input: get_option('zone_tab'),
++ output: 'tz-coords.h',
++ command: [prog_python, '@CURRENT_SOURCE_DIR@/generate-tz-header.py', '-i', '@INPUT@', '-o', '@OUTPUT@']
++ )
++else
++ tz_coords_h = files('tz-coords.h')
++endif
+
+ built_sources = gnome.gdbus_codegen(
+ 'cinnamon-session-dbus',
+@@ -32,7 +44,7 @@ color_deps = [
+
+ executable(
+ 'csd-' + plugin_name,
+- sources + built_sources,
++ sources + built_sources + [tz_coords_h],
+ include_directories: [include_dirs, common_inc],
+ dependencies: color_deps,
+ c_args: [
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-settings-daemon/, ...
@ 2024-09-27 5:57 Eli Schwartz
0 siblings, 0 replies; 7+ messages in thread
From: Eli Schwartz @ 2024-09-27 5:57 UTC (permalink / raw
To: gentoo-commits
commit: 9241024ec5416abe4559b0305cbc151a783d9020
Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Thu Sep 26 22:42:58 2024 +0000
Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Fri Sep 27 05:55:53 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9241024e
gnome-extra/cinnamon-settings-daemon: drop 6.0.0-r1
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>
| 1 -
.../cinnamon-settings-daemon-6.0.0-r1.ebuild | 99 ----------------------
.../files/cinnamon-settings-daemon-6.0.0-c99.patch | 26 ------
3 files changed, 126 deletions(-)
--git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index 4feffe546d51..39a55c895ccd 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -1,2 +1 @@
-DIST cinnamon-settings-daemon-6.0.0.tar.gz 578061 BLAKE2B f05e14e9d3c15bc94df5435b0f317e1924993fbf4908491ea5a825b623c6a6f127ce20f5c31f54bfbd547a70ad645c3dbe71d9c55f790a3e0730d55bc58d6316 SHA512 44348765bf8c0cb941d177a6765aef10796d72f5c215dbffa4b514523956e257128d6bbbb0dcd9c3f0b2bcde24745e082ad82a7cee149125903e13b349c07200
DIST cinnamon-settings-daemon-6.2.0.tar.gz 578907 BLAKE2B 24b9591f5e6bbacd92f564bfb4f1960c14bca78194dd00746ff4b31f2a6b99d09a701ca939aa39b932141c7c13d998b1a061185bd7b751815dbd8b43d1fceec2 SHA512 c2102ace141448694a4d22331f1b039ccdca41988165f0e1af4446c527be89f8ae2f87e0555a0cf4fa5bbb31e5c866f0c9c7a52174a1664183695695b5eed7be
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.0.0-r1.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.0.0-r1.ebuild
deleted file mode 100644
index 4f9a1ab66101..000000000000
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.0.0-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit meson gnome2-utils python-any-r1 xdg
-
-DESCRIPTION="Cinnamon's settings daemon"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-settings-daemon"
-SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2+ LGPL-2.1 LGPL-2.1+ MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="+colord cups input_devices_wacom smartcard systemd wayland"
-
-RDEPEND="
- >=dev-libs/glib-2.40.0:2[dbus]
- dev-libs/libgudev
- >=gnome-base/libgnomekbd-3.6:=
- >=gnome-extra/cinnamon-desktop-6.0:0=
- media-libs/fontconfig
- >=media-libs/lcms-2.2:2
- media-libs/libcanberra[gtk3,pulseaudio]
- >=media-libs/libpulse-0.9.16[glib]
- >=sys-auth/polkit-0.97
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.14.0:3[wayland=]
- >=x11-libs/libnotify-0.7.3
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- >=x11-libs/libxklavier-5.0:=
- >=x11-libs/pango-1.20.0
- >=sys-power/upower-0.9.11:=
-
- colord? ( >=x11-misc/colord-0.1.27:= )
- cups? (
- >=net-print/cups-1.4[dbus]
- app-admin/system-config-printer
- net-print/cups-pk-helper )
- input_devices_wacom? (
- >=dev-libs/libwacom-0.7:=
- >=gnome-base/librsvg-2.36.2 )
- smartcard? (
- dev-libs/nspr
- >=dev-libs/nss-3.11.2
- )
- systemd? ( sys-apps/systemd:0= )
- !systemd? ( sys-auth/elogind )
-"
-DEPEND="
- ${RDEPEND}
- dev-libs/libxml2:2
- x11-base/xorg-proto
-"
-BDEPEND="
- ${PYTHON_DEPS}
- dev-util/glib-utils
- dev-util/gdbus-codegen
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-6.0.0-c99.patch
-)
-
-src_prepare() {
- default
- python_fix_shebang install-scripts
-}
-
-src_configure() {
- # gudev not optional on Linux platforms
- local emesonargs=(
- -Duse_gudev=enabled
- -Duse_polkit=enabled
- -Duse_logind=enabled
- $(meson_feature colord use_color)
- $(meson_feature cups use_cups)
- $(meson_feature smartcard use_smartcard)
- $(meson_feature input_devices_wacom use_wacom)
- )
- meson_src_configure
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-6.0.0-c99.patch b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-6.0.0-c99.patch
deleted file mode 100644
index 36ce9365a554..000000000000
--- a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-6.0.0-c99.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://bugs.gentoo.org/919084
-https://github.com/linuxmint/cinnamon-settings-daemon/commit/48da3c4763bea93ea3e1d2ba2e2dfdb7f41d8afc
-
-From 48da3c4763bea93ea3e1d2ba2e2dfdb7f41d8afc Mon Sep 17 00:00:00 2001
-From: Leigh Scott <leigh123linux@gmail.com>
-Date: Mon, 5 Feb 2024 16:07:03 +0000
-Subject: [PATCH] Fix compile issue (#386)
-
-(Warning becomes an error due to gcc 14 changes)
---- a/plugins/keyboard/gkbd-configuration.c
-+++ b/plugins/keyboard/gkbd-configuration.c
-@@ -340,11 +340,11 @@ gkbd_configuration_get_xkl_engine (GkbdConfiguration *configuration)
- const char * const *
- gkbd_configuration_get_group_names (GkbdConfiguration *configuration)
- {
-- return configuration->priv->full_group_names;
-+ return (const char * const *)configuration->priv->full_group_names;
- }
-
- const char * const *
- gkbd_configuration_get_short_group_names (GkbdConfiguration *configuration)
- {
-- return configuration->priv->short_group_names;
-+ return (const char * const *)configuration->priv->short_group_names;
- }
-
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-settings-daemon/, ...
@ 2021-06-12 3:55 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2021-06-12 3:55 UTC (permalink / raw
To: gentoo-commits
commit: b62db7c94cf9b636dd0206fb571741a921e9e2d5
Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Fri Jun 11 16:40:13 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 12 03:55:14 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b62db7c9
gnome-extra/cinnamon-settings-daemon: drop old
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
| 1 -
.../cinnamon-settings-daemon-4.6.4.ebuild | 114 ---------------------
...amon-settings-daemon-3.8.0-accountservice.patch | 57 -----------
3 files changed, 172 deletions(-)
--git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index 9aa971d4d2e..35b6896bbd7 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -1,3 +1,2 @@
-DIST cinnamon-settings-daemon-4.6.4.tar.gz 668339 BLAKE2B 80e14d29a74004c1778e90d39c6ca892d3eee778134e43b8ea77cfec8cbad4f5ac21609cfbb9cdaab0b4d35b42e897223a5b9cdfd43de49d8112b8bc6fc45914 SHA512 77ddb637fd93fdfd59fb27c5a10082259fd99b4753ff36b3473db12f2fe0d19ee89d44c9e72f1ce9eab3f228c5fef418ce774dd78746d77b959ad9d8f93c1208
DIST cinnamon-settings-daemon-4.8.5.tar.gz 662123 BLAKE2B b3ddd72e55c10c2cacc6dd29145e381395bd2ef68db7082a0770bb3eb647964041ed023d4a8357f2adcf5e8c9f8f713bac837809ed5926cc0434c2dc3e5c90ad SHA512 4a1d128b3f6faf3e2c13420d3569d4fd8cfaa1798ba5cf83fcb692662b9888d22f9f4bfb6fe18af59d0632583a2730a07e3ab48cca12c357b2d318d205fd7d0a
DIST cinnamon-settings-daemon-5.0.0.tar.gz 662485 BLAKE2B 33c7cf208f66f480ab3d70e4e7627e65f059ae13a3f24142f6cd0743752f9d636066c2ed8a805c649726280887b882bc0bc53e4c590888937bb977183a43e4ef SHA512 0e2ef144717ca41d946d6467931fb45eabf3468025e6bc4cf25f9b11f2d94dae07f7649874d801b312d94905d30d4e74202bf8f01af53689179039865ea54052
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.6.4.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.6.4.ebuild
deleted file mode 100644
index 41f1514f1b0..00000000000
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.6.4.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools eutils gnome2-utils virtualx xdg
-
-DESCRIPTION="Cinnamon's settings daemon"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
-SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+colord cups input_devices_wacom smartcard systemd"
-RESTRICT="test"
-
-# udev is non-optional since lots of plugins, not just gudev, pull it in
-RDEPEND="
- >=dev-libs/glib-2.38:2
- dev-libs/libgudev:=
- >=gnome-base/libgnomekbd-3.6
- >=gnome-extra/cinnamon-desktop-4.6:0=
- media-libs/fontconfig
- >=media-libs/lcms-2.2:2
- media-libs/libcanberra:0=[gtk3]
- >=sys-apps/dbus-1.1.2
- dev-libs/dbus-glib
- >=sys-auth/polkit-0.97
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.9.10:3
- >=x11-libs/libnotify-0.7.3:0=
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- >=x11-libs/libxklavier-5.0
- >=sys-power/upower-0.9.11
-
- colord? ( >=x11-misc/colord-0.1.27:= )
- cups? (
- >=net-print/cups-1.4[dbus]
- app-admin/system-config-printer
- net-print/cups-pk-helper )
- input_devices_wacom? (
- >=dev-libs/libwacom-0.7
- >=gnome-base/librsvg-2.36.2
- x11-drivers/xf86-input-wacom
- x11-libs/libXtst )
- smartcard? ( >=dev-libs/nss-3.11.2 )
- systemd? ( sys-apps/systemd:0= )
- !systemd? ( sys-auth/elogind:0= )
-"
-DEPEND="${RDEPEND}
- dev-libs/libxml2:2
- x11-base/xorg-proto
-"
-BDEPEND="
- dev-util/glib-utils
- dev-util/gdbus-codegen
- >=dev-util/intltool-0.37.1
- virtual/pkgconfig
-"
-
-PATCHES=(
- # Make account-services optional
- "${FILESDIR}"/${PN}-3.8.0-accountservice.patch
-)
-
-src_prepare() {
- xdg_src_prepare
- eautoreconf
- gnome2_disable_deprecation_warning
-
- # Disable broken test
- sed -e '/g_test_add_func ("\/color\/edid/d' \
- -i plugins/color/gcm-self-test.c || die
-}
-
-src_configure() {
- # no point in disabling gudev since other plugins pull it in
- econf \
- --disable-maintainer-mode \
- --disable-schemas-compile \
- --enable-compile-warnings=minimum \
- --disable-static \
- --enable-gudev \
- --enable-polkit \
- --enable-logind \
- --disable-accountservice \
- $(use_enable colord color) \
- $(use_enable cups) \
- $(use_enable smartcard smartcard-support) \
- $(use_enable input_devices_wacom wacom)
-}
-
-src_test() {
- virtx emake check
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
- dodoc MAINTAINERS
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.8.0-accountservice.patch b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.8.0-accountservice.patch
deleted file mode 100644
index c12f2730cea..00000000000
--- a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.8.0-accountservice.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 15b1c1488f28e69cee86ff25bf0c95ebf5245add Mon Sep 17 00:00:00 2001
-From: Kristian Fiskerstrand <kf@sumptuouscapital.com>
-Date: Sat, 30 Jun 2018 22:35:52 +0200
-Subject: [PATCH] Make account service optional
-
----
- configure.ac | 6 ++++++
- plugins/background/csd-background-manager.c | 4 ++--
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index af5d3a4..a30126e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -166,6 +166,12 @@ else
- fi
- AM_CONDITIONAL(HAVE_GUDEV, test x$have_gudev = xyes)
-
-+AC_ARG_ENABLE(accountservice, AS_HELP_STRING([--disable-accountservice],[Disable accountservice]), enable_accountservice=$enableval)
-+
-+if test x$enable_accountservice = "xyes"; then
-+ AC_DEFINE(HAVE_ACCOUNTSERVICE, 1, [define if accountservice is available])
-+fi
-+
- dnl ---------------------------------------------------------------------------
- dnl - common
- dnl ---------------------------------------------------------------------------
-diff --git a/plugins/background/csd-background-manager.c b/plugins/background/csd-background-manager.c
-index 282094a..a692c6e 100644
---- a/plugins/background/csd-background-manager.c
-+++ b/plugins/background/csd-background-manager.c
-@@ -135,9 +135,9 @@ settings_change_event_cb (GSettings *settings,
- {
- gnome_bg_load_from_preferences (manager->priv->bg,
- manager->priv->settings);
--
-+#ifdef HAVE_ACCOUNTSERVICE
- gnome_bg_set_accountsservice_background (gnome_bg_get_filename (manager->priv->bg));
--
-+#endif
- return FALSE;
- }
-
-diff --git a/plugins/background/csd-background-manager.c
-b/plugins/background/csd-background-manager.c
-index a692c6e..a99b478 100644
---- a/plugins/background/csd-background-manager.c
-+++ b/plugins/background/csd-background-manager.c
-@@ -186,8 +186,9 @@ setup_bg (CsdBackgroundManager *manager)
- watch_bg_preferences (manager);
- gnome_bg_load_from_preferences (manager->priv->bg,
- manager->priv->settings);
--
-+#ifdef HAVE_ACCOUNTSERVICE
- gnome_bg_set_accountsservice_background (gnome_bg_get_filename (manager->priv->bg));
-+#endif
- }
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-settings-daemon/, ...
@ 2021-01-24 17:31 Joonas Niilola
0 siblings, 0 replies; 7+ messages in thread
From: Joonas Niilola @ 2021-01-24 17:31 UTC (permalink / raw
To: gentoo-commits
commit: fd9c5742eea0dc3daa007c6c22e379c5e4cd5327
Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Fri Jan 8 06:44:15 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 17:30:55 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd9c5742
gnome-extra/cinnamon-settings-daemon: 4.8.5 version bump
Project was converted to meson.
Bug: https://bugs.gentoo.org/757708
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
| 1 +
.../cinnamon-settings-daemon-4.8.5.ebuild | 93 ++++++++++++++
...innamon-settings-daemon-4.8.5-build-fixes.patch | 140 +++++++++++++++++++++
3 files changed, 234 insertions(+)
--git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index 23c2aa901c2..747883e3639 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -1 +1,2 @@
DIST cinnamon-settings-daemon-4.6.4.tar.gz 668339 BLAKE2B 80e14d29a74004c1778e90d39c6ca892d3eee778134e43b8ea77cfec8cbad4f5ac21609cfbb9cdaab0b4d35b42e897223a5b9cdfd43de49d8112b8bc6fc45914 SHA512 77ddb637fd93fdfd59fb27c5a10082259fd99b4753ff36b3473db12f2fe0d19ee89d44c9e72f1ce9eab3f228c5fef418ce774dd78746d77b959ad9d8f93c1208
+DIST cinnamon-settings-daemon-4.8.5.tar.gz 662123 BLAKE2B b3ddd72e55c10c2cacc6dd29145e381395bd2ef68db7082a0770bb3eb647964041ed023d4a8357f2adcf5e8c9f8f713bac837809ed5926cc0434c2dc3e5c90ad SHA512 4a1d128b3f6faf3e2c13420d3569d4fd8cfaa1798ba5cf83fcb692662b9888d22f9f4bfb6fe18af59d0632583a2730a07e3ab48cca12c357b2d318d205fd7d0a
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.8.5.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.8.5.ebuild
new file mode 100644
index 00000000000..decd70b8dc1
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.8.5.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson gnome2-utils xdg
+
+DESCRIPTION="Cinnamon's settings daemon"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-settings-daemon"
+SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+colord cups input_devices_wacom smartcard systemd"
+
+RDEPEND="
+ >=dev-libs/glib-2.40.0:2
+ dev-libs/libgudev:=
+ >=gnome-base/libgnomekbd-3.6
+ >=gnome-extra/cinnamon-desktop-4.8:0=
+ media-libs/fontconfig
+ >=media-libs/lcms-2.2:2
+ media-libs/libcanberra:0=[gtk3,pulseaudio]
+ >=media-sound/pulseaudio-0.9.16[glib]
+ >=sys-apps/dbus-1.1.2
+ dev-libs/dbus-glib
+ >=sys-auth/polkit-0.97
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-3.14.0:3
+ >=x11-libs/libnotify-0.7.3:0=
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ >=x11-libs/libxklavier-5.0
+ >=sys-power/upower-0.9.11
+
+ colord? ( >=x11-misc/colord-0.1.27:= )
+ cups? (
+ >=net-print/cups-1.4[dbus]
+ app-admin/system-config-printer
+ net-print/cups-pk-helper )
+ input_devices_wacom? (
+ >=dev-libs/libwacom-0.7
+ >=gnome-base/librsvg-2.36.2
+ x11-drivers/xf86-input-wacom
+ x11-libs/libXtst )
+ smartcard? ( >=dev-libs/nss-3.11.2 )
+ systemd? ( sys-apps/systemd:0= )
+ !systemd? ( sys-auth/elogind:0= )
+"
+DEPEND="
+ ${RDEPEND}
+ dev-libs/libxml2:2
+ x11-base/xorg-proto
+"
+BDEPEND="
+ dev-util/glib-utils
+ dev-util/gdbus-codegen
+ >=dev-util/intltool-0.37.1
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ # Miscellaneous meson configuration/compilation fixes
+ # https://github.com/linuxmint/cinnamon-settings-daemon/pull/314
+ "${FILESDIR}/${PN}-4.8.5-build-fixes.patch"
+)
+
+src_configure() {
+ # gudev not optional on Linux platforms
+ local emesonargs=(
+ -Duse_gudev=enabled
+ -Duse_polkit=enabled
+ -Duse_logind=enabled
+ $(meson_feature colord use_color)
+ $(meson_feature cups use_cups)
+ $(meson_feature smartcard use_smartcard)
+ $(meson_feature input_devices_wacom use_wacom)
+ )
+ meson_src_configure
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-4.8.5-build-fixes.patch b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-4.8.5-build-fixes.patch
new file mode 100644
index 00000000000..f70d1e544e9
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-4.8.5-build-fixes.patch
@@ -0,0 +1,140 @@
+From 281bc6b8e0085a91b7e59af45469c4da397646c2 Mon Sep 17 00:00:00 2001
+From: Sparky Bluefang <sparky@bluefang-logic.com>
+Date: Mon, 28 Dec 2020 17:05:21 -0500
+Subject: [PATCH] build: Add missing defines. Fix optional wacom build. Make
+ build options behave consistently.
+
+---
+ meson.build | 20 ++++++++++++--------
+ meson_options.txt | 14 ++++++++++----
+ plugins/meson.build | 2 +-
+ plugins/xrandr/meson.build | 1 +
+ 4 files changed, 24 insertions(+), 13 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 0e11d50..0d6c35a 100644
+--- a/meson.build
++++ b/meson.build
+@@ -9,6 +9,7 @@ pkgname = meson.project_name().to_lower()
+ api_version = '3.0'
+
+ cc = meson.get_compiler('c')
++cargs = []
+
+ # directories
+ prefix = get_option('prefix')
+@@ -43,7 +44,7 @@ endif
+ cinnamon_desktop_required = '>= 4.8.0'
+ canberra = dependency('libcanberra-gtk3')
+ cinnamon_desktop = dependency('cinnamon-desktop', version: cinnamon_desktop_required)
+-colord = dependency('colord', version: '>= 0.1.27')
++colord = dependency('colord', version: '>= 0.1.27', required: get_option('use_color'))
+ cups = dependency('cups', version: '>= 1.4', required: get_option('use_cups'))
+ cvc = dependency('cvc', version: cinnamon_desktop_required)
+ fontconfig = dependency('fontconfig')
+@@ -56,13 +57,13 @@ gtk = dependency('gtk+-3.0', version: '>= 3.14.0')
+ gudev = dependency('gudev-1.0', required: get_option('use_gudev'))
+ libnotify = dependency('libnotify', version: '>= 0.7.3')
+ kbproto = dependency('kbproto')
+-nss = dependency('nss', version: '>= 3.11.2', required: get_option('enable_smartcard'))
++nss = dependency('nss', version: '>= 3.11.2', required: get_option('use_smartcard'))
+ polkit = dependency('polkit-gobject-1', version: '>= 0.97', required: get_option('use_polkit'))
+ pulse_required = '>= 0.9.16'
+ pulse = dependency('libpulse', version: pulse_required)
+ pulse_glib = dependency('libpulse-mainloop-glib', version: pulse_required)
+ upower_glib = dependency('upower-glib', version: '>= 0.9.11')
+-wacom = dependency('libwacom', version: '>= 0.7', required: false)
++wacom = dependency('libwacom', version: '>= 0.7', required: get_option('use_wacom'))
+ x11 = dependency('x11')
+ xext = dependency('xext')
+ xfixes = dependency('xfixes')
+@@ -80,13 +81,12 @@ librsvg = dependency('librsvg-2.0', version: '>= 2.36.2', required: wacom.found(
+ xorg_wacom = dependency('xorg-wacom', required: wacom.found())
+
+ lcms = dependency('lcms2', version: '>= 2.2', required: false)
+-has_new_lcms = lcms.found()
+-if not has_new_lcms
+- lcms = dependency('lcms2')
++if lcms.found()
++ cargs += '-DHAVE_NEW_LCMS'
++else
++ lcms = dependency('lcms2', required: colord.found())
+ endif
+
+-cargs = []
+-
+ using_logind = false
+ if not get_option('use_logind').disabled()
+ logind = dependency('libsystemd-logind', required: false)
+@@ -125,6 +125,10 @@ if gudev.found()
+ cargs += '-DHAVE_GUDEV'
+ endif
+
++if wacom.found()
++ cargs += '-DHAVE_WACOM'
++endif
++
+ if not get_option('enable_debug')
+ cargs += [
+ '-Wno-deprecated-declarations',
+diff --git a/meson_options.txt b/meson_options.txt
+index 0a6941b..e3c89f3 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -35,20 +35,26 @@ option(
+ description: 'Whether cups (and therefore the print notifications plugin) support should be enabled'
+ )
+ option(
+- 'enable_smartcard',
++ 'use_smartcard',
+ type: 'feature',
+ value: 'enabled',
+ description: 'Set to false to disable smartcard support'
+ )
+ option(
+ 'use_color',
+- type: 'boolean',
+- value: true,
++ type: 'feature',
++ value: 'enabled',
+ description: 'Whether the color plugin should be enabled'
+ )
++option(
++ 'use_wacom',
++ type: 'feature',
++ value: 'auto',
++ description: 'Whether the wacom plugin should be enabled'
++)
+ option(
+ 'enable_debug',
+ type: 'boolean',
+ value: false,
+ description: 'Show additional build warnings'
+-)
+\ No newline at end of file
++)
+diff --git a/plugins/meson.build b/plugins/meson.build
+index 0d11a52..069366d 100644
+--- a/plugins/meson.build
++++ b/plugins/meson.build
+@@ -24,7 +24,7 @@ subdir('sound')
+ subdir('xrandr')
+ subdir('xsettings')
+
+-if get_option('use_color')
++if colord.found()
+ subdir('color')
+ endif
+
+diff --git a/plugins/xrandr/meson.build b/plugins/xrandr/meson.build
+index db2bf73..3296f1a 100644
+--- a/plugins/xrandr/meson.build
++++ b/plugins/xrandr/meson.build
+@@ -11,6 +11,7 @@ xrandr_deps = [
+ csd_dep,
+ libnotify,
+ upower_glib,
++ wacom,
+ xfixes,
+ ]
+
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-settings-daemon/, ...
@ 2020-12-27 5:06 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2020-12-27 5:06 UTC (permalink / raw
To: gentoo-commits
commit: 1c427f0f90d8c1ca128e216d8bb351e09d29d42c
Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Thu Dec 24 06:52:55 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 05:06:35 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c427f0f
gnome-extra/cinnamon-settings-daemon: Remove old
Closes: https://bugs.gentoo.org/734384
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
| 1 -
.../cinnamon-settings-daemon-4.4.0.ebuild | 94 ----------------------
.../cinnamon-settings-daemon-3.0.1-optional.patch | 84 -------------------
.../cinnamon-settings-daemon-4.4.0-systemd.patch | 36 ---------
4 files changed, 215 deletions(-)
--git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index 1b1c7374faa..23c2aa901c2 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -1,2 +1 @@
-DIST cinnamon-settings-daemon-4.4.0.tar.gz 665615 BLAKE2B ef0666864a4735ff32d57a584004176c74d0f0ad4b077d3439e135c1d24c8d0606221a1b1693a0189972b462055478680b03917a6acfcdfdc80649f7ee0fc224 SHA512 dc4b0c570b345577bd20e85b44f4c99c3e3c88a2c2aea7c928e1fae931dc4dc07c6dd64c5917661434d35e3ae606c8189c3f77e0658925b5cc6ba2dc1885cb81
DIST cinnamon-settings-daemon-4.6.4.tar.gz 668339 BLAKE2B 80e14d29a74004c1778e90d39c6ca892d3eee778134e43b8ea77cfec8cbad4f5ac21609cfbb9cdaab0b4d35b42e897223a5b9cdfd43de49d8112b8bc6fc45914 SHA512 77ddb637fd93fdfd59fb27c5a10082259fd99b4753ff36b3473db12f2fe0d19ee89d44c9e72f1ce9eab3f228c5fef418ce774dd78746d77b959ad9d8f93c1208
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.4.0.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.4.0.ebuild
deleted file mode 100644
index c38c65257e3..00000000000
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.4.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 virtualx
-
-DESCRIPTION="Cinnamon's settings daemon"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
-SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+colord cups input_devices_wacom smartcard systemd"
-RESTRICT=test
-
-# udev is non-optional since lots of plugins, not just gudev, pull it in
-RDEPEND="
- >=dev-libs/glib-2.38:2
- dev-libs/libgudev:=
- >=gnome-base/libgnomekbd-3.6
- >=gnome-extra/cinnamon-desktop-4.4:0=
- media-libs/fontconfig
- >=media-libs/lcms-2.2:2
- media-libs/libcanberra:0=[gtk3]
- >=sys-apps/dbus-1.1.2
- dev-libs/dbus-glib
- >=sys-auth/polkit-0.97
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.9.10:3
- >=x11-libs/libnotify-0.7.3:0=
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- >=x11-libs/libxklavier-5.0
- >=sys-power/upower-0.9.11
-
- colord? ( >=x11-misc/colord-0.1.27:= )
- cups? (
- >=net-print/cups-1.4[dbus]
- app-admin/system-config-printer
- net-print/cups-pk-helper )
- input_devices_wacom? (
- >=dev-libs/libwacom-0.7
- >=gnome-base/librsvg-2.36.2
- x11-drivers/xf86-input-wacom
- x11-libs/libXtst )
- smartcard? ( >=dev-libs/nss-3.11.2 )
- systemd? ( sys-apps/systemd:0= )
- !systemd? ( sys-auth/elogind:0= )
-"
-DEPEND="${RDEPEND}
- dev-util/glib-utils
- dev-util/gdbus-codegen
- dev-libs/libxml2:2
- >=dev-util/intltool-0.37.1
- x11-base/xorg-proto
- virtual/pkgconfig
-"
-
-src_prepare() {
- # make colord and wacom optional
- eapply "${FILESDIR}"/${PN}-3.0.1-optional.patch
- eapply "${FILESDIR}"/${PN}-3.8.0-accountservice.patch
- eapply "${FILESDIR}"/${PN}-4.4.0-systemd.patch
-
- # Disable broken test
- sed -e '/g_test_add_func ("\/color\/edid/d' \
- -i plugins/color/gcm-self-test.c || die
-
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- # no point in disabling gudev since other plugins pull it in
- gnome2_src_configure \
- --disable-static \
- --enable-gudev \
- --enable-polkit \
- --enable-logind \
- --disable-accountservice \
- $(use_enable colord color) \
- $(use_enable cups) \
- $(use_enable smartcard smartcard-support) \
- $(use_enable input_devices_wacom wacom)
-}
-
-src_test() {
- virtx emake check
-}
diff --git a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.0.1-optional.patch b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.0.1-optional.patch
deleted file mode 100644
index c12d7636f96..00000000000
--- a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.0.1-optional.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- a/configure.ac~ 2016-05-10 17:30:40.000000000 +0200
-+++ b/configure.ac 2016-06-25 17:43:46.554279197 +0200
-@@ -259,14 +259,28 @@
- dnl - color
- dnl ---------------------------------------------------------------------------
-
--PKG_CHECK_MODULES(COLOR, [colord >= 0.1.27 cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
-+AC_ARG_ENABLE(color,
-+ AS_HELP_STRING([--disable-color], [disable Colord support (default: enabled)]),,
-+ enable_color=yes)
-+build_color=false
-+if test x"$enable_color" != x"no" ; then
-+ PKG_CHECK_MODULES(COLOR, [colord >= 0.1.27 cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
-+ build_color=true
-+fi
-+
-+AM_CONDITIONAL(BUILD_COLOR, [test "x$build_color" = "xtrue"])
-
- dnl ---------------------------------------------------------------------------
- dnl - wacom
- dnl ---------------------------------------------------------------------------
-+AC_ARG_ENABLE(wacom,
-+ AS_HELP_STRING([--disable-wacom], [disable Wacom support (default: auto)]),,
-+ enable_wacom=auto)
- build_wacom=false
--PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 cinnamon-desktop xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION gtk+-3.0 >= 3.8.0],
-- [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"])
-+if test x"$enable_wacom" != x"no" ; then
-+ PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 cinnamon-desktop xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION gtk+-3.0 >= 3.8.0],
-+ [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"])
-+fi
-
- AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue")
-
-@@ -372,9 +386,15 @@
- dnl Check for logind
- dnl ====================================================================
-
--PKG_CHECK_MODULES(LOGIND, [libsystemd-login], [have_logind=yes], [
-- PKG_CHECK_MODULES(LOGIND, [libsystemd], [have_logind=yes], [have_logind=no])
--])
-+AC_ARG_ENABLE([logind],
-+ AS_HELP_STRING([--disable-logind], [Do not check for logind]),
-+ [enable_logind=$enableval],
-+ [enable_logind=auto])
-+
-+have_logind=no
-+if test x$enable_logind != xno ; then
-+ PKG_CHECK_MODULES(LOGIND, [libsystemd-login], [have_logind=yes], [have_logind=no])
-+fi
-
- if test x$have_logind = xyes; then
- AC_DEFINE(HAVE_LOGIND, 1, [Define if logind is supported])
-@@ -595,6 +615,7 @@
- LCMS DICT support: ${have_new_lcms}
- Libnotify support: ${have_libnotify}
-
-+ Colord support: ${build_color}
- Wacom support: ${build_wacom}
-
- Smartcard support: ${have_smartcard_support}
---- a/plugins/Makefile.am~ 2016-05-10 17:30:40.000000000 +0200
-+++ b/plugins/Makefile.am 2016-06-25 17:44:30.021307677 +0200
-@@ -6,7 +6,6 @@
- automount \
- background \
- clipboard \
-- color \
- cursor \
- dummy \
- datetime \
-@@ -23,6 +22,12 @@
-
- disabled_plugins = $(NULL)
-
-+if BUILD_COLOR
-+enabled_plugins += color
-+else
-+disabled_plugins += color
-+endif
-+
- if BUILD_WACOM
- enabled_plugins += wacom
- else
diff --git a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-4.4.0-systemd.patch b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-4.4.0-systemd.patch
deleted file mode 100644
index 90b63731f87..00000000000
--- a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-4.4.0-systemd.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 4c19a41429524a2da202b919a335a646103da0fd Mon Sep 17 00:00:00 2001
-From: Leigh Scott <leigh123linux@gmail.com>
-Date: Wed, 11 Dec 2019 23:29:08 +0000
-Subject: [PATCH] Restore old check for logind
-
----
- cinnamon-settings-daemon/cinnamon-settings-session.c | 2 +-
- plugins/common/csd-power-helper.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cinnamon-settings-daemon/cinnamon-settings-session.c b/cinnamon-settings-daemon/cinnamon-settings-session.c
-index adbe1e7..4d52b21 100644
---- a/cinnamon-settings-daemon/cinnamon-settings-session.c
-+++ b/cinnamon-settings-daemon/cinnamon-settings-session.c
-@@ -378,7 +378,7 @@ cinnamon_settings_session_init (CinnamonSettingsSession *session)
- session->priv = CINNAMON_SETTINGS_SESSION_GET_PRIVATE (session);
-
- #ifdef HAVE_LOGIND
-- if (access("/run/systemd/system/", F_OK) == 0) { // sd_booted ()
-+ if (access("/run/systemd/seats/", F_OK) == 0) { // sd_booted ()
- sd_pid_get_session (getpid(), &session->priv->session_id);
- session->priv->sd_source = sd_source_new ();
- g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL);
-diff --git a/plugins/common/csd-power-helper.c b/plugins/common/csd-power-helper.c
-index 5a83072..82c0b22 100644
---- a/plugins/common/csd-power-helper.c
-+++ b/plugins/common/csd-power-helper.c
-@@ -41,7 +41,7 @@ use_logind (void)
- static gsize once_init_value = 0;
-
- if (g_once_init_enter (&once_init_value)) {
-- should_use_logind = access("/run/systemd/system/", F_OK) == 0; // sd_booted ()
-+ should_use_logind = access("/run/systemd/seats/", F_OK) == 0; // sd_booted ()
-
- g_once_init_leave (&once_init_value, 1);
- }
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-settings-daemon/, ...
@ 2018-05-26 11:32 Mart Raudsepp
0 siblings, 0 replies; 7+ messages in thread
From: Mart Raudsepp @ 2018-05-26 11:32 UTC (permalink / raw
To: gentoo-commits
commit: 1ab1f2ba1c3257dd182acceec11f27f0ef35bcce
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat May 26 11:21:09 2018 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat May 26 11:31:14 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ab1f2ba
gnome-extra/cinnamon-settings-daemon: remove old
Package-Manager: Portage-2.3.28, Repoman-2.3.9
| 6 --
.../cinnamon-settings-daemon-2.8.3.ebuild | 104 ---------------------
.../cinnamon-settings-daemon-2.8.4.ebuild | 98 -------------------
.../cinnamon-settings-daemon-3.0.1.ebuild | 88 -----------------
.../cinnamon-settings-daemon-3.2.0.ebuild | 88 -----------------
.../cinnamon-settings-daemon-3.4.2.ebuild | 88 -----------------
.../cinnamon-settings-daemon-3.4.4.ebuild | 88 -----------------
.../cinnamon-settings-daemon-3.6.1.ebuild | 87 -----------------
.../cinnamon-settings-daemon-2.6.2-optional.patch | 99 --------------------
9 files changed, 746 deletions(-)
--git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index d9509584827..587df8d1630 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -1,7 +1 @@
-DIST cinnamon-settings-daemon-2.8.3.tar.gz 2935149 BLAKE2B 17f4f93c4f7a41e503ab325daf2b7cdac5aa1e7a4f084533622cdf8d9fe5996653986a95f3bcc29910d763d00971cdc4e5ef396416b4ef742492acd14bd02aa0 SHA512 a66ab0943f4a370fb203ba73dfa9f938ab2fc418c7876b7a048fc438ed8eaef3f5f7789ce86c0c2039ed61473c1b3fb9c60205571140291448854c03cba36f76
-DIST cinnamon-settings-daemon-2.8.4.tar.gz 2935478 BLAKE2B e9fd12370f03c742064abfaa22488d3fcd556fd695f9e8e90f19c429144d1c0f8428dc8e814a1dbb647779f585671333fedc8a9b8028f0937729d4daf2274dc9 SHA512 fab449efdfe4f12d17d61299b9c264d0bd70d88811406da68eab48943dbcd75ef3a87551eba653660efc4006c45f7eaa59d9ac3616a6da6808d35e59dd0a6d7f
-DIST cinnamon-settings-daemon-3.0.1.tar.gz 2912459 BLAKE2B 4519cab3a0b6af10ec3aba1cb922a62a2a73cbb532ba2e052a6261f2e428a91bf3eee437d06d4d696ce947b82f284b2201ef465a6e7ebb9b45a15ee989fda8af SHA512 848f1bc38e84edf9a8af48e55b7581881fbc9920dce9a4fc38627456dea7cbfe330bebba4bb46d1c231dd85bd3445d365b5e415485ac202e72335fe337a800e8
-DIST cinnamon-settings-daemon-3.2.0.tar.gz 2915197 BLAKE2B e3891077ac807c30ad7bb5755a598aab153fac9b3a8c9681e8275a63ff46ad66a596427074bae4722d68ab5ed9260b41a668ce1bffbfbb420e0737cf2b220dbb SHA512 1977402fddf62cf29c0285fd2be8c951dcf5f1d914e3ce53e2e738cfdb211096653b9256028fcb887e403d11dc2105e976eda05cf97c95afe6101c84c72abb12
-DIST cinnamon-settings-daemon-3.4.2.tar.gz 3102793 BLAKE2B 1794d60426937f5b654d8b5f8d78c878c0d44f33e33f76df975acccc96badf13ec04e98c7a768b609164cf44464ad9af90465fd6c08c8314adb9475a74db9203 SHA512 597f3a08e5c2168d0fc3da4b83c85f4c1f4451573cccc79bcb2a3debaab7f4714244e0300dce8ddc62de40b2f4c1c44ff282d280a1437d14041b44d4541c83e0
-DIST cinnamon-settings-daemon-3.4.4.tar.gz 3102951 BLAKE2B d799621861d2450d401788b344dd7c26347054a2756081a8c85526b9f31f9a468ea97695dc26a9c060692efcf0189aae958988f3c911b5a8f7028873158ee3b4 SHA512 93a7609a5c1b9c34061f9ba7836ace58cfa5549d9be811a1a5ca50e2cb9fc9e9462d9f356f50c9115cca93fa42f29ff9d130c184e19cccf9c0ee814fb39bc6d6
DIST cinnamon-settings-daemon-3.6.1.tar.gz 995005 BLAKE2B c512fe53b707099dca0926893f03056d508bbe22026367c3212a99f22df60d629e02e080fccdeb73151c7aa7e93396b47bede1820059f4a53eace11a56ae5521 SHA512 48a28decff08a191f4ec604386c3bb5c07001d4bc4f7b6d1da379626b41650653fdd14205bbed5321c41fbc281e8638b17e1de30dbba5d299f79cde03216cb33
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.3.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.3.ebuild
deleted file mode 100644
index 016d70f05fc..00000000000
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.3.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 virtualx
-
-DESCRIPTION="Cinnamon's settings daemon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+colord cups input_devices_wacom smartcard systemd"
-
-# udev is non-optional since lots of plugins, not just gudev, pull it in
-RDEPEND="
- >=dev-libs/glib-2.38:2
- >=gnome-base/libgnomekbd-3.6
- >=gnome-base/librsvg-2.36.2
- >=gnome-extra/cinnamon-desktop-2.6.3:0=
- media-libs/fontconfig
- >=media-libs/lcms-2.2:2
- media-libs/libcanberra:0=[gtk3]
- >=media-sound/pulseaudio-0.9.16:0=
- sys-apps/dbus
- >=sys-auth/polkit-0.97
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.9.10:3
- >=x11-libs/libnotify-0.7.3:0=
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libxklavier
- virtual/libgudev:=
-
- colord? ( >=x11-misc/colord-0.1.27:= )
- cups? ( >=net-print/cups-1.4[dbus] )
- input_devices_wacom? (
- >=dev-libs/libwacom-0.7
- x11-drivers/xf86-input-wacom
- x11-libs/libXtst )
- smartcard? ( >=dev-libs/nss-3.11.2 )
- || ( >=sys-power/upower-0.9.11 sys-power/upower-pm-utils )
- systemd? ( sys-apps/systemd:0= )
- !systemd? ( sys-auth/consolekit:0= )
-"
-DEPEND="${RDEPEND}
- dev-libs/libxml2:2
- >=dev-util/intltool-0.37.1
- x11-base/xorg-proto
- virtual/pkgconfig
-"
-
-src_prepare() {
- # make colord and wacom optional
- epatch "${FILESDIR}"/${PN}-2.6.2-optional.patch
-
- # Disable broken test
- sed -e '/g_test_add_func ("\/color\/edid/d' \
- -i plugins/color/gcm-self-test.c || die
-
- # Fix intltool unittest
- cat >>"${S}"/po/POTFILES.in <<EOF
-data/org.cinnamon.settings-daemon.peripherals.wacom.gschema.xml.in.in
-data/org.cinnamon.settings-daemon.plugins.background.gschema.xml.in
-data/org.cinnamon.settings-daemon.plugins.background.gschema.xml.in.in
-plugins/datetime/org.cinnamon.settingsdaemon.datetimemechanism.policy.in
-plugins/keyboard/csd-keyboard-xkb.c
-plugins/wacom/csd-wacom-device.c
-plugins/wacom/csd-wacom-osd-window.c
-plugins/wacom/org.cinnamon.settings-daemon.plugins.wacom.policy.in.in
-EOF
-
- epatch_user
-
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- DOCS="AUTHORS ChangeLog MAINTAINERS README"
-
- # no point in disabling gudev since other plugins pull it in
- gnome2_src_configure \
- --disable-static \
- --enable-gudev \
- --enable-man \
- --enable-polkit \
- $(use_enable colord color) \
- $(use_enable cups) \
- $(use_enable smartcard smartcard-support) \
- $(use_enable systemd logind) \
- $(use_enable input_devices_wacom wacom)
-}
-
-src_test() {
- unset DISPLAY
- Xemake check
-}
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.4.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.4.ebuild
deleted file mode 100644
index 57a99bc2085..00000000000
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.4.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 virtualx
-
-DESCRIPTION="Cinnamon's settings daemon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+colord cups input_devices_wacom smartcard systemd"
-
-# udev is non-optional since lots of plugins, not just gudev, pull it in
-RDEPEND="
- >=dev-libs/glib-2.38:2
- >=gnome-base/libgnomekbd-3.6
- >=gnome-base/librsvg-2.36.2
- >=gnome-extra/cinnamon-desktop-2.6.3:0=
- media-libs/fontconfig
- >=media-libs/lcms-2.2:2
- media-libs/libcanberra:0=[gtk3]
- >=media-sound/pulseaudio-0.9.16:0=
- sys-apps/dbus
- >=sys-auth/polkit-0.97
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.9.10:3
- >=x11-libs/libnotify-0.7.3:0=
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libxklavier
- virtual/libgudev:=
-
- colord? ( >=x11-misc/colord-0.1.27:= )
- cups? ( >=net-print/cups-1.4[dbus] )
- input_devices_wacom? (
- >=dev-libs/libwacom-0.7
- x11-drivers/xf86-input-wacom
- x11-libs/libXtst )
- smartcard? ( >=dev-libs/nss-3.11.2 )
- || ( >=sys-power/upower-0.9.11 sys-power/upower-pm-utils )
- systemd? ( sys-apps/systemd:0= )
- !systemd? ( sys-auth/consolekit:0= )
-"
-DEPEND="${RDEPEND}
- dev-libs/libxml2:2
- >=dev-util/intltool-0.37.1
- x11-base/xorg-proto
- virtual/pkgconfig
-"
-
-src_prepare() {
- # make colord and wacom optional
- eapply "${FILESDIR}"/${PN}-2.6.2-optional.patch
-
- # Disable broken test
- sed -e '/g_test_add_func ("\/color\/edid/d' \
- -i plugins/color/gcm-self-test.c || die
-
- # Fix intltool unittest
- cat >>"${S}"/po/POTFILES.in <<EOF
-data/org.cinnamon.settings-daemon.peripherals.wacom.gschema.xml.in.in
-data/org.cinnamon.settings-daemon.plugins.background.gschema.xml.in
-data/org.cinnamon.settings-daemon.plugins.background.gschema.xml.in.in
-plugins/datetime/org.cinnamon.settingsdaemon.datetimemechanism.policy.in
-plugins/keyboard/csd-keyboard-xkb.c
-plugins/wacom/csd-wacom-device.c
-plugins/wacom/csd-wacom-osd-window.c
-plugins/wacom/org.cinnamon.settings-daemon.plugins.wacom.policy.in.in
-EOF
-
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- # no point in disabling gudev since other plugins pull it in
- gnome2_src_configure \
- --disable-static \
- --enable-gudev \
- --enable-man \
- --enable-polkit \
- $(use_enable colord color) \
- $(use_enable cups) \
- $(use_enable smartcard smartcard-support) \
- $(use_enable systemd logind) \
- $(use_enable input_devices_wacom wacom)
-}
-
-src_test() {
- virtx emake check
-}
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.0.1.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.0.1.ebuild
deleted file mode 100644
index 26b72223362..00000000000
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.0.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 virtualx
-
-DESCRIPTION="Cinnamon's settings daemon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+colord cups input_devices_wacom smartcard systemd"
-
-# udev is non-optional since lots of plugins, not just gudev, pull it in
-RDEPEND="
- >=dev-libs/glib-2.38:2
- >=gnome-base/libgnomekbd-3.6
- >=gnome-base/librsvg-2.36.2
- >=gnome-extra/cinnamon-desktop-2.8.0:0=
- media-libs/fontconfig
- >=media-libs/lcms-2.2:2
- media-libs/libcanberra:0=[gtk3]
- sys-apps/dbus
- >=sys-auth/polkit-0.97
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.9.10:3
- >=x11-libs/libnotify-0.7.3:0=
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libxklavier
- virtual/libgudev:=
-
- colord? ( >=x11-misc/colord-0.1.27:= )
- cups? ( >=net-print/cups-1.4[dbus] )
- input_devices_wacom? (
- >=dev-libs/libwacom-0.7
- x11-drivers/xf86-input-wacom
- x11-libs/libXtst )
- smartcard? ( >=dev-libs/nss-3.11.2 )
- systemd? (
- sys-apps/systemd:0=
- >=sys-power/upower-0.9.11:= )
- !systemd? (
- sys-auth/consolekit:0=
- || ( >=sys-power/upower-0.9.11 sys-power/upower-pm-utils ) )
-"
-DEPEND="${RDEPEND}
- dev-libs/libxml2:2
- >=dev-util/intltool-0.37.1
- x11-base/xorg-proto
- virtual/pkgconfig
-"
-
-src_prepare() {
- # make colord and wacom optional
- eapply "${FILESDIR}"/${PN}-3.0.1-optional.patch
-
- # Disable broken test
- sed -e '/g_test_add_func ("\/color\/edid/d' \
- -i plugins/color/gcm-self-test.c || die
-
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- # no point in disabling gudev since other plugins pull it in
- gnome2_src_configure \
- --disable-static \
- --enable-gudev \
- --enable-man \
- --enable-polkit \
- $(use_enable colord color) \
- $(use_enable cups) \
- $(use_enable smartcard smartcard-support) \
- $(use_enable systemd logind) \
- $(use_enable input_devices_wacom wacom)
-}
-
-src_test() {
- virtx emake check
-}
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.2.0.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.2.0.ebuild
deleted file mode 100644
index 9ec0e9bcb65..00000000000
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.2.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 virtualx
-
-DESCRIPTION="Cinnamon's settings daemon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+colord cups input_devices_wacom smartcard systemd"
-
-# udev is non-optional since lots of plugins, not just gudev, pull it in
-RDEPEND="
- >=dev-libs/glib-2.38:2
- >=gnome-base/libgnomekbd-3.6
- >=gnome-base/librsvg-2.36.2
- >=gnome-extra/cinnamon-desktop-2.8.0:0=
- media-libs/fontconfig
- >=media-libs/lcms-2.2:2
- media-libs/libcanberra:0=[gtk3]
- sys-apps/dbus
- >=sys-auth/polkit-0.97
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.9.10:3
- >=x11-libs/libnotify-0.7.3:0=
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libxklavier
- virtual/libgudev:=
-
- colord? ( >=x11-misc/colord-0.1.27:= )
- cups? ( >=net-print/cups-1.4[dbus] )
- input_devices_wacom? (
- >=dev-libs/libwacom-0.7
- x11-drivers/xf86-input-wacom
- x11-libs/libXtst )
- smartcard? ( >=dev-libs/nss-3.11.2 )
- systemd? (
- sys-apps/systemd:0=
- >=sys-power/upower-0.9.11:= )
- !systemd? (
- sys-auth/consolekit:0=
- || ( >=sys-power/upower-0.9.11 sys-power/upower-pm-utils ) )
-"
-DEPEND="${RDEPEND}
- dev-libs/libxml2:2
- >=dev-util/intltool-0.37.1
- x11-base/xorg-proto
- virtual/pkgconfig
-"
-
-src_prepare() {
- # make colord and wacom optional
- eapply "${FILESDIR}"/${PN}-3.0.1-optional.patch
-
- # Disable broken test
- sed -e '/g_test_add_func ("\/color\/edid/d' \
- -i plugins/color/gcm-self-test.c || die
-
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- # no point in disabling gudev since other plugins pull it in
- gnome2_src_configure \
- --disable-static \
- --enable-gudev \
- --enable-man \
- --enable-polkit \
- $(use_enable colord color) \
- $(use_enable cups) \
- $(use_enable smartcard smartcard-support) \
- $(use_enable systemd logind) \
- $(use_enable input_devices_wacom wacom)
-}
-
-src_test() {
- virtx emake check
-}
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.4.2.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.4.2.ebuild
deleted file mode 100644
index 9ec0e9bcb65..00000000000
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.4.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 virtualx
-
-DESCRIPTION="Cinnamon's settings daemon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+colord cups input_devices_wacom smartcard systemd"
-
-# udev is non-optional since lots of plugins, not just gudev, pull it in
-RDEPEND="
- >=dev-libs/glib-2.38:2
- >=gnome-base/libgnomekbd-3.6
- >=gnome-base/librsvg-2.36.2
- >=gnome-extra/cinnamon-desktop-2.8.0:0=
- media-libs/fontconfig
- >=media-libs/lcms-2.2:2
- media-libs/libcanberra:0=[gtk3]
- sys-apps/dbus
- >=sys-auth/polkit-0.97
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.9.10:3
- >=x11-libs/libnotify-0.7.3:0=
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libxklavier
- virtual/libgudev:=
-
- colord? ( >=x11-misc/colord-0.1.27:= )
- cups? ( >=net-print/cups-1.4[dbus] )
- input_devices_wacom? (
- >=dev-libs/libwacom-0.7
- x11-drivers/xf86-input-wacom
- x11-libs/libXtst )
- smartcard? ( >=dev-libs/nss-3.11.2 )
- systemd? (
- sys-apps/systemd:0=
- >=sys-power/upower-0.9.11:= )
- !systemd? (
- sys-auth/consolekit:0=
- || ( >=sys-power/upower-0.9.11 sys-power/upower-pm-utils ) )
-"
-DEPEND="${RDEPEND}
- dev-libs/libxml2:2
- >=dev-util/intltool-0.37.1
- x11-base/xorg-proto
- virtual/pkgconfig
-"
-
-src_prepare() {
- # make colord and wacom optional
- eapply "${FILESDIR}"/${PN}-3.0.1-optional.patch
-
- # Disable broken test
- sed -e '/g_test_add_func ("\/color\/edid/d' \
- -i plugins/color/gcm-self-test.c || die
-
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- # no point in disabling gudev since other plugins pull it in
- gnome2_src_configure \
- --disable-static \
- --enable-gudev \
- --enable-man \
- --enable-polkit \
- $(use_enable colord color) \
- $(use_enable cups) \
- $(use_enable smartcard smartcard-support) \
- $(use_enable systemd logind) \
- $(use_enable input_devices_wacom wacom)
-}
-
-src_test() {
- virtx emake check
-}
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.4.4.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.4.4.ebuild
deleted file mode 100644
index 9ec0e9bcb65..00000000000
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.4.4.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 virtualx
-
-DESCRIPTION="Cinnamon's settings daemon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+colord cups input_devices_wacom smartcard systemd"
-
-# udev is non-optional since lots of plugins, not just gudev, pull it in
-RDEPEND="
- >=dev-libs/glib-2.38:2
- >=gnome-base/libgnomekbd-3.6
- >=gnome-base/librsvg-2.36.2
- >=gnome-extra/cinnamon-desktop-2.8.0:0=
- media-libs/fontconfig
- >=media-libs/lcms-2.2:2
- media-libs/libcanberra:0=[gtk3]
- sys-apps/dbus
- >=sys-auth/polkit-0.97
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.9.10:3
- >=x11-libs/libnotify-0.7.3:0=
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libxklavier
- virtual/libgudev:=
-
- colord? ( >=x11-misc/colord-0.1.27:= )
- cups? ( >=net-print/cups-1.4[dbus] )
- input_devices_wacom? (
- >=dev-libs/libwacom-0.7
- x11-drivers/xf86-input-wacom
- x11-libs/libXtst )
- smartcard? ( >=dev-libs/nss-3.11.2 )
- systemd? (
- sys-apps/systemd:0=
- >=sys-power/upower-0.9.11:= )
- !systemd? (
- sys-auth/consolekit:0=
- || ( >=sys-power/upower-0.9.11 sys-power/upower-pm-utils ) )
-"
-DEPEND="${RDEPEND}
- dev-libs/libxml2:2
- >=dev-util/intltool-0.37.1
- x11-base/xorg-proto
- virtual/pkgconfig
-"
-
-src_prepare() {
- # make colord and wacom optional
- eapply "${FILESDIR}"/${PN}-3.0.1-optional.patch
-
- # Disable broken test
- sed -e '/g_test_add_func ("\/color\/edid/d' \
- -i plugins/color/gcm-self-test.c || die
-
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- # no point in disabling gudev since other plugins pull it in
- gnome2_src_configure \
- --disable-static \
- --enable-gudev \
- --enable-man \
- --enable-polkit \
- $(use_enable colord color) \
- $(use_enable cups) \
- $(use_enable smartcard smartcard-support) \
- $(use_enable systemd logind) \
- $(use_enable input_devices_wacom wacom)
-}
-
-src_test() {
- virtx emake check
-}
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1.ebuild
deleted file mode 100644
index 5967c0fed3f..00000000000
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 virtualx
-
-DESCRIPTION="Cinnamon's settings daemon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+colord cups input_devices_wacom smartcard systemd"
-
-# udev is non-optional since lots of plugins, not just gudev, pull it in
-RDEPEND="
- >=dev-libs/glib-2.38:2
- >=gnome-base/libgnomekbd-3.6
- >=gnome-base/librsvg-2.36.2
- >=gnome-extra/cinnamon-desktop-2.8.0:0=
- media-libs/fontconfig
- >=media-libs/lcms-2.2:2
- media-libs/libcanberra:0=[gtk3]
- sys-apps/dbus
- >=sys-auth/polkit-0.97
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.9.10:3
- >=x11-libs/libnotify-0.7.3:0=
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libxklavier
- virtual/libgudev:=
-
- colord? ( >=x11-misc/colord-0.1.27:= )
- cups? ( >=net-print/cups-1.4[dbus] )
- input_devices_wacom? (
- >=dev-libs/libwacom-0.7
- x11-drivers/xf86-input-wacom
- x11-libs/libXtst )
- smartcard? ( >=dev-libs/nss-3.11.2 )
- systemd? (
- sys-apps/systemd:0=
- >=sys-power/upower-0.9.11:= )
- !systemd? (
- sys-auth/elogind:0=
- || ( >=sys-power/upower-0.9.11 sys-power/upower-pm-utils ) )
-"
-DEPEND="${RDEPEND}
- dev-libs/libxml2:2
- >=dev-util/intltool-0.37.1
- x11-base/xorg-proto
- virtual/pkgconfig
-"
-
-src_prepare() {
- # make colord and wacom optional
- eapply "${FILESDIR}"/${PN}-3.0.1-optional.patch
-
- # Disable broken test
- sed -e '/g_test_add_func ("\/color\/edid/d' \
- -i plugins/color/gcm-self-test.c || die
-
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- # no point in disabling gudev since other plugins pull it in
- gnome2_src_configure \
- --disable-static \
- --enable-gudev \
- --enable-polkit \
- --enable-logind \
- $(use_enable colord color) \
- $(use_enable cups) \
- $(use_enable smartcard smartcard-support) \
- $(use_enable input_devices_wacom wacom)
-}
-
-src_test() {
- virtx emake check
-}
diff --git a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-2.6.2-optional.patch b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-2.6.2-optional.patch
deleted file mode 100644
index e5abe075f5e..00000000000
--- a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-2.6.2-optional.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 884ce49f5bcdca37a30fef94d6649af012c88fee Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sat, 13 Jun 2015 18:03:09 -0400
-Subject: [PATCH] Make logind, colord, wacom optional and non-automagic
-
----
- configure.ac | 31 +++++++++++++++++++++++++++----
- plugins/Makefile.am | 7 ++++++-
- 2 files changed, 33 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index ce79a6d..095a7a3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -260,14 +260,28 @@ dnl ---------------------------------------------------------------------------
- dnl - color
- dnl ---------------------------------------------------------------------------
-
--PKG_CHECK_MODULES(COLOR, [colord >= 0.1.27 cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
-+AC_ARG_ENABLE(color,
-+ AS_HELP_STRING([--disable-color], [disable Colord support (default: enabled)]),,
-+ enable_color=yes)
-+build_color=false
-+if test x"$enable_color" != x"no" ; then
-+ PKG_CHECK_MODULES(COLOR, [colord >= 0.1.27 cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
-+ build_color=true
-+fi
-+
-+AM_CONDITIONAL(BUILD_COLOR, [test "x$build_color" = "xtrue"])
-
- dnl ---------------------------------------------------------------------------
- dnl - wacom
- dnl ---------------------------------------------------------------------------
-+AC_ARG_ENABLE(wacom,
-+ AS_HELP_STRING([--disable-wacom], [disable Wacom support (default: auto)]),,
-+ enable_wacom=auto)
- build_wacom=false
--PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 cinnamon-desktop xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION gtk+-3.0 >= 3.8.0],
-- [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"])
-+if test x"$enable_wacom" != x"no" ; then
-+ PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 cinnamon-desktop xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION gtk+-3.0 >= 3.8.0],
-+ [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"])
-+fi
-
- AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue")
-
-@@ -373,7 +387,15 @@ dnl ====================================================================
- dnl Check for logind
- dnl ====================================================================
-
--PKG_CHECK_MODULES(LOGIND, [libsystemd-login], [have_logind=yes], [have_logind=no])
-+AC_ARG_ENABLE([logind],
-+ AS_HELP_STRING([--disable-logind], [Do not check for logind]),
-+ [enable_logind=$enableval],
-+ [enable_logind=auto])
-+
-+have_logind=no
-+if test x$enable_logind != xno ; then
-+ PKG_CHECK_MODULES(LOGIND, [libsystemd-login], [have_logind=yes], [have_logind=no])
-+fi
-
- if test x$have_logind = xyes; then
- AC_DEFINE(HAVE_LOGIND, 1, [Define if logind is supported])
-@@ -595,6 +617,7 @@ echo "
- LCMS DICT support: ${have_new_lcms}
- Libnotify support: ${have_libnotify}
-
-+ Colord support: ${build_color}
- Wacom support: ${build_wacom}
-
- Smartcard support: ${have_smartcard_support}
-diff --git a/plugins/Makefile.am b/plugins/Makefile.am
-index b9cb3a6..f37eec0 100644
---- a/plugins/Makefile.am
-+++ b/plugins/Makefile.am
-@@ -6,7 +6,6 @@ enabled_plugins = \
- automount \
- background \
- clipboard \
-- color \
- cursor \
- dummy \
- datetime \
-@@ -23,6 +22,12 @@ enabled_plugins = \
-
- disabled_plugins = $(NULL)
-
-+if BUILD_COLOR
-+enabled_plugins += color
-+else
-+disabled_plugins += color
-+endif
-+
- if BUILD_WACOM
- enabled_plugins += wacom
- else
---
-2.4.3
-
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-settings-daemon/, ...
@ 2015-11-15 22:30 Pacho Ramos
0 siblings, 0 replies; 7+ messages in thread
From: Pacho Ramos @ 2015-11-15 22:30 UTC (permalink / raw
To: gentoo-commits
commit: 58fb57358e8d7fbc9aa2cbb53adef6b809a157c1
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 15 21:58:49 2015 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Nov 15 22:30:16 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58fb5735
gnome-extra/cinnamon-settings-daemon: Drop old
Package-Manager: portage-2.2.24
| 2 -
.../cinnamon-settings-daemon-2.4.3.ebuild | 105 ---------------------
.../cinnamon-settings-daemon-2.6.2.ebuild | 105 ---------------------
.../cinnamon-settings-daemon-2.4.3-optional.patch | 82 ----------------
4 files changed, 294 deletions(-)
--git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index a6f7e9d..051d20a 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -1,4 +1,2 @@
-DIST cinnamon-settings-daemon-2.4.3.tar.gz 2998895 SHA256 1d3c47aad65f9c5064686352012cf1783e51440fa45f4ee030bb33ac66304fd2 SHA512 a70b04fbbddf735582043554c809f6dc098b58938b7245de8b1398ac4a38e9483f43e8b08ec7810d81cc3afabbad74045a1abfa6d2ed4e8b672f5df971e7c916 WHIRLPOOL 9416bd0af5f1bc27358768d46c6d51c25f49436825ac201b01c6986b80aebb78a91baaa79e72bc0577f818330bf19046e5f3dcdafb245779ddc47f3714d47eea
-DIST cinnamon-settings-daemon-2.6.2.tar.gz 2990964 SHA256 a97b85a2f9aafdc9c7c7facc97e422d7bc9531a920ac2e685fd82c56c01d8dec SHA512 72fc93ff27fc8b565349069a4713ac13f13dd600da64e9f35f35c9b2eb625afbc71bd5d1586653ad4f08cd3b65dbad9110aa21be24a6194eae40f367646608c9 WHIRLPOOL ed1d0a89465333c476e60cf9f49ef8e98e4dc2fcb65acc773fc662f06054f37d88407d04276b9d419ed017b5ed6af52731d97de4744a19b4c13af18df20b9fba
DIST cinnamon-settings-daemon-2.6.3.tar.gz 2992102 SHA256 b71a515f9eed5efd35ef134f291a9dd9674d81026b23c85377493b53ec1cf0ae SHA512 ff6ec6be7a134414a525bd5dce6d90570800d0dbfc5f1641b02fbe17389bcf32d47832f5fcd736cdff8dfa09f129f998acd99d9358b1edf5315edb91c8b553ba WHIRLPOOL 9d2fb909fca23f7db2124e56e285e6c7623a9e7d710309f92894a2ab19b6a5a7e92b4e5c947e0cc74513eec30f7fa7bc7464997a1fdc3ff27ad19040579efdb0
DIST cinnamon-settings-daemon-2.8.1.tar.gz 2934995 SHA256 2e01f7e8900043f8efb28f33814e70ca12eb12b7d49061ce6d059c1a0b0344a0 SHA512 a8c1c685ecc6c03e274b2d26c214f24a9300e8ac4355f7d1f6f81ffb4393b079f7e40d1f1d5cb06509e298d55b4d20ca51e9821cd2894b234512d1287daf3689 WHIRLPOOL 2a029e3a22af1e3a5b9edfc82184244d5c1d8eb61107466110fc1d33ab3e641651d42ee2675c65db78475edcd03e053468d4b2d019e381046cbf8cdab7c74d85
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.4.3.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.4.3.ebuild
deleted file mode 100644
index b19bf96..0000000
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.4.3.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 virtualx
-
-DESCRIPTION="Cinnamon's settings daemon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+colord cups input_devices_wacom smartcard systemd"
-
-# udev is non-optional since lots of plugins, not just gudev, pull it in
-RDEPEND="
- >=dev-libs/glib-2.38:2
- >=gnome-base/libgnomekbd-2.91.1
- >=gnome-base/librsvg-2.36.2
- >=gnome-extra/cinnamon-desktop-1.0:0=
- media-libs/fontconfig
- >=media-libs/lcms-2.2:2
- media-libs/libcanberra:0=[gtk3]
- >=media-sound/pulseaudio-0.9.16:0=
- sys-apps/dbus
- >=sys-auth/polkit-0.97
- || ( >=sys-power/upower-0.9.11:= sys-power/upower-pm-utils )
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.7.8:3
- >=x11-libs/libnotify-0.7.3:0=
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libxklavier
- virtual/libgudev:=
-
- colord? ( >=x11-misc/colord-0.1.9:= )
- cups? ( >=net-print/cups-1.4[dbus] )
- input_devices_wacom? (
- >=dev-libs/libwacom-0.7
- x11-drivers/xf86-input-wacom
- x11-libs/libXtst )
- smartcard? ( >=dev-libs/nss-3.11.2 )
- systemd? ( sys-apps/systemd:0= )
- !systemd? ( sys-auth/consolekit:0= )
-"
-DEPEND="${RDEPEND}
- dev-libs/libxml2:2
- >=dev-util/intltool-0.37.1
- x11-proto/kbproto
- virtual/pkgconfig
-"
-
-src_prepare() {
- # make colord and wacom optional
- epatch "${FILESDIR}"/${PN}-2.4.3-optional.patch
-
- # Disable broken test
- sed -e '/g_test_add_func ("\/color\/edid/d' \
- -i plugins/color/gcm-self-test.c || die
-
- # Fix intltool unittest
- cat >>"${S}"/po/POTFILES.in <<EOF
-data/org.cinnamon.settings-daemon.peripherals.wacom.gschema.xml.in.in
-data/org.cinnamon.settings-daemon.plugins.background.gschema.xml.in
-data/org.cinnamon.settings-daemon.plugins.background.gschema.xml.in.in
-plugins/datetime/org.cinnamon.settingsdaemon.datetimemechanism.policy.in
-plugins/keyboard/csd-keyboard-xkb.c
-plugins/wacom/csd-wacom-device.c
-plugins/wacom/csd-wacom-osd-window.c
-plugins/wacom/org.cinnamon.settings-daemon.plugins.wacom.policy.in.in
-EOF
-
- epatch_user
-
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- DOCS="AUTHORS ChangeLog MAINTAINERS README"
-
- # no point in disabling gudev since other plugins pull it in
- gnome2_src_configure \
- --disable-static \
- --enable-gudev \
- --enable-man \
- --enable-polkit \
- $(use_enable colord color) \
- $(use_enable cups) \
- $(use_enable smartcard smartcard-support) \
- $(use_enable systemd) \
- $(use_enable input_devices_wacom wacom)
-}
-
-src_test() {
- unset DISPLAY
- Xemake check
-}
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.2.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.2.ebuild
deleted file mode 100644
index b323373..0000000
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 virtualx
-
-DESCRIPTION="Cinnamon's settings daemon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+colord cups input_devices_wacom smartcard systemd"
-
-# udev is non-optional since lots of plugins, not just gudev, pull it in
-RDEPEND="
- >=dev-libs/glib-2.38:2
- >=gnome-base/libgnomekbd-3.6
- >=gnome-base/librsvg-2.36.2
- >=gnome-extra/cinnamon-desktop-2.6.3:0=
- media-libs/fontconfig
- >=media-libs/lcms-2.2:2
- media-libs/libcanberra:0=[gtk3]
- >=media-sound/pulseaudio-0.9.16:0=
- sys-apps/dbus
- >=sys-auth/polkit-0.97
- || ( >=sys-power/upower-0.9.11:= sys-power/upower-pm-utils )
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.9.10:3
- >=x11-libs/libnotify-0.7.3:0=
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libxklavier
- virtual/libgudev:=
-
- colord? ( >=x11-misc/colord-0.1.27:= )
- cups? ( >=net-print/cups-1.4[dbus] )
- input_devices_wacom? (
- >=dev-libs/libwacom-0.7
- x11-drivers/xf86-input-wacom
- x11-libs/libXtst )
- smartcard? ( >=dev-libs/nss-3.11.2 )
- systemd? ( sys-apps/systemd:0= )
- !systemd? ( sys-auth/consolekit:0= )
-"
-DEPEND="${RDEPEND}
- dev-libs/libxml2:2
- >=dev-util/intltool-0.37.1
- x11-proto/kbproto
- virtual/pkgconfig
-"
-
-src_prepare() {
- # make colord and wacom optional
- epatch "${FILESDIR}"/${PN}-2.6.2-optional.patch
-
- # Disable broken test
- sed -e '/g_test_add_func ("\/color\/edid/d' \
- -i plugins/color/gcm-self-test.c || die
-
- # Fix intltool unittest
- cat >>"${S}"/po/POTFILES.in <<EOF
-data/org.cinnamon.settings-daemon.peripherals.wacom.gschema.xml.in.in
-data/org.cinnamon.settings-daemon.plugins.background.gschema.xml.in
-data/org.cinnamon.settings-daemon.plugins.background.gschema.xml.in.in
-plugins/datetime/org.cinnamon.settingsdaemon.datetimemechanism.policy.in
-plugins/keyboard/csd-keyboard-xkb.c
-plugins/wacom/csd-wacom-device.c
-plugins/wacom/csd-wacom-osd-window.c
-plugins/wacom/org.cinnamon.settings-daemon.plugins.wacom.policy.in.in
-EOF
-
- epatch_user
-
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- DOCS="AUTHORS ChangeLog MAINTAINERS README"
-
- # no point in disabling gudev since other plugins pull it in
- gnome2_src_configure \
- --disable-static \
- --enable-gudev \
- --enable-man \
- --enable-polkit \
- $(use_enable colord color) \
- $(use_enable cups) \
- $(use_enable smartcard smartcard-support) \
- $(use_enable systemd logind) \
- $(use_enable input_devices_wacom wacom)
-}
-
-src_test() {
- unset DISPLAY
- Xemake check
-}
diff --git a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-2.4.3-optional.patch b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-2.4.3-optional.patch
deleted file mode 100644
index 8946427..0000000
--- a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-2.4.3-optional.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 0bfad0d65540acc6598c694904cdb9f7032c952d Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Mon, 5 May 2014 21:50:25 -0400
-Subject: [PATCH] Make colord and wacom support optional and non-automagic
-
----
- configure.ac | 20 +++++++++++++++++---
- plugins/Makefile.am | 7 ++++++-
- 2 files changed, 23 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6a17530..e5a752c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -260,15 +260,28 @@ fi
- dnl ---------------------------------------------------------------------------
- dnl - color
- dnl ---------------------------------------------------------------------------
-+AC_ARG_ENABLE(color,
-+ AS_HELP_STRING([--disable-color], [disable Colord support (default: enabled)]),,
-+ enable_color=yes)
-+build_color=false
-+if test x"$enable_color" != x"no" ; then
-+ PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
-+ build_color=true
-+fi
-
--PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
-+AM_CONDITIONAL(BUILD_COLOR, [test "x$build_color" = "xtrue"])
-
- dnl ---------------------------------------------------------------------------
- dnl - wacom
- dnl ---------------------------------------------------------------------------
-+AC_ARG_ENABLE(wacom,
-+ AS_HELP_STRING([--disable-wacom], [disable Wacom support (default: auto)]),,
-+ enable_wacom=auto)
- build_wacom=false
--PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 cinnamon-desktop xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION gtk+-3.0 >= 3.8.0],
-- [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"])
-+if test x"$enable_wacom" != x"no" ; then
-+ PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 cinnamon-desktop xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION gtk+-3.0 >= 3.8.0],
-+ [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"])
-+fi
-
- AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue")
-
-@@ -604,6 +617,7 @@ echo "
- LCMS DICT support: ${have_new_lcms}
- Libnotify support: ${have_libnotify}
-
-+ Colord support: ${build_color}
- Wacom support: ${build_wacom}
-
- Smartcard support: ${have_smartcard_support}
-diff --git a/plugins/Makefile.am b/plugins/Makefile.am
-index b9cb3a6..f37eec0 100644
---- a/plugins/Makefile.am
-+++ b/plugins/Makefile.am
-@@ -6,7 +6,6 @@ enabled_plugins = \
- automount \
- background \
- clipboard \
-- color \
- cursor \
- dummy \
- datetime \
-@@ -23,6 +22,12 @@ enabled_plugins = \
-
- disabled_plugins = $(NULL)
-
-+if BUILD_COLOR
-+enabled_plugins += color
-+else
-+disabled_plugins += color
-+endif
-+
- if BUILD_WACOM
- enabled_plugins += wacom
- else
---
-2.2.1
-
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2025-03-10 2:25 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-10 2:25 [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-settings-daemon/, Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-09-27 5:57 Eli Schwartz
2021-06-12 3:55 Sam James
2021-01-24 17:31 Joonas Niilola
2020-12-27 5:06 Sam James
2018-05-26 11:32 Mart Raudsepp
2015-11-15 22:30 Pacho Ramos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox