Browse Source

icewm update to 1.6.4

Signed-off-by: guibuilder_pel7x64builder0 <guibuilder@powerel.org>
master
guibuilder_pel7x64builder0 5 years ago
parent
commit
ac2bcebe7e
  1. BIN
      SOURCES/Araita+.tar.bz2
  2. BIN
      SOURCES/Araita-Dark+.tar.bz2
  3. BIN
      SOURCES/IceClearlooks2-ColorsMas_theme_pack-0.8.tar.bz2
  4. BIN
      SOURCES/KDE-Core-20181026134422.tar.bz2
  5. BIN
      SOURCES/Windows7ice1.tar.xz
  6. BIN
      SOURCES/awesome-icewm.git60d40b8.tar.gz
  7. 23
      SOURCES/missing-ytimer-link.patch
  8. 141
      SPECS/icewm.spec

BIN
SOURCES/Araita+.tar.bz2

Binary file not shown.

BIN
SOURCES/Araita-Dark+.tar.bz2

Binary file not shown.

BIN
SOURCES/IceClearlooks2-ColorsMas_theme_pack-0.8.tar.bz2

Binary file not shown.

BIN
SOURCES/KDE-Core-20181026134422.tar.bz2

Binary file not shown.

BIN
SOURCES/Windows7ice1.tar.xz

Binary file not shown.

BIN
SOURCES/awesome-icewm.git60d40b8.tar.gz

Binary file not shown.

23
SOURCES/missing-ytimer-link.patch

@ -0,0 +1,23 @@ @@ -0,0 +1,23 @@
From 6b1721fec3e5608327e553c43f3fd8f761cb66a7 Mon Sep 17 00:00:00 2001
From: Nathan <ndowens04@gmail.com>
Date: Wed, 8 Jan 2020 06:07:40 +0000
Subject: [PATCH] Missing ytimer link

Closes: #6
---
src/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 56c78f26..31d6a42e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -505,7 +505,7 @@ ADD_EXECUTABLE(icewmhint${EXEEXT} icewmhint.cc ${MISC_SRCS})
target_compile_options(icewmhint${EXEEXT} PUBLIC ${CXXFLAGS_COMMON} ${icewm_pc_flags})
TARGET_LINK_LIBRARIES(icewmhint${EXEEXT} ${xext_LDFLAGS} ${x11_LDFLAGS} ${nls_LIBS} ${EXTRA_LIBS})
-ADD_EXECUTABLE(icesh${EXEEXT} icesh.cc misc.cc mstring.cc ref.cc yarray.cc)
+ADD_EXECUTABLE(icesh${EXEEXT} icesh.cc misc.cc mstring.cc ref.cc yarray.cc ytimer.cc)
target_compile_options(icesh${EXEEXT} PUBLIC ${CXXFLAGS_COMMON} ${icewm_pc_flags})
TARGET_LINK_LIBRARIES(icesh${EXEEXT} ${xext_LDFLAGS} ${xrandr_LDFLAGS} ${xinerama_LDFLAGS} ${x11_LDFLAGS} ${nls_LIBS} ${EXTRA_LIBS})

141
SPECS/icewm.spec

@ -1,5 +1,8 @@ @@ -1,5 +1,8 @@
# Autotools/CMake
%bcond_with fallback_build_tool

%if 0%{?fedora} || 0%{?rhel} >= 8
### Enable LTO
# Enable LTO
%global optflags %{optflags} -flto
%global build_ldflags %{build_ldflags} -flto
%endif
@ -8,40 +11,40 @@ @@ -8,40 +11,40 @@
%global awe_shortcommit %(c=%{awe_commit}; echo ${c:0:7})

Name: icewm
Version: 1.6.3
Version: 1.6.4
Release: 1%{?dist}
Summary: Window manager designed for speed, usability, and consistency

License: LGPLv2+
URL: https://github.com/bbidulock/icewm
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
URL: https://ice-wm.org/
Source0: https://github.com/ice-wm/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
Source1: https://github.com/tim77/awesome-%{name}/archive/%{awe_commit}/awesome-%{name}.git%{awe_shortcommit}.tar.gz

### Themes
## https://www.box-look.org/p/1310273/
# Themes
# * https://www.box-look.org/p/1310273/
Source10: IceClearlooks2-ColorsMas_theme_pack-0.8.tar.bz2

## https://www.box-look.org/p/1266477/
# * https://www.box-look.org/p/1266477/
Source12: KDE-Core-20181026134422.tar.bz2

## https://www.box-look.org/p/1163246/
# * https://www.box-look.org/p/1163246/
Source13: Windows7ice1.tar.xz

## https://www.box-look.org/p/1321163/
# * https://www.box-look.org/p/1321163/
Source14: Araita+.tar.bz2
Source15: Araita-Dark+.tar.bz2

