Accepting request 1226203 from X11:windowmanagers

OBS-URL: https://build.opensuse.org/request/show/1226203
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/WindowMaker?expand=0&rev=49

WindowMaker-0.95.9.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f22358ff60301670e1e2b502faad0f2da7ff8976632d538f95fe4638e9c6b714
-size 3397167

WindowMaker-0.96.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4fe130ba23cf4aa21c156ec8f01f748df537d0604ec06c6bbcec896df1926f6d
+size 3443048

WindowMaker-config.patch

@@ -276,7 +276,7 @@ Index: util/wmaker.inst.in
 ===================================================================
 --- util/wmaker.inst.in.orig
 +++ util/wmaker.inst.in
-@@ -276,41 +276,41 @@ echo "    $GSDIR/Library/WindowMaker/$in
+@@ -256,19 +256,19 @@ echo "    $GSDIR/Library/WindowMaker/$in
  }
  
  wmaker_found=0
@@ -309,43 +309,3 @@ Index: util/wmaker.inst.in
  
  
  trap "show_end_message;exit" 2
- 
--echo
--echo "Now the .xinitrc, .Xclients or .xsession script must be updated so that"
--echo "it calls wmaker when you start an X session."
--echo "Type the name of the file that must be changed (normally .xinitrc)."
--echo "If the file already exists, it will be backed up with a .old.$DATE "
--echo "extension"
--echo "If you want to edit it by hand, hit <Control>-C now."
--read file
--
--if test "x$file" = "x"; then
--	echo "Using .xinitrc as a default value"
--	file=.xinitrc
--fi
--
--if [ -f "$USERDIR/$file" ]; then
--	mv "$USERDIR/$file" "$USERDIR/$file.old.$DATE"
--fi
-+#echo
-+#echo "Now the .xinitrc, .Xclients or .xsession script must be updated so that"
-+#echo "it calls wmaker when you start an X session."
-+#echo "Type the name of the file that must be changed (normally .xinitrc)."
-+#echo "If the file already exists, it will be backed up with a .old.$DATE "
-+#echo "extension"
-+#echo "If you want to edit it by hand, hit <Control>-C now."
-+#read file
-+
-+#if test "x$file" = "x"; then
-+#	echo "Using .xinitrc as a default value"
-+#	file=.xinitrc
-+#fi
-+
-+#if [ -f "$USERDIR/$file" ]; then
-+#	mv "$USERDIR/$file" "$USERDIR/$file.old.$DATE"
-+#fi
- 
--make_script "$USERDIR/$file"
-+#make_script "$USERDIR/$file"
- 
- show_end_message

WindowMaker-rpmlintrc

@@ -1 +0,0 @@
-addFilter("macro-in-comment")

WindowMaker.changes

@@ -1,3 +1,48 @@
+-------------------------------------------------------------------
+Wed Nov 20 10:44:40 UTC 2024 - chris@computersalat.de
+
+- remove WindowMaker-rpmlintrc
+- fix build error with wallpaper-branding-openSUSE
+
+-------------------------------------------------------------------
+Mon Nov 18 08:23:07 UTC 2024 - chris@computersalat.de
+
+- Update to 0.96.0 (August 5th 2023)
+  * Screen corners can be assigned an external command to be executed
+    when the mouse pointer is entering those areas. In WPrefs, “Hot
+    Corner Shortcut Preferences” can be used for configuration or by
+    manually adding a “HotCorners” key and value to “YES” in the
+    ~/GNUstep/Defaults/WindowMaker file. Hot Corners feature is disabled
+    by default. Actions are specified by the “HotCornerActions” and are
+    defined as a four entries list (“top left action”, “top right action”,
+    “bottom left action”, “bottom right action”). A screen corner area is
+    a cube shape defined by the “HotCornerEdge” which is a number of
+    pixels from 2 (by default) to 10. To lower the risk of triggering
+    that feature accidentally a “HotCornerDelay” key can be used which
+    is the time before the action is triggered while the pointer is in
+    one of the screen corner. Default value is 250 ms.
+  * In WPrefs “Keyboard Shortcut Preferences” tab, three new actions
+    can be configured: “Capture a portion of the screen”, “Capture a
+    window”, “Capture the entire screen”. The file is saved in
+    ~/GNUstep/Library/WindowMaker/Screenshots directory under a filename
+    format “screenshot_%Y-%m-%d_at_%H:%M:%S” followed by the extension.
+    Which can be png or jpg based on WRaster dependencies.
+  * libXRes is now an optional dependency. XRes the resource extension
+    for the X protocol is used to find the underlying processes
+    (and PIDs) responsible for displaying the windows.
+  * Support for _NET_WM_FULLSCREEN_MONITORS hint. That hint allows
+    applications that support it to be set as fullscreen on multiple
+    heads. It depends on Xinerama extension support.
+  * To keep the dock on the primary head in a multi-head setup, set the
+    option “KeepDockOnPrimaryHead” in ~/GNUstep/Defaults/WindowMaker to
+    “YES” or click “Keep dock on primary head” under the WPrefs “Expert
+     User Preferences” tab.
+- rebase/rework patches
+  * WindowMaker-config.patch
+  * WindowMaker-menu.patch
+  * fix_wmgenmenu_paths.patch
+  * wm-giflib.patch
+
 -------------------------------------------------------------------
 Wed May 15 07:53:24 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
 

