[fossil-users] Sort skins alphabetically patch

2018-01-09 Thread Jungle Boogie 
Hi All,

For your consideration...


Index: src/skins.c
==
--- src/skins.c
+++ src/skins.c
@@ -39,23 +39,23 @@
 static struct BuiltinSkin {
   const char *zDesc;/* Description of this skin */
   const char *zLabel;   /* The directory under skins/ holding this skin */
   char *zSQL;   /* Filled in at run-time with SQL to insert this skin 
*/
 } aBuiltinSkin[] = {
-  { "Default",   "default",   0 },
+  { "Ardoise",   "ardoise",   0 },
+  { "Black & White, Menu on Left",   "black_and_white",   0 },
   { "Blitz", "blitz", 0 },
   { "Blitz, No Logo","blitz_no_logo", 0 },
   { "Bootstrap", "bootstrap", 0 },
-  { "Xekri", "xekri", 0 },
-  { "Original",  "original",  0 },
+  { "Default",   "default",   0 },
+  { "Eagle", "eagle", 0 },
   { "Enhanced Original", "enhanced1", 0 },
-  { "Shadow boxes & Rounded Corners","rounded1",  0 },
-  { "Eagle", "eagle", 0 },
-  { "Black & White, Menu on Left",   "black_and_white",   0 },
+  { "Khaki, No Logo","khaki", 0 },
+  { "Original",  "original",  0 },
   { "Plain Gray, No Logo",   "plain_gray",0 },
-  { "Khaki, No Logo","khaki", 0 },
-  { "Ardoise",   "ardoise",   0 },
+  { "Shadow boxes & Rounded Corners","rounded1",  0 },
+  { "Xekri", "xekri", 0 },
 };
 
 /*
 ** A skin consists of four "files" named here:
 */

Thanks,
j.b.
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] Turning off GCC's "helpful" ansi color escape sequences in error/warning messages

2018-01-09 Thread Martin S. Weber 
On 2018-01-09 19:27:10, The Tick wrote:
> 
> Seems to me that most people will either use script or redirect the make
> output to a file. Computers are simply too fast and the output too
> (...) If you use GCC
> you will probably have noticed that it inserts ansi color escape sequences
> in an attempt to highlight portions of the messages. If you peruse the
> typescript file or log file of your build then these escape sequences are
> very distracting and make it more difficult than necessary to read the
> message. 

GCC is not the only tool with a console UI that does that. In the
"white text on black background" (or vice versa) world, this actually
works somewhat acceptably (minus readability issues). Other color combinations
of terminals - not so much. And you do not know from within the application
what your console's fore- and background colors are (you may possibly sometimes,
but usually you don't). 

So please, if you're a SW dev who is reading this and thinking about
adding color output to your tool of choice, think how it'll look on 
white-on-red, yellow-on-green, black-on-darkgoldenrod, ... , wisen up, 
don't add it or do, please, add an option to turn it off.

Thanks.
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

[fossil-users] Turning off GCC's "helpful" ansi color escape sequences in error/warning messages

2018-01-09 Thread The Tick 


Seems to me that most people will either use script or redirect the make 
output to a file. Computers are simply too fast and the output too 
voluminous to catch warnings and errors as they scroll by. If you use 
GCC you will probably have noticed that it inserts ansi color escape 
sequences in an attempt to highlight portions of the messages. If you 
peruse the typescript file or log file of your build then these escape 
sequences are very distracting and make it more difficult than necessary 
to read the message. GCC does have an option to turn them off.


For fossil builds on windows, create a file "config.w32" in the fossil 
root directory with the contents:


CFLAGS=-fno-diagnostics-color

For unix (which I have not used for a while) I suspect you could just 
invoke configure with:


env CFLAGS=-fno-diagnostics-color ./configure ...
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] New "Ardoise" skin

2018-01-09 Thread jungle Boogie 
On 8 January 2018 at 04:27, Richard Hipp  wrote:
> On 1/8/18, Antoine Chavasse  wrote:
>> I'm not sure I can fix this from the skin, since the background color for
>> ticket reports are configured by the user in the settings.
>>
>
> I might need to enhance Fossil to recognize this situation and make
> automatic adjustments to the background color.
>

If it's not already obvious, the fields on the ticket page are also too bright:
https://www.fossil-scm.org/skins/ardoise/tktview?name=c541b6e734