### Better font rendering on non HiDPI screens
# Better font rendering on non HiDPI screens
Source20: local.conf
Source21: gtkrc-2.0
Source22: gkt3-settings.ini

Source30: %{name}-startup

### Wallpaper
# Wallpaper
Source40: %{name}-wallpaper.png

### 3rd party config files
# 3rd party config files
Source50: dunstrc
Source51: conky.conf

@ -49,12 +52,18 @@ Patch0: %{name}-keys.patch @@ -49,12 +52,18 @@ Patch0: %{name}-keys.patch
Patch1: %{name}-toolbar.patch
Patch2: %{name}-menu.patch

### Fallback build tool
# BuildRequires: automake
# BuildRequires: autoconf
# Missing library link
# * https://github.com/ice-wm/icewm/issues/6
Patch10: https://github.com/ice-wm/icewm/commit/6b1721fec3e5608327e553c43f3fd8f761cb66a7.patch#/missing-ytimer-link.patch

BuildRequires: asciidoc
%if %{with fallback_build_tool}
BuildRequires: automake
BuildRequires: autoconf
%else
BuildRequires: cmake3
%endif

BuildRequires: asciidoc
BuildRequires: gcc-c++
BuildRequires: intltool
BuildRequires: libtool
@ -92,22 +101,22 @@ Recommends: %{name}-themes = %{version}-%{release} @@ -92,22 +101,22 @@ Recommends: %{name}-themes = %{version}-%{release}
Recommends: %{name}-wallpaper
Recommends: abattis-cantarell-fonts

### Compositor for X11
# Compositor for X11
Recommends: compton-ng%{?_isa}

### Notification daemon
# Notification daemon
Recommends: dunst%{?_isa}

### Display resolution control
# Display resolution control
Recommends: lxrandr%{?_isa}

### Night mode
# Night mode
Recommends: redshift-gtk%{?_isa}

### Launcher
# Launcher
Recommends: rofi%{?_isa}

### Volume control
# Volume control
Recommends: volumeicon%{?_isa}

Recommends: conky%{?_isa}
@ -116,24 +125,24 @@ Recommends: gnome-terminal%{?_isa} @@ -116,24 +125,24 @@ Recommends: gnome-terminal%{?_isa}
Recommends: network-manager-applet%{?_isa}
Suggests: %{name}-minimal-session = %{version}-%{release}

### Various additional useful tools
## Screenshot
# Various additional useful tools
# * Screenshot
Suggests: deepin-screenshot%{?_isa}
Suggests: flameshot%{?_isa}

## Volume control
# * Volume control
Suggests: pasystray%{?_isa}
Suggests: pavucontrol%{?_isa}

## Graphical app launcher for X with minimal dependencies
# * Graphical app launcher for X with minimal dependencies
Suggests: xlunch%{?_isa}

## https://github.com/bbidulock/icewm/issues/379
# https://github.com/bbidulock/icewm/issues/379
Suggests: xterm%{?_isa}
%endif

%if 0%{?fedora}
### Screen brightness control (not available in EPEL8 yet)
# Screen brightness control (not available in EPEL8 yet)
Recommends: xbacklight%{?_isa}
%endif

@ -146,6 +155,7 @@ You can install minimal version of IceWM without all optional dependencies: @@ -146,6 +155,7 @@ You can install minimal version of IceWM without all optional dependencies:
sudo dnf install %{name}-minimal-session --setopt=install_weak_deps=False


# Data package
%package data
Summary: Data files for %{name}
BuildArch: noarch
@ -156,6 +166,7 @@ Requires: %{name} = %{version}-%{release} @@ -156,6 +166,7 @@ Requires: %{name} = %{version}-%{release}
Data files for %{name}.


# Themes package
%package themes
Summary: Extra themes for %{name}
BuildArch: noarch
@ -166,6 +177,7 @@ Requires: %{name} = %{version}-%{release} @@ -166,6 +177,7 @@ Requires: %{name} = %{version}-%{release}
Extra themes for %{name}.


# Minimal-session package
%package minimal-session
Summary: Minimal session for %{name}
BuildArch: noarch
@ -176,6 +188,7 @@ Requires: %{name} = %{version}-%{release} @@ -176,6 +188,7 @@ Requires: %{name} = %{version}-%{release}
Minimal, lightweight session for %{name}.


# Wallpaper package
%package wallpaper
Summary: Wallpaper for %{name}
BuildArch: noarch
@ -186,6 +199,7 @@ Requires: %{name} @@ -186,6 +199,7 @@ Requires: %{name}
Wallpaper for %{name}.


