diff options
| author | Michael Palimaka <kensington@gentoo.org> | 2013-11-13 22:40:00 +1100 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2013-11-13 22:40:00 +1100 |
| commit | 786c2615f29d995fd188ac295a922e5359747f98 (patch) | |
| tree | 2842b1ec59250e339bb8c55acb150bb758ff653e | |
| parent | bf0847b6c71d2effd42481721c3cf94de6a5489e (diff) | |
| parent | 71565395318984ba0e20e2797e28e57da2dbbc6d (diff) | |
| download | kde-786c2615f29d995fd188ac295a922e5359747f98.tar.gz kde-786c2615f29d995fd188ac295a922e5359747f98.tar.bz2 kde-786c2615f29d995fd188ac295a922e5359747f98.zip | |
Merge branch 'master' into frameworks
| -rw-r--r-- | kde-base/kwalletd/files/kwalletd-4.12-include-qgpgme.patch | 13 | ||||
| -rw-r--r-- | kde-base/kwalletd/kwalletd-9999.ebuild | 2 |
2 files changed, 0 insertions, 15 deletions
diff --git a/kde-base/kwalletd/files/kwalletd-4.12-include-qgpgme.patch b/kde-base/kwalletd/files/kwalletd-4.12-include-qgpgme.patch deleted file mode 100644 index e634f19c2ec..00000000000 --- a/kde-base/kwalletd/files/kwalletd-4.12-include-qgpgme.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/kwalletd/CMakeLists.txt b/kwalletd/CMakeLists.txt -index dfba793..323762f 100644 ---- a/kwalletd/CMakeLists.txt -+++ b/kwalletd/CMakeLists.txt -@@ -5,7 +5,7 @@ find_package(QGpgme) # provided by kdepimlibs - - if (QGPGME_FOUND) - add_definitions(-DHAVE_QGPGME) -- include_directories(${QGPGME_INCLUDE_DIR}) -+ include_directories(${QGPGME_INCLUDE_DIR} ${GPGME_INCLUDES}) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}") - endif(QGPGME_FOUND) - diff --git a/kde-base/kwalletd/kwalletd-9999.ebuild b/kde-base/kwalletd/kwalletd-9999.ebuild index d7de97fc547..3c714ed7a34 100644 --- a/kde-base/kwalletd/kwalletd-9999.ebuild +++ b/kde-base/kwalletd/kwalletd-9999.ebuild @@ -11,8 +11,6 @@ DESCRIPTION="KDE Password Server" KEYWORDS="" IUSE="debug" -PATCHES=( "${FILESDIR}/${PN}-4.12-include-qgpgme.patch" ) - DEPEND=" app-crypt/gpgme $(add_kdebase_dep kdepimlibs) |