spotify_blob.patch 2.6 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778
  1. From e8c87242457ebd597c4f706b3b118afb39dbb742 Mon Sep 17 00:00:00 2001
  2. From: Chocobozzz <me@florianbigard.com>
  3. Date: Tue, 6 Feb 2018 08:45:48 +0100
  4. Subject: [PATCH] Revert "Link statically to libprotobuf from the spotifyblob"
  5. This reverts commit 170c64cd8bef9df2ea88dd4f72eec641c250bcfd.
  6. ---
  7. CMakeLists.txt | 2 --
  8. ext/clementine-spotifyblob/CMakeLists.txt | 1 -
  9. ext/libclementine-common/CMakeLists.txt | 1 +
  10. ext/libclementine-remote/CMakeLists.txt | 1 -
  11. ext/libclementine-tagreader/CMakeLists.txt | 1 -
  12. 5 files changed, 1 insertion(+), 5 deletions(-)
  13. diff --git a/CMakeLists.txt b/CMakeLists.txt
  14. index 820b13851..3ec57df2b 100644
  15. --- a/CMakeLists.txt
  16. +++ b/CMakeLists.txt
  17. @@ -56,8 +56,6 @@ find_package(PkgConfig REQUIRED)
  18. find_package(Protobuf REQUIRED)
  19. find_package(FFTW3)
  20. -find_library(PROTOBUF_STATIC_LIBRARY libprotobuf.a libprotobuf)
  21. -
  22. pkg_check_modules(CDIO libcdio)
  23. pkg_check_modules(CHROMAPRINT REQUIRED libchromaprint)
  24. pkg_search_module(CRYPTOPP cryptopp libcrypto++)
  25. diff --git a/ext/clementine-spotifyblob/CMakeLists.txt b/ext/clementine-spotifyblob/CMakeLists.txt
  26. index ca332dca1..30553bfc4 100644
  27. --- a/ext/clementine-spotifyblob/CMakeLists.txt
  28. +++ b/ext/clementine-spotifyblob/CMakeLists.txt
  29. @@ -46,7 +46,6 @@ target_link_libraries(clementine-spotifyblob
  30. ${QT_QTNETWORK_LIBRARY}
  31. ${GSTREAMER_BASE_LIBRARIES}
  32. ${GSTREAMER_APP_LIBRARIES}
  33. - ${PROTOBUF_STATIC_LIBRARY}
  34. clementine-spotifyblob-messages
  35. libclementine-common
  36. )
  37. diff --git a/ext/libclementine-common/CMakeLists.txt b/ext/libclementine-common/CMakeLists.txt
  38. index 2cf31339b..56f46722c 100644
  39. --- a/ext/libclementine-common/CMakeLists.txt
  40. +++ b/ext/libclementine-common/CMakeLists.txt
  41. @@ -36,6 +36,7 @@ add_library(libclementine-common STATIC
  42. target_link_libraries(libclementine-common
  43. ${QT_LIBRARIES}
  44. + ${PROTOBUF_LIBRARY}
  45. ${TAGLIB_LIBRARIES}
  46. ${CMAKE_THREAD_LIBS_INIT}
  47. )
  48. diff --git a/ext/libclementine-remote/CMakeLists.txt b/ext/libclementine-remote/CMakeLists.txt
  49. index 5f860fbcd..f6fc7685a 100644
  50. --- a/ext/libclementine-remote/CMakeLists.txt
  51. +++ b/ext/libclementine-remote/CMakeLists.txt
  52. @@ -11,7 +11,6 @@ add_library(libclementine-remote STATIC
  53. )
  54. target_link_libraries(libclementine-remote
  55. - ${PROTOBUF_LIBRARY}
  56. libclementine-common
  57. )
  58. diff --git a/ext/libclementine-tagreader/CMakeLists.txt b/ext/libclementine-tagreader/CMakeLists.txt
  59. index dd75473c9..ba9e3ff31 100644
  60. --- a/ext/libclementine-tagreader/CMakeLists.txt
  61. +++ b/ext/libclementine-tagreader/CMakeLists.txt
  62. @@ -38,7 +38,6 @@ add_library(libclementine-tagreader STATIC
  63. )
  64. target_link_libraries(libclementine-tagreader
  65. - ${PROTOBUF_LIBRARY}
  66. libclementine-common
  67. )
  68. --
  69. 2.16.1