# Fonts-settings package
%package fonts-settings
Summary: Font settings and tweaks for %{name}
BuildArch: noarch
@ -196,6 +210,7 @@ Requires: %{name} = %{version}-%{release} @@ -196,6 +210,7 @@ Requires: %{name} = %{version}-%{release}
Font settings and tweaks for %{name}.


# 3rd-party-cfg package
%package 3rd-party-cfg
Summary: Config files for 3rd-party apps to play nicely with %{name}
BuildArch: noarch
@ -211,15 +226,17 @@ Various config files for 3rd-party apps to play nicely with %{name}. @@ -211,15 +226,17 @@ 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

### Tweak IceClearlooks2 theme
# Tweak IceClearlooks2 theme
sed -i 's!sans-serif:size=10!Cantarell:size=11!' IceClearlooks2*/*.theme
sed -i 's!MenuFontNameXft = Cantarell:size=11!MenuFontNameXft = Cantarell:size=10!' 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
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
@ -227,26 +244,30 @@ find Windows7ice1/. -type f -executable -exec chmod -x "{}" \; @@ -227,26 +244,30 @@ find Windows7ice1/. -type f -executable -exec chmod -x "{}" \;
%setup -q -D -T -a14
%setup -q -D -T -a15

### Tweak Araita theme
# Tweak Araita theme
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!22!16!' Araita*/*.theme
sed -i 's!#DesktopBackgroundImage= "/usr/share/wallpapers/default.jpg"!DesktopBackgroundImage= "%{_datadir}/backgrounds/%{name}-wallpaper.png"!' Araita*/*.theme
sed -i 's!#DesktopBackgroundImage= "/usr/share/wallpapers/default.jpg"!DesktopBackgroundImage= "%{_datadir}/backgrounds/%{name}-wallpaper.png"!' \
Araita*/*.theme

mkdir -p %{_target_platform}


%build
%if 0%{?fedora} || 0%{?rhel} >= 8
### Enable LTO
# Enable LTO
export AR=%{_bindir}/gcc-ar
export RANLIB=%{_bindir}/gcc-ranlib
export NM=%{_bindir}/gcc-nm
%endif

### Fallback build tool
# autoreconf -vif

%if %{with fallback_build_tool}
#./autogen.sh
autoreconf -fiv
%configure \
--with-xterm=%{_bindir}/gnome-terminal \
%else
pushd %{_target_platform}
%cmake3 \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
@ -256,28 +277,38 @@ pushd %{_target_platform} @@ -256,28 +277,38 @@ pushd %{_target_platform}
-DCONFIG_XPM=on \
-DXTERMCMD=%{_bindir}/gnome-terminal \
..
%make_build
popd
%endif

%if %{with fallback_build_tool}
%make_build
%else
%make_build -C %{_target_platform}
%endif


%install
%if %{with fallback_build_tool}
%make_install
%else
%make_install -C %{_target_platform}
%endif

