[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [k3b] /: Revert "Use new KF5Cddb and test past"
From:       Johannes Obermayr <johannesobermayr () gmx ! de>
Date:       2016-07-28 19:42:50
Message-ID: E1bSrCk-0005E6-OK () code ! kde ! org
[Download RAW message or body]

Git commit f5fceb01d1a897731b2bd4251a2c6d0a383cedcc by Johannes Obermayr.
Committed on 28/07/2016 at 19:40.
Pushed by jobermayr into branch 'master'.

Revert "Use new KF5Cddb and test past"

This reverts commit d325d673f0cf7a4c20f1fb3936521da55dc95aaa.

We use official libkcddb repository (https://quickgit.kde.org/?p=libkcddb.git).
Changes must go there before changing dependent projects.

CCMAIL: xiangzhai83@gmail.com

M  +4    -4    CMakeLists.txt
M  +1    -1    libk3b/CMakeLists.txt
M  +1    -1    plugins/project/audioprojectcddb/CMakeLists.txt
M  +1    -1    src/CMakeLists.txt

http://commits.kde.org/k3b/f5fceb01d1a897731b2bd4251a2c6d0a383cedcc

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e966f24..38f029d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,10 +60,10 @@ set_package_properties(Samplerate PROPERTIES
     URL "http://www.mega-nerd.com/SRC"
     TYPE REQUIRED)
 
-find_package(KF5Cddb)
-set_package_properties(KF5Cddb PROPERTIES
-    DESCRIPTION "KF5 CDDB library"
-    URL "https://github.com/isoft-linux/libkcddb"
+find_package(Libkcddb)
+set_package_properties(Libkcddb PROPERTIES
+    DESCRIPTION "KDE CDDB library"
+    URL "http://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
     TYPE REQUIRED
     PURPOSE "libkcddb is used to retrieve audio CD meta data from the internet.")
 
diff --git a/libk3b/CMakeLists.txt b/libk3b/CMakeLists.txt
index 3f9b974..9b3ca2e 100644
--- a/libk3b/CMakeLists.txt
+++ b/libk3b/CMakeLists.txt
@@ -214,7 +214,7 @@ target_link_libraries(k3blib
         KF5::Solid
         Qt5::Network
         Qt5::Widgets
-        KF5::Cddb
+        KDE::Libkcddb::kcddb
         samplerate
         ${videodvd_libraries}
 )
diff --git a/plugins/project/audioprojectcddb/CMakeLists.txt \
b/plugins/project/audioprojectcddb/CMakeLists.txt index 91f8cbd..2ed2cd2 100644
--- a/plugins/project/audioprojectcddb/CMakeLists.txt
+++ b/plugins/project/audioprojectcddb/CMakeLists.txt
@@ -4,7 +4,7 @@ target_link_libraries(k3baudioprojectcddbplugin
     k3bdevice
     k3blib
     KF5::I18n
-    KF5::Cddb
+    KDE::Libkcddb::kcddb
 )
 
 install(TARGETS k3baudioprojectcddbplugin DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d0d8ec6..22ae7a1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -224,7 +224,7 @@ target_include_directories(k3b PRIVATE
 target_link_libraries(k3b
     k3bdevice
     k3blib
-    KF5::Cddb
+    KDE::Libkcddb::kcddb
     KF5::Archive
     KF5::I18n
     KF5::IconThemes


[prev in list] [next in list] [prev in thread] [next in thread]