data, plug-ins: logo images moved to gimp-data repository.

Now the development and stable logos will be generated from gimp-data. In other changes, the gi-docgen logo is installed as a symlink using install_symlink() which exists since meson 0.61.0 so I bumped our meson dependency (in practice we were already using this function anyway and Debian bookworm has meson 1.0.1 so it's all good). Finally I don't install a wilber.png anymore, which was only used by script-fu testing, and which was the same as gimp-logo.png (except 256x256 instead of 128x128). Unless mistaken, all script-fu tests loading this image still work with the change. The only one where I needed further change was buffer.scm (which was checking the dimensions). See gimp-data@9aa6e35.
2024-03-09 19:04:57 +01:00 · 2024-03-09 19:04:57 +01:00 · 42171503d4
parent 4f9655573f
commit 42171503d4
29 changed files with 37 additions and 56 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1068,7 +1068,7 @@ dev-docs:
      mkdir $DIR_NAME                                                                       &&
      mv "${DEB_GIMP_PREFIX}/share/doc/babl-$BABL_API_VER" $DIR_NAME/                       &&
      TAR_NAME="$DIR_NAME.tar.xz"                                                           &&
-      tar -cJf ${TAR_NAME} $DIR_NAME                                                        &&
+      tar --dereference -cJf ${TAR_NAME} $DIR_NAME                                          &&
      sha256sum $TAR_NAME > ${TAR_NAME}.SHA256SUMS                                          &&
      sha512sum $TAR_NAME > ${TAR_NAME}.SHA512SUMS
    - GEGL_MAJ_VER=$(grep GEGL_MAJOR_VERSION _gegl/${DEB_BUILD_DIR}/config.h |head -1 |sed 's/^[^0-9]*\([0-9]*\).*$/\1/') &&
@ -1080,7 +1080,7 @@ dev-docs:
      mkdir $DIR_NAME                                                                       &&
      mv "${DEB_GIMP_PREFIX}/share/doc/gegl-$GEGL_API_VER" $DIR_NAME/                       &&
      TAR_NAME="$DIR_NAME.tar.xz"                                                           &&
-      tar -cJf ${TAR_NAME} $DIR_NAME                                                        &&
+      tar --dereference -cJf ${TAR_NAME} $DIR_NAME                                          &&
      sha256sum $TAR_NAME > ${TAR_NAME}.SHA256SUMS                                          &&
      sha512sum $TAR_NAME > ${TAR_NAME}.SHA512SUMS
    - GIMP_VER=$(grep GIMP_VERSION ${DEB_BUILD_DIR}/config.h | head -1 | sed 's/^.*"\([^"]*\)"$/\1/') &&
@ -1090,7 +1090,7 @@ dev-docs:
      mv "${DEB_GIMP_PREFIX}/share/doc/gimp-$APP_VER" $DIR_NAME/reference                   &&
      mv ${DEB_BUILD_DIR}/devel-docs/g-ir-docs $DIR_NAME/                                   &&
      TAR_NAME="$DIR_NAME.tar.xz"                                                           &&
-      tar -cJf ${TAR_NAME} $DIR_NAME                                                        &&
+      tar --dereference -cJf ${TAR_NAME} $DIR_NAME                                          &&
      sha256sum $TAR_NAME > ${TAR_NAME}.SHA256SUMS                                          &&
      sha512sum $TAR_NAME > ${TAR_NAME}.SHA512SUMS
  needs: ["deps-debian-x64", "gimp-debian-x64"]
--- a/data/images/gimp-devel-logo.png
+++ b/data/images/gimp-devel-logo.png
--- a/data/images/gimp-logo.png
+++ b/data/images/gimp-logo.png
--- a/data/images/gimp-splash.png
+++ b/data/images/gimp-splash.png
--- a/data/images/meson.build
+++ b/data/images/meson.build
@ -1,18 +0,0 @@
-gimp_logo_dir = meson.current_source_dir()
-
-images = [
-  'wilber.png',
-]
-images += stable ? 'gimp-logo.png' : 'gimp-devel-logo.png'
-
-install_data(
-  images,
-  install_dir: gimpdatadir / 'images',
-)
-
-if gi_docgen.found()
-  install_data(
-    stable ? 'gimp-logo.png' : 'gimp-devel-logo.png',
-    install_dir: get_option('datadir') / 'doc' / 'gimp-@0@'.format(gimp_app_version) / 'images',
-  )
-endif
--- a/data/images/wilber.png
+++ b/data/images/wilber.png
--- a/data/meson.build
+++ b/data/meson.build
@ -1,7 +1,6 @@
 subdir('dynamics')
 subdir('environ')
 subdir('gradients')
-subdir('images')
 subdir('interpreters')
 subdir('palettes')
 subdir('tags')
--- a/meson.build
+++ b/meson.build
@ -1,7 +1,7 @@
 project('gimp',
  'c', 'cpp',
  version: '2.99.19',
-  meson_version: '>=0.59.0',
+  meson_version: '>=0.61.0',
  default_options: [
    'cpp_std=gnu++14',
    'buildtype=debugoptimized',
--- a/plug-ins/script-fu/test/frameworks/testing.scm
+++ b/plug-ins/script-fu/test/frameworks/testing.scm
@ -454,7 +454,7 @@
 ; Returns ID of image
 ; Knows installed image directory (not dedicated to testing but always there.)
 ; Accepts image suffixes that Gimp can load.
-; Typical is /usr/local/share/gimp/2.99/images/wilber.png
+; Typical is /usr/local/share/gimp/2.99/images/gimp-logo.png
 (define (testing:load-test-image filename)
  (gimp-message (path-to-test-images filename))
  ; unpack ID via car
--- a/plug-ins/script-fu/test/tests/PDB/channel/channel-ops.scm
+++ b/plug-ins/script-fu/test/tests/PDB/channel/channel-ops.scm
@ -7,7 +7,7 @@

 ; setup
 ; Load test image that already has drawable
-(define testImage (testing:load-test-image "wilber.png"))
+(define testImage (testing:load-test-image "gimp-logo.png"))

 ; gimp-channel-ops-duplicate is deprecated, use gimp-image-duplicate
 ; gimp-channel-ops-offset deprecated, use gimp-drawable-offset
--- a/plug-ins/script-fu/test/tests/PDB/display/display.scm
+++ b/plug-ins/script-fu/test/tests/PDB/display/display.scm
@ -17,7 +17,7 @@
 ; setup

 ; an image
-(define testImage (testing:load-test-image "wilber.png"))
+(define testImage (testing:load-test-image "gimp-logo.png"))
 ; a second image
 (define testImage2 (car (gimp-image-new 21 22 RGB)))

@ -83,7 +83,7 @@


 ; reconnect succeeds
-; Make displays of wilber.png now show the testImage2 that is not now displayed
+; Make displays of gimp-logo now show the testImage2 that is not now displayed
 (assert `(gimp-displays-reconnect ,testImage ,testImage2 ))
 ; display ID is still valid
 (assert-PDB-true `(gimp-display-id-is-valid ,testDisplay))
--- a/plug-ins/script-fu/test/tests/PDB/drawable/drawable-attributes.scm
+++ b/plug-ins/script-fu/test/tests/PDB/drawable/drawable-attributes.scm
@ -3,7 +3,7 @@

 ; setup

-(define testImage (testing:load-test-image "wilber.png"))
+(define testImage (testing:load-test-image "gimp-logo.png"))
 ; Wilber has one layer
 ; cadr is vector, first element is a drawable
 (define testDrawable (vector-ref (cadr (gimp-image-get-layers testImage)) 0))
--- a/plug-ins/script-fu/test/tests/PDB/drawable/drawable-ops.scm
+++ b/plug-ins/script-fu/test/tests/PDB/drawable/drawable-ops.scm
@ -7,7 +7,7 @@

 ; setup

-(define testImage (testing:load-test-image "wilber.png"))
+(define testImage (testing:load-test-image "gimp-logo.png"))
 ; Wilber has one layer
 ; cadr is vector, first element is a drawable
 (define testDrawable (vector-ref (cadr (gimp-image-get-layers testImage)) 0))
--- a/plug-ins/script-fu/test/tests/PDB/drawable/drawable.scm
+++ b/plug-ins/script-fu/test/tests/PDB/drawable/drawable.scm
@ -5,7 +5,7 @@
 ; kernel operations on drawable as set of pixels tested elsewhere

 ; setup
-(define testImage (testing:load-test-image "wilber.png"))
+(define testImage (testing:load-test-image "gimp-logo.png"))
 ; Wilber has one layer
 (define testDrawable (vector-ref (cadr (gimp-image-get-layers testImage)) 0))

--- a/plug-ins/script-fu/test/tests/PDB/edit/buffer.scm
+++ b/plug-ins/script-fu/test/tests/PDB/edit/buffer.scm
@ -16,7 +16,7 @@

 ; setup
 ; Load test image that already has drawable
-(define testImage (testing:load-test-image "wilber.png"))
+(define testImage (testing:load-test-image "gimp-logo.png"))

 ; the layer is the zeroeth element in the vector which is the second element
 ; but cadr returns the second element!!
@ -43,11 +43,11 @@
                    "bufferName"))

 ; buffer has same size as image when created with no selection
-; test image is 256x256
+; test image is 128x128
 (assert `(= (car (gimp-buffer-get-width "bufferName"))
-            256))
+            128))
 (assert `(= (car (gimp-buffer-get-height "bufferName"))
-            256))
+            128))

 ; new buffer has alpha: the image is RGB but the buffer has bpp 4
 ; This is not well documented.