### Themes
cp -a IceClearlooks2-* %{buildroot}%{_datadir}/%{name}/themes/
cp -ra awesome-%{name}-%{awe_commit}/themes/AntiX-collection/* %{buildroot}%{_datadir}/%{name}/themes/
cp -ra awesome-%{name}-%{awe_commit}/themes/IceAdwaita-* %{buildroot}%{_datadir}/%{name}/themes/
# Themes
cp -ap IceClearlooks2-* %{buildroot}%{_datadir}/%{name}/themes/
cp -rap awesome-%{name}-%{awe_commit}/themes/AntiX-collection/* %{buildroot}%{_datadir}/%{name}/themes/
cp -rap awesome-%{name}-%{awe_commit}/themes/IceAdwaita-* %{buildroot}%{_datadir}/%{name}/themes/
install -m 0644 -p awesome-%{name}-%{awe_commit}/distro-logos/fedora/icewm.xpm %{buildroot}%{_datadir}/%{name}/themes/IceAdwaita-Small/taskbar/icewm.xpm
install -m 0644 -p awesome-%{name}-%{awe_commit}/distro-logos/fedora/icewm-24.xpm %{buildroot}%{_datadir}/%{name}/themes/IceAdwaita-Medium/taskbar/icewm.xpm
install -m 0644 -p awesome-%{name}-%{awe_commit}/distro-logos/fedora/icewm-24.xpm %{buildroot}%{_datadir}/%{name}/themes/IceAdwaita-Dark-Medium-alpha/taskbar/icewm.xpm
install -m 0644 -p awesome-%{name}-%{awe_commit}/distro-logos/fedora/icewm-32.xpm %{buildroot}%{_datadir}/%{name}/themes/IceAdwaita-Large/taskbar/icewm.xpm
cp -a KDE-Core %{buildroot}%{_datadir}/%{name}/themes/
cp -a Windows7ice1 %{buildroot}%{_datadir}/%{name}/themes/
cp -a Araita+ %{buildroot}%{_datadir}/%{name}/themes/
cp -a Araita-Dark+ %{buildroot}%{_datadir}/%{name}/themes/
cp -ap KDE-Core %{buildroot}%{_datadir}/%{name}/themes/
cp -ap Windows7ice1 %{buildroot}%{_datadir}/%{name}/themes/
cp -ap Araita+ %{buildroot}%{_datadir}/%{name}/themes/
cp -ap Araita-Dark+ %{buildroot}%{_datadir}/%{name}/themes/
echo "Theme=\"IceAdwaita-Medium/default.theme\"" > %{buildroot}%{_datadir}/%{name}/theme

### Font settings
# Font settings
install -Dp -m 0644 %{SOURCE20} %{buildroot}%{_sysconfdir}/fonts/local.conf
install -Dp -m 0644 %{SOURCE21} %{buildroot}%{_sysconfdir}/gtk-2.0/gtkrc
install -Dp -m 0644 %{SOURCE22} %{buildroot}%{_sysconfdir}/gtk-3.0/settings.ini
@ -286,17 +317,17 @@ install -Dp -m 0755 %{SOURCE30} %{buildroot}%{_datadir}/%{name}/startup @@ -286,17 +317,17 @@ install -Dp -m 0755 %{SOURCE30} %{buildroot}%{_datadir}/%{name}/startup
install -Dp -m 0644 %{SOURCE40} %{buildroot}%{_datadir}/backgrounds/%{name}-wallpaper.png
%find_lang %{name}

### Tweak default settings
# Tweak default settings
sed -i 's!# TaskBarShowMailboxStatus=1 # 0/1!TaskBarShowMailboxStatus=0 # 0/1!' %{buildroot}%{_datadir}/%{name}/preferences
sed -i 's!# TaskBarShowCPUStatus=1 # 0/1!TaskBarShowCPUStatus=0 # 0/1!' %{buildroot}%{_datadir}/%{name}/preferences
sed -i 's!# TaskBarShowMEMStatus=1 # 0/1!TaskBarShowMEMStatus=0 # 0/1!' %{buildroot}%{_datadir}/%{name}/preferences
sed -i 's!# TaskBarShowNetStatus=1 # 0/1!TaskBarShowNetStatus=0 # 0/1!' %{buildroot}%{_datadir}/%{name}/preferences

### 3rd-party configs
# 3rd-party configs
install -Dp -m 0644 %{SOURCE50} %{buildroot}%{_sysconfdir}/xdg/dunst/dunstrc
install -Dp -m 0644 %{SOURCE51} %{buildroot}%{_sysconfdir}/xdg/conky/conky.conf

### Better default conky config
# Better default conky config
%post 3rd-party-cfg
install -m 0644 -p %{_sysconfdir}/xdg/conky/conky.conf %{_sysconfdir}/conky/conky.conf

@ -352,7 +383,7 @@ install -m 0644 -p %{_sysconfdir}/xdg/conky/conky.conf %{_sysconfdir}/conky/conk @@ -352,7 +383,7 @@ install -m 0644 -p %{_sysconfdir}/xdg/conky/conky.conf %{_sysconfdir}/conky/conk
%{_datadir}/%{name}/themes/win95/
%{_datadir}/%{name}/themes/Windows7ice1/

### AntiX-collection
# AntiX-collection
%{_datadir}/%{name}/themes/AntiX-*
%{_datadir}/%{name}/themes/Antix-*
%{_datadir}/%{name}/themes/blue-crystal-*
@ -391,12 +422,18 @@ install -m 0644 -p %{_sysconfdir}/xdg/conky/conky.conf %{_sysconfdir}/conky/conk @@ -391,12 +422,18 @@ install -m 0644 -p %{_sysconfdir}/xdg/conky/conky.conf %{_sysconfdir}/conky/conk


%changelog
* Thu Jan 09 2020 Artem Polishchuk <ego.cordatus@gmail.com> - 1.6.4-1
- Update to 1.6.4
- Switch source URL to 'github.com/ice-wm/icewm' due to release lags
https://github.com/bbidulock/icewm/issues/405
- Preserve timestamps during copying

* Mon Nov 25 2019 Artem Polishchuk <ego.cordatus@gmail.com> - 1.6.3-1
- Update to 1.6.3

* Sat Nov 23 2019 Artem Polishchuk <ego.cordatus@gmail.com> - 1.6.2-6
- Add patch fix: Anti-aliasing icon edges #392
- https://github.com/bbidulock/icewm/issues/392
- Add patch fix: Anti-aliasing icon edges
https://github.com/bbidulock/icewm/issues/392

* Wed Oct 16 2019 Artem Polishchuk <ego.cordatus@gmail.com> - 1.6.2-5
- Theme polishing and new themes

Loading…
Cancel
Save