Thanks for the new skin, Antoine! I appreciate the work.

> --
> D. Richard Hipp
> d...@sqlite.org

-- 
---
inum: 883510009027723
sip: jungleboo...@sip2sip.info
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] Errors in current trunk (24c2b99d) related to TIMESPEC

2018-01-09 Thread The Tick 

On 1/9/2018 2:35 PM, Stephan Beal wrote:


On Tue, Jan 9, 2018 at 9:09 PM, The Tick > wrote:

  src/cson_amalgamation.c: In function 'cson_str_to_json':
  src/cson_amalgamation.c:3888:51: warning: '%04x' directive writing
4 bytes into a region of size between 3 and 5 [-Wformat-overflow=]
   rc = sprintf(ubuf, "\\u%04x\\u%04x",
 ^~~~
  src/cson_amalgamation.c:3888:40: note: directive argument in the
range [56320, 57343]
   rc = sprintf(ubuf, "\\u%04x\\u%04x",
  ^~~~
  src/cson_amalgamation.c:3888:24: note: 'sprintf' output between 13
and 15 bytes into a destination of size 13
   rc = sprintf(ubuf, "\\u%04x\\u%04x",
   ~~~^
(0xd800 | (ch>>10)),

(0xdc00 | (ch & 0x3ff)));



That buffer has been increased to 20 bytes. Please try with the latest
trunk. Thank you for your persistence!

http://fossil-scm.org/fossil/info/e508424e7d7863e1



Zero errors or warnings. Very nice. Thank you.

___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] Errors in current trunk (24c2b99d) related to TIMESPEC

2018-01-09 Thread Stephan Beal 
On Tue, Jan 9, 2018 at 9:09 PM, The Tick  wrote:

>   src/cson_amalgamation.c: In function 'cson_str_to_json':
>   src/cson_amalgamation.c:3888:51: warning: '%04x' directive writing 4
> bytes into a region of size between 3 and 5 [-Wformat-overflow=]
>rc = sprintf(ubuf, "\\u%04x\\u%04x",
>  ^~~~
>   src/cson_amalgamation.c:3888:40: note: directive argument in the range
> [56320, 57343]
>rc = sprintf(ubuf, "\\u%04x\\u%04x",
>   ^~~~
>   src/cson_amalgamation.c:3888:24: note: 'sprintf' output between 13 and
> 15 bytes into a destination of size 13
>rc = sprintf(ubuf, "\\u%04x\\u%04x",
>~~~^
> (0xd800 | (ch>>10)),
> 
> (0xdc00 | (ch & 0x3ff)));
> 
>

That buffer has been increased to 20 bytes. Please try with the latest
trunk. Thank you for your persistence!

http://fossil-scm.org/fossil/info/e508424e7d7863e1

-- 
- stephan beal
http://wanderinghorse.net/home/stephan/
"Freedom is sloppy. But since tyranny's the only guaranteed byproduct of
those who insist on a perfect world, freedom will have to do." -- Bigby Wolf
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] Errors in current trunk (24c2b99d) related to TIMESPEC

2018-01-09 Thread Stephan Beal 
i will take a look at the cson warnings - that fike is generated from an
upstream tree.

- stephan
Sent from a mobile device, possibly from bed. Please excuse brevity, typos,
and top-posting.

On Jan 9, 2018 21:17, "jungle Boogie"  wrote:

> On 9 January 2018 at 06:32, Richard Hipp  wrote:
> > A new version of Fossil is now on trunk.
> > (https://www.fossil-scm.org/fossil/info/9a33a240a2101ede)  Please try
> > again to build on every platform you have at hand, but especially all
> > variations of MSVC and MinGW, and let me know whether or not you run
> > into build issues.
> >
>
> I don't see any build errors when using MS Visual Studio 2017,
> v15.0.26730.16.
> I just performed a fossil up trunk and the make flags.
>
>
> > --
> > D. Richard Hipp
> > d...@sqlite.org
> ___
> fossil-users mailing list
> fossil-users@lists.fossil-scm.org
> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
>
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] Errors in current trunk (24c2b99d) related to TIMESPEC

2018-01-09 Thread jungle Boogie 
On 9 January 2018 at 06:32, Richard Hipp  wrote:
> A new version of Fossil is now on trunk.
> (https://www.fossil-scm.org/fossil/info/9a33a240a2101ede)  Please try
> again to build on every platform you have at hand, but especially all
> variations of MSVC and MinGW, and let me know whether or not you run
> into build issues.
>

I don't see any build errors when using MS Visual Studio 2017, v15.0.26730.16.
I just performed a fossil up trunk and the make flags.


> --
> D. Richard Hipp
> d...@sqlite.org
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] Errors in current trunk (24c2b99d) related to TIMESPEC

2018-01-09 Thread The Tick 

On 1/9/2018 1:50 PM, Richard Hipp wrote:

On 1/9/18, The Tick  wrote:


Fossil 666fc089b8 compiles successfully although there are still a few
warnings for shell.c. Thank you.



What about the later 9a33a240 check-in.  Does it fix all the warnings for you?



Fossil 9a33a240 compiles >much< cleaner -- there are no warnings for shell.c

$ Fossil-9a33a240/fossil.exe version -v
  This is fossil version 2.5 [9a33a240a2] 2018-01-09 14:29:29 UTC
  Compiled on Jan  9 2018 13:44:57 using mingw32 (64-bit)
  Schema version 2015-01-24
  zlib 1.2.11, loaded 1.2.11
  hardened-SHA1 by Marc Stevens and Dan Shumow
  SSL (OpenSSL 1.1.0f  25 May 2017)
  FOSSIL_ENABLE_LEGACY_MV_RM
  FOSSIL_ENABLE_EXEC_REL_PATHS
  FOSSIL_ENABLE_TH1_DOCS
  FOSSIL_ENABLE_TH1_HOOKS
  TCL (Tcl 8.6.6, loaded TH_OK: 8.6.8)
  USE_TCL_STUBS
  FOSSIL_TCL_STUBS
  FOSSIL_ENABLE_TCL_PRIVATE_STUBS
  JSON (API 20120713)
  MBCS_COMMAND_LINE
  FOSSIL_STATIC_BUILD
  SQLite 3.22.0 2018-01-09 14:27:58 a7446d3217
  SQLITE_DEFAULT_FILE_FORMAT=4
  SQLITE_DEFAULT_WAL_SYNCHRONOUS=1
  SQLITE_ENABLE_DBSTAT_VTAB
  SQLITE_ENABLE_FTS3_PARENTHESIS
  SQLITE_ENABLE_FTS4
  SQLITE_ENABLE_FTS5
  SQLITE_ENABLE_JSON1
  SQLITE_ENABLE_LOCKING_STYLE=0
  SQLITE_ENABLE_STMTVTAB
  SQLITE_LIKE_DOESNT_MATCH_BLOBS
  SQLITE_MAX_EXPR_DEPTH=0
  SQLITE_OMIT_DECLTYPE
  SQLITE_OMIT_DEPRECATED
  SQLITE_OMIT_GET_TABLE
  SQLITE_OMIT_LOAD_EXTENSION
  SQLITE_OMIT_PROGRESS_CALLBACK
  SQLITE_OMIT_SHARED_CACHE
  SQLITE_THREADSAFE=0
  SQLITE_USE_ALLOCA

The only warnings I get are:

  gcc -Wall -Wdeclaration-after-statement -Os -Lsrc/../compat/zlib 
-Isrc/../compat/zlib -Lsrc/../compat/openssl-1.1.0f 
-Isrc/../compat/openssl-1.1.0f/include 
-Lsrc/../compat/Tcl8.6.6srcdir/win 
-Isrc/../compat/Tcl8.6.6srcdir/generic 
-Isrc/../compat/Tcl8.6.6srcdir/win -DBROKEN_MINGW_CMDLINE=1 
-DFOSSIL_ENABLE_SSL=1 -DFOSSIL_ENABLE_EXEC_REL_PATHS=1 
-DFOSSIL_ENABLE_LEGACY_MV_RM=1 -DFOSSIL_ENABLE_TH1_DOCS=1 
-DFOSSIL_ENABLE_TH1_HOOKS=1 -DFOSSIL_ENABLE_TCL=1 
-DFOSSIL_ENABLE_TCL_STUBS=1 -DUSE_TCL_STUBS 
-DFOSSIL_ENABLE_TCL_PRIVATE_STUBS=1 -DFOSSIL_ENABLE_JSON=1  -I. -Isrc -c 
src/cson_amalgamation.c -o wbld/cson_amalgamation.o

  src/cson_amalgamation.c: In function 'cson_str_to_json':
  src/cson_amalgamation.c:3888:51: warning: '%04x' directive writing 4 
bytes into a region of size between 3 and 5 [-Wformat-overflow=]

   rc = sprintf(ubuf, "\\u%04x\\u%04x",
 ^~~~
  src/cson_amalgamation.c:3888:40: note: directive argument in the 
range [56320, 57343]

   rc = sprintf(ubuf, "\\u%04x\\u%04x",
  ^~~~
  src/cson_amalgamation.c:3888:24: note: 'sprintf' output between 13 
and 15 bytes into a destination of size 13

   rc = sprintf(ubuf, "\\u%04x\\u%04x",
   ~~~^
(0xd800 | (ch>>10)),

(0xdc00 | (ch & 0x3ff)));



GCC has the following that can remove "bogus" warnings:

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat-overflow"

  :
  :

#pragma GCC diagnostic pop


I have no idea if other compilers have a method to avoid warning 
messages in particular circumstances.

___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] Errors in current trunk (24c2b99d) related to TIMESPEC

2018-01-09 Thread Richard Hipp 
On 1/9/18, The Tick  wrote:
>
> Fossil 666fc089b8 compiles successfully although there are still a few
> warnings for shell.c. Thank you.
>

What about the later 9a33a240 check-in.  Does it fix all the warnings for you?

-- 
D. Richard Hipp
d...@sqlite.org
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] Errors in current trunk (24c2b99d) related to TIMESPEC

2018-01-09 Thread The Tick 

On 1/8/2018 6:57 PM, Richard Hipp wrote:

On 1/8/18, The Tick  wrote:


Curious about the new skins, I attempted to compile Fossil-24c2b99d on
win7x64 with a current (as of today) MSYS2 using



There are changes on trunk that might fix these build problem.  But,
as nobody here has been able to reproduce them, we cannot be sure.
Therefore, please try the latest trunk check-in and see if it is
working better for you and report back.  Thanks.



Fossil 666fc089b8 compiles successfully although there are still a few 
warnings for shell.c. Thank you.


$ Fossil-666fc089/fossil version -v
  This is fossil version 2.5 [666fc089b8] 2018-01-09 02:28:19 UTC
  Compiled on Jan  9 2018 02:10:43 using mingw32 (64-bit)
  Schema version 2015-01-24
  zlib 1.2.11, loaded 1.2.11
  hardened-SHA1 by Marc Stevens and Dan Shumow
  SSL (OpenSSL 1.1.0f  25 May 2017)
  FOSSIL_ENABLE_LEGACY_MV_RM
  FOSSIL_ENABLE_EXEC_REL_PATHS
  FOSSIL_ENABLE_TH1_DOCS
  FOSSIL_ENABLE_TH1_HOOKS
  TCL (Tcl 8.6.6, loaded TH_OK: 8.6.8)
  USE_TCL_STUBS
  FOSSIL_TCL_STUBS
  FOSSIL_ENABLE_TCL_PRIVATE_STUBS
  JSON (API 20120713)
  MBCS_COMMAND_LINE
  FOSSIL_STATIC_BUILD
  SQLite 3.22.0 2018-01-09 02:27:13 cba0206a15
  SQLITE_DEFAULT_FILE_FORMAT=4
  SQLITE_DEFAULT_WAL_SYNCHRONOUS=1
  SQLITE_ENABLE_DBSTAT_VTAB
  SQLITE_ENABLE_FTS3_PARENTHESIS
  SQLITE_ENABLE_FTS4
  SQLITE_ENABLE_FTS5
  SQLITE_ENABLE_JSON1
  SQLITE_ENABLE_LOCKING_STYLE=0
  SQLITE_ENABLE_STMTVTAB
  SQLITE_LIKE_DOESNT_MATCH_BLOBS
  SQLITE_MAX_EXPR_DEPTH=0
  SQLITE_OMIT_DECLTYPE
  SQLITE_OMIT_DEPRECATED
  SQLITE_OMIT_GET_TABLE
  SQLITE_OMIT_LOAD_EXTENSION
  SQLITE_OMIT_PROGRESS_CALLBACK
  SQLITE_OMIT_SHARED_CACHE
  SQLITE_THREADSAFE=0
  SQLITE_USE_ALLOCA


FYI, here are the warnings:

  gcc -Wall -Wdeclaration-after-statement -Os -Lsrc/../compat/zlib 
-Isrc/../compat/zlib -Lsrc/../compat/openssl-1.1.0f 
-Isrc/../compat/openssl-1.1.0f/include 
-Lsrc/../compat/Tcl8.6.6srcdir/win 
-Isrc/../compat/Tcl8.6.6srcdir/generic 
-Isrc/../compat/Tcl8.6.6srcdir/win -DBROKEN_MINGW_CMDLINE=1 
-DFOSSIL_ENABLE_SSL=1 -DFOSSIL_ENABLE_EXEC_REL_PATHS=1 
-DFOSSIL_ENABLE_LEGACY_MV_RM=1 -DFOSSIL_ENABLE_TH1_DOCS=1 
-DFOSSIL_ENABLE_TH1_HOOKS=1 -DFOSSIL_ENABLE_TCL=1 
-DFOSSIL_ENABLE_TCL_STUBS=1 -DUSE_TCL_STUBS 
-DFOSSIL_ENABLE_TCL_PRIVATE_STUBS=1 -DFOSSIL_ENABLE_JSON=1  -I. -Isrc 
-Dmain=sqlite3_shell -DSQLITE_SHELL_IS_UTF8=1 
-DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE= 
-DSQLITE_SHELL_DBNAME_PROC=fossil_open -Daccess=file_access 
-Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen   -c 
src/shell.c -o wbld/shell.o

  src/shell.c: In function 'fsdirNext':
  src/shell.c:2505:30: warning: passing argument 2 of '_stat64i32' from 
incompatible pointer type [-Wincompatible-pointer-types]

 if( lstat(pCur->zPath, >sStat) ){
^
  src/shell.c:2079:38: note: in definition of macro 'lstat'
   #  define lstat(path,buf) _stat(path,buf)
^~~
  In file included from src/shell.c:108:0:
  D:/msys64/mingw64/x86_64-w64-mingw32/include/sys/stat.h:101:28: note: 
expected 'struct _stat64i32 *' but argument is of type 'struct _stat64 *'
 __CRT_INLINE int __cdecl _stat64i32(const char *_Name,struct 
_stat64i32 *_Stat)

  ^~
  src/shell.c: In function 'fsdirFilter':
  src/shell.c:2639:26: warning: passing argument 2 of '_stat64i32' from 
incompatible pointer type [-Wincompatible-pointer-types]

 if( lstat(pCur->zPath, >sStat) ){
^
  src/shell.c:2079:38: note: in definition of macro 'lstat'
   #  define lstat(path,buf) _stat(path,buf)
^~~
  In file included from src/shell.c:108:0:
  D:/msys64/mingw64/x86_64-w64-mingw32/include/sys/stat.h:101:28: note: 
expected 'struct _stat64i32 *' but argument is of type 'struct _stat64 *'
 __CRT_INLINE int __cdecl _stat64i32(const char *_Name,struct 
_stat64i32 *_Stat)

  ^~


And for completeness, here is the 'make' command I've been using:

$ make \
-f win/Makefile.mingw \
X64=1 \
FOSSIL_TCL_SOURCE=0 \
FOSSIL_ENABLE_JSON=1 \
FOSSIL_ENABLE_SSL=1 \
FOSSIL_BUILD_SSL=1 \
FOSSIL_ENABLE_EXEC_REL_PATHS=1 \
FOSSIL_ENABLE_LEGACY_MV_RM=1 \
FOSSIL_ENABLE_TH1_DOCS=1 \
FOSSIL_ENABLE_TH1_HOOKS=1 \
FOSSIL_ENABLE_TCL=1 \
FOSSIL_ENABLE_TCL_STUBS=1 \
FOSSIL_ENABLE_TCL_PRIVATE_STUBS=1 \
OPENSSLDIR='$(SRCDIR)/../compat/'$OPENSSLDIR \
TCLDIR='$(SRCDIR)/../compat/'$TCLDIR \
TCLSRCDIR='$(SRCDIR)/../compat/'$TCLSRCDIR



___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] Errors in current trunk (24c2b99d) related to TIMESPEC

2018-01-09 Thread Richard Hipp 
A new version of Fossil is now on trunk.
(https://www.fossil-scm.org/fossil/info/9a33a240a2101ede)  Please try
again to build on every platform you have at hand, but especially all
variations of MSVC and MinGW, and let me know whether or not you run
into build issues.

-- 
D. Richard Hipp
d...@sqlite.org
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users