diff --git a/icewm-default-theme.patch b/icewm-default-theme.patch deleted file mode 100644 index c3ca564..0000000 --- a/icewm-default-theme.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- a/IceClearlooks2-Magi/default.theme 2019-06-17 22:14:07.000000000 +0300 -+++ b/IceClearlooks2-Magi/default.theme 2019-06-23 00:30:36.917179000 +0300 -@@ -88,25 +88,25 @@ - - DesktopBackgroundColor = "#2854b0" - #DesktopBackgroundCenter=1 # 0 / 1 --#DesktopBackgroundScaled=1 # 0 / 1 --#DesktopBackgroundImage = "/home/ren/Imágenes/cafe70.jpg" -+DesktopBackgroundScaled=1 # 0 / 1 -+DesktopBackgroundImage = "/usr/share/backgrounds/icewm-wallpaper.png" - - --MenuFontNameXft = sans-serif:size=10 --NormalButtonFontNameXft = sans-serif:size=10 --ActiveButtonFontNameXft = sans-serif:size=10 --NormalWorkspaceFontNameXft = sans-serif:size=10 --ActiveWorkspaceFontNameXft = sans-serif:size=10 --NormalTaskBarFontNameXft = sans-serif:size=10 --ActiveTaskBarFontNameXft = sans-serif:size=10 --ToolTipFontNameXft = sans-serif:size=10 --ApmFontNameXft = sans-serif:size=10 --ClockFontNameXft = sans-serif:size=10 --TitleFontNameXft = sans-serif:size=10:bold --MinimizedWindowFontNameXft = sans-serif:size=10 --QuickSwitchFontNameXft = sans-serif:size=10 --ListBoxFontNameXft = sans-serif:size=10 --LabelFontNameXft = sans-serif:size=10 --InputFontNameXft = sans-serif:size=10 --ToolButtonFontNameXft = sans-serif:size=10 --StatusFontNameXft = sans-serif:size=10 -+MenuFontNameXft = Cantarell:size=10 -+NormalButtonFontNameXft = Cantarell:size=10 -+ActiveButtonFontNameXft = Cantarell:size=10 -+NormalWorkspaceFontNameXft = Cantarell:size=10 -+ActiveWorkspaceFontNameXft = Cantarell:size=10 -+NormalTaskBarFontNameXft = Cantarell:size=10 -+ActiveTaskBarFontNameXft = Cantarell:size=10 -+ToolTipFontNameXft = Cantarell:size=10 -+ApmFontNameXft = Cantarell:size=10 -+ClockFontNameXft = Cantarell:size=10 -+TitleFontNameXft = Cantarell:size=10:bold -+MinimizedWindowFontNameXft = Cantarell:size=10 -+QuickSwitchFontNameXft = Cantarell:size=10 -+ListBoxFontNameXft = Cantarell:size=10 -+LabelFontNameXft = Cantarell:size=10 -+InputFontNameXft = Cantarell:size=10 -+ToolButtonFontNameXft = Cantarell:size=10 -+StatusFontNameXft = Cantarell:size=10 diff --git a/icewm.spec b/icewm.spec index 10e449e..404c8b4 100644 --- a/icewm.spec +++ b/icewm.spec @@ -6,7 +6,7 @@ Name: icewm Version: 1.6.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Window manager designed for speed, usability, and consistency License: LGPLv2+ @@ -33,7 +33,6 @@ Source30: %{name}-startup Source40: %{name}-wallpaper.png Patch0: %{name}-keys.patch Patch1: %{name}-toolbar.patch -Patch2: %{name}-default-theme.patch # Replace xterm with another terminal emulator Patch10: %{url}/commit/1379799837147116fb2835dd452ce3f267f4eb73.diff @@ -169,11 +168,18 @@ Font settings and tweaks for %{name}. %patch1 -p1 %setup -q -D -T -a10 %setup -q -D -T -a11 -%patch2 -p1 +sed -i 's!sans-serif:size=10!Cantarell:size=11!' IceClearlooks2*/*.theme +sed -i 's!xmirs!xmis!' IceClearlooks2*/*.theme +sed -i 's!#DesktopBackgroundScaled=1 # 0 / 1!DesktopBackgroundScaled=1 # 0 / 1!' IceClearlooks2*/*.theme +sed -i 's!#DesktopBackgroundImage = "/home/ren/Imágenes/cafe70.jpg"!DesktopBackgroundImage = "%{_datadir}/backgrounds/%{name}-wallpaper.png"!' IceClearlooks2*/*.theme %setup -q -D -T -a12 %setup -q -D -T -a13 +find Windows7ice1/. -type f -executable -exec chmod -x "{}" \; %setup -q -D -T -a14 %setup -q -D -T -a15 +sed -i 's!carlito:size=12!Cantarell:size=11!' Araita*/*.theme +sed -i 's!carlito:size=13!Cantarell:size=11!' Araita*/*.theme +sed -i 's!#DesktopBackgroundImage= "/usr/share/wallpapers/default.jpg"!DesktopBackgroundImage= "%{_datadir}/backgrounds/%{name}-wallpaper.png"!' Araita*/*.theme mkdir -p %{_target_platform} %build @@ -284,6 +290,9 @@ install -Dpm0644 %{SOURCE40} %{buildroot}%{_datadir}/backgrounds/%{name}-wall %{_sysconfdir}/gtk-3.0/settings.ini %changelog +* Thu Sep 12 2019 Artem Polishchuk - 1.6.1-10 +- Minor theming fixes + * Wed Sep 11 2019 Artem Polishchuk - 1.6.1-9 - Add Araita theme - Add SVG support