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.

116 lines
3.7 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/rene/pixieplus/gcc34.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2004 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. --- ./misc/qxcfi.cpp.orig 2004-09-11 04:07:59.151740064 +0200
  20. +++ ./misc/qxcfi.cpp 2004-09-11 04:08:05.571764072 +0200
  21. @@ -1342,7 +1342,7 @@
  22. bool XCFImageFormat::loadProperty ( QDataStream& xcf_io, PropType& type,
  23. QByteArray& bytes )
  24. {
  25. - xcf_io >> (Q_UINT32)type;
  26. + xcf_io >> (Q_UINT32&)type;
  27. if ( xcf_io.device()->status() != IO_Ok ) {
  28. qDebug( "XCF: read failure on property type" );
  29. --- ./app/batch.cpp.orig 2004-09-11 04:12:22.211748864 +0200
  30. +++ ./app/batch.cpp 2004-09-11 04:13:43.471395520 +0200
  31. @@ -196,7 +196,7 @@
  32. connect(bbox->addButton(i18n("Cancel")), SIGNAL(clicked()), this,
  33. SLOT(reject()));
  34. layout->addWidget(bbox);
  35. -};
  36. +}
  37. KIFShadeDialog::KIFShadeDialog(QWidget *parent, const char *name)
  38. : QDialog(parent, name, true)
  39. @@ -228,7 +228,7 @@
  40. connect(bbox->addButton(i18n("Cancel")), SIGNAL(clicked()), this,
  41. SLOT(reject()));
  42. layout->addWidget(bbox);
  43. -};
  44. +}
  45. KIFTextDialog::KIFTextDialog(QWidget *parent, const char *name)
  46. : QDialog(parent, name, true)
  47. --- ./app/batch.h.orig 2004-09-11 04:12:32.822135840 +0200
  48. +++ ./app/batch.h 2004-09-11 04:12:50.375467328 +0200
  49. @@ -17,7 +17,7 @@
  50. #define off_t long long
  51. extern "C"{
  52. #include <api.h>
  53. -};
  54. +}
  55. class KProgress;
  56. class QLabel;
  57. --- ./app/ifapp.h.orig 2004-09-11 04:12:37.881366720 +0200
  58. +++ ./app/ifapp.h 2004-09-11 04:13:18.392208136 +0200
  59. @@ -14,7 +14,7 @@
  60. #define off_t long long
  61. extern "C"{
  62. #include <api.h>
  63. -};
  64. +}
  65. class KIFFileList;
  66. class KIFImage;
  67. --- ./app/imageutils.cpp.orig 2004-09-11 04:17:17.323885000 +0200
  68. +++ ./app/imageutils.cpp 2004-09-11 04:17:24.803747888 +0200
  69. @@ -23,7 +23,7 @@
  70. #define off_t long long
  71. extern "C"{
  72. #include <api.h>
  73. -};
  74. +}
  75. // in compressedgif.cpp
  76. unsigned int WriteCompressedGIFImage(const ImageInfo *image_info,
  77. --- ./app/main.cpp.orig 2004-09-11 04:17:51.949621088 +0200
  78. +++ ./app/main.cpp 2004-09-11 04:17:59.114531856 +0200
  79. @@ -21,7 +21,7 @@
  80. #define off_t long long
  81. extern "C"{
  82. #include <api.h>
  83. -};
  84. +}
  85. /* Signal handlers. We install them for pretty much everything that can
  86. --- ./app/rightclick.cpp.orig 2004-09-11 04:15:50.851030872 +0200
  87. +++ ./app/rightclick.cpp 2004-09-11 04:16:31.609834592 +0200
  88. @@ -220,7 +220,7 @@
  89. idx = -1;
  90. }
  91. if(idx != -1){
  92. - QStringList itemList(view->itemCatagories(&itemList[idx]));
  93. + QStringList itemList(view->itemCatagories((Thumbnail *)&itemList[idx]));
  94. for(it=catList.begin(), i=1000; it != catList.end(); ++it, ++i){
  95. if(itemList.findIndex((*it)) == -1)
  96. addMnu->insertItem((*it), i);
  97. --- ./app/screengrab.cpp.orig 2004-09-11 04:14:32.614924568 +0200
  98. +++ ./app/screengrab.cpp 2004-09-11 04:14:39.452885040 +0200
  99. @@ -125,7 +125,7 @@
  100. while(inLoop)
  101. kapp->processEvents();
  102. delete this;
  103. -};
  104. +}
  105. void KIFScreenGrab::slotCheckIfDelay()
  106. {