nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 08:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

rubyPackages.hpricot: fix build with clang 16

Browse Source
This commit is contained in:
Randy Eckenrode 2024-07-25 21:19:48 -04:00
parent 5a5fda7a90
commit e1d14f12b1
No known key found for this signature in database
GPG Key ID: 64C1CD4EC2A600D9
2 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/ruby-modules/gem-config/default.nix
View File

@ -457,6 +457,14 @@ in
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
};
hpricot = attrs: {
dontBuild = false;
patches = [
# Fix incompatible function pointer conversion errors with clang 16
./hpricot-fix-incompatible-function-pointer-conversion.patch
];
};
iconv = attrs: {
dontBuild = false;
buildFlags = lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}";

48
pkgs/development/ruby-modules/gem-config/hpricot-fix-incompatible-function-pointer-conversion.patch Normal file
View File

@ -0,0 +1,48 @@
diff --git a/ext/fast_xs/fast_xs.c b/ext/fast_xs/fast_xs.c
index 11ef71f..d5eb8d8 100644
--- a/ext/fast_xs/fast_xs.c
+++ b/ext/fast_xs/fast_xs.c
@@ -144,7 +144,7 @@ static VALUE unpack_utf8(VALUE self)
return rb_funcall(self, unpack_id, 1, U_fmt);
}
-static VALUE unpack_uchar(VALUE self)
+static VALUE unpack_uchar(VALUE self, VALUE _exn)
{
return rb_funcall(self, unpack_id, 1, C_fmt);
}
diff --git a/ext/hpricot_scan/hpricot_scan.c b/ext/hpricot_scan/hpricot_scan.c
index f11cbb5..161ebd4 100644
--- a/ext/hpricot_scan/hpricot_scan.c
+++ b/ext/hpricot_scan/hpricot_scan.c
@@ -22,7 +22,7 @@ struct hpricot_struct {
#define RSTRING_PTR(str) RSTRING(str)->ptr
#endif
-VALUE hpricot_css(VALUE, VALUE, VALUE, VALUE, VALUE);
+VALUE hpricot_css(VALUE, VALUE, VALUE, VALUE);
#define NO_WAY_SERIOUSLY "*** This should not happen, please file a bug report with the HTML you're parsing at http://github.com/hpricot/hpricot/issues. So sorry!"
diff --git a/ext/hpricot_scan/hpricot_scan.rl b/ext/hpricot_scan/hpricot_scan.rl
index 0f17f11..8b00a38 100644
--- a/ext/hpricot_scan/hpricot_scan.rl
+++ b/ext/hpricot_scan/hpricot_scan.rl
@@ -20,7 +20,7 @@ struct hpricot_struct {
#define RSTRING_PTR(str) RSTRING(str)->ptr
#endif
-VALUE hpricot_css(VALUE, VALUE, VALUE, VALUE, VALUE);
+VALUE hpricot_css(VALUE, VALUE, VALUE, VALUE);
#define NO_WAY_SERIOUSLY "*** This should not happen, please file a bug report with the HTML you're parsing at http://github.com/hpricot/hpricot/issues. So sorry!"
@@ -806,7 +806,7 @@ make_hpricot_struct(VALUE members, VALUE (*alloc)(VALUE klass))
for (i = 0; i < len; i++) {
ID id = SYM2ID(rb_ary_entry(members, i));
const char* name = rb_id2name(id);
- int len = strlen(name);
+ size_t len = strlen(name);
memcpy(attr_set, name, strlen(name));
attr_set[len] = '=';