pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics/scrot scrot: Update to 1.1.1



details:   https://anonhg.NetBSD.org/pkgsrc/rev/903e27985143
branches:  trunk
changeset: 399910:903e27985143
user:      fox <fox%pkgsrc.org@localhost>
date:      Sun Aug 18 16:52:03 2019 +0000

description:
scrot: Update to 1.1.1

Removes patch-aa and patch-ab since they are no longer applicable to 1.1.1

Thanks to ng0 for coming up with the update patch.

Changes since 0.8:

Tue Jul 11 23:45:00 -03:00 2019  Joao Eriberto Mota Filho <eriberto%eriberto.pro.br@localhost>
Version 1.1.1

  [ Daniel T. Borelli ]

  * Update manpage and help.

  [ Joao Eriberto Mota Filho ]

  * New release.

Tue Jul 09 18:51:00 -03:00 2019  Joao Eriberto Mota Filho <eriberto%eriberto.pro.br@localhost>
Version 1.1

  [ Daniel T. Borelli ]

  * Added (-n, --note) to draw a text.
  * Added (-l, --line) to define the line to use to select an area to capture.

  [ Jade Auer ]

  * Added a specifier ($a) to embed hostname in output file.

  [ Joao Eriberto Mota Filho ]

  * Added a check for autoconf-archive presence in configure.ac.
  * Added rights for Jade.
  * Adjusted Makefile.am to remove src/scrot_config.h when distclean.
  * Updated manpage.
  * Final adjustments for a new release.
  * Several tests in Debian.

Sun Jun 11 11:01:00 -03:00 2019  Joao Eriberto Mota Filho <eriberto%eriberto.pro.br@localhost>
Version 1.0

  [ Daniel Lublin ]

  * Added EXIT_FAILURE when are no arguments required by some options. Fix
    Debian bug #685173.
  * Improved the manpage to show undocumented options.

  [ Daniel T. Borelli ]

  * Added option: --overwrite or -o. Now, by default do not overwrite the file.
    Fix Debian bug #807139.
  * Added support to grab mouse pointer (-p option). Fix Ubuntu bug #1698375.
  * Added support to freeze the screen when selection is activated (-f option).
  * Do not use gib_eprintf in calls to X11 functions. Fix Ubuntu bug #1523212.
  * Fix: scrot can't save files without extension. Fix Ubuntu bug #148659.
  * Fix: scrot don't complain about invalid numeric argument. Fix Ubuntu
    bug #371784.
  * Fixed some compiling warnings.

  [ Joao Eriberto Mota Filho ]

  * Final adjustments for a new release.
  * Several tests in Debian.
  * Updated AUTHORS file.

Tue Feb 12 19:06:11 -03:00 2019  Joao Eriberto Mota Filho <eriberto%eriberto.pro.br@localhost>
Version 0.9

  * Added --autoselect rectangle option. Thanks to Stoney Sauce
    <stoneysauce%gmail.com@localhost>.
  * Added --focused option. Thanks to James Cameron <quozl%us.netrek.org@localhost>.
  * Added an autogen.sh file.
  * Added some explanation about how to help the project.
  * Character cleanup for UTF-8 compatibility. Thanks to William Vera
    <billy%billy.com.mx@localhost>.
  * Fixed a missing option for beep prevention. Thanks to Ibragimov Rinat
    <ibragimovrinat%mail.ru@localhost>.
  * Fixed spelling errors in final binary. Thanks to William Vera
    <billy%billy.com.mx@localhost>.
  * Improved the autotools (acinclude.m4, configure.ac, Makefile.am and
    src/Makefile.am).
  * Improved the GCC hardening.
  * Prevent arbitrary long file names. Thanks to George Danchev
    <danchev%spnet.net@localhost>.
  * Several fixes in manpage.

