#2 Update to 3.22.11
Closed 4 years ago by nonamedotc. Opened 4 years ago by nonamedotc.
Unknown source master  into  master

@@ -0,0 +1,65 @@

+ --- dark/meson.build.orig	2020-01-05 10:47:24.276530752 -0500

+ +++ dark/meson.build	2020-01-05 10:48:11.474881572 -0500

+ @@ -71,7 +71,6 @@

+      'gtk-3.0/_gnome-apps.scss',

+      'gtk-3.0/_lightdm-gtk-greeter.scss',

+      'gtk-3.0/_others.scss',

+ -    'gtk-3.0/_unity.scss',

+      'gtk-3.0/_xfce.scss'

+  ])

+  

+ @@ -444,39 +443,6 @@

+      'plank/dock.theme'

+  ])

+  

+ -#

+ -# Unity files

+ -#

+ -unity_files = files([

+ -    'unity/close_focused_normal.png',

+ -    'unity/close_focused_prelight.png',

+ -    'unity/close_focused_pressed.png',

+ -    'unity/close.png',

+ -    'unity/close_unfocused.png',

+ -    'unity/close_unfocused_prelight.png',

+ -    'unity/close_unfocused_pressed.png',

+ -    'unity/maximize_focused_normal.png',

+ -    'unity/maximize_focused_prelight.png',

+ -    'unity/maximize_focused_pressed.png',

+ -    'unity/maximize.png',

+ -    'unity/maximize_unfocused.png',

+ -    'unity/maximize_unfocused_prelight.png',

+ -    'unity/maximize_unfocused_pressed.png',

+ -    'unity/minimize_focused_normal.png',

+ -    'unity/minimize_focused_prelight.png',

+ -    'unity/minimize_focused_pressed.png',

+ -    'unity/minimize.png',

+ -    'unity/minimize_unfocused.png',

+ -    'unity/minimize_unfocused_prelight.png',

+ -    'unity/minimize_unfocused_pressed.png',

+ -    'unity/unmaximize_focused_normal.png',

+ -    'unity/unmaximize_focused_prelight.png',

+ -    'unity/unmaximize_focused_pressed.png',

+ -    'unity/unmaximize.png',

+ -    'unity/unmaximize_unfocused.png',

+ -    'unity/unmaximize_unfocused_prelight.png',

+ -    'unity/unmaximize_unfocused_pressed.png'

+ -])

+  

+  #

+  #   Installing

+ @@ -526,7 +492,7 @@

+                                      install_dir: join_paths(theme_path, 'gtk-3.0'))

+  

+  install_data('gtk-3.0/settings.ini', install_dir : join_paths(theme_path, 'gtk-3.0'))

+ -install_data(['gtk-3.0/apps/granite-widgets.css', 'gtk-3.0/apps/lightdm-unity-greeter.css'], install_dir : join_paths(theme_path, 'gtk-3.0/apps'))

+ +install_data(['gtk-3.0/apps/granite-widgets.css'], install_dir : join_paths(theme_path, 'gtk-3.0/apps'))

+  install_data(gtk3_assets, install_dir : join_paths (theme_path, 'gtk-3.0/assets'))

+  

+  # we don't want to install these in the flatpak

+ @@ -546,5 +512,4 @@

+      # install_data(xfce_notify_files, install_dir : join_paths (theme_path, 'xfce-notify-4.0'))

+      # install_data(xfce_notify_bright_files, install_dir : join_paths (bright_theme_path, 'xfce-notify-4.0_bright'))

+      install_data(plank_files, install_dir : join_paths (theme_path, 'plank'))

+ -    install_data(unity_files, install_dir : join_paths (theme_path, 'unity'))

+  endif

file modified
+80 -25
@@ -1,40 +1,63 @@

  %global theme_name     Greybird

  

  Name:           greybird

- Version:        3.22.10

- Release:        2%{?dist}

+ Version:        3.22.11

