From e34948774aa662bac92a06fc1a41a4f8cd15ceb8f4de9046699a62d6f6c720cc Mon Sep 17 00:00:00 2001
From: Yifan Jiang <yfjiang@suse.com>
Date: Wed, 18 Jan 2023 02:25:42 +0000
Subject: [PATCH] Accepting request 1044025 from
 home:polslinux:branches:X11:windowmanagers

- Update to 3.3.0:
  * Prevent a derefence of a null-Pixel in xftColor.
  * Add "getClass" and "setClass" commands to icesh.
  * Support tabs in task grouping.
  * Use spaces instead of dots when printing WM_COMMAND.
  * When a focused window hides or rolls up, focus some other window.
  * When looking for a focusable window, avoid rolled up windows.
  * Fix for setting focus on passive motif dialogs
  * Fallback to rolled up windows in the second pass of getLastFocus.
  * Use CurrentTime when setting focus to a passive client in the timeout.
  * On icon not found, report dimensions.
  * Don't refocus a focused window in focusLastWindow.
  * Don't activate an active window when receiving an activation message.
  * Ignore duplicate map requests.
  * Let icesh implicitly select windows at most once.
  * Add support for nanosvg for issue #695.
  * Add preference ToolTipIcon=1 for issue #637.
  * Add nanosvg to .gitignore.
  * Remove unneeded logevent from icesh.
- Remove unknown options from configure
- Rebase icewm-preferences.patch

OBS-URL: https://build.opensuse.org/request/show/1044025
OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/icewm?expand=0&rev=128
---
 icewm-3.2.2.tar.lz            |  3 ---
 icewm-3.3.0.tar.lz            |  3 +++
 icewm-desktop-nodisplay.patch | 10 +++++-----
 icewm-preferences.patch       | 14 +++++++-------
 icewm-susemenu.patch          | 18 +++++++++---------
 icewm.changes                 | 25 +++++++++++++++++++++++++
 icewm.spec                    | 11 ++---------
 7 files changed, 51 insertions(+), 33 deletions(-)
 delete mode 100644 icewm-3.2.2.tar.lz
 create mode 100644 icewm-3.3.0.tar.lz

diff --git a/icewm-3.2.2.tar.lz b/icewm-3.2.2.tar.lz
deleted file mode 100644
index e6794f7..0000000
--- a/icewm-3.2.2.tar.lz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:22d308846a4ba746df6b3212a00d23415ff2a4e96e54bae985a6f7f8d42d9b19
-size 1787950
diff --git a/icewm-3.3.0.tar.lz b/icewm-3.3.0.tar.lz
new file mode 100644
index 0000000..5e330d7
--- /dev/null
+++ b/icewm-3.3.0.tar.lz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f8dea2bc4f8648ee11fbcb3b7efe9162eebe0f9e33eb561f928eef9c72d97393
+size 1794714
diff --git a/icewm-desktop-nodisplay.patch b/icewm-desktop-nodisplay.patch
index b28f616..aaea322 100644
--- a/icewm-desktop-nodisplay.patch
+++ b/icewm-desktop-nodisplay.patch
@@ -1,8 +1,8 @@
-diff --git a/lib/icewm.desktop b/lib/icewm.desktop
-index 040e973..ecfea1f 100644
---- a/lib/icewm.desktop
-+++ b/lib/icewm.desktop
-@@ -20,7 +20,7 @@ Comment[uk]=Простий та швидкий менеджер вікон
+Index: icewm-3.3.0/lib/icewm.desktop
+===================================================================
+--- icewm-3.3.0.orig/lib/icewm.desktop
++++ icewm-3.3.0/lib/icewm.desktop
+@@ -20,7 +20,7 @@ Comment[uk]=Простий та швид
  Icon=icewm
  TryExec=/usr/bin/icewm
  Exec=/usr/bin/icewm
diff --git a/icewm-preferences.patch b/icewm-preferences.patch
index 89da8ce..deae350 100644
--- a/icewm-preferences.patch
+++ b/icewm-preferences.patch
@@ -13,10 +13,10 @@ a file generated by ./src/genpref. To edit the patch:
   vi lib/preferences
   quilt refresh
 ---
-Index: b/src/preferences
+Index: icewm-3.3.0/src/preferences
 ===================================================================
---- a/src/preferences
-+++ b/src/preferences
+--- icewm-3.3.0.orig/src/preferences
++++ icewm-3.3.0/src/preferences
 @@ -207,6 +207,7 @@
  
  #  Icon search path (colon separated)
@@ -25,7 +25,7 @@ Index: b/src/preferences
  
  #  Colon separated icon theme list with wildcard support. Minus prefix - can be used to exclude themes.
  # IconThemes="*:-HighContrast"
-@@ -474,6 +475,7 @@
+@@ -501,6 +502,7 @@
  
  #  Command to lock display/screensaver.
  # LockCommand=""
@@ -33,7 +33,7 @@ Index: b/src/preferences
  
  #  Command to cancel logout.
  # LogoutCancelCommand=""
-@@ -669,6 +671,7 @@
+@@ -702,6 +704,7 @@
  
  #  Command to reboot the system.
  # RebootCommand="test -e /run/systemd/system && systemctl reboot"
@@ -41,7 +41,7 @@ Index: b/src/preferences
  
  #  Send the clicks outside menus to target window.
  # ReplayMenuCancelClick=0 # 0/1
-@@ -738,6 +741,7 @@
+@@ -771,6 +774,7 @@
  
  #  Command to shutdown the system.
  # ShutdownCommand="test -e /run/systemd/system && systemctl poweroff"
