[Trisquel-devel] Finished fixing make-asunder. Some questions and 1 patch not being applied

[Pablo Correa Gómez]

Hi again!

I have just finished fixing the patches. I have just pushed a branch as it is explained in the contributions guidelines. However, I'm not 100% sure about the changes having been correctly pushed, so please, let me know if you can't see them.

  In addition to fixing the patches that didn't work, I found with grep one function related to the monkey codec. I added the corresponding diff entrances to remove it, but for some reason I cannot understand, the one for the .h file didn't get executed (patching was ok but the line that had to be removed remained in the file after patching). I would like to know if I have made some mistake or if it's all right that there is a prototype of a function that refers to the monkey codec.

What I added (line 460 file DATA/asunder/asunder.4061-monkey.patch):

-----------------------------------------------------------------------------------------------------------------------------------------------------
diff -ruN src-monkey/util.c src/util.c
--- src-monkey/util.c 2017-12-07 00:09:30.000000000 +0000
+++ src/util.c 2017-12-07 00:09:30.000000000 +0000
@@ -39,25 +39,5 @@
     exit(-1);
 }
-
-int int_to_monkey_int(int i)
-{
-    switch(i)
-    {
-    case 0:
-        return 1000;
-    case 1:
-        return 2000;
-    case 2:
-        return 3000;
-    case 3:
-        return 4000;
-    case 4:
-        return 5000;
-    }
-
-    fprintf(stderr, "int_to_monkey_int() called with bad parameter\n");
-    return 3000;
-}

 int int_to_vbr_int(int i)
 {
diff -ruN src-monkey/util.h src/util.h
--- src-monkey/util.h  2017-12-07 13:37:12.000000000 +0000
+++ src/util.h 2017-12-07 13:37:52.000000000 +0000
@@ +5,4 -5,4 @@
 void fatalError(const char* message);

-int int_to_monkey_int(int i);
 int int_to_vbr_int(int i);
 int int_to_bitrate(int i, bool vbr);
 int int_to_wavpack_bitrate(int i);
 int int_to_musepack_bitrate(int i);
 int int_to_musepack_int(int i);
--------------------------------------------------------------------------------------------------------------------------------------------

Thank you very much for your patience with a newbie, I still don't feel confident with all this tools, so I want to make sure I'm doing things right before screwing it up.

Cheers,
Pablo.


Thanks for working on the package helpers! The need for those is quite high.

make-asunder is a good package to work on, although the modifications needed seem rather nontrivial. By all means continue to work on it if you please. If you'd like to work on something that would give you quicker gratification, there are also other packages with probably simpler changes required, such as make-bleachbit.

Kevin

On Tue, Dec 5, 2017 at 6:13 PM, bill-auger <bill-auger en peers.community<mailto:bill-auger en peers.community>> wrote:
!!!rock on!!! pablo


_______________________________________________
Trisquel-devel mailing list
Trisquel-devel en listas.trisquel.info<mailto:Trisquel-devel en listas.trisquel.info>
https://listas.trisquel.info/mailman/listinfo/trisquel-devel<https://listas.trisquel.info/<wbr>mailman/listinfo/trisquel-<wbr>devele>



_______________________________________________
Trisquel-devel mailing list
Trisquel-devel en listas.trisquel.info<mailto:Trisquel-devel en listas.trisquel.info>
https://listas.trisquel.info/mailman/listinfo/trisquel-devel

------------ pr�xima parte ------------
Se ha borrado un adjunto en formato HTML...
URL: <http://listas.trisquel.info/pipermail/trisquel-devel/attachments/20171207/ff44d330/attachment.html>