+ Release:        1%{?dist}

  Summary:        A clean minimalistic theme for Xfce, GTK+ 2 and 3

  

  License:        GPLv2+ or CC-BY-SA

  URL:            http://shimmerproject.org/project/%{name}/ 

  Source0:        https://github.com/shimmerproject/%{theme_name}/archive/v%{version}.tar.gz

  

+ Patch0:         light_remove_unity.patch

+ Patch1:         dark_remove_unity.patch

+ 

+ BuildRequires:  gdk-pixbuf2-devel

+ BuildRequires:  librsvg2-devel

+ BuildRequires:  meson

+ BuildRequires:  sassc

+ BuildRequires:  rubygem-sass

+ 

+ Requires:       gtk-murrine-engine

+ 

  BuildArch:      noarch

  

+ Obsoletes:      greybird-gtk2-theme < 3.22.11

+ Obsoletes:      greybird-gtk3-theme < 3.22.11

+ Obsoletes:      greybird-metacity-theme < 3.22.11

+ Obsoletes:      greybird-xfce4-notifyd-theme < 3.22.11

+ Obsoletes:      greybird-xfwm4-themes < 3.22.11

+ 

+ Provides:       greybird = %{name}-%{release}

+ 

  %description

  Greybird is a theme for GTK2/3 and xfwm4/metacity started out on the basis of

  Bluebird, but aims at reworking the intense blue tone to a more neutral

  grey-ish look that will be more pleasant to look at in everyday use.

  

  

- %package gtk2-theme

- Summary:        Greybird GTK+2 themes

- Requires:       gtk-murrine-engine >= 0.98.1.1 gtk2-engines

+ %package dark-theme

+ Summary:        Greybird Dark themes

  

- %description gtk2-theme

- Themes for GTK+2 as part of the Greybird theme.

+ Requires:       gtk2-murrine-engines

  

+ Obsoletes:      greybird-gtk2-theme < 3.22.11

+ Obsoletes:      greybird-gtk3-theme < 3.22.11

+ Obsoletes:      greybird-metacity-theme < 3.22.11

+ Obsoletes:      greybird-xfce4-notifyd-theme < 3.22.11

+ Obsoletes:      greybird-xfwm4-themes < 3.22.11

+ Provides:       greybird-dark-theme = %{name}-%{release}

  

- %package gtk3-theme

- Summary:        Greybird GTK+3 themes

  

- %description gtk3-theme

- Themes for GTK+3 as part of the Greybird theme.

+ %description dark-theme

+ Dark Themes as part of the Greybird theme.

  

  

  %package metacity-theme

  Summary:        Greybird Metacity themes

  Requires:       metacity

+ Requires:       greybird

+ Requires:       greybird-dark

  

  %description metacity-theme

  Themes for Metacity as part of the Greybird theme.
@@ -43,6 +66,8 @@

  %package xfwm4-theme

  Summary:        Greybird Xfwm4 themes

  Requires:       xfwm4

+ Requires:       greybird

+ Requires:       greybird-dark

  

  %description xfwm4-theme

  Themes for Xfwm4 as part of the Greybird theme.
@@ -50,60 +75,90 @@

  %package xfce4-notifyd-theme

  Summary:        Greybird Xfce4 notifyd theme

  Requires:       xfce4-notifyd

+ Requires:       greybird

  

  %description xfce4-notifyd-theme

  Themes for Xfce4 notifyd as part of the Greybird theme.

  

+ %package plank

+ Summary:        Greybird plank themes

+ Requires:       plank

+ Requires:       greybird

+ Requires:       greybird-dark

+ 

+ %description plank

+ Themes for plank as part of the Greybird theme.

+ 

  %prep

  

  %setup -q -n %{theme_name}-%{version}

  

  # Cleanup

  # Remove Unity theme

- rm -f gtk-3.0/apps/unity.css

- rm -f gtk-3.0/apps/lightdm-unity-greeter.css

+ rm -fr light/unity

+ rm -fr dark/unity

  

- sed -i '/unity\.css/d' gtk-3.0/gtk.css

- sed -i '/lightdm-unity-greeter\.css/d' gtk-3.0/gtk.css

+ %patch0 -p0

