[repo.or.cz] wmaker-crm.git branch next updated: wmaker-0.95.6-247-g2086eef
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project wmaker-crm.git.
The branch, next has been updated
discards 45374b598fe2917eb678a8f18418ef940b47f825 (commit)
discards 6f67f80aa411adc960c4431dc4aff46652ac9228 (commit)
discards e6a2edbc9c31404d8f22e1923603a1422067cffd (commit)
discards 68aee92278bd6414c43059d1e26699fcf005 (commit)
discards b11cd0cf1656150c4d9cee58631d1de7723b9e82 (commit)
discards ae92bccb14432a8e4ab6619f5171a7b56506e5e6 (commit)
via 2086eefb7e5c658bf0f99feb2aa4b118b188e2b1 (commit)
via 842e145e0aeef633b7d0f938f57098469fee7cfe (commit)
via b4cf94aacd0f9fcffd802b0a8e47e0d162ca1f20 (commit)
via 2ebfcd9c5c9350d89f2346304ed8c02883020785 (commit)
via 1cef020eb322f1bc2978d49ec2d846dd9d1cc15d (commit)
via 30fe0fb05f6fd0030155c2643a93a562c8278711 (commit)
via d1c9f791d870d88ec4f02e31b29600e1afbaa58a (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (45374b598fe2917eb678a8f18418ef940b47f825)
\
N -- N -- N (2086eefb7e5c658bf0f99feb2aa4b118b188e2b1)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://repo.or.cz/w/wmaker-crm.git/commit/2086eefb7e5c658bf0f99feb2aa4b118b188e2b1
commit 2086eefb7e5c658bf0f99feb2aa4b118b188e2b1
Author: Christophe CURIS
Date: Sat Apr 18 23:56:19 2015 +0200
texi2txt: add workaround for a known bug in "mawk"
As reported by Douglas Torrance, the script that generates the plain text
documentation from the texinfo source would crash due to the cross-
references when the version of awk used is "mawk".
This is actually a known bug in mawk:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=172774
It looks like the bug have been fixed in mawk, but Debian is still
providing a broken version. To avoid problems, this patch is introducing a
workaround in the matching pattern that causes the issue every time it is
being used.
Signed-off-by: Christophe CURIS
diff --git a/script/generate-txt-from-texi.sh b/script/generate-txt-from-texi.sh
index 5554e6e..3800c72 100755
--- a/script/generate-txt-from-texi.sh
+++ b/script/generate-txt-from-texi.sh
@@ -212,12 +212,12 @@ function end_conditional(name, local_i) {
# with @value; they can also be defined from command-line (-D)
# they are stored in the global array "variable[name]"
function set_variable(line, local_idx, local_name, local_value) {
- gsub(/^[ \t]*/, "", line);
+ gsub(/^[ \t]+/, "", line);
local_idx = match(line, /[ \t]/);
if (local_idx > 0) {
local_name = substr(line, 1, local_idx - 1);
local_value = substr(line, local_idx + 1);
-gsub(/^[ \t]*/, "", local_value);
+gsub(/^[ \t]+/, "", local_value);
} else {
local_name = line;
local_value = "";
@@ -473,7 +473,7 @@ function new_node(args,local_nb, local_arr,
local_i) {
if ((local_nb < 1) || (local_nb > 4)) {
report_error("bad number of argument " local_nb " for @node at line " NR);
}
- gsub(/^[ \t]*/, "", local_arr[1]);
+ gsub(/^[ \t]+/, "", local_arr[1]);
gsub(/[ \t]*$/, "", local_arr[1]);
if (local_arr[1] == "") {
report_error("missing node name for @node at line " NR);
@@ -572,7 +572,7 @@ function generate_cross_reference(args, cmd,
local_nb, local_arr, local
local_arr[1] = execute_commands(local_arr[1]);
for (local_i = 1; local_i <= local_nb; local_i++) {
-gsub(/^[ \t]*/, "", local_arr[local_i]);
+gsub(/^[ \t]+/, "", local_arr[local_i]);
gsub(/[ \t]*$/, "", local_arr[local_i]);
}
http://repo.or.cz/w/wmaker-crm.git/commit/842e145e0aeef633b7d0f938f57098469fee7cfe
commit 842e145e0aeef633b7d0f938f57098469fee7cfe
Author: Christophe CURIS
Date: Sat Apr 18 20:17:30 2015 +0200
doc: re-generate the top directory documentation when "make dist" is invoked
As pointed by Douglas Torrance, there are some case where the 2 docs
INSTALL-WMAKER and README.i18n are not re-generated properly, one of the
cases being if the user grabs the sources from Git to make a source package
only (ie, without compiling anything).
This patch adds a hook to "make dist" so it will re-generate the docs if
needed. Because the "dist-hook" is run after Automake has copied the files
[PATCH 1/1] merge with ae92bccb14432a8e4ab6619f5171a7b56506e5e6
(fix typo)
---
doc/build/Compilation.texi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/build/Compilation.texi b/doc/build/Compilation.texi
index cb19a6d..4db3ae0 100644
--- a/doc/build/Compilation.texi
+++ b/doc/build/Compilation.texi
@@ -224,7 +224,7 @@ Get the @emph{GNU} version from
@uref{http://www.gnu.org/software/gettext/}
This library can be used by the @emph{WINGs} toolkit to improve support for
@emph{UTF-8} and for
languages written in right-to-left direction, in some widgets.
-You have to explicitly ask for its support though (@pxref{Configure Options}).
+You have to explicitly ask for its support through (@pxref{Configure Options}).
You can get it from @uref{http://www.pango.org/Download}
@item @emph{libbsd}
--
2.1.4
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
[PATCH 1/1] texi2txt: add workaround for a known bug in "mawk"
As reported by Douglas Torrance, the script that generates the plain text
documentation from the texinfo source would crash due to the cross-
references when the version of awk used is "mawk".
This is actually a known bug in mawk:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=172774
It looks like the bug have been fixed in mawk, but Debian is still
providing a broken version. To avoid problems, this patch is introducing a
workaround in the matching pattern that causes the issue every time it is
being used.
Signed-off-by: Christophe CURIS
---
script/generate-txt-from-texi.sh | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/script/generate-txt-from-texi.sh b/script/generate-txt-from-texi.sh
index 5554e6e..3800c72 100755
--- a/script/generate-txt-from-texi.sh
+++ b/script/generate-txt-from-texi.sh
@@ -212,12 +212,12 @@ function end_conditional(name, local_i) {
# with @value; they can also be defined from command-line (-D)
# they are stored in the global array "variable[name]"
function set_variable(line, local_idx, local_name, local_value) {
- gsub(/^[ \t]*/, "", line);
+ gsub(/^[ \t]+/, "", line);
local_idx = match(line, /[ \t]/);
if (local_idx > 0) {
local_name = substr(line, 1, local_idx - 1);
local_value = substr(line, local_idx + 1);
-gsub(/^[ \t]*/, "", local_value);
+gsub(/^[ \t]+/, "", local_value);
} else {
local_name = line;
local_value = "";
@@ -473,7 +473,7 @@ function new_node(args,local_nb, local_arr,
local_i) {
if ((local_nb < 1) || (local_nb > 4)) {
report_error("bad number of argument " local_nb " for @node at line " NR);
}
- gsub(/^[ \t]*/, "", local_arr[1]);
+ gsub(/^[ \t]+/, "", local_arr[1]);
gsub(/[ \t]*$/, "", local_arr[1]);
if (local_arr[1] == "") {
report_error("missing node name for @node at line " NR);
@@ -572,7 +572,7 @@ function generate_cross_reference(args, cmd,
local_nb, local_arr, local
local_arr[1] = execute_commands(local_arr[1]);
for (local_i = 1; local_i <= local_nb; local_i++) {
-gsub(/^[ \t]*/, "", local_arr[local_i]);
+gsub(/^[ \t]+/, "", local_arr[local_i]);
gsub(/[ \t]*$/, "", local_arr[local_i]);
}
--
2.1.4
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
Re: [PATCH 14/23] texi2txt: add support for making cross-references in the document
- Christophe a écrit : > > - Douglas Torrance a écrit : > > On 04/06/2015 10:58 AM, Christophe CURIS wrote: > > > The texinfo format provides 3 commands @ref, @xref and @pxref to make > > > cross > > > references to existing @nodes in the document; it also provides a command > > > @anchor to place arbitrary targets for cross-reference. > > > > > > Because these will be handy for the Installation Manual that already does > > > some references, this patch implements the 4 commands: > > > > > > [...] > > > > There must be some GNU extensions in here somewhere, as I get the > > following error without gawk when running the script on Compilation.texi: > > > > Error: cross reference to undefined node/anchor "ConfigureOptions" found > > at line 227 > > > Unfortunately I was not able to reproduce so far on #next; I tried with: > awk --posix > awk --traditional > nawk > > None of them is complaining. Looking at the message, it seems there is a > space missing between the 2 words, so it looks like a difference in parsing. > What's strange is that this xref is called also at other places, do you get > more message or just the one above? > Well, it turns out "nawk" is a link to "awk" (which is gawk) on my system. But "mawk" gives the same message... investigating! -- To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
Re: [PATCH 07/23] doc: changed section for man page of "wdread" to 1x for consistency
- Douglas Torrance a écrit : > On 04/06/2015 10:57 AM, Christophe CURIS wrote: > > All the man pages for our tools that interact with Window Maker are placed > > in the "1x" section, but the "wdread" page was an exception for no known > > reason. > > > > For consistency, this patch renames the file to the same "1x" section. > > Thanks for these patches, Christophe! > > I'm wondering, though, if we should change all of the sections to 1 > instead of 1x, as it appears deprecated. Not even X manpages use 1x any > more. On my system, "ls /usr/share/man/man1 | grep 1x" returns only > Window Maker-related manpages. The situation seems to be similar on my side too. Will make a patch about this, it makes sense! -- To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
Re: [PATCH 14/23] texi2txt: add support for making cross-references in the document
- Douglas Torrance a écrit : > On 04/06/2015 10:58 AM, Christophe CURIS wrote: > > The texinfo format provides 3 commands @ref, @xref and @pxref to make cross > > references to existing @nodes in the document; it also provides a command > > @anchor to place arbitrary targets for cross-reference. > > > > Because these will be handy for the Installation Manual that already does > > some references, this patch implements the 4 commands: > > > > [...] > > There must be some GNU extensions in here somewhere, as I get the > following error without gawk when running the script on Compilation.texi: > > Error: cross reference to undefined node/anchor "ConfigureOptions" found > at line 227 Unfortunately I was not able to reproduce so far on #next; I tried with: awk --posix awk --traditional nawk None of them is complaining. Looking at the message, it seems there is a space missing between the 2 words, so it looks like a difference in parsing. What's strange is that this xref is called also at other places, do you get more message or just the one above? -- To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
[PATCH 1/1] doc: re-generate the top directory documentation when "make dist" is invoked
As pointed by Douglas Torrance, there are some case where the 2 docs INSTALL-WMAKER and README.i18n are not re-generated properly, one of the cases being if the user grabs the sources from Git to make a source package only (ie, without compiling anything). This patch adds a hook to "make dist" so it will re-generate the docs if needed. Because the "dist-hook" is run after Automake has copied the files to the temporary directory (distdir) then we also include an explicit copy of the files there to have the latest version. Signed-off-by: Christophe CURIS --- doc/build/Makefile.am | 7 +++ 1 file changed, 7 insertions(+) diff --git a/doc/build/Makefile.am b/doc/build/Makefile.am index c80394e..dc656e9 100644 --- a/doc/build/Makefile.am +++ b/doc/build/Makefile.am @@ -7,6 +7,13 @@ EXTRA_DIST = Readme \ # How to re-generate automatically the top-level text files all-local: $(top_srcdir)/INSTALL-WMAKER $(top_srcdir)/README.i18n +# We also re-generate the documentation when "make dist" is used, because we cannot +# be assured that the doc currently present in the directory is up-to-date, for example +# if the user did not run "make (all)" for valid reason +dist-hook: $(top_srcdir)/INSTALL-WMAKER $(top_srcdir)/README.i18n + cp -f $(top_srcdir)/INSTALL-WMAKER $(top_distdir)/INSTALL-WMAKER + cp -f $(top_srcdir)/README.i18n $(top_distdir)/README.i18n + $(top_srcdir)/INSTALL-WMAKER: $(srcdir)/Compilation.texi $(top_srcdir)/script/generate-txt-from-texi.sh $(AM_V_GEN)if test ! -e "$(top_srcdir)/INSTALL-WMAKER" -o -w "$(top_srcdir)/INSTALL-WMAKER" ; then \ $(top_srcdir)/script/generate-txt-from-texi.sh \ -- 2.1.4 -- To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
Re: [PATCH 15/23] doc: convert INSTALL-WMAKER into a texinfo source processed by texi2txt
- Douglas Torrance a écrit : > > On 04/06/2015 10:58 AM, Christophe CURIS wrote: > > diff --git a/doc/build/Makefile.am b/doc/build/Makefile.am > > index 93e3e8b..c80394e 100644 > > --- a/doc/build/Makefile.am > > +++ b/doc/build/Makefile.am > > @@ -1,10 +1,20 @@ > > # The list of sources are distributed, but none are to be > > # installed along with Window Maker: > > EXTRA_DIST = Readme \ > > + Compilation.texi \ > > Translations.texi > > > > # How to re-generate automatically the top-level text files > > -all-local: $(top_srcdir)/README.i18n > > +all-local: $(top_srcdir)/INSTALL-WMAKER $(top_srcdir)/README.i18n > > + > > +$(top_srcdir)/INSTALL-WMAKER: $(srcdir)/Compilation.texi > > $(top_srcdir)/script/generate-txt-from-texi.sh > > + $(AM_V_GEN)if test ! -e "$(top_srcdir)/INSTALL-WMAKER" -o -w > > "$(top_srcdir)/INSTALL-WMAKER" ; then \ > > + $(top_srcdir)/script/generate-txt-from-texi.sh \ > > + $(srcdir)/Compilation.texi -o $(top_srcdir)/INSTALL-WMAKER \ > > + -Dversion="$(PACKAGE_VERSION)" -e "$(PACKAGE_BUGREPORT)" ; \ > > + else \ > > + echo "Warning: \"$(top_srcdir)/INSTALL-WMAKER\" is not writeable, > > not regenerated" ; \ > > + fi > > > > Would it be possible for this to run during "make dist"? > > Right now, the INSTALL-WMAKER in a "make dist"-generated tarball is the > one generated by autogen.sh and lists "git#next" as its version (the > default). But when Window Maker is built, a new INSTALL-WMAKER is > generated with the version from configure.ac. > > This can cause problems, e.g., when building Debian packages where the > source tree is expected to match the source tarball. There's no problem > the first time, but the build fails on successive attempts. > > This is also a problem for README.i18n. Not really hard to do, and I think your case is totally valid. Carlos, Here's a patch to handle the issue. -- To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
[PATCH 3/3] merge with 418eb1f157c76ffc3db43f9a4fbf1a85f966d55c
--- doc/get-wraster-flags.1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/get-wraster-flags.1 b/doc/get-wraster-flags.1 index 95bd062..8abc35f 100644 --- a/doc/get-wraster-flags.1 +++ b/doc/get-wraster-flags.1 @@ -4,11 +4,11 @@ .PP .SH "SYNOPSIS" .B pkg-config -.R wrlib +wrlib .I \-\-cflags .br .B pkg-config -.R wrlib +wrlib .I \-\-libs .SH "DESCRIPTION" \fBget-wraster-flags\fP used to provide the compilation and link flags for programs that use -- 2.1.4 -- To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
[PATCH 2/3] merge with 4c86603b36ed91da0b1246a4f0b4093d4e75bf08
--- doc/get-wutil-flags.1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/get-wutil-flags.1 b/doc/get-wutil-flags.1 index 1e6641a..635c322 100644 --- a/doc/get-wutil-flags.1 +++ b/doc/get-wutil-flags.1 @@ -4,11 +4,11 @@ .PP .SH "SYNOPSIS" .B pkg-config -.R WUtil +WUtil .I \-\-cflags .br .B pkg-config -.R WUtil +WUtil .I \-\-libs .SH "DESCRIPTION" \fBget-wutil-flags\fP used to provide the compilation and link flags for programs that use -- 2.1.4 -- To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
[PATCH 1/3] merge with 46bc10e27b09cd7f9c149af982063fdf96a1a35f
--- doc/get-wings-flags.1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/get-wings-flags.1 b/doc/get-wings-flags.1 index 7c04894..2ddd8b8 100644 --- a/doc/get-wings-flags.1 +++ b/doc/get-wings-flags.1 @@ -4,11 +4,11 @@ .PP .SH "SYNOPSIS" .B pkg-config -.R WINGs +WINGs .I \-\-cflags .br .B pkg-config -.R WINGs +WINGs .I \-\-libs .SH "DESCRIPTION" \fBget-wings-flags\fP used to provide the compilation and link flags for programs that use -- 2.1.4 -- To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
Re: [PATCH 03/23] WINGs: mark the script 'get-wings-flags' as deprecated
Hi Douglas, - Douglas Torrance a écrit : > Hi Christophe, > > On 04/06/2015 10:57 AM, Christophe CURIS wrote: > > --- a/doc/get-wings-flags.1 > > +++ b/doc/get-wings-flags.1 > > [...] > > +.R WINGs > > I'm getting the following warnings when I run "man --warnings > ./get-wings-flags.1 > /dev/null": > > `R' is a string (producing the registered sign), not a macro. > `R' is a string (producing the registered sign), not a macro. > > This is true for all the get-*-flags manpages. I confirm, I missed these because by default "man" does report anything and I did not know about this nice "--warnings" option... Carlos, I propose the following 3 patchs to fix that. doc/get-wings-flags.1 | 4 ++-- doc/get-wraster-flags.1 | 4 ++-- doc/get-wutil-flags.1 | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) -- To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
