pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/misc/gelemental gelemental: update to 2.0.1.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ccf055c0b049
branches:  trunk
changeset: 385673:ccf055c0b049
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Sep 24 06:30:43 2022 +0000

description:
gelemental: update to 2.0.1.

Fixes build.

Version 2.0.1 [stable]
======================

This is a maintenance release of gElemental which is C++17 compatible and
forces button colours for several modern themes.

Version 2.0.0 [stable]
----------------------

This release of gElemental reflects the transfer to a new maintainer.
It includes several bugfixes from the Debichem Team, some minor interface
improvements, and the addition of new element names.

diffstat:

 misc/gelemental/Makefile                                   |  13 ++--
 misc/gelemental/PLIST                                      |   3 +-
 misc/gelemental/distinfo                                   |  17 +----
 misc/gelemental/patches/patch-aa                           |  13 ----
 misc/gelemental/patches/patch-libelemental_misc_extras_cc  |  15 -----
 misc/gelemental/patches/patch-libelemental_misc_widgets_cc |  15 -----
 misc/gelemental/patches/patch-libelemental_value.cc        |  42 ++++---------
 misc/gelemental/patches/patch-libelemental_value.hh        |  17 -----
 misc/gelemental/patches/patch-libelemental_value.tcc       |  13 ----
 misc/gelemental/patches/patch-src_dialogs.cc               |  19 ------
 misc/gelemental/patches/patch-src_main_cc                  |  16 -----
 11 files changed, 26 insertions(+), 157 deletions(-)

diffs (249 lines):

diff -r 8b5663479e2f -r ccf055c0b049 misc/gelemental/Makefile
--- a/misc/gelemental/Makefile  Sat Sep 24 06:18:43 2022 +0000
+++ b/misc/gelemental/Makefile  Sat Sep 24 06:30:43 2022 +0000
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.43 2021/12/08 16:05:37 adam Exp $
-#
+# $NetBSD: Makefile,v 1.44 2022/09/24 06:30:43 wiz Exp $
 
-DISTNAME=      gelemental-1.2.0
-PKGREVISION=   35
+DISTNAME=      gelemental-2.0.1
 CATEGORIES=    misc
-MASTER_SITES=  http://www.kdau.com/files/
-EXTRACT_SUFX=  .tar.bz2
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=ginggs/}
+GITHUB_TAG=    v${PKGVERSION_NOREV}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-#HOMEPAGE=     http://www.kdau.com/projects/gelemental/
+HOMEPAGE=      https://github.com/ginggs/gelemental
 COMMENT=       Periodic table viewer
+LICENSE=       mit AND gnu-gpl-v3
 
 GNU_CONFIGURE= yes
 USE_LIBTOOL=   yes
diff -r 8b5663479e2f -r ccf055c0b049 misc/gelemental/PLIST
--- a/misc/gelemental/PLIST     Sat Sep 24 06:18:43 2022 +0000
+++ b/misc/gelemental/PLIST     Sat Sep 24 06:30:43 2022 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:07:21 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2022/09/24 06:30:43 wiz Exp $
 bin/gelemental
 include/libelemental/element.hh
 include/libelemental/element.tcc
@@ -20,6 +20,7 @@
 share/icons/hicolor/32x32/apps/gelemental.png
 share/icons/hicolor/48x48/apps/gelemental.png
 share/icons/hicolor/scalable/apps/gelemental.svg
+share/locale/cs/LC_MESSAGES/gelemental.mo
 share/locale/da/LC_MESSAGES/gelemental.mo
 share/locale/de/LC_MESSAGES/gelemental.mo
 share/locale/en_CA/LC_MESSAGES/gelemental.mo
diff -r 8b5663479e2f -r ccf055c0b049 misc/gelemental/distinfo
--- a/misc/gelemental/distinfo  Sat Sep 24 06:18:43 2022 +0000
+++ b/misc/gelemental/distinfo  Sat Sep 24 06:30:43 2022 +0000
@@ -1,13 +1,6 @@
-$NetBSD: distinfo,v 1.8 2021/10/26 10:59:04 nia Exp $
+$NetBSD: distinfo,v 1.9 2022/09/24 06:30:43 wiz Exp $
 
