From ae51b769019ea5e4c32ec6e386f3d2183562c1cb Mon Sep 17 00:00:00 2001 From: Logan Rathbone Date: Tue, 8 Jun 2021 22:55:49 -0400 Subject: Port build system from autotools to meson. --- data/Makefile.am | 23 ----------------------- data/meson.build | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 23 deletions(-) delete mode 100644 data/Makefile.am create mode 100644 data/meson.build (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am deleted file mode 100644 index cc185118..00000000 --- a/data/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -clothesdir = $(datadir)/zenity/clothes -clothes_DATA = \ - monk.png \ - gnome-tshirt.png \ - sunglasses.png \ - surfboard.png \ - hawaii-shirt.png - -imagesdir = $(datadir)/zenity -images_DATA = \ - zenity.png \ - zenity-calendar.png \ - zenity-list.png \ - zenity-file.png \ - zenity-progress.png \ - zenity-text.png \ - zenity-scale.png \ - zenity-entry.png \ - zenity-notification.png - -man_MANS = zenity.1 - -EXTRA_DIST = $(images_DATA) $(clothes_DATA) $(man_MANS) diff --git a/data/meson.build b/data/meson.build new file mode 100644 index 00000000..373efcf4 --- /dev/null +++ b/data/meson.build @@ -0,0 +1,22 @@ +install_man('zenity.1') + +install_data( + ['zenity.png', + 'zenity-calendar.png', + 'zenity-list.png', + 'zenity-file.png', + 'zenity-progress.png', + 'zenity-text.png', + 'zenity-scale.png', + 'zenity-entry.png', + 'zenity-notification.png'] + ) + +install_data( + ['monk.png', + 'gnome-tshirt.png', + 'sunglasses.png', + 'surfboard.png', + 'hawaii-shirt.png'], + install_dir: join_paths(zenity_datadir, 'clothes') + ) -- cgit From b40d9bcb9b7928be50f6a2ae4d93912f8c408d8b Mon Sep 17 00:00:00 2001 From: Logan Rathbone Date: Tue, 29 Jun 2021 00:22:09 -0400 Subject: about: Remove Zen wisdom of the ancients This easter egg was disabled more than a decade ago, but zenity is still installing the image files that were used for it. Let's stop doing that. Signed-off-by: Simon McVittie --- data/gnome-tshirt.png | Bin 4147 -> 0 bytes data/hawaii-shirt.png | Bin 13730 -> 0 bytes data/meson.build | 9 --------- data/monk.png | Bin 9773 -> 0 bytes data/sunglasses.png | Bin 2721 -> 0 bytes data/surfboard.png | Bin 14484 -> 0 bytes 6 files changed, 9 deletions(-) delete mode 100644 data/gnome-tshirt.png delete mode 100644 data/hawaii-shirt.png delete mode 100644 data/monk.png delete mode 100644 data/sunglasses.png delete mode 100644 data/surfboard.png (limited to 'data') diff --git a/data/gnome-tshirt.png b/data/gnome-tshirt.png deleted file mode 100644 index 424ec61e..00000000 Binary files a/data/gnome-tshirt.png and /dev/null differ diff --git a/data/hawaii-shirt.png b/data/hawaii-shirt.png deleted file mode 100644 index db4184c0..00000000 Binary files a/data/hawaii-shirt.png and /dev/null differ diff --git a/data/meson.build b/data/meson.build index 373efcf4..339b3cff 100644 --- a/data/meson.build +++ b/data/meson.build @@ -11,12 +11,3 @@ install_data( 'zenity-entry.png', 'zenity-notification.png'] ) - -install_data( - ['monk.png', - 'gnome-tshirt.png', - 'sunglasses.png', - 'surfboard.png', - 'hawaii-shirt.png'], - install_dir: join_paths(zenity_datadir, 'clothes') - ) diff --git a/data/monk.png b/data/monk.png deleted file mode 100644 index 0c515ddf..00000000 Binary files a/data/monk.png and /dev/null differ diff --git a/data/sunglasses.png b/data/sunglasses.png deleted file mode 100644 index c3036842..00000000 Binary files a/data/sunglasses.png and /dev/null differ diff --git a/data/surfboard.png b/data/surfboard.png deleted file mode 100644 index 572d9dec..00000000 Binary files a/data/surfboard.png and /dev/null differ -- cgit