115 lines
2.7 KiB
Diff
115 lines
2.7 KiB
Diff
--- libcinnamon-desktop/meson.build 2018-05-06 16:37:39.000000000 +0200
|
|
+++ - 2018-05-09 19:03:26.854206934 +0200
|
|
@@ -1,21 +1,3 @@
|
|
-libcinnamon_desktop_gir_sources = [
|
|
- 'display-name.c',
|
|
- 'edid-parse.c',
|
|
- 'gnome-bg-crossfade.c',
|
|
- 'gnome-bg.c',
|
|
- 'gnome-desktop-thumbnail.c',
|
|
- 'gnome-desktop-utils.c',
|
|
- 'gnome-installer.c',
|
|
- 'gnome-pnp-ids.c',
|
|
- 'gnome-rr-config.c',
|
|
- 'gnome-rr-labeler.c',
|
|
- 'gnome-rr-output-info.c',
|
|
- 'gnome-rr.c',
|
|
- 'gnome-thumbnail-pixbuf-utils.c',
|
|
- 'gnome-wall-clock.c',
|
|
- 'gnome-xkb-info.c',
|
|
-]
|
|
-
|
|
libcinnamon_desktop_misc_headers = [
|
|
'gnome-datetime-source.h',
|
|
'gnome-rr-private.h',
|
|
@@ -81,31 +63,6 @@
|
|
)
|
|
endif
|
|
|
|
-cdesktop_gir = gnome.generate_gir(libcinnamon_desktop,
|
|
- sources: 'cdesktop-enums.h',
|
|
- namespace: 'CDesktopEnums',
|
|
- nsversion: '3.0',
|
|
- identifier_prefix: 'CDesktop',
|
|
- symbol_prefix: 'c_desktop',
|
|
- extra_args: [
|
|
- '-DGNOME_DESKTOP_USE_UNSTABLE_API',
|
|
- ],
|
|
- install: true,
|
|
-)
|
|
-
|
|
-gnome.generate_gir(libcinnamon_desktop,
|
|
- sources: libcinnamon_desktop_gir_sources + libcinnamon_desktop_headers,
|
|
- namespace: 'CinnamonDesktop',
|
|
- nsversion: '3.0',
|
|
- export_packages: 'cinnamon-desktop',
|
|
- identifier_prefix: 'Gnome',
|
|
- symbol_prefix: 'gnome_',
|
|
- includes: ['GObject-2.0', 'Gtk-3.0', cdesktop_gir[0], ],
|
|
- extra_args: [
|
|
- '-DGNOME_DESKTOP_USE_UNSTABLE_API',
|
|
- ],
|
|
- install: true,
|
|
-)
|
|
|
|
# FIXME
|
|
# https://github.com/mesonbuild/meson/issues/1687
|
|
--- libcvc/meson.build 2018-05-06 16:37:39.000000000 +0200
|
|
+++ - 2018-05-09 19:07:38.048845300 +0200
|
|
@@ -1,24 +1,9 @@
|
|
-libcvc_gir_sources = [
|
|
- 'gvc-channel-map.c',
|
|
- 'gvc-mixer-card.c',
|
|
- 'gvc-mixer-control.c',
|
|
- 'gvc-mixer-event-role.c',
|
|
- 'gvc-mixer-event-role.h',
|
|
- 'gvc-mixer-sink-input.c',
|
|
- 'gvc-mixer-sink.c',
|
|
- 'gvc-mixer-sink.h',
|
|
- 'gvc-mixer-source-output.c',
|
|
- 'gvc-mixer-source.c',
|
|
- 'gvc-mixer-stream.c',
|
|
- 'gvc-mixer-ui-device.c',
|
|
-]
|
|
libcvc_sources = [
|
|
'gvc-channel-map-private.h',
|
|
'gvc-mixer-card-private.h',
|
|
'gvc-mixer-control-private.h',
|
|
'gvc-mixer-stream-private.h',
|
|
'gvc-pulseaudio-fake.h',
|
|
- libcvc_gir_sources,
|
|
]
|
|
|
|
libcvc_headers = [
|
|
@@ -44,20 +29,6 @@
|
|
version: '0.0.0',
|
|
)
|
|
|
|
-gnome.generate_gir(libcvc,
|
|
- sources: libcvc_gir_sources + libcvc_headers,
|
|
- namespace: 'Cvc',
|
|
- nsversion: '1.0',
|
|
- identifier_prefix: 'Gvc',
|
|
- symbol_prefix: 'gvc_',
|
|
- includes: [
|
|
- 'GObject-2.0',
|
|
- 'Gio-2.0',
|
|
- ],
|
|
- install: true,
|
|
-)
|
|
-
|
|
-
|
|
install_headers(
|
|
libcvc_headers,
|
|
subdir: join_paths('cinnamon-desktop', 'libcvc'),
|
|
--- libcinnamon-desktop/meson.build 2018-05-09 19:08:56.864652942 +0200
|
|
+++ - 2018-05-09 19:09:17.874779723 +0200
|
|
@@ -6,7 +6,6 @@
|
|
]
|
|
|
|
libcinnamon_desktop_sources = [
|
|
- libcinnamon_desktop_gir_sources,
|
|
libcinnamon_desktop_misc_headers,
|
|
'gnome-datetime-source.c',
|
|
]
|