--- a/plug-ins/script-fu/test/tests/PDB/edit/edit-multi-layer.scm
+++ b/plug-ins/script-fu/test/tests/PDB/edit/edit-multi-layer.scm
@ -12,7 +12,7 @@

 ; setup
 ; Load test image that already has drawable
-(define testImage (testing:load-test-image "wilber.png"))
+(define testImage (testing:load-test-image "gimp-logo.png"))

 ; Add a layer
 (define testLayer2
--- a/plug-ins/script-fu/test/tests/PDB/edit/edit.scm
+++ b/plug-ins/script-fu/test/tests/PDB/edit/edit.scm
@ -12,7 +12,7 @@

 ; setup
 ; Load test image that already has drawable
-(define testImage (testing:load-test-image "wilber.png"))
+(define testImage (testing:load-test-image "gimp-logo.png"))

 ; get all the root layers
 ; testImage has exactly one root layer.
--- a/plug-ins/script-fu/test/tests/PDB/image/image-color-profile.scm
+++ b/plug-ins/script-fu/test/tests/PDB/image/image-color-profile.scm
@ -27,7 +27,7 @@


 ; setup
-(define testImage (testing:load-test-image "wilber.png"))
+(define testImage (testing:load-test-image "gimp-logo.png"))

 ; an image we use just to transfer color profiles
 (define colorImage (car (gimp-image-new 21 22 RGB)))
--- a/plug-ins/script-fu/test/tests/PDB/image/image-indexed.scm
+++ b/plug-ins/script-fu/test/tests/PDB/image/image-indexed.scm
@ -10,7 +10,7 @@
 (define newTestImage (car (gimp-image-new 21 22 RGB)))

 ; Load test image that already has drawable
-(define testImage (testing:load-test-image "wilber.png"))
+(define testImage (testing:load-test-image "gimp-logo.png"))



@ -57,8 +57,8 @@
            INDEXED))


