<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9efa10a054e71951ad60c640e5dd5e7644297a03">https://github.com/macports/macports-ports/commit/9efa10a054e71951ad60c640e5dd5e7644297a03</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 9efa10a glom: update to version 1.32.0
</span>9efa10a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9efa10a054e71951ad60c640e5dd5e7644297a03
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Sat Jun 22 22:34:51 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> glom: update to version 1.32.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * remove unused patch file
</span><span style='display:block; white-space:pre;color:#404040;'> * update/correct dependencies, active variant checks
</span><span style='display:block; white-space:pre;color:#404040;'> * now uses python37, postgresql11, mysql57
</span>---
gnome/glom/Portfile | 33 +++++++++++-----------
gnome/glom/files/patch-configure.ac.diff | 26 +++++------------
.../patch-glom-libglom-connectionpool.cc.diff | 6 ++--
.../files/patch-macros-ax_python_devel.m4.diff | 11 --------
4 files changed, 26 insertions(+), 50 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/glom/Portfile b/gnome/glom/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 21265c3..1eef0c7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/glom/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/glom/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,8 +5,7 @@ PortGroup active_variants 1.1
</span> PortGroup perl5 1.0
name glom
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.28.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.32.0
</span> set branch [join [lrange [split ${version} .] 0 1] .]
license GPL-2
description Glom is an easy-to-use database designer and user interface.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,9 +19,9 @@ master_sites gnome:sources/${name}/${branch}/
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 b91c1db5e67f4281cc5d57cb8f7eea475846f1b5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8ad6664adfcca91fe30f17595f0db10b89ff66b450dba930d3cf4252dae2bbbd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7974420
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 02b748371658fe569ed463e175e0bdd7ed26a689 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 53bf207ebca82c563b9e67bce977459a17e7fd94e35c27c196986736da248df1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 9030852
</span>
depends_build port:pkgconfig \
port:autoconf \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,8 +33,7 @@ depends_build port:pkgconfig \
</span> port:mm-common \
path:bin/dot:graphviz \
port:doxygen \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libxslt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-sphinx \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py37-sphinx \
</span> port:perl${perl5.major}
depends_lib port:desktop-file-utils \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,13 +41,15 @@ depends_lib port:desktop-file-utils \
</span> port:gtkmm3 \
port:boost \
port:libxml2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libxmlxx2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libxmlxx3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libxslt \
</span> port:libgda5 \
port:libgdamm5 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:mysql57 \
</span> port:goocanvasmm2\
port:gtksourceviewmm3 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:postgresql94 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-gobject3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:postgresql11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py37-gobject3 \
</span> port:libepc \
port:evince \
port:shared-mime-info
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,14 +61,14 @@ depends_run port:adwaita-icon-theme \
</span> patchfiles patch-configure.ac.diff \
patch-glom-libglom-connectionpool.cc.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-require_active_variants boost python27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-require_active_variants libgda5 postgresql94
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+require_active_variants boost python37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+require_active_variants libgda5 {mysql57 postgresql11}
</span>
# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
configure.cmd ./autogen.sh
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set python.branch 2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python.branch 3.7
</span> set python.prefix ${frameworks_dir}/Python.framework/Versions/${python.branch}
configure.pkg_config_path ${python.prefix}/lib/pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,11 +77,11 @@ configure.perl ${perl5.bin}
</span>
configure.env SPHINX_BUILD=${prefix}/bin/sphinx-build-${python.branch}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cxxflags-append -std=c++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2014
</span>
configure.args --with-boost-python=mt \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-postgres-utils=${prefix}/lib/postgresql94/bin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-postgres-utils=${prefix}/lib/postgresql11/bin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-mysql-utils=${prefix}/lib/mysql57/bin \
</span> --disable-mysql \
--disable-silent-rules \
--disable-update-mime-database \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,4 +106,3 @@ To work around known locale issues, set LANG=C when starting glom
</span> }
livecheck.type gnome
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex "LATEST-IS-(1\\.28(?:\\.\\d+)*)"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/glom/files/patch-configure.ac.diff b/gnome/glom/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c57b7e7..6ae89ce 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/glom/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/glom/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2014-07-07 07:47:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2014-07-07 10:36:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -157,7 +157,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Libraries used by libglom:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--REQUIRED_LIBGLOM_LIBS='giomm-2.4 >= 2.32.0 libxml++-2.6 >= 2.23.1 libxslt >= 1.1.10 pygobject-3.0 >= 2.29.0 libgdamm-5.0 >= 4.99.8 libgda-5.0 >= 5.2.1 libgda-postgres-5.0 libgda-postgres-5.0 libgda-mysql-5.0 libarchive >= 3.0'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+REQUIRED_LIBGLOM_LIBS='giomm-2.4 >= 2.32.0 libxml++-2.6 >= 2.23.1 libxslt >= 1.1.10 pygobject-3.0 >= 2.29.0 libgdamm-5.0 >= 4.99.8 libgda-5.0 >= 5.2.1 libgda-postgres-5.0 libgda-postgres-5.0 libarchive >= 3.0'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AS_IF([test "x$glom_enable_mysql" = xyes],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [REQUIRED_LIBGLOM_LIBS="$REQUIRED_LIBGLOM_LIBS libgda-mysql-5.0"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AS_IF([test "x$glom_host_win32" != xyes],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [REQUIRED_LIBGLOM_LIBS="$REQUIRED_LIBGLOM_LIBS libepc-1.0 >= 0.4.0"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -230,6 +233,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # so we can use pyexec_LTLIBRARIES in the .am files:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AM_PATH_PYTHON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2019-10-28 07:00:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2020-02-14 12:59:57.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -240,6 +240,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # For instance, ./configure PYTHON=python3.4 --prefix=/opt/gnome
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AM_PATH_PYTHON([3.0])
</span>
+dnl Override standard python locations with MacPorts version specific ones
+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,5 +16,5 @@
</span> +AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
+
# Get the compiler and linker flags for embedding Python.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # To specify a particular python version you must set an environment variable.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # For instance:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This uses the PYTHON_VERSION set by AM_PATH_PYTHON above.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/glom/files/patch-glom-libglom-connectionpool.cc.diff b/gnome/glom/files/patch-glom-libglom-connectionpool.cc.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c879461..7dee75d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/glom/files/patch-glom-libglom-connectionpool.cc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/glom/files/patch-glom-libglom-connectionpool.cc.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- glom/libglom/connectionpool.cc.orig 2014-01-28 03:01:43.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ glom/libglom/connectionpool.cc 2014-04-10 15:16:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -594,7 +594,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glom/libglom/connectionpool.cc.orig 2019-10-28 06:38:20.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glom/libglom/connectionpool.cc 2020-02-14 13:07:16.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -568,7 +568,7 @@
</span> // TODO: This is probably mingw specific
static __p_sig_fn_t previous_sig_handler = SIG_DFL;
#else
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/glom/files/patch-macros-ax_python_devel.m4.diff b/gnome/glom/files/patch-macros-ax_python_devel.m4.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7647493..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/glom/files/patch-macros-ax_python_devel.m4.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- macros/ax_python_devel.m4.orig 2014-04-10 15:29:03.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macros/ax_python_devel.m4 2014-04-10 15:32:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -289,7 +289,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # save current global flags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_save_LIBS="$LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_save_CPPFLAGS="$CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIBS="$ac_save_LIBS $PYTHON_LDFLAGS $PYTHON_EXTRA_LDFLAGS $PYTHON_EXTRA_LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIBS="$ac_save_LIBS $PYTHON_LDFLAGS $PYTHON_EXTRA_LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_LANG_PUSH([C])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_LINK_IFELSE([
</span></pre><pre style='margin:0'>
</pre>