Remove the pnp_ids configuration option (unused as of 9131984) (#249)

Author: SparkyBluefang

debian/rules

@@ -9,8 +9,7 @@ export DPKG_GENSYMBOLS_CHECK_LEVEL = 2
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		--buildtype=debugoptimized \
-		-Dpnp_ids=/usr/share/hwdata/pnp.ids
+		--buildtype=debugoptimized
 
 override_dh_strip:
 	dh_strip -Xdesktop -Xcinnamon --dbg-package=libcvc-dbg

libcinnamon-desktop/meson.build

@@ -73,7 +73,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,
@@ -97,12 +96,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',

libcinnamon-desktop/pnp.ids

@@ -63,20 +63,6 @@ use_alsa = get_option('alsa')
 xkb_base = xkbconf.get_variable(pkgconfig: 'xkb_base')
 iso_codes_prefix = iso_codes.get_variable(pkgconfig: '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()),
   '',

meson.build

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