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.

123 lines
3.1 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/gnome2/libgda/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. The usual gcc-3.4 trivialities.
  20. - Rene Rebe <rene@exactcode.de>
  21. --- libgda-1.0.1/libgda/gda-util.c.orig 2004-05-10 14:21:46.925295232 +0200
  22. +++ libgda-1.0.1/libgda/gda-util.c 2004-05-10 14:22:59.587248936 +0200
  23. @@ -62,10 +62,8 @@
  24. case GDA_VALUE_TYPE_TIME : return "time";
  25. case GDA_VALUE_TYPE_TIMESTAMP : return "timestamp";
  26. case GDA_VALUE_TYPE_TINYINT : return "tinyint";
  27. - default:
  28. + default: return "string";
  29. }
  30. -
  31. - return "string";
  32. }
  33. /**
  34. --- libgda-1.0.1/providers/xml/gda-xml-provider.c.orig 2004-05-10 14:31:07.936008640 +0200
  35. +++ libgda-1.0.1/providers/xml/gda-xml-provider.c 2004-05-10 14:31:22.640773176 +0200
  36. @@ -682,7 +682,6 @@
  37. case GDA_CONNECTION_SCHEMA_TYPES :
  38. return get_types (cnc);
  39. default :
  40. + return NULL;
  41. }
  42. -
  43. - return NULL;
  44. }
  45. --- libgda-1.0.1/providers/ldap/gda-ldap-provider.c.orig 2004-05-10 14:29:32.499517192 +0200
  46. +++ libgda-1.0.1/providers/ldap/gda-ldap-provider.c 2004-05-10 14:30:36.051855768 +0200
  47. @@ -276,9 +276,8 @@
  48. case GDA_CONNECTION_FEATURE_SQL :
  49. return TRUE;
  50. default :
  51. + return FALSE;
  52. }
  53. -
  54. - return FALSE;
  55. }
  56. static void
  57. @@ -467,9 +466,8 @@
  58. case GDA_CONNECTION_SCHEMA_TYPES :
  59. return get_ldap_types (cnc, params);
  60. default :
  61. + return NULL;
  62. }
  63. -
  64. - return NULL;
  65. }
  66. /* begin_transaction handler for the GdaLdapProvider class */
  67. --- libgda-1.0.1/providers/mysql/gda-mysql-provider.c.orig 2004-05-10 14:25:03.484413704 +0200
  68. +++ libgda-1.0.1/providers/mysql/gda-mysql-provider.c 2004-05-10 14:26:35.245463904 +0200
  69. @@ -510,6 +510,7 @@
  70. g_free (str);
  71. break;
  72. default:
  73. + ;
  74. }
  75. return reclist;
  76. @@ -655,6 +656,7 @@
  77. case GDA_CONNECTION_FEATURE_TRANSACTIONS :
  78. return TRUE;
  79. default :
  80. + ;
  81. }
  82. return FALSE;
  83. @@ -1187,7 +1189,6 @@
  84. case GDA_CONNECTION_SCHEMA_TYPES :
  85. return get_mysql_types (cnc, params);
  86. default :
  87. + return NULL;
  88. }
  89. -
  90. - return NULL;
  91. }
  92. --- libgda-1.0.1/providers/sqlite/gda-sqlite-provider.c.orig 2004-05-10 14:27:57.509957800 +0200
  93. +++ libgda-1.0.1/providers/sqlite/gda-sqlite-provider.c 2004-05-10 14:28:56.085053032 +0200
  94. @@ -589,9 +589,8 @@
  95. case GDA_CONNECTION_FEATURE_VIEWS :
  96. return TRUE;
  97. default:
  98. + return FALSE;
  99. }
  100. -
  101. - return FALSE;
  102. }
  103. static void
  104. @@ -775,7 +774,6 @@
  105. case GDA_CONNECTION_SCHEMA_TYPES :
  106. return get_types ();
  107. default:
  108. + return NULL;
  109. }
  110. -
  111. - return NULL;
  112. }