diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-07 17:31:10 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-07 17:31:10 +0100 |
| commit | 0e48701e4ef754a7d5aab1e8fa1ef6ba8ff3c441 (patch) | |
| tree | a01dc4371165970aa77e40aaaf74ba1eae8daf47 /libre/kdepim-libre | |
| parent | 1ac5165814a8df7108dae57ebb527efd21873461 (diff) | |
| parent | d8d675cb1e75787b0db061756e4cbebe3c5a03fa (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/busybox/PKGBUILD
community/glpng/PKGBUILD
community/hercules/PKGBUILD
community/libnetfilter_acct/PKGBUILD
community/libvirt/PKGBUILD
extra/crypto++/PKGBUILD
extra/hexedit/PKGBUILD
extra/kdesdk-kate/PKGBUILD
extra/kdesdk/PKGBUILD
extra/libmp3splt/PKGBUILD
extra/ntfs-3g_ntfsprogs/PKGBUILD
extra/opencv/PKGBUILD
extra/qemu-kvm/PKGBUILD
extra/xf86-input-wacom/PKGBUILD
extra/xfce4-eyes-plugin/PKGBUILD
extra/xfdesktop/PKGBUILD
Diffstat (limited to 'libre/kdepim-libre')
| -rw-r--r-- | libre/kdepim-libre/PKGBUILD | 11 | ||||
| -rw-r--r-- | libre/kdepim-libre/boost152.patch | 13 |
2 files changed, 3 insertions, 21 deletions
diff --git a/libre/kdepim-libre/PKGBUILD b/libre/kdepim-libre/PKGBUILD index f72efd2cd..53c588336 100644 --- a/libre/kdepim-libre/PKGBUILD +++ b/libre/kdepim-libre/PKGBUILD @@ -22,7 +22,7 @@ pkgname=('kdepim-akonadiconsole-libre' 'kdepim-ktimetracker-libre' 'kdepim-ktnef-libre' 'kdepim-libkdepim-libre') -pkgver=4.10.0 +pkgver=4.10.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://pim.kde.org' @@ -30,16 +30,11 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdepim-libre') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'kde-agent' 'nepomuk-widgets') -source=("http://download.kde.org/stable/${pkgver}/src/${_pkgbase}-${pkgver}.tar.xz" - 'boost152.patch') -sha1sums=('6074fcea53b10c3660c5cc9a00b65e777840fdc4' +source=("http://download.kde.org/stable/${pkgver}/src/${_pkgbase}-${pkgver}.tar.xz") +sha1sums=('9d1102ec9ea7ee7b8ddc70011231f173ceb2e5c1' '652de82dcc1c45de3123898ba46e1962bb0ed6d4') build() { - cd ${_pkgbase}-${pkgver} - patch -p1 -i "${srcdir}"/boost152.patch - cd ../ - mkdir build cd build cmake ../${_pkgbase}-${pkgver} \ diff --git a/libre/kdepim-libre/boost152.patch b/libre/kdepim-libre/boost152.patch deleted file mode 100644 index c82b092f1..000000000 --- a/libre/kdepim-libre/boost152.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- kdepim-4.10.0/kleopatra/models/keylistmodel.cpp~ 2013-01-31 09:40:34.270651208 +0000 -+++ kdepim-4.10.0/kleopatra/models/keylistmodel.cpp 2013-01-31 09:41:26.570259714 +0000 -@@ -60,9 +60,9 @@ - #ifdef _WIN32_WCE - #define BOOST_ALL_NO_LIB - #endif --#include <boost/graph/adjacency_list.hpp> - - #ifndef Q_MOC_RUN // QTBUG-22829 -+#include <boost/graph/adjacency_list.hpp> - #include <boost/graph/topological_sort.hpp> - #endif - |