WindowMaker.spec

@@ -20,7 +20,7 @@ Name:           WindowMaker
 Summary:        A Colorful and Flexible Window Manager
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later AND SUSE-Public-Domain
 Group:          System/GUI/Other
-Version:        0.95.9
+Version:        0.96.0
 Release:        0
 URL:            http://windowmaker.org/
 Source:         http://windowmaker.org/pub/source/release/%{name}-%{version}.tar.gz
@@ -29,7 +29,6 @@ Source2:        theme.tar.bz2
 Source4:        README.SUSE
 Source5:        %{name}.desktop
 Source6:        windowmaker
-Source7:        %{name}-rpmlintrc
 Patch1:         %{name}-config.patch
 Patch2:         %{name}-menu.patch
 Patch3:         fix_wmgenmenu_paths.patch
@@ -146,7 +145,15 @@ find $RPM_BUILD_ROOT/usr/share/%{name}/Themes -type f -exec chmod 644 {} \;
 find $RPM_BUILD_ROOT/usr/share/%{name}/Themes -type d -exec chmod 755 {} \;
 # use default openSUSE wallpaper in SUSE theme
 pushd %{buildroot}/usr/share/%{name}/Themes/SUSE.themed/
+%if 0%{?sle_version} <= 150500 && 0%{?is_opensuse}
+ln -sf /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg default.png
+%endif
+%if 0%{?sle_version} >= 150600 && 0%{?is_opensuse}
 ln -sf /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.png default.png
+%endif
+%if 0%{?suse_version} > 1600
+ln -sf /usr/share/wallpapers/openSUSEdefault/contents/images/1920x1200.png default.png
+%endif
 popd
 #----------------------------------------------------------------------
 # not packaged
@@ -160,6 +167,7 @@ cd ..
 %find_lang %{name}
 %find_lang WINGs %{name}.lang
 %find_lang WPrefs %{name}.lang
+%find_lang WRaster %{name}.lang
 %find_lang wmgenmenu %{name}.lang
 
 # rpmlint
