Hello community, here is the log from the commit of package ugrep for openSUSE:Factory checked in at 2020-08-17 12:05:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ugrep (Old) and /work/SRC/openSUSE:Factory/.ugrep.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ugrep" Mon Aug 17 12:05:56 2020 rev:6 rq:826999 version:2.5.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ugrep/ugrep.changes 2020-08-12 10:39:14.016372730 +0200 +++ /work/SRC/openSUSE:Factory/.ugrep.new.3399/ugrep.changes 2020-08-17 12:06:21.830727148 +0200 @@ -1,0 +2,6 @@ +Sun Aug 16 09:10:12 UTC 2020 - Andreas Stieger <[email protected]> + +- ugrep 2.5.2: + * Query UI monitor enhancements + +------------------------------------------------------------------- Old: ---- ugrep-2.5.1.tar.gz New: ---- ugrep-2.5.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ugrep.spec ++++++ --- /var/tmp/diff_new_pack.O1X9lm/_old 2020-08-17 12:06:22.570727561 +0200 +++ /var/tmp/diff_new_pack.O1X9lm/_new 2020-08-17 12:06:22.574727562 +0200 @@ -17,7 +17,7 @@ Name: ugrep -Version: 2.5.1 +Version: 2.5.2 Release: 0 Summary: Universal grep: a feature-rich grep implementation with focus on speed License: BSD-3-Clause @@ -27,8 +27,8 @@ BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: pkgconfig(bzip2) +BuildRequires: pkgconfig(liblz4) >= 1.8.2 BuildRequires: pkgconfig(liblzma) -BuildRequires: pkgconfig(liblz4) BuildRequires: pkgconfig(libpcre2-8) BuildRequires: pkgconfig(zlib) ++++++ ugrep-2.5.1.tar.gz -> ugrep-2.5.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ugrep-2.5.1/Formula/ugrep.rb new/ugrep-2.5.2/Formula/ugrep.rb --- old/ugrep-2.5.1/Formula/ugrep.rb 2020-08-10 16:18:32.000000000 +0200 +++ new/ugrep-2.5.2/Formula/ugrep.rb 1970-01-01 01:00:00.000000000 +0100 @@ -1,27 +0,0 @@ -class Ugrep < Formula - env :std - desc "Ultra fast grep with query UI, fuzzy search, archive search, and more" - homepage "https://github.com/Genivia/ugrep"; - url "https://github.com/Genivia/ugrep/archive/v2.5.0.tar.gz"; - sha256 "98cc23f27ec4ebba14d36f21b5625e0def4aab3e65afecc609e676938002b110" - - depends_on "pcre2" - depends_on "xz" - - def install - ENV.O2 - ENV.deparallelize - ENV.delete('CFLAGS') - ENV.delete('CXXFLAGS') - system "./configure", "--enable-color", - "--disable-dependency-tracking", - "--disable-silent-rules", - "--prefix=#{prefix}" - system "make" - system "make", "install" - end - - test do - system "make", "test" - end -end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ugrep-2.5.1/README.md new/ugrep-2.5.2/README.md --- old/ugrep-2.5.1/README.md 2020-08-10 16:18:32.000000000 +0200 +++ new/ugrep-2.5.2/README.md 2020-08-12 20:25:11.000000000 +0200 @@ -157,7 +157,7 @@ Install the latest **ugrep** with [Homebrew](https://brew.sh): - $ brew install https://raw.githubusercontent.com/Genivia/ugrep/master/Formula/ugrep.rb + $ brew install ugrep This installs the `ugrep` and `ug` commands, where `ug` is the same as `ugrep` but also loads the configuration file .ugrep when present in the working @@ -625,8 +625,8 @@ GNU/BSD grep, pattern `a*` matches every line in the input, and actually matches `xyz` three times (the empty transitions before and between the `x`, `y`, and `z`). Allowing empty matches requires **ugrep** option `-Y`. - Patterns that start with `^` and end with `$` are permitted to match empty, - e.g. `^\h*$`, by implicitly enabling `-Y`. + Patterns that start with `^` or end with `$`, such as `^\h*$`, match empty. + These patterns automatically enable option `-Y`. - **ugrep** option `-D, --devices=ACTION` is `skip` by default, instead of `read`. This prevents unexpectedly hanging on named pipes in directories that are recursively searched, as may happen with GNU/BSD grep that `read` @@ -634,12 +634,12 @@ - **ugrep** option `-d, --directories=ACTION` is `skip` by default, instead of `read`. By default, directories specified on the command line are searched, but not recursively deeper into subdirectories. -- **ugrep** does not use a `.greprc` configuration file or a `GREP_OPTIONS` - environment variable, because the behavior of **ugrep** must be portable and - predictable on every system, without having to copy the configuration files - to each system. Also GNU grep abandoned `GREP_OPTIONS` for this reason. - Instead, please use shell aliases to create new commands with specific search - options. +- **ugrep** does not the `GREP_OPTIONS` environment variable, because the + behavior of **ugrep** must be portable and predictable on every system. Also + GNU grep abandoned `GREP_OPTIONS` for this reason. Please use the `ug` + command that loads the .ugrep configuration file located in the working + directory or in the home directory when present, or use shell aliases to + create new commands with specific search options. 🔝 [Back to table of contents](#toc) @@ -1027,6 +1027,10 @@ `Right` `Ctrl-F` | move right `PgUp` `Ctrl-G` | move display up by a page `PgDn` `Ctrl-D` | move display down by a page +`Alt-Up` | move display up by 1/2 page (MacOS `Shift-Up`) +`Alt-Down` | move display down by 1/2 page (MacOS `Shift-Down`) +`Alt-Left` | move display left by 1/2 page (MacOS `Shift-Left`) +`Alt-Right` | move display right by 1/2 page (MacOS `Shift-Right`) `Home` `Ctrl-A` | move cursor to the begin of line `End` `Ctrl-E` | move cursor to the end of line `Ctrl-K` | delete after cursor @@ -1673,11 +1677,13 @@ When option `-z` is used with options `-g`, `-O`, `-M`, or `-t`, archives and compressed and uncompressed files that match the filename selection criteria (glob, extension, magic bytes, or file type) are searched only. For example, -`ugrep -r -z -tc++` searches C++ files such as `main.cpp`, and also -`main.cpp.gz` and `main.cpp.xz` when present. Also any cpio, pax, tar, and zip -archives when present are searched for C++ files such as `main.cpp`. Use -option `--stats` to see a list of the glob patterns applied to filter file -pathnames in the recursive search and when searching archive contents. +`ugrep -r -z -tc++` searches C++ files such as `main.cpp` and zip and tar +archives that contain C++ files such as `main.cpp`. Also included in the +search are compressed C++ files such as `main.cpp.gz` and `main.cpp.xz` when +present. Also any cpio, pax, tar, and zip archives when present are searched +for C++ files that they contain, such as `main.cpp`. Use option `--stats` to +see a list of the glob patterns applied to filter file pathnames in the +recursive search and when searching archive contents. When option `-z` is used with options `-g`, `-O`, `-M`, or `-t` to search cpio, jar, pax, tar, and zip archives, archived files that match the filename selection @@ -1926,19 +1932,19 @@ lines or bytes) `tr` (translate), `iconv` and `uconv` (convert), and more advanced document conversion utilities such as: -- [`pdftotext`](https://pypi.org/project/pdftotext) to convert PDF to text, +- [`pdftotext`](https://pypi.org/project/pdftotext) to convert PDF to text - [`pandoc`](https://pandoc.org) to convert .docx, .epub, and other document - formats, -- [`soffice`](https://www.libreoffice.org) to convert office documents, -- [`csvkit`](https://pypi.org/project/csvkit) to convert spreadsheets, and + formats +- [`soffice`](https://www.libreoffice.org) to convert office documents +- [`csvkit`](https://pypi.org/project/csvkit) to convert spreadsheets - [`openssl`](https://wiki.openssl.org/index.php/Command_Line_Utilities) to - convert certificates and key files. + convert certificates and key files to text and other formats - [`exiftool`](http://exiftool.sourceforge.net) to read meta information embedded in images. Also decompressors may be used as filter utilities, such as `unzip`, `gunzip`, -`bunzip2`, `unlzma`, and `unxz` that can decompress files to standard output by -specifying option `--stdout`. However, **ugrep** option `-z` is typically +`bunzip2`, `unlzma`, and `unxz` that decompress files to standard output when +option `--stdout` is specified. However, **ugrep** option `-z` is typically faster to search compressed files. The `--filter` option may also be used to run a user-defined shell script to @@ -2673,16 +2679,12 @@ ### Output matches in JSON, XML, CSV, C++ - --cpp - Output file matches in C++. See also options --format and -u. - --csv - Output file matches in CSV. If -H, -n, -k, or -b is specified, + --cpp Output file matches in C++. See also options --format and -u. + --csv Output file matches in CSV. If -H, -n, -k, or -b is specified, additional values are output. See also options --format and -u. - --json - Output file matches in JSON. If -H, -n, -k, or -b is specified, + --json Output file matches in JSON. If -H, -n, -k, or -b is specified, additional values are output. See also options --format and -u. - --xml - Output file matches in XML. If -H, -n, -k, or -b is specified, + --xml Output file matches in XML. If -H, -n, -k, or -b is specified, additional values are output. See also options --format and -u. To recursively search for lines with `TODO` and display C++ file matches in @@ -4307,7 +4309,7 @@ - ugrep 2.5.1 August 10, 2020 UGREP(1) + ugrep 2.5.2 August 12, 2020 UGREP(1) 🔝 [Back to table of contents](#toc) Binary files old/ugrep-2.5.1/bin/win32/ugrep.exe and new/ugrep-2.5.2/bin/win32/ugrep.exe differ Binary files old/ugrep-2.5.1/bin/win64/ugrep.exe and new/ugrep-2.5.2/bin/win64/ugrep.exe differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ugrep-2.5.1/man/ugrep.1 new/ugrep-2.5.2/man/ugrep.1 --- old/ugrep-2.5.1/man/ugrep.1 2020-08-10 16:18:32.000000000 +0200 +++ new/ugrep-2.5.2/man/ugrep.1 2020-08-12 20:25:11.000000000 +0200 @@ -1,4 +1,4 @@ -.TH UGREP "1" "August 10, 2020" "ugrep 2.5.1" "User Commands" +.TH UGREP "1" "August 12, 2020" "ugrep 2.5.2" "User Commands" .SH NAME \fBugrep\fR, \fBug\fR -- file pattern searcher .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ugrep-2.5.1/src/query.cpp new/ugrep-2.5.2/src/query.cpp --- old/ugrep-2.5.1/src/query.cpp 2020-08-10 16:18:32.000000000 +0200 +++ new/ugrep-2.5.2/src/query.cpp 2020-08-12 20:25:11.000000000 +0200 @@ -1250,7 +1250,7 @@ row_ = 0; rows_ = 0; skip_ = 0; - dots_ = 3; + dots_ = 0; if (!eof_) { @@ -1366,7 +1366,6 @@ searching_[10] = '.'; searching_[11] = '.'; searching_[9 + dots_] = '\0'; - dots_ = (dots_ + 1) & 3; Screen::put(rows_ - row_ + 1, 0, eof_ ? "(END)" : searching_); Screen::normal(); @@ -1374,6 +1373,8 @@ // when searching, don't immediately clear the rest of the screen if (eof_ || dots_ == 3) Screen::end(); + + dots_ = (dots_ + 1) & 3; } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ugrep-2.5.1/src/ugrep.cpp new/ugrep-2.5.2/src/ugrep.cpp --- old/ugrep-2.5.1/src/ugrep.cpp 2020-08-10 16:18:32.000000000 +0200 +++ new/ugrep-2.5.2/src/ugrep.cpp 2020-08-12 20:25:11.000000000 +0200 @@ -67,7 +67,7 @@ */ // ugrep version -#define UGREP_VERSION "2.5.1" +#define UGREP_VERSION "2.5.2" #include "ugrep.hpp" #include "glob.hpp" @@ -1596,6 +1596,7 @@ virtual ~Grep() { +#ifdef HAVE_LIBZ if (stream != NULL) { delete stream; @@ -1615,6 +1616,7 @@ thread.join(); } #endif +#endif } // search the specified files or standard input for pattern matches
