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.

126 lines
3.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/clifford/tse3/gcc34.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2005 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. diff -ruN tse3-0.2.7/src/tse3/app/Application.h tse3-0.2.7-new/src/tse3/app/Application.h
  20. --- tse3-0.2.7/src/tse3/app/Application.h 2002-07-28 17:17:09.000000000 +0200
  21. +++ tse3-0.2.7-new/src/tse3/app/Application.h 2004-06-15 15:25:18.808754168 +0200
  22. @@ -35,12 +35,12 @@
  23. namespace Cmd
  24. {
  25. class CommandHistory;
  26. - };
  27. + }
  28. namespace Ins
  29. {
  30. class Destination;
  31. - };
  32. + }
  33. /**
  34. * The App namespace contains classes that use the @ref TSE3
  35. diff -ruN tse3-0.2.7/src/tse3/app/Record.h tse3-0.2.7-new/src/tse3/app/Record.h
  36. --- tse3-0.2.7/src/tse3/app/Record.h 2002-07-28 17:17:09.000000000 +0200
  37. +++ tse3-0.2.7-new/src/tse3/app/Record.h 2004-06-15 15:27:10.691745368 +0200
  38. @@ -36,7 +36,7 @@
  39. namespace Cmd
  40. {
  41. class CommandHistory;
  42. - };
  43. + }
  44. namespace App
  45. {
  46. diff -ruN tse3-0.2.7/src/tse3/Midi.h tse3-0.2.7-new/src/tse3/Midi.h
  47. --- tse3-0.2.7/src/tse3/Midi.h 2002-07-28 17:17:07.000000000 +0200
  48. +++ tse3-0.2.7-new/src/tse3/Midi.h 2004-06-15 15:14:33.921791888 +0200
  49. @@ -819,6 +819,6 @@
  50. const MidiEvent &e1;
  51. };
  52. };
  53. -};
  54. +}
  55. #endif
  56. diff -ruN tse3-0.2.7/src/tse3/Mutex.h tse3-0.2.7-new/src/tse3/Mutex.h
  57. --- tse3-0.2.7/src/tse3/Mutex.h 2002-07-28 17:17:08.000000000 +0200
  58. +++ tse3-0.2.7-new/src/tse3/Mutex.h 2004-06-15 15:28:52.521264928 +0200
  59. @@ -315,7 +315,7 @@
  60. #endif
  61. }
  62. };
  63. - };
  64. + }
  65. }
  66. #endif
  67. diff -ruN tse3-0.2.7/src/tse3/Notifier.h tse3-0.2.7-new/src/tse3/Notifier.h
  68. --- tse3-0.2.7/src/tse3/Notifier.h 2002-08-20 16:59:15.000000000 +0200
  69. +++ tse3-0.2.7-new/src/tse3/Notifier.h 2004-06-15 15:17:15.756189320 +0200
  70. @@ -290,7 +290,7 @@
  71. const p4_type &p4; // (*)
  72. };
  73. - };
  74. + }
  75. /**************************************************************************
  76. * Public Notifier framework API
  77. @@ -367,7 +367,7 @@
  78. */
  79. typedef Listener<interface_type> listener_type;
  80. - friend class listener_type;
  81. + friend class Listener<interface_type>;
  82. protected:
  83. @@ -602,7 +602,7 @@
  84. if (notifiers.erase(notifier)) notifier->detach(this);
  85. }
  86. - friend class notifier_type;
  87. + friend class Notifier<interface_type>;
  88. protected:
  89. diff -ruN tse3-0.2.7/src/tse3/plt/Arts.cpp tse3-0.2.7-new/src/tse3/plt/Arts.cpp
  90. --- tse3-0.2.7/src/tse3/plt/Arts.cpp 2002-10-22 15:16:45.000000000 +0200
  91. +++ tse3-0.2.7-new/src/tse3/plt/Arts.cpp 2004-06-15 15:21:15.540736528 +0200
  92. @@ -74,7 +74,7 @@
  93. ArtsCommon *artsCommon = 0;
  94. int artsCommonInit = 0;
  95. -};
  96. +}
  97. ArtsMidiScheduler::ArtsMidiScheduler()
  98. diff -ruN tse3-0.2.7/src/tse3/util/MulDiv.h tse3-0.2.7-new/src/tse3/util/MulDiv.h
  99. --- tse3-0.2.7/src/tse3/util/MulDiv.h 2002-07-28 17:17:13.000000000 +0200
  100. +++ tse3-0.2.7-new/src/tse3/util/MulDiv.h 2004-06-15 15:18:59.332443336 +0200
  101. @@ -34,7 +34,7 @@
  102. * @return val * num / div (which coped with integer overflows)
  103. */
  104. extern int muldiv(int val, int num, int div);
  105. - };
  106. + }
  107. }
  108. #endif