Skip to content

Add GTK 4 variant of Greybird-dark#341

Open
mathiascode wants to merge 1 commit intoshimmerproject:masterfrom
mathiascode:greybird-dark-gtk4
Open

Add GTK 4 variant of Greybird-dark#341
mathiascode wants to merge 1 commit intoshimmerproject:masterfrom
mathiascode:greybird-dark-gtk4

Conversation

@mathiascode
Copy link
Copy Markdown

Comment thread dark/gtk-4.0/Gemfile
@@ -0,0 +1 @@
../../light/gtk-4.0/Gemfile No newline at end of file
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Comment thread dark/gtk-4.0/_common.scss
@@ -0,0 +1 @@
../../light/gtk-4.0/_common.scss No newline at end of file
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Commas in function parameters should be followed by one space

@@ -0,0 +1 @@
../../light/gtk-4.0/gtk-contained-dark.scss No newline at end of file
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prefer double-quoted strings

@@ -0,0 +1 @@
../../light/gtk-4.0/gtk-dark.scss No newline at end of file
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prefer double-quoted strings

Comment thread dark/gtk-4.0/gtk.scss
@@ -0,0 +1 @@
../../light/gtk-4.0/gtk.scss No newline at end of file
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prefer double-quoted strings

@rozhuk-im
Copy link
Copy Markdown

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

@import 'colors';
@import 'drawing';
@import 'common';
@import 'colors-public';
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prefer double-quoted strings


@import 'colors';
@import 'drawing';
@import 'common';
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prefer double-quoted strings

$variant: 'dark';

@import 'colors';
@import 'drawing';
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prefer double-quoted strings


$variant: 'dark';

@import 'colors';
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prefer double-quoted strings

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

$variant: 'dark';
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prefer double-quoted strings

@mathiascode
Copy link
Copy Markdown
Author

Thanks, but fail to build:

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

@rozhuk-im
Copy link
Copy Markdown

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

@rozhuk-im
Copy link
Copy Markdown

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

@mathiascode
Copy link
Copy Markdown
Author

mathiascode commented Sep 26, 2023

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
Copy link
Copy Markdown

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
Copy link
Copy Markdown

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

@mathiascode
Copy link
Copy Markdown
Author

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:
image

@rozhuk-im
Copy link
Copy Markdown

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.

@mathiascode
Copy link
Copy Markdown
Author

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
Copy link
Copy Markdown

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.
Screenshot_2023-10-01_06-37-09

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants