Revision: 139832 https://trac.macports.org/changeset/139832 Author: devans@macports.org Date: 2015-08-29 08:35:50 -0700 (Sat, 29 Aug 2015) Log Message: ----------- GNOME-3/unstable-c++11: glom, copy from unstable and update to version 1.29.5, as of this version requires C++11 and boost +python34 to configure and build, use cxx11 port group. 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 Added Paths: ----------- users/devans/GNOME-3/unstable-c++11/dports/gnome/glom/ users/devans/GNOME-3/unstable-c++11/dports/gnome/glom/files/patch-glom-frame_glom.cc.diff Modified: users/devans/GNOME-3/unstable-c++11/dports/gnome/glom/Portfile =================================================================== --- users/devans/GNOME-3/unstable/dports/gnome/glom/Portfile 2015-07-18 20:38:33 UTC (rev 138775) +++ users/devans/GNOME-3/unstable-c++11/dports/gnome/glom/Portfile 2015-08-29 15:35:50 UTC (rev 139832) @@ -4,8 +4,12 @@ PortSystem 1.0 PortGroup active_variants 1.1 +# as of version 1.29.5 requires C++11 to build + +PortGroup cxx11 1.0 + name glom -version 1.29.4 +version 1.29.5 set branch [join [lrange [split ${version} .] 0 1] .] license GPL-2 description Glom is an easy-to-use database designer and user interface. @@ -19,8 +23,8 @@ use_xz yes -checksums rmd160 6d0dd3c01caaa4fbf996df26126a559a3534a603 \ - sha256 052f60cafacece4b88e40641492336caae06d051ca76ee5b9a0b9e062882a432 +checksums rmd160 15163cd99ce54f2f81caa532833df492d1183251 \ + sha256 2806bd9b5ebb1aaee6e9da0e080ec087074f7a31ba962178390e96d45acfc29d # set pbranch to desired perl version # currently 5.22 (#48365) @@ -38,7 +42,7 @@ path:bin/dot:graphviz \ port:doxygen \ port:libxslt \ - port:py27-sphinx \ + port:py34-sphinx \ port:perl${pbranch} depends_lib port:desktop-file-utils \ @@ -52,7 +56,7 @@ port:goocanvasmm2\ port:gtksourceviewmm3 \ port:postgresql94 \ - port:py27-gobject3 \ + port:py34-gobject3 \ port:libepc \ port:evince \ port:shared-mime-info @@ -62,15 +66,17 @@ port:gnome-keyring patchfiles patch-configure.ac.diff \ + patch-glom-frame_glom.cc.diff \ patch-glom-libglom-connectionpool.cc.diff require_active_variants libgda5 postgresql94 +require_active_variants boost python34 # reconfigure using upstream autogen.sh for intltool 0.51 compatibility configure.cmd ./autogen.sh -set python.branch 2.7 +set python.branch 3.4 set python.prefix ${frameworks_dir}/Python.framework/Versions/${python.branch} configure.pkg_config_path ${python.prefix}/lib/pkgconfig Modified: users/devans/GNOME-3/unstable-c++11/dports/gnome/glom/files/patch-configure.ac.diff =================================================================== --- users/devans/GNOME-3/unstable/dports/gnome/glom/files/patch-configure.ac.diff 2015-07-18 20:38:33 UTC (rev 138775) +++ users/devans/GNOME-3/unstable-c++11/dports/gnome/glom/files/patch-configure.ac.diff 2015-08-29 15:35:50 UTC (rev 139832) @@ -1,6 +1,6 @@ ---- configure.ac.orig 2015-06-09 01:42:33.000000000 -0700 -+++ configure.ac 2015-07-18 03:21:41.000000000 -0700 -@@ -157,7 +157,10 @@ +--- configure.ac.orig 2015-07-13 02:58:23.000000000 -0700 ++++ configure.ac 2015-07-17 21:54:30.000000000 -0700 +@@ -159,7 +159,10 @@ # Libraries used by libglom: @@ -12,7 +12,7 @@ AS_IF([test "x$glom_host_win32" != xyes], [REQUIRED_LIBGLOM_LIBS="$REQUIRED_LIBGLOM_LIBS libepc-1.0 >= 0.4.0"]) -@@ -230,6 +233,17 @@ +@@ -232,6 +235,17 @@ # so we can use pyexec_LTLIBRARIES in the .am files: AM_PATH_PYTHON @@ -28,5 +28,5 @@ +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: + # To specify a particular python version you must pass PYTHON_VERSION. + # For instance, ./configure PYTHON_VERSION="3.4" --prefix=/opt/gnome Added: users/devans/GNOME-3/unstable-c++11/dports/gnome/glom/files/patch-glom-frame_glom.cc.diff =================================================================== --- users/devans/GNOME-3/unstable-c++11/dports/gnome/glom/files/patch-glom-frame_glom.cc.diff (rev 0) +++ users/devans/GNOME-3/unstable-c++11/dports/gnome/glom/files/patch-glom-frame_glom.cc.diff 2015-08-29 15:35:50 UTC (rev 139832) @@ -0,0 +1,38 @@ +--- glom/frame_glom.cc.orig 2015-07-21 01:03:05.000000000 -0700 ++++ glom/frame_glom.cc 2015-07-21 01:04:25.000000000 -0700 +@@ -1628,7 +1628,7 @@ + Utils::get_glade_widget_derived_with_warning(m_pDialog_Relationships); + if(!m_pDialog_Relationships) + { +- std::cerr << G_STRFUNC << ": m_pDialog_Relationships is null." << std::cerr; ++ std::cerr << G_STRFUNC << ": m_pDialog_Relationships is null." << std::endl; + return; + } + +@@ -1699,7 +1699,7 @@ + Utils::get_glade_child_widget_derived_with_warning(m_pBox_Reports); + if(!m_pBox_Reports) + { +- std::cerr << G_STRFUNC << ": m_pBox_Reports is null." << std::cerr; ++ std::cerr << G_STRFUNC << ": m_pBox_Reports is null." << std::endl; + return; + } + +@@ -1990,7 +1990,7 @@ + Utils::get_glade_widget_derived_with_warning(m_pDialogConnection); + if(!m_pDialogConnection) + { +- std::cerr << G_STRFUNC << ": m_pBox_Reports is null." << std::cerr; ++ std::cerr << G_STRFUNC << ": m_pBox_Reports is null." << std::endl; + return false; + } + +@@ -2394,7 +2394,7 @@ + Utils::get_glade_widget_with_warning("glom_developer.glade", "dialog_error_create_database", dialog); + if(!dialog) + { +- std::cerr << G_STRFUNC << ": dialog is null." << std::cerr; ++ std::cerr << G_STRFUNC << ": dialog is null." << std::endl; + return false; + } + Modified: users/devans/GNOME-3/unstable-c++11/dports/gnome/glom/files/patch-glom-libglom-connectionpool.cc.diff =================================================================== --- users/devans/GNOME-3/unstable/dports/gnome/glom/files/patch-glom-libglom-connectionpool.cc.diff 2015-07-18 20:38:33 UTC (rev 138775) +++ users/devans/GNOME-3/unstable-c++11/dports/gnome/glom/files/patch-glom-libglom-connectionpool.cc.diff 2015-08-29 15:35:50 UTC (rev 139832) @@ -1,6 +1,6 @@ ---- glom/libglom/connectionpool.cc.orig 2015-02-10 03:00:11.000000000 -0800 -+++ glom/libglom/connectionpool.cc 2015-07-18 03:21:41.000000000 -0700 -@@ -605,7 +605,7 @@ +--- 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 @@ // TODO: This is probably mingw specific static __p_sig_fn_t previous_sig_handler = SIG_DFL; #else