+ %patch1 -p0

  

  %build

- # Nothing to build

+ %meson

+ 

+ %meson_build

  

  %install

- mkdir -p -m755 %{buildroot}%{_datadir}/themes/%{theme_name}

- cp -pr gtk-2.0/ gtk-3.0/ metacity-1/ xfwm4/ xfwm4-a11y/ xfwm4-compact/ xfce-notify-4.0/ %{buildroot}%{_datadir}/themes/%{theme_name}

+ %meson_install

  

- %files gtk2-theme

+ 

+ %files

  %doc LICENSE.GPL LICENSE.CC

- %dir %{_datadir}/themes/Greybird/

+ %{_datadir}/themes/%{theme_name}/index.theme

+ %{_datadir}/themes/%{theme_name}/%{theme_name}.emerald

+ %{_datadir}/themes/%{theme_name}/gnome-shell/

  %{_datadir}/themes/%{theme_name}/gtk-2.0/

+ %{_datadir}/themes/%{theme_name}/gtk-3.0/

  

  

- %files gtk3-theme

+ %files dark-theme

  %doc LICENSE.GPL LICENSE.CC

- %dir %{_datadir}/themes/Greybird/

- %{_datadir}/themes/%{theme_name}/gtk-3.0/

+ %{_datadir}/themes/%{theme_name}-dark/index.theme

+ %{_datadir}/themes/%{theme_name}-dark/%{theme_name}-dark.emerald

+ %{_datadir}/themes/%{theme_name}-dark/gnome-shell/

+ %{_datadir}/themes/%{theme_name}-dark/gtk-2.0/

+ %{_datadir}/themes/%{theme_name}-dark/gtk-3.0/

  

  

  %files metacity-theme

  %doc LICENSE.GPL LICENSE.CC

  %dir %{_datadir}/themes/Greybird/

  %{_datadir}/themes/%{theme_name}/metacity-1/

+ %{_datadir}/themes/%{theme_name}-dark/metacity-1/

  

  

  %files xfwm4-theme

  %doc LICENSE.GPL LICENSE.CC

  %dir %{_datadir}/themes/Greybird/

+ %{_datadir}/themes/%{theme_name}-accessibility/xfwm4/

+ %{_datadir}/themes/%{theme_name}-dark-accessibility/xfwm4/

+ %{_datadir}/themes/%{theme_name}-dark/xfwm4/

  %{_datadir}/themes/%{theme_name}/xfwm4/

- %{_datadir}/themes/%{theme_name}/xfwm4-a11y/

- %{_datadir}/themes/%{theme_name}/xfwm4-compact/

+ %{_datadir}/themes/%{theme_name}-compact/xfwm4/

  

  %files xfce4-notifyd-theme

  %doc LICENSE.GPL LICENSE.CC

  %dir %{_datadir}/themes/Greybird/

+ %{_datadir}/themes/%{theme_name}-bright/xfce-notify-4.0/

  %{_datadir}/themes/%{theme_name}/xfce-notify-4.0/

  

+ %files plank

+ %doc LICENSE.GPL LICENSE.CC

+ %{_datadir}/themes/%{theme_name}/plank/

+ %{_datadir}/themes/%{theme_name}-dark/plank/

+ 

  %changelog

+ * Sun Jan 05 2020 Mukundan Ragavan <nonamedotc@fedoraproject.org> = 3.22.11-1

+ - Update to 3.22.11

+ 

  * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.22.10-2

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

  

@@ -0,0 +1,66 @@

+ --- light/meson.build.orig	2020-01-05 10:48:18.792090990 -0500

+ +++ light/meson.build	2020-01-05 10:48:53.524085023 -0500

+ @@ -72,7 +72,6 @@

+      'gtk-3.0/_gnome-apps.scss',

+      'gtk-3.0/_lightdm-gtk-greeter.scss',

+      'gtk-3.0/_others.scss',

+ -    'gtk-3.0/_unity.scss',

+      'gtk-3.0/_xfce.scss'

+  ])

+  

+ @@ -559,40 +558,6 @@

+      'plank/dock.theme'

