pool/WindowMaker
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 794222 from X11:windowmanagers

Browse Source 
- Update to 0.95.9
  * SwitchPanel is now more configurable:
    you can configure the switch panel icon size by setting the
    “SwitchPanelIconSize” option to your preferred value in
    ~/GNUstep/Defaults/WindowMaker. The font size used in this panel now is also
    sensible to changes in the system font.
  * New user configuration directory environment variable:
    In previous versions, the GNUstep directory used to store a user’s Window
    Maker configuration files was specified by the GNUSTEP_USER_ROOT environment
    variable, which defaulted to ~/GNUstep. However, this environment variable
    was deprecated in gnustep-make v2. Therefore, it has been replaced by the
    WMAKER_USER_ROOT environment variable.
  * libXmu is now an optional dependency
    If the library is not found, compilation work, the only limitation will
    arise when trying to install the standard colormap on displays which are not
    TrueColor. Please note that if you have the library but not the headers,
    configure will still stop; there is no user option to explicitly disable
    the library use.
- Rebase patches
  * WindowMaker-config.patch
  * WindowMaker-menu.patch
- Rework reproducible patch
  * remove WindowMaker-0.95.8-reproducible.patch
  * add WindowMaker-reproducible.patch

OBS-URL: https://build.opensuse.org/request/show/794222
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/WindowMaker?expand=0&rev=45
This commit is contained in:
Dominique Leuenberger 2020-04-15 17:57:22 +00:00 committed by Git OBS Bridge
commit 3ebbfdf088
8 changed files with 109 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
WindowMaker-0.95.8-reproducible.patch
View File

