Sync from SUSE:SLFO:1.1 icewm revision dd6c13c6862476a3dbabdd8678d08230

icewm-desktop-nodisplay.patch

@@ -1,8 +1,8 @@
-Index: icewm-3.4.3/lib/icewm.desktop
+Index: icewm-3.3.2/lib/icewm.desktop
 ===================================================================
---- icewm-3.4.3.orig/lib/icewm.desktop
+--- icewm-3.3.2.orig/lib/icewm.desktop
-+++ icewm-3.4.3/lib/icewm.desktop
++++ icewm-3.3.2/lib/icewm.desktop
-@@ -26,7 +26,7 @@ Comment[uk]=Простий та швид
+@@ -20,7 +20,7 @@ Comment[uk]=Простий та швид
  Icon=icewm
  TryExec=/usr/bin/icewm
  Exec=/usr/bin/icewm

icewm-preferences.patch

@@ -13,65 +13,60 @@ a file generated by ./src/genpref. To edit the patch:
   vi lib/preferences
   quilt refresh
 ---
-Index: icewm-3.4.3/src/preferences
+Index: icewm-3.3.0/src/preferences
 ===================================================================
---- a/src/preferences
+--- icewm-3.3.0.orig/src/preferences
-+++ b/src/preferences
++++ icewm-3.3.0/src/preferences
-@@ -212,7 +212,7 @@
+@@ -207,6 +207,7 @@
- # HorizontalEdgeSwitch=0 # 0/1
  
  #  Icon search path (colon separated)
--# IconPath="/usr/local/share/icons:/usr/local/share/pixmaps:/usr/share/icons:/usr/share/pixmaps:"
+ # IconPath="/usr/local/share/icons:/usr/local/share/pixmaps:/usr/share/icons:/usr/share/pixmaps:"
 +IconPath="/usr/share/icons/Adwaita/16x16/legacy:/usr/share/icons/Adwaita/16x16/apps:/usr/share/icons/hicolor:/usr/share/icons:/usr/share/pixmaps"
  
  #  Colon separated icon theme list with wildcard support. Minus prefix - can be used to exclude themes.
  # IconThemes="*:-HighContrast"
-@@ -506,7 +506,7 @@
+@@ -501,6 +502,7 @@
- # LimitSize=1 # 0/1
  
  #  Command to lock display/screensaver.
--# LockCommand=""
+ # LockCommand=""
 +LockCommand="xlock -mousemotion"
  
  #  Command to cancel logout.
  # LogoutCancelCommand=""
-@@ -707,7 +707,7 @@
+@@ -702,6 +704,7 @@
- # RaiseOnFocus=1 # 0/1
  
  #  Command to reboot the system.
--# RebootCommand="test -e /run/systemd/system && systemctl reboot || loginctl reboot"
+ # RebootCommand="test -e /run/systemd/system && systemctl reboot"
 +RebootCommand="/bin/sh -c 'systemctl reboot ||:'"
  
  #  Send the clicks outside menus to target window.
  # ReplayMenuCancelClick=0 # 0/1
-@@ -776,7 +776,7 @@
+@@ -771,6 +774,7 @@
- # ShowWorkspaceStatus=1 # 0/1
  
  #  Command to shutdown the system.
--# ShutdownCommand="test -e /run/systemd/system && systemctl poweroff || loginctl poweroff"
+ # ShutdownCommand="test -e /run/systemd/system && systemctl poweroff"
 +ShutdownCommand="/bin/sh -c 'systemctl poweroff ||:'"
  
  #  Maximized windows can be resized.
  # SizeMaximized=0 # 0/1
-@@ -1481,19 +1481,19 @@ WorkspaceNames=" 1 ", " 2 ", " 3 ", " 4
+@@ -1473,18 +1477,21 @@ WorkspaceNames=" 1 ", " 2 ", " 3 ", " 4
- # CycleBackgroundsPeriod=0 # [0-2147483647]
  
  #  Display desktop background centered and not tiled.
--# DesktopBackgroundCenter=0 # 0/1
+ # DesktopBackgroundCenter=0 # 0/1
 +DesktopBackgroundCenter=0 # 0/1
  
- #  Desktop background color(s), comma separated.
+ #  Desktop background color(s)
  # DesktopBackgroundColor=""
  
- #  Desktop background image(s), comma separated.
+ #  Desktop background image(s)
--# DesktopBackgroundImage=""
+ # DesktopBackgroundImage=""
 +DesktopBackgroundImage="BRANDING_PICTURE"
  
  #  Paint the background image over all multihead monitors combined.
  # DesktopBackgroundMultihead=0 # 0/1
  
  #  Resize desktop background to full screen.
--# DesktopBackgroundScaled=0 # 0/1
+ # DesktopBackgroundScaled=0 # 0/1
 +DesktopBackgroundScaled=1 # 0/1
  
  #  Color(s) to announce for semitransparent windows.

icewm.changes

