sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Ismael Luceno (8e423d15f825c9de81f6befbfb306687ff34c7fe)

From: Ismael Luceno <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (8e423d15f825c9de81f6befbfb306687ff34c7fe)
Date: Sat, 3 Jun 2023 20:00:38 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

windowmanagers/jwm/DETAILS | 11 ++--
windowmanagers/jwm/HISTORY | 6 +-
windowmanagers/jwm/PRE_BUILD | 11 +++-
windowmanagers/jwm/separate-rootmenu.patch | 77
-----------------------------
4 files changed, 21 insertions(+), 84 deletions(-)

New commits:
commit 8e423d15f825c9de81f6befbfb306687ff34c7fe
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

jwm 2.4.3

diff --git a/windowmanagers/jwm/DETAILS b/windowmanagers/jwm/DETAILS
index 67e007c..e800242 100755
--- a/windowmanagers/jwm/DETAILS
+++ b/windowmanagers/jwm/DETAILS
@@ -1,10 +1,11 @@
+# Watch: https://joewing.net/projects/jwm/
SPELL=jwm
- VERSION=2.0.1
- SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_URL[0]=http://joewing.net/programs/$SPELL/releases/$SOURCE
-
SOURCE_HASH=sha512:ec5124a3995fa314e8e484b9ab2fe3088df022223c3f4594202755f7baa02f28be368863ced783814463377eb2b3ce63b756f1e1720b539acade3d819d8d4a0b
+ VERSION=2.4.3
+ SOURCE=$SPELL-$VERSION.tar.xz
+
SOURCE_URL[0]=https://github.com/joewing/jwm/releases/download/v$VERSION/$SOURCE
+
SOURCE_HASH=sha512:35b8a6da9614f11881013aa77c36ee88ce9a213f056e797231b772132beb841d54094809b6a476383999bddeccf61451f72cd166309dd79c223b634cf5d1e69e
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- WEB_SITE="http://joewing.net/programs/jwm/";
+ WEB_SITE="https://joewing.net/projects/jwm/";
LICENSE[0]=GPL2
ENTERED=20070807
SHORT="a minimalistic WM written in C"
diff --git a/windowmanagers/jwm/HISTORY b/windowmanagers/jwm/HISTORY
index 5817b61..4f9b3e4 100644
--- a/windowmanagers/jwm/HISTORY
+++ b/windowmanagers/jwm/HISTORY
@@ -1,3 +1,8 @@
+2023-06-03 Ismael Luceno <ismael AT sourcemage.org>
+ * separate-rootmenu.patch: removed, replaced by a script
+ * PRE_BUILD: added script to split root menu programatically
+ * DETAILS: updated spell to 2.4.3
+
2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: jpeg -> JPEG

@@ -24,4 +29,3 @@

