[csw-devel] SF.net SVN: gar:[17955] csw/mgar/pkg/libpqxx/trunk
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Sun May 6 15:31:09 CEST 2012
Revision: 17955
http://gar.svn.sourceforge.net/gar/?rev=17955&view=rev
Author: wahwah
Date: 2012-05-06 13:31:09 +0000 (Sun, 06 May 2012)
Log Message:
-----------
libpqxx/trunk: version bump, package split
Modified Paths:
--------------
csw/mgar/pkg/libpqxx/trunk/Makefile
csw/mgar/pkg/libpqxx/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/libpqxx/trunk/files/0001-Can-t-instantiate-a-const-iterator-from-non-const.patch
csw/mgar/pkg/libpqxx/trunk/files/0002-Don-t-test-for-reverse-iters-if-they-re-not-there.patch
Removed Paths:
-------------
csw/mgar/pkg/libpqxx/trunk/files/0001-Can-t-instantiate-a-const_reverse_iterator.patch
csw/mgar/pkg/libpqxx/trunk/files/0002-If-reviter-is-unavailable-don-t-test-for-it.patch
Modified: csw/mgar/pkg/libpqxx/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libpqxx/trunk/Makefile 2012-05-06 07:50:47 UTC (rev 17954)
+++ csw/mgar/pkg/libpqxx/trunk/Makefile 2012-05-06 13:31:09 UTC (rev 17955)
@@ -2,7 +2,7 @@
# TODO (release-critical prefixed with !, non release-critical with *)
#
NAME = libpqxx
-VERSION = 4.0
+VERSION = 5.0
GARTYPE = v2
CATEGORIES = lib
@@ -10,18 +10,41 @@
define BLURB
endef
-MASTER_SITES = http://pqxx.org/download/software/libpqxx/
+# Daily dev snapshots
+MASTER_SITES = http://pqxx.org/~jtv/tmp/pqxx/snapshot/
+
+# Official download site
+# MASTER_SITES = http://pqxx.org/download/software/libpqxx/
+
DISTFILES = $(DISTNAME).tar.gz
BUILD_DEP_PKGS = CSWpostgresql-dev
-PATCHFILES += 0001-Can-t-instantiate-a-const_reverse_iterator.patch
-PATCHFILES += 0002-If-reviter-is-unavailable-don-t-test-for-it.patch
+PATCHFILES += 0001-Can-t-instantiate-a-const-iterator-from-non-const.patch
+PATCHFILES += 0002-Don-t-test-for-reverse-iters-if-they-re-not-there.patch
+# Tests require a running server, which we won't have.
+SKIPTEST = 1
+
+EXTRA_LINKER_FLAGS = -norunpath
+
CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --enable-shared=yes
+CONFIGURE_ARGS += --enable-static=no
-# The tests require a running PostgreSQL server.
-SKIPTEST = 1
+PACKAGES += CSWlibpqxx5-0
+CATALOGNAME_CSWlibpqxx5-0 = libpqxx5_0
+PKGFILES_CSWlibpqxx5-0 += $(call baseisadirs,$(libdir),libpqxx-5\.0\.so(\.\d+)*)
+SPKG_DESC_CSWlibpqxx5-0 += $(DESCRIPTION), libpqxx-5.0.so
+RUNTIME_DEP_PKGS_CSWlibpqxx5-0 += CSWlibpq5
+# This is a retarded way to name shared libraries. Some projects still do it.
+CHECKPKG_OVERRIDES_CSWlibpqxx5-0 += soname-equals-filename|file=/opt/csw/lib/libpqxx-5.0.so
+# The 'EXTRA_LINKER_FLAGS = -norunpath' bit doesn't work.
+CHECKPKG_OVERRIDES_CSWlibpqxx5-0 += bad-rpath-entry
+PACKAGES += CSWlibpqxx-dev
+SPKG_DESC_CSWlibpqxx-dev += $(DESCRIPTION), development files
+RUNTIME_DEP_PKGS_CSWlibpqxx-dev += CSWlibpqxx5-0
+INCOMPATIBLE_PKGS_CSWlibpqxx-dev = CSWlibpqxx
+
include gar/category.mk
-
Modified: csw/mgar/pkg/libpqxx/trunk/checksums
===================================================================
--- csw/mgar/pkg/libpqxx/trunk/checksums 2012-05-06 07:50:47 UTC (rev 17954)
+++ csw/mgar/pkg/libpqxx/trunk/checksums 2012-05-06 13:31:09 UTC (rev 17955)
@@ -1 +1 @@
-bd7541f858400a96cbe2a48cb342ad0e libpqxx-4.0.tar.gz
+1696363959355504bcfa9cd73b84c4f2 libpqxx-5.0.tar.gz
Added: csw/mgar/pkg/libpqxx/trunk/files/0001-Can-t-instantiate-a-const-iterator-from-non-const.patch
===================================================================
--- csw/mgar/pkg/libpqxx/trunk/files/0001-Can-t-instantiate-a-const-iterator-from-non-const.patch (rev 0)
+++ csw/mgar/pkg/libpqxx/trunk/files/0001-Can-t-instantiate-a-const-iterator-from-non-const.patch 2012-05-06 13:31:09 UTC (rev 17955)
@@ -0,0 +1,43 @@
+From 6b12ccb3569a19fd2549c55647c5ea56956ef07f Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Sun, 6 May 2012 11:03:51 +0200
+Subject: [PATCH] Can't instantiate a const iterator from non-const
+
+---
+ src/connection_base.cxx | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/connection_base.cxx b/src/connection_base.cxx
+index 4137af8..c02591b 100644
+--- a/src/connection_base.cxx
++++ b/src/connection_base.cxx
+@@ -476,11 +476,11 @@ bool pqxx::connection_base::is_open() const PQXX_NOEXCEPT
+ void pqxx::connection_base::process_notice_raw(const char msg[]) PQXX_NOEXCEPT
+ {
+ if (!msg || !*msg) return;
+- const list<errorhandler *>::const_reverse_iterator
++ const list<errorhandler *>::reverse_iterator
+ rbegin = m_errorhandlers.rbegin(),
+ rend = m_errorhandlers.rend();
+ for (
+- list<errorhandler *>::const_reverse_iterator i = rbegin;
++ list<errorhandler *>::reverse_iterator i = rbegin;
+ i != rend && (**i)(msg);
+ ++i) ;
+ }
+@@ -999,10 +999,10 @@ void pqxx::connection_base::close() PQXX_NOEXCEPT
+ PQsetNoticeProcessor(m_Conn, NULL, NULL);
+ list<errorhandler *> old_handlers;
+ m_errorhandlers.swap(old_handlers);
+- const list<errorhandler *>::const_reverse_iterator
++ const list<errorhandler *>::reverse_iterator
+ rbegin = old_handlers.rbegin(),
+ rend = old_handlers.rend();
+- for (list<errorhandler *>::const_reverse_iterator i = rbegin; i!=rend; ++i)
++ for (list<errorhandler *>::reverse_iterator i = rbegin; i!=rend; ++i)
+ gate::errorhandler_connection_base(**i).unregister();
+
+ m_Conn = m_policy.do_disconnect(m_Conn);
+--
+1.7.10
+
Deleted: csw/mgar/pkg/libpqxx/trunk/files/0001-Can-t-instantiate-a-const_reverse_iterator.patch
===================================================================
--- csw/mgar/pkg/libpqxx/trunk/files/0001-Can-t-instantiate-a-const_reverse_iterator.patch 2012-05-06 07:50:47 UTC (rev 17954)
+++ csw/mgar/pkg/libpqxx/trunk/files/0001-Can-t-instantiate-a-const_reverse_iterator.patch 2012-05-06 13:31:09 UTC (rev 17955)
@@ -1,43 +0,0 @@
-From 6952ec8d9a19c0972d8358da98eb48e5fbaa4563 Mon Sep 17 00:00:00 2001
-From: Maciej Blizinski <maciej at opencsw.org>
-Date: Sun, 6 May 2012 09:17:46 +0200
-Subject: [PATCH] Can't instantiate a const_reverse_iterator
-
----
- src/connection_base.cxx | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/connection_base.cxx b/src/connection_base.cxx
-index e67643d..0573105 100644
---- a/src/connection_base.cxx
-+++ b/src/connection_base.cxx
-@@ -476,11 +476,11 @@ bool pqxx::connection_base::is_open() const throw ()
- void pqxx::connection_base::process_notice_raw(const char msg[]) throw ()
- {
- if (!msg || !*msg) return;
-- const list<errorhandler *>::const_reverse_iterator
-+ list<errorhandler *>::reverse_iterator
- rbegin = m_errorhandlers.rbegin(),
- rend = m_errorhandlers.rend();
- for (
-- list<errorhandler *>::const_reverse_iterator i = rbegin;
-+ list<errorhandler *>::reverse_iterator i = rbegin;
- i != rend && (**i)(msg);
- ++i) ;
- }
-@@ -997,10 +997,10 @@ void pqxx::connection_base::close() throw ()
- PQsetNoticeProcessor(m_Conn, NULL, NULL);
- list<errorhandler *> old_handlers;
- m_errorhandlers.swap(old_handlers);
-- const list<errorhandler *>::const_reverse_iterator
-+ const list<errorhandler *>::reverse_iterator
- rbegin = old_handlers.rbegin(),
- rend = old_handlers.rend();
-- for (list<errorhandler *>::const_reverse_iterator i = rbegin; i!=rend; ++i)
-+ for (list<errorhandler *>::reverse_iterator i = rbegin; i!=rend; ++i)
- gate::errorhandler_connection_base(**i).unregister();
-
- m_Conn = m_policy.do_disconnect(m_Conn);
---
-1.7.10
-
Added: csw/mgar/pkg/libpqxx/trunk/files/0002-Don-t-test-for-reverse-iters-if-they-re-not-there.patch
===================================================================
--- csw/mgar/pkg/libpqxx/trunk/files/0002-Don-t-test-for-reverse-iters-if-they-re-not-there.patch (rev 0)
+++ csw/mgar/pkg/libpqxx/trunk/files/0002-Don-t-test-for-reverse-iters-if-they-re-not-there.patch 2012-05-06 13:31:09 UTC (rev 17955)
@@ -0,0 +1,42 @@
+From 25b448599878842fb8175a7bcea58b784f5b2937 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Sun, 6 May 2012 14:10:27 +0200
+Subject: [PATCH] Don't test for reverse iters if they're not there
+
+---
+ test/unit/test_binarystring.cxx | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/test/unit/test_binarystring.cxx b/test/unit/test_binarystring.cxx
+index 1c911d6..1df104a 100644
+--- a/test/unit/test_binarystring.cxx
++++ b/test/unit/test_binarystring.cxx
+@@ -20,7 +20,9 @@ void test_binarystring(transaction_base &T)
+ PQXX_CHECK_EQUAL(b.size(), 0u, "Empty binarystring has nonzero size.");
+ PQXX_CHECK_EQUAL(b.length(), 0u, "Length/size mismatch.");
+ PQXX_CHECK(b.begin() == b.end(), "Empty binarystring iterates.");
++#ifdef PQXX_HAVE_REVERSE_ITERATOR
+ PQXX_CHECK(b.rbegin() == b.rend(), "Empty binarystring reverse-iterates.");
++#endif
+ PQXX_CHECK_THROWS(b.at(0), out_of_range, "Empty binarystring accepts at().");
+
+ b = make_binarystring(T, "z");
+@@ -29,11 +31,15 @@ void test_binarystring(transaction_base &T)
+ PQXX_CHECK_EQUAL(b.size(), 1u, "Bad binarystring size.");
+ PQXX_CHECK_EQUAL(b.length(), 1u, "Length/size mismatch.");
+ PQXX_CHECK(b.begin() != b.end(), "Nonempty binarystring does not iterate.");
++#ifdef PQXX_HAVE_REVERSE_ITERATOR
+ PQXX_CHECK(
+ b.rbegin() != b.rend(),
+ "Nonempty binarystring does not reverse-iterate.");
++#endif
+ PQXX_CHECK(b.begin() + 1 == b.end(), "Bad iteration.");
++#ifdef PQXX_HAVE_REVERSE_ITERATOR
+ PQXX_CHECK(b.rbegin() + 1 == b.rend(), "Bad reverse iteration.");
++#endif
+ PQXX_CHECK(b.front() == 'z', "Unexpected front().");
+ PQXX_CHECK(b.back() == 'z', "Unexpected back().");
+ PQXX_CHECK(b.at(0) == 'z', "Unexpected data at index 0.");
+--
+1.7.10
+
Deleted: csw/mgar/pkg/libpqxx/trunk/files/0002-If-reviter-is-unavailable-don-t-test-for-it.patch
===================================================================
--- csw/mgar/pkg/libpqxx/trunk/files/0002-If-reviter-is-unavailable-don-t-test-for-it.patch 2012-05-06 07:50:47 UTC (rev 17954)
+++ csw/mgar/pkg/libpqxx/trunk/files/0002-If-reviter-is-unavailable-don-t-test-for-it.patch 2012-05-06 13:31:09 UTC (rev 17955)
@@ -1,42 +0,0 @@
-From 550d0970eb6dafc0e153b58bb471a382c9b84731 Mon Sep 17 00:00:00 2001
-From: Maciej Blizinski <maciej at opencsw.org>
-Date: Sun, 6 May 2012 09:38:50 +0200
-Subject: [PATCH 3/3] If reviter is unavailable, don't test for it
-
----
- test/unit/test_binarystring.cxx | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/test/unit/test_binarystring.cxx b/test/unit/test_binarystring.cxx
-index 1c911d6..1df104a 100644
---- a/test/unit/test_binarystring.cxx
-+++ b/test/unit/test_binarystring.cxx
-@@ -20,7 +20,9 @@ void test_binarystring(transaction_base &T)
- PQXX_CHECK_EQUAL(b.size(), 0u, "Empty binarystring has nonzero size.");
- PQXX_CHECK_EQUAL(b.length(), 0u, "Length/size mismatch.");
- PQXX_CHECK(b.begin() == b.end(), "Empty binarystring iterates.");
-+#ifdef PQXX_HAVE_REVERSE_ITERATOR
- PQXX_CHECK(b.rbegin() == b.rend(), "Empty binarystring reverse-iterates.");
-+#endif
- PQXX_CHECK_THROWS(b.at(0), out_of_range, "Empty binarystring accepts at().");
-
- b = make_binarystring(T, "z");
-@@ -29,11 +31,15 @@ void test_binarystring(transaction_base &T)
- PQXX_CHECK_EQUAL(b.size(), 1u, "Bad binarystring size.");
- PQXX_CHECK_EQUAL(b.length(), 1u, "Length/size mismatch.");
- PQXX_CHECK(b.begin() != b.end(), "Nonempty binarystring does not iterate.");
-+#ifdef PQXX_HAVE_REVERSE_ITERATOR
- PQXX_CHECK(
- b.rbegin() != b.rend(),
- "Nonempty binarystring does not reverse-iterate.");
-+#endif
- PQXX_CHECK(b.begin() + 1 == b.end(), "Bad iteration.");
-+#ifdef PQXX_HAVE_REVERSE_ITERATOR
- PQXX_CHECK(b.rbegin() + 1 == b.rend(), "Bad reverse iteration.");
-+#endif
- PQXX_CHECK(b.front() == 'z', "Unexpected front().");
- PQXX_CHECK(b.back() == 'z', "Unexpected back().");
- PQXX_CHECK(b.at(0) == 'z', "Unexpected data at index 0.");
---
-1.7.10
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list