[150498] users/devans/GNOME-3/unstable-c++11/dports/gnome/glom
devans at macports.org
devans at macports.org
Wed Jul 20 09:16:06 PDT 2016
Revision: 150498
https://trac.macports.org/changeset/150498
Author: devans at macports.org
Date: 2016-07-20 09:16:06 -0700 (Wed, 20 Jul 2016)
Log Message:
-----------
GNOME-3/unstable-c++11: glom, update to version 1.31.6, dependencies, use system perl for build.
Modified Paths:
--------------
users/devans/GNOME-3/unstable-c++11/dports/gnome/glom/Portfile
users/devans/GNOME-3/unstable-c++11/dports/gnome/glom/files/patch-configure.ac.diff
users/devans/GNOME-3/unstable-c++11/dports/gnome/glom/files/patch-glom-libglom-connectionpool.cc.diff
Modified: users/devans/GNOME-3/unstable-c++11/dports/gnome/glom/Portfile
===================================================================
--- users/devans/GNOME-3/unstable-c++11/dports/gnome/glom/Portfile 2016-07-20 16:04:36 UTC (rev 150497)
+++ users/devans/GNOME-3/unstable-c++11/dports/gnome/glom/Portfile 2016-07-20 16:16:06 UTC (rev 150498)
@@ -5,11 +5,13 @@
PortGroup active_variants 1.1
# as of version 1.29.5 requires C++11 to build
+# as of version 1.31.1 requires libxmlxx3 to build
+# as of version 1.31.2 uses C++14
PortGroup cxx11 1.0
name glom
-version 1.31.1
+version 1.31.6
set branch [join [lrange [split ${version} .] 0 1] .]
license GPL-2
description Glom is an easy-to-use database designer and user interface.
@@ -23,14 +25,9 @@
use_xz yes
-checksums rmd160 42eae360cdd99c063cb6f360ab6cb99e9613444e \
- sha256 3e15f5e875b641addcaf06da3791b3227099a6c76dc7bd6374fc1f62f3ac6068
+checksums rmd160 4ad2acba1775cce9ebc37e9ea07ddf7f2b19a0ae \
+ sha256 6c5bb163e66d487f979763c3ca3437b56322581872429f1fc3af95f11a2eace0
-# set pbranch to desired perl version
-# currently 5.22 (#48365)
-
-set pbranch 5.22
-
depends_build port:pkgconfig \
port:autoconf \
port:automake \
@@ -42,15 +39,14 @@
path:bin/dot:graphviz \
port:doxygen \
port:libxslt \
- port:py34-sphinx \
- port:perl${pbranch}
+ port:py34-sphinx
depends_lib port:desktop-file-utils \
port:libarchive \
port:gtkmm3 \
port:boost \
port:libxml2 \
- port:libxmlxx2 \
+ port:libxmlxx3 \
port:libgda5 \
port:libgdamm5 \
port:goocanvasmm2\
@@ -84,7 +80,7 @@
configure.env SPHINX_BUILD=${prefix}/bin/sphinx-build-${python.branch} \
PYTHON_EXTRA_LDFLAGS=' '
-configure.perl ${prefix}/bin/perl${pbranch}
+configure.perl /usr/bin/perl
configure.args --with-boost-python=mt \
--with-postgres-utils=${prefix}/lib/postgresql94/bin \
Modified: users/devans/GNOME-3/unstable-c++11/dports/gnome/glom/files/patch-configure.ac.diff
===================================================================
--- users/devans/GNOME-3/unstable-c++11/dports/gnome/glom/files/patch-configure.ac.diff 2016-07-20 16:04:36 UTC (rev 150497)
+++ users/devans/GNOME-3/unstable-c++11/dports/gnome/glom/files/patch-configure.ac.diff 2016-07-20 16:16:06 UTC (rev 150498)
@@ -1,18 +1,18 @@
---- configure.ac.orig 2015-11-27 01:21:08.000000000 -0800
-+++ configure.ac 2015-12-05 15:34:57.000000000 -0800
-@@ -159,7 +159,10 @@
+--- configure.ac.orig 2016-06-08 05:15:58.000000000 -0700
++++ configure.ac 2016-07-20 08:25:22.000000000 -0700
+@@ -163,7 +163,10 @@
# Libraries used by libglom:
--REQUIRED_LIBGLOM_LIBS='giomm-2.4 >= 2.46.1 libxml++-3.0 >= 2.24.0 libxslt >= 1.1.10 pygobject-3.0 >= 2.29.0 libgdamm-5.0 >= 4.99.10 libgda-5.0 >= 5.2.1 libgda-postgres-5.0 libgda-postgres-5.0 libgda-mysql-5.0 libarchive >= 3.0'
-+REQUIRED_LIBGLOM_LIBS='giomm-2.4 >= 2.46.1 libxml++-3.0 >= 2.24.0 libxslt >= 1.1.10 pygobject-3.0 >= 2.29.0 libgdamm-5.0 >= 4.99.10 libgda-5.0 >= 5.2.1 libgda-postgres-5.0 libgda-postgres-5.0 libarchive >= 3.0'
+-REQUIRED_LIBGLOM_LIBS='giomm-2.4 >= 2.47.4 libxml++-3.0 >= 3.0.0 libxslt >= 1.1.10 pygobject-3.0 >= 2.29.0 libgdamm-5.0 >= 4.99.10 libgda-5.0 >= 5.2.1 libgda-postgres-5.0 libgda-postgres-5.0 libgda-mysql-5.0 libarchive >= 3.0'
++REQUIRED_LIBGLOM_LIBS='giomm-2.4 >= 2.47.4 libxml++-3.0 >= 3.0.0 libxslt >= 1.1.10 pygobject-3.0 >= 2.29.0 libgdamm-5.0 >= 4.99.10 libgda-5.0 >= 5.2.1 libgda-postgres-5.0 libgda-postgres-5.0 libarchive >= 3.0'
+
+AS_IF([test "x$glom_enable_mysql" = xyes],
+ [REQUIRED_LIBGLOM_LIBS="$REQUIRED_LIBGLOM_LIBS libgda-mysql-5.0"])
AS_IF([test "x$glom_host_win32" != xyes],
[REQUIRED_LIBGLOM_LIBS="$REQUIRED_LIBGLOM_LIBS libepc-1.0 >= 0.4.0"])
-@@ -232,6 +235,17 @@
+@@ -236,6 +239,17 @@
# so we can use pyexec_LTLIBRARIES in the .am files:
AM_PATH_PYTHON
Modified: users/devans/GNOME-3/unstable-c++11/dports/gnome/glom/files/patch-glom-libglom-connectionpool.cc.diff
===================================================================
--- users/devans/GNOME-3/unstable-c++11/dports/gnome/glom/files/patch-glom-libglom-connectionpool.cc.diff 2016-07-20 16:04:36 UTC (rev 150497)
+++ users/devans/GNOME-3/unstable-c++11/dports/gnome/glom/files/patch-glom-libglom-connectionpool.cc.diff 2016-07-20 16:16:06 UTC (rev 150498)
@@ -1,6 +1,6 @@
--- glom/libglom/connectionpool.cc.orig 2015-07-07 01:53:04.000000000 -0700
+++ glom/libglom/connectionpool.cc 2015-07-17 21:56:09.000000000 -0700
-@@ -603,7 +603,7 @@
+@@ -572,7 +572,7 @@
// TODO: This is probably mingw specific
static __p_sig_fn_t previous_sig_handler = SIG_DFL;
#else
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160720/0f91c473/attachment-0001.html>
More information about the macports-changes
mailing list