diff options
Diffstat (limited to '')
-rw-r--r-- | kde/patch/kdepim.patch | 2 | ||||
-rw-r--r-- | kde/patch/kdepim/kdepim-install_kleopatra_headers.patch | 122 | ||||
-rw-r--r-- | kde/patch/kdepim/kdepim-install_kleopatra_headers.patch.gz | bin | 1193 -> 0 bytes | |||
-rw-r--r-- | kde/patch/kdepimlibs-framework.patch | 2 | ||||
-rw-r--r-- | kde/patch/kdepimlibs-framework/kdepimlibs_autotests.diff | 10 | ||||
-rw-r--r-- | kde/patch/kdepimlibs-framework/kdepimlibs_autotests.diff.gz | bin | 272 -> 0 bytes |
6 files changed, 134 insertions, 2 deletions
diff --git a/kde/patch/kdepim.patch b/kde/patch/kdepim.patch index fc41774..f8b34ac 100644 --- a/kde/patch/kdepim.patch +++ b/kde/patch/kdepim.patch @@ -1,4 +1,4 @@ # Install Kleopatra headers, needed by kopete-cryptography: # This used to be fixed? -zcat $CWD/patch/kdepim/kdepim-install_kleopatra_headers.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/kdepim/kdepim-install_kleopatra_headers.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/kde/patch/kdepim/kdepim-install_kleopatra_headers.patch b/kde/patch/kdepim/kdepim-install_kleopatra_headers.patch new file mode 100644 index 0000000..8960ab8 --- /dev/null +++ b/kde/patch/kdepim/kdepim-install_kleopatra_headers.patch @@ -0,0 +1,122 @@ +diff -up kdepim-4.11.90/kleopatra/libkleopatraclient/CMakeLists.txt.install_kleopatra_headers kdepim-4.11.90/kleopatra/libkleopatraclient/CMakeLists.txt +--- kdepim-4.11.90/kleopatra/libkleopatraclient/CMakeLists.txt.install_kleopatra_headers 2013-11-14 02:23:52.000000000 -0600 ++++ kdepim-4.11.90/kleopatra/libkleopatraclient/CMakeLists.txt 2013-11-16 13:17:30.289810575 -0600 +@@ -6,3 +6,7 @@ add_subdirectory(gui) + + add_subdirectory(tests) + ++install( ++ FILES kleopatraclient_export.h ++ DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient ++ ) +diff -up kdepim-4.11.90/kleopatra/libkleopatraclient/core/CMakeLists.txt.install_kleopatra_headers kdepim-4.11.90/kleopatra/libkleopatraclient/core/CMakeLists.txt +--- kdepim-4.11.90/kleopatra/libkleopatraclient/core/CMakeLists.txt.install_kleopatra_headers 2013-11-14 02:23:52.000000000 -0600 ++++ kdepim-4.11.90/kleopatra/libkleopatraclient/core/CMakeLists.txt 2013-11-16 13:17:30.290810557 -0600 +@@ -72,3 +72,13 @@ else() + endif() + + install(TARGETS kleopatraclientcore ${INSTALL_TARGETS_DEFAULT_ARGS}) ++ ++install( ++ FILES ++ initialization.h ++ command.h ++ selectcertificatecommand.h ++ signencryptfilescommand.h ++ decryptverifyfilescommand.h ++ DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient/core ++ ) +diff -up kdepim-4.11.90/kleopatra/libkleopatraclient/gui/CMakeLists.txt.install_kleopatra_headers kdepim-4.11.90/kleopatra/libkleopatraclient/gui/CMakeLists.txt +--- kdepim-4.11.90/kleopatra/libkleopatraclient/gui/CMakeLists.txt.install_kleopatra_headers 2013-11-14 02:23:52.000000000 -0600 ++++ kdepim-4.11.90/kleopatra/libkleopatraclient/gui/CMakeLists.txt 2013-11-16 13:17:30.290810557 -0600 +@@ -16,3 +16,9 @@ set_target_properties(kleopatraclientgui + ) + + install(TARGETS kleopatraclientgui ${INSTALL_TARGETS_DEFAULT_ARGS}) ++ ++install( ++ FILES ++ certificaterequester.h ++ DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient/gui ++ ) +diff -up kdepim-4.11.90/libkleo/CMakeLists.txt.install_kleopatra_headers kdepim-4.11.90/libkleo/CMakeLists.txt +--- kdepim-4.11.90/libkleo/CMakeLists.txt.install_kleopatra_headers 2013-11-14 02:23:52.000000000 -0600 ++++ kdepim-4.11.90/libkleo/CMakeLists.txt 2013-11-16 13:17:30.290810557 -0600 +@@ -121,3 +121,61 @@ install ( FILES libkleopatrarc-win32.des + else () + install ( FILES libkleopatrarc.desktop DESTINATION ${CONFIG_INSTALL_DIR} RENAME libkleopatrarc ) + endif () ++ ++install( FILES ++ kleo/kleo_export.h ++ kleo/enum.h ++ kleo/oidmap.h ++ kleo/cryptobackend.h ++ kleo/cryptobackendfactory.h ++ kleo/cryptoconfig.h ++ kleo/dn.h ++ kleo/job.h ++ kleo/keylistjob.h ++ kleo/keygenerationjob.h ++ kleo/abstractimportjob.h ++ kleo/importjob.h ++ kleo/importfromkeyserverjob.h ++ kleo/exportjob.h ++ kleo/changeexpiryjob.h ++ kleo/changeownertrustjob.h ++ kleo/downloadjob.h ++ kleo/deletejob.h ++ kleo/encryptjob.h ++ kleo/decryptjob.h ++ kleo/signjob.h ++ kleo/specialjob.h ++ kleo/verifydetachedjob.h ++ kleo/verifyopaquejob.h ++ kleo/decryptverifyjob.h ++ kleo/signencryptjob.h ++ kleo/signkeyjob.h ++ kleo/adduseridjob.h ++ kleo/refreshkeysjob.h ++ kleo/multideletejob.h ++ kleo/hierarchicalkeylistjob.h ++ kleo/keyfilter.h ++ kleo/keyfiltermanager.h ++ kleo/changepasswdjob.h ++ kleo/checksumdefinition.h ++ kleo/exception.h ++ kleo/kconfigbasedkeyfilter.h ++ kleo/listallkeysjob.h ++ kleo/stl_util.h ++ DESTINATION ${INCLUDE_INSTALL_DIR}/kleo COMPONENT Devel) ++ ++install ( FILES ++ ui/kdhorizontalline.h ++ ui/messagebox.h ++ ui/progressbar.h ++ ui/progressdialog.h ++ ui/keylistview.h ++ ui/keyselectiondialog.h ++ ui/keyrequester.h ++ ui/keyapprovaldialog.h ++ ui/dnattributeorderconfigwidget.h ++ ui/cryptoconfigmodule.h ++ ui/cryptoconfigdialog.h ++ ui/directoryserviceswidget.h ++ ui/filenamerequester.h ++ DESTINATION ${INCLUDE_INSTALL_DIR}/kleo/ui COMPONENT Devel) +diff -up kdepim-4.11.90/libkpgp/CMakeLists.txt.install_kleopatra_headers kdepim-4.11.90/libkpgp/CMakeLists.txt +--- kdepim-4.11.90/libkpgp/CMakeLists.txt.install_kleopatra_headers 2013-11-16 13:17:30.290810557 -0600 ++++ kdepim-4.11.90/libkpgp/CMakeLists.txt 2013-11-16 13:20:55.258111864 -0600 +@@ -35,3 +35,11 @@ add_subdirectory( tests ) + install(FILES kconf_update/kpgp.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR}) + install(PROGRAMS kconf_update/kpgp-3.1-upgrade-address-data.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR}) + ++install(FILES ++ kpgp.h ++ kpgpbase.h ++ kpgpblock.h ++ kpgpkey.h ++ kpgpui.h ++ libkpgp_export.h ++ DESTINATION ${INCLUDE_INSTALL_DIR}/kpgp COMPONENT Devel ) + diff --git a/kde/patch/kdepim/kdepim-install_kleopatra_headers.patch.gz b/kde/patch/kdepim/kdepim-install_kleopatra_headers.patch.gz Binary files differdeleted file mode 100644 index c842649..0000000 --- a/kde/patch/kdepim/kdepim-install_kleopatra_headers.patch.gz +++ /dev/null diff --git a/kde/patch/kdepimlibs-framework.patch b/kde/patch/kdepimlibs-framework.patch index 123d8da..36c99fa 100644 --- a/kde/patch/kdepimlibs-framework.patch +++ b/kde/patch/kdepimlibs-framework.patch @@ -1,3 +1,3 @@ # The autotests generate ECM errors so skip building them: -zcat $CWD/patch/kdepimlibs-framework/kdepimlibs_autotests.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/kdepimlibs-framework/kdepimlibs_autotests.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/kde/patch/kdepimlibs-framework/kdepimlibs_autotests.diff b/kde/patch/kdepimlibs-framework/kdepimlibs_autotests.diff new file mode 100644 index 0000000..24b21ff --- /dev/null +++ b/kde/patch/kdepimlibs-framework/kdepimlibs_autotests.diff @@ -0,0 +1,10 @@ +--- a/syndication/CMakeLists.txt 2014-06-02 13:44:23.000000000 +0200 ++++ b/syndication/CMakeLists.txt 2014-06-02 16:51:00.393339484 +0200 +@@ -41,7 +41,6 @@ + ########### Targets ########### + + add_subdirectory(src/syndication) +-add_subdirectory(autotests) + + ########### CMake Config Files ########### + set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5Syndication") diff --git a/kde/patch/kdepimlibs-framework/kdepimlibs_autotests.diff.gz b/kde/patch/kdepimlibs-framework/kdepimlibs_autotests.diff.gz Binary files differdeleted file mode 100644 index 28cc49a..0000000 --- a/kde/patch/kdepimlibs-framework/kdepimlibs_autotests.diff.gz +++ /dev/null |