openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File fix-qca-qt5.diff of Package kget (Revision 727b96911ce915d1872dc2e4e895ccd3)

Currently displaying revision 727b96911ce915d1872dc2e4e895ccd3 , Show latest

commit a3cca346809f174b992123fb7a58cd62f3436aec
Author: Raymond Wooninck <tittiatcoke@gmail.com>
Date:   Tue Jan 13 11:28:16 2015 +0100

Change to use the qt5 branch of Qca

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c3f458d..828761f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,7 +41,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_P
 find_package(Sqlite QUIET)
 set_package_properties(SQLITE_FOUND PROPERTIES DESCRIPTION "SQLite is a Binary-Database" TYPE RECOMMENDED PURPOSE "Needed for the SQLite-Backend of the KGet-History") 
 
-find_package(Qca 2.1.0)
+find_package(Qca-qt5 2.1.0)
 set_package_properties(Qca PROPERTIES DESCRIPTION "Support for encryption"
                        URL "http://delta.affinix.com/qca"
                        TYPE REQUIRED)
@@ -71,7 +71,7 @@ if(CMAKE_BUILD_TYPE MATCHES debugfull)
      add_definitions(-DDEBUG)
 endif(CMAKE_BUILD_TYPE MATCHES debugfull)
 
-if (Qca_FOUND)
+if (Qca-qt5_FOUND)
     add_definitions(-DHAVE_QCA2)
 MESSAGE(STATUS "QCA found")
 endif()
@@ -181,8 +181,8 @@ if (SQLITE_FOUND)
   target_link_libraries(kgetcore ${QT_QTSQL_LIBRARY})
 endif (SQLITE_FOUND)
 
-if (Qca_FOUND)
-    target_link_libraries(kgetcore qca)
+if (Qca-qt5_FOUND)
+    target_link_libraries(kgetcore qca-qt5)
 endif ()
 
 if (KF5QGpgme_FOUND)

commit 22737e6dd01abb62cd2f6ac3eb9c7ae96bc948f4
Author: Raymond Wooninck <tittiatcoke@gmail.com>
Date:   Tue Jan 13 11:53:56 2015 +0100

Fix QGpgme detection due to upstream changes

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 828761f..2c93564 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,9 +47,8 @@ set_package_properties(Qca PROPERTIES DESCRIPTION "Support for encryption"
                        TYPE REQUIRED)
 
 
-find_package(KF5QGpgme)
 find_package(KF5Gpgmepp)
-set_package_properties(KF5QGpgme_FOUND PROPERTIES DESCRIPTION "The QGpgME library" TYPE RECOMMENDED PURPOSE "QGpgME is required to have signature verifying support in KGet.") 
+set_package_properties(KF5Gpgmepp_FOUND PROPERTIES DESCRIPTION "The GpgMEPP library" TYPE RECOMMENDED PURPOSE "GpgMEPP is required to have signature verifying support in KGet.") 
 
 find_package(KTorrent QUIET)
 set_package_properties(LIBKTORRENT_FOUND PROPERTIES DESCRIPTION "Backend Library of KTorrent" TYPE RECOMMENDED PURPOSE "Needed to build KGet bittorrent support.") 
@@ -76,12 +75,11 @@ if (Qca-qt5_FOUND)
 MESSAGE(STATUS "QCA found")
 endif()
 
-if(KF5QGpgme_FOUND)
+if(KF5Gpgmepp_FOUND)
     find_package(Boost REQUIRED)
     add_definitions(-DHAVE_QGPGME)
     include_directories(
         ${Boost_INCLUDE_DIRS}
-        ${QGPGME_INCLUDE_DIR}
     )
 endif()
 
@@ -185,7 +183,7 @@ if (Qca-qt5_FOUND)
     target_link_libraries(kgetcore qca-qt5)
 endif ()
 
-if (KF5QGpgme_FOUND)
+if (KF5Gpgmepp_FOUND)
     target_link_libraries(kgetcore KF5::QGpgme KF5::Gpgmepp)
     kde_enable_exceptions()
 endif()

Places

File fix-qca-qt5.diff of Package kget (Revision 727b96911ce915d1872dc2e4e895ccd3)

Places