dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Jehan 2024-03-09 19:04:57 +01:00
parent 4f9655573f
commit 42171503d4
29 changed files with 37 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci.yml
View File

@ -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"]

BIN
data/images/gimp-devel-logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 16 KiB

BIN
data/images/gimp-logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 14 KiB

BIN
data/images/gimp-splash.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.4 MiB

18
data/images/meson.build
View File

@ -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

BIN
data/images/wilber.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 33 KiB

1
data/meson.build
View File

@ -1,7 +1,6 @@
subdir('dynamics')
subdir('environ')
subdir('gradients')
subdir('images')
subdir('interpreters')
subdir('palettes')
subdir('tags')

2
meson.build
View File

@ -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',

4
plug-ins/script-fu/test/frameworks/testing.scm
View File

@ -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
@ -465,4 +465,4 @@
; FUTURE: platform indpendent path
; FUTURE: color profile test files in the repo
(define (testing:path-to-color-profile name)
(string-append "/work/" name))
(string-append "/work/" name))

2
plug-ins/script-fu/test/tests/PDB/channel/channel-ops.scm
View File

@ -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

6
plug-ins/script-fu/test/tests/PDB/display/display.scm
View File

@ -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))
@ -106,4 +106,4 @@
"Invalid value for argument 0")
; Testing leaves two displays visible in GIMP app
; Testing leaves two displays visible in GIMP app

2
plug-ins/script-fu/test/tests/PDB/drawable/drawable-attributes.scm
View File

@ -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))

2
plug-ins/script-fu/test/tests/PDB/drawable/drawable-ops.scm
View File

@ -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))

2
plug-ins/script-fu/test/tests/PDB/drawable/drawable.scm
View File

@ -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))

10
plug-ins/script-fu/test/tests/PDB/edit/buffer.scm
View File

@ -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.
@ -90,4 +90,4 @@
; TODO test two buffers
; TODO test renaming when name already in use
; TODO test renaming when name already in use

2
plug-ins/script-fu/test/tests/PDB/edit/edit-multi-layer.scm
View File

@ -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

2
plug-ins/script-fu/test/tests/PDB/edit/edit.scm
View File

@ -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.

4
plug-ins/script-fu/test/tests/PDB/image/image-color-profile.scm
View File

@ -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)))
@ -168,4 +168,4 @@
; for debugging individual test file:
;(gimp-display-new testImage)
;(gimp-display-new testImage)

6
plug-ins/script-fu/test/tests/PDB/image/image-indexed.scm
View File

@ -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

4
plug-ins/script-fu/test/tests/PDB/image/image-layers.scm
View File

@ -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))

2
plug-ins/script-fu/test/tests/PDB/image/image-mode.scm
View File

@ -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))

4
plug-ins/script-fu/test/tests/PDB/image/image-set-selected.scm
View File

@ -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
@ -111,4 +111,4 @@
(assert-error `(gimp-image-set-selected-vectors
,testImage
0 #() )
"Invalid value for argument 2")
"Invalid value for argument 2")

2
plug-ins/script-fu/test/tests/PDB/item/item-layer-group.scm
View File

@ -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))

2
plug-ins/script-fu/test/tests/PDB/item/item-position.scm
View File

@ -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))

2
plug-ins/script-fu/test/tests/PDB/item/item.scm
View File

@ -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)))

2
plug-ins/script-fu/test/tests/PDB/paint/dynamics.scm
View File

@ -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")))

2
plug-ins/script-fu/test/tests/PDB/paint/paint-methods.scm
View File

@ -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")))

2
plug-ins/script-fu/test/tests/PDB/selection/selection-by.scm
View File

@ -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

2
plug-ins/script-fu/test/tests/PDB/vectors/vectors-stroke.scm
View File

@ -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))