Hello community,

here is the log from the commit of package greybird-geeko-theme for 
openSUSE:Factory checked in at 2019-07-17 14:27:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/greybird-geeko-theme (Old)
 and      /work/SRC/openSUSE:Factory/.greybird-geeko-theme.new.1887 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "greybird-geeko-theme"

Wed Jul 17 14:27:06 2019 rev:3 rq:715734 version:3.22.10.1+git38.1a7574f

Changes:
--------
--- 
/work/SRC/openSUSE:Factory/greybird-geeko-theme/greybird-geeko-theme.changes    
    2019-07-11 13:17:15.438788866 +0200
+++ 
/work/SRC/openSUSE:Factory/.greybird-geeko-theme.new.1887/greybird-geeko-theme.changes
      2019-07-17 14:27:08.843365956 +0200
@@ -1,0 +2,8 @@
+Tue Jul 16 14:57:20 UTC 2019 - [email protected]
+
+- Update to version 3.22.10.1+git38.1a7574f:
+  * Merge bright into lights notification theme, and drop darks bright theme
+  * Install bright notification files to proper places
+  * Add flags for flatpak usage
+
+-------------------------------------------------------------------

Old:
----
  greybird-geeko-theme-3.22.10.1+git35.86db55b.obscpio

New:
----
  greybird-geeko-theme-3.22.10.1+git38.1a7574f.obscpio

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ greybird-geeko-theme.spec ++++++
--- /var/tmp/diff_new_pack.KxplNG/_old  2019-07-17 14:27:09.415364179 +0200
+++ /var/tmp/diff_new_pack.KxplNG/_new  2019-07-17 14:27:09.415364179 +0200
@@ -20,7 +20,7 @@
 %define name_dark Greybird-Geeko-Dark
 
 Name:           greybird-geeko-theme
-Version:        3.22.10.1+git35.86db55b
+Version:        3.22.10.1+git38.1a7574f
 Release:        0
 Url:            https://github.com/shimmerproject/Greybird-Geeko
 Summary:        A grey theme for GNOME, XFCE, GTK+ 2 and 3

++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.KxplNG/_old  2019-07-17 14:27:09.455364055 +0200
+++ /var/tmp/diff_new_pack.KxplNG/_new  2019-07-17 14:27:09.459364043 +0200
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param 
name="url">https://github.com/shimmerproject/Greybird-Geeko.git</param>
-              <param 
name="changesrevision">3dd0c09b98dcec4a2ef686906bc92dc2eff3da3f</param></service></servicedata>
\ No newline at end of file
+              <param 
name="changesrevision">1a7574f241b6233d44c135a079cda89b80d2eed6</param></service></servicedata>
\ No newline at end of file

++++++ greybird-geeko-theme-3.22.10.1+git35.86db55b.obscpio -> 
greybird-geeko-theme-3.22.10.1+git38.1a7574f.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/greybird-geeko-theme-3.22.10.1+git35.86db55b/dark/meson.build 
new/greybird-geeko-theme-3.22.10.1+git38.1a7574f/dark/meson.build
--- old/greybird-geeko-theme-3.22.10.1+git35.86db55b/dark/meson.build   
2019-07-09 15:22:45.000000000 +0200
+++ new/greybird-geeko-theme-3.22.10.1+git38.1a7574f/dark/meson.build   
2019-07-16 16:46:45.000000000 +0200
@@ -1,18 +1,7 @@
 theme_path = join_paths(get_option('datadir'), 'themes/Greybird-Geeko-Dark')
 a11y_theme_path = join_paths(get_option('datadir'), 
'themes/Greybird-Geeko-Dark-Accessibility')
 compact_theme_path = join_paths(get_option('datadir'), 
'themes/Greybird-Geeko-Dark-Compact')
-
-#
-# index.theme
-#
-
-install_data('index.theme', install_dir : theme_path)
-
-#
-# emerald file
-#
-
-install_data('Greybird-geeko.emerald', rename: 'Greybird-Geeko-Dark.emerald', 
install_dir : theme_path)
+bright_theme_path = join_paths(get_option('datadir'), 
'themes/Greybird-Geeko-Dark-Bright')
 
 #
 # GTK+-2.0 Files
@@ -71,11 +60,6 @@
     'gtk-2.0/assets/radio-unchecked-hover.png'
 ])
 
-install_data(gtk2_files, install_dir : join_paths(theme_path, 'gtk-2.0'))
-install_data(gtk2_apps, install_dir : join_paths(theme_path, 'gtk-2.0/apps'))
-install_data(gtk2_thunar, install_dir : join_paths(theme_path, 
'gtk-2.0/apps/thunar'))
-install_data(gtk2_assets, install_dir : join_paths(theme_path, 
'gtk-2.0/assets'))
-
 #
 # GTK+-3.0 Files
 #
@@ -92,37 +76,6 @@
     'gtk-3.0/_xfce.scss'
 ])
 
