mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

50 lines
1.9 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/blindcoder/dvdstyler/hotfixes.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  19. --- ./src/Config.h.orig 2005-02-25 20:01:13.323362352 +0100
  20. +++ ./src/Config.h 2005-02-25 20:05:58.288041136 +0100
  21. @@ -67,7 +67,7 @@
  22. #define CONFIG_PROP_T(name, cfgName, defName, cfgType)\
  23. cfgType Get##name(bool def = false)\
  24. - { return def ? defName : cfg->Read(cfgName, defName); }\
  25. + { return def ? defName : cfg->Read(cfgName, (cfgType&)defName); }\
  26. void Set##name(cfgType value)\
  27. {\
  28. wxLogNull log;\
  29. --- ./wxVillaLib/imagjpg.cpp.orig 2005-02-25 19:45:01.000000000 +0100
  30. +++ ./wxVillaLib/imagjpg.cpp 2005-02-25 20:08:56.000024808 +0100
  31. @@ -115,7 +115,7 @@
  32. #define OUTPUT_BUF_SIZE 4096 /* choose an efficiently fwrite'able size */
  33. -#if !wxCHECK_VERSION(2,5,0)
  34. +// #if !wxCHECK_VERSION(2,5,0)
  35. #define wx_init_source my_init_sources
  36. #define wx_fill_input_buffer my_fill_input_buffer
  37. #define wx_skip_input_data my_skip_input_data
  38. @@ -124,7 +124,7 @@
  39. #define wx_init_destination init_destination
  40. #define wx_empty_output_buffer empty_output_buffer
  41. #define wx_term_destination term_destination
  42. -#endif
  43. +// #endif
  44. #ifdef JPEG_METHOD_LINKAGE