diffstat:

 graphics/scrot/DESCR                      |   6 +++-
 graphics/scrot/Makefile                   |  22 ++++++++++++------
 graphics/scrot/PLIST                      |   6 +----
 graphics/scrot/distinfo                   |  13 +++++------
 graphics/scrot/patches/patch-aa           |  13 -----------
 graphics/scrot/patches/patch-ab           |  14 ------------
 graphics/scrot/patches/patch-src_getopt.c |  36 +++++++++++++++++++++++++++++++
 7 files changed, 62 insertions(+), 48 deletions(-)

diffs (150 lines):

diff -r ddda3c4a3272 -r 903e27985143 graphics/scrot/DESCR
--- a/graphics/scrot/DESCR      Sun Aug 18 16:47:38 2019 +0000
+++ b/graphics/scrot/DESCR      Sun Aug 18 16:52:03 2019 +0000
@@ -1,2 +1,4 @@
-scrot is a commandline screen capture util like "import",
-but using imlib2
+scrot (SCReenshOT) is a simple command line screen capture
+utility that uses imlib2 to grab and save images. Multiple
+image formats are supported through imlib2's dynamic saver
+modules.
diff -r ddda3c4a3272 -r 903e27985143 graphics/scrot/Makefile
--- a/graphics/scrot/Makefile   Sun Aug 18 16:47:38 2019 +0000
+++ b/graphics/scrot/Makefile   Sun Aug 18 16:52:03 2019 +0000
@@ -1,16 +1,24 @@
-# $NetBSD: Makefile,v 1.34 2017/09/04 18:00:56 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2019/08/18 16:52:03 fox Exp $
 
-DISTNAME=      scrot-0.8
-PKGREVISION=   20
+DISTNAME=      scrot-1.1.1
 CATEGORIES=    graphics
-MASTER_SITES=  http://linuxbrit.co.uk/downloads/
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=resurrecting-open-source-projects/}
+GITHUB_TAG=    ${PKGVERSION_NOREV}
+EXTRACT_USING= bsdtar
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-#HOMEPAGE=     http://linuxbrit.co.uk/scrot/
+HOMEPAGE=      https://github.com/resurrecting-open-source-projects/scrot
 COMMENT=       Commandline screen capture util like "import", but using imlib2
+LICENSE=       mit
 
-GNU_CONFIGURE= YES
+TOOL_DEPENDS+= autoconf-archive-[0-9]*:../../devel/autoconf-archive
+
+USE_TOOLS+=    autoreconf automake m4
+
+GNU_CONFIGURE= yes
+
+pre-configure:
+       cd ${WRKSRC} && autoreconf -i
 
 .include "../../devel/giblib/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff -r ddda3c4a3272 -r 903e27985143 graphics/scrot/PLIST
--- a/graphics/scrot/PLIST      Sun Aug 18 16:47:38 2019 +0000
+++ b/graphics/scrot/PLIST      Sun Aug 18 16:52:03 2019 +0000
@@ -1,7 +1,3 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:59:28 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2019/08/18 16:52:03 fox Exp $
 bin/scrot
 man/man1/scrot.1
-share/doc/scrot/AUTHORS
-share/doc/scrot/ChangeLog
-share/doc/scrot/README
-share/doc/scrot/TODO
diff -r ddda3c4a3272 -r 903e27985143 graphics/scrot/distinfo
--- a/graphics/scrot/distinfo   Sun Aug 18 16:47:38 2019 +0000
+++ b/graphics/scrot/distinfo   Sun Aug 18 16:52:03 2019 +0000
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.6 2015/11/03 21:34:20 agc Exp $
+$NetBSD: distinfo,v 1.7 2019/08/18 16:52:03 fox Exp $
 
