rpms / cinnamon-settings-daemon

Clone
Source Code
GIT

Files

  1.   ff90f76b681cff6d2cea993bd3890f532a36133f
  2.   fix_meson.patch
Blob Blame History Raw 
diff -uNrp a/meson.build b/meson.build
--- a/meson.build	2020-10-15 04:00:01.000000000 +0100
+++ b/meson.build	2020-10-22 23:31:11.884196203 +0100
@@ -15,6 +15,7 @@ prefix = get_option('prefix')
 bindir = get_option('bindir')
 datadir = get_option('datadir')
 libdir = get_option('libdir')
+libexecdir = get_option('libexecdir')
 includedir = get_option('includedir')
 desktopdir = join_paths(datadir, 'applications')
 schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
@@ -115,7 +116,7 @@ csd_conf.set_quoted('PACKAGE', meson.pro
 csd_conf.set_quoted('PACKAGE_NAME', meson.project_name())
 csd_conf.set_quoted('PACKAGE_VERSION', meson.project_version())
 csd_conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
-csd_conf.set_quoted('LIBEXECDIR', join_paths(prefix, pkglibdir))
+csd_conf.set_quoted('LIBEXECDIR', join_paths(prefix, libexecdir))
 csd_conf.set_quoted('SYSCONFDIR', sysconfdir)
 csd_conf.set_quoted('LIBDIR', libdir)
 
diff -uNrp a/plugins/a11y-keyboard/meson.build b/plugins/a11y-keyboard/meson.build
--- a/plugins/a11y-keyboard/meson.build	2020-10-15 04:00:01.000000000 +0100
+++ b/plugins/a11y-keyboard/meson.build	2020-10-22 23:22:22.392815105 +0100
@@ -21,7 +21,7 @@ executable(
         '-DPLUGIN_NAME="@0@"'.format(plugin_name),
     ],
     install: true,
-    install_dir: pkglibdir,
+    install_dir: libexecdir,
 )
 
 test_a11y_prefs_dialog_sources = [
diff -uNrp a/plugins/a11y-settings/meson.build b/plugins/a11y-settings/meson.build
--- a/plugins/a11y-settings/meson.build	2020-10-15 04:00:01.000000000 +0100
+++ b/plugins/a11y-settings/meson.build	2020-10-22 23:22:22.392815105 +0100
@@ -20,7 +20,7 @@ executable(
         '-DPLUGIN_NAME="@0@"'.format(plugin_name),
     ],
     install: true,
-    install_dir: pkglibdir,
+    install_dir: libexecdir,
 )
 
 configure_file(
diff -uNrp a/plugins/automount/meson.build b/plugins/automount/meson.build
--- a/plugins/automount/meson.build	2020-10-15 04:00:01.000000000 +0100
+++ b/plugins/automount/meson.build	2020-10-22 23:22:22.392815105 +0100
@@ -22,7 +22,7 @@ executable(
     ],
     install_rpath: join_paths(prefix, apilibdir),
     install: true,
-    install_dir: pkglibdir,
+    install_dir: libexecdir,
 )
 
 test_automount_dialog_sources = [
diff -uNrp a/plugins/background/meson.build b/plugins/background/meson.build
--- a/plugins/background/meson.build	2020-10-15 04:00:01.000000000 +0100
+++ b/plugins/background/meson.build	2020-10-22 23:22:22.392815105 +0100
@@ -21,7 +21,7 @@ executable(
         '-DPLUGIN_NAME="@0@"'.format(plugin_name),
     ],
     install: true,
-    install_dir: pkglibdir,
+    install_dir: libexecdir,
 )
 
 configure_file(
diff -uNrp a/plugins/clipboard/meson.build b/plugins/clipboard/meson.build
--- a/plugins/clipboard/meson.build	2020-10-15 04:00:01.000000000 +0100
+++ b/plugins/clipboard/meson.build	2020-10-22 23:22:22.392815105 +0100
@@ -22,7 +22,7 @@ executable(
         '-DPLUGIN_NAME="@0@"'.format(plugin_name),
     ],
     install: true,
-    install_dir: pkglibdir,
+    install_dir: libexecdir,
 )
 
 configure_file(
diff -uNrp a/plugins/color/meson.build b/plugins/color/meson.build
--- a/plugins/color/meson.build	2020-10-15 04:00:01.000000000 +0100
+++ b/plugins/color/meson.build	2020-10-22 23:22:22.393815103 +0100
@@ -30,7 +30,7 @@ executable(
     ],
     install_rpath: join_paths(prefix, apilibdir),
     install: true,
-    install_dir: pkglibdir,
+    install_dir: libexecdir,
 )
 
 test_color_sources = [
diff -uNrp a/plugins/common/meson.build b/plugins/common/meson.build
--- a/plugins/common/meson.build	2020-10-15 04:00:01.000000000 +0100
+++ b/plugins/common/meson.build	2020-10-22 23:22:22.393815103 +0100
@@ -36,7 +36,7 @@ executable(
     helper_sources,
     dependencies: common_dep,
     install: true,
-    install_dir: pkglibdir,
+    install_dir: libexecdir,
 )
 
 install_data(
diff -uNrp a/plugins/cursor/meson.build b/plugins/cursor/meson.build
--- a/plugins/cursor/meson.build	2020-10-15 04:00:01.000000000 +0100
+++ b/plugins/cursor/meson.build	2020-10-22 23:22:22.393815103 +0100
@@ -21,7 +21,7 @@ executable(
         '-DPLUGIN_NAME="@0@"'.format(plugin_name),
     ],
     install: true,
-    install_dir: pkglibdir,
+    install_dir: libexecdir,
 )
 
 configure_file(
diff -uNrp a/plugins/datetime/meson.build b/plugins/datetime/meson.build
--- a/plugins/datetime/meson.build	2020-10-15 04:00:01.000000000 +0100
+++ b/plugins/datetime/meson.build	2020-10-22 23:22:22.393815103 +0100
@@ -57,7 +57,7 @@ if polkit.found()
             '-DPLUGIN_NAME="@0@"'.format(plugin_name),
         ],
         install: true,
-        install_dir: pkglibdir,
+        install_dir: libexecdir,
     )
 
     executable(
@@ -69,7 +69,7 @@ if polkit.found()
 endif
 
 datetime_conf = configuration_data()
-datetime_conf.set('LIBEXECDIR', join_paths(prefix, pkglibdir))
+datetime_conf.set('LIBEXECDIR', join_paths(prefix, libexecdir))
 configure_file(
     input: 'org.cinnamon.SettingsDaemon.DateTimeMechanism.service.in',
     output: 'org.cinnamon.SettingsDaemon.DateTimeMechanism.service',
diff -uNrp a/plugins/dummy/meson.build b/plugins/dummy/meson.build
--- a/plugins/dummy/meson.build	2020-10-15 04:00:01.000000000 +0100
+++ b/plugins/dummy/meson.build	2020-10-22 23:22:22.393815103 +0100
@@ -21,5 +21,5 @@ executable(
         '-DPLUGIN_NAME="@0@"'.format(plugin_name),
     ],
     install: true,
-    install_dir: pkglibdir,
+    install_dir: libexecdir,
 )
diff -uNrp a/plugins/housekeeping/meson.build b/plugins/housekeeping/meson.build
--- a/plugins/housekeeping/meson.build	2020-10-15 04:00:01.000000000 +0100
+++ b/plugins/housekeeping/meson.build	2020-10-22 23:22:22.394815099 +0100
@@ -27,7 +27,7 @@ executable(
         '-DPLUGIN_NAME="@0@"'.format(plugin_name),
     ],
     install: true,
-    install_dir: pkglibdir,
+    install_dir: libexecdir,
 )
 
 test_disk_space_sources = [
diff -uNrp a/plugins/keyboard/meson.build b/plugins/keyboard/meson.build
--- a/plugins/keyboard/meson.build	2020-10-15 04:00:01.000000000 +0100
+++ b/plugins/keyboard/meson.build	2020-10-22 23:22:22.394815099 +0100
@@ -27,7 +27,7 @@ executable(
         '-DDATADIR="@0@"'.format(datadir),
     ],
     install: true,
-    install_dir: pkglibdir,
+    install_dir: libexecdir,
 )
 
 configure_file(
diff -uNrp a/plugins/media-keys/meson.build b/plugins/media-keys/meson.build
--- a/plugins/media-keys/meson.build	2020-10-15 04:00:01.000000000 +0100
+++ b/plugins/media-keys/meson.build	2020-10-22 23:22:22.394815099 +0100
@@ -27,7 +27,7 @@ executable(
         '-DPLUGIN_NAME="@0@"'.format(plugin_name),
     ],
     install: true,
-    install_dir: pkglibdir,
+    install_dir: libexecdir,
 )
 
 configure_file(
diff -uNrp a/plugins/meson.build b/plugins/meson.build
--- a/plugins/meson.build	2020-10-15 04:00:01.000000000 +0100
+++ b/plugins/meson.build	2020-10-22 23:38:48.321777388 +0100
@@ -1,5 +1,5 @@
 desktop_conf = configuration_data()
-desktop_conf.set('libexecdir', join_paths(prefix, pkglibdir))
+desktop_conf.set('libexecdir', join_paths(prefix, libexecdir))
 
 subdir('common')
 subdir('a11y-keyboard')
diff -uNrp a/plugins/mouse/meson.build b/plugins/mouse/meson.build
--- a/plugins/mouse/meson.build	2020-10-15 04:00:01.000000000 +0100
+++ b/plugins/mouse/meson.build	2020-10-22 23:22:22.394815099 +0100
@@ -26,7 +26,7 @@ executable(
         '-DPLUGIN_NAME="@0@"'.format(plugin_name),
     ],
     install: true,
-    install_dir: pkglibdir,
+    install_dir: libexecdir,
 )
 
 executable(
@@ -35,7 +35,7 @@ executable(
     include_directories: [include_dirs, common_inc],
     dependencies: mouse_deps,
     install: true,
-    install_dir: pkglibdir,
+    install_dir: libexecdir,
 )
 
 configure_file(
diff -uNrp a/plugins/orientation/meson.build b/plugins/orientation/meson.build
--- a/plugins/orientation/meson.build	2020-10-15 04:00:01.000000000 +0100
+++ b/plugins/orientation/meson.build	2020-10-22 23:22:22.394815099 +0100
@@ -21,7 +21,7 @@ executable(
         '-DPLUGIN_NAME="@0@"'.format(plugin_name),
     ],
     install: true,
-    install_dir: pkglibdir,
+    install_dir: libexecdir,
 )
 
 configure_file(
diff -uNrp a/plugins/power/meson.build b/plugins/power/meson.build
--- a/plugins/power/meson.build	2020-10-15 04:00:01.000000000 +0100
+++ b/plugins/power/meson.build	2020-10-22 23:22:22.395815096 +0100
@@ -63,7 +63,7 @@ executable(
     ],
     install_rpath: join_paths(prefix, apilibdir),
     install: true,
-    install_dir: pkglibdir,
+    install_dir: libexecdir,
 )
 
 if gudev.found()
@@ -76,7 +76,7 @@ if gudev.found()
             # '-DPLUGIN_NAME="@0@"'.format(plugin_name),
         ],
         install: true,