-theme_deps += custom_target('Greybird-Geeko-Dark',
-                            input: 'gtk-3.0/gtk-contained.scss',
-                            output: 'gtk.css',
-                            command: [
-                                sassc, sassc_opts, '@INPUT@', '@OUTPUT@'
-                            ],
-                            depend_files: scss_files,
-                            build_by_default: true,
-                            install: true,
-                            install_dir: join_paths(theme_path, 'gtk-3.0'))
-
-theme_deps += custom_target('Greybird-Geeko-Dark-Dark',
-                            input: 'gtk-3.0/gtk-contained-dark.scss',
-                            output: 'gtk-dark.css',
-                            command: [
-                                sassc, sassc_opts, '@INPUT@', '@OUTPUT@'
-                            ],
-                            depend_files: scss_files,
-                            build_by_default: true,
-                            install: true,
-                            install_dir: join_paths(theme_path, 'gtk-3.0'))
-
-gtk_dark_gresources = gnome.compile_resources('gtk', 
'gtk-3.0/gtk.gresource.xml',
-                                         source_dir: 
join_paths(meson.source_root(), 'light/gtk-3.0'),
-                                         install: true,
-                                         gresource_bundle: true,
-                                         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'))
-
 gtk3_assets = files([
     'gtk-3.0/assets/checkbox-mixed.png',
     'gtk-3.0/assets/[email protected]',
@@ -202,14 +155,10 @@
     'gtk-3.0/assets/[email protected]',
 ])
 
-install_data(gtk3_assets, install_dir : join_paths (theme_path, 
'gtk-3.0/assets'))
-
 #
 # GNOME Shell Files
 #
 
-install_data(['gnome-shell/gnome-shell.css'], install_dir : join_paths 
(theme_path, 'gnome-shell'))
-
 #
 # Metacity Files
 #
@@ -243,8 +192,6 @@
     'metacity-1/minimize_focused_normal.png'
 ])
 
-install_data(metacity_files, install_dir : join_paths (theme_path, 
'metacity-1'))
-
 #
 # Xfce Notify 4.0 Files
 #
@@ -254,19 +201,6 @@
     'xfce-notify-4.0/gtkrc'
 ])
 
-install_data(xfce_notify_files, install_dir : join_paths (theme_path, 
'xfce-notify-4.0'))
-
-#
-# Xfce Notify 4.0 Bright-Dateien 🥚
-#
-
-xfce_notify_bright_files = files([
-    'xfce-notify-4.0_bright/gtk.css',
-    'xfce-notify-4.0_bright/gtkrc'
-])
-
-install_data(xfce_notify_bright_files, install_dir : join_paths (theme_path, 
'xfce-notify-4.0'))
-
 #
 # Xfwm4 Files
 #
@@ -331,8 +265,6 @@
     'xfwm4/top-right-inactive.xpm'
 ])
 
-install_data(xfwm4_files, install_dir : join_paths (theme_path, 'xfwm4'))
-
 #
 # Xfwm4 A11y Files
 #
@@ -448,9 +380,7 @@
     'xfwm4-a11y/right-inactive.xpm',
     'xfwm4-a11y/title-1-inactive.xpm'
 ])
-# we're not installing xfwm a11y for dark
-# install_data(xfwm4_a11y_files, install_dir : join_paths (a11y_theme_path, 
'xfwm4'))
-#
+
 #
 # Xfwm4 Compact Files
 #
@@ -564,6 +494,60 @@
     'xfwm4-compact/right-inactive.xpm',
     'xfwm4-compact/title-1-inactive.xpm'
 ])
-# we're not installing xfwm compact for dark
-# install_data(xfwm4_compact_files, install_dir : join_paths 
(compact_theme_path, 'xfwm4'))
+
+#
+#   Installing
 #
