[138763] users/devans/GNOME-3/unstable/dports/gnome/glom/files

[devans at macports.org]

Revision: 138763
          https://trac.macports.org/changeset/138763
Author:   devans at macports.org
Date:     2015-07-18 03:30:07 -0700 (Sat, 18 Jul 2015)
Log Message:
-----------
GNOME-3/unstable: glom, update patch files.

Modified Paths:
--------------
    users/devans/GNOME-3/unstable/dports/gnome/glom/files/patch-configure.ac.diff
    users/devans/GNOME-3/unstable/dports/gnome/glom/files/patch-glom-libglom-connectionpool.cc.diff

Removed Paths:
-------------
    users/devans/GNOME-3/unstable/dports/gnome/glom/files/patch-glom-frame_glom.cc.diff
    users/devans/GNOME-3/unstable/dports/gnome/glom/files/patch-macros-ax_python_devel.m4.diff

Modified: users/devans/GNOME-3/unstable/dports/gnome/glom/files/patch-configure.ac.diff
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/glom/files/patch-configure.ac.diff	2015-07-18 09:45:11 UTC (rev 138762)
+++ users/devans/GNOME-3/unstable/dports/gnome/glom/files/patch-configure.ac.diff	2015-07-18 10:30:07 UTC (rev 138763)
@@ -1,14 +1,14 @@
---- configure.ac.orig	2014-07-07 07:47:09.000000000 -0700
-+++ configure.ac	2014-07-07 10:36:59.000000000 -0700
+--- 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 @@
  
  
  # 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.8 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.8 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"])
+-REQUIRED_LIBGLOM_LIBS='giomm-2.4 >= 2.43.1 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'
++REQUIRED_LIBGLOM_LIBS='giomm-2.4 >= 2.43.1 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'
++ 
++ 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"])

Deleted: users/devans/GNOME-3/unstable/dports/gnome/glom/files/patch-glom-frame_glom.cc.diff
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/glom/files/patch-glom-frame_glom.cc.diff	2015-07-18 09:45:11 UTC (rev 138762)
+++ users/devans/GNOME-3/unstable/dports/gnome/glom/files/patch-glom-frame_glom.cc.diff	2015-07-18 10:30:07 UTC (rev 138763)
@@ -1,11 +0,0 @@
---- glom/frame_glom.cc.orig	2013-04-16 00:35:35.000000000 -0700
-+++ glom/frame_glom.cc	2013-04-16 00:35:55.000000000 -0700
-@@ -1576,7 +1576,7 @@
-   //Get the fields information from the database:
-   DbUtils::type_vec_fields fieldsDatabase = DbUtils::get_fields_for_table_from_database(m_table_name);
- 
--  Document* pDoc = dynamic_cast<const Document*>(get_document());
-+  Document* pDoc = dynamic_cast<Document*>(get_document());
-   if(pDoc)
-   {
-     bool document_must_be_updated = false;

Modified: users/devans/GNOME-3/unstable/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 09:45:11 UTC (rev 138762)
+++ users/devans/GNOME-3/unstable/dports/gnome/glom/files/patch-glom-libglom-connectionpool.cc.diff	2015-07-18 10:30:07 UTC (rev 138763)
@@ -1,6 +1,6 @@
---- 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 @@
+--- 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 @@
  // TODO: This is probably mingw specific
  static __p_sig_fn_t previous_sig_handler = SIG_DFL;
  #else

Deleted: users/devans/GNOME-3/unstable/dports/gnome/glom/files/patch-macros-ax_python_devel.m4.diff
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/glom/files/patch-macros-ax_python_devel.m4.diff	2015-07-18 09:45:11 UTC (rev 138762)
+++ users/devans/GNOME-3/unstable/dports/gnome/glom/files/patch-macros-ax_python_devel.m4.diff	2015-07-18 10:30:07 UTC (rev 138763)
@@ -1,11 +0,0 @@
---- 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/20150718/6d3296c8/attachment-0001.html>