From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-desktop/, gnome-extra/cinnamon-desktop/files/
Date: Mon, 10 Mar 2025 02:25:28 +0000 (UTC) [thread overview]
Message-ID: <1741573437.6fb334e837a7b33f355fcd9aecf51d809c5e4104.sam@gentoo> (raw)
commit: 6fb334e837a7b33f355fcd9aecf51d809c5e4104
Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Sat Dec 7 21:58:02 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 10 02:23:57 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fb334e8
gnome-extra/cinnamon-desktop: add 6.4.1
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
| 1 +
.../cinnamon-desktop/cinnamon-desktop-6.4.1.ebuild | 74 ++++++++
...namon-desktop-6.4.0-remove-pnp_ids-option.patch | 193 +++++++++++++++++++++
3 files changed, 268 insertions(+)
--git a/gnome-extra/cinnamon-desktop/Manifest b/gnome-extra/cinnamon-desktop/Manifest
index 0d3a16060ba0..d78343ab2150 100644
--- a/gnome-extra/cinnamon-desktop/Manifest
+++ b/gnome-extra/cinnamon-desktop/Manifest
@@ -1 +1,2 @@
DIST cinnamon-desktop-6.2.0.tar.gz 510369 BLAKE2B e91cc5de64cfa2b936dd224727a493f7ca9049272d7cead88f6e6682b3e11505798d340e245816386e8427712dc3159c416bc51ac6b8cdf937649f34afa247f7 SHA512 be7e4fe206fb4fa62cacf7190b5702035313346ae51a3ef985ec2046d30e0ae5b1e1d314f82d362a363c3949deab02e4d2a4ea910ffe7f279111563c224f75f7
+DIST cinnamon-desktop-6.4.1.tar.gz 509746 BLAKE2B 36cc34af24adeaa80bb89440bfbb0676131493c55a418d55397e0d14beff1afecf1c0073b653b5927d830ae16200575489608d9f33c9c8603cdc328890c04a0a SHA512 4089e2261426019b922005480e4d106e2cc6dbba2d28044cefaf7e861597446b484605bf18b7cf114c323a78afe83fb56fe4fceab8b8a986b39a67132ac4b4a5
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.4.1.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.4.1.ebuild
new file mode 100644
index 000000000000..2849983c8bc1
--- /dev/null
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.4.1.ebuild
@@ -0,0 +1,74 @@
+# 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 gnome2-utils python-any-r1
+
+DESCRIPTION="A collection of libraries and utilites used by Cinnamon"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-desktop"
+SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-1 GPL-2+ LGPL-2+ LGPL-2.1+ MIT"
+SLOT="0/4" # subslot = libcinnamon-desktop soname version
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ app-text/iso-codes
+ >=dev-libs/glib-2.37.3:2[dbus]
+ >=dev-libs/gobject-introspection-0.10.2:=
+ >=gnome-base/gsettings-desktop-schemas-3.5.91
+ >=media-libs/libpulse-12.99.3[glib]
+ sys-apps/accountsservice
+ virtual/libudev:=
+ x11-libs/cairo[X]
+ >=x11-libs/gdk-pixbuf-2.22:2[introspection]
+ >=x11-libs/gtk+-3.3.16:3[introspection]
+ x11-libs/libX11
+ >=x11-libs/libXext-1.1
+ x11-libs/libxkbfile
+ >=x11-libs/libXrandr-1.3
+ x11-misc/xkeyboard-config
+"
+DEPEND="
+ ${RDEPEND}
+ x11-base/xorg-proto
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+ dev-util/gdbus-codegen
+ dev-util/glib-utils
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ # Remove dead config option to prevent junk files from being installed
+ # https://github.com/linuxmint/cinnamon-desktop/pull/249
+ "${FILESDIR}/${PN}-6.4.0-remove-pnp_ids-option.patch"
+)
+
+src_prepare() {
+ default
+ python_fix_shebang install-scripts
+}
+
+src_configure() {
+ local emesonargs=(
+ # https://github.com/linuxmint/cinnamon-desktop/commit/7eadfb1da9a42384396978b8ab46e0725d18e04f
+ # > Unless/until this fixes an actual identified issue for us or provides significant advantages
+ # > we're not using it in Cinnamon.
+ -Dsystemd=disabled
+ )
+ meson_src_configure
+}
+
+pkg_postinst() {
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ gnome2_schemas_update
+}
diff --git a/gnome-extra/cinnamon-desktop/files/cinnamon-desktop-6.4.0-remove-pnp_ids-option.patch b/gnome-extra/cinnamon-desktop/files/cinnamon-desktop-6.4.0-remove-pnp_ids-option.patch
new file mode 100644
index 000000000000..7b007a17cf19
--- /dev/null
+++ b/gnome-extra/cinnamon-desktop/files/cinnamon-desktop-6.4.0-remove-pnp_ids-option.patch
@@ -0,0 +1,193 @@
+From 4d3e44fb3b6add51a46cfce34f3194f3a20b3b1a Mon Sep 17 00:00:00 2001
+From: Sparky Bluefang <sparky@bluefang-logic.com>
+Date: Sat, 7 Dec 2024 16:38:18 -0500
+Subject: [PATCH] Remove the pnp_ids configuration option (unused as of
+ 913198430f27852544f9443a250421168d3d4466)
+
+---
+ debian/rules | 3 +-
+ libcinnamon-desktop/meson.build | 7 ---
+ libcinnamon-desktop/pnp.ids | 75 ---------------------------------
+ meson.build | 21 ---------
+ meson_options.txt | 2 -
+ 5 files changed, 1 insertion(+), 107 deletions(-)
+ delete mode 100644 libcinnamon-desktop/pnp.ids
+
+diff --git a/debian/rules b/debian/rules
+index 22dfd1d3..46173c2f 100755
+--- a/debian/rules
++++ b/debian/rules
+@@ -9,8 +9,7 @@ export DPKG_GENSYMBOLS_CHECK_LEVEL = 2
+
+ override_dh_auto_configure:
+ dh_auto_configure -- \
+- --buildtype=debug \
+- -Dpnp_ids=/usr/share/hwdata/pnp.ids
++ --buildtype=debug
+
+ override_dh_strip:
+ dh_strip -Xdesktop -Xcinnamon --dbg-package=libcvc-dbg
+diff --git a/libcinnamon-desktop/meson.build b/libcinnamon-desktop/meson.build
+index 23e6dedd..0f548fa4 100644
+--- a/libcinnamon-desktop/meson.build
++++ b/libcinnamon-desktop/meson.build
+@@ -72,7 +72,6 @@ libcinnamon_desktop = shared_library('cinnamon-desktop',
+ include_directories: [ rootInclude ],
+ c_args: [
+ '-DG_LOG_DOMAIN="CinnamonDesktop"',
+- '-DPNP_IDS="@0@"'.format(pnp_ids_path),
+ '-DXKB_BASE="@0@"'.format(xkb_base),
+ ],
+ dependencies: cinnamon_deps,
+@@ -96,12 +95,6 @@ pkgconfig.generate(
+ variables: [ 'exec_prefix=${prefix}'],
+ )
+
+-if pnp_ids_install_internal
+- install_data('pnp.ids',
+- install_dir: pnp_ids_path,
+- )
+-endif
+-
+ cdesktop_gir = gnome.generate_gir(libcinnamon_desktop,
+ sources: 'cdesktop-enums.h',
+ namespace: 'CDesktopEnums',
+diff --git a/libcinnamon-desktop/pnp.ids b/libcinnamon-desktop/pnp.ids
+deleted file mode 100644
+index 70c10bb4..00000000
+--- a/libcinnamon-desktop/pnp.ids
++++ /dev/null
+@@ -1,75 +0,0 @@
+-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
+-<head>
+-<title>hwdata.git - Hardware Database, including Monitors, pci.ids, usb.ids, and video cards</title>
+-<meta name='generator' content='cgit v0.9.1'/>
+-<meta name='robots' content='index, nofollow'/>
+-<link rel='stylesheet' type='text/css' href='/cgit-data/cgit.css'/>
+-<link rel='alternate' title='Atom feed' href='http://git.fedorahosted.org/cgit/hwdata.git/atom/?h=master' type='application/atom+xml'/>
+-</head>
+-<body>
+-<div id='cgit'><table id='header'>
+-<tr>
+-<td class='logo' rowspan='2'><a href='/cgit/'><img src='/cgit-data/cgit.png' alt='cgit logo'/></a></td>
+-<td class='main'><a href='/cgit/'>index</a> : <a title='hwdata.git' href='/cgit/hwdata.git/'>hwdata.git</a></td><td class='form'><form method='get' action=''>
+-<select name='h' onchange='this.form.submit();'>
+-<option value='RHEL4'>RHEL4</option>
+-<option value='RHEL5'>RHEL5</option>
+-<option value='RHEL6'>RHEL6</option>
+-<option value='RHEL7'>RHEL7</option>
+-<option value='master' selected='selected'>master</option>
+-<option value='rhel5'>rhel5</option>
+-</select> <input type='submit' name='' value='switch'/></form></td></tr>
+-<tr><td class='sub'>Hardware Database, including Monitors, pci.ids, usb.ids, and video cards</td><td class='sub right'>Karsten Hopp</td></tr></table>
+-<table class='tabs'><tr><td>
+-<a class='active' href='/cgit/hwdata.git/'>summary</a><a href='/cgit/hwdata.git/refs/'>refs</a><a href='/cgit/hwdata.git/log/'>log</a><a href='/cgit/hwdata.git/tree/'>tree</a><a href='/cgit/hwdata.git/commit/'>commit</a><a href='/cgit/hwdata.git/diff/'>diff</a><a href='/cgit/hwdata.git/stats/'>stats</a></td><td class='form'><form class='right' method='get' action='/cgit/hwdata.git/log/'>
+-<select name='qt'>
+-<option value='grep'>log msg</option>
+-<option value='author'>author</option>
+-<option value='committer'>committer</option>
+-<option value='range'>range</option>
+-</select>
+-<input class='txt' type='text' size='10' name='q' value=''/>
+-<input type='submit' value='search'/>
+-</form>
+-</td></tr></table>
+-<div class='content'><table summary='repository info' class='list nowrap'><tr class='nohover'><th class='left'>Branch</th><th class='left'>Commit message</th><th class='left'>Author</th><th class='left' colspan='2'>Age</th></tr>
+-<tr><td><a href='/cgit/hwdata.git/log/?h=RHEL4'>RHEL4</a></td><td><a href='/cgit/hwdata.git/commit/?h=RHEL4'>bump release and add changelog</a></td><td>Karsten Hopp</td><td colspan='2'><span class='age-years'>2 years</span></td></tr>
+-<tr><td><a href='/cgit/hwdata.git/log/?h=RHEL5'>RHEL5</a></td><td><a href='/cgit/hwdata.git/commit/?h=RHEL5'>- update pci.ids, usb.ids</a></td><td>Karsten Hopp</td><td colspan='2'><span class='age-years'>2 years</span></td></tr>
+-<tr><td><a href='/cgit/hwdata.git/log/?h=RHEL6'>RHEL6</a></td><td><a href='/cgit/hwdata.git/commit/?h=RHEL6'>updated pci.ids, usb.ids (#760014)</a></td><td>Karsten Hopp</td><td colspan='2'><span class='age-months'>13 months</span></td></tr>
+-<tr><td><a href='/cgit/hwdata.git/log/?h=RHEL7'>RHEL7</a></td><td><a href='/cgit/hwdata.git/commit/?h=RHEL7'>update</a></td><td>Karsten Hopp</td><td colspan='2'><span class='age-months'>10 months</span></td></tr>
+-<tr><td><a href='/cgit/hwdata.git/log/'>master</a></td><td><a href='/cgit/hwdata.git/commit/'>data files update</a></td><td>Michal Minar</td><td colspan='2'><span class='age-weeks'>4 weeks</span></td></tr>
+-<tr><td><a href='/cgit/hwdata.git/log/?h=rhel5'>rhel5</a></td><td><a href='/cgit/hwdata.git/commit/?h=rhel5'>Merge commit 'origin/master'</a></td><td>Karsten Hopp</td><td colspan='2'><span class='age-years'>5 years</span></td></tr>
+-<tr class='nohover'><td colspan='4'> </td></tr><tr class='nohover'><th class='left'>Tag</th><th class='left'>Download</th><th class='left'>Author</th><th class='left' colspan='2'>Age</th></tr>
+-<tr><td><a href='/cgit/hwdata.git/tag/?id=hwdata-0.243-1'>hwdata-0.243-1</a></td><td><a href='/cgit/hwdata.git/snapshot/hwdata-0.243-1.zip'>hwdata-0.243-1.zip</a> <a href='/cgit/hwdata.git/snapshot/hwdata-0.243-1.tar.gz'>hwdata-0.243-1.tar.gz</a> <a href='/cgit/hwdata.git/snapshot/hwdata-0.243-1.tar.bz2'>hwdata-0.243-1.tar.bz2</a> </td><td>Michal Minar</td><td colspan='2'><span class='age-weeks'>8 weeks</span></td></tr>
+-<tr><td><a href='/cgit/hwdata.git/tag/?id=hwdata-0.242-1'>hwdata-0.242-1</a></td><td><a href='/cgit/hwdata.git/snapshot/hwdata-0.242-1.zip'>hwdata-0.242-1.zip</a> <a href='/cgit/hwdata.git/snapshot/hwdata-0.242-1.tar.gz'>hwdata-0.242-1.tar.gz</a> <a href='/cgit/hwdata.git/snapshot/hwdata-0.242-1.tar.bz2'>hwdata-0.242-1.tar.bz2</a> </td><td>Michal Minar</td><td colspan='2'><span class='age-months'>3 months</span></td></tr>
+-<tr><td><a href='/cgit/hwdata.git/tag/?id=hwdata-0.241-1'>hwdata-0.241-1</a></td><td><a href='/cgit/hwdata.git/snapshot/hwdata-0.241-1.zip'>hwdata-0.241-1.zip</a> <a href='/cgit/hwdata.git/snapshot/hwdata-0.241-1.tar.gz'>hwdata-0.241-1.tar.gz</a> <a href='/cgit/hwdata.git/snapshot/hwdata-0.241-1.tar.bz2'>hwdata-0.241-1.tar.bz2</a> </td><td>Michal Minar</td><td colspan='2'><span class='age-months'>4 months</span></td></tr>
+-<tr><td><a href='/cgit/hwdata.git/tag/?id=hwdata-0.240-1'>hwdata-0.240-1</a></td><td><a href='/cgit/hwdata.git/snapshot/hwdata-0.240-1.zip'>hwdata-0.240-1.zip</a> <a href='/cgit/hwdata.git/snapshot/hwdata-0.240-1.tar.gz'>hwdata-0.240-1.tar.gz</a> <a href='/cgit/hwdata.git/snapshot/hwdata-0.240-1.tar.bz2'>hwdata-0.240-1.tar.bz2</a> </td><td>Michal Minar</td><td colspan='2'><span class='age-months'>4 months</span></td></tr>
+-<tr><td><a href='/cgit/hwdata.git/tag/?id=hwdata-0.238-1'>hwdata-0.238-1</a></td><td><a href='/cgit/hwdata.git/snapshot/hwdata-0.238-1.zip'>hwdata-0.238-1.zip</a> <a href='/cgit/hwdata.git/snapshot/hwdata-0.238-1.tar.gz'>hwdata-0.238-1.tar.gz</a> <a href='/cgit/hwdata.git/snapshot/hwdata-0.238-1.tar.bz2'>hwdata-0.238-1.tar.bz2</a> </td><td>Adam Jackson</td><td colspan='2'><span class='age-months'>7 months</span></td></tr>
+-<tr><td><a href='/cgit/hwdata.git/tag/?id=hwdata-0.237-1'>hwdata-0.237-1</a></td><td><a href='/cgit/hwdata.git/snapshot/hwdata-0.237-1.zip'>hwdata-0.237-1.zip</a> <a href='/cgit/hwdata.git/snapshot/hwdata-0.237-1.tar.gz'>hwdata-0.237-1.tar.gz</a> <a href='/cgit/hwdata.git/snapshot/hwdata-0.237-1.tar.bz2'>hwdata-0.237-1.tar.bz2</a> </td><td>Adam Jackson</td><td colspan='2'><span class='age-months'>7 months</span></td></tr>
+-<tr><td><a href='/cgit/hwdata.git/tag/?id=hwdata-0.236-1'>hwdata-0.236-1</a></td><td><a href='/cgit/hwdata.git/snapshot/hwdata-0.236-1.zip'>hwdata-0.236-1.zip</a> <a href='/cgit/hwdata.git/snapshot/hwdata-0.236-1.tar.gz'>hwdata-0.236-1.tar.gz</a> <a href='/cgit/hwdata.git/snapshot/hwdata-0.236-1.tar.bz2'>hwdata-0.236-1.tar.bz2</a> </td><td>Adam Jackson</td><td colspan='2'><span class='age-months'>7 months</span></td></tr>
+-<tr><td><a href='/cgit/hwdata.git/tag/?id=hwdata-0.235-1'>hwdata-0.235-1</a></td><td><a href='/cgit/hwdata.git/snapshot/hwdata-0.235-1.zip'>hwdata-0.235-1.zip</a> <a href='/cgit/hwdata.git/snapshot/hwdata-0.235-1.tar.gz'>hwdata-0.235-1.tar.gz</a> <a href='/cgit/hwdata.git/snapshot/hwdata-0.235-1.tar.bz2'>hwdata-0.235-1.tar.bz2</a> </td><td>Adam Jackson</td><td colspan='2'><span class='age-months'>7 months</span></td></tr>
+-<tr><td><a href='/cgit/hwdata.git/tag/?id=hwdata-0.213.16-1'>hwdata-0.213.16-1</a></td><td><a href='/cgit/hwdata.git/snapshot/hwdata-0.213.16-1.zip'>hwdata-0.213.16-1.zip</a> <a href='/cgit/hwdata.git/snapshot/hwdata-0.213.16-1.tar.gz'>hwdata-0.213.16-1.tar.gz</a> <a href='/cgit/hwdata.git/snapshot/hwdata-0.213.16-1.tar.bz2'>hwdata-0.213.16-1.tar.bz2</a> </td><td>Philip Knirsch</td><td colspan='2'><span class='age-years'>4 years</span></td></tr>
+-<tr><td><a href='/cgit/hwdata.git/tag/?id=hwdata-0.225-1'>hwdata-0.225-1</a></td><td><a href='/cgit/hwdata.git/snapshot/hwdata-0.225-1.zip'>hwdata-0.225-1.zip</a> <a href='/cgit/hwdata.git/snapshot/hwdata-0.225-1.tar.gz'>hwdata-0.225-1.tar.gz</a> <a href='/cgit/hwdata.git/snapshot/hwdata-0.225-1.tar.bz2'>hwdata-0.225-1.tar.bz2</a> </td><td>Adam Jackson</td><td colspan='2'><span class='age-years'>4 years</span></td></tr>
+-<tr class='nohover'><td colspan='4'><a href='/cgit/hwdata.git/refs/tags'>[...]</a></td></tr><tr class='nohover'><td colspan='4'> </td></tr><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message</th><th class='left'>Author</th><th class='left'>Files</th><th class='left'>Lines</th></tr>
+-<tr><td>2013-02-18</td><td><a href='/cgit/hwdata.git/commit/?id=5e931dd336e03c1029b2ae856298e450471f38dc'>data files update</a><a class='deco' href='/cgit/hwdata.git/commit/?id=5e931dd336e03c1029b2ae856298e450471f38dc'>HEAD</a><a class='branch-deco' href='/cgit/hwdata.git/log/'>master</a></td><td>Michal Minar</td><td>3</td><td>-3662/+5993</td></tr>
+-<tr><td>2013-01-18</td><td><a href='/cgit/hwdata.git/commit/?id=ab16cd38b8c676c69b4e2329d9d36d0f3899dae4'>updated text of GPLv2 file</a></td><td>Michal Minar</td><td>1</td><td>-21/+20</td></tr>
+-<tr><td>2013-01-18</td><td><a href='/cgit/hwdata.git/commit/?id=1eef266fb376a5208246c0b54da82b8fbe8475ad'>updated data files</a><a class='tag-deco' href='/cgit/hwdata.git/tag/?id=hwdata-0.243-1'>hwdata-0.243-1</a></td><td>Michal Minar</td><td>4</td><td>-511/+372</td></tr>
+-<tr><td>2012-12-07</td><td><a href='/cgit/hwdata.git/commit/?id=3ec4e33c01d479ed3cf4321a7b7f4dc91a79e970'>Updated data files</a><a class='tag-deco' href='/cgit/hwdata.git/tag/?id=hwdata-0.242-1'>hwdata-0.242-1</a></td><td>Michal Minar</td><td>4</td><td>-2235/+3545</td></tr>
+-<tr><td>2012-11-07</td><td><a href='/cgit/hwdata.git/commit/?id=1ce7e5ea843892755c43ee751f032c8c6e47137b'>updated spec</a><a class='tag-deco' href='/cgit/hwdata.git/tag/?id=hwdata-0.241-1'>hwdata-0.241-1</a></td><td>Michal Minar</td><td>1</td><td>-1/+4</td></tr>
+-<tr><td>2012-11-07</td><td><a href='/cgit/hwdata.git/commit/?id=4df2658e8024a019f5621d9c509a6ab2255ee85e'>updated pci.ids and out.txt</a><a class='tag-deco' href='/cgit/hwdata.git/tag/?id=hwdata-0.240-1'>hwdata-0.240-1</a></td><td>Michal Minar</td><td>2</td><td>-191/+1167</td></tr>
+-<tr><td>2012-10-31</td><td><a href='/cgit/hwdata.git/commit/?id=a7b95c1323b88cacc9ef51ab345a86449dbb965d'>added script for comparison of old and new pci.ids</a></td><td>Michal Minar</td><td>1</td><td>-0/+150</td></tr>
+-<tr><td>2012-09-26</td><td><a href='/cgit/hwdata.git/commit/?id=2f39fb805e3a861bd49f4524764104f2db0dab37'>update data files, fixed spec file</a></td><td>Michal Minar</td><td>4</td><td>-28/+58</td></tr>
+-<tr><td>2012-09-25</td><td><a href='/cgit/hwdata.git/commit/?id=9665c98dd34ab927772ce359e9ee9fbc0a549d97'>updated data files (pci.ids, oui.txt, usb.ids)</a></td><td>Michal Minar</td><td>4</td><td>-1839/+3261</td></tr>
+-<tr><td>2012-08-27</td><td><a href='/cgit/hwdata.git/commit/?id=3ab47e5247be12cb03df83682a6d1c1f5a716cff'>build: Don't depend on hwdata.spec for 'make install'</a></td><td>Colin Walters</td><td>1</td><td>-1/+1</td></tr>
+-<tr class='nohover'><td colspan='3'><a href='/cgit/hwdata.git/log/'>[...]</a></td></tr>
+-<tr class='nohover'><td colspan='4'> </td></tr><tr><th class='left' colspan='4'>Clone</th></tr>
+-<tr><td colspan='4'><a href='git://git.fedorahosted.org/hwdata.git'>git://git.fedorahosted.org/hwdata.git</a></td></tr>
+-<tr><td colspan='4'><a href='ssh://git.fedorahosted.org/git/hwdata.git'>ssh://git.fedorahosted.org/git/hwdata.git</a></td></tr>
+-<tr><td colspan='4'><a href='http://git.fedorahosted.org/git/hwdata.git'>http://git.fedorahosted.org/git/hwdata.git</a></td></tr>
+-</table></div> <!-- class=content -->
+-<div class='footer'>generated by cgit v0.9.1 at 2013-03-16 18:07:15 (GMT)</div>
+-</div> <!-- id=cgit -->
+-</body>
+-</html>
+diff --git a/meson.build b/meson.build
+index 8243a5d5..4b16875c 100644
+--- a/meson.build
++++ b/meson.build
+@@ -63,20 +63,6 @@ use_alsa = get_option('alsa')
+ xkb_base = xkbconf.get_variable(pkgconfig: 'xkb_base')
+ iso_codes_prefix = iso_codes.get_pkgconfig_variable('prefix')
+
+-# Path to the pnp.ids file -- to know if we use one shipped with another
+-# package, or an internal file
+-
+-pnp_ids_path = get_option('pnp_ids')
+-pnp_ids_install_internal = (pnp_ids_path == '')
+-
+-if pnp_ids_install_internal
+- # Default value
+- pnp_ids_path = join_paths(get_option('datadir'), 'libcinnamon-desktop')
+- pnp_ids_abspath = join_paths(get_option('prefix'), pnp_ids_path)
+-else
+- pnp_ids_abspath = pnp_ids_path
+-endif
+-
+ ################################################################################
+ # Config
+
+@@ -113,12 +99,6 @@ subdir('libcinnamon-desktop')
+ subdir('libcvc')
+ subdir('schemas')
+
+-
+-pnp_message = '@0@: @1@'.format(
+- ''+(pnp_ids_install_internal ? 'internal' : 'system'),
+- pnp_ids_abspath
+-)
+-
+ message('\n'.join([
+ '',
+ ' prefix: ' + get_option('prefix'),
+@@ -133,7 +113,6 @@ message('\n'.join([
+ ' compiler: ' + cc.get_id(),
+ ' debugging support: ' + get_option('buildtype'),
+ ' Use *_DISABLE_DEPRECATED: @0@'.format(get_option('deprecation_warnings')),
+- ' Use PNP files: ' + pnp_message,
+ ' Use ALSA: ' + '@0@'.format(use_alsa),
+ ' systemd: @0@'.format(systemd.found()),
+ '',
+diff --git a/meson_options.txt b/meson_options.txt
+index e0ad4d3a..612c3e39 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,7 +1,5 @@
+ option('deprecation_warnings', type: 'boolean', value: false,
+ description: 'Show compiler warnings about deprecated features')
+-option('pnp_ids', type: 'string', value: '',
+- description: 'Specify the path to pnp.ids (default is an internal copy)')
+ option('alsa', type: 'boolean', value: false,
+ description: 'ALSA support')
+ option('systemd',
next reply other threads:[~2025-03-10 2:25 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-10 2:25 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-09-27 5:57 [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-desktop/, gnome-extra/cinnamon-desktop/files/ Eli Schwartz
2020-05-31 19:05 Matt Turner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1741573437.6fb334e837a7b33f355fcd9aecf51d809c5e4104.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox