This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository freeorion.
commit b2d1012aa5b447249bb7f5e389402c219e6add13 Author: Markus Koschany <[email protected]> Date: Mon Sep 12 08:30:36 2016 +0200 Drop all patches. Fixed upstream. --- debian/patches/boost1.61.patch | 49 ---------- debian/patches/make-destructors-public.patch | 135 --------------------------- debian/patches/series | 2 - 3 files changed, 186 deletions(-) diff --git a/debian/patches/boost1.61.patch b/debian/patches/boost1.61.patch deleted file mode 100644 index 616906b..0000000 --- a/debian/patches/boost1.61.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 70c19e312ae86919bd77b39d45fa35dc4b66d458 Mon Sep 17 00:00:00 2001 -From: Marcel Metz <[email protected]> -Date: Sun, 21 Aug 2016 20:23:48 +0200 -Subject: [PATCH] Use old boost::optional implementation for boost 1.61 - -Fixes #777 - -- boost::spirit v 1.61 relies on the fact that the `Variant` template - type of `boost::spirit::qi::detail::find_substitute` typedefs a - `types` subtype. -- For the failing instantiation of `find_substition` a - `boost::optional` is used as `Variant` template type. -- `boost::optional` removed its `types` subtype implementation with - commit [boost::optional b5b8414c0], which means that this type is - missing on every boost version 1.61 and onwards (until fixed of course). -- Using the BOOST_OPTIONAL_CONFIG_USE_OLD_IMPLEMENTATION_OF_OPTIONAL - reenables the old implementation of boost::optional, which provides a - `types` subtype. - -This commits enables said define for boost 1.61 only, because I consider -this an upstream bug. The upstream bug is tracked as [boost #12349]. - -[boost::optional b5b8414c0]: https://github.com/boostorg/optional/commit/b5b8414c069a2c5f16cc1f9813d069c8b36e2c35 -[boost #12349]: https://svn.boost.org/trac/boost/ticket/12349 ---- - CMakeLists.txt | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3e70e72..65f1537 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -143,6 +143,16 @@ find_package(Boost ${MINIMUM_BOOST_VERSION} COMPONENTS chrono date_time filesyst - find_package(ZLIB REQUIRED) - find_package(Freetype REQUIRED) - -+if(${Boost_VERSION} EQUAL "106100") -+ # with boost 1.61 some boost::optional internals were changed. However -+ # boost::spirit relies on some API the old implementation provided. This -+ # define enables the usage of the old boost::optional implementation. -+ # boost upstream tracks this bug as #12349 -+ add_definitions( -+ -DBOOST_OPTIONAL_CONFIG_USE_OLD_IMPLEMENTATION_OF_OPTIONAL -+ ) -+endif() -+ - include_directories( - ${Boost_INCLUDE_DIRS} - ${ZLIB_INCLUDE_DIR} diff --git a/debian/patches/make-destructors-public.patch b/debian/patches/make-destructors-public.patch deleted file mode 100644 index 33cce40..0000000 --- a/debian/patches/make-destructors-public.patch +++ /dev/null @@ -1,135 +0,0 @@ -From: Markus Koschany <[email protected]> -Date: Mon, 22 Aug 2016 01:44:53 +0200 -Subject: make destructors public - -Debian-Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=833773 -Origin: https://github.com/freeorion/freeorion/issues/777 (veelai) ---- - universe/Building.h | 2 +- - universe/Field.h | 2 +- - universe/Fleet.h | 2 +- - universe/Planet.h | 2 +- - universe/Ship.h | 2 +- - universe/System.h | 2 +- - 6 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/universe/Building.h b/universe/Building.h -index 17e889c..83057f1 100644 ---- a/universe/Building.h -+++ b/universe/Building.h -@@ -52,6 +52,7 @@ public: - - virtual void ResetTargetMaxUnpairedMeters(); - //@} -+ ~Building() {} - - protected: - friend class Universe; -@@ -68,7 +69,6 @@ protected: - - template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p); - template <class T> friend void boost::checked_delete(T* x); -- ~Building() {} - - virtual Building* Clone(int empire_id = ALL_EMPIRES) const; ///< returns new copy of this Building - //@} -diff --git a/universe/Field.h b/universe/Field.h -index 8cb5b9a..6e6ea16 100644 ---- a/universe/Field.h -+++ b/universe/Field.h -@@ -38,6 +38,7 @@ public: - - virtual void ResetTargetMaxUnpairedMeters(); - //@} -+ ~Field() {} - - protected: - friend class Universe; -@@ -47,7 +48,6 @@ protected: - - template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p); - template <class T> friend void boost::checked_delete(T* x); -- ~Field() {} - - virtual Field* Clone(int empire_id = ALL_EMPIRES) const; ///< returns new copy of this Field - //@} -diff --git a/universe/Fleet.h b/universe/Fleet.h -index 9b44103..f32bf10 100644 ---- a/universe/Fleet.h -+++ b/universe/Fleet.h -@@ -128,6 +128,7 @@ public: - static const int ETA_NEVER; ///< returned by ETA when fleet can't reach destination due to lack of route or inability to move - static const int ETA_UNKNOWN; ///< returned when ETA can't be determined - static const int ETA_OUT_OF_RANGE; ///< returned by ETA when fleet can't reach destination due to insufficient fuel capacity and lack of fleet resupply on route -+ ~Fleet() {} - - protected: - friend class Universe; -@@ -149,7 +150,6 @@ protected: - - template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p); - template <class T> friend void boost::checked_delete(T* x); -- ~Fleet() {} - - virtual Fleet* Clone(int empire_id = ALL_EMPIRES) const; ///< returns new copy of this Fleet - //@} -diff --git a/universe/Planet.h b/universe/Planet.h -index ec4a6c3..ec09344 100644 ---- a/universe/Planet.h -+++ b/universe/Planet.h -@@ -172,6 +172,7 @@ public: - //@} - - static int TypeDifference(PlanetType type1, PlanetType type2); -+ ~Planet() {} - - protected: - friend class Universe; -@@ -183,7 +184,6 @@ protected: - - template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p); - template <class T> friend void boost::checked_delete(T* x); -- ~Planet() {} - - virtual Planet* Clone(int empire_id = ALL_EMPIRES) const; ///< returns new copy of this Planet - //@} -diff --git a/universe/Ship.h b/universe/Ship.h -index 2599064..e22956c 100644 ---- a/universe/Ship.h -+++ b/universe/Ship.h -@@ -92,6 +92,7 @@ public: - virtual void ResetPairedActiveMeters(); - virtual void SetShipMetersToMax(); - //@} -+ ~Ship() {} - - protected: - friend class Universe; -@@ -102,7 +103,6 @@ protected: - - template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p); - template <class T> friend void boost::checked_delete(T* x); -- ~Ship() {} - - virtual Ship* Clone(int empire_id = ALL_EMPIRES) const; ///< returns new copy of this Ship - //@} -diff --git a/universe/System.h b/universe/System.h -index 0740720..07792bd 100644 ---- a/universe/System.h -+++ b/universe/System.h -@@ -109,6 +109,7 @@ public: - - virtual void ResetTargetMaxUnpairedMeters(); - //@} -+ ~System() {} - - protected: - friend class Universe; -@@ -132,7 +133,6 @@ protected: - - template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p); - template <class T> friend void boost::checked_delete(T* x); -- ~System() {} - - virtual System* Clone(int empire_id = ALL_EMPIRES) const; ///< returns new copy of this System - //@} diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 0c94d5d..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -boost1.61.patch -make-destructors-public.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/freeorion.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