+
+# index.theme, always install this
+install_data('index.theme', install_dir : theme_path)
+
+# gtk3 stuff, also always install this
+theme_deps += custom_target('Greybird-Geeko-Dark',
+                            input: 'gtk-3.0/gtk-contained.scss',
+                            output: 'gtk.css',
+                            command: [
+                                sassc, sassc_opts, '@INPUT@', '@OUTPUT@'
+                            ],
+                            depend_files: scss_files,
+                            build_by_default: true,
+                            install: true,
+                            install_dir: join_paths(theme_path, 'gtk-3.0'))
+
+theme_deps += custom_target('Greybird-Geeko-Dark-Dark',
+                            input: 'gtk-3.0/gtk-contained-dark.scss',
+                            output: 'gtk-dark.css',
+                            command: [
+                                sassc, sassc_opts, '@INPUT@', '@OUTPUT@'
+                            ],
+                            depend_files: scss_files,
+                            build_by_default: true,
+                            install: true,
+                            install_dir: join_paths(theme_path, 'gtk-3.0'))
+
+gtk_dark_gresources = gnome.compile_resources('gtk', 
'gtk-3.0/gtk.gresource.xml',
+                                         source_dir: 
join_paths(meson.source_root(), 'light/gtk-3.0'),
+                                         install: true,
+                                         gresource_bundle: true,
+                                         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(gtk3_assets, install_dir : join_paths (theme_path, 
'gtk-3.0/assets'))
+
+# we don't want to install these in the flatpak
+if not get_option('flatpak')
+    install_data('Greybird-geeko.emerald', rename: 
'Greybird-Geeko-Dark.emerald', install_dir : theme_path)
+    install_data(gtk2_files, install_dir : join_paths(theme_path, 'gtk-2.0'))
+    install_data(gtk2_apps, install_dir : join_paths(theme_path, 
'gtk-2.0/apps'))
+    install_data(gtk2_thunar, install_dir : join_paths(theme_path, 
'gtk-2.0/apps/thunar'))
+    install_data(gtk2_assets, install_dir : join_paths(theme_path, 
'gtk-2.0/assets'))
+    install_data(['gnome-shell/gnome-shell.css'], install_dir : join_paths 
(theme_path, 'gnome-shell'))
+    install_data(metacity_files, install_dir : join_paths (theme_path, 
'metacity-1'))
+    install_data(xfce_notify_files, install_dir : join_paths (theme_path, 
'xfce-notify-4.0'))
+    install_data(xfwm4_files, install_dir : join_paths (theme_path, 'xfwm4'))
+    # we're not installing xfwm a11y for dark
+    # install_data(xfwm4_a11y_files, install_dir : join_paths 
(a11y_theme_path, 'xfwm4'))
+    # we're not installing xfwm compact for dark
+    # install_data(xfwm4_compact_files, install_dir : join_paths 
(compact_theme_path, 'xfwm4'))
+endif
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/greybird-geeko-theme-3.22.10.1+git35.86db55b/dark/xfce-notify-4.0_bright/gtk.css
 
new/greybird-geeko-theme-3.22.10.1+git38.1a7574f/dark/xfce-notify-4.0_bright/gtk.css
--- 
old/greybird-geeko-theme-3.22.10.1+git35.86db55b/dark/xfce-notify-4.0_bright/gtk.css
        2019-07-09 15:22:45.000000000 +0200
+++ 
new/greybird-geeko-theme-3.22.10.1+git38.1a7574f/dark/xfce-notify-4.0_bright/gtk.css
        1970-01-01 01:00:00.000000000 +0100
