2 files changed, 11 insertions, 20 deletions

diff --git a/databases/glom/files/patch-glom-libglom-python_embed-py_glom_record.cc b/databases/glom/files/patch-glom-libglom-python_embed-py_glom_record.cc
deleted file mode 100644
index a83ec8738c29..000000000000
--- a/databases/glom/files/patch-glom-libglom-python_embed-py_glom_record.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- glom/libglom/python_embed/py_glom_record.cc.orig	Sun Jul 15 13:34:18 2007
-+++ glom/libglom/python_embed/py_glom_record.cc	Sun Jul 15 13:34:44 2007
-@@ -122,7 +122,7 @@
- 
- 
- 
--static int
-+static Py_ssize_t
- Record_tp_as_mapping_length(PyGlomRecord *self)
- {
-   return self->m_pMap_field_values->size();
-@@ -146,7 +146,7 @@
-         }
-         else
-         {
--          g_warning("Record_tp_as_mapping_getitem(): item not found in m_pMap_field_values. size=%d, item=%s", self->m_pMap_field_values->size(), pchKey);
-+          g_warning("Record_tp_as_mapping_getitem(): item not found in m_pMap_field_values. size=%d, item=%s", (int)self->m_pMap_field_values->size(), pchKey);
-         }
-       }
-       else
diff --git a/databases/glom/files/patch-glom_libglom_connectionpool.cc b/databases/glom/files/patch-glom_libglom_connectionpool.cc
new file mode 100644
index 000000000000..ae8bf97bcc90
--- /dev/null
+++ b/databases/glom/files/patch-glom_libglom_connectionpool.cc
@@ -0,0 +1,11 @@
+--- glom/libglom/connectionpool.cc.orig	2008-01-31 11:29:29.000000000 +0100
++++ glom/libglom/connectionpool.cc	2008-01-31 11:38:06.000000000 +0100
+@@ -642,7 +642,7 @@ bool ConnectionPool::directory_exists_ur
+ }
+ 
+ #ifndef GLOM_ENABLE_CLIENT_ONLY
+-static sighandler_t previous_sig_handler = SIG_DFL; /* Arbitrary default */
++static __sighandler_t *previous_sig_handler = SIG_DFL; /* Arbitrary default */
+ 
+ /* This is a Linux/Unix signal handler, 
+  * so we can respond to a crash.