From b298d11d917e00ab964056e744fd15d19428454b Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Sep 11 2019 23:19:25 +0000 Subject: Add Araita theme Add SVG support Replace 'xterm' with 'gnome-terminal' Spec file and packaging fixes Switch to CMake --- diff --git a/.gitignore b/.gitignore index a46b341..34187b0 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ icewm-1.2.37.tar.gz /Windows7ice1.tar.xz /icewm-1.6.1.tar.gz /icewm-fedora.tar.xz +/Araita+.tar.bz2 +/Araita-Dark+.tar.bz2 diff --git a/1379799837147116fb2835dd452ce3f267f4eb73.diff b/1379799837147116fb2835dd452ce3f267f4eb73.diff new file mode 100644 index 0000000..f10c565 --- /dev/null +++ b/1379799837147116fb2835dd452ce3f267f4eb73.diff @@ -0,0 +1,46 @@ +diff --git a/configure.ac b/configure.ac +index a8fc8324..13bfa66d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -406,6 +406,9 @@ AC_ARG_WITH([theme], + with_theme="default/default.theme") + AC_DEFINE_UNQUOTED([CONFIG_DEFAULT_THEME], + "${with_theme}",[Name of default theme]) ++AC_ARG_WITH([xterm], ++ AC_HELP_STRING([--with-xterm=xterm],[Default X11 terminal emulator for X11]), ++ [AC_DEFINE_UNQUOTED([XTERMCMD],"$with_xterm",[Name of terminal emulator.])]) + + AC_DEFINE_UNQUOTED([HOSTOS],["${host_os}"], + [Define to the host operating system.]) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 88227162..40a28e35 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -81,6 +81,7 @@ IF("" STREQUAL "${CONFIG_UNICODE_SET}") + ELSE() + MESSAGE(STATUS "Configured custom unicode set: ${CONFIG_UNICODE_SET}.") + ENDIF() ++SET(XTERMCMD "" CACHE STRING "Default terminal emulator for X11") + + # TODO: find some common helper to handle that variables + if(ENABLE_NLS OR CONFIG_I18N) +@@ -523,7 +524,6 @@ foreach (_variableName + CONFIG_XPM + CONFIG_LIBJPEG + CONFIG_LIBPNG +- CONFIG_RENDER + CONFIG_XFREETYPE + CONFIG_COREFONTS + CONFIG_FRIBIDI +diff --git a/src/config.cmake.h.in b/src/config.cmake.h.in +index d43ccbc8..8ce3ee0d 100644 +--- a/src/config.cmake.h.in ++++ b/src/config.cmake.h.in +@@ -119,6 +119,7 @@ + #cmakedefine XINERAMA 1 + #cmakedefine CONFIG_FRIBIDI 1 + #cmakedefine DEBUG 1 ++#cmakedefine XTERMCMD @XTERMCMD@ + + #define CONFIG_DEFAULT_THEME "@CONFIG_DEFAULT_THEME@" + diff --git a/icewm-startup b/icewm-startup new file mode 100755 index 0000000..98437bd --- /dev/null +++ b/icewm-startup @@ -0,0 +1,19 @@ +#!/usr/bin/bash + +sleep 1 && + +## Compositor (lite and safe mode) +#compton -cC -r 20 -l -20 -t -20 -o 0.8 & +## Compositor +#compton --backend glx --glx-no-stencil -cC -r 20 -l -20 -t -20 -o 0.8 & +## Compositor (with blur) +#compton --backend glx --glx-no-stencil --blur-background --blur-kern 7x7box -cC -r 20 -l -20 -t -20 -o 0.8 & + +nm-applet & +pasystray & +redshift-gtk & + +#evolution & +#gwe & +#telegram-desktop & +#workrave & diff --git a/icewm.spec b/icewm.spec index afde337..10e449e 100644 --- a/icewm.spec +++ b/icewm.spec @@ -1,40 +1,48 @@ -# Enable LTO %if 0%{?fedora} || 0%{?rhel} >= 8 +# Enable LTO %global optflags %{optflags} -flto %global build_ldflags %{build_ldflags} -flto %endif Name: icewm Version: 1.6.1 -Release: 4%{?dist} +Release: 9%{?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 +# --- Themes --- # https://www.box-look.org/p/1310273/ -Source1: IceClearlooks2-ColorsMas_theme_pack-0.8.tar.bz2 +Source10: IceClearlooks2-ColorsMas_theme_pack-0.8.tar.bz2 Source11: %{name}-fedora.tar.xz # https://www.box-look.org/p/1266477/ -Source2: KDE-Core-20181026134422.tar.bz2 +Source12: KDE-Core-20181026134422.tar.bz2 # https://www.box-look.org/p/1163246/ -Source3: Windows7ice1.tar.xz +Source13: Windows7ice1.tar.xz +# https://www.box-look.org/p/1321163/ +Source14: Araita+.tar.bz2 +Source15: Araita-Dark+.tar.bz2 # Better font rendering on non HiDPI screens -Source4: local.conf -Source41: gtkrc-2.0 -Source42: gkt3-settings.ini +Source20: local.conf +Source21: gtkrc-2.0 +Source22: gkt3-settings.ini -Source5: startup +Source30: %{name}-startup # Wallpaper -Source6: %{name}-wallpaper.png +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 + +# Fallback build tool +#BuildRequires: automake +#BuildRequires: autoconf -BuildRequires: cmake -BuildRequires: automake BuildRequires: asciidoc -BuildRequires: autoconf +BuildRequires: cmake3 BuildRequires: gcc-c++ BuildRequires: intltool BuildRequires: libtool @@ -45,6 +53,7 @@ BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(ao) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(fribidi) +BuildRequires: pkgconfig(gdk-pixbuf-xlib-2.0) BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(librsvg-2.0) @@ -70,7 +79,7 @@ Recommends: %{name}-themes = %{version}-%{release} Recommends: %{name}-wallpaper Recommends: abattis-cantarell-fonts # Compositor for X11 -Recommends: compton%{?_isa} +Recommends: compton-ng%{?_isa} Recommends: gnome-screenshot%{?_isa} Recommends: gnome-terminal%{?_isa} @@ -85,17 +94,23 @@ Recommends: pavucontrol%{?_isa} Recommends: redshift-gtk%{?_isa} # Launcher Recommends: rofi%{?_isa} -# https://github.com/bbidulock/icewm/issues/379 -Recommends: xterm%{?_isa} -Suggests: %{name}-minimal-session -# Various additional useful tools +Suggests: %{name}-minimal-session = %{version}-%{release} +# --- Various additional useful tools --- Suggests: deepin-screenshot%{?_isa} +# Graphical app launcher for X with minimal dependencies +Suggests: xlunch%{?_isa} +# https://github.com/bbidulock/icewm/issues/379 +Suggests: xterm%{?_isa} %endif %description IceWM is a window manager for the X Window System (freedesktop, XFree86). The goal of IceWM is speed, simplicity, and not getting in the user's way. +You can install minimal version of IceWM without all optional dependencies: + + sudo dnf install %{name}-minimal-session --setopt=install_weak_deps=False + %package data BuildArch: noarch @@ -131,7 +146,7 @@ Minimal, lightweight session for %{name}. BuildArch: noarch Summary: Wallpaper for %{name} -Requires: %{name} = %{version}-%{release} +Requires: %{name} %description wallpaper Wallpaper for %{name}. @@ -149,38 +164,58 @@ Font settings and tweaks for %{name}. %prep %setup -q +%patch10 -p1 %patch0 -p1 %patch1 -p1 -%setup -q -D -T -a1 +%setup -q -D -T -a10 %setup -q -D -T -a11 %patch2 -p1 -%setup -q -D -T -a2 -%setup -q -D -T -a3 +%setup -q -D -T -a12 +%setup -q -D -T -a13 +%setup -q -D -T -a14 +%setup -q -D -T -a15 +mkdir -p %{_target_platform} %build +%if 0%{?fedora} || 0%{?rhel} >= 8 # Enable LTO export AR=%{_bindir}/gcc-ar export RANLIB=%{_bindir}/gcc-ranlib export NM=%{_bindir}/gcc-nm +%endif -autoreconf -vif -%configure --with-cfgdir=%{_sysconfdir}/%{name} +# Fallback build tool +#autoreconf -vif + +pushd %{_target_platform} +%cmake3 \ + -DCONFIG_GDK_PIXBUF_XLIB=on \ + -DCONFIG_LIBPNG=off \ + -DCONFIG_LIBRSVG=on \ + -DCONFIG_XPM=off \ + -DXTERMCMD=%{_bindir}/gnome-terminal \ + .. %make_build %install +pushd %{_target_platform} %make_install +popd +# Themes cp -a IceClearlooks2-* %{buildroot}%{_datadir}/%{name}/themes/ cp -rfa icewm-fedora/themes %{buildroot}%{_datadir}/%{name}/ 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/ echo "Theme=\"IceClearlooks2-Magi/default.theme\"" > %{buildroot}%{_datadir}/%{name}/theme # Font settings -install -Dpm0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/fonts/local.conf -install -Dpm0644 %{SOURCE41} %{buildroot}%{_sysconfdir}/gtk-2.0/gtkrc -install -Dpm0644 %{SOURCE42} %{buildroot}%{_sysconfdir}/gtk-3.0/settings.ini +install -Dpm0644 %{SOURCE20} %{buildroot}%{_sysconfdir}/fonts/local.conf +install -Dpm0644 %{SOURCE21} %{buildroot}%{_sysconfdir}/gtk-2.0/gtkrc +install -Dpm0644 %{SOURCE22} %{buildroot}%{_sysconfdir}/gtk-3.0/settings.ini -install -Dpm0755 %{SOURCE5} %{buildroot}%{_datadir}/%{name}/startup -install -Dpm0644 %{SOURCE6} %{buildroot}%{_datadir}/backgrounds/%{name}-wallpaper.png +install -Dpm0755 %{SOURCE30} %{buildroot}%{_datadir}/%{name}/startup +install -Dpm0644 %{SOURCE40} %{buildroot}%{_datadir}/backgrounds/%{name}-wallpaper.png %find_lang %{name} %files -f %{name}.lang @@ -200,7 +235,7 @@ install -Dpm0644 %{SOURCE6} %{buildroot}%{_datadir}/backgrounds/%{name}-wall %{_datadir}/xsessions/%{name}-session.desktop %{_mandir}/man*/*.* -%files data -f %{name}.lang +%files data %{_datadir}/%{name}/icons %{_datadir}/%{name}/keys %{_datadir}/%{name}/ledclock @@ -218,7 +253,9 @@ install -Dpm0644 %{SOURCE6} %{buildroot}%{_datadir}/backgrounds/%{name}-wall %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/themes -%files themes -f %{name}.lang +%files themes +%{_datadir}/%{name}/themes/Araita+ +%{_datadir}/%{name}/themes/Araita-Dark+ %{_datadir}/%{name}/themes/CrystalBlue %{_datadir}/%{name}/themes/Helix %{_datadir}/%{name}/themes/IceClearlooks2-Debish @@ -247,6 +284,13 @@ install -Dpm0644 %{SOURCE6} %{buildroot}%{_datadir}/backgrounds/%{name}-wall %{_sysconfdir}/gtk-3.0/settings.ini %changelog +* Wed Sep 11 2019 Artem Polishchuk - 1.6.1-9 +- Add Araita theme +- Add SVG support +- Replace 'xterm' with 'gnome-terminal' +- Spec file and packaging fixes +- Switch to CMake + * Thu Aug 22 2019 Artem Polishchuk - 1.6.1-4 - Update to 1.6.1 - Thanks to Sergio Cipolla for help diff --git a/sources b/sources index 75f636e..5d82b55 100644 --- a/sources +++ b/sources @@ -1,3 +1,5 @@ +SHA512 (Araita+.tar.bz2) = 587addc5c4d8d23cba759bd768abdb7351b3043df2de069bc278ea369b4e813459d9ca209f31168960094f1f7959e0fabfefae20efeee2db43716a061e3787a8 +SHA512 (Araita-Dark+.tar.bz2) = a263190dd4ab1362621358fea58fe1774351c7bd3ff0f6e75aba8fca1ab9da32585e4916acb71f51d2a15d3c3a5633d1aa597775ff884fb8f6bbbe116b991702 SHA512 (IceClearlooks2-ColorsMas_theme_pack-0.8.tar.bz2) = 3c79f2914135ea9074876e6e05e7c8b770faa131bb9c8b7b68659129f57360b6f744efaa0022ac01ffb4ebba694b0a8764bc336c1ca59b2e5f70dc2568658426 SHA512 (KDE-Core-20181026134422.tar.bz2) = a946637167385893fefc01a0725fab2262a9a74d686070f68125dd0c297abf7dfda0808c0a48f0d53acb9a6ef0650927c778e46708b267975708909e118a27ab SHA512 (Windows7ice1.tar.xz) = c02ccf8a74c54488571654a319247311abde1db906ba65882d43144b376f6700d107be2af2475e54d2b6078ef3bd1fdafa2b42808e467a5eeb8f074a211e44b9 diff --git a/startup b/startup deleted file mode 100755 index 764bfa5..0000000 --- a/startup +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -sleep 1 && - -## Compositor (lite and safe mode) -# compton -cC -r 6 -l -8 -t -8 -o 0.3 & -## Compositor -# compton --backend glx --glx-no-stencil -cC -r 6 -l -8 -t -8 -o 0.3 & -## Compositor (with blur) -# compton --backend glx --glx-no-stencil --blur-background --blur-kern 7x7box -cC -r 6 -l -8 -t -8 -o 0.3 & - -nm-applet & -pasystray & -redshift-gtk & - -# evolution & -# gwe & -# telegram-desktop & -# workrave &