@@ -1,47 +0,0 @@
-#XfceNotifyWindow {
-    background-color: #f2f1f1;
-    color: #686868;
-    border: 1px solid shade(#f2f1f1, 0.6);
-}
-
-#XfceNotifyWindow button {
-    background-image: none;
-    background-color: #f2f1f1;
-    color: shade(#f2f1f1, 0.4);
-    border-color: shade(#f2f1f1, 0.6);
-    border-radius: 3px;
-}
-
-#XfceNotifyWindow button:hover {
-    background-color: shade(#f2f1f1, 0.9);
-}
-
-#XfceNotifyWindow button:active {
-    background-color: shade(#f2f1f1, 0.8);
-}
-
-#XfceNotifyWindow label#summary {
-    font-weight: bold;
-}
-
-#XfceNotifyWindow progressbar {
-    min-height: 6px;
-    border-radius: 3px;
-}
-
-#XfceNotifyWindow progressbar progress {
-    background-image: none;
-    background-color: #686868;
-    border: none;
-    box-shadow: none;
-}
-
-#XfceNotifyWindow progressbar trough {
-    background-image: linear-gradient(to bottom,
-                                      shade(#f2f1f1, 0.65),
-                                      shade(#f2f1f1, 1.25)
-                                      );
-    border: 1px solid shade(#f2f1f1, 0.2);
-    border-radius: 3px;
-    padding: 1px 0;
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/greybird-geeko-theme-3.22.10.1+git35.86db55b/dark/xfce-notify-4.0_bright/gtkrc
 
new/greybird-geeko-theme-3.22.10.1+git38.1a7574f/dark/xfce-notify-4.0_bright/gtkrc
--- 
old/greybird-geeko-theme-3.22.10.1+git35.86db55b/dark/xfce-notify-4.0_bright/gtkrc
  2019-07-09 15:22:45.000000000 +0200
+++ 
new/greybird-geeko-theme-3.22.10.1+git38.1a7574f/dark/xfce-notify-4.0_bright/gtkrc
  1970-01-01 01:00:00.000000000 +0100
@@ -1,75 +0,0 @@
-style "notify-window"
-
-{
-    XfceNotifyWindow::summary-bold = 1
-    XfceNotifyWindow::border-color = "#686868"
-    XfceNotifyWindow::border-color-hover = "#686868"
-    XfceNotifyWindow::border-radius = 10.0
-    XfceNotifyWindow::border-width = 0.5
-    XfceNotifyWindow::border-width-hover = 0.5
-    bg[NORMAL] = "#f2f1f1"
-    engine "murrine" {
-        textstyle = 1
-        text_shade = 1.1
-    }
-}
-
-style "notify-button"
-{
-    bg[NORMAL] = "#f1f1f1"
-    bg[PRELIGHT] = "#e4e4e4"
-    bg[ACTIVE] = "#ddd"
-    fg[NORMAL] = "#686868"
-    fg[PRELIGHT] = "#686868"
-    fg[ACTIVE] = "#000"
-    engine "murrine" {
-        gradient_shades = { 1.0, 1.0, 1.0, 1.0 }
-        border_shades   = { 1.15, 1.15 }
-        contrast = 1.0
-        roundness = 4
-        textstyle = 1
-        text_shade = 1.1
-    }
-}
-
-style "notify-text"
-{
-    fg[NORMAL] = "#686868"
-    fg[PRELIGHT] = "#000"
-    GtkWidget::link-color = "#a7a7a7"
-    engine "murrine" {
-        textstyle = 0
-    }
-}
-
-style "notify-summary"
-{
-    font_name = "Bold"
-}
-
-style "notify-progressbar"
-{
-    xthickness   = 1
-    ythickness   = 1
-
-    fg[PRELIGHT] = "#ddd"
-    bg[NORMAL]   = "#f1f1f1"
-    bg[SELECTED] = "#f1f1f1"
-
-    engine "murrine" {
-        gradient_shades = { 1.0, 1.0, 1.0, 1.0 }
-        contrast       = 1.0
-        border_shades  = { 1.35, 1.35 }
-        trough_shades  = { 2.85, 3.25 }
-        trough_border_shades = { 1.1, 1.1 }
-        progressbarstyle = 0
-        roundness = 6
-    }
-}
-
-class "XfceNotifyWindow" style "notify-window"
-widget "XfceNotifyWindow.*.summary" style "notify-summary"
-widget_class "XfceNotifyWindow.*GtkButton*" style "notify-button"
-widget_class "XfceNotifyWindow.*.<GtkLabel>" style "notify-text"
-widget_class "XfceNotifyWindow.*.<GtkProgress>" style "notify-progressbar"
-widget_class "XfceNotifyWindow.*.<GtkProgressBar>" style "notify-progressbar"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/greybird-geeko-theme-3.22.10.1+git35.86db55b/light/meson.build 
new/greybird-geeko-theme-3.22.10.1+git38.1a7574f/light/meson.build
--- old/greybird-geeko-theme-3.22.10.1+git35.86db55b/light/meson.build  
2019-07-09 15:22:45.000000000 +0200
+++ new/greybird-geeko-theme-3.22.10.1+git38.1a7574f/light/meson.build  
2019-07-16 16:46:45.000000000 +0200
@@ -1,18 +1,7 @@
 theme_path = join_paths(get_option('datadir'), 'themes/Greybird-Geeko-Light')
 a11y_theme_path = join_paths(get_option('datadir'), 
'themes/Greybird-Geeko-Light-Accessibility')
 compact_theme_path = join_paths(get_option('datadir'), 
'themes/Greybird-Geeko-Light-Compact')
-
-#
-# index.theme
-#
-
-install_data('index.theme', install_dir : theme_path)
-
-#
-# emerald file
-#
-
-install_data('Greybird-geeko.emerald', rename: 'Greybird-Geeko-Light.emerald', 
install_dir : theme_path)
+bright_theme_path = join_paths(get_option('datadir'), 
'themes/Greybird-Geeko-Light-Bright')
 
 #
 # GTK+-2.0 Files
@@ -71,11 +60,6 @@
     'gtk-2.0/assets/radio-unchecked-hover.png'
 ])
 
-install_data(gtk2_files, install_dir : join_paths(theme_path, 'gtk-2.0'))
-install_data(gtk2_apps, install_dir : join_paths(theme_path, 'gtk-2.0/apps'))
-install_data(gtk2_thunar, install_dir : join_paths(theme_path, 
'gtk-2.0/apps/thunar'))
-install_data(gtk2_assets, install_dir : join_paths(theme_path, 
'gtk-2.0/assets'))
-
 #
 # GTK+-3.0 Files
 #
@@ -92,37 +76,6 @@
     'gtk-3.0/_xfce.scss'
 ])
 
-theme_deps += custom_target('Greybird-Geeko-Light',
-                            input: 'gtk-3.0/gtk-contained.scss',
-                            output: 'gtk.css',
-                            command: [
-                                sassc, sassc_opts, '@INPUT@', '@OUTPUT@'
-                            ],
-                            depend_files: scss_files,
-                            build_by_default: true,
-                            install: true,
-                            install_dir: join_paths(theme_path, 'gtk-3.0'))
-
-theme_deps += custom_target('Greybird-Geeko-Light-Dark',
-                            input: 'gtk-3.0/gtk-contained-dark.scss',
-                            output: 'gtk-dark.css',
-                            command: [
-                                sassc, sassc_opts, '@INPUT@', '@OUTPUT@'
-                            ],
-                            depend_files: scss_files,
-                            build_by_default: true,
-                            install: true,
-                            install_dir: join_paths(theme_path, 'gtk-3.0'))
-
-gtk_light_gresources = gnome.compile_resources('gtk', 
'gtk-3.0/gtk.gresource.xml',
-                                         source_dir: 
join_paths(meson.source_root(), 'light/gtk-3.0'),
-                                         install: true,
-                                         gresource_bundle: true,
-                                         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'))
-
 gtk3_assets = files([
     'gtk-3.0/assets/checkbox-mixed.png',
     'gtk-3.0/assets/[email protected]',
@@ -202,14 +155,10 @@
     'gtk-3.0/assets/[email protected]',
 ])
 
-install_data(gtk3_assets, install_dir : join_paths (theme_path, 
'gtk-3.0/assets'))
-
 #
 # GNOME Shell Files
 #
 
-install_data(['gnome-shell/gnome-shell.css'], install_dir : join_paths 
(theme_path, 'gnome-shell'))
-
 #
 # Metacity Files
 #
@@ -243,8 +192,6 @@
     'metacity-1/minimize_focused_normal.png'
 ])
 
