pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/sysutils/gentoo gentoo: Update to 0.20.7



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2da6511b8ddb
branches:  trunk
changeset: 400813:2da6511b8ddb
user:      nia <nia%pkgsrc.org@localhost>
date:      Wed Sep 04 17:35:45 2019 +0000

description:
gentoo: Update to 0.20.7

note: this now uses GTK3.

0.20.7
* Fixed bug that prevented setting the colors for a command button's
  secondary (right-click) function. Reported by RickTee.
* Tiny rewrite to how list entries are stored when reading directories
  which on my system improved speed by around 30X. Suggested by RickTee.
* Updated the GNU gettext machinery. Now requires gettext on your system
  to support internationalization, instead of including the code in a
  intl/ subdir in gentoo's code. Makes sense?
* Fixed a bug that made gentoo's progress-reporting dialogs lack a
  parent window, whch in turn made GTK+ emit warnings.

diffstat:

 sysutils/gentoo/Makefile                         |   22 ++-
 sysutils/gentoo/PLIST                            |    4 +-
 sysutils/gentoo/distinfo                         |   21 +--
 sysutils/gentoo/patches/patch-Makefile.in        |   24 ++++
 sysutils/gentoo/patches/patch-aa                 |   13 --
 sysutils/gentoo/patches/patch-ab                 |   13 --
 sysutils/gentoo/patches/patch-ac                 |   95 ------------------
 sysutils/gentoo/patches/patch-ad                 |   23 ----
 sysutils/gentoo/patches/patch-ae                 |  116 -----------------------
 sysutils/gentoo/patches/patch-af                 |   40 -------
 sysutils/gentoo/patches/patch-ag                 |   13 --
 sysutils/gentoo/patches/patch-ah                 |   13 --
 sysutils/gentoo/patches/patch-src_gentoo.c       |   20 +++
 sysutils/gentoo/patches/patch-src_mntent__wrap.c |   18 +++
 14 files changed, 85 insertions(+), 350 deletions(-)

diffs (truncated from 516 to 300 lines):

diff -r 32840fe20a15 -r 2da6511b8ddb sysutils/gentoo/Makefile
--- a/sysutils/gentoo/Makefile  Wed Sep 04 16:39:22 2019 +0000
+++ b/sysutils/gentoo/Makefile  Wed Sep 04 17:35:45 2019 +0000
@@ -1,23 +1,25 @@
-# $NetBSD: Makefile,v 1.34 2012/10/23 19:51:03 asau Exp $
+# $NetBSD: Makefile,v 1.35 2019/09/04 17:35:45 nia Exp $
 
-DISTNAME=      gentoo-0.11.57
-PKGREVISION=   3
+DISTNAME=      gentoo-0.20.7
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=gentoo/}
 
 MAINTAINER=    dunse%goa.nu@localhost
-HOMEPAGE=      http://www.obsession.se/gentoo/
-COMMENT=       Two-pane filemanager using GTK+, 100% GUI configurable
+HOMEPAGE=      https://sourceforge.net/projects/gentoo/
+COMMENT=       Two-pane filemanager using GTK, 100% GUI configurable
+LICENSE=       gnu-gpl-v2
 
-USE_PKGLOCALEDIR=      yes
-USE_TOOLS+=            msgfmt
-GNU_CONFIGURE=         yes
+USE_TOOLS+=    pkg-config
+USE_TOOLS+=    msgfmt msgmerge xgettext
+GNU_CONFIGURE= yes
+
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=       --disable-gtktest
 
 EGDIR=         ${PREFIX}/share/examples/gentoo
-CONF_FILES=    ${EGDIR}/gentoorc ${PKG_SYSCONFDIR}/gentoorc
+CONF_FILES+=   ${EGDIR}/gentoorc ${PKG_SYSCONFDIR}/gentoorc
 CONF_FILES+=   ${EGDIR}/gentoogtkrc ${PKG_SYSCONFDIR}/gentoogtkrc
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 32840fe20a15 -r 2da6511b8ddb sysutils/gentoo/PLIST
--- a/sysutils/gentoo/PLIST     Wed Sep 04 16:39:22 2019 +0000
+++ b/sysutils/gentoo/PLIST     Wed Sep 04 17:35:45 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2009/06/14 18:16:05 joerg Exp $
+@comment $NetBSD: PLIST,v 1.13 2019/09/04 17:35:45 nia Exp $
 bin/gentoo
 share/examples/gentoo/gentoogtkrc
 share/examples/gentoo/gentoorc
