<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/66e4bedefca4875b451db3bb673fc04a2da674ec">https://github.com/macports/macports-ports/commit/66e4bedefca4875b451db3bb673fc04a2da674ec</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 66e4bedefca4875b451db3bb673fc04a2da674ec
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Tue Sep 6 00:38:11 2022 +0200
<span style='display:block; white-space:pre;color:#404040;'> glom: use one python version
</span>---
gnome/glom/Portfile | 40 +++++++++++++++-----------
gnome/glom/files/patch-export-regex.diff | 11 +++++++
gnome/glom/files/patch-glom-frame_glom.cc.diff | 11 -------
3 files changed, 34 insertions(+), 28 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 ea5bf12deb4..eef1aaebf32 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;'>@@ -14,7 +14,7 @@ set branch [join [lrange [split ${version} .] 0 1] .]
</span> license GPL-2
description Glom is an easy-to-use database designer and user interface.
long_description ${description} This version supports GTK+ 3 and the libgda-5.0 API.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {@catap korins.ky:kirill} openmaintainer
</span> categories gnome databases
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,6 +27,13 @@ checksums rmd160 02b748371658fe569ed463e175e0bdd7ed26a689 \
</span> sha256 53bf207ebca82c563b9e67bce977459a17e7fd94e35c27c196986736da248df1 \
size 9030852
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_branch 3.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set mysql_branch 57
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set postgre_branch 11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_prefix ${frameworks_dir}/Python.framework/Versions/${python_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_version [join [lrange [split ${python_branch} .] 0 1] ""]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build port:pkgconfig \
port:autoconf \
port:automake \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +44,7 @@ depends_build port:pkgconfig \
</span> port:mm-common \
path:bin/dot:graphviz \
path:bin/doxygen:doxygen \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py38-sphinx \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-sphinx \
</span> port:perl${perl5.major}
depends_lib port:desktop-file-utils \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,11 +56,11 @@ depends_lib port:desktop-file-utils \
</span> port:libxslt \
port:libgda5 \
port:libgdamm5 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:mysql57 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:mysql${mysql_branch} \
</span> port:goocanvasmm2\
port:gtksourceviewmm3 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:postgresql11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py38-gobject3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:postgresql${postgre_branch} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-gobject3 \
</span> port:libepc \
port:evince \
port:shared-mime-info
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,32 +69,31 @@ depends_run port:adwaita-icon-theme \
</span> port:gnome-keyring
patchfiles patch-configure.ac.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-export-regex.diff \
</span> patch-glom-libglom-connectionpool.cc.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-require_active_variants [boost::depends_portname] python39
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-require_active_variants libgda5 {mysql57 postgresql11}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+require_active_variants [boost::depends_portname] python${python_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+require_active_variants libgda5 mysql${mysql_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+require_active_variants libgda5 postgresql${postgre_branch}
</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 3.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set python.prefix ${frameworks_dir}/Python.framework/Versions/${python.branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.pkg_config_path ${python.prefix}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.python ${prefix}/bin/python${python.branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.pkg_config_path \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${python_prefix}/lib/pkgconfig ${prefix}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.python ${prefix}/bin/python${python_branch}
</span> configure.perl ${perl5.bin}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env SPHINX_BUILD=${prefix}/bin/sphinx-build-${python.branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env SPHINX_BUILD=${prefix}/bin/sphinx-build-${python_branch}
</span>
compiler.cxx_standard 2014
compiler.blacklist-append *gcc-3.* *gcc-4.* {clang < 700}
configure.args --with-boost=[boost::install_area] \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-boost-python=-mt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-postgres-utils=${prefix}/lib/postgresql11/bin \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-mysql-utils=${prefix}/lib/mysql57/bin \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-mysql \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-boost-python=boost_python${python_version}-mt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-postgres-utils=${prefix}/lib/postgresql${postgre_branch}/bin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-mysql-utils=${prefix}/lib/mysql${mysql_branch}/bin \
</span> --disable-silent-rules \
--disable-update-mime-database \
--disable-documentation
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/glom/files/patch-export-regex.diff b/gnome/glom/files/patch-export-regex.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..236b8c2af7e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/glom/files/patch-export-regex.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile_libglom.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile_libglom.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -97,7 +97,7 @@ pymod_ldflags = -module -avoid-version -no-undefined -shrext .pyd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pymod_ldflags = -module -avoid-version -no-undefined
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-glom_pyexport = -export-symbols-regex '^_*initglom'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++glom_pyexport = -export-symbols-regex 'glom_@GLOM_ABI_VERSION_UNDERLINED@'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glom_python_embed_python_module_glom_@GLOM_ABI_VERSION_UNDERLINED@_la_LDFLAGS = $(pymod_ldflags) $(glom_pyexport)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glom_python_embed_python_module_glom_@GLOM_ABI_VERSION_UNDERLINED@_la_CPPFLAGS = $(glom_includes) $(LIBGLOM_CFLAGS) $(boost_python_cflags)
</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-frame_glom.cc.diff b/gnome/glom/files/patch-glom-frame_glom.cc.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ee8fe58b67e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/glom/files/patch-glom-frame_glom.cc.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;'>---- glom/frame_glom.cc.orig 2013-04-16 00:35:35.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ glom/frame_glom.cc 2013-04-16 00:35:55.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1576,7 +1576,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //Get the fields information from the database:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DbUtils::type_vec_fields fieldsDatabase = DbUtils::get_fields_for_table_from_database(m_table_name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Document* pDoc = dynamic_cast<const Document*>(get_document());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Document* pDoc = dynamic_cast<Document*>(get_document());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(pDoc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool document_must_be_updated = false;
</span></pre><pre style='margin:0'>
</pre>