[119257] users/devans/dports/gnome/glom
devans at macports.org
devans at macports.org
Mon Apr 21 11:31:03 PDT 2014
Revision: 119257
https://trac.macports.org/changeset/119257
Author: devans at macports.org
Date: 2014-04-21 11:31:03 -0700 (Mon, 21 Apr 2014)
Log Message:
-----------
devans/dports: glom, work in progress, update to version 1.26, dependencies, add intltool configuration fix, misc configuration updates.
Modified Paths:
--------------
users/devans/dports/gnome/glom/Portfile
users/devans/dports/gnome/glom/files/patch-glom-libglom-connectionpool.cc.diff
Added Paths:
-----------
users/devans/dports/gnome/glom/files/patch-configure.ac.diff
users/devans/dports/gnome/glom/files/patch-macros-ax_python_devel.m4.diff
Modified: users/devans/dports/gnome/glom/Portfile
===================================================================
--- users/devans/dports/gnome/glom/Portfile 2014-04-21 18:23:25 UTC (rev 119256)
+++ users/devans/dports/gnome/glom/Portfile 2014-04-21 18:31:03 UTC (rev 119257)
@@ -4,7 +4,7 @@
PortSystem 1.0
name glom
-version 1.24.0
+version 1.26.0
set branch [join [lrange [split ${version} .] 0 1] .]
license GPL-2
description Glom is an easy-to-use database designer and user interface.
@@ -19,48 +19,70 @@
use_xz yes
-checksums rmd160 4d1ce27c1e8fe272ad1e33525d4917a51e2f2d8d \
- sha256 83ff79610ffdede48536c0d07d5288ad84ec26c86aa2aa1db98b46abdebbdcc2
+checksums rmd160 3f48af233fba992dbd86a99dc276d20d631a9a82 \
+ sha256 f53a2d46f766d4e50b1cde0edc4408b443f22db7662f47dd80f7b1a545050024
-depends_build port:gnome-doc-utils \
+depends_build port:pkgconfig \
+ port:intltool \
+ port:itstool \
+ port:yelp-tools \
port:mm-common \
port:graphviz \
port:doxygen \
port:libxslt \
port:py27-sphinx
-depends_lib port:boost \
+depends_lib port:libarchive \
+ port:boost \
port:libxml2 \
+ port:libxmlxx2 \
port:libgda5 \
- port:libxmlxx2 \
+ port:libgdamm5 \
port:goocanvasmm2\
- port:libgdamm5 \
port:gtksourceviewmm3 \
- port:postgresql91 \
+ port:postgresql93 \
port:py27-gobject3 \
port:libepc \
- port:evince
+ port:evince \
+ port:shared-mime-info
-patchfiles patch-glom-libglom-connectionpool.cc.diff
+post-extract {
+ copy ${worksrcpath}/configure.ac ${worksrcpath}/configure.ac.orig
+}
+patchfiles patch-configure.ac.diff \
+ patch-glom-libglom-connectionpool.cc.diff
+
+# update macros/intltool.m4 and autoreconf
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/macros
+}
+
+use_autoreconf yes
+autoreconf.args -fvi
+
set python.branch 2.7
set python.prefix ${frameworks_dir}/Python.framework/Versions/${python.branch}
configure.pkg_config_path ${python.prefix}/lib/pkgconfig
configure.python ${prefix}/bin/python${python.branch}
-configure.env SPHINX_BUILD=${prefix}/bin/sphinx-build-${python.branch}
+configure.env SPHINX_BUILD=${prefix}/bin/sphinx-build-${python.branch} \
+ PYTHON_EXTRA_LDFLAGS=' '
+configure.perl ${prefix}/bin/perl5.16
+
configure.args --with-boost-python=mt \
- --with-postgres-utils=${prefix}/lib/postgresql90/bin \
- --disable-scrollkeeper \
+ --with-postgres-utils=${prefix}/lib/postgresql93/bin \
+ --disable-mysql \
+ --disable-silent-rules \
--disable-update-mime-database \
--disable-documentation
universal_variant no
post-activate {
- system "scrollkeeper-update"
system "${prefix}/bin/update-mime-database ${prefix}/share/mime"
}
Added: users/devans/dports/gnome/glom/files/patch-configure.ac.diff
===================================================================
--- users/devans/dports/gnome/glom/files/patch-configure.ac.diff (rev 0)
+++ users/devans/dports/gnome/glom/files/patch-configure.ac.diff 2014-04-21 18:31:03 UTC (rev 119257)
@@ -0,0 +1,43 @@
+--- configure.ac.orig 2014-03-06 07:48:22.000000000 -0800
++++ configure.ac 2014-04-11 01:13:02.000000000 -0700
+@@ -63,8 +63,8 @@
+ # i18n
+ IT_PROG_INTLTOOL([0.35])
+
+-AM_GNU_GETTEXT([external])
+-AM_GNU_GETTEXT_VERSION([0.17])
++#AM_GNU_GETTEXT([external])
++#AM_GNU_GETTEXT_VERSION([0.17])
+
+ AC_SUBST([GETTEXT_PACKAGE], [glom])
+ AC_DEFINE([GETTEXT_PACKAGE], [PACKAGE_TARNAME], [Define to the gettext package name.])
+@@ -157,7 +157,10 @@
+
+
+ # Libraries used by libglom:
+-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.6 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.32.0 libxml++-2.6 >= 2.23.1 libxslt >= 1.1.10 pygobject-3.0 >= 2.29.0 libgdamm-5.0 >= 4.99.6 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"])
+@@ -224,6 +227,17 @@
+ # so we can use pyexec_LTLIBRARIES in the .am files:
+ AM_PATH_PYTHON
+
++dnl Override standard python locations with MacPorts version specific ones
++
++AC_SUBST([PYTHON_PREFIX], [`$PYTHON -c 'import sys; print(sys.prefix);'`])
++AC_SUBST([PYTHON_EXEC_PREFIX], [`$PYTHON -c 'import sys; print(sys.exec_prefix)'`])
++
++am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
++am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
++
++AC_SUBST([pythondir], [$am_cv_python_pythondir])
++AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
++
+ # Get the compiler and linker flags for embedding Python.
+ # To specify a particular python version you must set an environment variable.
+ # For instance:
Modified: users/devans/dports/gnome/glom/files/patch-glom-libglom-connectionpool.cc.diff
===================================================================
--- users/devans/dports/gnome/glom/files/patch-glom-libglom-connectionpool.cc.diff 2014-04-21 18:23:25 UTC (rev 119256)
+++ users/devans/dports/gnome/glom/files/patch-glom-libglom-connectionpool.cc.diff 2014-04-21 18:31:03 UTC (rev 119257)
@@ -1,6 +1,6 @@
---- glom/libglom/connectionpool.cc.orig 2013-01-14 00:13:51.000000000 -0800
-+++ glom/libglom/connectionpool.cc 2013-08-03 06:17:07.000000000 -0700
-@@ -620,7 +620,7 @@
+--- glom/libglom/connectionpool.cc.orig 2014-01-28 03:01:43.000000000 -0800
++++ glom/libglom/connectionpool.cc 2014-04-10 15:16:29.000000000 -0700
+@@ -612,7 +612,7 @@
// TODO: This is probably mingw specific
static __p_sig_fn_t previous_sig_handler = SIG_DFL;
#else
Added: users/devans/dports/gnome/glom/files/patch-macros-ax_python_devel.m4.diff
===================================================================
--- users/devans/dports/gnome/glom/files/patch-macros-ax_python_devel.m4.diff (rev 0)
+++ users/devans/dports/gnome/glom/files/patch-macros-ax_python_devel.m4.diff 2014-04-21 18:31:03 UTC (rev 119257)
@@ -0,0 +1,11 @@
+--- macros/ax_python_devel.m4.orig 2014-04-10 15:29:03.000000000 -0700
++++ macros/ax_python_devel.m4 2014-04-10 15:32:54.000000000 -0700
+@@ -289,7 +289,7 @@
+ # save current global flags
+ ac_save_LIBS="$LIBS"
+ ac_save_CPPFLAGS="$CPPFLAGS"
+- LIBS="$ac_save_LIBS $PYTHON_LDFLAGS $PYTHON_EXTRA_LDFLAGS $PYTHON_EXTRA_LIBS"
++ LIBS="$ac_save_LIBS $PYTHON_LDFLAGS $PYTHON_EXTRA_LIBS"
+ CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"
+ AC_LANG_PUSH([C])
+ AC_LINK_IFELSE([
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140421/2ea9cc50/attachment.html>
More information about the macports-changes
mailing list