2007-08-07 J.P. Nimmo <capnnimmo712 AT gmail.com>
* DETAILS, DEPENDS, HISTORY: created spell
-
diff --git a/windowmanagers/jwm/PRE_BUILD b/windowmanagers/jwm/PRE_BUILD
index 7cd2a16..096feab 100755
--- a/windowmanagers/jwm/PRE_BUILD
+++ b/windowmanagers/jwm/PRE_BUILD
@@ -1,3 +1,12 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-patch -p1 < ${SCRIPT_DIRECTORY}/separate-rootmenu.patch
+awk '
+ BEGIN { menufile = "jwmrc-menu"; print "<JWM>" > menufile }
+ END { print "</JWM>" > menufile }
+ function rootmenu_end() {
+ if (!/^ *<\/RootMenu>/) return 1
+ printf " <Include>/etc/%s</Include>\n", menufile
+ }
+ /^ *<RootMenu/, !rootmenu_end() { print > menufile; next } 1
+' example.jwmrc > example.jwmrc.$$ &&
+mv example.jwmrc.$$ example.jwmrc
diff --git a/windowmanagers/jwm/separate-rootmenu.patch
b/windowmanagers/jwm/separate-rootmenu.patch
deleted file mode 100644
index b06c7de..0000000
--- a/windowmanagers/jwm/separate-rootmenu.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -Naur ./jwm-2.0.1/example.jwmrc jwm-2.0.1-fixed/example.jwmrc
---- ./jwm-2.0.1/example.jwmrc 2007-07-05 03:56:41.000000000 +0200
-+++ jwm-2.0.1-fixed/example.jwmrc 2007-08-25 23:26:07.000000000 +0200
-@@ -1,36 +1,8 @@
- <?xml version="1.0"?>
-
- <JWM>
--
-- 
-- 
-- <RootMenu height="32" onroot="123">
-- <Program icon="rxvt.png" label="Terminal">rxvt</Program>
--
-- <Menu icon="folder.png" label="Applications">
-- <Program icon="audacious.png" label="Audacious">audacious</Program>
-- <Program icon="dia.png" label="Dia">dia</Program>
-- <Program icon="firefox.png" label="Firefox">firefox</Program>
-- <Program icon="pidgin.png" label="Pidgin">pidgin</Program>
-- <Program icon="gimp.png" label="Gimp">gimp</Program>
-- <Program icon="gtk-gnutella.png" label="gtk-gnutella">
-- gtk-gnutella
-- </Program>
-- <Program icon="gxine.png" label="gxine">gxine</Program>
-- <Program icon="ooffice.png" label="Open Office">ooffice</Program>
-- </Menu>
-- <Menu icon="folder.png" label="Utilities">
-- <Program icon="xcalc.png">xcalc</Program>
-- <Program icon="xfontsel.png">xfontsel</Program>
-- <Program icon="xmag.png">xmag</Program>
-- <Program icon="xprop.png" label="xprop">
-- xprop | xmessage -file -
-- </Program>
-- </Menu>
-- <Separator/>
-- <Restart label="Restart" icon="restart.png"/>
-- <Exit label="Exit" confirm="true" icon="exit.png"/>
-- </RootMenu>
-+ # include the Rootmenu
-+ <Include>/etc/jwmrc-menu</Include>
-
- <Group>
- <Class>Pidgin</Class>
-diff -Naur ./jwm-2.0.1/jwmrc-menu jwm-2.0.1-fixed/jwmrc-menu
---- ./jwm-2.0.1/jwmrc-menu 1970-01-01 01:00:00.000000000 +0100
-+++ jwm-2.0.1-fixed/jwmrc-menu 2007-08-25 23:26:27.000000000 +0200
-@@ -0,0 +1,31 @@
-+<JWM>
-+
-+
-+
-+<RootMenu height="32" onroot="123">
-+ <Program icon="rxvt.png" label="Terminal">rxvt</Program>
-+ <Menu icon="folder.png" label="Applications">
-+ <Program icon="audacious.png" label="Audacious">audacious</Program>
-+ <Program icon="dia.png" label="Dia">dia</Program>
-+ <Program icon="firefox.png" label="Firefox">firefox</Program>
-+ <Program icon="pidgin.png" label="Pidgin">pidgin</Program>
-+ <Program icon="gimp.png" label="Gimp">gimp</Program>
-+ <Program icon="gtk-gnutella.png" label="gtk-gnutella">
-+ gtk-gnutella
-+ </Program>
-+ <Program icon="gxine.png" label="gxine">gxine</Program>
-+ <Program icon="ooffice.png" label="Open Office">ooffice</Program>
-+ </Menu>
-+ <Menu icon="folder.png" label="Utilities">
-+ <Program icon="xcalc.png">xcalc</Program>
-+ <Program icon="xfontsel.png">xfontsel</Program>
-+ <Program icon="xmag.png">xmag</Program>
-+ <Program icon="xprop.png" label="xprop">
-+ xprop | xmessage -file -
-+ </Program>
-+ </Menu>
-+ <Separator/>
-+ <Restart label="Restart" icon="restart.png"/>
-+ <Exit label="Exit" confirm="true" icon="exit.png"/>
-+</RootMenu>
-+</JWM>

[SM-Commit] GIT changes to master grimoire by Ismael Luceno (8e423d15f825c9de81f6befbfb306687ff34c7fe), Ismael Luceno, 06/03/2023