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',