From cf7807d7aea23a99a144afceaba961cfed652b5f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 11 Mar 2025 01:49:36 +0000 Subject: gentoo auto-resync : 11:03:2025 - 01:49:36 --- gnome-extra/cinnamon-desktop/Manifest | 3 + .../cinnamon-desktop/cinnamon-desktop-6.4.1.ebuild | 74 ++++++++ ...namon-desktop-6.4.0-remove-pnp_ids-option.patch | 193 +++++++++++++++++++++ 3 files changed, 270 insertions(+) create mode 100644 gnome-extra/cinnamon-desktop/cinnamon-desktop-6.4.1.ebuild create mode 100644 gnome-extra/cinnamon-desktop/files/cinnamon-desktop-6.4.0-remove-pnp_ids-option.patch (limited to 'gnome-extra/cinnamon-desktop') diff --git a/gnome-extra/cinnamon-desktop/Manifest b/gnome-extra/cinnamon-desktop/Manifest index 139b8361fa36..bde0075a6ec6 100644 --- a/gnome-extra/cinnamon-desktop/Manifest +++ b/gnome-extra/cinnamon-desktop/Manifest @@ -1,3 +1,6 @@ +AUX cinnamon-desktop-6.4.0-remove-pnp_ids-option.patch 16244 BLAKE2B 4ff77ac0adfa5d887caec2409dde56750e60f8ef69fa41050da1d4b7ca7b7a16cb705008c187bb1f8012dda82f613cba52e26be17e71350f265bc2935a6400e3 SHA512 ba9c791829df8a6d01d6db42e3a58b57689ab42ad7f69160ff3d383f632569558027cf54ea5ee67063ad82f376dbffc4b17514ab9ac64f87fd4d551780d0c103 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 EBUILD cinnamon-desktop-6.2.0.ebuild 1714 BLAKE2B 181ec00176e0f12f4335b401a7fc364f7260d2a8cb81c0294d0ef7c8e42b1250add6451d1374d2582e722b336a621ff7fd27ff8d0560d99136b74dc9e0ea88bb SHA512 9fbee55110211224626ff0cda9a63fd22762d4d5d9ba6429e8b6132f2e5141588b485b3ded3b3c9c3b5249ba09dda4c0f008887bacf55ae863811d38c1c0bfe9 +EBUILD cinnamon-desktop-6.4.1.ebuild 1885 BLAKE2B fd251a80904d71a56500bb100854a5ecc27ea00b609c4f26f8aeb28f8a150d2f51c76df7b9574502d200f7ec35a9a47def39c0ab43726b581846600acede218e SHA512 e924e8080f9f94f663f83980ac6cd016a9c646b71c18186efca330bff00b8b732ee4eed2e57ad019a58155bab040a3d4c2ddff8ab7e31741b7fae3b0d9c6dc25 MISC metadata.xml 496 BLAKE2B c019ef51b10de9ccafed1294e6d436dcdc8f02735170afe9e038689c6c4d76fb3e099bc9ec7f10c2a50d2bfa5e1d1c191667a470d734effad53d9d299f431664 SHA512 41a99dd4e1aad85dda44e2168bc150e2c27bb40a45c0dfe0f085e502242e6a0704ad8b47f64140d81afa7ff096cac735c46827f3d949962400de92d769505cc4 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 +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 @@ +- +- +- +-hwdata.git - Hardware Database, including Monitors, pci.ids, usb.ids, and video cards +- +- +- +- +- +- +-
+- +- +- +- +-
+-summaryrefslogtreecommitdiffstats
+- +- +- +-
+-
+-
+- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-
BranchCommit messageAuthorAge
RHEL4bump release and add changelogKarsten Hopp2 years
RHEL5- update pci.ids, usb.idsKarsten Hopp2 years
RHEL6updated pci.ids, usb.ids (#760014)Karsten Hopp13 months
RHEL7updateKarsten Hopp10 months
masterdata files updateMichal Minar4 weeks
rhel5Merge commit 'origin/master'Karsten Hopp5 years
 
TagDownloadAuthorAge
hwdata-0.243-1hwdata-0.243-1.zip  hwdata-0.243-1.tar.gz  hwdata-0.243-1.tar.bz2  Michal Minar8 weeks
hwdata-0.242-1hwdata-0.242-1.zip  hwdata-0.242-1.tar.gz  hwdata-0.242-1.tar.bz2  Michal Minar3 months
hwdata-0.241-1hwdata-0.241-1.zip  hwdata-0.241-1.tar.gz  hwdata-0.241-1.tar.bz2  Michal Minar4 months
hwdata-0.240-1hwdata-0.240-1.zip  hwdata-0.240-1.tar.gz  hwdata-0.240-1.tar.bz2  Michal Minar4 months
hwdata-0.238-1hwdata-0.238-1.zip  hwdata-0.238-1.tar.gz  hwdata-0.238-1.tar.bz2  Adam Jackson7 months
hwdata-0.237-1hwdata-0.237-1.zip  hwdata-0.237-1.tar.gz  hwdata-0.237-1.tar.bz2  Adam Jackson7 months
hwdata-0.236-1hwdata-0.236-1.zip  hwdata-0.236-1.tar.gz  hwdata-0.236-1.tar.bz2  Adam Jackson7 months
hwdata-0.235-1hwdata-0.235-1.zip  hwdata-0.235-1.tar.gz  hwdata-0.235-1.tar.bz2  Adam Jackson7 months
hwdata-0.213.16-1hwdata-0.213.16-1.zip  hwdata-0.213.16-1.tar.gz  hwdata-0.213.16-1.tar.bz2  Philip Knirsch4 years
hwdata-0.225-1hwdata-0.225-1.zip  hwdata-0.225-1.tar.gz  hwdata-0.225-1.tar.bz2  Adam Jackson4 years
[...]
 
AgeCommit messageAuthorFilesLines
2013-02-18data files updateHEADmasterMichal Minar3-3662/+5993
2013-01-18updated text of GPLv2 fileMichal Minar1-21/+20
2013-01-18updated data fileshwdata-0.243-1Michal Minar4-511/+372
2012-12-07Updated data fileshwdata-0.242-1Michal Minar4-2235/+3545
2012-11-07updated spechwdata-0.241-1Michal Minar1-1/+4
2012-11-07updated pci.ids and out.txthwdata-0.240-1Michal Minar2-191/+1167
2012-10-31added script for comparison of old and new pci.idsMichal Minar1-0/+150
2012-09-26update data files, fixed spec fileMichal Minar4-28/+58
2012-09-25updated data files (pci.ids, oui.txt, usb.ids)Michal Minar4-1839/+3261
2012-08-27build: Don't depend on hwdata.spec for 'make install'Colin Walters1-1/+1
[...]
 
Clone
git://git.fedorahosted.org/hwdata.git
ssh://git.fedorahosted.org/git/hwdata.git
http://git.fedorahosted.org/git/hwdata.git
+-
generated by cgit v0.9.1 at 2013-03-16 18:07:15 (GMT)
+-
+- +- +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', -- cgit v1.2.3