@ -1,35 +0,0 @@
could be upstreamed, but upstream seems dead
with lists.windowmaker.org down and the last git commit is from March
commit e9ab99877b71669a75c1c1a43c1fb24cb32c1bdf
Author: Bernhard M. Wiedemann <bwiedemann@suse.de>
Date: Tue Dec 19 21:13:21 2017 +0100
texi2txt: Use ChangeLog date instead of build date
in order to make builds reproducible.
See https://reproducible-builds.org/ for why this is good.
This date call works with GNU date and BSD date.
Without this patch, /usr/share/doc/packages/WindowMaker/README.i18n
will differ in the line
Published by The Window Maker team on ...
---
An alternative solution could use the $SOURCE_DATE_EPOCH variable
defined in https://reproducible-builds.org/specs/source-date-epoch/
diff --git a/script/generate-txt-from-texi.sh b/script/generate-txt-from-texi.sh
index 3800c72c..ee4e8603 100755
--- a/script/generate-txt-from-texi.sh
+++ b/script/generate-txt-from-texi.sh
@@ -822,7 +822,7 @@ function execute_commands(line, replaced_line, command) {
} else if (command == "today") {
# Make sure the date will be in english (we use "C" because it not certain
# that the English locale is enabled on the machine of the user)
- replaced_line = replaced_line "'"`LANG=C date '+%d %B %Y' | sed -e 's,^0,,' `"'";
+ replaced_line = replaced_line "'"`LANG=C date -u -r ../../ChangeLog '+%d %B %Y' | sed -e 's,^0,,' `"'";
# Commands to display text in a special style ##############################
} else if (command == "asis") {

3
WindowMaker-0.95.8.tar.gz
View File

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

3
WindowMaker-0.95.9.tar.gz Normal file
View File

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

36
WindowMaker-config.patch
View File

@ -2,22 +2,24 @@ Index: WindowMaker/Defaults/WindowMaker.in
===================================================================
--- WindowMaker/Defaults/WindowMaker.in.orig
+++ WindowMaker/Defaults/WindowMaker.in
@@ -1,5 +1,6 @@
{
SmoothWorkspaceBack = NO;
+ CirculateRaise = YES;
PopupSwitchMenu = NO;
MenuStyle = normal;
DisableMiniwindows = NO;
@@ -34,7 +35,7 @@
IconSize = 64;
FocusMode = manual;
DisableWSMouseActions = NO;
- MouseLeftButtonAction = SelectWindows;
+ MouseLeftButtonAction = OpenApplicationsMenu;
MouseMiddleButtonAction = OpenWindowListMenu;
MouseRightButtonAction = OpenApplicationsMenu;
MouseWheelAction = None;
@@ -14,7 +14,7 @@
IconPosition = blh;
IconificationStyle = Zoom;
DisableWSMouseActions = NO;
- MouseLeftButtonAction = SelectWindows;
+ MouseLeftButtonAction = OpenApplicationsMenu;
MouseMiddleButtonAction = OpenWindowListMenu;
MouseRightButtonAction = OpenApplicationsMenu;
MouseBackwardButtonAction = None;
@@ -42,7 +42,7 @@
ColormapMode = auto;
AutoFocus = YES;
RaiseDelay = 0;
- CirculateRaise = NO;
+ CirculateRaise = YES;
Superfluous = YES;
AdvanceToNewWorkspace = NO;
CycleWorkspaces = NO;
Index: dockit
===================================================================
--- /dev/null
@ -274,7 +276,7 @@ Index: util/wmaker.inst.in
===================================================================
--- util/wmaker.inst.in.orig
+++ util/wmaker.inst.in
@@ -280,41 +280,41 @@ echo " $GSDIR/Library/WindowMaker/$in
@@ -276,41 +276,41 @@ echo " $GSDIR/Library/WindowMaker/$in
}
wmaker_found=0

29
WindowMaker-menu.patch
View File

@ -3574,10 +3574,10 @@ Index: WindowMaker/plmenu.ko.in
+ ("종 료", EXIT)
)
)
Index: WindowMaker/plmenu.pl
Index: WindowMaker/plmenu.pl.in
===================================================================
--- WindowMaker/plmenu.pl.orig
+++ WindowMaker/plmenu.pl
--- WindowMaker/plmenu.pl.in.orig
+++ WindowMaker/plmenu.pl.in
@@ -1,125 +1,12 @@
("WindowMaker",
("Informacja",
@ -3889,10 +3889,10 @@ Index: WindowMaker/plmenu.sk.in
("Koniec", EXIT)
)
)
Index: WindowMaker/plmenu.zh_CN
Index: WindowMaker/plmenu.zh_CN.in
===================================================================
--- WindowMaker/plmenu.zh_CN.orig
+++ WindowMaker/plmenu.zh_CN
--- WindowMaker/plmenu.zh_CN.in.orig
+++ WindowMaker/plmenu.zh_CN.in
@@ -1,63 +1,11 @@
("应用程序",
("信息",
@ -4061,7 +4061,7 @@ Index: WindowMaker/menu.nl.in
===================================================================
--- WindowMaker/menu.nl.in.orig
+++ WindowMaker/menu.nl.in
@@ -111,65 +111,9 @@
@@ -116,65 +116,9 @@
"Info" MENU
"Infopaneel" INFO_PANEL
"Juridische info" LEGAL_PANEL
@ -4127,22 +4127,15 @@ Index: WindowMaker/menu.nl.in
"Commando's" MENU
"Andere verbergen" HIDE_OTHERS
@@ -210,13 +154,12 @@
"Iconenset opslaan" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Iconensetnaam,Voer bestandsnaam in:)"
"Voorkeurenhulpmiddel" EXEC #wprefs#
"Uiterlijk" END
-
@@ -186,6 +130,8 @@
"Uiterlijk" OPEN_MENU "appearance.menu.nl"
+ "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps
+ "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8"
"Sessie" MENU
"Sessie opslaan" SAVE_SESSION
"Sessie wissen" CLEAR_SESSION
"Window Maker herstarten" RESTART
- "BlackBox starten" RESTART blackbox
- "IceWM starten" RESTART icewm
"Afsluiten" EXIT
"Sessie" END
"Programma's" END
Index: WindowMaker/menu.zh_TW.in
===================================================================
--- WindowMaker/menu.zh_TW.in.orig

39
WindowMaker-reproducible.patch Normal file
View File

@ -0,0 +1,39 @@
could be upstreamed, but upstream seems dead
with lists.windowmaker.org down and the last git commit is from March
commit e9ab99877b71669a75c1c1a43c1fb24cb32c1bdf
Author: Bernhard M. Wiedemann <bwiedemann@suse.de>
Date: Tue Dec 19 21:13:21 2017 +0100
texi2txt: Use ChangeLog date instead of build date
in order to make builds reproducible.
See https://reproducible-builds.org/ for why this is good.
This date call works with GNU date and BSD date.
Without this patch, /usr/share/doc/packages/WindowMaker/README.i18n
will differ in the line
Published by The Window Maker team on ...
---
An alternative solution could use the $SOURCE_DATE_EPOCH variable
defined in https://reproducible-builds.org/specs/source-date-epoch/
Index: autogen.sh
===================================================================
--- autogen.sh.orig
+++ autogen.sh
@@ -1,8 +1,10 @@
#!/bin/sh
# Generate the documentation about compiling Window Maker
-./script/generate-txt-from-texi.sh "doc/build/Compilation.texi" -o "INSTALL-WMAKER"
-./script/generate-txt-from-texi.sh "doc/build/Translations.texi" -o "README.i18n"
+### Use date of INSTALL file instead of build (current/compile) date
+InstallDate="`LANG=C date -u -r ./INSTALL '+%d %B %Y' | sed -e 's,^0,,' `"
+./script/generate-txt-from-texi.sh -d "$InstallDate" "doc/build/Compilation.texi" -o "INSTALL-WMAKER"
+./script/generate-txt-from-texi.sh -d "$InstallDate" "doc/build/Translations.texi" -o "README.i18n"
# Change date of the files to the past so they will be regenerated by 'make'
touch -d '2000-01-01' INSTALL-WMAKER README.i18n

28
WindowMaker.changes
View File

@ -1,3 +1,31 @@
-------------------------------------------------------------------
Sat Apr 11 14:41:40 UTC 2020 - chris@computersalat.de
- Update to 0.95.9
* SwitchPanel is now more configurable:
you can configure the switch panel icon size by setting the
“SwitchPanelIconSize” option to your preferred value in
~/GNUstep/Defaults/WindowMaker. The font size used in this panel now is also
sensible to changes in the system font.
* New user configuration directory environment variable:
In previous versions, the GNUstep directory used to store a user’s Window
Maker configuration files was specified by the GNUSTEP_USER_ROOT environment
variable, which defaulted to ~/GNUstep. However, this environment variable
was deprecated in gnustep-make v2. Therefore, it has been replaced by the
WMAKER_USER_ROOT environment variable.
* libXmu is now an optional dependency
If the library is not found, compilation work, the only limitation will
arise when trying to install the standard colormap on displays which are not
TrueColor. Please note that if you have the library but not the headers,
configure will still stop; there is no user option to explicitly disable
the library use.
- Rebase patches
* WindowMaker-config.patch
* WindowMaker-menu.patch
- Rework reproducible patch
* remove WindowMaker-0.95.8-reproducible.patch
* add WindowMaker-reproducible.patch
-------------------------------------------------------------------
Wed Dec 20 12:11:03 UTC 2017 - bwiedemann@suse.com

22
WindowMaker.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package WindowMaker
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -12,20 +12,17 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: WindowMaker
Summary: A Colorful and Flexible Window Manager
License: GPL-2.0+ and LGPL-2.1+ and SUSE-Public-Domain
License: GPL-2.0-or-later AND LGPL-2.1-or-later AND SUSE-Public-Domain
Group: System/GUI/Other
Version: 0.95.8
Version: 0.95.9
Release: 0
# 81eefca4ef70414d73048300058e5007f402dd7f
# f846b7cdd39749b5291d4559185a229b752b4fed
#Version: 0.95.3.99.2
Url: http://windowmaker.org/
URL: http://windowmaker.org/
Source: http://windowmaker.org/pub/source/release/%{name}-%{version}.tar.gz
Source1: %{name}-extra-0.1.tar.bz2
Source2: theme.tar.bz2
@ -39,7 +36,7 @@ Patch3: fix_wmgenmenu_paths.patch
#
Patch101: wm-giflib.patch
# PATCH-FEATURE-OPENSUSE
Patch102: WindowMaker-0.95.8-reproducible.patch
Patch102: WindowMaker-reproducible.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: fdupes
BuildRequires: fontconfig-devel
@ -84,7 +81,7 @@ window managers.
%package devel
Summary: Development files for WindowMaker
License: GPL-2.0+
License: GPL-2.0-or-later
Group: Development/Libraries/X11
Requires: %{name} = %{version}
@ -100,7 +97,7 @@ cp %{name}/{menu.*,plmenu.*} menu_orig
%patch2
%patch3
%patch101
%patch102 -p1
%patch102
cp %{S:4} .
cp %{S:6} .
%if 0%{?suse_version} < 1140
@ -109,7 +106,7 @@ rename no nb po/no.*
# ---------------------------------------------------------------------------
%build
./autogen.sh
bash -x ./autogen.sh
export LINGUAS="be bg bs ca cs da de el es et fi fr gl hr hu hy it ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW"
export CFLAGS="$RPM_OPT_FLAGS $(freetype-config --cflags)"
%configure \
@ -180,7 +177,6 @@ cd ..
/usr/bin/*
%{_libdir}/*.so.*
%{_mandir}/man1/*
%{_mandir}/man8/*
/usr/share/WINGs
/usr/share/%{name}
/usr/share/xsessions/*