-install_data(metacity_files, install_dir : join_paths (theme_path, 
'metacity-1'))
-
 #
 # Xfce Notify 4.0 Files
 #
@@ -254,19 +201,6 @@
     'xfce-notify-4.0/gtkrc'
 ])
 
-install_data(xfce_notify_files, install_dir : join_paths (theme_path, 
'xfce-notify-4.0'))
-
-#
-# Xfce Notify 4.0 Bright-Dateien 🥚
-#
-
-xfce_notify_bright_files = files([
-    'xfce-notify-4.0_bright/gtk.css',
-    'xfce-notify-4.0_bright/gtkrc'
-])
-
-install_data(xfce_notify_bright_files, install_dir : join_paths (theme_path, 
'xfce-notify-4.0'))
-
 #
 # Xfwm4 Files
 #
@@ -379,8 +313,6 @@
     'xfwm4/top-right-inactive.xpm'
 ])
 
-install_data(xfwm4_files, install_dir : join_paths (theme_path, 'xfwm4'))
-
 #
 # Xfwm4 A11y Files
 #
@@ -497,8 +429,6 @@
     'xfwm4-a11y/title-1-inactive.xpm'
 ])
 
-install_data(xfwm4_a11y_files, install_dir : join_paths (a11y_theme_path, 
'xfwm4'))
-
 #
 # Xfwm4 Compact Files
 #
@@ -613,4 +543,56 @@
     'xfwm4-compact/title-1-inactive.xpm'
 ])
 
-install_data(xfwm4_compact_files, install_dir : join_paths 
(compact_theme_path, 'xfwm4'))
\ No newline at end of file
+#
+#   Installing
+#
+
+# index.theme, always install this
+install_data('index.theme', install_dir : theme_path)
+
+# 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(gtk3_assets, install_dir : join_paths (theme_path, 
'gtk-3.0/assets'))
+theme_deps += custom_target('Greybird-Geeko-Light',
+                            input: 'gtk-3.0/gtk-contained.scss',
+                            output: 'gtk.css',
+                            command: [
+                                sassc, sassc_opts, '@INPUT@', '@OUTPUT@'
+                            ],
+                            depend_files: scss_files,
+                            build_by_default: true,
+                            install: true,
+                            install_dir: join_paths(theme_path, 'gtk-3.0'))
+
+theme_deps += custom_target('Greybird-Geeko-Light-Dark',
+                            input: 'gtk-3.0/gtk-contained-dark.scss',
+                            output: 'gtk-dark.css',
+                            command: [
+                                sassc, sassc_opts, '@INPUT@', '@OUTPUT@'
+                            ],
+                            depend_files: scss_files,
+                            build_by_default: true,
+                            install: true,
+                            install_dir: join_paths(theme_path, 'gtk-3.0'))
+
+gtk_light_gresources = gnome.compile_resources('gtk', 
'gtk-3.0/gtk.gresource.xml',
+                                         source_dir: 
join_paths(meson.source_root(), 'light/gtk-3.0'),
+                                         install: true,
+                                         gresource_bundle: true,
+                                         install_dir: join_paths(theme_path, 
'gtk-3.0'))
+
+# we don't want to install these in the flatpak
+if not get_option('flatpak')
+    install_data('Greybird-geeko.emerald', rename: 
'Greybird-Geeko-Light.emerald', install_dir : theme_path)
+    install_data(gtk2_files, install_dir : join_paths(theme_path, 'gtk-2.0'))
+    install_data(gtk2_apps, install_dir : join_paths(theme_path, 
'gtk-2.0/apps'))
+    install_data(gtk2_thunar, install_dir : join_paths(theme_path, 
'gtk-2.0/apps/thunar'))
+    install_data(gtk2_assets, install_dir : join_paths(theme_path, 
'gtk-2.0/assets'))
+    install_data(['gnome-shell/gnome-shell.css'], install_dir : join_paths 
(theme_path, 'gnome-shell'))
+    install_data(metacity_files, install_dir : join_paths (theme_path, 
'metacity-1'))
+    install_data(xfce_notify_files, install_dir : join_paths (theme_path, 
'xfce-notify-4.0'))
+    install_data(xfwm4_files, install_dir : join_paths (theme_path, 'xfwm4'))
+    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'))
+endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/greybird-geeko-theme-3.22.10.1+git35.86db55b/light/xfce-notify-4.0/gtk.css 
new/greybird-geeko-theme-3.22.10.1+git38.1a7574f/light/xfce-notify-4.0/gtk.css
--- 
old/greybird-geeko-theme-3.22.10.1+git35.86db55b/light/xfce-notify-4.0/gtk.css  
    2019-07-09 15:22:45.000000000 +0200
