D18287: Remove hardcoded /usr/share paths in install

2019-01-16 Thread Rik Mills 
rikmills added a comment.


  Build fails now on Kubuntu Cosim and Disco builds.
  
  
https://launchpadlibrarian.net/406558385/buildlog_ubuntu-disco-amd64.breeze-gtk_5.14.80+p19.04+git20190117.0641-0_BUILDING.txt.gz
  
  > make[3]: Leaving directory 
'/<>/breeze-gtk-5.14.80+p19.04+git20190117.0641/obj-x86_64-linux-gnu'
  >  make -f kconf_update/CMakeFiles/gtkbreeze5.5.dir/build.make 
kconf_update/CMakeFiles/gtkbreeze5.5.dir/build
  >  [ 25%] Generating ../Breeze-Dark/gtk-2.0/gtkrc, 
../Breeze-Dark/gtk-3.18/gtk.css, ../Breeze-Dark/gtk-3.20/gtk.css
  >  make[3]: Entering directory 
'/<>/breeze-gtk-5.14.80+p19.04+git20190117.0641/obj-x86_64-linux-gnu'
  >  cd /<>/breeze-gtk-5.14.80+p19.04+git20190117.0641/src && 
./build_theme.sh -c BreezeDark -t 
/<>/breeze-gtk-5.14.80+p19.04+git20190117.0641/obj-x86_64-linux-gnu/Breeze-Dark
 -r 
  >  [ 50%] Generating ../Breeze/gtk-2.0/gtkrc, ../Breeze/gtk-3.18/gtk.css, 
../Breeze/gtk-3.20/gtk.css, ../Breeze/gtk-3.18/gtk-dark.css, 
../Breeze/gtk-3.20/gtk-dark.css
  >  cd /<>/breeze-gtk-5.14.80+p19.04+git20190117.0641/src && 
./build_theme.sh -c Breeze -t 
/<>/breeze-gtk-5.14.80+p19.04+git20190117.0641/obj-x86_64-linux-gnu/Breeze
 -r 
  >  ./build_theme.sh: 88: shift: can't shift that many
  >  make[3]: *** [src/CMakeFiles/Breeze.dir/build.make:140: 
Breeze/gtk-2.0/gtkrc] Error 2
  >  make[3]: Leaving directory 
'/<>/breeze-gtk-5.14.80+p19.04+git20190117.0641/obj-x86_64-linux-gnu'
  >  make[2]: *** [CMakeFiles/Makefile2:151: src/CMakeFiles/Breeze.dir/all] 
Error 2
  >  make[2]: *** Waiting for unfinished jobs
  >  ./build_theme.sh: 88: shift: can't shift that many
  >  make[3]: *** [src/CMakeFiles/Breeze-Dark.dir/build.make:138: 
Breeze-Dark/gtk-2.0/gtkrc] Error 2
  >  make[3]: Leaving directory 
'/<>/breeze-gtk-5.14.80+p19.04+git20190117.0641/obj-x86_64-linux-gnu'
  >  make[2]: *** [CMakeFiles/Makefile2:188: 
src/CMakeFiles/Breeze-Dark.dir/all] Error 2

REPOSITORY
  R98 Breeze for Gtk

REVISION DETAIL
  https://phabricator.kde.org/D18287

To: davidedmundson, #plasma, zzag
Cc: rikmills, zzag, plasma-devel, jraleigh, GB_2, ragreen, Pitel, ZrenBot, 
lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart

D18287: Remove hardcoded /usr/share paths in install

2019-01-16 Thread David Edmundson 
This revision was automatically updated to reflect the committed changes.
Closed by commit R98:de20417d6d2e: Remove hardcoded /usr/share paths in install 
(authored by davidedmundson).

REPOSITORY
  R98 Breeze for Gtk

CHANGES SINCE LAST UPDATE
  https://phabricator.kde.org/D18287?vs=49620&id=49642

REVISION DETAIL
  https://phabricator.kde.org/D18287

AFFECTED FILES
  src/CMakeLists.txt
  src/build_theme.sh
  src/render_assets.py

To: davidedmundson, #plasma, zzag
Cc: zzag, plasma-devel, jraleigh, GB_2, ragreen, Pitel, ZrenBot, lesliezhai, 
ali-mohamed, jensreuterberg, abetts, sebas, apol, mart

D18287: Remove hardcoded /usr/share paths in install

2019-01-16 Thread David Edmundson 
davidedmundson updated this revision to Diff 49620.
davidedmundson added a comment.


  whitespace

REPOSITORY
  R98 Breeze for Gtk

CHANGES SINCE LAST UPDATE
  https://phabricator.kde.org/D18287?vs=49591&id=49620

BRANCH
  master

REVISION DETAIL
  https://phabricator.kde.org/D18287

AFFECTED FILES
  src/CMakeLists.txt
  src/build_theme.sh
  src/render_assets.py

To: davidedmundson, #plasma, zzag
Cc: zzag, plasma-devel, jraleigh, GB_2, ragreen, Pitel, ZrenBot, lesliezhai, 
ali-mohamed, jensreuterberg, abetts, sebas, apol, mart

D18287: Remove hardcoded /usr/share paths in install

2019-01-16 Thread Vlad Zagorodniy 
zzag accepted this revision.
zzag added inline comments.
This revision is now accepted and ready to land.

INLINE COMMENTS

> build_theme.sh:73
> +  echo "   empty, it is installed into"
>echo "  ~/.local/share/themes/THEME_NAME"
>exit 0

You forgot to indent this one. :-)

> build_theme.sh:91
>  
> +
>  if [ -z "${COLOR_SCHEME}" ]; then

Probably unrelated whitespace change.

REPOSITORY
  R98 Breeze for Gtk

BRANCH
  master

REVISION DETAIL
  https://phabricator.kde.org/D18287

To: davidedmundson, #plasma, zzag
Cc: zzag, plasma-devel, jraleigh, GB_2, ragreen, Pitel, ZrenBot, lesliezhai, 
ali-mohamed, jensreuterberg, abetts, sebas, apol, mart

D18287: Remove hardcoded /usr/share paths in install

2019-01-15 Thread David Edmundson 
davidedmundson created this revision.
davidedmundson added a reviewer: Plasma.
Herald added a project: Plasma.
Herald added a subscriber: plasma-devel.
davidedmundson requested review of this revision.

REVISION SUMMARY
  We can't assume where breeze color files are installed.
  
  If this was a user facing app we should use XDG_DATA_DIRS but as this is
  purely used as an install script it should use the data configured in
  the found breeze.
  
  There's still a tonne of hardcoded strings in the scripts, but at least
  they're now in paths we don't hit.

TEST PLAN
  Now builds on my machine.

REPOSITORY
  R98 Breeze for Gtk

BRANCH
  master

REVISION DETAIL
  https://phabricator.kde.org/D18287

AFFECTED FILES
  src/CMakeLists.txt
  src/build_theme.sh
  src/render_assets.py

To: davidedmundson, #plasma
Cc: plasma-devel, jraleigh, GB_2, ragreen, Pitel, ZrenBot, lesliezhai, 
ali-mohamed, jensreuterberg, abetts, sebas, apol, mart