Hello community,
here is the log from the commit of package jgmenu for openSUSE:Factory checked
in at 2019-07-08 15:12:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/jgmenu (Old)
and /work/SRC/openSUSE:Factory/.jgmenu.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jgmenu"
Mon Jul 8 15:12:20 2019 rev:6 rq:713950 version:3.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/jgmenu/jgmenu.changes 2019-05-22
15:41:34.714427178 +0200
+++ /work/SRC/openSUSE:Factory/.jgmenu.new.4615/jgmenu.changes 2019-07-08
16:29:47.271996913 +0200
@@ -1,0 +2,11 @@
+Mon Jul 8 06:32:33 UTC 2019 - mvet...@suse.com
+
+- Update to 3.1:
+ * In obtheme module, support openbox config file (rc.xml) user override
+ by setting environment variable JGMENU_RCXML. For example:
+ JGMENU_RCXML=$HOME/.config/openbox/bl-rc.xml jgmenu_run obtheme jgmenurc
+ JGMENU_RCXML=$HOME/.config/openbox/bl-rc.xml jgmenu init --apply-obtheme
+ * Minor updates to man pages
+ * Fix incorrect relative path in unit test t1201-lx.t
+
+-------------------------------------------------------------------
Old:
----
v3.0.tar.gz
New:
----
v3.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jgmenu.spec ++++++
--- /var/tmp/diff_new_pack.Pmo215/_old 2019-07-08 16:29:48.443998547 +0200
+++ /var/tmp/diff_new_pack.Pmo215/_new 2019-07-08 16:29:48.451998558 +0200
@@ -17,7 +17,7 @@
Name: jgmenu
-Version: 3.0
+Version: 3.1
Release: 0
Summary: Small X11 menu intended to be used with openbox and tint2
License: GPL-2.0-only
++++++ v3.0.tar.gz -> v3.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jgmenu-3.0/NEWS.md new/jgmenu-3.1/NEWS.md
--- old/jgmenu-3.0/NEWS.md 2019-05-19 22:42:15.000000000 +0200
+++ new/jgmenu-3.1/NEWS.md 2019-07-06 11:21:00.000000000 +0200
@@ -6,6 +6,7 @@
## Recent releases
+[v3.1](docs/relnotes/3.1.txt)
[v3.0](docs/relnotes/3.0.txt)
[v2.2.1](docs/relnotes/2.2.1.txt)
[v2.2](docs/relnotes/2.2.txt)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jgmenu-3.0/debian/changelog
new/jgmenu-3.1/debian/changelog
--- old/jgmenu-3.0/debian/changelog 2019-05-19 22:42:15.000000000 +0200
+++ new/jgmenu-3.1/debian/changelog 2019-07-06 11:21:00.000000000 +0200
@@ -1,5 +1,5 @@
-jgmenu (3.0) UNRELEASED; urgency=medium
+jgmenu (3.1) UNRELEASED; urgency=medium
* New upstream release
- -- Johan Malm <jgm...@gmail.com> Sun, 19 May 2019 21:39:19 +0000
+ -- Johan Malm <jgm...@gmail.com> Sat, 06 Jul 2019 10:20:09 +0000
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jgmenu-3.0/debian/control
new/jgmenu-3.1/debian/control
--- old/jgmenu-3.0/debian/control 2019-05-19 22:42:15.000000000 +0200
+++ new/jgmenu-3.1/debian/control 2019-07-06 11:21:00.000000000 +0200
@@ -17,4 +17,7 @@
Package: jgmenu
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, python3
-Description: simple X11 menu intended to be used with tint2 and openbox
+Description: Simple X11 menu
+ A stand-alone, contemporary-looking menu application for Linux and BSD.
+ Independent of window manager and panel.
+ Designed for customisation, scripting, ricing and tweaking
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jgmenu-3.0/docs/manual/jgmenu.1
new/jgmenu-3.1/docs/manual/jgmenu.1
--- old/jgmenu-3.0/docs/manual/jgmenu.1 2019-05-19 22:42:15.000000000 +0200
+++ new/jgmenu-3.1/docs/manual/jgmenu.1 2019-07-06 11:21:00.000000000 +0200
@@ -1,6 +1,6 @@
.\" Automatically generated by Pandoc 2.7.2
.\"
-.TH "JGMENU" "1" "18 May, 2019" "" ""
+.TH "JGMENU" "1" "18 June, 2019" "" ""
.hy
.SH NAME
.PP
@@ -31,13 +31,16 @@
.IP
.nf
\f[C]
-\[u250C]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u252C]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2510]
-\[br] jgmenu \[br] launch menu \[br]
-\[u251C]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u253C]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2524]
-\[br] jgmenu init \[br] create config file \[br]
-\[u251C]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u253C]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2524]
-\[br] man jgmenututorial \[br] read step-by-step guide \[br]
-\[u2514]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2534]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2518]
+\[u250C]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u252C]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2510]
+\[br] jgmenu_run \[br] Launch menu \[br]
+\[u251C]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u253C]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2524]
+\[br] jgmenu init \[br] Create config file \[br]
+\[br] \[br] \[ti]/.config/jgmenu/jgmenurc \[br]
+\[u251C]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u253C]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2524]
+\[br] jgmenu init -i \[br] Interactive setup \[br]
+\[u251C]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u253C]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2524]
+\[br] man jgmenututorial \[br] Read step-by-step guide \[br]
+\[u2514]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2534]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2518]
\f[R]
.fi
.SH DESCRIPTION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jgmenu-3.0/docs/manual/jgmenu.1.md
new/jgmenu-3.1/docs/manual/jgmenu.1.md
--- old/jgmenu-3.0/docs/manual/jgmenu.1.md 2019-05-19 22:42:15.000000000
+0200
+++ new/jgmenu-3.1/docs/manual/jgmenu.1.md 2019-07-06 11:21:00.000000000
+0200
@@ -1,6 +1,6 @@
% JGMENU(1)
% Johan Malm
-% 18 May, 2019
+% 18 June, 2019
# NAME
@@ -18,13 +18,16 @@
## Use these three commands to get started
- ┌────────────────────┬─────────────────────────┐
- │ jgmenu │ launch menu │
- ├────────────────────┼─────────────────────────┤
- │ jgmenu init │ create config file │
- ├────────────────────┼─────────────────────────┤
- │ man jgmenututorial │ read step-by-step guide │
- └────────────────────┴─────────────────────────┘
+ ┌────────────────────┬───────────────────────────┐
+ │ jgmenu_run │ Launch menu │
+ ├────────────────────┼───────────────────────────┤
+ │ jgmenu init │ Create config file │
+ │ │ ~/.config/jgmenu/jgmenurc │
+ ├────────────────────┼───────────────────────────┤
+ │ jgmenu init -i │ Interactive setup │
+ ├────────────────────┼───────────────────────────┤
+ │ man jgmenututorial │ Read step-by-step guide │
+ └────────────────────┴───────────────────────────┘
# DESCRIPTION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jgmenu-3.0/docs/relnotes/3.1.txt
new/jgmenu-3.1/docs/relnotes/3.1.txt
--- old/jgmenu-3.0/docs/relnotes/3.1.txt 1970-01-01 01:00:00.000000000
+0100
+++ new/jgmenu-3.1/docs/relnotes/3.1.txt 2019-07-06 11:21:00.000000000
+0200
@@ -0,0 +1,14 @@
+jgmenu v3.1 release notes
+=========================
+
+Updates since v3.0
+------------------
+
+ * In obtheme module, support openbox config file (rc.xml) user override
+ by setting environment variable JGMENU_RCXML. For example:
+ JGMENU_RCXML=$HOME/.config/openbox/bl-rc.xml jgmenu_run obtheme jgmenurc
+ JGMENU_RCXML=$HOME/.config/openbox/bl-rc.xml jgmenu init --apply-obtheme
+
+ * Minor updates to man pages
+
+ * Fix incorrect relative path in unit test t1201-lx.t
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jgmenu-3.0/scripts/make-debian.sh
new/jgmenu-3.1/scripts/make-debian.sh
--- old/jgmenu-3.0/scripts/make-debian.sh 2019-05-19 22:42:15.000000000
+0200
+++ new/jgmenu-3.1/scripts/make-debian.sh 2019-07-06 11:21:00.000000000
+0200
@@ -5,7 +5,7 @@
#
test -d "debian" || { echo "fatal: need to run from project root"; exit 1; }
-test -f "jgmenu.c" || { echo "fatal: need to run from project root"; exit 1; }
+test -f "src/jgmenu.c" || { echo "fatal: need to run from project root"; exit
1; }
ver=$(./scripts/version-gen.sh | sed -e 's/^jgmenu v//' | cut -f1 -d"-")
#git describe --exact-match HEAD 2>/dev/null || echo "warn: not at tag"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jgmenu-3.0/scripts/version-gen.sh
new/jgmenu-3.1/scripts/version-gen.sh
--- old/jgmenu-3.0/scripts/version-gen.sh 2019-05-19 22:42:15.000000000
+0200
+++ new/jgmenu-3.1/scripts/version-gen.sh 2019-07-06 11:21:00.000000000
+0200
@@ -8,7 +8,7 @@
# Change "default_version" before doing a `git tag -a ...`
#
-default_version="3.0"
+default_version="3.1"
v=$(git describe --dirty --abbrev=1 2>/dev/null)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jgmenu-3.0/src/jgmenu-init.sh
new/jgmenu-3.1/src/jgmenu-init.sh
--- old/jgmenu-3.0/src/jgmenu-init.sh 2019-05-19 22:42:15.000000000 +0200
+++ new/jgmenu-3.1/src/jgmenu-init.sh 2019-07-06 11:21:00.000000000 +0200
@@ -58,6 +58,7 @@
--theme=<theme> Create config file with a particular theme\n\
--list-themes Display all available themes\n\
--regression-check Only check for config options no longer valid\n\
+ --apply-obtheme Apply current openbox theme to menu\n\
--verbose Be more verbose\n"
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jgmenu-3.0/src/jgmenu-obtheme.c
new/jgmenu-3.1/src/jgmenu-obtheme.c
--- old/jgmenu-3.0/src/jgmenu-obtheme.c 2019-05-19 22:42:15.000000000 +0200
+++ new/jgmenu-3.1/src/jgmenu-obtheme.c 2019-07-06 11:21:00.000000000 +0200
@@ -29,7 +29,14 @@
};
static const char obtheme_usage[] =
-"Usage: jgmenu_run obtheme <jgmenurc filename>\n";
+"Usage: jgmenu_run obtheme <jgmenurc filename>\n\n"
+"The theme name will be obtained from:\n"
+" * ~/.config/openbox/rc.xml\n"
+" * /etc/xdg/openbox/rc.xml\n"
+"Set environment variable JGMENU_RCXML to specify a different file\n\n"
+"Openbox theme files will be searched for in:\n"
+" * ~/.themes/\n"
+" * /usr/share/themes/\n";
void usage(void)
{
@@ -181,7 +188,7 @@
return -1;
}
-static int find_rcxml(struct sbuf *filename)
+static void find_rcxml(struct sbuf *filename)
{
struct stat sb;
int i;
@@ -190,22 +197,27 @@
sbuf_cpy(filename, rcxml_files[i]);
sbuf_expand_tilde(filename);
if (!stat(filename->buf, &sb))
- return 0;
+ return;
}
- return -1;
+ die("cannot find rc.xml");
}
int main(int argc, char **argv)
{
struct sbuf filename;
+ char *p;
if (argc != 2)
usage();
sbuf_init(&filename);
LIBXML_TEST_VERSION
- if (find_rcxml(&filename) < 0)
- die("cannot find rc.xml");
+ p = getenv("JGMENU_RCXML");
+ if (p)
+ sbuf_cpy(&filename, p);
+ else
+ find_rcxml(&filename);
+
get_obtheme_from_rcxml(filename.buf);
info("detected theme '%s' from file '%s'", obtheme, filename.buf);
if (find_themerc(&filename) < 0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jgmenu-3.0/tests/t1201-lx.t
new/jgmenu-3.1/tests/t1201-lx.t
--- old/jgmenu-3.0/tests/t1201-lx.t 2019-05-19 22:42:15.000000000 +0200
+++ new/jgmenu-3.1/tests/t1201-lx.t 2019-07-06 11:21:00.000000000 +0200
@@ -11,7 +11,8 @@
fi
generate_directories () {
- d="${PWD}/../t1201/desktop-directories"
+ d="${PWD}/t1201/desktop-directories"
+ printf "%b\n" ".directory files generated in: $d"
rm -rf "${d}"
mkdir -p "${d}"
for i in $(seq 9)
@@ -23,7 +24,8 @@
}
generate_apps () {
- d="${PWD}/../t1201/applications"
+ d="${PWD}/t1201/applications"
+ printf "%b\n" ".desktop files generated in: $d"
rm -rf "${d}"
mkdir -p "${d}"
for i in $(seq 9)
@@ -39,16 +41,25 @@
done
}
+generate_menu_file () {
+ d="${PWD}/t1201/menus"
+ rm -rf "${d}"
+ mkdir -p "${d}"
+ cp ../t1201/menus/test2-applications.menu "$d"
+}
+
test_menu () {
- d="${PWD}/../t1201"
+ d="${PWD}/t1201"
export XDG_CONFIG_DIRS="${d}"
export XDG_DATA_HOME="${d}"
+ printf "%b\n" "XDG_DATA_HOME=$XDG_DATA_HOME"
export XDG_MENU_PREFIX="${1}-"
rm -rf ~/.cache/menus &&
+ cp "../t1201/${1}.expect" expect &&
LANG=C LC_ALL=C ../../jgmenu-lx >actual &&
- cp "${d}/${1}.expect" expect &&
+ cp "../t1201/${1}.expect" expect &&
test_cmp expect actual
}
@@ -56,6 +67,7 @@
generate_directories &&
generate_apps &&
+generate_menu_file &&
test_menu "test2"
'