-        install_dir: pkglibdir,
+        install_dir: libexecdir,
     )
 endif
 
diff -uNrp a/plugins/print-notifications/meson.build b/plugins/print-notifications/meson.build
--- a/plugins/print-notifications/meson.build	2020-10-15 04:00:01.000000000 +0100
+++ b/plugins/print-notifications/meson.build	2020-10-22 23:22:22.395815096 +0100
@@ -26,7 +26,7 @@ executable(
         '-DPLUGIN_NAME="@0@"'.format(plugin_name),
     ],
     install: true,
-    install_dir: pkglibdir,
+    install_dir: libexecdir,
 )
 
 executable(
@@ -35,7 +35,7 @@ executable(
     include_directories: [include_dirs, common_inc],
     dependencies: print_notifications_deps,
     install: true,
-    install_dir: pkglibdir,
+    install_dir: libexecdir,
 )
 
 configure_file(
diff -uNrp a/plugins/screensaver-proxy/meson.build b/plugins/screensaver-proxy/meson.build
--- a/plugins/screensaver-proxy/meson.build	2020-10-15 04:00:01.000000000 +0100
+++ b/plugins/screensaver-proxy/meson.build	2020-10-22 23:22:22.395815096 +0100
@@ -20,7 +20,7 @@ executable(
         '-DPLUGIN_NAME="@0@"'.format(plugin_name),
     ],
     install: true,
-    install_dir: pkglibdir,
+    install_dir: libexecdir,
 )
 
 configure_file(
diff -uNrp a/plugins/smartcard/meson.build b/plugins/smartcard/meson.build
--- a/plugins/smartcard/meson.build	2020-10-15 04:00:01.000000000 +0100
+++ b/plugins/smartcard/meson.build	2020-10-22 23:22:22.395815096 +0100
@@ -22,7 +22,7 @@ executable(
         '-DPLUGIN_NAME="@0@"'.format(plugin_name),
     ],
     install: true,
-    install_dir: pkglibdir,
+    install_dir: libexecdir,
 )
 
 configure_file(
diff -uNrp a/plugins/sound/meson.build b/plugins/sound/meson.build
--- a/plugins/sound/meson.build	2020-10-15 04:00:01.000000000 +0100
+++ b/plugins/sound/meson.build	2020-10-22 23:22:22.395815096 +0100
@@ -24,7 +24,7 @@ executable(
         '-DPLUGIN_NAME="@0@"'.format(plugin_name),
     ],
     install: true,
-    install_dir: pkglibdir,
+    install_dir: libexecdir,
 )
 
 configure_file(
diff -uNrp a/plugins/wacom/meson.build b/plugins/wacom/meson.build
--- a/plugins/wacom/meson.build	2020-10-15 04:00:01.000000000 +0100
+++ b/plugins/wacom/meson.build	2020-10-22 23:22:22.396815093 +0100
@@ -58,7 +58,7 @@ executable(
         '-DPLUGIN_NAME="@0@"'.format(plugin_name),
     ],
     install: true,
-    install_dir: pkglibdir,
+    install_dir: libexecdir,
 )
 
 if gudev.found()
@@ -68,7 +68,7 @@ if gudev.found()
         include_directories: [include_dirs, common_inc, include_enums],
         dependencies: wacom_deps,
         install: true,
-        install_dir: pkglibdir,
+        install_dir: libexecdir,
     )
 endif
 