-; testImage has a layer named same as file "wilber.png"
-; TODO Why does "Background" work but app shows "wilber.png"
+; testImage has a layer named same as file "gimp-logo.png"
+; TODO Why does "Background" work but app shows "gimp-logo.png"

 ; drawable of indexed image is also indexed
 (assert `(= (car (gimp-drawable-is-indexed
--- a/plug-ins/script-fu/test/tests/PDB/image/image-layers.scm
+++ b/plug-ins/script-fu/test/tests/PDB/image/image-layers.scm
@ -4,7 +4,7 @@

 ; setup
 ; Load test image that already has drawable
-(define testImage (testing:load-test-image "wilber.png"))
+(define testImage (testing:load-test-image "gimp-logo.png"))



@ -37,7 +37,7 @@
 ; FIXME seems to fail??? because name is actually "Background"

 ; the same layer can be got by name
-; FIXME app shows layer name is "wilber.png" same as image name
+; FIXME app shows layer name is "gimp-logo.png" same as image name
 (assert `(= (car (gimp-image-get-layer-by-name ,testImage "Background"))
            ,testLayer))

--- a/plug-ins/script-fu/test/tests/PDB/image/image-mode.scm
+++ b/plug-ins/script-fu/test/tests/PDB/image/image-mode.scm
@ -2,7 +2,7 @@
 ; COLOR=>GRAY=>INDEXED=>GRAY

 ; setup
