pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #242094 from reckenrode/djvulibre-clang16

djvulibre: fix build with clang 16

authored by

Weijia Wang and committed by
GitHub 8fb25699 00caa492

+25
unified split
+21
pkgs/applications/misc/djvulibre/c++17-register-class.patch
···
··· 1 + diff -ur a/libdjvu/GBitmap.h b/libdjvu/GBitmap.h 2 + --- a/libdjvu/GBitmap.h 2020-11-20 09:57:32.000000000 -0700 3 + +++ b/libdjvu/GBitmap.h 2023-07-07 07:07:45.519912414 -0600 4 + @@ -620,7 +620,7 @@ 5 + inline int 6 + GBitmap::read_run(unsigned char *&data) 7 + { 8 + - register int z=*data++; 9 + + int z=*data++; 10 + return (z>=RUNOVERFLOWVALUE)? 11 + ((z&~RUNOVERFLOWVALUE)<<8)|(*data++):z; 12 + } 13 + @@ -628,7 +628,7 @@ 14 + inline int 15 + GBitmap::read_run(const unsigned char *&data) 16 + { 17 + - register int z=*data++; 18 + + int z=*data++; 19 + return (z>=RUNOVERFLOWVALUE)? 20 + ((z&~RUNOVERFLOWVALUE)<<8)|(*data++):z; 21 + }
+4
pkgs/applications/misc/djvulibre/default.nix
··· 30 bash 31 ]; 32 33 enableParallelBuilding = true; 34 35 meta = with lib; {
··· 30 bash 31 ]; 32 33 + # Remove uses of the `register` storage class specifier, which was removed in C++17. 34 + # Fixes compilation with clang 16, which defaults to C++17. 35 + patches = [ ./c++17-register-class.patch ]; 36 + 37 enableParallelBuilding = true; 38 39 meta = with lib; {