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

List:       kde-commits
Subject:    [sysadmin/ci-master-config] patches: remove kdepimlibs patch, the issue is with CamelCase is incorre
From:       Scarlett Clark <scarlett () scarlettgatelyclark ! com>
Date:       2016-04-07 0:17:35
Message-ID: E1anxdf-0006ek-9C () scm ! kde ! org
[Download RAW message or body]

Git commit 4a10250b16a8cbe5566303ea398088dbdf51af49 by Scarlett Clark.
Committed on 07/04/2016 at 00:16.
Pushed by scarlettclark into branch 'master'.

remove kdepimlibs patch, the issue is with CamelCase is incorrect, will fil=
e bug. Adjusted digikam to point to actual header.

M  +1    -1    patches/digikam/kf5-qt5/akonadicontactsearch.diff
D  +0    -13   patches/kdepimlibs/kf5-qt5/set_ecm_generate_headers_prefix.p=
atch

http://commits.kde.org/sysadmin/ci-master-config/4a10250b16a8cbe5566303ea39=
8088dbdf51af49

diff --git a/patches/digikam/kf5-qt5/akonadicontactsearch.diff b/patches/di=
gikam/kf5-qt5/akonadicontactsearch.diff
index 3afff0b..24578ab 100644
--- a/patches/digikam/kf5-qt5/akonadicontactsearch.diff
+++ b/patches/digikam/kf5-qt5/akonadicontactsearch.diff
@@ -7,7 +7,7 @@ index 99b215e..2dc7f35 100644
  #include <kjob.h>
  #include <AkonadiCore/Item>
 -#include <Akonadi/Contact/ContactSearchJob>
-+#include <KF5/Akonadi/Contact/ContactSearchJob>
++#include <KF5/akonadi/contact/contactsearchjob.h>
  #include <KContacts/Addressee>
  =

  #if defined(__APPLE__) && defined(__clang__)
diff --git a/patches/kdepimlibs/kf5-qt5/set_ecm_generate_headers_prefix.pat=
ch b/patches/kdepimlibs/kf5-qt5/set_ecm_generate_headers_prefix.patch
deleted file mode 100644
index 28f03bd..0000000
--- a/patches/kdepimlibs/kf5-qt5/set_ecm_generate_headers_prefix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git akonadi-contact/src/CMakeLists.txt akonadi-contact/src/CMakeLis=
ts.txt
-index 5a0b452..29103a1 100644
---- akonadi-contact/src/CMakeLists.txt
-+++ akonadi-contact/src/CMakeLists.txt
-@@ -289,7 +289,7 @@ ecm_generate_headers(AkonadiContact_CamelCase_HEADERS
-     SelectAddressBookDialog
- =

-     REQUIRED_HEADERS AkonadiContact_HEADERS
--    PREFIX Akonadi/Contact
-+    PREFIX KF5/Akonadi/Contact
-     )
- =

- install( FILES
[prev in list] [next in list] [prev in thread] [next in thread]