@@ -184,8 +192,7 @@ cd ..
 /usr/share/WINGs
 /usr/share/%{name}
 /usr/share/xsessions/*
-#/usr/X11R6/share/%{name}
-#/usr/X11R6/GNUstep
+/usr/share/applications/*
 
 %files devel
 %defattr(-,root,root)

fix_wmgenmenu_paths.patch

@@ -24,10 +24,10 @@ Index: util/wmgenmenu.c
 +	char *tmp, *theme_paths, *style_paths, *icon_paths, *bg_paths;
  
  	tmp = wstrconcat("-noext ", PKGDATADIR);
- 	theme_paths = wstrconcat(tmp, "/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle");
- 	style_paths = wstrconcat(tmp, "/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle");
- 	icon_paths = wstrconcat(tmp, "/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons");
-+	bg_paths = wstrconcat(tmp, "/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t");
+ 	theme_paths = wstrconcat(tmp, "/Themes $HOME/" GSUSER_SUBDIR "/" USERDATA_SUBDIR "/" PACKAGE_TARNAME "/Themes WITH setstyle");
+ 	style_paths = wstrconcat(tmp, "/Styles $HOME/" GSUSER_SUBDIR "/" USERDATA_SUBDIR "/" PACKAGE_TARNAME "/Styles WITH setstyle");
+ 	icon_paths = wstrconcat(tmp, "/IconSets $HOME/" GSUSER_SUBDIR "/" USERDATA_SUBDIR "/" PACKAGE_TARNAME "/IconSets WITH seticons");
++  bg_paths = wstrconcat(tmp, "/Backgrounds $HOME/" GSUSER_SUBDIR "/" USERDATA_SUBDIR "/" PACKAGE_TARNAME "/Backgrounds WITH wmsetbg -u -t");
  
  	struct option longopts[] = {
  		{ "version",		no_argument,	NULL,	'v' },
@@ -35,7 +35,7 @@ Index: util/wmgenmenu.c
  	L3Menu = WMCreatePLArray(
  		WMCreatePLString(_("Images")),
  		WMCreatePLString("OPEN_MENU"),
--		WMCreatePLString("-noext $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t"),
+-		WMCreatePLString("-noext $HOME/" GSUSER_SUBDIR "/" USERDATA_SUBDIR "/" PACKAGE_TARNAME "/Backgrounds WITH wmsetbg -u -t"),
 +		WMCreatePLString(bg_paths),
  		NULL
  	);

wm-giflib.patch

@@ -2,7 +2,6 @@
  WINGs/Examples/colorpick.c      |    4 ++++
  WINGs/Examples/fontl.c          |    4 ++++
  WINGs/Examples/puzzle.c         |    4 ++++
- WINGs/Extras/test.c             |    4 ++++
  WINGs/Extras/wtabledelegates.c  |    4 ++++
  WINGs/Extras/wtableview.c       |    4 ++++
  WINGs/Tests/mywidget.c          |    4 ++++
@@ -208,19 +207,6 @@ Index: WINGs/Examples/puzzle.c
  #include <stdlib.h>
  #include <stdio.h>
  #include <WINGs/WINGs.h>
-Index: WINGs/Extras/test.c
-===================================================================
---- WINGs/Extras/test.c.orig
-+++ WINGs/Extras/test.c
-@@ -1,4 +1,8 @@
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <WINGs/WINGs.h>
- #include <stdio.h>
- #include <stdint.h>
 Index: WINGs/Extras/wtabledelegates.c
 ===================================================================
 --- WINGs/Extras/wtabledelegates.c.orig
@@ -835,7 +821,7 @@ Index: WINGs/wlist.c
 +
  #include "WINGsP.h"
  
- char *WMListDidScrollNotification = "WMListDidScrollNotification";
+ const char *WMListDidScrollNotification = "WMListDidScrollNotification";
 Index: WINGs/wmenuitem.c
 ===================================================================
 --- WINGs/wmenuitem.c.orig
@@ -1040,7 +1026,7 @@ Index: WINGs/wutil.c
 +
  #include "WINGsP.h"
  
- void WHandleEvents()
+ void WHandleEvents(void)
 Index: WINGs/wview.c
 ===================================================================
 --- WINGs/wview.c.orig
@@ -1101,7 +1087,7 @@ Index: WPrefs.app/Expert.c
 ===================================================================
 --- WPrefs.app/Expert.c.orig
 +++ WPrefs.app/Expert.c
-@@ -20,6 +20,10 @@
+@@ -21,6 +21,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
  
@@ -1551,7 +1537,7 @@ Index: src/dock.c
 ===================================================================
 --- src/dock.c.orig
 +++ src/dock.c
-@@ -20,6 +20,10 @@
+@@ -21,6 +21,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
  
@@ -1744,8 +1730,7 @@ Index: src/osdep_darwin.c
 ===================================================================
 --- src/osdep_darwin.c.orig
 +++ src/osdep_darwin.c
-@@ -1,4 +1,8 @@
- 
+@@ -1,3 +1,7 @@
 +#ifdef HAVE_CONFIG_H
 +#include "config.h"
 +#endif
@@ -2038,7 +2023,7 @@ Index: src/window.c
 ===================================================================
 --- src/window.c.orig
 +++ src/window.c
-@@ -19,6 +19,10 @@
+@@ -20,6 +20,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
  
@@ -2471,17 +2456,17 @@ Index: wrlib/alpha_combine.c
 ===================================================================
 --- wrlib/alpha_combine.c.orig
 +++ wrlib/alpha_combine.c
-@@ -18,6 +18,10 @@
-  *  MA 02110-1301, USA.
-  */
+@@ -20,6 +20,10 @@
+ 
+ #include "config.h"
  
 +#ifdef HAVE_CONFIG_H
 +#include "config.h"
 +#endif
 +
  #include "wraster.h"
+ #include "wr_i18n.h"
  
- void RCombineAlpha(unsigned char *d, unsigned char *s, int s_has_alpha,
 Index: wrlib/tests/testdraw.c
 ===================================================================
 --- wrlib/tests/testdraw.c.orig