[svn] r6752 - trunk/rpms/libpqxx

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Tue Apr 7 22:48:06 CEST 2009


Author: dries
Date: 2009-04-07 21:48:05 +0100 (Tue, 07 Apr 2009)
New Revision: 6752

Added:
   trunk/rpms/libpqxx/libpqxx-2.6.9-gcc43.patch
   trunk/rpms/libpqxx/libpqxx-2.6.9-visibility.patch
Modified:
   trunk/rpms/libpqxx/libpqxx.spec
Log:
added patch by Filipe Brandenburger which fixes the visibility of freemem_result_data, added a patch by Holger Ackermann which fixes the compile problems with gcc 4.3 (strlen not declared)

Added: trunk/rpms/libpqxx/libpqxx-2.6.9-gcc43.patch
===================================================================
--- trunk/rpms/libpqxx/libpqxx-2.6.9-gcc43.patch	                        (rev 0)
+++ trunk/rpms/libpqxx/libpqxx-2.6.9-gcc43.patch	2009-04-07 20:48:05 UTC (rev 6752)
@@ -0,0 +1,56 @@
+diff -ub ./libpqxx-2.6.9-orig/src/binarystring.cxx ./libpqxx-2.6.9/src/binarystring.cxx
+--- ./libpqxx-2.6.9-orig/src/binarystring.cxx	2008-04-16 19:52:13.000000000 +0200
++++ ./libpqxx-2.6.9/src/binarystring.cxx	2008-04-16 19:52:39.000000000 +0200
+@@ -18,6 +18,7 @@
+ 
+ #include <new>
+ #include <stdexcept>
++#include <cstring>
+ 
+ #include "libpq-fe.h"
+ 
+diff -ub ./libpqxx-2.6.9-orig/src/connection_base.cxx ./libpqxx-2.6.9/src/connection_base.cxx
+--- ./libpqxx-2.6.9-orig/src/connection_base.cxx	2008-04-16 19:52:13.000000000 +0200
++++ ./libpqxx-2.6.9/src/connection_base.cxx	2008-04-16 19:53:10.000000000 +0200
+@@ -22,6 +22,7 @@
+ #include <cerrno>
+ #include <cstdio>
+ #include <ctime>
++#include <cstring>
+ #include <stdexcept>
+ 
+ #ifdef PQXX_HAVE_SYS_SELECT_H
+diff -ub ./libpqxx-2.6.9-orig/src/cursor.cxx ./libpqxx-2.6.9/src/cursor.cxx
+--- ./libpqxx-2.6.9-orig/src/cursor.cxx	2008-04-16 19:52:13.000000000 +0200
++++ ./libpqxx-2.6.9/src/cursor.cxx	2008-04-16 19:53:30.000000000 +0200
+@@ -17,6 +17,7 @@
+  */
+ #include "pqxx/compiler-internal.hxx"
+ 
++#include <cstring>
+ #include <cstdlib>
+ 
+ #include "pqxx/cursor"
+diff -ub ./libpqxx-2.6.9-orig/src/result.cxx ./libpqxx-2.6.9/src/result.cxx
+--- ./libpqxx-2.6.9-orig/src/result.cxx	2008-04-16 19:52:13.000000000 +0200
++++ ./libpqxx-2.6.9/src/result.cxx	2008-04-16 19:54:02.000000000 +0200
+@@ -18,6 +18,8 @@
+ #include "pqxx/compiler-internal.hxx"
+ 
+ #include <stdexcept>
++#include <cstring>
++#include <cstdlib>
+ 
+ #include "libpq-fe.h"
+ 
+diff -ub ./libpqxx-2.6.9-orig/src/transaction_base.cxx ./libpqxx-2.6.9/src/transaction_base.cxx
+--- ./libpqxx-2.6.9-orig/src/transaction_base.cxx	2008-04-16 19:52:13.000000000 +0200
++++ ./libpqxx-2.6.9/src/transaction_base.cxx	2008-04-16 19:54:20.000000000 +0200
+@@ -19,6 +19,7 @@
+ #include "pqxx/compiler-internal.hxx"
+ 
+ #include <stdexcept>
++#include <cstring>
+ 
+ #include "pqxx/connection_base"
+ #include "pqxx/result"