@@ -1,157 +1,3 @@
--------------------------------------------------------------------
-Wed Oct  9 01:15:23 UTC 2024 - Xiaoguang Wang <xiaoguang.wang@suse.com>
-
-- Add explicit pkgconfig(librsvg-2.0) BuildRequires: Needed support
-  svg file (bsc#1222655).
-
--------------------------------------------------------------------
-Mon Jun 17 06:45:58 UTC 2024 - Paolo Stivanin <info@paolostivanin.com>
-
-- Update to 3.6.0:
-  * Support composing characters in the address bar with X input method.
-  * Double-click the border to maximize just that side of the window.
-  * Repeat the double-click to restore that side. Also for corners.
-  * Ignore duplicate requests from GNOME to move or resize a window.
-  * Restore the moving of windows by dragging with the right button down.
-  * Avoid constructing invalid work areas.
-  * Don't dispatch events to destroyed windows.
-  * Don't install mouse bindings when the frame is being destroyed.
-  * Don't create a Window handle for a destroyed or orphaned window.
-
--------------------------------------------------------------------
-Wed May 22 07:52:14 UTC 2024 - Paolo Stivanin <info@paolostivanin.com>
-
-- Update to 3.5.0:
-  * New -i,--install option installs an icewm-extra theme.
-  * Add file argument completion to the address bar.
-  * Add "cd" and "pwd" commands to the address bar.
-  * Improve tilde expansion on user login names.
-  * Document the 22 address bar editing keys.
-  * When lowering a frame by KeyWinLower, also lower it in the focus order.
-  * Keyboard layout icon names can now be longer than 2 letters.
-  * Don't use XSendEvent for internal WM actions, but use XPutBack.
-  * When focusing a client, clear urgency and stop flashing.
-  * When the frame drops urgency, also update the client.
-  * Let "icesh restore" also clear the urgency flag.
-  * Several small documentation improvements.
-
--------------------------------------------------------------------
-Thu Apr 18 16:58:08 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
-
-- Do not recommends icewm-lang: the -lang package has already more
-  sophisticated supplements. The various sub-packages require
-  icewm, and thus get the supplements satisfied indirectly.
-
--------------------------------------------------------------------
-Tue Apr 16 08:39:00 UTC 2024 - Bernhard Wiedemann <bwiedemann@suse.com>
-
-- Change DesktopBackgroundImage from .jpg to .png (boo#1222877)
-
--------------------------------------------------------------------
-Mon Feb 26 16:04:51 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
-
-- Use %patch -P N instead of deprecated %patchN.
-
--------------------------------------------------------------------
-Thu Dec 28 22:45:13 UTC 2023 - Sean Lewis <seanlew@opensuse.org>
-
-- Update to 3.4.5:
-  * Fix for centering the clock LED digits vertically
-  * Fix the KeyWinTile commands for multi-mon setups
-  * Fix the workspace buttons for right-to-left languages
-
-
--------------------------------------------------------------------
-Sat Nov 25 20:17:40 UTC 2023 - Dirk Müller <dmueller@suse.com>
-
-- update to 3.4.4:
-  * Use fcsmart for capturing loadText data.
-  * Support TIFF and WEBP in icewmbg.
-  * More permissive parsing of a PAM image header in icesh.
-  * Remove obsolete winoption examples and add one for
-    plank.
-  * Use --disable-librsvg instead of --disable-rsvg.
-  * Add `supportsFormat` to check for support of additional
-    image formats.
-  * Support JXL, JP2, RAW, SVG, TGA image formats in
-    icewmbg.
-  * Test if a color can be considered dark for issue #715.
-  * Brighten the color of inactive preview icons for dark
-    themes for issue
-  * Fix a crash when a ping timeout dialog is destroyed for
-    issue #729.
-  * Let icewmbg interpret command-line arguments relative
-    to the current working directory.
-  * Clarify prefoverride and closes #750
-  * When mapping a client by PID, search for the best
-    match.
-  * Don't enforce the use of clang++ in the debug build.
-  * Fix ordering in the 4th configuration
-  * Fix minor warnings from recent CMake and GCC
-  * Translated using Weblate (Portuguese (Brazil))
-
--------------------------------------------------------------------
-Sun Oct 22 14:23:19 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
-
-- Drop pkgconfig(gdk-pixbuf-xlib-2.0) BuildRequires: No longer
-  needed nor used (in our case, we use the new default Imlib2).
-- Add explicit pkgconfig(gdk-pixbuf-2.0) BuildRequires: Needed to
-  build {_bindir}/icewm-menu-fdo.
-
--------------------------------------------------------------------
-Tue Oct  3 09:26:20 UTC 2023 - Paolo Stivanin <info@paolostivanin.com>
-
-- Update to version 3.4.3:
-  * New preference "TaskBarShowWindowTitles" for icon-only task buttons.
-  * New winoption "doNotManage" to workaround bugs in picom for plank.
-  * When a battery has no data about full charge, use the capacity.
-  * When cascading windows, include the border size in the displacement.
-  * Let icewmbg interpret command-line file arguments relative to $PWD.
-  * Add a -f,--fork option to icewmbg to detach it from the terminal.
-  * Fix the Window List Menu for #144.
-  * Fix restoring from fullscreen with F11 in chromium for #141.
-  * Support tabs in the Window List Menu.
-  * Control the terminal in icewm-menu-fdo by option or environment.
-  * Let icewm-menu-fdo use a list of default terminals to choose from.
-- Drop unknown config options:
-  * --enable-guievents
-  * --enable-antialiasing
-  * --enable-gradients
-  * --enable-shaped-decorations
-
--------------------------------------------------------------------
-Mon Jun  5 10:19:21 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
-
-- Update to version 3.4.0:
-  * Features:
-    - Support keybindings to shifted keys for issue #134.
-    - Support keybindings to literal Latin-1 characters.
-    - Support all UTF-8 code points in keybindings.
-  * Fixes:
-    - Fix for a map request from an unmanaged client for
-      bbidulock/icewm#734.
-    - When the keyboard layout changes, reparse the key bindings.
-  * Changes:
-    - Update the manpage for "icewm-keys".
-    - Updated translations.
-
--------------------------------------------------------------------
-Thu May 18 12:51:20 UTC 2023 - Paolo Stivanin <info@paolostivanin.com>
-
-- Update to 3.3.5:
-  * Lookup icons in more context directories for issue ice-wm/icewm#132.
-  * An Escape key release event must match the key press event for #726.
-  * Report when icon could not be found for issue ice-wm/icewm#133.
-  * Use "firefox" instead of "mozilla" as Firefox icon for ice-wm/icewm#132.
-  * Rescale workspace buttons when taskbar is rather high.
-  * Temporarily hide the taskbar collapse button when collapsing or expanding.
-  * Compute the ultimate workspace button height, before creating them.
-  * Limit the resource string of an unresponsive client for issue #729.
-  * Check for TaskBarDoubleHeight when computing workspace button height.
-  * Also focus last window when hiding and Click-to-focus for issue #727.
-  * Let icesh exit with zero if the last action was a successful manager
-    action.
-
 -------------------------------------------------------------------
 Thu May  4 07:17:39 UTC 2023 - Paolo Stivanin <info@paolostivanin.com>
 

icewm.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package icewm
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 %global lites icewm icewmhint icewmbg icesh icewm-session
 Name:           icewm
-Version:        3.6.0
+Version:        3.3.4
 Release:        0
 Summary:        Window Manager with a Taskbar
 License:        LGPL-2.1-or-later
@@ -43,10 +43,9 @@ BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  pkgconfig(fribidi)
-BuildRequires:  pkgconfig(gdk-pixbuf-2.0)
+BuildRequires:  pkgconfig(gdk-pixbuf-xlib-2.0)
 BuildRequires:  pkgconfig(ice)
 BuildRequires:  pkgconfig(imlib2)
-BuildRequires:  pkgconfig(librsvg-2.0)
 BuildRequires:  pkgconfig(sm)
 BuildRequires:  pkgconfig(sndfile)
 BuildRequires:  pkgconfig(x11)
@@ -64,9 +63,10 @@ Requires:       icewm-bin
 Requires:       imlib2-loaders
 Requires:       xdg-menu
 Requires(post): update-alternatives
-Requires(postun): update-alternatives
+Requires(postun):update-alternatives
 # If you have the choice, prefer the big one.
 Recommends:     icewm-default
+Recommends:     icewm-lang = %{version}
 Recommends:     xclock
 # For locking you need xscreensaver
 Recommends:     xscreensaver
@@ -122,6 +122,7 @@ Group:          System/GUI/Other
 Requires:       adwaita-icon-theme
 Requires:       icewm
 Requires:       update-alternatives
+Recommends:     icewm-lang
 Provides:       icewm-bin
 
 %description default
@@ -136,6 +137,7 @@ Summary:        Window Manager with a Taskbar -- Lite Version
 Group:          System/GUI/Other
 Requires:       icewm
 Requires:       update-alternatives
+Recommends:     icewm-lang
 Provides:       icewm-bin
 
 %description lite
@@ -149,8 +151,8 @@ mailbox status, and a digital clock. It is fast and small.
 
 %prep
 %setup -q
-%patch -P 1 -p1
+%patch1 -p1
-%patch -P 2 -p1
+%patch2 -p1
 
 %build
 autoreconf -fi
@@ -179,6 +181,10 @@ done
   --enable-i18n                      \
   --enable-nls                       \
   --enable-corefonts                 \
+  --enable-guievents                 \
+  --enable-antialiasing              \
+  --enable-gradients                 \
+  --enable-shaped-decorations        \
   --enable-menus-fdo                 \
   --enable-i18n
 %make_build
@@ -188,7 +194,7 @@ patch -p1 -i %{PATCH99}
 # And use proper branding
 wallpaper="openSUSEdefault"
 sed -i \
-    -e "s:BRANDING_PICTURE:%{_datadir}/wallpapers/$wallpaper/contents/images/1920x1080.png:" \
+    -e "s:BRANDING_PICTURE:%{_datadir}/wallpapers/$wallpaper/contents/images/1920x1080.jpg:" \
     src/preferences
 %endif