diff --git a/app/tests/test-save-and-export.c b/app/tests/test-save-and-export.c index e0c99912fc..e15316d5df 100644 --- a/app/tests/test-save-and-export.c +++ b/app/tests/test-save-and-export.c @@ -147,8 +147,8 @@ imported_file_files (gconstpointer data) gchar *filename; GimpPDBStatusType status; - filename = g_build_filename (g_getenv ("GIMP_TESTING_ABS_TOP_SRCDIR"), - "desktop/64x64/gimp.png", + filename = g_build_filename (g_getenv ("GIMP_TESTING_ABS_TOP_BUILDDIR"), + "gimp-data/images/logo/gimp64x64.png", NULL); g_assert_true (g_file_test (filename, G_FILE_TEST_EXISTS)); file = g_file_new_for_path (filename); @@ -191,8 +191,8 @@ saved_imported_file_files (gconstpointer data) GimpPDBStatusType status; GimpPlugInProcedure *proc; - import_filename = g_build_filename (g_getenv ("GIMP_TESTING_ABS_TOP_SRCDIR"), - "desktop/64x64/gimp.png", + import_filename = g_build_filename (g_getenv ("GIMP_TESTING_ABS_TOP_BUILDDIR"), + "gimp-data/images/logo/gimp64x64.png", NULL); import_file = g_file_new_for_path (import_filename); g_free (import_filename); @@ -303,8 +303,8 @@ clear_import_file_after_export (gconstpointer data) GimpPlugInProcedure *proc; GimpPDBStatusType status; - filename = g_build_filename (g_getenv ("GIMP_TESTING_ABS_TOP_SRCDIR"), - "desktop/64x64/gimp.png", + filename = g_build_filename (g_getenv ("GIMP_TESTING_ABS_TOP_BUILDDIR"), + "gimp-data/images/logo/gimp64x64.png", NULL); file = g_file_new_for_path (filename); g_free (filename); diff --git a/desktop/16x16/gimp.png b/desktop/16x16/gimp.png deleted file mode 100644 index 2c1935f57d..0000000000 Binary files a/desktop/16x16/gimp.png and /dev/null differ diff --git a/desktop/22x22/gimp.png b/desktop/22x22/gimp.png deleted file mode 100644 index ab209ec005..0000000000 Binary files a/desktop/22x22/gimp.png and /dev/null differ diff --git a/desktop/24x24/gimp.png b/desktop/24x24/gimp.png deleted file mode 100644 index f507187989..0000000000 Binary files a/desktop/24x24/gimp.png and /dev/null differ diff --git a/desktop/256x256/gimp.png b/desktop/256x256/gimp.png deleted file mode 100644 index 416df1854b..0000000000 Binary files a/desktop/256x256/gimp.png and /dev/null differ diff --git a/desktop/32x32/gimp.png b/desktop/32x32/gimp.png deleted file mode 100644 index 5680f7c806..0000000000 Binary files a/desktop/32x32/gimp.png and /dev/null differ diff --git a/desktop/48x48/gimp.png b/desktop/48x48/gimp.png deleted file mode 100644 index f6895f6686..0000000000 Binary files a/desktop/48x48/gimp.png and /dev/null differ diff --git a/desktop/64x64/gimp.png b/desktop/64x64/gimp.png deleted file mode 100644 index d74b4b8674..0000000000 Binary files a/desktop/64x64/gimp.png and /dev/null differ diff --git a/desktop/meson.build b/desktop/meson.build index 19784a5b2b..bee2e93c48 100644 --- a/desktop/meson.build +++ b/desktop/meson.build @@ -1,32 +1,3 @@ -sizes = [ - '16', - '22', - '24', - '32', - '48', - '64', - '256', -] - - -# XXX: the old autotools build used to `touch` the (datadir) /icons/hicolor -# folder at install time in order to comply with the "Icon Theme Specification" -# (see the "Implementation Notes" section about changing the mtime of the -# toplevel icon directory after installing/updating icon themes). -# This part was not reimplemented in our meson build. Unsure if this is still -# needed or even if this is the role of the application build to take care of -# this. - -foreach size : sizes - sizedir = size+'x'+size - install_data(sizedir / 'gimp.png', - install_dir: get_option('datadir') / 'icons' / 'hicolor' / sizedir / 'apps' - ) -endforeach -install_data('scalable/gimp.svg', - install_dir: get_option('datadir') / 'icons' / 'hicolor' / 'scalable' / 'apps' -) - desktopfilename = 'gimp.desktop' desktop_conf = configuration_data()