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

Fix altermime build

Browse Source 
svn path=/nixpkgs/trunk/; revision=33625
This commit is contained in:
Yury G. Kudryashov 2012-04-05 15:31:10 +00:00
parent b4e5ce8de5
commit 68b6d23a35
4 changed files with 23 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
pkgs/tools/networking/altermime/altermime.patch
View File

@ -1,48 +0,0 @@
AUR patch for fixing build
diff -Naur altermime-0.3.10/qpe.c altermime-0.3.10-new/qpe.c
--- altermime-0.3.10/qpe.c 2008-11-16 09:45:45.000000000 +0100
+++ altermime-0.3.10-new/qpe.c 2010-11-24 14:28:43.153334114 +0100
@@ -97,7 +97,7 @@
op+= strlen(paragraph);// +3; /** jump the output + =\r\n **/
out_remaining-= (strlen(paragraph)); // Was +3, updated to fix Outlook problems
- QPD fprintf(stdout, "Soft break (%d + %d > 76 char) for '%s'\n", current_line_length, charout_size, paragraph);
+ QPD fprintf(stdout, "Soft break (%zd + %d > 76 char) for '%s'\n", current_line_length, charout_size, paragraph);
/** reinitialize the paragraph **/
paragraph[0] = '\0';
@@ -108,7 +108,7 @@
}
snprintf(pp, pp_remaining, "%s", charout);
- QPD fprintf(stdout,"charout='%s', size=%d, pp_remain=%d result='%s'\n", charout, charout_size, pp_remaining, paragraph);
+ QPD fprintf(stdout,"charout='%s', size=%d, pp_remain=%zd result='%s'\n", charout, charout_size, pp_remaining, paragraph);
pp += charout_size;
pp_remaining -= charout_size;
p++;
@@ -149,13 +149,13 @@
out_size = in_size *3;
in_buffer = malloc( sizeof(char) *in_size +1);
if (in_buffer == NULL) {
- QPD fprintf(stdout,"Error allocating %d bytes for input buffer\n", in_size);
+ QPD fprintf(stdout,"Error allocating %zd bytes for input buffer\n", in_size);
return -1;
}
out_buffer = malloc( sizeof(char) *out_size *3 +1);
if (in_buffer == NULL) {
- QPD fprintf(stdout,"Error allocating %d bytes for output buffer\n", out_size);
+ QPD fprintf(stdout,"Error allocating %zd bytes for output buffer\n", out_size);
return -1;
}
@@ -169,7 +169,7 @@
** we segfault ;) **/
*(in_buffer +in_size) = '\0';
- QPD fprintf(stdout,"file %s is loaded, size = %d\n", fname, in_size);
+ QPD fprintf(stdout,"file %s is loaded, size = %zd\n", fname, in_size);
qp_encode( out_buffer, out_size, in_buffer, in_size );

18
pkgs/tools/networking/altermime/debian-patches.nix Normal file
View File

@ -0,0 +1,18 @@
# Generated by debian-patches.sh from debian-patches.txt
let
prefix = "http://patch-tracker.debian.org/patch/series/dl/altermime/0.3.10-7";
in
[
{
url = "${prefix}/15_fix_snprintf.diff";
sha256 = "0fbi99s7pc2jvg9s2zldvg18i6g5ca3pcyaxy47kyabnz956dris";
}
{
url = "${prefix}/10_fix_printk_warnings.diff";
sha256 = "1fqsym07r3gv8zllg7c956g5a04gsxnr1ibbgkjr3yx6nm5ci1j7";
}
{
url = "${prefix}/20_fix-unused-but-set-variables.diff";
sha256 = "0ski67k44amrgg2g3gwdjzrlix2gjg60r5rs5wbjingvq1n7255r";
}
]

4
pkgs/tools/networking/altermime/debian-patches.txt Normal file
View File

@ -0,0 +1,4 @@
altermime/0.3.10-7
15_fix_snprintf.diff
10_fix_printk_warnings.diff
20_fix-unused-but-set-variables.diff

2
pkgs/tools/networking/altermime/default.nix
View File

@ -26,7 +26,7 @@ rec {
inherit (sourceInfo) name version;
inherit buildInputs;
patches = [./altermime.patch];
patches = map a.fetchurl (import ./debian-patches.nix);
phaseNames = ["doPatch" "fixTarget" "doMakeInstall"];
fixTarget = a.fullDepEntry (''