Added: trunk/rpms/libpqxx/libpqxx-2.6.9-visibility.patch
===================================================================
--- trunk/rpms/libpqxx/libpqxx-2.6.9-visibility.patch	                        (rev 0)
+++ trunk/rpms/libpqxx/libpqxx-2.6.9-visibility.patch	2009-04-07 20:48:05 UTC (rev 6752)
@@ -0,0 +1,30 @@
+diff -Naur libpqxx-2.6.9.orig/include/pqxx/prepared_statement.hxx
+libpqxx-2.6.9/include/pqxx/prepared_statement.hxx
+--- libpqxx-2.6.9.orig/include/pqxx/prepared_statement.hxx
+2007-01-29 14:18:52.000000000 -0500
++++ libpqxx-2.6.9/include/pqxx/prepared_statement.hxx   2009-04-06
+21:27:43.000000000 -0400
+@@ -141,7 +141,7 @@
+ namespace internal
+ {
+ /// Internal representation of a prepared statement definition
+-struct PQXX_PRIVATE prepared_def
++struct PQXX_LIBEXPORT prepared_def
+ {
+  /// Parameter definition
+  struct param
+diff -Naur libpqxx-2.6.9.orig/include/pqxx/result.hxx
+libpqxx-2.6.9/include/pqxx/result.hxx
+--- libpqxx-2.6.9.orig/include/pqxx/result.hxx  2007-01-29
+14:18:52.000000000 -0500
++++ libpqxx-2.6.9/include/pqxx/result.hxx       2009-04-06
+21:27:14.000000000 -0400
+@@ -60,7 +60,7 @@
+  ~result_data();
+ };
+
+-void freemem_result_data(result_data *) throw ();
++void PQXX_LIBEXPORT freemem_result_data(result_data *) throw ();
+ template<> inline
+ void PQAlloc<result_data>::freemem() throw () { freemem_result_data(m_Obj); }
+ } // namespace internal

Modified: trunk/rpms/libpqxx/libpqxx.spec
===================================================================
--- trunk/rpms/libpqxx/libpqxx.spec	2009-04-07 19:59:43 UTC (rev 6751)
+++ trunk/rpms/libpqxx/libpqxx.spec	2009-04-07 20:48:05 UTC (rev 6752)
@@ -4,12 +4,14 @@
 Summary: C++ client API for PostgreSQL
 Name: libpqxx
 Version: 2.6.9
-Release: 2
+Release: 3
 License: BSD
 Group: System Environment/Libraries
 URL: http://pqxx.org/
 
 Source: http://pqxx.org/download/software/libpqxx/libpqxx-%{version}.tar.gz
+Patch0: libpqxx-2.6.9-visibility.patch
+Patch1: libpqxx-2.6.9-gcc43.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: openssl-devel, postgresql-devel, postgresql-libs, gcc-c++, pkgconfig
@@ -34,6 +36,8 @@
 
 %prep
 %setup
+%patch0 -p1
+%patch1 -p2
 %{__perl} -pi -e "s|.Werror||g;" configure*
 
 %build
@@ -67,6 +71,10 @@
 %{_libdir}/pkgconfig/libpqxx.pc
 
 %changelog
+* Tue Apr  7 2009 Dries Verachtert <dries at ulyssis.org> - 2.6.9-3
+- Added a patch by Filipe Brandenburger which fixes the visibility of freemem_result_data.
+- Added a patch by Holger Ackermann which fixes the compile problems with gcc 4.3 (strlen not declared).
+
 * Sun Jun 22 2008 David Rennalls <drennalls at gmail.com> - 2.6.9-2
 - Various fixes.
 




More information about the commits mailing list