+++ 
new/greybird-geeko-theme-3.22.10.1+git38.1a7574f/light/xfce-notify-4.0/gtk.css  
    2019-07-16 16:46:45.000000000 +0200
@@ -1,17 +1,25 @@
 #XfceNotifyWindow {
-    background-color: shade(#686868, 0.3);
-    color: #fcfcfc;
-    border: 1px solid shade(#686868, 0.6);
+    background-color: #f2f1f1;
+    color: #686868;
+    border: 1px solid shade(#f2f1f1, 0.6);
 }
 
 #XfceNotifyWindow button {
     background-image: none;
-    background-color: shade(#686868, 0.5);
-    color: #fcfcfc;
-    border-color: shade(#fcfcfc, 0.35);
+    background-color: #f2f1f1;
+    color: shade(#f2f1f1, 0.4);
+    border-color: shade(#f2f1f1, 0.6);
     border-radius: 3px;
 }
 
+#XfceNotifyWindow button:hover {
+    background-color: shade(#f2f1f1, 0.9);
+}
+
+#XfceNotifyWindow button:active {
+    background-color: shade(#f2f1f1, 0.8);
+}
+
 #XfceNotifyWindow label#summary {
     font-weight: bold;
 }
@@ -23,17 +31,17 @@
 
 #XfceNotifyWindow progressbar progress {
     background-image: none;
-    background-color: #fcfcfc;
+    background-color: #686868;
     border: none;
     box-shadow: none;
 }
 
 #XfceNotifyWindow progressbar trough {
     background-image: linear-gradient(to bottom,
-                                      shade(#686868, 0.65),
-                                      shade(#686868, 1.25)
+                                      shade(#f2f1f1, 0.65),
+                                      shade(#f2f1f1, 1.25)
                                       );
-    border: 1px solid shade(#686868, 0.2);
+    border: 1px solid shade(#f2f1f1, 0.2);
     border-radius: 3px;
     padding: 1px 0;
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/greybird-geeko-theme-3.22.10.1+git35.86db55b/light/xfce-notify-4.0/gtkrc 
new/greybird-geeko-theme-3.22.10.1+git38.1a7574f/light/xfce-notify-4.0/gtkrc
--- 
old/greybird-geeko-theme-3.22.10.1+git35.86db55b/light/xfce-notify-4.0/gtkrc    
    2019-07-09 15:22:45.000000000 +0200
+++ 
new/greybird-geeko-theme-3.22.10.1+git38.1a7574f/light/xfce-notify-4.0/gtkrc    
    2019-07-16 16:46:45.000000000 +0200
@@ -1,33 +1,45 @@
 style "notify-window"
+
 {
     XfceNotifyWindow::summary-bold = 1
-    XfceNotifyWindow::border-color = "#ffffff"
-    XfceNotifyWindow::border-color-hover = "#ffffff"
+    XfceNotifyWindow::border-color = "#686868"
+    XfceNotifyWindow::border-color-hover = "#686868"
     XfceNotifyWindow::border-radius = 10.0
-    XfceNotifyWindow::border-width = 0.1
-    XfceNotifyWindow::border-width-hover = 0.1
-    bg[NORMAL] = "#111"
+    XfceNotifyWindow::border-width = 0.5
+    XfceNotifyWindow::border-width-hover = 0.5
+    bg[NORMAL] = "#f2f1f1"
+    engine "murrine" {
+        textstyle = 1
+        text_shade = 1.1
+    }
 }
 
 style "notify-button"
 {
-    bg[NORMAL] = "#202020"
-    bg[PRELIGHT] = "#303030"
-    bg[ACTIVE] = "#222222"
-    fg[NORMAL] = "#ffffff"
-    fg[PRELIGHT] = "#ffffff"
+    bg[NORMAL] = "#f1f1f1"
+    bg[PRELIGHT] = "#e4e4e4"
+    bg[ACTIVE] = "#ddd"
+    fg[NORMAL] = "#686868"
+    fg[PRELIGHT] = "#686868"
+    fg[ACTIVE] = "#000"
     engine "murrine" {
-       border_shades = { 2.9, 2.6 }
-       shadow_shades = {2.4,2.4}
+        gradient_shades = { 1.0, 1.0, 1.0, 1.0 }
+        border_shades   = { 1.15, 1.15 }
+        contrast = 1.0
         roundness = 4
+        textstyle = 1
+        text_shade = 1.1
     }
 }
 
 style "notify-text"
 {
-    fg[NORMAL] = "#ffffff"
-    fg[PRELIGHT] = "#ffffff"
+    fg[NORMAL] = "#686868"
+    fg[PRELIGHT] = "#000"
     GtkWidget::link-color = "#a7a7a7"
+    engine "murrine" {
+        textstyle = 0
+    }
 }
 
 style "notify-summary"
@@ -37,26 +49,27 @@
 
 style "notify-progressbar"
 {
-    GtkProgressBar::min-horizontal-bar-height = 4
-    xthickness   = 0
-    ythickness   = 0
-
-    fg[PRELIGHT] = "#000000"
-    bg[NORMAL]   = "#fefefe"
-    bg[SELECTED] = "#fefefe"
-    bg[ACTIVE]   = "#696969"
+    xthickness   = 1
+    ythickness   = 1
+
+    fg[PRELIGHT] = "#ddd"
+    bg[NORMAL]   = "#f1f1f1"
+    bg[SELECTED] = "#f1f1f1"
 
     engine "murrine" {
         gradient_shades = { 1.0, 1.0, 1.0, 1.0 }
-        contrast       = 0.5
-        border_shades  = { 0.9, 0.9 }
-        progressbarstyle    = 0
+        contrast       = 1.0
+        border_shades  = { 1.35, 1.35 }
+        trough_shades  = { 2.85, 3.25 }
+        trough_border_shades = { 1.1, 1.1 }
+        progressbarstyle = 0
+        roundness = 6
     }
 }
 
 class "XfceNotifyWindow" style "notify-window"
 widget "XfceNotifyWindow.*.summary" style "notify-summary"
-widget_class "XfceNotifyWindow.*<GtkButton>" style "notify-button"
+widget_class "XfceNotifyWindow.*GtkButton*" style "notify-button"
 widget_class "XfceNotifyWindow.*.<GtkLabel>" style "notify-text"
 widget_class "XfceNotifyWindow.*.<GtkProgress>" style "notify-progressbar"
 widget_class "XfceNotifyWindow.*.<GtkProgressBar>" style "notify-progressbar"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/greybird-geeko-theme-3.22.10.1+git35.86db55b/light/xfce-notify-4.0_bright/gtk.css
 
new/greybird-geeko-theme-3.22.10.1+git38.1a7574f/light/xfce-notify-4.0_bright/gtk.css
--- 
old/greybird-geeko-theme-3.22.10.1+git35.86db55b/light/xfce-notify-4.0_bright/gtk.css
       2019-07-09 15:22:45.000000000 +0200
+++ 
new/greybird-geeko-theme-3.22.10.1+git38.1a7574f/light/xfce-notify-4.0_bright/gtk.css
       1970-01-01 01:00:00.000000000 +0100
@@ -1,47 +0,0 @@
-#XfceNotifyWindow {
-    background-color: #f2f1f1;
-    color: #686868;
-    border: 1px solid shade(#f2f1f1, 0.6);
-}
-
-#XfceNotifyWindow button {
-    background-image: none;
-    background-color: #f2f1f1;
-    color: shade(#f2f1f1, 0.4);
-    border-color: shade(#f2f1f1, 0.6);
-    border-radius: 3px;
-}
-
-#XfceNotifyWindow button:hover {
-    background-color: shade(#f2f1f1, 0.9);
-}
-
-#XfceNotifyWindow button:active {
-    background-color: shade(#f2f1f1, 0.8);
-}
-
-#XfceNotifyWindow label#summary {
-    font-weight: bold;
-}
-
-#XfceNotifyWindow progressbar {
-    min-height: 6px;
-    border-radius: 3px;
-}
-
-#XfceNotifyWindow progressbar progress {
-    background-image: none;
-    background-color: #686868;
-    border: none;
-    box-shadow: none;
-}
-
-#XfceNotifyWindow progressbar trough {
-    background-image: linear-gradient(to bottom,
-                                      shade(#f2f1f1, 0.65),
-                                      shade(#f2f1f1, 1.25)
-                                      );
-    border: 1px solid shade(#f2f1f1, 0.2);
-    border-radius: 3px;
-    padding: 1px 0;
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/greybird-geeko-theme-3.22.10.1+git35.86db55b/light/xfce-notify-4.0_bright/gtkrc
 
new/greybird-geeko-theme-3.22.10.1+git38.1a7574f/light/xfce-notify-4.0_bright/gtkrc
--- 
old/greybird-geeko-theme-3.22.10.1+git35.86db55b/light/xfce-notify-4.0_bright/gtkrc
 2019-07-09 15:22:45.000000000 +0200
+++ 
new/greybird-geeko-theme-3.22.10.1+git38.1a7574f/light/xfce-notify-4.0_bright/gtkrc
 1970-01-01 01:00:00.000000000 +0100
@@ -1,75 +0,0 @@
-style "notify-window"
-
-{
-    XfceNotifyWindow::summary-bold = 1
-    XfceNotifyWindow::border-color = "#686868"
-    XfceNotifyWindow::border-color-hover = "#686868"
-    XfceNotifyWindow::border-radius = 10.0
-    XfceNotifyWindow::border-width = 0.5
-    XfceNotifyWindow::border-width-hover = 0.5
-    bg[NORMAL] = "#f2f1f1"
-    engine "murrine" {
-        textstyle = 1
-        text_shade = 1.1
-    }
-}
-
-style "notify-button"
-{
-    bg[NORMAL] = "#f1f1f1"
-    bg[PRELIGHT] = "#e4e4e4"
-    bg[ACTIVE] = "#ddd"
-    fg[NORMAL] = "#686868"
-    fg[PRELIGHT] = "#686868"
-    fg[ACTIVE] = "#000"
-    engine "murrine" {
-        gradient_shades = { 1.0, 1.0, 1.0, 1.0 }
-        border_shades   = { 1.15, 1.15 }
-        contrast = 1.0
-        roundness = 4
-        textstyle = 1
-        text_shade = 1.1
-    }
-}
-
-style "notify-text"
-{
-    fg[NORMAL] = "#686868"
-    fg[PRELIGHT] = "#000"
-    GtkWidget::link-color = "#a7a7a7"
-    engine "murrine" {
-        textstyle = 0
-    }
-}
-
-style "notify-summary"
-{
-    font_name = "Bold"
-}
-
-style "notify-progressbar"
-{
-    xthickness   = 1
-    ythickness   = 1
-
-    fg[PRELIGHT] = "#ddd"
-    bg[NORMAL]   = "#f1f1f1"
-    bg[SELECTED] = "#f1f1f1"
-
-    engine "murrine" {
-        gradient_shades = { 1.0, 1.0, 1.0, 1.0 }
-        contrast       = 1.0
-        border_shades  = { 1.35, 1.35 }
-        trough_shades  = { 2.85, 3.25 }
-        trough_border_shades = { 1.1, 1.1 }
-        progressbarstyle = 0
-        roundness = 6
-    }
-}
-
-class "XfceNotifyWindow" style "notify-window"
-widget "XfceNotifyWindow.*.summary" style "notify-summary"
-widget_class "XfceNotifyWindow.*GtkButton*" style "notify-button"
-widget_class "XfceNotifyWindow.*.<GtkLabel>" style "notify-text"
-widget_class "XfceNotifyWindow.*.<GtkProgress>" style "notify-progressbar"
-widget_class "XfceNotifyWindow.*.<GtkProgressBar>" style "notify-progressbar"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/greybird-geeko-theme-3.22.10.1+git35.86db55b/meson.build 
new/greybird-geeko-theme-3.22.10.1+git38.1a7574f/meson.build
--- old/greybird-geeko-theme-3.22.10.1+git35.86db55b/meson.build        
2019-07-09 15:22:45.000000000 +0200
+++ new/greybird-geeko-theme-3.22.10.1+git38.1a7574f/meson.build        
2019-07-16 16:46:45.000000000 +0200
@@ -11,5 +11,13 @@
 
 theme_deps = []
 
-subdir('light')
-subdir('dark')
\ No newline at end of file
+if get_option('flatpak')
+    if get_option('flatpak-variant') == 'light'
+        subdir('light')
+    elif get_option('flatpak-variant') == 'dark'
+        subdir('dark')
+    endif
+else
+    subdir('light')
+    subdir('dark')
+endif
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/greybird-geeko-theme-3.22.10.1+git35.86db55b/meson_options.txt 
new/greybird-geeko-theme-3.22.10.1+git38.1a7574f/meson_options.txt
--- old/greybird-geeko-theme-3.22.10.1+git35.86db55b/meson_options.txt  
2019-07-09 15:22:45.000000000 +0200
+++ new/greybird-geeko-theme-3.22.10.1+git38.1a7574f/meson_options.txt  
2019-07-16 16:46:45.000000000 +0200
@@ -1 +1,3 @@
-option('generate_sourcemaps', type: 'boolean', value: false)
\ No newline at end of file
+option('generate_sourcemaps', type: 'boolean', value: false)
+option('flatpak', type: 'boolean', value: false)
+option('flatpak-variant', type: 'combo', choices : ['light', 'dark'], value: 
'light')
\ No newline at end of file

++++++ greybird-geeko-theme.obsinfo ++++++
--- /var/tmp/diff_new_pack.KxplNG/_old  2019-07-17 14:27:11.831356674 +0200
+++ /var/tmp/diff_new_pack.KxplNG/_new  2019-07-17 14:27:11.831356674 +0200
@@ -1,5 +1,5 @@
 name: greybird-geeko-theme
-version: 3.22.10.1+git35.86db55b
-mtime: 1562678565
-commit: 86db55b9afa85b4d9d9f1161a5d5c914060c892a
+version: 3.22.10.1+git38.1a7574f
+mtime: 1563288405
+commit: 1a7574f241b6233d44c135a079cda89b80d2eed6
 


Reply via email to