diff options
Diffstat (limited to 'nonprism')
-rw-r--r-- | nonprism/bitlbee-libre-nonprism/PKGBUILD | 11 | ||||
-rw-r--r-- | nonprism/bitlbee-libre-nonprism/bitlbee.install | 21 | ||||
-rw-r--r-- | nonprism/bitlbee-libre-nonprism/xinetd | 2 | ||||
-rw-r--r-- | nonprism/claws-mail-nonprism/PKGBUILD | 13 | ||||
-rw-r--r-- | nonprism/evolution-data-server-nonprism/PKGBUILD | 9 | ||||
-rw-r--r-- | nonprism/gnome-online-accounts-nonprism/PKGBUILD | 9 | ||||
-rw-r--r-- | nonprism/icedove-libre-nonprism/PKGBUILD | 146 | ||||
-rw-r--r-- | nonprism/icedove-libre-nonprism/icedove.desktop | 13 | ||||
-rw-r--r-- | nonprism/icedove-libre-nonprism/icedove.install | 12 | ||||
-rw-r--r-- | nonprism/icedove-libre-nonprism/mozconfig | 46 | ||||
-rw-r--r-- | nonprism/icedove-libre-nonprism/vendor.js | 9 | ||||
-rw-r--r-- | nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD | 19 | ||||
-rw-r--r-- | nonprism/kdenetwork-kopete-libre-nonprism/libotr3.patch | 71 | ||||
-rw-r--r-- | nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch | 18 | ||||
-rw-r--r-- | nonprism/kdenetwork-kopete-libre-nonprism/mediastreamer29.patch | 22 | ||||
-rw-r--r-- | nonprism/kdepim-runtime-nonprism/PKGBUILD | 6 | ||||
-rw-r--r-- | nonprism/sylpheed-nonprism/PKGBUILD | 6 |
17 files changed, 282 insertions, 151 deletions
diff --git a/nonprism/bitlbee-libre-nonprism/PKGBUILD b/nonprism/bitlbee-libre-nonprism/PKGBUILD index e48667d52..02418359a 100644 --- a/nonprism/bitlbee-libre-nonprism/PKGBUILD +++ b/nonprism/bitlbee-libre-nonprism/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 200603 2013-11-29 19:17:58Z dreisner $ # Contributor: FUBAR <mrfubar@gmail.com> # Contributor: simo <simo@archlinux.org> @@ -10,8 +10,8 @@ _pkgname=bitlbee pkgname=bitlbee-libre-nonprism -pkgver=3.2 -pkgrel=3 +pkgver=3.2.1 +pkgrel=1 pkgdesc='Brings XMPP to IRC, without support for unsafe and dangerous for privacy protocols' url='http://www.bitlbee.org/' license=('GPL') @@ -26,8 +26,8 @@ replaces=("$_pkgname" "$_pkgname-libre" "$_pkgname-coherence") source=("http://get.bitlbee.org/src/${_pkgname}-${pkgver}.tar.gz" 'xinetd' 'bitlbee.tmpfiles') -sha1sums=('21e17f082c776566429603b1e8c966983a75ac9e' - 'ec1a3efff09b9fc3d3e52560d8cdbe23186c819f' +sha1sums=('954471ab87206826c072f31b3def40a1be5a78f5' + '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17' '3695ed2fe22436c4d0fc3ead829f7d1f89bc491c') backup=('etc/bitlbee/bitlbee.conf' 'etc/bitlbee/motd.txt' @@ -49,7 +49,6 @@ build() { --oscar=0 \ --yahoo=0 \ --twitter=0 \ - --purple=0 \ --ssl=gnutls \ --strip=0 \ --otr=plugin \ diff --git a/nonprism/bitlbee-libre-nonprism/bitlbee.install b/nonprism/bitlbee-libre-nonprism/bitlbee.install index aa5a81a70..c8a8f93a1 100644 --- a/nonprism/bitlbee-libre-nonprism/bitlbee.install +++ b/nonprism/bitlbee-libre-nonprism/bitlbee.install @@ -1,15 +1,22 @@ post_install() { - getent group bitlbee &>/dev/null || groupadd -r -g 65 bitlbee >/dev/null - getent passwd bitlbee &>/dev/null || useradd -r -u 65 -g bitlbee -d /var/lib/bitlbee -s /bin/false -c bitlbee bitlbee >/dev/null - systemd-tmpfiles --create bitlbee.conf + if ! getent group bitlbee &>/dev/null; then + groupadd -r -g 65 bitlbee >/dev/null + fi + if ! getent passwd bitlbee &>/dev/null; then + useradd -r -u 65 -g bitlbee -d /var/lib/bitlbee -s /bin/false -c bitlbee bitlbee >/dev/null + fi + systemd-tmpfiles --create bitlbee.conf } post_upgrade() { - post_install + post_install } post_remove() { - getent passwd bitlbee &>/dev/null && userdel bitlbee >/dev/null - getent group bitlbee &>/dev/null && groupdel bitlbee >/dev/null - true + if getent passwd bitlbee &>/dev/null; then + userdel bitlbee >/dev/null + fi + if getent group bitlbee &>/dev/null; then + groupdel bitlbee >/dev/null + fi } diff --git a/nonprism/bitlbee-libre-nonprism/xinetd b/nonprism/bitlbee-libre-nonprism/xinetd index 68d5663b3..d671a8cfc 100644 --- a/nonprism/bitlbee-libre-nonprism/xinetd +++ b/nonprism/bitlbee-libre-nonprism/xinetd @@ -6,7 +6,7 @@ service bitlbee wait = no user = bitlbee group = bitlbee - server = /usr/bin/bitlbee + server = /usr/sbin/bitlbee port = 6667 disable = yes } diff --git a/nonprism/claws-mail-nonprism/PKGBUILD b/nonprism/claws-mail-nonprism/PKGBUILD index 4df1a5e5f..1e48c65bd 100644 --- a/nonprism/claws-mail-nonprism/PKGBUILD +++ b/nonprism/claws-mail-nonprism/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 196415 2013-10-13 09:17:50Z andyrtr $ +# $Id: PKGBUILD 201547 2013-12-14 21:56:36Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> _pkgname=claws-mail pkgname=$_pkgname-nonprism -pkgver=3.9.2 -pkgrel=4 +pkgver=3.9.3 +pkgrel=1 pkgdesc="A GTK+ based e-mail client, without libgdata support" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') url="http://www.$_pkgname.org" -depends=('gtk2' 'gnutls' 'startup-notification' 'enchant' 'gpgme' 'libetpan>=1.1-4' +depends=('gtk2' 'gnutls' 'startup-notification' 'enchant' 'gpgme' 'libetpan>=1.1-4' 'compface' 'libsm' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils') -makedepends=('compface' 'spamassassin' 'bogofilter' 'valgrind' +makedepends=('spamassassin' 'bogofilter' 'valgrind' # dependencies for plugins 'libsoup' 'webkitgtk2' 'libnotify' 'libcanberra' 'poppler-glib' 'pygtk') #'libchamplain' needed for geolocation plugin, disabled for now - most time it's not compatible with current gnome releases @@ -34,10 +34,9 @@ optdepends=('python2: needed for some tools and python plugin' replaces=("$_pkgname" "sylpheed-claws" "$_pkgname-extra-plugins" "$_pkgname-libre" "$_pkgname-libre-nonprism") conflicts=("$_pkgname" "$_pkgname-extra-plugins") provides=("$_pkgname=$pkgver" 'claws') -options=(!libtool) install=$_pkgname.install source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/$_pkgname-$pkgver.tar.bz2{,.asc}) -md5sums=('90de2a265e65fbd9dffdbf428bb0ee28' +md5sums=('0158b5e6b6d6866f9a75fd288a4edf04' 'SKIP') build() { diff --git a/nonprism/evolution-data-server-nonprism/PKGBUILD b/nonprism/evolution-data-server-nonprism/PKGBUILD index a84fbf135..f8e78ee1a 100644 --- a/nonprism/evolution-data-server-nonprism/PKGBUILD +++ b/nonprism/evolution-data-server-nonprism/PKGBUILD @@ -1,15 +1,14 @@ -# $Id: PKGBUILD 196433 2013-10-13 19:19:09Z heftig $ +# $Id: PKGBUILD 201344 2013-12-09 08:01:08Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> _pkgname=evolution-data-server pkgname=evolution-data-server-nonprism -pkgver=3.10.1 +pkgver=3.10.3 pkgrel=1 pkgdesc="Centralized access to appointments and contacts, without libgdata support" arch=(i686 x86_64) -depends=(gnome-online-accounts nss krb5 libgweather libical db gcr libsoup) +depends=(gnome-online-accounts nss krb5 libgweather libical db) makedepends=(intltool gperf gobject-introspection vala python2) -options=('!libtool') install=$_pkgname.install url="http://www.gnome.org" license=(GPL) @@ -17,7 +16,7 @@ replaces=("$_pkgname" 'evolution-data-server-coherence') conflicts=$_pkgname provides=$_pkgname=$pkgver source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz) -sha256sums=('a6b5acbd21767b685d58ebfd4c152baa693387f5654fb738b3645ee39e82f9f5') +sha256sums=('41af5c658255230de47423fad73f19bfab15b9e0df80141b13f66b55bf295bd2') build() { cd "$_pkgname-$pkgver" diff --git a/nonprism/gnome-online-accounts-nonprism/PKGBUILD b/nonprism/gnome-online-accounts-nonprism/PKGBUILD index e9c333171..db313b925 100644 --- a/nonprism/gnome-online-accounts-nonprism/PKGBUILD +++ b/nonprism/gnome-online-accounts-nonprism/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 196736 2013-10-17 12:37:48Z heftig $ +# $Id: PKGBUILD 199427 2013-11-12 16:52:35Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> _pkgname=gnome-online-accounts pkgname=gnome-online-accounts-nonprism -pkgver=3.10.1 -pkgrel=2 +pkgver=3.10.2 +pkgrel=1 pkgdesc="GNOME service to access online accounts, without support for unsafe and dangerous for privacy protocols" arch=(i686 x86_64 mips64el) url="http://www.gnome.org" @@ -16,10 +16,9 @@ makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl') provides=("$_pkgname=$pkgver") conflicts=$_pkgname replaces=($_pkgname $pkgname-coherence) -options=(!libtool) install=$_pkgname.install source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz) -sha256sums=('d925841a4c1c7a46a0837fc7e219891a46431e089847fa248e3f691c23ff7d9b') +sha256sums=('0b2418c1845337b6574a12d2075d319d8aaa5bbc4b0d1d123108c5da00e11b97') build() { cd $_pkgname-$pkgver diff --git a/nonprism/icedove-libre-nonprism/PKGBUILD b/nonprism/icedove-libre-nonprism/PKGBUILD new file mode 100644 index 000000000..36d5497dd --- /dev/null +++ b/nonprism/icedove-libre-nonprism/PKGBUILD @@ -0,0 +1,146 @@ +# Maintainer : Márcio Silva <coadde@lavabit.com> +# Maintainer : André Silva <emulatorman@parabola.nu> + +# We're getting this from Debian Experimental +_debname=icedove +_debver=24.1.1 +_debrel=deb1 +_debrepo=http://ftp.debian.org/debian/pool/main/ +debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } + +_pkgname=${_debname} +pkgname=${_debname}-libre-nonprism +epoch=1 +pkgver=${_debver}.${_debrel} +pkgrel=1 +pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird, without support for unsafe and dangerous for privacy protocols" +arch=('i686' 'x86_64' 'mips64el') +license=('MPL' 'GPL' 'LGPL') +url="http://packages.debian.org/experimental/${_pkgname}" +depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification') +makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt') +optdepends=('libcanberra: for sound support') +replaces=('thunderbird' "${pkgname%-nonprism}") +conflicts=('thunderbird' "${pkgname%-nonprism}") +provides=('thunderbird' "${pkgname%-nonprism}=$epoch:$pkgver") +install=${_pkgname}.install +source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz" + "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.gz" + mozconfig + vendor.js + ${_pkgname}.desktop) +options=(!emptydirs) +md5sums=('91ddfb44481e6cb456d835a832d885c1' + '9f060324dbed3f8d27c896703bda6078' + 'c46cf2a671c8fdefcabd4c87e38f3d40' + '5a53179d14ae9631b7afe5e4d0fc0b25' + 'e785e0c267f4435ae1a9aa0b03bcacfb') + +prepare() { + export DEBIAN_BUILD="comm-esr24" + + export QUILT_PATCHES=debian/patches + export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' + export QUILT_DIFF_ARGS='--no-timestamps' + + mv debian "${srcdir}/${DEBIAN_BUILD}" + cd "${srcdir}/${DEBIAN_BUILD}" + + mv debian/${_pkgname}-branding "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}" + + cp -a debian/app-icons/${_pkgname}big.svg debian/app-icons/${_pkgname}_icon.svg + for i in 16x16 22x22 24x24 32x32 48x48 256x256; do + install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}/mailicon${i/x*/}.png" + done + for i in 48x48 64x64; do + install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}/content/icon${i/x*/}.png" + done + + # Fix orthographic issue ("Icdove" to "Icedove") in MOZ_APP_BASENAME line for confvars.sh. + sed -i 's|Icdove|Icedove|' debian/patches/debian-hacks/Icedove-branding.patch + + quilt push -av + + # Fix paths on makefile + sed -i 's|topsrcdir = [.][.]/[.][.]/[.][.]/|topsrcdir = @top_srcdir@|; + s|include $(topsrcdir)/config/autoconf.mk|include $(DEPTH)/config/autoconf.mk|; + s|include $(DEPTH)/config/rules.mk|include $(topsrcdir)/config/rules.mk|; + ' mail/branding/icedove/Makefile.in + + sed -i 's|topsrcdir = [.][.]/[.][.]/[.][.]/[.][.]|topsrcdir = @top_srcdir@|; + s|include $(topsrcdir)/config/autoconf.mk|include $(DEPTH)/config/autoconf.mk|; + s|include $(DEPTH)/config/rules.mk|include $(topsrcdir)/config/rules.mk|; + ' mail/branding/icedove/locales/Makefile.in + + # Fix package-manifest.in + sed -i '\|; Phishing Protection| s|$|\n#ifdef MOZ_SAFE_BROWSING|; + \|@BINPATH@/components/url-classifier[.]xpt| s|$|\n#endif| + ' mail/installer/package-manifest.in + + # Fix branding + sed -i 's|Icedove Mail/News|Icedove|' mail/branding/icedove/locales/en-US/brand.{dtd,properties} + + # Replace common URLs + sed -i '\|extensions[.]getAddons[.]get[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/Icedove");|g; + \|extensions[.]getAddons[.]search[.]browseURL| s|https://addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/Icedove");|g; + \|extensions[.]getAddons[.]search[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/Icedove");|g; + \|extensions[.]webservice[.]discoverURL| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/Icedove");|g; + ' mail/app/profile/all-thunderbird.js + + # Remove support for unsafe and dangerous for privacy protocols + sed -i '\|facebook|d + \|gtalk|d + \|twitter|d + ' chat/moz.build + sed -i '\|facebook[.]js|d + \|facebook[.]manifest|d + \|gtalk[.]js|d + \|gtalk[.]manifest|d + \|twitter[.]js|d + \|twitter[.]manifest|d + ' mail/installer/package-manifest.in + rm -r chat/protocols/{facebook,gtalk,twitter} + + cp "${srcdir}/mozconfig" .mozconfig + + # configure script misdetects the preprocessor without an optimization level + # https://bugs.archlinux.org/task/34644 + sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' mozilla/configure +} + +build() { + export DEBIAN_BUILD="comm-esr24" + + cd "${srcdir}/${DEBIAN_BUILD}" + + export LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/lib/${_pkgname}" + export PYTHON="/usr/bin/python2" + + make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" +} + +package() { + export DEBIAN_BUILD="comm-esr24" + + cd "${srcdir}/${DEBIAN_BUILD}" + + make -j1 -f client.mk DESTDIR="${pkgdir}" install + + install -Dm644 "${srcdir}/vendor.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/preferences/vendor.js" + + for i in 16x16 22x22 24x24 32x32 48x48 64x64 128x128 256x256; do + install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${pkgdir}/usr/share/icons/hicolor/$i/apps/${_pkgname}.png" + done + install -Dm644 "debian/app-icons/${_pkgname}_icon.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_pkgname}.svg" + + install -Dm644 "${srcdir}/${_pkgname}.desktop" \ + "${pkgdir}/usr/share/applications/${_pkgname}.desktop" + + rm -rf "${pkgdir}"/usr/lib/${_pkgname}/{dictionaries,hyphenation,searchplugins} + ln -sf /usr/share/hunspell "${pkgdir}/usr/lib/${_pkgname}/dictionaries" + ln -sf /usr/share/hyphen "${pkgdir}/usr/lib/${_pkgname}/hyphenation" + ln -sf /usr/lib/mozilla/searchplugins "${pkgdir}/usr/lib/${_pkgname}/searchplugins" + + # We don't want the development stuff + rm -r "${pkgdir}"/usr/{include,lib/${_pkgname}-devel,share/idl} +} diff --git a/nonprism/icedove-libre-nonprism/icedove.desktop b/nonprism/icedove-libre-nonprism/icedove.desktop new file mode 100644 index 000000000..ef2cd76e9 --- /dev/null +++ b/nonprism/icedove-libre-nonprism/icedove.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Version=1.0 +Name=Icedove +Comment=Mail & News Reader +GenericName=Mail Client & News Reader +Exec=icedove %u +TryExec=icedove +Icon=icedove +Terminal=false +Type=Application +Categories=Network;Email; +MimeType=message/rfc822;x-scheme-handler/mailto; +StartupNotify=true diff --git a/nonprism/icedove-libre-nonprism/icedove.install b/nonprism/icedove-libre-nonprism/icedove.install new file mode 100644 index 000000000..4d4a283db --- /dev/null +++ b/nonprism/icedove-libre-nonprism/icedove.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/nonprism/icedove-libre-nonprism/mozconfig b/nonprism/icedove-libre-nonprism/mozconfig new file mode 100644 index 000000000..57c02368a --- /dev/null +++ b/nonprism/icedove-libre-nonprism/mozconfig @@ -0,0 +1,46 @@ +mk_add_options MOZ_CO_PROJECT=mail +ac_add_options --enable-application=mail + +ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib + +# Icedove +ac_add_options --disable-official-branding +ac_add_options --with-branding=mail/branding/icedove + +# System libraries +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-jpeg +ac_add_options --with-system-zlib +ac_add_options --with-system-bz2 +ac_add_options --with-system-png +ac_add_options --with-system-libevent +ac_add_options --with-system-libvpx +ac_add_options --enable-system-hunspell +ac_add_options --enable-system-sqlite +ac_add_options --enable-system-ffi +ac_add_options --enable-system-cairo +ac_add_options --enable-system-pixman +ac_add_options --with-pthreads + +# Features +ac_add_options --enable-startup-notification +ac_add_options --enable-gio + +ac_add_options --disable-gstreamer +ac_add_options --disable-gnomevfs +ac_add_options --disable-crashreporter +ac_add_options --disable-updater +ac_add_options --disable-tests +ac_add_options --disable-mochitest +ac_add_options --disable-installer + +# Optimization +ac_add_options --enable-optimize + +export MOZILLA_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 + +# Parabola features +ac_add_options --disable-safe-browsing diff --git a/nonprism/icedove-libre-nonprism/vendor.js b/nonprism/icedove-libre-nonprism/vendor.js new file mode 100644 index 000000000..170b505a8 --- /dev/null +++ b/nonprism/icedove-libre-nonprism/vendor.js @@ -0,0 +1,9 @@ +// Use LANG environment variable to choose locale +pref("intl.locale.matchOS", true); + +// Disable default mailer checking. +pref("mail.shell.checkDefaultMail", false); + +// Don't disable our bundled extensions in the application directory +pref("extensions.autoDisableScopes", 11); +pref("extensions.shownSelectionUI", true); diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD index a5f4e9807..86a91508f 100644 --- a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD +++ b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 198789 2013-11-04 15:13:00Z andrea $ +# $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.3 +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,12 @@ 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=('70fd03fb955574f4eba733d590ce15c841fd8805' - '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384' - '317683a5c2acd0a0058c5ab42f6006e9db511ef3' - '3c46e5c80ef0cd3f6fe9fb6d5cb8c252c6792208') +sha1sums=('c1ef611b27079388e48e558a65e2de80db93d875' + 'ddde6ed0b6f281512dc12cb80f712f33c6932c92') 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 +46,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/libre-nonprism.patch b/nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch index b6915cbb5..6d73766cc 100644 --- a/nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch +++ b/nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch @@ -1,8 +1,8 @@ diff --git a/doc/index.docbook b/doc/index.docbook -index 1576dc9..daf7170 100644 +index b55fd88..416de49 100644 --- a/doc/index.docbook +++ b/doc/index.docbook -@@ -20,7 +20,6 @@ +@@ -24,7 +24,6 @@ <!ENTITY kopete-chatstyle SYSTEM "chatstyle.docbook"> <!ENTITY kopete-pipes SYSTEM "pipes.docbook"> <!ENTITY kopete-jabber SYSTEM "jabber.docbook"> @@ -10,7 +10,7 @@ index 1576dc9..daf7170 100644 ]> <!-- Intro (1st draft, Will) -@@ -112,15 +111,7 @@ Appendix: Chat Window Style Guide (1st draft, Michaël) +@@ -116,15 +115,7 @@ Appendix: Chat Window Style Guide (1st draft, Michaël) <keyword>Messaging</keyword> <keyword>Jabber</keyword> <keyword>IRC</keyword> @@ -26,7 +26,7 @@ index 1576dc9..daf7170 100644 </keywordset> </bookinfo> -@@ -174,13 +165,13 @@ Appendix: Chat Window Style Guide (1st draft, Michaël) +@@ -178,13 +169,13 @@ Appendix: Chat Window Style Guide (1st draft, Michaël) <para>To use &kopete; you need to set up one or more accounts for the instant messaging services you wish to use.</para> <para>You've probably already chosen a messaging service, either because you already use &im;, or you need to use the same service as your friends. If you don't fit into either of these categories, please consider using a messaging service based on open standards, because these are designed for use by Free Software. Other messaging services are prone to changing the underlying technology without making the details freely available, making them harder for Free Software developers to support.</para> <para>The messaging services that &kopete; supports that are based on open standards are Jabber and IRC.</para> @@ -35,14 +35,14 @@ index 1576dc9..daf7170 100644 <sect1 id="creating-accounts"> <title>Creating Accounts</title> <para>To create an account, use <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure...</guimenuitem> </menuchoice> to display the Configure window.</para> - <para>The Configure window is the main way to set up and customize &kopete;. On the left a column of icons control which aspect of &kopete; is being configured. Click the <guiicon>Accounts</guiicon> icon. The main pane will change to display the account management pane. This is currently empty, but will soon list your &im; accounts. Click <guibutton>New</guibutton> to display the <interface>Account Wizard</interface>.</para> - <para>The <interface>Account Wizard</interface> helps you create an &im; account. After the <guilabel>Introduction</guilabel> page, you are asked to select the messaging service that you'd like to use. Click one of the services shown and then click <guibutton>Next</guibutton>. On the following page, you should enter your registration details for that instant messaging service.</para> + <para>The Configure window is the main way to set up and customize &kopete;. On the left a column of icons control which aspect of &kopete; is being configured. Click the <guiicon>Accounts</guiicon> icon. The main pane will change to display the account management pane. This is currently empty, but will soon list your &im; accounts. Click <guibutton>Add Account</guibutton> to display the <interface>Account Wizard</interface>.</para> + <para>The <interface>Account Wizard</interface> helps you create an &im; account. On the first page, you are asked to select the messaging service that you'd like to use. Click one of the services shown and then click <guibutton>Next</guibutton>. On the following page, you should enter your registration details for that instant messaging service.</para> -<para>Most services just require you to enter a username or unique identifying number (<acronym>UIN</acronym>) and password. The special purpose services Winpopup and <acronym>SMS</acronym> work slightly differently, so please see their specific sections. There are a couple of other options that apply to most services that you should look at:</para> +<para>Most services just require you to enter a username or unique identifying number (<acronym>UIN</acronym>) and password. The special purpose services Winpopup work slightly differently, so please see their specific sections. There are a couple of other options that apply to most services that you should look at:</para> <variablelist> <varlistentry><term>Remember password</term><listitem><para>When this is checked, &kopete; will store the password for you, so you don't have to enter it every time you connect to the &im; service. If you are security-conscious or want to limit access to the &im; account you can leave this unchecked.</para></listitem></varlistentry> <varlistentry><term>Connect at startup</term><listitem><para>When this is checked, &kopete; will try to connect to the &im; service as when it starts. If you use a <acronym>LAN</acronym>, <acronym>DSL</acronym> or other <quote>always-on</quote> connection, this is appropriate; dial-up modem users should turn this off and connect manually when you have dialed up.</para></listitem></varlistentry> -@@ -256,7 +247,7 @@ Shortcuts...</guimenuitem></menuchoice>.</para></tip> +@@ -260,7 +251,7 @@ Shortcuts...</guimenuitem></menuchoice>.</para></tip> <listitem><para>Select Display Name and Group. Here you can enter a Display Name (the name used for this person inside &kopete;), and choose the <link linkend="organise-contacts-grouping">groups</link> they are a member of.</para></listitem> <listitem><para>Select &im; Accounts. Here you can choose which accounts you want to use to chat to the new contact. If you only have one &im; account, you won't see this screen.</para></listitem> <listitem><para>Account-specific Add Contact Pages. For each account, you'll get one page where you can enter the <acronym>UIN</acronym>, buddy name or Email address, depending on the &im; system in use.</para></listitem> @@ -51,7 +51,7 @@ index 1576dc9..daf7170 100644 </orderedlist> <para>You can add contacts to an existing Metacontact using its context menu.</para> -@@ -699,47 +690,17 @@ Shortcuts...</guimenuitem></menuchoice>.</para></tip> +@@ -705,47 +696,17 @@ Shortcuts...</guimenuitem></menuchoice>.</para></tip> <para>&kopete; calls different &im; systems 'Protocols'. When you add an account, it is specific to a single protocol. Although &kopete; tries to make instant messaging appear the same, no matter what protocol you use, there are some differences in the level of support for advanced features such as file transfer and multimedia.</para> <sect1 id="protocols-list"> <title>Protocols</title> @@ -100,7 +100,7 @@ index 1576dc9..daf7170 100644 </sect2> </sect1> </chapter> -@@ -1120,7 +1081,6 @@ Documentation copyright 2003,2004,2005 &Will.Stephenson; (lists at stevello free +@@ -1180,7 +1141,6 @@ Documentation copyright 2003,2004,2005 &Will.Stephenson; (lists at stevello free &kopete-chatstyle; &kopete-pipes; &kopete-jabber; 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 771a3e045..0e899459f 100644 --- a/nonprism/kdepim-runtime-nonprism/PKGBUILD +++ b/nonprism/kdepim-runtime-nonprism/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 198789 2013-11-04 15:13:00Z andrea $ +# $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.3 +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=('168455654655bd302c668ca91f18fab47fa6cd3c') +sha1sums=('fe988ea74cf83f1dae99f81bc02eefaa834c664c') prepare() { mkdir build diff --git a/nonprism/sylpheed-nonprism/PKGBUILD b/nonprism/sylpheed-nonprism/PKGBUILD index 34d15ce73..08b0b3c13 100644 --- a/nonprism/sylpheed-nonprism/PKGBUILD +++ b/nonprism/sylpheed-nonprism/PKGBUILD @@ -8,13 +8,13 @@ _pkgname=sylpheed pkgname=sylpheed-nonprism pkgver=3.3.0 -pkgrel=1 +pkgrel=1.1 pkgdesc="Lightweight and user-friendly e-mail client, without Gmail support" arch=('i686' 'x86_64') url="http://sylpheed.sraoss.jp/en/" license=('GPL') -depends=('gpgme' 'gtkspell' 'desktop-file-utils') -makedepends=('compface' 'openssl') +depends=('gpgme' 'gtkspell' 'desktop-file-utils' 'compface') +makedepends=('openssl') options=('!libtool') replaces=$_pkgname conflicts=$_pkgname |