summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre/kdebase-konqueror-libre/PKGBUILD6
-rw-r--r--libre/kdebase-runtime-libre/PKGBUILD6
-rw-r--r--libre/kdelibs-libre/PKGBUILD8
-rw-r--r--libre/kdenetwork-kopete-libre/PKGBUILD19
-rw-r--r--libre/kdenetwork-kopete-libre/libotr3.patch71
-rw-r--r--libre/kdenetwork-kopete-libre/mediastreamer29.patch22
-rw-r--r--libre/kdepim-libre/PKGBUILD79
-rw-r--r--libre/kdeutils-ark-libre/PKGBUILD6
-rw-r--r--nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD18
-rw-r--r--nonprism/kdenetwork-kopete-libre-nonprism/libotr3.patch71
-rw-r--r--nonprism/kdenetwork-kopete-libre-nonprism/mediastreamer29.patch22
-rw-r--r--nonprism/kdepim-runtime-nonprism/PKGBUILD6
12 files changed, 55 insertions, 279 deletions
diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD
index 69b70cd04..93d55bbac 100644
--- a/libre/kdebase-konqueror-libre/PKGBUILD
+++ b/libre/kdebase-konqueror-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 200912 2013-12-06 12:18:19Z svenstaro $
+# $Id: PKGBUILD 201659 2013-12-17 13:52:43Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
@@ -6,7 +6,7 @@
_pkgname='kdebase-konqueror'
pkgname='kdebase-konqueror-libre'
-pkgver=4.11.4
+pkgver=4.12.0
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url="http://kde.org/applications/internet/konqueror/"
@@ -15,7 +15,7 @@ groups=('kde' 'kdebase')
makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'nepomuk-widgets')
source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz"
'konq-about-fsdg.diff')
-sha1sums=('de4a7a7802f527cc1f760b051c4a0699d5f6624b'
+sha1sums=('e85b5445380e44894efcaa21f4c95fad1ed4c4f6'
'd6cbb53c04179b8180f9439eca156b7ff2e76b3a')
pkgdesc='KDE File Manager & Web Browser, without Google and nonfree software recommendation'
depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD
index 8c9a7bdb5..566cbb339 100644
--- a/libre/kdebase-runtime-libre/PKGBUILD
+++ b/libre/kdebase-runtime-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 200879 2013-12-06 12:16:02Z svenstaro $
+# $Id: PKGBUILD 201659 2013-12-17 13:52:43Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=kdebase-runtime
pkgname=kdebase-runtime-libre
-pkgver=4.11.4
+pkgver=4.12.0
pkgrel=1
pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search providers"
arch=('i686' 'x86_64' 'mips64el')
@@ -26,7 +26,7 @@ install="${_pkgname}.install"
source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz"
'duckduckgo_html.desktop'
'duckduckgo_lite.desktop')
-sha1sums=('66e34b4fa464866d37379b3c78ea6415941db5c0'
+sha1sums=('7c077b5ff2839fee1cc55016cd6711da1abb584c'
'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd'
'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b')
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index 12d3cc402..5929de23d 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 200864 2013-12-06 12:14:11Z svenstaro $
+# $Id: PKGBUILD 201659 2013-12-17 13:52:43Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org
# Contributor: Pierre Schmitz <pierre@archlinux.de>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=kdelibs
pkgname=kdelibs-libre
-pkgver=4.11.4
+pkgver=4.12.0
pkgrel=1
-pkgdesc="KDE Core Libraries"
+pkgdesc="KDE Core Libraries, without nonfree plugins recommendation support"
arch=('i686' 'x86_64' 'mips64el')
url='https://projects.kde.org/projects/kde/kdelibs'
license=('GPL' 'LGPL' 'FDL')
@@ -24,7 +24,7 @@ install=${_pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
'kde-applications-menu.patch' 'qt4.patch'
'khtml-fsdg.diff')
-sha1sums=('6f7f378ce46ddcf2ee4b7810afc42725a82024c3'
+sha1sums=('a510f9dc2675c5656af00a92f81b747129ff70d1'
'86ee8c8660f19de8141ac99cd6943964d97a1ed7'
'ed1f57ee661e5c7440efcaba7e51d2554709701c'
'a1502a964081ad583a00cf90c56e74bf60121830')
diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD
index 7057dc2a0..46e2732a5 100644
--- a/libre/kdenetwork-kopete-libre/PKGBUILD
+++ b/libre/kdenetwork-kopete-libre/PKGBUILD
@@ -1,42 +1,37 @@
-# $Id: PKGBUILD 201125 2013-12-06 12:34:37Z svenstaro $
+# $Id: PKGBUILD 201659 2013-12-17 13:52:43Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=kdenetwork-kopete
pkgname=kdenetwork-kopete-libre
-pkgver=4.11.4
+pkgver=4.12.0
pkgrel=1
pkgdesc='Instant Messenger, without skype support'
url='http://kde.org/applications/internet/kopete/'
arch=('i686' 'x86_64' 'mips64el')
license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdenetwork')
-depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr3' 'libmsn' 'libidn'
+depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libmsn' 'libidn'
'qimageblitz' 'libgadu' 'mediastreamer' 'jsoncpp')
makedepends=('cmake' 'automoc4' 'boost')
install=${_pkgname}.install
replaces=$_pkgname
conflicts=$_pkgname
provides=$_pkgname=$pkgver
-source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz"
- 'libotr3.patch'
- 'mediastreamer29.patch')
-sha1sums=('d8bc0c386d9f846e2d5f05d7dfa421fdcb2ac537'
- '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384'
- '317683a5c2acd0a0058c5ab42f6006e9db511ef3')
+source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz")
+sha1sums=('c1ef611b27079388e48e558a65e2de80db93d875')
prepare() {
cd kopete-${pkgver}
- patch -p2 -i "${srcdir}"/libotr3.patch
- patch -p1 -i "${srcdir}"/mediastreamer29.patch
# Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34.
sed -i 's/Skype protocol" ON/Skype protocol" OFF/g' protocols/CMakeLists.txt
rm -rf protocols/skype
sed 's/, Skype//' -i doc/index.docbook
+ cd ..
+ mkdir build
}
build() {
- mkdir build
cd build
cmake ../kopete-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
diff --git a/libre/kdenetwork-kopete-libre/libotr3.patch b/libre/kdenetwork-kopete-libre/libotr3.patch
deleted file mode 100644
index 1e96c98d6..000000000
--- a/libre/kdenetwork-kopete-libre/libotr3.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -urN a/kopete/cmake/modules/FindLibOTR.cmake b/kopete/cmake/modules/FindLibOTR.cmake
---- a/kopete/cmake/modules/FindLibOTR.cmake 2012-08-12 18:08:59.000000000 -0600
-+++ b/kopete/cmake/modules/FindLibOTR.cmake 2012-11-09 12:14:24.251450904 -0700
-@@ -13,13 +13,13 @@
- SET(LIBOTR_FIND_QUIETLY TRUE)
- ENDIF (LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY)
-
--FIND_PATH(LIBOTR_INCLUDE_DIR libotr/version.h)
-+FIND_PATH(LIBOTR_INCLUDE_DIR libotr3/version.h)
-
--FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr libotr)
-+FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr3 libotr3)
-
--# Determine version information from libotr/version.h
-+# Determine version information from libotr3/version.h
- IF( LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY )
-- EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr/version.h" OUTPUT_VARIABLE output)
-+ EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr3/version.h" OUTPUT_VARIABLE output)
- STRING(REGEX MATCH "OTRL_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+" LIBOTR_VERSION "${output}")
- STRING(REGEX REPLACE "^OTRL_VERSION \"" "" LIBOTR_VERSION "${LIBOTR_VERSION}")
- # Check if version is at least 3.2.0
-diff -urN a/kopete/plugins/otr/authenticationwizard.h b/kopete/plugins/otr/authenticationwizard.h
---- a/kopete/plugins/otr/authenticationwizard.h 2012-08-12 18:09:00.000000000 -0600
-+++ b/kopete/plugins/otr/authenticationwizard.h 2012-11-09 12:15:11.181265336 -0700
-@@ -26,7 +26,7 @@
- */
-
- extern "C"{
--#include "libotr/proto.h"
-+#include "libotr3/proto.h"
- }
-
- #include "kopetechatsession.h"
-diff -urN a/kopete/plugins/otr/otrlchatinterface.h b/kopete/plugins/otr/otrlchatinterface.h
---- a/kopete/plugins/otr/otrlchatinterface.h 2012-08-12 18:09:00.000000000 -0600
-+++ b/kopete/plugins/otr/otrlchatinterface.h 2012-11-09 12:16:10.141032744 -0700
-@@ -36,10 +36,10 @@
- #include "authenticationwizard.h"
-
- extern "C" {
--#include <libotr/privkey.h>
--#include <libotr/proto.h>
--#include <libotr/message.h>
--#include <libotr/userstate.h>
-+#include <libotr3/privkey.h>
-+#include <libotr3/proto.h>
-+#include <libotr3/message.h>
-+#include <libotr3/userstate.h>
- }
-
-
-diff -urN a/kopete/plugins/otr/otrlconfinterface.h b/kopete/plugins/otr/otrlconfinterface.h
---- a/kopete/plugins/otr/otrlconfinterface.h 2012-08-12 18:09:00.000000000 -0600
-+++ b/kopete/plugins/otr/otrlconfinterface.h 2012-11-09 12:15:56.961084991 -0700
-@@ -32,11 +32,11 @@
- #include <kopetechatsession.h>
-
- extern "C" {
--#include <libotr/privkey.h>
--#include <libotr/proto.h>
--#include <libotr/message.h>
--#include <libotr/userstate.h>
--#include <libotr/context.h>
-+#include <libotr3/privkey.h>
-+#include <libotr3/proto.h>
-+#include <libotr3/message.h>
-+#include <libotr3/userstate.h>
-+#include <libotr3/context.h>
- }
-
- class KOPETE_OTR_SHARED_EXPORT OtrlConfInterface : public QObject
diff --git a/libre/kdenetwork-kopete-libre/mediastreamer29.patch b/libre/kdenetwork-kopete-libre/mediastreamer29.patch
deleted file mode 100644
index eb0b2297e..000000000
--- a/libre/kdenetwork-kopete-libre/mediastreamer29.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc b/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
-index 88fdbd1..57c6c05 100644
---- a/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
-+++ b/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
-@@ -200,7 +200,7 @@ bool LinphoneVoiceChannel::SetSendCodecs(const std::vector<AudioCodec>& codecs)
- LOG(LS_INFO) << "Using " << i->name << "/" << i->clockrate;
- pt_ = i->id;
- audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, i->id, 250, 0); /* -1 means that function will choose some free port */
-- port2 = rtp_session_get_local_port(audio_stream_->session);
-+ port2 = rtp_session_get_local_port(audio_stream_->ms.session);
- first = false;
- }
- }
-@@ -211,7 +211,7 @@ bool LinphoneVoiceChannel::SetSendCodecs(const std::vector<AudioCodec>& codecs)
- // working with a buggy client; let's try PCMU.
- LOG(LS_WARNING) << "Received empty list of codces; using PCMU/8000";
- audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, 0, 250, 0); /* -1 means that function will choose some free port */
-- port2 = rtp_session_get_local_port(audio_stream_->session);
-+ port2 = rtp_session_get_local_port(audio_stream_->ms.session);
- }
-
- return true;
diff --git a/libre/kdepim-libre/PKGBUILD b/libre/kdepim-libre/PKGBUILD
index 4e7755575..96dca0a5d 100644
--- a/libre/kdepim-libre/PKGBUILD
+++ b/libre/kdepim-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 201135 2013-12-06 12:35:22Z svenstaro $
+# $Id: PKGBUILD 201659 2013-12-17 13:52:43Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
@@ -22,7 +22,7 @@ pkgname=('kdepim-akonadiconsole-libre'
'kdepim-ktimetracker-libre'
'kdepim-ktnef-libre'
'kdepim-libkdepim-libre')
-pkgver=4.11.4
+pkgver=4.12.0
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://pim.kde.org'
@@ -31,7 +31,7 @@ groups=('kde' 'kdepim-libre')
makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss'
'kde-agent' 'nepomuk-widgets' 'link-grammar')
source=("http://download.kde.org/stable/${pkgver}/src/${_pkgbase}-${pkgver}.tar.xz")
-sha1sums=('e01149607f455e20e58852791f1397739b58a544')
+sha1sums=('1ca184dc89f8c8395ffe4ec62a3fdcd0a7397ac4')
build() {
mkdir build
@@ -67,8 +67,6 @@ package_kdepim-akregator-libre() {
install='kdepim-akregator.install'
cd "${srcdir}"/build/akregator
make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/akregator
- make DESTDIR="${pkgdir}" install
cd "${srcdir}"/build/kontact/plugins/akregator
make DESTDIR="${pkgdir}" install
}
@@ -83,15 +81,13 @@ package_kdepim-blogilo-libre() {
install='kdepim.install'
cd "${srcdir}"/build/blogilo
make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/blogilo
- make DESTDIR="${pkgdir}" install
cd "${srcdir}"/build/composereditor-ng
make DESTDIR="${pkgdir}" install
}
package_kdepim-console-libre() {
pkgdesc='Command line tool for accessing calendar files, without nonfree pilot-link support'
- depends=('kdepim-runtime')
+ depends=('kdepim-libkdepim')
url='http://pim.kde.org'
replaces=('kdepim-console')
conflicts=('kdepim-console')
@@ -99,10 +95,6 @@ package_kdepim-console-libre() {
install='kdepim.install'
cd "${srcdir}"/build/console
make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/kabcclient
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/konsolekalendar
- make DESTDIR="${pkgdir}" install
}
package_kdepim-kaddressbook-libre() {
@@ -113,12 +105,11 @@ package_kdepim-kaddressbook-libre() {
conflicts=('kdepim-kaddressbook')
provides=("kdepim-kaddressbook=${pkgver}")
install='kdepim.install'
- cd "${srcdir}"/build/kaddressbook
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/kontact/plugins/kaddressbook
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/plugins/kaddressbook
- make DESTDIR="${pkgdir}" install
+ for i in kaddressbook kontact/plugins/kaddressbook \
+ plugins/kaddressbook contactthemeeditor; do
+ cd "${srcdir}"/build/${i}
+ make DESTDIR="${pkgdir}" install
+ done
}
package_kdepim-kalarm-libre() {
@@ -131,8 +122,6 @@ package_kdepim-kalarm-libre() {
install='kdepim.install'
cd "${srcdir}"/build/kalarm
make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/kalarm
- make DESTDIR="${pkgdir}" install
}
package_kdepim-kjots-libre() {
@@ -145,8 +134,6 @@ package_kdepim-kjots-libre() {
install='kdepim.install'
cd "${srcdir}"/build/kjots
make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/kjots
- make DESTDIR="${pkgdir}" install
cd "${srcdir}"/build/kontact/plugins/kjots
make DESTDIR="${pkgdir}" install
}
@@ -161,10 +148,6 @@ package_kdepim-kleopatra-libre() {
provides=("kdepim-kleopatra=${pkgver}")
cd "${srcdir}"/build/kleopatra
make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/kleopatra
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/kwatchgnupg
- make DESTDIR="${pkgdir}" install
}
package_kdepim-kmail-libre() {
@@ -177,12 +160,12 @@ package_kdepim-kmail-libre() {
replaces=('kdepim-kmail' 'kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
'kdepim-mimelib' 'kdepim-plugins')
provides=("kdepim-kmail=${pkgver}")
- for i in kmail doc/kmail kmailcvt archivemailagent \
- importwizard ksendemail libksieve messagelist mailfilteragent \
- ontologies kontact/plugins/kmail headerthemeeditor; do
- cd "${srcdir}"/build/${i}
- make DESTDIR="${pkgdir}" install
- done
+ for i in kmail kmailcvt agents/archivemailagent agents/folderarchiveagent\
+ agents/mailfilteragent importwizard ksendemail libksieve messagelist \
+ ontologies kontact/plugins/kmail headerthemeeditor mboximporter; do
+ cd "${srcdir}"/build/${i}
+ make DESTDIR="${pkgdir}" install
+ done
}
package_kdepim-knode-libre() {
@@ -195,10 +178,6 @@ package_kdepim-knode-libre() {
install='kdepim-knode.install'
cd "${srcdir}"/build/knode
make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/knode
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/kioslave/news
- make DESTDIR="${pkgdir}" install
cd "${srcdir}"/build/kontact/plugins/knode
make DESTDIR="${pkgdir}" install
}
@@ -213,8 +192,6 @@ package_kdepim-knotes-libre() {
install='kdepim.install'
cd "${srcdir}"/build/knotes
make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/knotes
- make DESTDIR="${pkgdir}" install
cd "${srcdir}"/build/kontact/plugins/knotes
make DESTDIR="${pkgdir}" install
}
@@ -227,8 +204,8 @@ package_kdepim-kontact-libre() {
conflicts=('kdepim-kontact' 'kdepim-kontactinterfaces')
replaces=('kdepim-kontact' 'kdepim-kontactinterfaces')
provides=("kdepim-kontact=${pkgver}")
- for i in kontact/src doc/kontact kontact/plugins/summary \
- kontact/plugins/specialdates doc/kontact-admin; do
+ for i in kontact/src kontact/plugins/summary \
+ kontact/plugins/specialdates; do
cd "${srcdir}"/build/${i}
make DESTDIR="${pkgdir}" install
done
@@ -242,9 +219,8 @@ package_kdepim-korganizer-libre() {
conflicts=('kdepim-korganizer')
provides=("kdepim-korganizer=${pkgver}")
install='kdepim-korganizer.install'
- for i in korganizer doc/korganizer kontact/plugins/korganizer \
- calendarviews; do
- cd "${srcdir}"/build/${i}
+ for i in korganizer korgac kontact/plugins/korganizer calendarviews; do
+ cd "${srcdir}"/build/${i}
make DESTDIR="${pkgdir}" install
done
}
@@ -270,22 +246,18 @@ package_kdepim-ktimetracker-libre() {
install='kdepim.install'
cd "${srcdir}"/build/ktimetracker
make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/ktimetracker
- make DESTDIR="${pkgdir}" install
}
package_kdepim-ktnef-libre() {
pkgdesc='A viewer/extractor for TNEF files, without nonfree pilot-link support'
depends=('kdebase-runtime' 'kdepimlibs')
url="https://projects.kde.org/projects/kde/kdepim/ktnef"
+ install=kdepim-ktnef.install
replaces=('kdepim-ktnef')
conflicts=('kdepim-ktnef')
provides=("kdepim-ktnef=${pkgver}")
- install=kdepim-ktnef.install
cd "${srcdir}"/build/ktnef
make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/ktnef
- make DESTDIR="${pkgdir}" install
}
package_kdepim-libkdepim-libre() {
@@ -298,11 +270,12 @@ package_kdepim-libkdepim-libre() {
replaces=('kdepim-libkdepim' 'kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
'kdepim-akonadi')
provides=("kdepim-libkdepim=${pkgver}")
- for i in akonadi_next calendarsupport incidenceeditor-ng \
- kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \
- mailcommon mailimporter messagecomposer messagecore messageviewer \
- icons templateparser plugins/messageviewer grammar sendlateragent \
- plugins/ktexteditor pimactivity pimcommon pimsettingexporter; do
+ for i in agents/sendlateragent akonadi_next calendarsupport \
+ incidenceeditor-ng kaddressbookgrantlee kdgantt2 libkdepim \
+ libkdepimdbusinterfaces libkleo libkpgp mailcommon mailimporter \
+ messagecomposer messagecore messageviewer icons templateparser \
+ plugins/messageviewer grammar grantleetheme grantleethemeeditor \
+ plugins/ktexteditor pimactivity pimcommon pimsettingexporter; do
cd "${srcdir}"/build/${i}
make DESTDIR="${pkgdir}" install
done
diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD
index 22636f28f..84aaaad77 100644
--- a/libre/kdeutils-ark-libre/PKGBUILD
+++ b/libre/kdeutils-ark-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 201173 2013-12-06 12:38:09Z svenstaro $
+# $Id: PKGBUILD 201659 2013-12-17 13:52:43Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=kdeutils-ark
pkgname=kdeutils-ark-libre
-pkgver=4.11.4
+pkgver=4.12.0
pkgrel=1
pkgdesc='Archiving Tool, with unar support'
url='http://kde.org/applications/utilities/ark/'
@@ -20,7 +20,7 @@ replaces=('kdeutils-ark')
conflicts=('kdeutils-ark')
source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz"
'ark-unar-06.patch')
-sha1sums=('cad4391ea3009bf4fa325cbe5b402a06e19a9fef'
+sha1sums=('d7b9fbf595b7fc7a67e52a8ad1f0977b07abd274'
'a0a836950f185d9b2245204579f969203036fdec')
build() {
diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
index 7927661a6..cd932ac3e 100644
--- a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
+++ b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 201125 2013-12-06 12:34:37Z svenstaro $
+# $Id: PKGBUILD 201659 2013-12-17 13:52:43Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=kdenetwork-kopete
pkgname=kdenetwork-kopete-libre-nonprism
-pkgver=4.11.4
+pkgver=4.12.0
pkgrel=1
pkgdesc='Instant Messenger, without skype and support for unsafe and dangerous for privacy protocols'
url='http://kde.org/applications/internet/kopete/'
arch=('i686' 'x86_64' 'mips64el')
license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdenetwork')
-depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr3' 'libidn'
+depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libidn'
'qimageblitz' 'mediastreamer' 'jsoncpp')
makedepends=('cmake' 'automoc4' 'boost')
install=${_pkgname}.install
@@ -19,18 +19,11 @@ replaces=$_pkgname
conflicts=$_pkgname
provides=$_pkgname=$pkgver
source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz"
- 'libotr3.patch'
- 'mediastreamer29.patch'
'libre-nonprism.patch')
-sha1sums=('d8bc0c386d9f846e2d5f05d7dfa421fdcb2ac537'
- '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384'
- '317683a5c2acd0a0058c5ab42f6006e9db511ef3'
- '3c46e5c80ef0cd3f6fe9fb6d5cb8c252c6792208')
+sha1sums=('c1ef611b27079388e48e558a65e2de80db93d875')
prepare() {
cd kopete-${pkgver}
- patch -p2 -i "${srcdir}"/libotr3.patch
- patch -p1 -i "${srcdir}"/mediastreamer29.patch
# Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34.
sed -i 's/Skype protocol" ON/Skype protocol" OFF/g' protocols/CMakeLists.txt
rm -rf protocols/skype
@@ -52,10 +45,11 @@ prepare() {
sed -i 's/meanwhile protocol" ON/meanwhile protocol" OFF/g' protocols/CMakeLists.txt
rm -rf protocols/meanwhile
patch -p1 -i "${srcdir}"/libre-nonprism.patch
+ cd ..
+ mkdir build
}
build() {
- mkdir build
cd build
cmake ../kopete-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/libotr3.patch b/nonprism/kdenetwork-kopete-libre-nonprism/libotr3.patch
deleted file mode 100644
index 1e96c98d6..000000000
--- a/nonprism/kdenetwork-kopete-libre-nonprism/libotr3.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -urN a/kopete/cmake/modules/FindLibOTR.cmake b/kopete/cmake/modules/FindLibOTR.cmake
---- a/kopete/cmake/modules/FindLibOTR.cmake 2012-08-12 18:08:59.000000000 -0600
-+++ b/kopete/cmake/modules/FindLibOTR.cmake 2012-11-09 12:14:24.251450904 -0700
-@@ -13,13 +13,13 @@
- SET(LIBOTR_FIND_QUIETLY TRUE)
- ENDIF (LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY)
-
--FIND_PATH(LIBOTR_INCLUDE_DIR libotr/version.h)
-+FIND_PATH(LIBOTR_INCLUDE_DIR libotr3/version.h)
-
--FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr libotr)
-+FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr3 libotr3)
-
--# Determine version information from libotr/version.h
-+# Determine version information from libotr3/version.h
- IF( LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY )
-- EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr/version.h" OUTPUT_VARIABLE output)
-+ EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr3/version.h" OUTPUT_VARIABLE output)
- STRING(REGEX MATCH "OTRL_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+" LIBOTR_VERSION "${output}")
- STRING(REGEX REPLACE "^OTRL_VERSION \"" "" LIBOTR_VERSION "${LIBOTR_VERSION}")
- # Check if version is at least 3.2.0
-diff -urN a/kopete/plugins/otr/authenticationwizard.h b/kopete/plugins/otr/authenticationwizard.h
---- a/kopete/plugins/otr/authenticationwizard.h 2012-08-12 18:09:00.000000000 -0600
-+++ b/kopete/plugins/otr/authenticationwizard.h 2012-11-09 12:15:11.181265336 -0700
-@@ -26,7 +26,7 @@
- */
-
- extern "C"{
--#include "libotr/proto.h"
-+#include "libotr3/proto.h"
- }
-
- #include "kopetechatsession.h"
-diff -urN a/kopete/plugins/otr/otrlchatinterface.h b/kopete/plugins/otr/otrlchatinterface.h
---- a/kopete/plugins/otr/otrlchatinterface.h 2012-08-12 18:09:00.000000000 -0600
-+++ b/kopete/plugins/otr/otrlchatinterface.h 2012-11-09 12:16:10.141032744 -0700
-@@ -36,10 +36,10 @@
- #include "authenticationwizard.h"
-
- extern "C" {
--#include <libotr/privkey.h>
--#include <libotr/proto.h>
--#include <libotr/message.h>
--#include <libotr/userstate.h>
-+#include <libotr3/privkey.h>
-+#include <libotr3/proto.h>
-+#include <libotr3/message.h>
-+#include <libotr3/userstate.h>
- }
-
-
-diff -urN a/kopete/plugins/otr/otrlconfinterface.h b/kopete/plugins/otr/otrlconfinterface.h
---- a/kopete/plugins/otr/otrlconfinterface.h 2012-08-12 18:09:00.000000000 -0600
-+++ b/kopete/plugins/otr/otrlconfinterface.h 2012-11-09 12:15:56.961084991 -0700
-@@ -32,11 +32,11 @@
- #include <kopetechatsession.h>
-
- extern "C" {
--#include <libotr/privkey.h>
--#include <libotr/proto.h>
--#include <libotr/message.h>
--#include <libotr/userstate.h>
--#include <libotr/context.h>
-+#include <libotr3/privkey.h>
-+#include <libotr3/proto.h>
-+#include <libotr3/message.h>
-+#include <libotr3/userstate.h>
-+#include <libotr3/context.h>
- }
-
- class KOPETE_OTR_SHARED_EXPORT OtrlConfInterface : public QObject
diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/mediastreamer29.patch b/nonprism/kdenetwork-kopete-libre-nonprism/mediastreamer29.patch
deleted file mode 100644
index eb0b2297e..000000000
--- a/nonprism/kdenetwork-kopete-libre-nonprism/mediastreamer29.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc b/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
-index 88fdbd1..57c6c05 100644
---- a/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
-+++ b/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
-@@ -200,7 +200,7 @@ bool LinphoneVoiceChannel::SetSendCodecs(const std::vector<AudioCodec>& codecs)
- LOG(LS_INFO) << "Using " << i->name << "/" << i->clockrate;
- pt_ = i->id;
- audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, i->id, 250, 0); /* -1 means that function will choose some free port */
-- port2 = rtp_session_get_local_port(audio_stream_->session);
-+ port2 = rtp_session_get_local_port(audio_stream_->ms.session);
- first = false;
- }
- }
-@@ -211,7 +211,7 @@ bool LinphoneVoiceChannel::SetSendCodecs(const std::vector<AudioCodec>& codecs)
- // working with a buggy client; let's try PCMU.
- LOG(LS_WARNING) << "Received empty list of codces; using PCMU/8000";
- audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, 0, 250, 0); /* -1 means that function will choose some free port */
-- port2 = rtp_session_get_local_port(audio_stream_->session);
-+ port2 = rtp_session_get_local_port(audio_stream_->ms.session);
- }
-
- return true;
diff --git a/nonprism/kdepim-runtime-nonprism/PKGBUILD b/nonprism/kdepim-runtime-nonprism/PKGBUILD
index b99ee562f..0e899459f 100644
--- a/nonprism/kdepim-runtime-nonprism/PKGBUILD
+++ b/nonprism/kdepim-runtime-nonprism/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 200881 2013-12-06 12:16:11Z svenstaro $
+# $Id: PKGBUILD 201659 2013-12-17 13:52:43Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=kdepim-runtime
pkgname=kdepim-runtime-nonprism
-pkgver=4.11.4
+pkgver=4.12.0
pkgrel=1
pkgdesc='Extends the functionality of kdepim, without libkgapi and libkfbapi support'
arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ replaces=('kdepim-runtime' 'kdepim-runtime-coherence')
conflicts=kdepim-runtime
provides=kdepim-runtime=$pkgver
source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz")
-sha1sums=('202f6c9d0631c6297d4fd6b0b46167bab34a9b34')
+sha1sums=('fe988ea74cf83f1dae99f81bc02eefaa834c664c')
prepare() {
mkdir build