@@ -49,7 +49,7 @@ Index: b/src/preferences
  
  #  Maximized windows can be resized.
  # SizeMaximized=0 # 0/1
-@@ -1437,18 +1441,21 @@ WorkspaceNames=" 1 ", " 2 ", " 3 ", " 4 "
+@@ -1473,18 +1477,21 @@ WorkspaceNames=" 1 ", " 2 ", " 3 ", " 4
  
  #  Display desktop background centered and not tiled.
  # DesktopBackgroundCenter=0 # 0/1
diff --git a/icewm-susemenu.patch b/icewm-susemenu.patch
index be609e5..ae1dd8e 100644
--- a/icewm-susemenu.patch
+++ b/icewm-susemenu.patch
@@ -1,7 +1,7 @@
-Index: icewm-2.9.7/lib/menu.in
+Index: icewm-3.3.0/lib/menu.in
 ===================================================================
---- icewm-2.9.7.orig/lib/menu.in
-+++ icewm-2.9.7/lib/menu.in
+--- icewm-3.3.0.orig/lib/menu.in
++++ icewm-3.3.0/lib/menu.in
 @@ -11,5 +11,6 @@ prog Firefox mozilla firefox
  prog Hexchat xchat hexchat
  prog Gimp gimp gimp
@@ -10,10 +10,10 @@ Index: icewm-2.9.7/lib/menu.in
 +#menufile Programs folder programs
  menufile Tool_bar folder toolbar
 +menuprog SUSE folder xdg_menu --format icewm
-Index: icewm-2.9.7/src/wmmenu.cc
+Index: icewm-3.3.0/src/wmmenu.cc
 ===================================================================
---- icewm-2.9.7.orig/src/wmmenu.cc
-+++ icewm-2.9.7/src/wmmenu.cc
+--- icewm-3.3.0.orig/src/wmmenu.cc
++++ icewm-3.3.0/src/wmmenu.cc
 @@ -294,6 +294,46 @@ char* MenuLoader::parseMenuProg(char *p,
      return p;
  }
@@ -71,10 +71,10 @@ Index: icewm-2.9.7/src/wmmenu.cc
          else if (!strcmp(word, "include")) {
              p = parseIncludeStatement(p, container);
          }
-Index: icewm-2.9.7/src/wmprog.h
+Index: icewm-3.3.0/src/wmprog.h
 ===================================================================
---- icewm-2.9.7.orig/src/wmprog.h
-+++ icewm-2.9.7/src/wmprog.h
+--- icewm-3.3.0.orig/src/wmprog.h
++++ icewm-3.3.0/src/wmprog.h
 @@ -30,6 +30,7 @@ private:
      char* parseAMenu(char *data, ObjectContainer *container);
      char* parseMenuFile(char *data, ObjectContainer *container);
diff --git a/icewm.changes b/icewm.changes
index 750c626..771b6dd 100644
--- a/icewm.changes
+++ b/icewm.changes
@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Wed Dec 21 07:35:06 UTC 2022 - Paolo Stivanin <info@paolostivanin.com>
+
+- Update to 3.3.0:
+  * Prevent a derefence of a null-Pixel in xftColor.
+  * Add "getClass" and "setClass" commands to icesh.
+  * Support tabs in task grouping.
+  * Use spaces instead of dots when printing WM_COMMAND.
+  * When a focused window hides or rolls up, focus some other window.
+  * When looking for a focusable window, avoid rolled up windows.
+  * Fix for setting focus on passive motif dialogs 
+  * Fallback to rolled up windows in the second pass of getLastFocus.
+  * Use CurrentTime when setting focus to a passive client in the timeout.
+  * On icon not found, report dimensions.
+  * Don't refocus a focused window in focusLastWindow.
+  * Don't activate an active window when receiving an activation message.
+  * Ignore duplicate map requests.
+  * Let icesh implicitly select windows at most once.
+  * Add support for nanosvg for issue #695.
+  * Add preference ToolTipIcon=1 for issue #637.
+  * Add nanosvg to .gitignore.
+  * Remove unneeded logevent from icesh.
+- Remove unknown options from configure 
+- Rebase icewm-preferences.patch
+
 -------------------------------------------------------------------
 Wed Nov 23 13:41:27 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/icewm.spec b/icewm.spec
index ce6bd36..e7719eb 100644
--- a/icewm.spec
+++ b/icewm.spec
@@ -18,7 +18,7 @@
 
 %global lites icewm icewmhint icewmbg icesh icewm-session
 Name:           icewm
-Version:        3.2.2
+Version:        3.3.0
 Release:        0
 Summary:        Window Manager with a Taskbar
 License:        LGPL-2.1-or-later
@@ -34,6 +34,7 @@ BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
+BuildRequires:  gettext-runtime >= 0.20.0
 BuildRequires:  libtool
 BuildRequires:  lzip
 BuildRequires:  pkgconfig
@@ -153,9 +154,6 @@ mailbox status, and a digital clock. It is fast and small.
 %patch1 -p1
 %patch2 -p1
 
-# Do not require needlessly new gettext.
-sed -i 's/0.19.6/0.18.3/g' configure.ac
-
 %build
 autoreconf -fi
 # Build the Lite version
@@ -164,13 +162,8 @@ autoreconf -fi
   --with-cfgdir=%{_sysconfdir}/icewm \
   --enable-i18n                      \
   --disable-nls                      \
-  --disable-guievents                \
-  --disable-winmenu                  \
   --without-icesound                 \
-  --enable-lite                      \
-  --enable-taskbar                   \
   --disable-menus-fdo                \
-  --disable-menus-mate               \
   --disable-fribidi
 %make_build
 # Grab the lite content.