@@ -125,7 +125,9 @@
 share/gentoo/icons/xcf.xpm
 share/gentoo/icons/xpm.xpm
 share/gentoo/icons/xpm2.xpm
+share/locale/ca/LC_MESSAGES/gentoo.mo
 share/locale/de/LC_MESSAGES/gentoo.mo
+share/locale/es/LC_MESSAGES/gentoo.mo
 share/locale/es_MX/LC_MESSAGES/gentoo.mo
 share/locale/fr/LC_MESSAGES/gentoo.mo
 share/locale/it/LC_MESSAGES/gentoo.mo
diff -r 32840fe20a15 -r 2da6511b8ddb sysutils/gentoo/distinfo
--- a/sysutils/gentoo/distinfo  Wed Sep 04 16:39:22 2019 +0000
+++ b/sysutils/gentoo/distinfo  Wed Sep 04 17:35:45 2019 +0000
@@ -1,14 +1,9 @@
-$NetBSD: distinfo,v 1.28 2015/11/04 01:32:14 agc Exp $
+$NetBSD: distinfo,v 1.29 2019/09/04 17:35:45 nia Exp $
 
-SHA1 (gentoo-0.11.57.tar.gz) = ac5859b489a6b88161d5b0f2ddd06490ce9915eb
-RMD160 (gentoo-0.11.57.tar.gz) = 675333aa740f297a0d41d5795689b8e4280d2bdf
-SHA512 (gentoo-0.11.57.tar.gz) = 98cd28ba485771c7988896f6365fcab7d313387e48a65af890c8442c3b8e26ca4c545b8ed008af9b6d4b03a622219431e3f8ef1ad539ca3bc9160fa77d4351a7
-Size (gentoo-0.11.57.tar.gz) = 1479376 bytes
-SHA1 (patch-aa) = 5d8f1fcd4110b09e02f44584e2ccd921a7175929
-SHA1 (patch-ab) = e84931dbc57434881f8071e389ebe8df061ee0b6
-SHA1 (patch-ac) = 4e5d52849887b816eb4388fb2c75aefb3443f5c8
-SHA1 (patch-ad) = 7e41b435aff7af5e57bfb82902a6bb88af37ad97
-SHA1 (patch-ae) = 92a0efdb319b33db09f96d8d2a4729f9fdf2c9af
-SHA1 (patch-af) = 2b80f24bd545177b0d089696e7b3ed7f0d72a3b0
-SHA1 (patch-ag) = 3045a4eb72f8c50d147fe09256ec791359053418
-SHA1 (patch-ah) = c14c80a7c821f69b98cb23156ec5b30ac40ed2ec
+SHA1 (gentoo-0.20.7.tar.gz) = 7a04d05610c3118e1c4bd81869b24e5bd973bf52
+RMD160 (gentoo-0.20.7.tar.gz) = 88a08b6139f385b2a5a65150200b88872edab2fb
+SHA512 (gentoo-0.20.7.tar.gz) = 7a4d601526d7071392bc3f2f34fd86337f4186fc45e633ed359b32ba44f43faddc4760a9ebd2e20d08662755052dd4c02a06724d274f98db342ac53fa28e39b0
+Size (gentoo-0.20.7.tar.gz) = 1414198 bytes
+SHA1 (patch-Makefile.in) = 2cbc495151cdd95fda868b603bc5dcca3425477b
+SHA1 (patch-src_gentoo.c) = a04cfd377168488a681b6f71087ab530e3bfd9d4
+SHA1 (patch-src_mntent__wrap.c) = 0b06442ecf1fa486cb8ac70ad51d17d76ad4e9fb
diff -r 32840fe20a15 -r 2da6511b8ddb sysutils/gentoo/patches/patch-Makefile.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/gentoo/patches/patch-Makefile.in Wed Sep 04 17:35:45 2019 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-Makefile.in,v 1.1 2019/09/04 17:35:45 nia Exp $
+
+Install configuration to examples.
+
+--- Makefile.in.orig   2016-06-14 09:51:27.000000000 +0000
++++ Makefile.in
+@@ -264,7 +264,7 @@ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+-GENTOO_CFLAGS = @GENTOO_CFLAGS@
++GENTOO_CFLAGS = @CFLAGS@
+ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+ GMSGFMT = @GMSGFMT@
+ GMSGFMT_015 = @GMSGFMT_015@
+@@ -362,7 +362,7 @@ runstatedir = @runstatedir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+-sysconfdir = @sysconfdir@
++sysconfdir = ${datadir}/examples/@PACKAGE@
+ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
diff -r 32840fe20a15 -r 2da6511b8ddb sysutils/gentoo/patches/patch-aa
--- a/sysutils/gentoo/patches/patch-aa  Wed Sep 04 16:39:22 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2008/11/10 14:56:16 adam Exp $
-
---- Makefile.in.orig   2008-07-13 20:10:09.000000000 +0200
-+++ Makefile.in
-@@ -237,7 +237,7 @@ psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
--sysconfdir = @sysconfdir@
-+sysconfdir = ${datadir}/examples/@PACKAGE@
- target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
diff -r 32840fe20a15 -r 2da6511b8ddb sysutils/gentoo/patches/patch-ab
--- a/sysutils/gentoo/patches/patch-ab  Wed Sep 04 16:39:22 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2008/11/10 14:56:16 adam Exp $
-
---- configure.orig     2008-07-13 20:10:10.000000000 +0200
-+++ configure
-@@ -3416,7 +3416,7 @@ _ACEOF
- 
-   GENTOO_CFLAGS="$GENTOO_CFLAGS -g -pg"
- else
--  GENTOO_CFLAGS="$GENTOO_CFLAGS -O2"
-+  GENTOO_CFLAGS="$GENTOO_CFLAGS $CFLAGS"
- fi
- 
- 
diff -r 32840fe20a15 -r 2da6511b8ddb sysutils/gentoo/patches/patch-ac
--- a/sysutils/gentoo/patches/patch-ac  Wed Sep 04 16:39:22 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2006/06/20 20:41:22 joerg Exp $
-
---- src/mntent_wrap.c.orig     2003-10-12 13:45:23.000000000 +0000
-+++ src/mntent_wrap.c
-@@ -92,7 +92,7 @@ gint mne_endmntent(FILE *filep)
-       return -1;
- }
- 
--#elif defined __OpenBSD__ || defined __FreeBSD__ || defined __NetBSD__ || (defined __osf__ && defined __alpha__)
-+#elif defined __OpenBSD__ || defined __FreeBSD__ || defined __NetBSD__ || (defined __osf__ && defined __alpha__) || defined(__DragonFly__)
- 
- /* Here is the implementation for BSD and Alpha Tru64 systems. */
- 
-@@ -100,6 +100,9 @@ gint mne_endmntent(FILE *filep)
- #include <sys/mount.h>
- #include <sys/param.h>
- #include <sys/ucred.h>
-+#if defined(HAVE_STRUCT_STATVFS) && !defined(__DragonFly__)
-+#include <sys/statvfs.h>
-+#endif
- 
- /* A pointer to one of these is returned by mne_setmntent(), depending on which file
- ** name is given as an input. Note that on BSD systems, the system calls themselves
-@@ -109,13 +112,18 @@ gint mne_endmntent(FILE *filep)
- ** of what kind of mount entries we're supposed to deal with. Since gentoo will
- ** pass a FILE pointer to mne_getmntent() anyway, it seems natural to use it.
- */
--static FILE   f_fstab, f_mtab;
-+static int f_stab_val, f_mtab_val;
-+static FILE *f_fstab = (FILE *)&f_stab_val, *f_mtab = (FILE *)&f_mtab_val;
- 
- /* These are used when we're accessing the currently mounted filesystems, using
- ** a call to getmntinfo(). The mtab_pos and mtab_num integers are then used to
- ** keep track of where in the returned array of statfs structs we are.
- */
-+#if defined(HAVE_STRUCT_STATVFS) && !defined(__DragonFly__)
-+static struct statvfs *mtab = NULL;
-+#else
- static struct statfs  *mtab = NULL;
-+#endif
- static guint          mtab_pos = 0, mtab_num = 0;
- 
- /* 1999-05-09 -       An attempt at a BSD implementation, after having received input from
-@@ -132,28 +140,28 @@ FILE * mne_setmntent(const gchar *filena
-       if(strcmp(filename, "/etc/fstab") == 0)         /* Looking for available filesystems? */
-       {
-               if(setfsent() == 1)
--                      return &f_fstab;
-+                      return f_fstab;
-       }
-       else if(strcmp(filename, "/proc/mtab") == 0)    /* Looking for mounted filesystems? */
-       {
-               if((mtab_num = getmntinfo(&mtab, 0)) > 0)
-               {
-                       mtab_pos = 0;
--                      return &f_mtab;
-+                      return f_mtab;
-               }
-       }
-       return NULL;
- }
- 
--/* 1999-05-09 -       Get another entry of data, either about mounted (filep == &f_mtab) or available
--**            (filep == &f_fstab) filesystems. Returns NULL when the respective data source
-+/* 1999-05-09 -       Get another entry of data, either about mounted (filep == f_mtab) or available
-+**            (filep == f_fstab) filesystems. Returns NULL when the respective data source
- **            is exhausted.
- */
- const MntEnt * mne_getmntent(FILE *filep)
- {
-       static MntEnt   me;
- 
--      if(filep == &f_fstab)
-+      if(filep == f_fstab)
-       {
-               struct fstab    *ment;
- 
-@@ -164,7 +172,7 @@ const MntEnt * mne_getmntent(FILE *filep
-                       return &me;
-               }
-       }
--      else if(filep == &f_mtab)
-+      else if(filep == f_mtab)
-       {
-               if(mtab_pos == mtab_num)                /* Array exhausted? */
-                       return NULL;
-@@ -182,7 +190,7 @@ const MntEnt * mne_getmntent(FILE *filep
- /* 1999-05-09 -       Stop traversing mount/fs data. */
- gint mne_endmntent(FILE *filep)
- {
--      if(filep == &f_fstab)
-+      if(filep == f_fstab)
-               endfsent();
- 
-       return 0;
diff -r 32840fe20a15 -r 2da6511b8ddb sysutils/gentoo/patches/patch-ad
--- a/sysutils/gentoo/patches/patch-ad  Wed Sep 04 16:39:22 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-$NetBSD: patch-ad,v 1.8 2008/11/10 14:56:16 adam Exp $
-
---- src/gentoo.c.orig  2006-08-23 14:58:12.000000000 -0400
-+++ src/gentoo.c       2008-08-17 01:44:41.000000000 -0400
-@@ -334,7 +334,18 @@ static GtkWidget * build_gui(MainInfo *m
- static void init_paths(CfgInfo *cfg)
- {
-       cfg->path.path[PTID_ICON]  = g_string_new(PATH_ICN);
-+#if 0
-+      /* PATH_GRC is the compile-time $HOME, which seems wrong. */
-       cfg->path.path[PTID_GTKRC] = g_string_new(PATH_GRC);
-+#else
-+      {
-+              const char *home = getenv("HOME");
-+              if (home == NULL) {
-+                      home = "/";
-+              }
-+              cfg->path.path[PTID_GTKRC] = g_string_new(home);
-+      }
-+#endif
-       cfg->path.path[PTID_FSTAB] = g_string_new("/etc/fstab");
-       cfg->path.path[PTID_MTAB]  = g_string_new("/proc/mounts");
- 
diff -r 32840fe20a15 -r 2da6511b8ddb sysutils/gentoo/patches/patch-ae
--- a/sysutils/gentoo/patches/patch-ae  Wed Sep 04 16:39:22 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
-$NetBSD: patch-ae,v 1.7 2009/05/17 22:04:11 dholland Exp $
-
-Fix insecure-temp-files. Replaces older nonworking patch with similar
-intent. XXX inadequately tested, lack of time.
-
-Upstream: sent upstream by obache@: http://sourceforge.net/tracker/?func=detail&atid=406763&aid=2537314&group_id=32880
-
---- src/types.c.orig   2008-07-09 15:51:26.000000000 -0400
-+++ src/types.c        2009-05-17 17:55:28.000000000 -0400
-@@ -28,6 +28,12 @@
- #include <sys/wait.h>
- #include <unistd.h>
- 
-+#ifdef __sun /* paths.h missing in solaris */
-+#define _PATH_TMP "/tmp/"
-+#else
-+#include <paths.h>
-+#endif
-+
- #include <stddef.h>
- 
- #include "strutil.h"
-@@ -345,14 +351,18 @@ static FType * match_file(GList *list, D
- void typ_identify_end(MainInfo *min, const gchar *path)



Home | Main Index | Thread Index | Old Index