0004-Remove-invalid-g_object-declarations-to-fix-build-wi.patch 1.1 KB

123456789101112131415161718192021222324252627282930313233
  1. From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001
  2. From: Fabian Vogt <fvogt@suse.de>
  3. Date: Wed, 7 Apr 2021 13:38:09 +0200
  4. Subject: [PATCH] Remove invalid g_object declarations to fix build with glib
  5. >= 2.68
  6. g_object_ref_sink is defined as a macro meanwhile and so the build fails.
  7. Just remove the declarations, glib.h is included anyway.
  8. Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
  9. [Retrieved from: https://github.com/qtwebkit/qtwebkit/pull/1058]
  10. [Dario: make the patch to be applied with fuzz factor 0]
  11. Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
  12. ---
  13. Source/WTF/wtf/glib/GRefPtr.h | 3 ---
  14. 1 file changed, 3 deletions(-)
  15. diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h
  16. index 06133d82cb35..d9a1d2f145f5 100644
  17. --- a/Source/WTF/wtf/glib/GRefPtr.h
  18. +++ b/Source/WTF/wtf/glib/GRefPtr.h
  19. @@ -29,9 +29,6 @@
  20. #include <wtf/RefPtr.h>
  21. #include <algorithm>
  22. -extern "C" void g_object_unref(gpointer);
  23. -extern "C" gpointer g_object_ref_sink(gpointer);
  24. -
  25. namespace WTF {
  26. enum GRefPtrAdoptType { GRefPtrAdopt };
  27. --
  28. 2.25.1