cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

htmlcxx: 0.86 -> 0.87

Browse source 
Also fix build with C++17, thoughtfully stolen from [1].

[1]: https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-cpp/htmlcxx/files/htmlcxx-0.87-c++17.patch
This commit is contained in:
Zane van Iperen 2022-04-25 00:29:17 +10:00
parent 858b460f3c
commit 1b44874d72
No known key found for this signature in database
GPG key ID: 68616B2D8AC4DCC5
2 changed files with 31 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
pkgs/development/libraries/htmlcxx/c++17.patch Normal file
View file

@ -0,0 +1,24 @@
diff --color -Naur a/html/CharsetConverter.cc b/html/CharsetConverter.cc
--- a/html/CharsetConverter.cc 2018-12-29 03:13:56.000000000 +0000
+++ b/html/CharsetConverter.cc 2021-05-31 23:03:10.705334580 +0100
@@ -7,7 +7,7 @@
using namespace std;
using namespace htmlcxx;
-CharsetConverter::CharsetConverter(const string &from, const string &to) throw (Exception)
+CharsetConverter::CharsetConverter(const string &from, const string &to)
{
mIconvDescriptor = iconv_open(to.c_str(), from.c_str());
if (mIconvDescriptor == (iconv_t)(-1))
diff --color -Naur a/html/CharsetConverter.h b/html/CharsetConverter.h
--- a/html/CharsetConverter.h 2018-12-29 03:13:56.000000000 +0000
+++ b/html/CharsetConverter.h 2021-05-31 23:03:19.042574598 +0100
@@ -17,7 +17,7 @@
: std::runtime_error(arg) {}
};
- CharsetConverter(const std::string &from, const std::string &to) throw (Exception);
+ CharsetConverter(const std::string &from, const std::string &to);
~CharsetConverter();
std::string convert(const std::string &input);

11
pkgs/development/libraries/htmlcxx/default.nix
View file

@ -2,15 +2,18 @@
stdenv.mkDerivation rec {
pname = "htmlcxx";
version = "0.86";
version = "0.87";
src = fetchurl {
url = "mirror://sourceforge/htmlcxx/htmlcxx/${version}/${pname}-${version}.tar.gz";
sha256 = "1hgmyiad3qgbpf2dvv2jygzj6jpz4dl3n8ds4nql68a4l9g2nm07";
url = "mirror://sourceforge/htmlcxx/v${version}/${pname}-${version}.tar.gz";
sha256 = "sha256-XTj5OM9N+aKYpTRq8nGV//q/759GD8KgIjPLz6j8dcg=";
};
buildInputs = [ libiconv ];
patches = [ ./ptrdiff.patch ];
patches = [
./ptrdiff.patch
./c++17.patch
];
meta = with lib; {
homepage = "http://htmlcxx.sourceforge.net/";