@@ -78,7 +78,7 @@ executable(
     include_directories: [include_dirs, common_inc, include_enums],
     dependencies: wacom_deps,
     install: true,
-    install_dir: pkglibdir,
+    install_dir: libexecdir,
 )
 
 executable(
@@ -87,7 +87,7 @@ executable(
     include_directories: [include_dirs, common_inc, include_enums],
     dependencies: wacom_deps,
     install: true,
-    install_dir: pkglibdir,
+    install_dir: libexecdir,
 )
 
 configure_file(
diff -uNrp a/plugins/xrandr/meson.build b/plugins/xrandr/meson.build
--- a/plugins/xrandr/meson.build	2020-10-15 04:00:01.000000000 +0100
+++ b/plugins/xrandr/meson.build	2020-10-22 23:22:22.396815093 +0100
@@ -23,7 +23,7 @@ executable(
         '-DPLUGIN_NAME="@0@"'.format(plugin_name),
     ],
     install: true,
-    install_dir: pkglibdir,
+    install_dir: libexecdir,
 )
 
 configure_file(
diff -uNrp a/plugins/xsettings/meson.build b/plugins/xsettings/meson.build
--- a/plugins/xsettings/meson.build	2020-10-15 04:00:01.000000000 +0100
+++ b/plugins/xsettings/meson.build	2020-10-22 23:22:22.396815093 +0100
@@ -36,7 +36,7 @@ executable(
         '-DGTK_MODULES_DIRECTORY="@0@/cinnamon-settings-daemon-@1@/gtk-modules/"'.format(libdir, meson.project_version()),
     ],
     install: true,
-    install_dir: pkglibdir,
+    install_dir: libexecdir,
 )
 
 executable(
Powered by Pagure 5.13.3
Documentation • File an Issue • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.