[SCM] KDE Base Runtime module packaging branch, master, updated. debian/16.08.0-1-7-ga946580
Maximiliano Curia
maxy at moszumanska.debian.org
Sat Sep 10 17:12:41 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kde-runtime.git;a=commitdiff;h=57aa12d
The following commit has been merged in the master branch:
commit 57aa12dec0f8c41bb6b714fbea5b753592d4811c
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date: Tue Jul 12 19:35:32 2016 +0200
Refresh patches
---
debian/patches/kubuntu_disable-gpg-backend.diff | 84 ----------------------
debian/patches/series | 3 -
...x-add_definitions-according-to-new-policy.patch | 39 ----------
...in_req-to-match-kdelibs-policy-and-enable.patch | 21 ------
4 files changed, 147 deletions(-)
diff --git a/debian/patches/kubuntu_disable-gpg-backend.diff b/debian/patches/kubuntu_disable-gpg-backend.diff
deleted file mode 100644
index f6318d4..0000000
--- a/debian/patches/kubuntu_disable-gpg-backend.diff
+++ /dev/null
@@ -1,84 +0,0 @@
-From: Alex Fiestas <afiestas at kde.org>
-Date: Sat, 18 Jun 2016 13:51:49 +0200
-Subject: kubuntu_disable-gpg-backend.diff
-
-Description: disable kwallet gpg backend as it is not working perfectly
-Forwarded: no
-Author: Alex Fiestas <afiestas at kde.org>
-Reviewed-by: Harald Sitter <apachelogger at kubuntu.org>
----
- kwalletd/CMakeLists.txt | 46 +++++++++++++++++++++++-----------------------
- 1 file changed, 23 insertions(+), 23 deletions(-)
-
-diff --git a/kwalletd/CMakeLists.txt b/kwalletd/CMakeLists.txt
-index 73aec82..4d73d5c 100644
---- a/kwalletd/CMakeLists.txt
-+++ b/kwalletd/CMakeLists.txt
-@@ -1,15 +1,15 @@
- project(kwalletd)
-
- ########### find needed packages ######
--find_package(Gpgme) # Called by FindQGpgme, but since we call some gpgme
-- # functions ourselves we need to link against it directly.
--find_package(QGpgme) # provided by kdepimlibs
-+# find_package(Gpgme) # Called by FindQGpgme, but since we call some gpgme
-+# # functions ourselves we need to link against it directly.
-+# find_package(QGpgme) # provided by kdepimlibs
-
--if (GPGME_FOUND AND QGPGME_FOUND)
-- add_definitions(-DHAVE_QGPGME)
-- include_directories(${GPGME_INCLUDES} ${QGPGME_INCLUDE_DIR})
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
--endif(GPGME_FOUND AND QGPGME_FOUND)
-+# if (GPGME_FOUND AND QGPGME_FOUND)
-+# add_definitions(-DHAVE_QGPGME)
-+# include_directories(${GPGME_INCLUDES} ${QGPGME_INCLUDE_DIR})
-+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
-+# endif(GPGME_FOUND AND QGPGME_FOUND)
-
- ########### build backends #########
- add_subdirectory(backend)
-@@ -37,18 +37,18 @@ kde4_add_ui_files(kwalletd_KDEINIT_SRCS
- kwalletwizardpagepassword.ui
- )
-
--if (GPGME_FOUND AND QGPGME_FOUND)
-- set(kwalletd_KDEINIT_SRCS
-- ${kwalletd_KDEINIT_SRCS}
-- knewwalletdialog.cpp
-- )
-- kde4_add_ui_files(kwalletd_KDEINIT_SRCS
-- kwalletwizardpagepasswordgpg.ui
-- kwalletwizardpagegpgkey.ui
-- knewwalletdialogintro.ui
-- knewwalletdialoggpg.ui
-- )
--endif(GPGME_FOUND AND QGPGME_FOUND)
-+# if (GPGME_FOUND AND QGPGME_FOUND)
-+# set(kwalletd_KDEINIT_SRCS
-+# ${kwalletd_KDEINIT_SRCS}
-+# knewwalletdialog.cpp
-+# )
-+# kde4_add_ui_files(kwalletd_KDEINIT_SRCS
-+# kwalletwizardpagepasswordgpg.ui
-+# kwalletwizardpagegpgkey.ui
-+# knewwalletdialogintro.ui
-+# knewwalletdialoggpg.ui
-+# )
-+# endif(GPGME_FOUND AND QGPGME_FOUND)
-
- find_file(kwallet_xml org.kde.KWallet.xml HINTS ${KDE4_DBUS_INTERFACES_DIR} )
-
-@@ -57,9 +57,9 @@ qt4_add_dbus_adaptor( kwalletd_KDEINIT_SRCS ${kwallet_xml} kwalletd.h KWalletD )
- kde4_add_kdeinit_executable( kwalletd NOGUI ${kwalletd_KDEINIT_SRCS} )
-
- target_link_libraries(kdeinit_kwalletd ${KDE4_KDEUI_LIBS} kwalletbackend )
--if (GPGME_FOUND AND QGPGME_FOUND)
-- target_link_libraries(kdeinit_kwalletd ${QGPGME_LIBRARIES} )
--endif(GPGME_FOUND AND QGPGME_FOUND)
-+# if (GPGME_FOUND AND QGPGME_FOUND)
-+# target_link_libraries(kdeinit_kwalletd ${QGPGME_LIBRARIES} )
-+# endif(GPGME_FOUND AND QGPGME_FOUND)
-
- install(TARGETS kdeinit_kwalletd ${INSTALL_TARGETS_DEFAULT_ARGS})
-
diff --git a/debian/patches/series b/debian/patches/series
index a3209e3..9f5444b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-upstream_set-cmake_min_req-to-match-kdelibs-policy-and-enable.patch
-upstream_cmake-fix-add_definitions-according-to-new-policy.patch
disable_usr_lib_install_rpath.diff
use_the_correct_locale.patch
use_always_present_path_to_test.patch
@@ -8,6 +6,5 @@ disable_kwalletd_autotests
kubuntu_nodisplay_knetattach.diff
kubuntu_shutup_shutup_shutup.diff
kubuntu_drkonqi_whoopsie_integration.patch
-# kubuntu_disable-gpg-backend.diff
add_glib_for_nm
hurd.diff
diff --git a/debian/patches/upstream_cmake-fix-add_definitions-according-to-new-policy.patch b/debian/patches/upstream_cmake-fix-add_definitions-according-to-new-policy.patch
deleted file mode 100644
index ba78402..0000000
--- a/debian/patches/upstream_cmake-fix-add_definitions-according-to-new-policy.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Pino Toscano <pino at kde.org>
-Date: Sat, 18 Jun 2016 10:25:22 +0200
-Subject: cmake: fix add_definitions according to new policy
-
----
- kioslave/nfs/CMakeLists.txt | 2 +-
- kwalletd/autotests/CMakeLists.txt | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/kioslave/nfs/CMakeLists.txt b/kioslave/nfs/CMakeLists.txt
-index 32be86c..0d62d7b 100644
---- a/kioslave/nfs/CMakeLists.txt
-+++ b/kioslave/nfs/CMakeLists.txt
-@@ -23,7 +23,7 @@ if (HAVE_XDR_U_LONGLONG_T)
- add_definitions(-DHAVE_XDR_U_LONGLONG_T)
- endif (HAVE_XDR_U_LONGLONG_T)
-
-- add_definitions(-DTRANSLATION_DOMAIN=\"kio_nfs\")
-+ add_definitions(-DTRANSLATION_DOMAIN="kio_nfs")
-
- set(kio_nfs_PART_SRCS kio_nfs.cpp nfsv2.cpp nfsv3.cpp rpc_nfs3_prot_xdr.c rpc_nfs2_prot_xdr.c )
-
-diff --git a/kwalletd/autotests/CMakeLists.txt b/kwalletd/autotests/CMakeLists.txt
-index 5ffbba4..c9af385 100644
---- a/kwalletd/autotests/CMakeLists.txt
-+++ b/kwalletd/autotests/CMakeLists.txt
-@@ -1,4 +1,4 @@
--add_definitions(-DTEST_DATA="\\"${CMAKE_CURRENT_SOURCE_DIR}/\\"")
-+add_definitions(-DTEST_DATA="${CMAKE_CURRENT_SOURCE_DIR}/")
-
- set(testname testpamopen)
- include_directories(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR})
-@@ -8,4 +8,4 @@ target_link_libraries(${testname} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT
- set(testname testpamopennofile)
- include_directories(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR})
- kde4_add_unit_test(${testname} kwalletexecuter.cpp ${testname}.cpp)
--target_link_libraries(${testname} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${KDE4_KDECORE_LIBS})
-\ No newline at end of file
-+target_link_libraries(${testname} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${KDE4_KDECORE_LIBS})
diff --git a/debian/patches/upstream_set-cmake_min_req-to-match-kdelibs-policy-and-enable.patch b/debian/patches/upstream_set-cmake_min_req-to-match-kdelibs-policy-and-enable.patch
deleted file mode 100644
index 0187e87..0000000
--- a/debian/patches/upstream_set-cmake_min_req-to-match-kdelibs-policy-and-enable.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Pino Toscano <pino at kde.org>
-Date: Sat, 18 Jun 2016 09:46:45 +0200
-Subject: set cmake_min_req to match kdelibs policy and enable newer cmake
- policies
-
----
- CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1db0cd2..8b4d0f2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,5 +1,7 @@
- project(KDEBASE_RUNTIME)
-
-+cmake_minimum_required(VERSION 2.8.9)
-+
- # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
- set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
-
--
KDE Base Runtime module packaging
More information about the pkg-kde-commits
mailing list