-SHA1 (scrot-0.8.tar.gz) = 674fcb4860f1dcfa02cde7d82414e1e1c731aa75
-RMD160 (scrot-0.8.tar.gz) = e082ee2dedea50756df0b53d212f9270ca201533
-SHA512 (scrot-0.8.tar.gz) = cba8f589e45758ddbfe4e276399a1ecb0dbe29569be5d85d97733e7f64de2911bd2d03e62700ad0c718a1fc886c2e3def9dee1de5cac884f9e65e772cebe838c
-Size (scrot-0.8.tar.gz) = 74324 bytes
-SHA1 (patch-aa) = b42dd5e4e336db20cd1da9ceabb29392bd2c4f5d
-SHA1 (patch-ab) = d4da1775b6174f20785557ab96404514d426c5d0
+SHA1 (scrot-1.1.1.tar.gz) = f55835cd5ce3cc16154ca700ed664409a79a497e
+RMD160 (scrot-1.1.1.tar.gz) = dbdef82be484bc071acac01339841b8a21812426
+SHA512 (scrot-1.1.1.tar.gz) = 6444fec6d793053b120a6f81bb1696b2c3d1a48f2b7d3949f63ab7e97cbd60d87962b87e52bf43acfae12c3381d59f7924c0f7c71d5372876d14a698f9b9f138
+Size (scrot-1.1.1.tar.gz) = 36473 bytes
+SHA1 (patch-src_getopt.c) = 8008e9c52cfe5c3dd76fd47ce96a9e0d2d36783f
diff -r ddda3c4a3272 -r 903e27985143 graphics/scrot/patches/patch-aa
--- a/graphics/scrot/patches/patch-aa   Sun Aug 18 16:47:38 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2003/04/27 19:29:03 jmmv Exp $
-
---- Makefile.in.orig   2001-08-29 20:57:11.000000000 +0200
-+++ Makefile.in
-@@ -82,7 +82,7 @@ INCLUDES = -I/usr/X11R6/include $(X_CFLA
- man_MANS = scrot.1
- 
- docs_DATA = README AUTHORS ChangeLog TODO
--docsdir = $(prefix)/doc/scrot
-+docsdir = $(datadir)/doc/scrot
- 
- EXTRA_DIST =  scrot.spec scrot.1 $(docs_DATA)
- 
diff -r ddda3c4a3272 -r 903e27985143 graphics/scrot/patches/patch-ab
--- a/graphics/scrot/patches/patch-ab   Sun Aug 18 16:47:38 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2003/06/16 18:49:18 jmc Exp $
-
---- src/scrot.h.orig   Wed Aug 29 18:39:57 2001
-+++ src/scrot.h        Mon Jun 16 13:21:47 2003
-@@ -90,4 +90,9 @@
- extern Window root;
- extern Screen *scr;
- 
-+/* Giblib routines. */
-+#define eprintf               gib_eprintf
-+#define _emalloc      gib_emalloc
-+#define weprintf      gib_weprintf
-+#define _estrdup      gib_estrdup
- #endif
diff -r ddda3c4a3272 -r 903e27985143 graphics/scrot/patches/patch-src_getopt.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/scrot/patches/patch-src_getopt.c Sun Aug 18 16:52:03 2019 +0000
@@ -0,0 +1,36 @@
+$NetBSD: patch-src_getopt.c,v 1.1 2019/08/18 16:52:03 fox Exp $
+
+1. Adds missing string.h header unconditionally, this is needed
+   for proper builds since it is used by getopt functions.
+
+   Upstream bug report: https://github.com/resurrecting-open-source-projects/scrot/issues/26
+
+2. Adds brackets for "if" to prevent ambigious "else"
+   (-Wparentheses)
+
+--- src/getopt.c.orig  2019-08-18 15:26:09.139597715 +0000
++++ src/getopt.c
+@@ -76,6 +76,8 @@
+ #endif
+ #endif
+ 
++#include <string.h>
++
+ #ifndef _
+ /* This is for other GNU distributions with internationalized messages.
+    When compiling libc, the _ macro is predefined.  */
+@@ -692,6 +696,7 @@ _getopt_internal(argc, argv, optstring, 
+             else
+             {
+                if (opterr)
++               {
+                   if (argv[optind - 1][1] == '-')
+                      /* --option */
+                      fprintf(stderr,
+@@ -704,5 +709,6 @@ _getopt_internal(argc, argv, optstring, 
+                              _
+                              ("%s: option `%c%s' doesn't allow an argument\n"),
+                              argv[0], argv[optind - 1][0], pfound->name);
++               }
+ 
+                nextchar += strlen(nextchar);



Home | Main Index | Thread Index | Old Index