From e746225250e0ebba149a96e599a6a95ae3335742 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Fri, 30 Nov 2007 15:40:01 +0000 Subject: [PATCH] Added type_mismatch.dpatch to fix a failure to instantiate std::max(). * Use dpatch in debian/rules. * Added dpatch to build dependencies. --- debian/changelog | 3 ++- debian/control | 2 +- debian/patches/00list | 2 ++ debian/patches/type_mismatch.dpatch | 18 ++++++++++++++++++ debian/rules | 6 ++++-- 5 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 debian/patches/00list create mode 100644 debian/patches/type_mismatch.dpatch diff --git a/debian/changelog b/debian/changelog index 04f1e5e..8427e85 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ enblend (3.0+dfsg-1) unstable; urgency=low * Initial release (Closes: #294389, #390655). * Removed GPL incompatible src/win32helpers/ from .orig.tar.gz. + * Added type_mismatch.dpatch to fix a failure to instantiate std::max(). - -- Sebastian Harl Sun, 28 Oct 2007 18:25:17 +0100 + -- Sebastian Harl Fri, 30 Nov 2007 15:37:42 +0000 diff --git a/debian/control b/debian/control index 1122b09..9ec62cf 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: graphics Priority: optional Maintainer: Sebastian Harl Uploaders: Florent Bayle -Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.6), autotools-dev, libtiff4-dev, libboost-dev, liblcms1-dev, libglew-dev, libplot-dev +Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.6), dpatch, autotools-dev, libtiff4-dev, libboost-dev, liblcms1-dev, libglew-dev, libplot-dev Standards-Version: 3.7.2 Homepage: http://enblend.sourceforge.net/ Vcs-Git: git://git.tokkee.org/pkg-enblend.git diff --git a/debian/patches/00list b/debian/patches/00list new file mode 100644 index 0000000..d1c5651 --- /dev/null +++ b/debian/patches/00list @@ -0,0 +1,2 @@ +type_mismatch.dpatch + diff --git a/debian/patches/type_mismatch.dpatch b/debian/patches/type_mismatch.dpatch new file mode 100644 index 0000000..42e79d1 --- /dev/null +++ b/debian/patches/type_mismatch.dpatch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## type_mismatch.dpatch by Sebastian Harl +## +## DP: Fixed a type mismatch when trying to instantiate std::max. + +@DPATCH@ + +--- a/src/anneal.h ++++ b/src/anneal.h +@@ -678,7 +678,7 @@ + + localK = stateSpace->size(); + if (localK < 2) convergedPoints[index] = true; +- kMax = std::max(kMax, stateProbabilities->size()); ++ kMax = std::max(kMax, (unsigned int)stateProbabilities->size()); + + } + diff --git a/debian/rules b/debian/rules index a8b4186..44f28e3 100755 --- a/debian/rules +++ b/debian/rules @@ -19,7 +19,9 @@ else CFLAGS += -O2 endif -config.status: configure +include /usr/share/dpatch/dpatch.make + +config.status: configure $(DPATCH_STAMPFN) dh_testdir CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ @@ -34,7 +36,7 @@ build-stamp: config.status touch build-stamp -clean: +clean: unpatch dh_testdir dh_testroot rm -f build-stamp -- 2.30.2