Attachment #211593 for bug #243493




# $FreeBSD$

PORTNAME=	elementary
PORTVERSION=	5.2.0
CATEGORIES=	x11-themes gnome
PKGNAMEPREFIX=	gnome-icons-


LICENSE=	GPLv3
LICENSE_FILE=	${WRKSRC}/COPYING

BUILD_DEPENDS=	xcursorgen:x11/xcursorgen
USE_GITHUB=	yes
GH_PROJECT=	icons

USES=		gettext gnome meson python:3.5+,build
USE_GNOME=	librsvg2
INSTALLS_ICONS=	yes

MESON_ARGS=	-Dpalettes=false \
		-Dvolume_icons=false
		${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/icons/elementary \
		"! -name *\.VolumeIcon* ! -name pre-commit ! -name CMakeLists.txt"
	${FIND} ${STAGEDIR}${PREFIX}/share/icons/elementary/ \
		-type d -empty | ${XARGS} ${RMDIR}

USE_GITHUB=	yes
GH_PROJECT=	icons

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1533450231	1	TIMESTAMP = 1579641319
2	SHA256 (elementary-icons-4.3.1_GH0.tar.gz) = 2fcb35760aa3285a17ecd5ef127fe5384a20cb6e86c2b4cd9ed7942063a70a10	2	SHA256 (elementary-icons-5.2.0_GH0.tar.gz) = b4a2b2205443dbfaecd42f0594bdf9c95d9787781b6fe1250ffa2c216a68ec7c
3	SIZE (elementary-icons-4.3.1_GH0.tar.gz) = 3072812	3	SIZE (elementary-icons-5.2.0_GH0.tar.gz) = 4100951




--- cursors/meson.build.orig	2020-01-08 21:23:48 UTC
+++ cursors/meson.build
@@ -1,5 +1,5 @@
 cursor_dir = join_paths(icon_dir, 'cursors')
-inkscape = find_program('inkscape')
+rsvg = find_program('rsvg-convert')
 xcursorgen = find_program('xcursorgen')
 
 cursors = [
@@ -100,9 +100,10 @@ foreach size: sizes
             message('rendering: ' + size + 'x' + size + '/' + cursor + '.png')
 
             run_command(
-                inkscape, '--without-gui',
-                '--export-width=@0@'.format(size), '--export-height=@0@'.format(size),
-                '--export-png=@0@.png'.format(join_paths (meson.build_root(), 'cursors', size + 'x' + size, cursor)),
+                rsvg,
+                '--width @0@'.format(size), '--height @0@'.format(size),
+                '--format png',
+                '--output @0@.png'.format(join_paths (meson.build_root(), 'cursors', size + 'x' + size, cursor)),
                 join_paths ('24', cursor + '.svg')
             )
     endforeach
@@ -111,9 +112,10 @@ foreach size: sizes
             message('rendering: ' + size + 'x' + size + '/' + watch + '.png')
 
             run_command(
-                inkscape, '--without-gui',
-                '--export-width=@0@'.format(size), '--export-height=@0@'.format(size),
-                '--export-png=@0@.png'.format(join_paths (meson.build_root(), 'cursors', size + 'x' + size, watch)),
+                rsvg,
+                '--width @0@'.format(size), '--height @0@'.format(size),
+                '--format png',
+                '--output @0@.png'.format(join_paths (meson.build_root(), 'cursors', size + 'x' + size, watch)),
                 join_paths ('24', watch + '.svg')
             )
     endforeach

Return to bug 243493

Lines 2-8 Link Here

(-)Makefile (-12 / +9 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= elementary	4	PORTNAME= elementary
5	PORTVERSION= 4.3.1	5	PORTVERSION= 5.2.0
6	CATEGORIES= x11-themes gnome	6	CATEGORIES= x11-themes gnome
7	PKGNAMEPREFIX= gnome-icons-	7	PKGNAMEPREFIX= gnome-icons-
8		8
Lines 12-30 Link Here
12	LICENSE= GPLv3	12	LICENSE= GPLv3
13	LICENSE_FILE= ${WRKSRC}/COPYING	13	LICENSE_FILE= ${WRKSRC}/COPYING
14		14
15	USES= gnome	15	BUILD_DEPENDS= xcursorgen:x11/xcursorgen
16	USE_GITHUB= yes
17	GH_PROJECT= icons
18		16
19	NO_BUILD= yes	17	USES= gettext gnome meson python:3.5+,build
20	NO_ARCH= yes	18	USE_GNOME= librsvg2
21	INSTALLS_ICONS= yes	19	INSTALLS_ICONS= yes
22		20
23	do-install:	21	MESON_ARGS= -Dpalettes=false \
24	cd ${WRKSRC} && \	22	-Dvolume_icons=false
25	${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/icons/elementary \
26	"! -name \.VolumeIcon ! -name pre-commit ! -name CMakeLists.txt"
27	${FIND} ${STAGEDIR}${PREFIX}/share/icons/elementary/ \
28	-type d -empty \| ${XARGS} ${RMDIR}
29		23
		24	USE_GITHUB= yes
		25	GH_PROJECT= icons
		26
30	.include <bsd.port.mk>	27	.include <bsd.port.mk>

Line 0 Link Here

(-)files/patch-cursors_meson.build (+37 lines)
	1	--- cursors/meson.build.orig 2020-01-08 21:23:48 UTC
	2	+++ cursors/meson.build
	3	@@ -1,5 +1,5 @@
	4	cursor_dir = join_paths(icon_dir, 'cursors')
	5	-inkscape = find_program('inkscape')
	6	+rsvg = find_program('rsvg-convert')
	7	xcursorgen = find_program('xcursorgen')
	8
	9	cursors = [
	10	@@ -100,9 +100,10 @@ foreach size: sizes
	11	message('rendering: ' + size + 'x' + size + '/' + cursor + '.png')
	12
	13	run_command(
	14	- inkscape, '--without-gui',
	15	- '--export-width=@0@'.format(size), '--export-height=@0@'.format(size),
	16	- '--export-png=@0@.png'.format(join_paths (meson.build_root(), 'cursors', size + 'x' + size, cursor)),
	17	+ rsvg,
	18	+ '--width @0@'.format(size), '--height @0@'.format(size),
	19	+ '--format png',
	20	+ '--output @0@.png'.format(join_paths (meson.build_root(), 'cursors', size + 'x' + size, cursor)),
	21	join_paths ('24', cursor + '.svg')
	22	)
	23	endforeach
	24	@@ -111,9 +112,10 @@ foreach size: sizes
	25	message('rendering: ' + size + 'x' + size + '/' + watch + '.png')
	26
	27	run_command(
	28	- inkscape, '--without-gui',
	29	- '--export-width=@0@'.format(size), '--export-height=@0@'.format(size),
	30	- '--export-png=@0@.png'.format(join_paths (meson.build_root(), 'cursors', size + 'x' + size, watch)),
	31	+ rsvg,
	32	+ '--width @0@'.format(size), '--height @0@'.format(size),
	33	+ '--format png',
	34	+ '--output @0@.png'.format(join_paths (meson.build_root(), 'cursors', size + 'x' + size, watch)),
	35	join_paths ('24', watch + '.svg')
	36	)
	37	endforeach

Lines 1-9 Link Here

(-)pkg-plist (-100 / +816 lines)
1	share/icons/elementary/AUTHORS
2	share/icons/elementary/CODE_OF_CONDUCT.md
3	share/icons/elementary/CONTRIBUTING.md
4	share/icons/elementary/CONTRIBUTORS
5	share/icons/elementary/COPYING
6	share/icons/elementary/README.md
7	share/icons/elementary/actions/128/address-book-new.svg	1	share/icons/elementary/actions/128/address-book-new.svg
8	share/icons/elementary/actions/128/bookmark-new.svg	2	share/icons/elementary/actions/128/bookmark-new.svg
9	share/icons/elementary/actions/128/browser-download.svg	3	share/icons/elementary/actions/128/browser-download.svg
Lines 15-20 Link Here
15	share/icons/elementary/actions/128/document-revert-rtl.svg	9	share/icons/elementary/actions/128/document-revert-rtl.svg
16	share/icons/elementary/actions/128/document-revert.svg	10	share/icons/elementary/actions/128/document-revert.svg
17	share/icons/elementary/actions/128/document-save.svg	11	share/icons/elementary/actions/128/document-save.svg
		12	share/icons/elementary/actions/128/document-send.svg
18	share/icons/elementary/actions/128/edit-copy.svg	13	share/icons/elementary/actions/128/edit-copy.svg
19	share/icons/elementary/actions/128/edit-delete.svg	14	share/icons/elementary/actions/128/edit-delete.svg
20	share/icons/elementary/actions/128/edit-paste.svg	15	share/icons/elementary/actions/128/edit-paste.svg
Lines 23-29 Link Here
23	share/icons/elementary/actions/128/edit-select-all.svg	18	share/icons/elementary/actions/128/edit-select-all.svg
24	share/icons/elementary/actions/128/edit-undo-rtl.svg	19	share/icons/elementary/actions/128/edit-undo-rtl.svg
25	share/icons/elementary/actions/128/edit-undo.svg	20	share/icons/elementary/actions/128/edit-undo.svg
		21	share/icons/elementary/actions/128/event-new.svg
26	share/icons/elementary/actions/128/folder-new.svg	22	share/icons/elementary/actions/128/folder-new.svg
		23	share/icons/elementary/actions/128/go-jump-rtl.svg
		24	share/icons/elementary/actions/128/go-jump.svg
27	share/icons/elementary/actions/128/help-about.svg	25	share/icons/elementary/actions/128/help-about.svg
28	share/icons/elementary/actions/128/help-contents.svg	26	share/icons/elementary/actions/128/help-contents.svg
29	share/icons/elementary/actions/128/insert-link.svg	27	share/icons/elementary/actions/128/insert-link.svg
Lines 38-58 Link Here
38	share/icons/elementary/actions/128/object-inverse.svg	36	share/icons/elementary/actions/128/object-inverse.svg
39	share/icons/elementary/actions/128/process-stop.svg	37	share/icons/elementary/actions/128/process-stop.svg
40	share/icons/elementary/actions/128/tag-new.svg	38	share/icons/elementary/actions/128/tag-new.svg
		39	share/icons/elementary/actions/128/view-reader.svg
		40	share/icons/elementary/actions/128/window-new.svg
41	share/icons/elementary/actions/16/address-book-new.svg	41	share/icons/elementary/actions/16/address-book-new.svg
42	share/icons/elementary/actions/16/align-horizontal-center.svg	42	share/icons/elementary/actions/16/align-horizontal-center.svg
		43	share/icons/elementary/actions/16/align-horizontal-left-to-anchor.svg
43	share/icons/elementary/actions/16/align-horizontal-left.svg	44	share/icons/elementary/actions/16/align-horizontal-left.svg