diff --git a/SOURCES/icewm-keys.patch b/SOURCES/icewm-keys.patch index a28aaa6..7249138 100644 --- a/SOURCES/icewm-keys.patch +++ b/SOURCES/icewm-keys.patch @@ -1,31 +1,31 @@ ---- a/lib/keys.in 2019-09-18 19:52:15.000000000 +0300 -+++ b/lib/keys.in 2019-10-11 04:36:30.076380710 +0300 +--- a/lib/keys.in 2019-11-25 01:03:01.000000000 +0200 ++++ b/lib/keys.in 2019-11-25 04:29:49.863392314 +0200 @@ -9,12 +9,28 @@ # XF86. Valid modifiers are Alt, Ctrl, Shift, Meta, Super and Hyper. # - key "Alt+Ctrl+t" @XTERMCMD@ -+key "Super+r" rofi -show drun -+key "Super+s" gnome-screenshot -+# key "Super+s" deepin-screenshot -+# key "Super+s" flameshot gui -+key "Super+f" xdg-open /home -+key "Super+e" gedit -+key "Super+h" @XTERMCMD@ -- htop - key "Alt+Ctrl+b" xdg-open about:blank --key "Alt+Ctrl+s" xdg-open https://www.google.com -+# key "Alt+Ctrl+s" xdg-open https://www.google.com -+key "Super+Shift+p" poweroff -+key "Super+Shift+r" reboot -+key "Super+Shift+s" systemctl suspend + key "Alt+Ctrl+t" @XTERMCMD@ ++key "Super+r" rofi -show drun ++key "Super+s" gnome-screenshot ++# key "Super+s" deepin-screenshot ++# key "Super+s" flameshot gui ++key "Super+f" xdg-open /home ++key "Super+e" gedit ++key "Super+h" @XTERMCMD@ -- htop + key "Alt+Ctrl+b" xdg-open about:blank +-key "Alt+Ctrl+s" xdg-open https://www.google.com ++# key "Alt+Ctrl+s" xdg-open https://www.google.com ++key "Super+Shift+p" poweroff ++key "Super+Shift+r" reboot ++key "Super+Shift+s" systemctl suspend - key "Super+KP_Subtract" amixer sset Master 5%- - key "Super+KP_Add" amixer sset Master 5%+ + key "Super+KP_Subtract" amixer sset Master 5%- + key "Super+KP_Add" amixer sset Master 5%+ -+key "Super+q" amixer sset Master 5%- -+key "Super+w" amixer sset Master 5%+ ++key "Super+q" amixer sset Master 5%- ++key "Super+w" amixer sset Master 5%+ + -+key "XF86MonBrightnessDown" xbacklight -dec 1 -+key "XF86MonBrightnessUp" xbacklight -inc 1 ++key "XF86MonBrightnessDown" xbacklight -dec 1 ++key "XF86MonBrightnessUp" xbacklight -inc 1 + # "Multimedia key" bindings for Xorg. Gather the keycodes of your # advanced function keys by watching the output of the xev command whilest diff --git a/SPECS/icewm.spec b/SPECS/icewm.spec index fec8410..abef37d 100644 --- a/SPECS/icewm.spec +++ b/SPECS/icewm.spec @@ -8,8 +8,8 @@ %global awe_shortcommit %(c=%{awe_commit}; echo ${c:0:7}) Name: icewm -Version: 1.6.2 -Release: 6%{?dist} +Version: 1.6.3 +Release: 1%{?dist} Summary: Window manager designed for speed, usability, and consistency License: LGPLv2+ @@ -49,9 +49,6 @@ Patch0: %{name}-keys.patch Patch1: %{name}-toolbar.patch Patch2: %{name}-menu.patch -# https://github.com/bbidulock/icewm/issues/392 -Patch10: %{url}/commit/b48663e27682ba173743699909a8695c41dc7745.diff#/premultiply-colors-by-alpha-channel-when-xrender-for-#392.diff - ### Fallback build tool # BuildRequires: automake # BuildRequires: autoconf @@ -98,19 +95,12 @@ Recommends: abattis-cantarell-fonts ### Compositor for X11 Recommends: compton-ng%{?_isa} -Recommends: conky%{?_isa} - ### Notification daemon Recommends: dunst%{?_isa} -Recommends: gnome-screenshot%{?_isa} -Recommends: gnome-terminal%{?_isa} - ### Display resolution control Recommends: lxrandr%{?_isa} -Recommends: network-manager-applet%{?_isa} - ### Night mode Recommends: redshift-gtk%{?_isa} @@ -120,6 +110,10 @@ Recommends: rofi%{?_isa} ### Volume control Recommends: volumeicon%{?_isa} +Recommends: conky%{?_isa} +Recommends: gnome-screenshot%{?_isa} +Recommends: gnome-terminal%{?_isa} +Recommends: network-manager-applet%{?_isa} Suggests: %{name}-minimal-session = %{version}-%{release} ### Various additional useful tools @@ -217,7 +211,6 @@ Various config files for 3rd-party apps to play nicely with %{name}. %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch10 -p1 %setup -q -D -T -a1 %setup -q -D -T -a10 @@ -240,10 +233,6 @@ sed -i 's!carlito:size=13!Cantarell:size=11!' Araita*/*.theme sed -i 's!22!16!' Araita*/*.theme sed -i 's!#DesktopBackgroundImage= "/usr/share/wallpapers/default.jpg"!DesktopBackgroundImage= "%{_datadir}/backgrounds/%{name}-wallpaper.png"!' Araita*/*.theme -### Remove in next version -## https://github.com/bbidulock/icewm/issues/387 -sed -i 's/ IceWM.jpg//' lib/CMakeLists.txt - mkdir -p %{_target_platform} @@ -272,9 +261,7 @@ popd %install -pushd %{_target_platform} -%make_install -popd +%make_install -C %{_target_platform} ### Themes cp -a IceClearlooks2-* %{buildroot}%{_datadir}/%{name}/themes/ @@ -332,6 +319,7 @@ install -m 0644 -p %{_sysconfdir}/xdg/conky/conky.conf %{_sysconfdir}/conky/conk %{_mandir}/man*/* %files data +%{_datadir}/%{name}/IceWM.jpg %{_datadir}/%{name}/icons %{_datadir}/%{name}/keys %{_datadir}/%{name}/ledclock @@ -403,6 +391,9 @@ install -m 0644 -p %{_sysconfdir}/xdg/conky/conky.conf %{_sysconfdir}/conky/conk %changelog +* Mon Nov 25 2019 Artem Polishchuk - 1.6.3-1 +- Update to 1.6.3 + * Sat Nov 23 2019 Artem Polishchuk - 1.6.2-6 - Add patch fix: Anti-aliasing icon edges #392 - https://github.com/bbidulock/icewm/issues/392