New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add GTK 4 variant of Greybird-dark #341

Open

mathiascode wants to merge 1 commit into shimmerproject:master from mathiascode:greybird-dark-gtk4

mathiascode commented Sep 9, 2023

Fixes https://forum.xfce.org/viewtopic.php?pid=73009

houndci-bot reviewed

View reviewed changes

dark/gtk-4.0/Gemfile

		@@ -0,0 +1 @@
		../../light/gtk-4.0/Gemfile

houndci-bot Sep 9, 2023

Style/FrozenStringLiteralComment: Missing magic comment # frozen_string_literal: true.
Style/StringLiterals: Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.

dark/gtk-4.0/_common.scss

		@@ -0,0 +1 @@
		../../light/gtk-4.0/_common.scss

houndci-bot Sep 9, 2023

Commas in function parameters should be followed by one space

dark/gtk-4.0/gtk-contained-dark.scss

		@@ -0,0 +1 @@
		../../light/gtk-4.0/gtk-contained-dark.scss

houndci-bot Sep 9, 2023

Prefer double-quoted strings

dark/gtk-4.0/gtk-dark.scss

		@@ -0,0 +1 @@
		../../light/gtk-4.0/gtk-dark.scss

houndci-bot Sep 9, 2023

Prefer double-quoted strings

dark/gtk-4.0/gtk.scss

		@@ -0,0 +1 @@
		../../light/gtk-4.0/gtk.scss

houndci-bot Sep 9, 2023

Prefer double-quoted strings

rozhuk-im commented Sep 25, 2023

Thanks, but fail to build:

...
[  9% 10/11] /usr/local/bin/glib-compile-resources ../dark/gtk-4.0/gtk.gresource.xml --target dark/gtk-4.0/gtk.gresource --sourcedir /tmp/ports/usr/ports/x11-themes/greybird-theme/work/Greybird-3.23.3/dark/gtk-4.0
FAILED: dark/gtk-4.0/gtk.gresource 
/usr/local/bin/glib-compile-resources ../dark/gtk-4.0/gtk.gresource.xml --target dark/gtk-4.0/gtk.gresource --sourcedir /tmp/ports/usr/ports/x11-themes/greybird-theme/work/Greybird-3.23.3/dark/gtk-4.0
../dark/gtk-4.0/gtk.gresource.xml: Error on line 1 char 1: Document must begin with an element (e.g. <book>).
[ 18% 10/11] /usr/local/bin/sassc -a -M -t compact ../dark/gtk-4.0/gtk-contained-dark.scss dark/gtk-4.0/gtk-dark.css
FAILED: dark/gtk-4.0/gtk-dark.css 
/usr/local/bin/sassc -a -M -t compact ../dark/gtk-4.0/gtk-contained-dark.scss dark/gtk-4.0/gtk-dark.css
Error: Invalid CSS after ".": expected 1 selector or at-rule, was "../../light/gtk-4.0"
        on line 1:1 of ../dark/gtk-4.0/gtk-contained-dark.scss
>> ../../light/gtk-4.0/gtk-contained-dark.scss
   ^
[ 27% 10/11] /usr/local/bin/sassc -a -M -t compact ../dark/gtk-4.0/gtk-contained-dark.scss dark/gtk-4.0/gtk.css
FAILED: dark/gtk-4.0/gtk.css 
/usr/local/bin/sassc -a -M -t compact ../dark/gtk-4.0/gtk-contained-dark.scss dark/gtk-4.0/gtk.css
Error: Invalid CSS after ".": expected 1 selector or at-rule, was "../../light/gtk-4.0"
        on line 1:1 of ../dark/gtk-4.0/gtk-contained-dark.scss
>> ../../light/gtk-4.0/gtk-contained-dark.scss
   ^
[ 36% 10/11] /usr/local/bin/glib-compile-resources ../dark/gtk-3.0/gtk.gresource.xml --target dark/gtk-3.0/gtk.gresource --sourcedir /tmp/ports/usr/ports/x11-themes/greybird-theme/work/Greybird-3.23.3/dark/gtk-3.0
[ 45% 10/11] /usr/local/bin/sassc -M -t compact ../light/gtk-4.0/gtk.scss light/gtk-4.0/gtk.css
...

mathiascode force-pushed the greybird-dark-gtk4 branch from 27c472c to 473c72c Compare

September 26, 2023 12:36

houndci-bot reviewed

View reviewed changes

dark/gtk-4.0/gtk-contained.scss

+              @import 'colors';
+              @import 'drawing';
+              @import 'common';
+              @import 'colors-public';

houndci-bot Sep 26, 2023

Prefer double-quoted strings

dark/gtk-4.0/gtk-contained.scss