-BLAKE2s (gelemental-1.2.0.tar.bz2) = af560a458f6f1ad19ddf0c4567aabbc979a48727f33dd07481db65ee6fc6e867
-SHA512 (gelemental-1.2.0.tar.bz2) = 2e6ef2c22b389cff69728b01e1eb397578974362356f5132098f29a9e01a64be228a24686738bd84ea575cee5aef068d9ab3d6c20233f995ccc5f1a1cb5d5673
-Size (gelemental-1.2.0.tar.bz2) = 460757 bytes
-SHA1 (patch-aa) = bef3bc522e630b5f5674b75bb9713a844e38b66f
-SHA1 (patch-libelemental_misc_extras_cc) = 5b65d9d3b26ff81f96a3af9a0de2552c79b2c957
-SHA1 (patch-libelemental_misc_widgets_cc) = 1de3021e6b4790e8f879f7ed8859281bf6f768ff
-SHA1 (patch-libelemental_value.cc) = 1db6a3d81c98749bf71a66ee88af8a18f3b2608d
-SHA1 (patch-libelemental_value.hh) = bc630930c5e6a801419b7e48986814b7a96c4e89
-SHA1 (patch-libelemental_value.tcc) = d07bd0eda624514bf4e22a2f995cc0176d1e6a6c
-SHA1 (patch-src_dialogs.cc) = 50b665acb4c2657d218a65a429d5c62b77d3e247
-SHA1 (patch-src_main_cc) = efd05b15c0e4fc2d19c07c525ac5f20e9fb05b1c
+BLAKE2s (gelemental-2.0.1.tar.gz) = ed616e7104f7cd50f33c718b59a6b26ceeca31df7680fb6adc47ce38d67760ef
+SHA512 (gelemental-2.0.1.tar.gz) = e3f8e1757ff3e7843f2a860ffd41413e15a8382a3d4bd41d850b629857764b1e1508de8e825d257e5232617395d56bc5f517797301d9fe13849ceb0e48a68da2
+Size (gelemental-2.0.1.tar.gz) = 779930 bytes
+SHA1 (patch-libelemental_value.cc) = 7f59e162d90696c3c49eeff07f512c70dc5ea72a
diff -r 8b5663479e2f -r ccf055c0b049 misc/gelemental/patches/patch-aa
--- a/misc/gelemental/patches/patch-aa  Sat Sep 24 06:18:43 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/11/06 20:16:16 drochner Exp $
-
---- libelemental/misc/ucompose.cc.orig 2007-10-01 18:33:04.000000000 +0200
-+++ libelemental/misc/ucompose.cc
-@@ -144,7 +144,7 @@ ustring
- UComposition::do_stringify (const std::wstring& src)
- {
-       return Glib::convert (string (reinterpret_cast<const char *> (src.data ()),
--              src.size () * sizeof (wchar_t)), "UTF-8", "WCHAR_T");
-+              src.size () * sizeof (wchar_t)), "UTF-8", "ucs-4");
- }
- 
- 
diff -r 8b5663479e2f -r ccf055c0b049 misc/gelemental/patches/patch-libelemental_misc_extras_cc
--- a/misc/gelemental/patches/patch-libelemental_misc_extras_cc Sat Sep 24 06:18:43 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-libelemental_misc_extras_cc,v 1.1 2012/05/06 23:07:05 dholland Exp $
-
-Fix build with new glib2.
-
---- libelemental/misc/extras.cc~       2007-09-25 04:39:02.000000000 +0000
-+++ libelemental/misc/extras.cc
-@@ -21,7 +21,7 @@
- 
- #include <algorithm>
- #include <stdexcept>
--#include <glib/gmem.h>
-+#include <glib.h>
- #include <glibmm/utility.h>
- 
- namespace misc {
diff -r 8b5663479e2f -r ccf055c0b049 misc/gelemental/patches/patch-libelemental_misc_widgets_cc
--- a/misc/gelemental/patches/patch-libelemental_misc_widgets_cc        Sat Sep 24 06:18:43 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-libelemental_misc_widgets_cc,v 1.1 2012/05/06 23:07:05 dholland Exp $
-
-Fix build with new glib2.
-
---- libelemental/misc/widgets.cc~      2007-09-25 04:39:02.000000000 +0000
-+++ libelemental/misc/widgets.cc
-@@ -20,7 +20,7 @@
- #include "macros.hh"
- #include "widgets.hh"
- 
--#include <glib/gmessages.h>
-+#include <glib.h>
- #include <gtkmm/alignment.h>
- #include <gtkmm/image.h>
- #include <gtkmm/label.h>
diff -r 8b5663479e2f -r ccf055c0b049 misc/gelemental/patches/patch-libelemental_value.cc
--- a/misc/gelemental/patches/patch-libelemental_value.cc       Sat Sep 24 06:18:43 2022 +0000
+++ b/misc/gelemental/patches/patch-libelemental_value.cc       Sat Sep 24 06:30:43 2022 +0000
@@ -1,32 +1,16 @@
-$NetBSD: patch-libelemental_value.cc,v 1.1 2015/07/03 12:46:10 joerg Exp $
+$NetBSD: patch-libelemental_value.cc,v 1.2 2022/09/24 06:30:44 wiz Exp $
 
---- libelemental/value.cc.orig 2015-06-27 14:24:42.000000000 +0000
+Fix build with pango 1.50.
+https://github.com/ginggs/gelemental/commit/689d343086ca151ecc4c4a407c1650bc64c7c931
+
+--- libelemental/value.cc.orig 2021-09-26 09:22:33.000000000 +0000
 +++ libelemental/value.cc
-@@ -23,7 +23,6 @@
- #include <libelemental/value.hh>
- #include <libelemental/value-types.hh>
- 
--#include <ext/stdio_filebuf.h>
- #include <glibmm/utility.h>
- #include <pango/pango-attributes.h>
- 
-@@ -130,19 +129,6 @@ EntriesView::max_name_length = 0;
- //******************************************************************************
- // class EntriesStream
+@@ -25,7 +25,7 @@
  
--
--EntriesStream::EntriesStream (FILE* file) throw ()
--:     buf (new __gnu_cxx::stdio_filebuf<char> (file, std::ios_base::out)),
--      buf_owned (true), os (*new std::ostream (buf)), os_owned (true)
--{}
--
--
--EntriesStream::EntriesStream (int fd) throw ()
--:     buf (new __gnu_cxx::stdio_filebuf<char> (fd, std::ios_base::out)),
--      buf_owned (true), os (*new std::ostream (buf)), os_owned (true)
--{}
--
--
- EntriesStream::EntriesStream (std::streambuf& buf_) throw ()
- :     buf (&buf_), buf_owned (false),
-       os (*new std::ostream (buf)), os_owned (true)
+ #include <ext/stdio_filebuf.h>
+ #include <glibmm/utility.h>
+-#include <pango/pango-attributes.h>
++#include <pango/pango.h>
+ 
+ namespace Elemental {
+ 
diff -r 8b5663479e2f -r ccf055c0b049 misc/gelemental/patches/patch-libelemental_value.hh
--- a/misc/gelemental/patches/patch-libelemental_value.hh       Sat Sep 24 06:18:43 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-libelemental_value.hh,v 1.1 2015/07/03 12:46:10 joerg Exp $
-
---- libelemental/value.hh.orig 2015-06-27 14:24:40.000000000 +0000
-+++ libelemental/value.hh
-@@ -142,12 +142,6 @@ class EntriesStream
- {
- public:
- 
--      //! Constructs a new EntriesStream for an open FILE pointer.
--      EntriesStream (FILE* file) throw ();
--
--      //! Constructs a new EntriesStream for an open file descriptor.
--      EntriesStream (int fd) throw ();
--
-       //! Constructs a new EntriesStream for a stream buffer.
-       EntriesStream (std::streambuf& buf) throw ();
- 
diff -r 8b5663479e2f -r ccf055c0b049 misc/gelemental/patches/patch-libelemental_value.tcc
--- a/misc/gelemental/patches/patch-libelemental_value.tcc      Sat Sep 24 06:18:43 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-libelemental_value.tcc,v 1.1 2011/11/25 22:09:13 joerg Exp $
-
---- libelemental/value.tcc.orig        2011-11-25 18:05:28.000000000 +0000
-+++ libelemental/value.tcc
-@@ -26,6 +26,8 @@
- #error "value.tcc must be included from value.hh."
- #endif
- 
-+#include <limits>
-+
- namespace Elemental {
- 
- 
diff -r 8b5663479e2f -r ccf055c0b049 misc/gelemental/patches/patch-src_dialogs.cc
--- a/misc/gelemental/patches/patch-src_dialogs.cc      Sat Sep 24 06:18:43 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$NetBSD: patch-src_dialogs.cc,v 1.1 2015/10/20 09:40:22 tnn Exp $
-
-dialogs.cc:250:14: error: incompatible operand types
-      ('Elemental::PropertyBase *' and 'bool')
-        return iter ? iter->get_value (cols.property) : false;
-
-(not sure if this is in line with what the code intends)
-
---- src/dialogs.cc.orig        2007-09-25 04:49:33.000000000 +0000
-+++ src/dialogs.cc
-@@ -247,7 +247,7 @@ PropertiesDialog::is_selectable (const R
-       const Gtk::TreePath& tpath, bool)
- {
-       Gtk::TreeIter iter = store->get_iter (tpath);
--      return iter ? iter->get_value (cols.property) : false;
-+      return iter ? (iter->get_value (cols.property) != NULL) : false;
- }
- 
- 
diff -r 8b5663479e2f -r ccf055c0b049 misc/gelemental/patches/patch-src_main_cc
--- a/misc/gelemental/patches/patch-src_main_cc Sat Sep 24 06:18:43 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_main_cc,v 1.1 2012/05/06 23:07:05 dholland Exp $
-
-Fix build with new glib2.
-
---- src/main.cc~       2007-09-25 04:49:33.000000000 +0000
-+++ src/main.cc
-@@ -26,8 +26,7 @@
- #include <clocale>
- #include <iostream>
- #include <locale>
--#include <glib/goption.h>
--#include <glib/gutils.h>
-+#include <glib.h>
- #include <glibmm/optionentry.h>
- #include <gtk/gtkaboutdialog.h>
- #include <gtk/gtkversion.h>



Home | Main Index | Thread Index | Old Index