[polybori] 03/05: Remove obsolete patches.
Tobias Hansen
thansen at moszumanska.debian.org
Tue May 9 23:52:10 UTC 2017
This is an automated email from the git hooks/post-receive script.
thansen pushed a commit to branch master
in repository polybori.
commit 1b990213f966b11c0e095960165df151862552f0
Author: Tobias Hansen <thansen at debian.org>
Date: Wed May 10 00:48:43 2017 +0100
Remove obsolete patches.
---
debian/changelog | 3 +
...02-Generate-clean-.pc-files-from-upstream.patch | 60 -----------------
debian/patches/fix-testsuite.patch | 62 ------------------
debian/patches/fix_ftbfs_gcc-6.patch | 75 ----------------------
debian/patches/series | 2 -
5 files changed, 3 insertions(+), 199 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b33906c..d916eb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
brial (0.8.7-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Removed patches:
+ - fix-testsuite.patch (SConstruct file was deleted upstream.)
+ - fix_ftbfs_gcc-6.patch (applied upstream)
-- Tobias Hansen <thansen at debian.org> Wed, 10 May 2017 00:40:48 +0100
diff --git a/debian/patches/0002-Generate-clean-.pc-files-from-upstream.patch b/debian/patches/0002-Generate-clean-.pc-files-from-upstream.patch
deleted file mode 100644
index eb39941..0000000
--- a/debian/patches/0002-Generate-clean-.pc-files-from-upstream.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From: Alexander Dreyer <adreyer at gmx.de>
-Date: Tue, 12 Mar 2013 11:33:53 +0100
-Subject: Generate clean .pc files (from upstream)
-
----
- SConstruct | 30 ++++++++++++++++++++----------
- 1 file changed, 20 insertions(+), 10 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index d13b8c3..8f433bd 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -2027,26 +2027,36 @@ if 'install' in COMMAND_LINE_TARGETS or 'install-docs' in COMMAND_LINE_TARGETS:
- if pkgconfigdirname:
- def build_pcfile(target, source, env):
- localenv = source[0].get_env()
-- libflags = localenv.subst("$LINKFLAGS $_LIBDIRFLAGS $_LIBFLAGS ${_stripixes(LIBLINKPREFIX, GD_LIBS, LIBLINKSUFFIX, LIBPREFIXES, LIBSUFFIXES, __env__)}");
-- libs = ' '.join(set([l.replace('-l','') for l in libflags.split()
-- if l.startswith('-l')]))
-+ shsfx = localenv.subst('$SHLIBSUFFIX')
-+ versioning = (shsfx.split(env.subst('$SHLIBSUFFIX'))+[''])[0]
-+ shsfx = shsfx.replace(versioning, '')
-+ libpfx = localenv.subst('$LIBPREFIX')
-+ libname = localenv.File(source[0]).name.replace(
-+ libpfx,'').replace(shsfx, '')
-+
-+ import re
-+ m = re.finditer('(?<='+ libpfx + ')' + libpb_name + '[^ ]*(?=' +\
-+ shsfx + ')', localenv.subst("$LIBS"))
-+ localdeps = ' '.join([elt.group(0) for elt in m])
-+
- page = """
- prefix=$PREFIX
- exec_prefix=$${prefix}
--includedir=$DEVEL_INCLUDE_PREFIX
-+includedir=$${prefix}/include
- libdir=$DEVEL_LIB_PREFIX
-
- Name: %s
- Description: The PolyBoRi library
- URL: http://polybori.sourceforge.net
- Version: %s
--Requires: %s
--Cflags: $CXXFLAGS $CCFLAGS $_CCCOMCOM
--Libs: %s
-+Requires: gdlib m4ri libpng %s
-+Cflags: ${INCPREFIX}$${includedir}${INCSUFFIX}
-+Libs: ${LIBDIRPREFIX}$${libdir}${LIBDIRSUFFIX} ${LIBLINKPREFIX}%s${LIBLINKSUFFIX}
- """ % (env.File(target[0]).name.replace('.pc',''),
-- pboriversion + '.' + pborirevision,
-- libs, libflags)
-- page = localenv.subst_target_source(page).replace(env.subst("$DESTDIR"),'') + '\n'
-+ pboriversion + '.' + pborirevision, localdeps,
-+ libname)
-+ page = localenv.subst_target_source(page).replace(
-+ env.subst("$DESTDIR"),'') + '\n'
- open(str(target[0]), 'w').writelines(page)
-
- return None
---
diff --git a/debian/patches/fix-testsuite.patch b/debian/patches/fix-testsuite.patch
deleted file mode 100644
index de871e6..0000000
--- a/debian/patches/fix-testsuite.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Description: Fix test suite
- - Added libraries symlinks to testsuite dependencies to ensure that
- tests can be executed.
- - Library sources were moved to folder libbrial.
- - Add a missing ;
- - Do not set CXXFLAGS=-std=c++98.
-From: Alexander Dreyer <adreyer at gmx.de>, Tobias Hansen <thansen at debian.org>
-Bug: https://github.com/BRiAl/BRiAl/issues/12
-
----
- SConstruct | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/SConstruct
-+++ b/SConstruct
-@@ -99,7 +99,7 @@
-
- [TestsPath, PyPBPath, CuddPath, GBPath, PBPath, DocPath, BuildPath] = \
- [ PathJoiner(fdir)
-- for fdir in Split("""testsuite PyPolyBoRi Cudd groebner libpolybori doc
-+ for fdir in Split("""testsuite PyPolyBoRi Cudd groebner libbrial doc
- build""") ]
-
- M4RIPath = PathJoiner('M4RI')
-@@ -304,7 +304,7 @@
-
- if oldstyle_flags() :
- defaultenv.Append(CCFLAGS=["-std=c99", "$M4RI_CFLAGS"])
-- defaultenv.Append(CXXFLAGS=["-std=c++98", "$M4RI_CFLAGS",
-+ defaultenv.Append(CXXFLAGS=["$M4RI_CFLAGS",
- "-ftemplate-depth-100"])
- for (var, help, default) in [('CCFLAGS', "C compiler flags", ["-O3"]),
- ('CXXFLAGS', "C++ compiler flags", ["-O3"])]:
-@@ -313,7 +313,7 @@
- else:
- defaultenv.Append(CCFLAGS=["$M4RI_CFLAGS"])
- defaultenv.Append(CFLAGS=["-std=c99"])
-- defaultenv.Append(CXXFLAGS=["-std=c++98", "-ftemplate-depth-100"])
-+ defaultenv.Append(CXXFLAGS=["-ftemplate-depth-100"])
-
- for (var, help, default) in [('CCFLAGS', "C/C++ compiler flags", ["-O3"]),
- ('CFLAGS', "C compiler flags", []),
-@@ -1252,6 +1252,8 @@
- [BOOST_TEST] + libpbShared + libgbShared + libm4ri + GD_LIBS,
- CPPDEFINES = ["BOOST_TEST_DYN_LINK"] )
-
-+ env.Depends(target, pb_symlinks + gb_symlinks)
-+
- test_building(TestsPath("unittests"), testfiles, env)
-
- for testfile in testfiles:
---- a/testsuite/src/BoolePolyRingTest.cc
-+++ b/testsuite/src/BoolePolyRingTest.cc
-@@ -96,7 +96,7 @@
-
- BOOST_TEST_MESSAGE( "nVariables, getVariableName, setVariableName" );
-
-- BOOST_CHECK_THROW(ring.getVariableName(-1),PBoRiError)
-+ BOOST_CHECK_THROW(ring.getVariableName(-1),PBoRiError);
- BOOST_CHECK_EQUAL(ring.getVariableName(0), "x(0)");
- BOOST_CHECK_EQUAL(ring.getVariableName(1), "x(1)");
- BOOST_CHECK_EQUAL(ring.getVariableName(2), "x(2)");
diff --git a/debian/patches/fix_ftbfs_gcc-6.patch b/debian/patches/fix_ftbfs_gcc-6.patch
deleted file mode 100644
index f7f956c..0000000
--- a/debian/patches/fix_ftbfs_gcc-6.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 63f747626822f5e0fa2bf975f7801fcc988eb530 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fran=C3=A7ois=20Bissey?= <francois.bissey at canterbury.ac.nz>
-Date: Mon, 2 Jan 2017 09:46:08 +1300
-Subject: [PATCH] only use either standard map or unordered map for more recent
- C++
-
----
- configure.ac | 8 +------
- libbrial/include/polybori/routines/pbori_func.h | 30 ++++++-------------------
- 2 files changed, 8 insertions(+), 30 deletions(-)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -19,13 +19,7 @@
- AC_CHECK_SIZEOF(int)
- AC_CHECK_SIZEOF(long)
-
--AC_CHECK_HEADER([unordered_map],[AC_DEFINE([PBORI_HAVE_UNORDERD_MAP],[],[has unordered map])])
--if ! test "x$ac_cv_header_unordered_map" = xyes; then
-- AC_CHECK_HEADER([tr1/unordered_map],[AC_DEFINE([PBORI_HAVE_TR1_UNORDERED_MAP],[],[has tr1 unordered map])])
-- if ! test "x$ac_cv_header_tr1_unordered_map" = xyes; then
-- AC_CHECK_HEADER([ext/hash_map],[AC_DEFINE([PBORI_HAVE_HASH_MAP],[],[has hash map])])
-- fi
--fi
-+AC_CHECK_HEADER([unordered_map],[AC_DEFINE([PBORI_HAVE_UNORDERED_MAP],[],[has unordered map])])
-
- PKG_CHECK_MODULES([M4RI], m4ri, [AC_DEFINE([PBORI_HAVE_M4RI],[],[has m4ri])])
- AC_EGREP_CPP([pbori_have_m4ri_png],
---- a/libbrial/include/polybori/routines/pbori_func.h
-+++ b/libbrial/include/polybori/routines/pbori_func.h
-@@ -26,18 +26,10 @@
- #include <sstream>
-
-
--#ifdef PBORI_HAVE_TR1_UNORDERED_MAP
--# include <tr1/unordered_map>
--#else
--# ifdef PBORI_HAVE_UNORDERED_MAP
--# include <unordered_map>
--# else
--# ifdef PBORI_HAVE_HASH_MAP
--# include <ext/hash_map>
--# else
--# include <map>
--# endif
--# endif
-+#ifdef PBORI_HAVE_UNORDERED_MAP
-+#include <unordered_map>
-+#else
-+#include <map>
- #endif
-
- BEGIN_NAMESPACE_PBORI
-@@ -630,18 +622,10 @@
- public:
- /// Type for index maps
-
--#ifdef PBORI_HAVE_TR1_UNORDERED_MAP
-- typedef std::tr1::unordered_map<Type, idx_type, hashes<Type> > type;
-+#ifdef PBORI_HAVE_UNORDERED_MAP
-+ typedef std::unordered_map<Type, idx_type, hashes<Type> > type;
- #else
--# ifdef PBORI_HAVE_UNORDERED_MAP
-- typedef std::unordered_map<Type, idx_type, hashes<Type> > type;
--# else
--# ifdef PBORI_HAVE_HASH_MAP
-- typedef __gnu_cxx::hash_map<Type, idx_type, hashes<Type> > type;
--# else
-- typedef std::map<Type, idx_type, Comparator> type;
--# endif
--# endif
-+ typedef std::map<Type, idx_type, Comparator> type;
- #endif
- };
-
diff --git a/debian/patches/series b/debian/patches/series
index 52387c1..5fe5990 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
0003-Protect-CErrorInfo-from-invalid-array-access.patch
-fix-testsuite.patch
testsuite-boost-1.62.patch
-fix_ftbfs_gcc-6.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/polybori.git
More information about the debian-science-commits
mailing list