+              @import 'colors';
+              @import 'drawing';
+              @import 'common';

houndci-bot Sep 26, 2023

Prefer double-quoted strings

dark/gtk-4.0/gtk-contained.scss

+              $variant: 'dark';
+              @import 'colors';
+              @import 'drawing';

houndci-bot Sep 26, 2023

Prefer double-quoted strings

dark/gtk-4.0/gtk-contained.scss


		$variant: 'dark';

		@import 'colors';

houndci-bot Sep 26, 2023

Prefer double-quoted strings

dark/gtk-4.0/gtk-contained.scss

+              //   you need a subtle shade
+              // - if you need to inverse a color function use the @if directive to match for dark $variant
+              $variant: 'dark';

houndci-bot Sep 26, 2023

Prefer double-quoted strings

Author

mathiascode commented Sep 26, 2023

Thanks, but fail to build:

Any difference now? The changes should match the GTK 3 theme, unless I overlooked something.

rozhuk-im commented Sep 26, 2023

No, same errors.
It does not expect ../../light/gtk-4.0/ in files.

rozhuk-im commented Sep 26, 2023

/dark/gtk-3.0/gtk-contained-dark.scss - is a symlink, probably you also shold convert files from error messages to symlinks.

Author

mathiascode commented Sep 26, 2023 •

edited

It uses symlinks in the same way as the GTK 3 theme, although I don't understand why they are failing. Everything builds correctly on my end.

Does the master branch work fine for you?

rozhuk-im commented Sep 26, 2023

Master build ok for me.

/dark/gtk-4.0/gtk.gresource.xml is not symlink, it is regular file!
Look at houndci-bot messages, it mark dark/gtk-4.0/Gemfile as regular file with unusual content.
Probably all symlinks was converted to regular files while you play with git before push here.

rozhuk-im commented Sep 28, 2023

Probably you have set core.symlinks = false
https://mirrors.edge.kernel.org/pub/software/scm/git/docs/git-config.html
fix: git config core.symlinks true


          Add GTK 4 variant of Greybird-dark

278bcc1

mathiascode force-pushed the greybird-dark-gtk4 branch from 473c72c to 278bcc1 Compare

September 29, 2023 13:40

Author

mathiascode commented Sep 29, 2023

Probably you have set core.symlinks = false https://mirrors.edge.kernel.org/pub/software/scm/git/docs/git-config.html fix: git config core.symlinks true

It was not set, but I set it to true just in case.

It's a symlink according to GitHub, and also when cloning my branch:

rozhuk-im commented Sep 29, 2023

Sorry, FreeBSD~s patch does not handle symlinks from git patch files.
I do manual symlinks creation.

Now error changed:

[  9% 10/11] /usr/local/bin/glib-compile-resources ../dark/gtk-4.0/gtk.gresource.xml --target dark/gtk-4.0/gtk.gresource --sourcedir /tmp/ports/usr/ports/x11-themes/greybird-theme/work/Greybird-3.23.3/dark/gtk-4.0
FAILED: dark/gtk-4.0/gtk.gresource 
/usr/local/bin/glib-compile-resources ../dark/gtk-4.0/gtk.gresource.xml --target dark/gtk-4.0/gtk.gresource --sourcedir /tmp/ports/usr/ports/x11-themes/greybird-theme/work/Greybird-3.23.3/dark/gtk-4.0
../dark/gtk-4.0/gtk.gresource.xml: Failed to locate “assets/bullet-symbolic.svg” in any source directory.

Author

mathiascode commented Sep 30, 2023

Sorry, FreeBSD~s patch does not handle symlinks from git patch files. I do manual symlinks creation.

Now error changed:

[  9% 10/11] /usr/local/bin/glib-compile-resources ../dark/gtk-4.0/gtk.gresource.xml --target dark/gtk-4.0/gtk.gresource --sourcedir /tmp/ports/usr/ports/x11-themes/greybird-theme/work/Greybird-3.23.3/dark/gtk-4.0
FAILED: dark/gtk-4.0/gtk.gresource 
/usr/local/bin/glib-compile-resources ../dark/gtk-4.0/gtk.gresource.xml --target dark/gtk-4.0/gtk.gresource --sourcedir /tmp/ports/usr/ports/x11-themes/greybird-theme/work/Greybird-3.23.3/dark/gtk-4.0
../dark/gtk-4.0/gtk.gresource.xml: Failed to locate “assets/bullet-symbolic.svg” in any source directory.

Did you symlink the assets directory?

rozhuk-im commented Oct 1, 2023

Yes, this help fix build issue.
It installed, but probably some missed - xfce does not show that GTK4 supported and dino (GTK4) does not become dark.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment