Control: tag 795154 fixed-upstream patch
Control: forwarded 795154 https://github.com/luabind/luabind/issues/27

Hello again,

Martin Pitt [2015-08-11  9:14 +0200]:
> luabind FTBFS with current sid, due to an apparent incompatibility
> with either gcc-5 or the current boost:

Linking upstream bug. This is fixed upstream with

  https://github.com/glehmann/luabind/commit/8dadb7fa

I'd like to NMU this bug and the C++ library transition bug #791196.
I usually use a 2-day NMU for this as per current exception for the
g++ transition, but as this package is LowNMU, I'll just go ahead and
upload it without delay as both fixes are quite obvious.

NMU debdiff attached.

Thanks,

Martin

-- 
Martin Pitt                        | http://www.piware.de
Ubuntu Developer (www.ubuntu.com)  | Debian Developer  (www.debian.org)
diff -Nru luabind-0.9.1+dfsg/debian/changelog 
luabind-0.9.1+dfsg/debian/changelog
--- luabind-0.9.1+dfsg/debian/changelog 2014-08-10 01:03:42.000000000 +0200
+++ luabind-0.9.1+dfsg/debian/changelog 2015-08-11 09:30:36.000000000 +0200
@@ -1,3 +1,13 @@
+luabind (0.9.1+dfsg-9.1) unstable; urgency=medium
+
+  [ Roberto C. Sanchez ]
+  * Non-maintainer upload.
+  * Add 00git_fix_build_with_boost1.57.patch: Fix FTBFS with current boost.
+    (Closes: #795154)
+  * Rename library packages for g++5 ABI transition. (Closes: #791196)
+
+ -- Martin Pitt <mp...@debian.org>  Tue, 11 Aug 2015 09:29:35 +0200
+
 luabind (0.9.1+dfsg-9) unstable; urgency=low
 
   * Change Build-Depends from "libboost1.54-all-dev | libboost1.55-all-dev |
diff -Nru luabind-0.9.1+dfsg/debian/control luabind-0.9.1+dfsg/debian/control
--- luabind-0.9.1+dfsg/debian/control   2014-08-10 01:03:42.000000000 +0200
+++ luabind-0.9.1+dfsg/debian/control   2015-08-11 09:28:58.000000000 +0200
@@ -8,9 +8,11 @@
 Vcs-Git: git://anonscm.debian.org/users/roberto/luabind.git
 Vcs-Browser: 
http://anonscm.debian.org/gitweb/?p=users/roberto/luabind.git;a=summary
 
-Package: libluabind0.9.1
+Package: libluabind0.9.1v5
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libluabind0.9.1
+Replaces: libluabind0.9.1
 Description: luabind c++ binding for lua: runtime library
  Luabind is a library that helps you create bindings between C++ and Lua.
  It has the ability to expose functions and classes, written in C++, to
@@ -26,7 +28,7 @@
 Section: debug
 Priority: extra
 Architecture: any
-Depends: libluabind0.9.1 (= ${binary:Version}), ${shlibs:Depends}, 
${misc:Depends}
+Depends: libluabind0.9.1v5 (= ${binary:Version}), ${shlibs:Depends}, 
${misc:Depends}
 Suggests: libluabind-dev
 Description: luabind c++ binding for lua: unstripped binaries
  Luabind is a library that helps you create bindings between C++ and Lua.
@@ -42,7 +44,7 @@
 Package: libluabind-dev
 Section: libdevel
 Architecture: any
-Depends: libluabind0.9.1  (= ${binary:Version}), ${shlibs:Depends}, 
liblua5.2-dev, libboost-dev, ${misc:Depends}
+Depends: libluabind0.9.1v5  (= ${binary:Version}), ${shlibs:Depends}, 
liblua5.2-dev, libboost-dev, ${misc:Depends}
 Suggests: libluabind-doc, libluabind-examples
 Description: luabind c++ binding for lua: static library and headers
  Luabind is a library that helps you create bindings between C++ and Lua.
diff -Nru luabind-0.9.1+dfsg/debian/libluabind0.9.1.install 
luabind-0.9.1+dfsg/debian/libluabind0.9.1.install
--- luabind-0.9.1+dfsg/debian/libluabind0.9.1.install   2014-08-10 
01:03:42.000000000 +0200
+++ luabind-0.9.1+dfsg/debian/libluabind0.9.1.install   1970-01-01 
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-bin/*/release/libluabind.so.0.9.1 /usr/lib/
diff -Nru luabind-0.9.1+dfsg/debian/libluabind0.9.1v5.install 
luabind-0.9.1+dfsg/debian/libluabind0.9.1v5.install
--- luabind-0.9.1+dfsg/debian/libluabind0.9.1v5.install 1970-01-01 
01:00:00.000000000 +0100
+++ luabind-0.9.1+dfsg/debian/libluabind0.9.1v5.install 2015-08-11 
09:28:58.000000000 +0200
@@ -0,0 +1 @@
+bin/*/release/libluabind.so.0.9.1 /usr/lib/
diff -Nru 
luabind-0.9.1+dfsg/debian/patches/00git_fix_build_with_boost1.57.patch 
luabind-0.9.1+dfsg/debian/patches/00git_fix_build_with_boost1.57.patch
--- luabind-0.9.1+dfsg/debian/patches/00git_fix_build_with_boost1.57.patch      
1970-01-01 01:00:00.000000000 +0100
+++ luabind-0.9.1+dfsg/debian/patches/00git_fix_build_with_boost1.57.patch      
2015-08-11 09:28:58.000000000 +0200
@@ -0,0 +1,34 @@
+From 8dadb7fae02bbf415ee51f69919cd0d47831cc6c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ga=C3=ABtan=20Lehmann?= <gaetan.lehm...@gmail.com>
+Date: Sun, 4 Jan 2015 14:02:23 +0100
+Subject: [PATCH] fix build with boost 1.57
+
+this is the fix applied in homebrew and in
+
+  https://github.com/luabind/luabind/issues/27
+---
+ luabind/object.hpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/luabind/detail/object.hpp b/luabind/detail/object.hpp
+index 5e2771c..c92319e 100644
+--- a/luabind/object.hpp
++++ b/luabind/object.hpp
+@@ -544,6 +544,8 @@ namespace detail
+       handle m_key;
+   };
+ 
++#if BOOST_VERSION < 105700
++
+ // Needed because of some strange ADL issues.
+ 
+ #define LUABIND_OPERATOR_ADL_WKND(op) \
+@@ -565,6 +567,8 @@ namespace detail
+   LUABIND_OPERATOR_ADL_WKND(!=)
+ 
+ #undef LUABIND_OPERATOR_ADL_WKND
++
++#endif // BOOST_VERSION < 105700
+  
+ } // namespace detail
+ 
diff -Nru luabind-0.9.1+dfsg/debian/patches/series 
luabind-0.9.1+dfsg/debian/patches/series
--- luabind-0.9.1+dfsg/debian/patches/series    2014-08-10 01:03:42.000000000 
+0200
+++ luabind-0.9.1+dfsg/debian/patches/series    2015-08-11 09:28:58.000000000 
+0200
@@ -1,3 +1,4 @@
+00git_fix_build_with_boost1.57.patch
 01_Jamroot_version_bump.patch
 02_example_cleaning.patch
 03_kfreebsd_build.patch

Attachment: signature.asc
Description: Digital signature

Reply via email to