-(define testImage (testing:load-test-image "wilber.png"))
+(define testImage (testing:load-test-image "gimp-logo.png"))

 ; test image is RGB
 (assert `(= (car (gimp-image-get-base-type ,testImage))
--- a/plug-ins/script-fu/test/tests/PDB/image/image-set-selected.scm
+++ b/plug-ins/script-fu/test/tests/PDB/image/image-set-selected.scm
@ -17,7 +17,7 @@
 ;(define testImage (car (gimp-image-new 21 22 RGB)))

 ; Load test image that already has drawable
-(define testImage (testing:load-test-image "wilber.png"))
+(define testImage (testing:load-test-image "gimp-logo.png"))

 (define testLayers (cadr (gimp-image-get-layers testImage )))
 ; assert testLayers is-a vector of length one
--- a/plug-ins/script-fu/test/tests/PDB/item/item-layer-group.scm
+++ b/plug-ins/script-fu/test/tests/PDB/item/item-layer-group.scm
@ -3,7 +3,7 @@


 ; setup
-(define testImage (testing:load-test-image "wilber.png"))
+(define testImage (testing:load-test-image "gimp-logo.png"))
 (define testLayer (vector-ref (cadr (gimp-image-get-layers testImage ))
                              0))

--- a/plug-ins/script-fu/test/tests/PDB/item/item-position.scm
+++ b/plug-ins/script-fu/test/tests/PDB/item/item-position.scm
@ -9,7 +9,7 @@


 ; setup
-(define testImage (testing:load-test-image "wilber.png"))
+(define testImage (testing:load-test-image "gimp-logo.png"))
 (define testLayer (vector-ref (cadr (gimp-image-get-layers testImage ))
                                  0))

--- a/plug-ins/script-fu/test/tests/PDB/item/item.scm
+++ b/plug-ins/script-fu/test/tests/PDB/item/item.scm
@ -131,7 +131,7 @@
 ; All the items in the same testImage
 ; See earlier tests, where setup is lifted from

-(define testImage (testing:load-test-image "wilber.png"))
+(define testImage (testing:load-test-image "gimp-logo.png"))
 (define testLayer (vector-ref (cadr (gimp-image-get-layers testImage ))
                                  0))
 (define testSelection (car (gimp-image-get-selection testImage)))
--- a/plug-ins/script-fu/test/tests/PDB/paint/dynamics.scm
+++ b/plug-ins/script-fu/test/tests/PDB/paint/dynamics.scm
@ -5,7 +5,7 @@
 ; setup

 ; an image, drawable, and path
-(define testImage (testing:load-test-image "wilber.png"))
+(define testImage (testing:load-test-image "gimp-logo.png"))
 (define testLayer (vector-ref (cadr (gimp-image-get-layers testImage ))
                                  0))
 (define testPath (car (gimp-vectors-new testImage "Test Path")))
--- a/plug-ins/script-fu/test/tests/PDB/paint/paint-methods.scm
+++ b/plug-ins/script-fu/test/tests/PDB/paint/paint-methods.scm
@ -8,7 +8,7 @@
 ; setup

 ; an image, drawable, and path
-(define testImage (testing:load-test-image "wilber.png"))
+(define testImage (testing:load-test-image "gimp-logo.png"))
 (define testLayer (vector-ref (cadr (gimp-image-get-layers testImage ))
                                  0))
 (define testPath (car (gimp-vectors-new testImage "Test Path")))
--- a/plug-ins/script-fu/test/tests/PDB/selection/selection-by.scm
+++ b/plug-ins/script-fu/test/tests/PDB/selection/selection-by.scm
@ -7,7 +7,7 @@


 ; setup
-(define testImage (testing:load-test-image "wilber.png"))
+(define testImage (testing:load-test-image "gimp-logo.png"))
 (define testLayer (vector-ref (cadr (gimp-image-get-layers testImage ))
                                  0))
 ; a layer mask from alpha
--- a/plug-ins/script-fu/test/tests/PDB/vectors/vectors-stroke.scm
+++ b/plug-ins/script-fu/test/tests/PDB/vectors/vectors-stroke.scm
@ -8,7 +8,7 @@

 ; setup

-(define testImage (testing:load-test-image "wilber.png"))
+(define testImage (testing:load-test-image "gimp-logo.png"))
 (define testLayer (vector-ref (cadr (gimp-image-get-layers testImage ))
                                  0))