depbuildfix.patch 2.9 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778
  1. G_CONST_RETURN is deprecated in glib 2.30 so remove to to avoid
  2. build failures. Also resolve other deprecation issues.
  3. RP 2011/10/12
  4. Upstream-Status: Pending
  5. Index: git/libedataserver/e-data-server-util.c
  6. ===================================================================
  7. --- git.orig/libedataserver/e-data-server-util.c 2011-10-12 01:42:40.622045788 +0100
  8. +++ git/libedataserver/e-data-server-util.c 2011-10-12 01:48:16.732045664 +0100
  9. @@ -165,7 +165,8 @@
  10. static gunichar
  11. stripped_char (gunichar ch)
  12. {
  13. - gunichar *decomp, retval;
  14. + gunichar decomp[4];
  15. + gunichar retval;
  16. GUnicodeType utype;
  17. gsize dlen;
  18. @@ -175,7 +176,7 @@
  19. case G_UNICODE_CONTROL:
  20. case G_UNICODE_FORMAT:
  21. case G_UNICODE_UNASSIGNED:
  22. - case G_UNICODE_COMBINING_MARK:
  23. + case G_UNICODE_SPACING_MARK:
  24. /* Ignore those */
  25. return 0;
  26. break;
  27. @@ -183,7 +184,7 @@
  28. /* Convert to lowercase, fall through */
  29. ch = g_unichar_tolower (ch);
  30. case G_UNICODE_LOWERCASE_LETTER:
  31. - if ((decomp = g_unicode_canonical_decomposition (ch, &dlen))) {
  32. + if ((dlen = g_unichar_fully_decompose (ch, FALSE, decomp, 4))) {
  33. retval = decomp[0];
  34. g_free (decomp);
  35. return retval;
  36. Index: git/addressbook/libedata-book/e-data-book-factory.c
  37. ===================================================================
  38. --- git.orig/addressbook/libedata-book/e-data-book-factory.c 2011-10-12 01:52:25.692045500 +0100
  39. +++ git/addressbook/libedata-book/e-data-book-factory.c 2011-10-12 01:53:31.862045707 +0100
  40. @@ -238,7 +238,7 @@
  41. return g_strdup_printf (
  42. "/org/gnome/evolution/dataserver/addressbook/%d/%u",
  43. getpid (),
  44. - g_atomic_int_exchange_and_add (&counter, 1));
  45. + g_atomic_int_add (&counter, 1));
  46. }
  47. static void
  48. Index: git/addressbook/libedata-book/e-data-book.c
  49. ===================================================================
  50. --- git.orig/addressbook/libedata-book/e-data-book.c 2011-10-12 01:54:40.752045465 +0100
  51. +++ git/addressbook/libedata-book/e-data-book.c 2011-10-12 01:55:16.012045897 +0100
  52. @@ -553,7 +553,7 @@
  53. return g_strdup_printf ("/org/gnome/evolution/dataserver/addressbook/BookView/%d/%d",
  54. getpid (),
  55. - g_atomic_int_exchange_and_add ((int*)&counter, 1));
  56. + g_atomic_int_add ((int*)&counter, 1));
  57. }
  58. static void
  59. Index: git/calendar/libedata-cal/e-data-cal-factory.c
  60. ===================================================================
  61. --- git.orig/calendar/libedata-cal/e-data-cal-factory.c 2011-10-12 01:57:56.612045081 +0100
  62. +++ git/calendar/libedata-cal/e-data-cal-factory.c 2011-10-12 01:57:58.832045211 +0100
  63. @@ -227,7 +227,7 @@
  64. return g_strdup_printf (
  65. "/org/gnome/evolution/dataserver/calendar/%d/%u",
  66. getpid (),
  67. - g_atomic_int_exchange_and_add (&counter, 1));
  68. + g_atomic_int_add (&counter, 1));
  69. }
  70. static void