+  ])

+  

+ -#

+ -# Unity files

+ -#

+ -unity_files = files([

+ -    'unity/close_focused_normal.png',

+ -    'unity/close_focused_prelight.png',

+ -    'unity/close_focused_pressed.png',

+ -    'unity/close.png',

+ -    'unity/close_unfocused.png',

+ -    'unity/close_unfocused_prelight.png',

+ -    'unity/close_unfocused_pressed.png',

+ -    'unity/maximize_focused_normal.png',

+ -    'unity/maximize_focused_prelight.png',

+ -    'unity/maximize_focused_pressed.png',

+ -    'unity/maximize.png',

+ -    'unity/maximize_unfocused.png',

+ -    'unity/maximize_unfocused_prelight.png',

+ -    'unity/maximize_unfocused_pressed.png',

+ -    'unity/minimize_focused_normal.png',

+ -    'unity/minimize_focused_prelight.png',

+ -    'unity/minimize_focused_pressed.png',

+ -    'unity/minimize.png',

+ -    'unity/minimize_unfocused.png',

+ -    'unity/minimize_unfocused_prelight.png',

+ -    'unity/minimize_unfocused_pressed.png',

+ -    'unity/unmaximize_focused_normal.png',

+ -    'unity/unmaximize_focused_prelight.png',

+ -    'unity/unmaximize_focused_pressed.png',

+ -    'unity/unmaximize.png',

+ -    'unity/unmaximize_unfocused.png',

+ -    'unity/unmaximize_unfocused_prelight.png',

+ -    'unity/unmaximize_unfocused_pressed.png'

+ -])

+ -

+  

+  #

+  #   Installing

+ @@ -603,7 +568,7 @@

+  

+  # gtk3 stuff, also always install this

+  install_data('gtk-3.0/settings.ini', install_dir : join_paths(theme_path, 'gtk-3.0'))

+ -install_data(['gtk-3.0/apps/granite-widgets.css', 'gtk-3.0/apps/lightdm-unity-greeter.css'], install_dir : join_paths(theme_path, 'gtk-3.0/apps'))

+ +install_data(['gtk-3.0/apps/granite-widgets.css'], install_dir : join_paths(theme_path, 'gtk-3.0/apps'))

+  install_data(gtk3_assets, install_dir : join_paths (theme_path, 'gtk-3.0/assets'))

+  theme_deps += custom_target('Greybird',

+                              input: 'gtk-3.0/gtk-contained.scss',

+ @@ -648,5 +613,4 @@

+      install_data(xfwm4_a11y_files, install_dir : join_paths (a11y_theme_path, 'xfwm4'))

+      install_data(xfwm4_compact_files, install_dir : join_paths (compact_theme_path, 'xfwm4'))

+      install_data(plank_files, install_dir : join_paths (theme_path, 'plank'))

+ -    install_data(unity_files, install_dir : join_paths (theme_path, 'unity'))

+  endif

This is a better PR. Patches get rid of unity theme.

Hum, so there's a light and dark version now, but don't we still want to seperate out the gtk2/gtk3 versions of those?

I guess the only reason it matters is that the gtk2 stuff Requires gtk2-murrine-engines? but wait... thats not packaged in fedora? Oh, it's gtk-murrine-engine... :)

I thought about splitting gtk2 and gtk3 themes. If I do that, greybird ends up with with a bunch of subpackages such as

  • light-gtk2
  • light-gtk3
  • dark-gtk2
  • dark-gtk3

etc.

Not to mention, both dark-gtk2 and dark-gtk3 need the same index.theme which needs to set in -dark subpackage or we need to duplicate manually.

All this for avoiding one dependency - gtk-murrine-engine (which I managed to misspell).

Should we really bother splitting gtk2/gtk3?

sure, I guess we can leave them in one...

do fix the gtk2-murrine-engines -> gtk-murrine-engine though

1 new commit added

  • fix requires on murrine engine
4 years ago

Pull-Request has been closed by nonamedotc

4 years ago

I will test PR# 3 and merge that. Thanks @kevin