summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
Diffstat (limited to 'libre')
-rw-r--r--libre/bbswitch-libre/PKGBUILD2
-rw-r--r--libre/bfgminer-libre/PKGBUILD6
-rw-r--r--libre/claws-mail-libre/PKGBUILD26
-rw-r--r--libre/hplip-libre/PKGBUILD6
-rw-r--r--libre/kdebase-konqueror-libre/PKGBUILD6
-rw-r--r--libre/kdebase-runtime-libre/PKGBUILD30
-rw-r--r--libre/kdelibs-libre/PKGBUILD8
-rw-r--r--libre/kdenetwork-kopete-libre/PKGBUILD87
-rw-r--r--libre/kdenetwork-kopete-libre/giflib5.patch67
-rw-r--r--libre/kdenetwork-kopete-libre/libotr3.patch (renamed from libre/kdenetwork-kopete-libre/use-libotr3.patch)0
-rw-r--r--libre/kdenetwork-kopete-libre/mediastreamer29.patch22
-rw-r--r--libre/kdepim-libre/PKGBUILD28
-rw-r--r--libre/kdeutils-ark-libre/PKGBUILD6
-rw-r--r--libre/linux-libre-kmod-alx/PKGBUILD42
-rw-r--r--libre/linux-libre-kmod-alx/linux-libre-kmod-alx.install32
-rw-r--r--libre/linux-libre-lts-kmod-alx/PKGBUILD4
-rw-r--r--libre/linux-libre-lts/PKGBUILD10
-rw-r--r--libre/linux-libre/3.10.6-reset-superseed-xhci-hcd.patch24
-rw-r--r--libre/linux-libre/PKGBUILD17
-rw-r--r--libre/lirc-libre/PKGBUILD4
-rw-r--r--libre/mozilla-searchplugins/PKGBUILD15
-rw-r--r--libre/mozilla-searchplugins/jamendo-en.xml.in10
-rw-r--r--libre/mozilla-searchplugins/yacy.xml12
-rw-r--r--libre/tp_smapi-libre/PKGBUILD4
-rw-r--r--libre/vhba-module-libre/PKGBUILD4
25 files changed, 148 insertions, 324 deletions
diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD
index ee87679de..aa3f3181d 100644
--- a/libre/bbswitch-libre/PKGBUILD
+++ b/libre/bbswitch-libre/PKGBUILD
@@ -7,7 +7,7 @@ _pkgname=bbswitch
pkgname=bbswitch-libre
pkgver=0.7
_extramodules=extramodules-3.10-LIBRE # Don't forget to update bbswitch.install
-pkgrel=9
+pkgrel=10
pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre kernel package)"
arch=('i686' 'x86_64' 'mips64el')
url=("http://github.com/Bumblebee-Project/bbswitch")
diff --git a/libre/bfgminer-libre/PKGBUILD b/libre/bfgminer-libre/PKGBUILD
index 88f78e318..43e862669 100644
--- a/libre/bfgminer-libre/PKGBUILD
+++ b/libre/bfgminer-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 94236 2013-07-17 13:44:25Z tredaelli $
+# $Id: PKGBUILD 96038 2013-08-19 11:41:39Z tredaelli $
# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
# Contributor: Andy Weidenbaum <archbaum@gmail.com>
_pkgname=bfgminer
pkgname=bfgminer-libre
-pkgver=3.1.3
+pkgver=3.1.4
pkgrel=1
pkgdesc="Bitcoin miner featuring overclocking, monitoring, fan speed control and remote management. For FPGA/GPU/CPU Bitcoin mining, without nonfree OpenCL recommendation."
arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ license=('GPL3')
options=(!libtool)
source=(http://luke.dashjr.org/programs/bitcoin/files/$_pkgname/$pkgver/$_pkgname-$pkgver.tbz2
remove-dangerous-rpath.patch)
-sha256sums=('07964687daf8c6ba0a11f349b6b139e4d35078cdd013935f9331b28feced0500'
+sha256sums=('ec59618b7d5c81e110871ce6d10563e01d7670bbe2559428836474a9f2eace1a'
'd26d07ca23ae25798c4db37cfda1a6a76f22d06e73efab1ddf62b3e1a7eef04c')
prepare() {
diff --git a/libre/claws-mail-libre/PKGBUILD b/libre/claws-mail-libre/PKGBUILD
index d9a171e10..5ee1fec05 100644
--- a/libre/claws-mail-libre/PKGBUILD
+++ b/libre/claws-mail-libre/PKGBUILD
@@ -1,23 +1,21 @@
-# $Id: PKGBUILD 188143 2013-06-10 13:35:31Z bpiotrowski $
+# $Id$
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-pkgname=claws-mail-libre
-_pkgflag=libre
-_pkgname=${pkgname%-$_pkgflag}
-pkgver=3.9.2
-pkgrel=1
+_pkgname=claws-mail
+pkgname=$_pkgname-libre
+pkgver=3.9.1
+pkgrel=3
pkgdesc='A GTK+ based e-mail client, without nonfree PalmOS handheld devices support'
arch=('i686' 'x86_64' 'mips64el')
license=('GPL3')
url="http://www.$_pkgname.org"
depends=('gtk2' 'gnutls' 'startup-notification' 'enchant'
'gpgme' 'libetpan>=1.1' 'libsm' 'db' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('compface' 'spamassassin' 'bogofilter'
+makedepends=('compface' 'spamassassin' 'bogofilter' 'valgrind'
# dependencies for plugins
'libsoup' 'libgdata' 'webkitgtk2' 'libnotify' 'libcanberra' 'poppler-glib' 'pygtk')
#'libchamplain' needed for geolocation plugin, disabled for now - most time it's not compatible with current gnome releases
-[ "$CARCH" != "mips64el" ] && makedepends+=('valgrind')
optdepends=('python2: needed for some tools and python plugin'
'perl: needed for some tools and perl plugin'
'spamassassin: adds support for spamfiltering'
@@ -40,7 +38,7 @@ 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=('8adc734912ff1b83545cb12850100473'
'SKIP')
build() {
@@ -51,7 +49,7 @@ build() {
sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py
sed -i 's:python -c:python2 -c:g' configure
- ./configure --prefix=/usr --disable-static \
+ setarch $CARCH ./configure --prefix=/usr --disable-static \
--enable-enchant \
--enable-gnutls \
--enable-ldap \
@@ -59,18 +57,18 @@ build() {
--enable-pgpmime-plugin \
--enable-spamassassin-plugin \
--enable-bogofilter-plugin \
- --enable-jpilot \
+ --disable-jpilot \
#--help
- make
+ setarch $CARCH make
}
package() {
cd $srcdir/$_pkgname-$pkgver
- make DESTDIR=$pkgdir install
+ setarch $CARCH make DESTDIR=$pkgdir install
# build and install extra tools
cd tools
- make
+ setarch $CARCH make
# all executables and .conf files ; only top directory
find -maxdepth 1 -type f -and -perm /111 -or -name '*.conf' | while read i ; do
install -D -m755 $i $pkgdir/usr/lib/$_pkgname/tools/$i
diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD
index 13f61ecec..3039dfdd7 100644
--- a/libre/hplip-libre/PKGBUILD
+++ b/libre/hplip-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191569 2013-07-25 20:33:03Z andyrtr $
+# $Id: PKGBUILD 193075 2013-08-15 15:25:13Z andyrtr $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor : Rémy Oudompheng <remy@archlinux.org>
# Contributor: Morgan LEFIEUX <comete@archlinuxfr.org>
@@ -6,7 +6,7 @@
_pkgname=hplip
pkgname=hplip-libre
-pkgver=3.13.7
+pkgver=3.13.8
pkgrel=1
pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without hplip-plugin binary blobs recommendation"
arch=('i686' 'x86_64')
@@ -31,7 +31,7 @@ options=('!libtool')
install=hplip.install
source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc}
hp-mkuri.patch)
-md5sums=('e834c8dd270f441c963f5d883d2d48f3'
+md5sums=('44de6a1e4d295ae6f1f0f0ef1cdc7301'
'SKIP'
'0bd7779fdbc4d7a9386df04dce2cb8d4')
diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD
index f1264b0c7..e360ef443 100644
--- a/libre/kdebase-konqueror-libre/PKGBUILD
+++ b/libre/kdebase-konqueror-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 189302 2013-07-02 21:26:19Z andrea $
+# $Id: PKGBUILD 192541 2013-08-13 18:47:05Z 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.10.5
+pkgver=4.11.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=('3953c441d508408becfbb1177d3a834775b92bf6'
+sha1sums=('2a1e0e902016f0dc6f39cbe4fc776e5f20554088'
'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 224d304e1..88735feed 100644
--- a/libre/kdebase-runtime-libre/PKGBUILD
+++ b/libre/kdebase-runtime-libre/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 189302 2013-07-02 21:26:19Z andrea $
+# $Id: PKGBUILD 192541 2013-08-13 18:47:05Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
_pkgname=kdebase-runtime
pkgname=kdebase-runtime-libre
-pkgver=4.10.5
+pkgver=4.11.0
pkgrel=1
pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search providers"
arch=('i686' 'x86_64' 'mips64el')
url='https://projects.kde.org/projects/kde/kde-runtime'
license=('GPL' 'LGPL')
-depends=("kdelibs>=${pkgver}" 'kactivities' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons'
- 'xorg-xauth')
+depends=("kdelibs>=${pkgver}" 'kactivities' 'smbclient' 'libssh' 'libcanberra'
+ 'oxygen-icons' 'xorg-xauth' 'libwebp')
makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'doxygen'
'networkmanager')
-optdepends=('kdepimlibs: to generate drkonqi reports'
- 'htdig: to build the search index in khelpcenter'
- 'rarian: needed by khelpcenter'
- 'gdb: drkonq crash handler')
+optdepends=('kdepimlibs: needed by DrKonqi to send crash reports to KDE.org'
+ 'gdb: needed by DrKonqi to generate backtrace'
+ 'htdig: to build the search index in the KHelpCenter'
+ 'rarian: needed by KHelpCenter')
replaces=("${_pkgname}")
conflicts=("${_pkgname}")
provides=("${_pkgname}=${pkgver}")
@@ -26,15 +26,19 @@ install="${_pkgname}.install"
source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz"
'duckduckgo_html.desktop'
'duckduckgo_lite.desktop')
-sha1sums=('1d472ceff3a38ff778803817b9c0eeb5b1880db6'
+sha1sums=('87f693a9cbb149dfa2be49d98562b2bc7add99b7'
'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd'
'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b')
+prepare() {
+ mkdir build
+}
+
build() {
cd "${srcdir}"
# Removing non-privacy search providers
- rm -v kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders/{7digital,acronym,altavista,amazon{,_mp3},amg,austronaut,backports,baidu,bing,blip,cia,dbug,deb,duckduckgo{,_info,_shopping},facebook,ecosia,feedster,flickr,flickrcc,froogle,google,google_advanced,google_code,google_groups,google_images,google_lucky,google_maps,google_movie,google_news,gracenote,imdb,jeeves,katatudo,magnatune,metacrawler,msdn,nl-telephone,nl-teletekst,python,rpmfind,tvtome,uspto,vimeo,vivisimo,voila,yahoo,yahoo_image,yahoo_local,yahoo_shopping,yahoo_video,youtube}.desktop
+ rm -v kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders/{7digital,acronym,amazon{,_mp3},amg,backports,baidu,bing,blip,cia,dbug,deb,duckduckgo{,_info,_shopping},facebook,ecosia,feedster,flickr,flickrcc,google,google_advanced,google_code,google_groups,google_images,google_lucky,google_maps,google_movie,google_news,imdb,jamendo,jeeves,magnatune,metacrawler,msdn,nl-telephone,nl-teletekst,python,rpmfind,tvtome,uspto,vimeo,voila,yahoo,yahoo_image,yahoo_local,yahoo_shopping,yahoo_video,youtube}.desktop
# Adding DuckDuckGo HTML
cp -v duckduckgo_html.desktop "kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders"
@@ -42,19 +46,19 @@ build() {
# Adding DuckDuckGo Lite
cp -v duckduckgo_lite.desktop "kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders"
- mkdir build
cd build
cmake ../kde-runtime-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DKDE4_BUILD_TESTS=OFF \
-DCMAKE_SKIP_RPATH=ON \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DWITH_QNtrack=OFF -DSAMBA_INCLUDE_DIR=/usr/include/samba-4.0
+ -DWITH_QNtrack=OFF \
+ -DSAMBA_INCLUDE_DIR=/usr/include/samba-4.0
make
}
package() {
- cd "$srcdir/build"
+ cd build
make DESTDIR="$pkgdir" install
rm -f "${pkgdir}/usr/share/icons/hicolor/index.theme"
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index 1a5692b89..c046bd4ce 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 191727 2013-07-29 18:37:46Z andrea $
+# $Id: PKGBUILD 192541 2013-08-13 18:47:05Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org
# Contributor: Pierre Schmitz <pierre@archlinux.de>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
_pkgname=kdelibs
pkgname=kdelibs-libre
-pkgver=4.10.5
-pkgrel=2
+pkgver=4.11.0
+pkgrel=1
pkgdesc="KDE Core Libraries"
arch=('i686' 'x86_64' 'mips64el')
url='https://projects.kde.org/projects/kde/kdelibs'
@@ -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=('6caab0c70ab742dd711b44dd3f9bfdcbf9be31eb'
+sha1sums=('fd5bf73784497245af3c6d5b94a1a8168f95e4e4'
'86ee8c8660f19de8141ac99cd6943964d97a1ed7'
'ed1f57ee661e5c7440efcaba7e51d2554709701c'
'a1502a964081ad583a00cf90c56e74bf60121830')
diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD
index 4f4f0edf9..e5136d719 100644
--- a/libre/kdenetwork-kopete-libre/PKGBUILD
+++ b/libre/kdenetwork-kopete-libre/PKGBUILD
@@ -1,65 +1,52 @@
-# $Id: PKGBUILD 191752 2013-07-30 08:53:59Z andrea $
+# $Id: PKGBUILD 192541 2013-08-13 18:47:05Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
-pkgbase=kdenetwork
-pkgname=('kdenetwork-kopete-libre')
-pkgver=4.10.5
-pkgrel=2
+_pkgname=kdenetwork-kopete
+pkgname=kdenetwork-kopete-libre
+pkgver=4.11.0
+pkgrel=1
+pkgdesc='Instant Messenger, without skype support'
+url='http://kde.org/applications/internet/kopete/'
arch=('i686' 'x86_64' 'mips64el')
-url='http://www.kde.org'
license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdenetwork')
-makedepends=('cmake' 'automoc4' 'boost' 'speex' 'libotr3' 'ppp'
- 'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver'
- 'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn'
- 'libktorrent' 'libmms' 'telepathy-qt')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
- 'use-libotr3.patch'
- 'giflib5.patch')
-sha1sums=('3ee86a1a227593e9f37881da3c1db1a3c384b2e4'
+depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr3' '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=('a67716f14a07cdbacf3df40983db17f594eb768b'
'9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384'
- '388319373e96e6f44446ea1132c35ae9f660e01c')
+ '317683a5c2acd0a0058c5ab42f6006e9db511ef3')
prepare() {
- cd ${pkgbase}-${pkgver}
- patch -p1 -i "${srcdir}"/use-libotr3.patch
- cd kopete
- patch -p1 -i "${srcdir}"/giflib5.patch
- cd ../../
- # 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' "${pkgbase}-${pkgver}/kopete/protocols/CMakeLists.txt"
- rm -rf "${pkgbase}-${pkgver}/kopete/protocols/skype"
- sed 's/, Skype//' -i "${pkgbase}-${pkgver}/kopete/doc/index.docbook"
+ 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
}
build() {
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DKDE4_BUILD_TESTS=OFF \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DMOZPLUGIN_INSTALL_DIR=/usr/lib/mozilla/plugins/ \
- -DWITH_Xmms=OFF \
- -DWITH_LibMeanwhile=OFF \
- -DWITH_qq=OFF
- make
+ mkdir build
+ cd build
+ cmake ../kopete-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DKDE4_BUILD_TESTS=OFF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_SKIP_RPATH=ON
+ make
}
-package_kdenetwork-kopete-libre() {
- pkgdesc='Instant Messenger, without skype support'
- depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr3' 'libmsn'
- 'libidn' 'qimageblitz' 'libgadu')
- conflicts=('kdenetwork-kopete')
- provides=("kdenetwork-kopete=${pkgver}")
- replaces=('kdenetwork-kopete')
- url="http://kde.org/applications/internet/kopete/"
- install='kdenetwork-kopete.install'
- cd $srcdir/build/kopete
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kopete/doc
- make DESTDIR=$pkgdir install
+package() {
+ cd build
+ make DESTDIR=$pkgdir install
}
diff --git a/libre/kdenetwork-kopete-libre/giflib5.patch b/libre/kdenetwork-kopete-libre/giflib5.patch
deleted file mode 100644
index 231aefbc2..000000000
--- a/libre/kdenetwork-kopete-libre/giflib5.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From: Raymond Wooninck <tittiatcoke@gmail.com>
-Date: Sun, 17 Mar 2013 12:24:09 +0000
-Subject: Enable building with giflib v5
-X-Git-Tag: v4.10.80
-X-Git-Url: http://quickgit.kde.org/?p=kopete.git&a=commitdiff&h=47ceec53aa5ee6b84a753fdbf735e44558513fe2
----
-Enable building with giflib v5
-
-REVIEW: 7066
-
-svn path=/trunk/KDE/kdenetwork/kopete/; revision=1344846
----
-
-
---- a/protocols/wlm/wlmchatsession.cpp
-+++ b/protocols/wlm/wlmchatsession.cpp
-@@ -65,6 +65,10 @@
- #include "wlmchatsessioninkaction.h"
- #ifdef HAVE_GIFLIB
- #include <gif_lib.h>
-+/* old giflib has no GIFLIB_MAJOR, define to avoid cpp warnings */
-+#ifndef GIFLIB_MAJOR
-+#define GIFLIB_MAJOR 4
-+#endif
- #endif
-
- WlmChatSession::WlmChatSession (Kopete::Protocol * protocol,
-@@ -467,11 +471,15 @@
- {
- #ifdef HAVE_GIFLIB
- #ifdef HAVE_GIF_ERROR_STRING // giflib 4.2.0+
-+#if GIFLIB_MAJOR >= 5
-+ fprintf(stderr, "GIF-LIB error (exact reporting not implemented)\n");
-+#else
- const char * errorString = GifErrorString();
- if (errorString)
- fprintf(stderr, "GIF-LIB error: %s\n", errorString);
- else
- fprintf(stderr, "GIF-LIB undefined error: %d\n", GifError());
-+#endif
- #else // older giflib versions, libungif
- PrintGifError();
- #endif // HAVE_GIF_ERROR_STRING
-@@ -483,6 +491,10 @@
- WlmChatSession::convertToGif( const QPixmap & ink, QString filename)
- {
- #ifdef HAVE_GIFLIB
-+#if GIFLIB_MAJOR >= 5
-+#define FreeMapObject GifFreeMapObject
-+#define MakeMapObject GifMakeMapObject
-+#endif
- int i, status;
- GifFileType *GifFile;
- ColorMapObject *screenColourmap;
-@@ -525,7 +537,11 @@
- }
- }
-
-+#if GIFLIB_MAJOR >= 5
-+ GifFile= EGifOpenFileName(QFile::encodeName(filename).constData(), 0, NULL);
-+#else
- GifFile= EGifOpenFileName(QFile::encodeName(filename).constData(), 0);
-+#endif
- if (!GifFile) {
- FreeMapObject(imageColourmap);
- FreeMapObject(screenColourmap);
-
diff --git a/libre/kdenetwork-kopete-libre/use-libotr3.patch b/libre/kdenetwork-kopete-libre/libotr3.patch
index 1e96c98d6..1e96c98d6 100644
--- a/libre/kdenetwork-kopete-libre/use-libotr3.patch
+++ b/libre/kdenetwork-kopete-libre/libotr3.patch
diff --git a/libre/kdenetwork-kopete-libre/mediastreamer29.patch b/libre/kdenetwork-kopete-libre/mediastreamer29.patch
new file mode 100644
index 000000000..eb0b2297e
--- /dev/null
+++ b/libre/kdenetwork-kopete-libre/mediastreamer29.patch
@@ -0,0 +1,22 @@
+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 3f9b3ce28..3d7c5e7fc 100644
--- a/libre/kdepim-libre/PKGBUILD
+++ b/libre/kdepim-libre/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 189302 2013-07-02 21:26:19Z andrea $
+# $Id: PKGBUILD 192541 2013-08-13 18:47:05Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
-
_pkgbase=kdepim
+
pkgbase=kdepim-libre
pkgname=('kdepim-akonadiconsole-libre'
'kdepim-akregator-libre'
@@ -22,16 +22,16 @@ pkgname=('kdepim-akonadiconsole-libre'
'kdepim-ktimetracker-libre'
'kdepim-ktnef-libre'
'kdepim-libkdepim-libre')
-pkgver=4.10.5
+pkgver=4.11.0
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://pim.kde.org'
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")
-sha1sums=('a7c791e748558a194d020104dc62604ee9f632ae')
+ 'kde-agent' 'nepomuk-widgets' 'link-grammar')
+source=("http://download.kde.org/stable/${pkgver}/src/${_pkgbase}-${pkgver}.tar.xz")
+sha1sums=('e71f685a06acef59f49540fba763541fb4b9f5a5')
build() {
mkdir build
@@ -75,7 +75,7 @@ package_kdepim-akregator-libre() {
package_kdepim-blogilo-libre() {
pkgdesc='A KDE Blogging Client, without nonfree pilot-link support'
- depends=('kdepim-runtime')
+ depends=('kdepim-libkdepim')
url="http://kde.org/applications/internet/blogilo/"
replaces=('kdepim-blogilo' 'blogilo')
conflicts=('kdepim-blogilo' 'blogilo')
@@ -85,6 +85,8 @@ package_kdepim-blogilo-libre() {
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() {
@@ -177,7 +179,7 @@ package_kdepim-kmail-libre() {
provides=("kdepim-kmail=${pkgver}")
for i in kmail doc/kmail kmailcvt archivemailagent \
importwizard ksendemail libksieve messagelist mailfilteragent \
- ontologies kontact/plugins/kmail; do
+ ontologies kontact/plugins/kmail headerthemeeditor sendlateragent; do
cd "${srcdir}"/build/${i}
make DESTDIR="${pkgdir}" install
done
@@ -289,18 +291,18 @@ package_kdepim-ktnef-libre() {
package_kdepim-libkdepim-libre() {
pkgdesc='Library for KDE PIM, without nonfree pilot-link support'
groups=()
- depends=('kde-agent' 'kdepim-runtime')
+ depends=('kde-agent' 'kdepim-runtime' 'link-grammar')
url='http://pim.kde.org'
conflicts=('kdepim-libkdepim' 'kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
- 'kdepim-strigi-analyzer' 'kdepim-akonadi')
+ 'kdepim-akonadi')
replaces=('kdepim-libkdepim' 'kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
- 'kdepim-strigi-analyzer' 'kdepim-akonadi')
+ '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 strigi-analyzer templateparser plugins/messageviewer \
- plugins/ktexteditor pimcommon pimsettingexporter; do
+ icons templateparser plugins/messageviewer grammar \
+ 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 5efee348d..1d58e5f89 100644
--- a/libre/kdeutils-ark-libre/PKGBUILD
+++ b/libre/kdeutils-ark-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 189302 2013-07-02 21:26:19Z andrea $
+# $Id: PKGBUILD 192541 2013-08-13 18:47:05Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
_pkgname=kdeutils-ark
pkgname=kdeutils-ark-libre
-pkgver=4.10.5
+pkgver=4.11.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=('8c50a864af0dbf62e3df46414c7bf9cd1d8c8620'
+sha1sums=('aa8e91d415096a55ad910dad83f7eb6abdf88f1f'
'a0a836950f185d9b2245204579f969203036fdec')
build() {
diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD
deleted file mode 100644
index de69239f6..000000000
--- a/libre/linux-libre-kmod-alx/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Maintainer: André Silva <emulatorman@lavabit.com>
-
-_kernver=3.9.9
-_kernrel=1
-pkgname=('linux-libre-kmod-alx')
-_version=v3.9-rc4
-_pkgver=3.9-rc4-2-su
-pkgver=3.9rc4.2
-pkgrel=10
-pkgdesc='Atheros alx ethernet device driver for linux-libre kernel'
-arch=('i686' 'x86_64')
-url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
-license=('GPL2')
-depends=("linux-libre=$_kernver-$_kernrel")
-makedepends=("linux-libre-headers=$_kernver-$_kernrel")
-install=linux-libre-kmod-alx.install
-replaces=('alx' 'alx-driver' 'dkms-alx')
-provides=('alx' 'alx-driver' 'dkms-alx')
-conflicts=('alx' 'alx-driver' 'dkms-alx')
-source=(http://www.kernel.org/pub/linux/kernel/projects/backports/stable/$_version/compat-drivers-$_pkgver.tar.xz)
-
-md5sums=('a00e82e212fe7533c9059e5b78cc3c1c')
-
-
-package() {
- # current extramodules version
- _extraver=extramodules-3.9-LIBRE
-
- cd $srcdir/compat-drivers-$_pkgver
-
- # replacing to specific linux-libre kernel version
- sed -i -e "s/lib\/modules\/\$(shell uname -r)/usr\/lib\/modules\/$_kernver-$_kernrel-LIBRE/" Makefile
-
- ./scripts/driver-select alx
- make
- cd $srcdir/compat-drivers-$_pkgver/compat
- gzip -9 compat.ko
- install -D -m 0644 compat.ko.gz $pkgdir/lib/modules/$_extraver/compat.ko.gz
- cd $srcdir/compat-drivers-$_pkgver/drivers/net/ethernet/atheros/alx
- gzip -9 alx.ko
- install -D -m 0644 alx.ko.gz $pkgdir/lib/modules/$_extraver/alx.ko.gz
-}
diff --git a/libre/linux-libre-kmod-alx/linux-libre-kmod-alx.install b/libre/linux-libre-kmod-alx/linux-libre-kmod-alx.install
deleted file mode 100644
index 069348192..000000000
--- a/libre/linux-libre-kmod-alx/linux-libre-kmod-alx.install
+++ /dev/null
@@ -1,32 +0,0 @@
-generic() {
- echo " > Running depmod now..."
- depmod -a
-}
-
-unload() {
- lsmod | grep alx > /dev/null
- if [ "$?" = "0" ]; then
- rmmod alx
- fi
-}
-
-post_install() {
- generic
- echo " > Reloading alx module..."
- echo " Please note that you may REBOOT your system to get it works!"
- unload
- sleep 0.5
- modprobe alx
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- generic
- echo " > Unloading memory resident module..."
- unload
- rmmod compat
- echo " Module unloaded!."
-}
diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD
index 97c2ebe12..00714409a 100644
--- a/libre/linux-libre-lts-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD
@@ -1,12 +1,12 @@
# Maintainer: André Silva <emulatorman@lavabit.com>
-_kernver=3.0.90
+_kernver=3.0.91
_kernrel=1
pkgname=('linux-libre-lts-kmod-alx')
_version=v3.9-rc4
_pkgver=3.9-rc4-2-su
pkgver=3.9rc4.2
-pkgrel=13
+pkgrel=14
pkgdesc='Atheros alx ethernet device driver for Linux-libre-lts kernel'
arch=('i686' 'x86_64')
url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index aff90a342..fc8e94f77 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 192456 2013-08-12 08:25:27Z tpowa $
+# $Id: PKGBUILD 193105 2013-08-16 10:56:05Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Thomas Baechler <thomas@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -8,10 +8,10 @@
pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.0
-_sublevel=90
+_sublevel=91
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
-_lxopkgver=${_basekernel}.89 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.91 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -33,7 +33,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'module-init-wait-3.0.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu1_0loongsonlibre_mipsel.tar.bz2")
md5sums=('f30a562307b6f71204370fcd33756466'
- '70f76d2855affd72b4854fbb5de9005f'
+ 'cb479cc4ee4709804bf65677c4178985'
'7373cc3ac66342156a7fc32af8577b46'
'b7229f80282337979514f9640a969ff5'
'c072b17032e80debc6a8626299245d46'
@@ -45,7 +45,7 @@ md5sums=('f30a562307b6f71204370fcd33756466'
'f36222e7ce20c8e4dc27376f9be60f6c'
'670931649c60fcb3ef2e0119ed532bd4'
'8a71abc4224f575008f974a099b5cf6f'
- '9ec540e23a40c8d0c615c8ebf8d354f8')
+ '0acdb5346ba868c3a1819f36902ef562')
if [ "$CARCH" != "mips64el" ]; then
# don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
diff --git a/libre/linux-libre/3.10.6-reset-superseed-xhci-hcd.patch b/libre/linux-libre/3.10.6-reset-superseed-xhci-hcd.patch
deleted file mode 100644
index 0415b8a1e..000000000
--- a/libre/linux-libre/3.10.6-reset-superseed-xhci-hcd.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-[PATCH] SCSI: Don't attempt to send extended INQUIRY command if skip_vpd_pages is set
-
-If a device has the skip_vpd_pages flag set we should simply fail the
-scsi_get_vpd_page() call.
-
-Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-Acked-by: Alan Stern <stern@rowland.harvard.edu>
-Tested-by: Stuart Foster <smf.linux@ntlworld.com>
-Cc: stable@vger.kernel.org
-
-diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
-index 3b1ea34..eaa808e 100644
---- a/drivers/scsi/scsi.c
-+++ b/drivers/scsi/scsi.c
-@@ -1031,6 +1031,9 @@ int scsi_get_vpd_page(struct scsi_device *sdev, u8 page, unsigned char *buf,
- {
- int i, result;
-
-+ if (sdev->skip_vpd_pages)
-+ goto fail;
-+
- /* Ask for all the pages supported by this device */
- result = scsi_vpd_inquiry(sdev, buf, 0, buf_len);
- if (result)
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 4124814f4..b45052181 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 192495 2013-08-13 09:26:23Z tpowa $
+# $Id: PKGBUILD 193106 2013-08-16 10:56:45Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Thomas Baechler <thomas@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -10,10 +10,10 @@
pkgbase=linux-libre # Build stock -LIBRE kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.10
-_sublevel=6
+_sublevel=7
pkgver=${_basekernel}.${_sublevel}
-pkgrel=2
-_lxopkgver=${_basekernel}.6 # nearly always the same as pkgver
+pkgrel=1
+_lxopkgver=${_basekernel}.7 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -31,10 +31,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'change-default-console-loglevel.patch'
'criu-no-expert.patch'
'3.10.6-logitech-dj.patch'
- '3.10.6-reset-superseed-xhci-hcd.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
- '63a1c2aba22871f8e8dacdb4968d9a1f'
+ '8d05dec5772b17c4c21c00b93da42bd8'
'8ec987449e0e42a1c98d8ce92b9019c2'
'8efbd1f17f37bdaa8649c8a63761bf07'
'e49ac236dfeef709f91a3d993ea7b62c'
@@ -44,8 +43,7 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
'f3def2cefdcbb954c21d8505d23cc83c'
'd50c1ac47394e9aec637002ef3392bd1'
'3ff40ca684cfe719723e627e2cef7cea'
- 'e751378a3e94532bfe85fb82c80e26c0'
- '0f0e9441467a3eca33e23ebb75709f06')
+ '797e952fb0a168c0c1822acc0fac67bc')
if [ "$CARCH" != "mips64el" ]; then
# don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
@@ -77,9 +75,6 @@ prepare() {
# fix https://bugs.archlinux.org/task/35991 - [linux] 3.10.x renders Logitech Unified Receivers useless
patch -Np1 -i "${srcdir}/3.10.6-logitech-dj.patch"
- # fix https://bugs.archlinux.org/task/36296 - [linux] 3.10.3 reset SuperSpeed USB using xhci_hcd
- patch -Np1 -i "${srcdir}/3.10.6-reset-superseed-xhci-hcd.patch"
-
if [ "$CARCH" == "mips64el" ]; then
sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile
sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index a3f93412c..a5e5212b1 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 192454 2013-08-12 07:02:21Z tpowa $
+# $Id: PKGBUILD 193099 2013-08-16 10:37:27Z tpowa $
# Maintainer: Paul Mattal <paul@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,7 +6,7 @@ _pkgbase=lirc
pkgbase=lirc-libre
pkgname=('lirc-libre' 'lirc-utils-libre')
pkgver=0.9.0
-pkgrel=55
+pkgrel=56
epoch=1
_extramodules=extramodules-3.10-LIBRE
arch=('i686' 'x86_64' 'mips64el')
diff --git a/libre/mozilla-searchplugins/PKGBUILD b/libre/mozilla-searchplugins/PKGBUILD
index 047157b2b..6721ff845 100644
--- a/libre/mozilla-searchplugins/PKGBUILD
+++ b/libre/mozilla-searchplugins/PKGBUILD
@@ -9,8 +9,8 @@
# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com>
pkgname=mozilla-searchplugins
-pkgver=1.3
-pkgrel=6
+pkgver=1.4
+pkgrel=1
pkgdesc="System-wide OpenSearch plugins common for Mozilla based browsers."
arch=('any')
license=('MPL' 'GPL' 'LGPL')
@@ -19,8 +19,6 @@ source=(
duckduckgo-html.xml
duckduckgo-lite.xml
internet-archive.xml
- jamendo-en.xml.in
- jamendo.ico::http://www.jamendo.com/favicon.ico
parabola-packages.xml::https://parabolagnulinux.org/opensearch/packages/
parabola-wiki-en.xml::
seeks-search.xml::http://seeks.zat.im/opensearch.xml
@@ -29,11 +27,6 @@ source=(
wikipedia-en.xml::https://en.wikipedia.org/w/opensearch_desc.php
)
-build() {
- cd "$srcdir"
- sed "s,@icon@,$(base64 -w0 < jamendo.ico)," < jamendo-en.xml.in > jamendo-en.xml
-}
-
package() {
install -m755 -d "${pkgdir}/usr/lib/mozilla/searchplugins"
install -m644 "${srcdir}"/*.xml "${pkgdir}/usr/lib/mozilla/searchplugins"
@@ -42,10 +35,8 @@ package() {
md5sums=('b4cc6bd8353af36ade441916217619e4'
'766aa6def4bf63c0d65afd6ca1b1ce37'
'462c68585461f8cdc23c93c46f6ee4cf'
- '0c9a3f48971aab8aa0cf2f5e2ff67292'
- 'e50a847cec81357e8730e0d327515a9c'
'92f834a3a1d85c9ae202955cdfe941eb'
'b9a0893d7f6d41d755c478fd60c44be8'
'76df72680069a41a476539213a569302'
- '72fb54e996c42e9a66ef4bbe41070823'
+ '0f6cb4119f54e90d678827e2928474d4'
'dbdd9b61e89d73cc3a70cbe20a1160e1')
diff --git a/libre/mozilla-searchplugins/jamendo-en.xml.in b/libre/mozilla-searchplugins/jamendo-en.xml.in
deleted file mode 100644
index 96b3a008d..000000000
--- a/libre/mozilla-searchplugins/jamendo-en.xml.in
+++ /dev/null
@@ -1,10 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Jamendo (en)</os:ShortName>
-<os:Description>Search Jamendo.com English site for downloadable Creative Commons music</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon;base64,@icon@</os:Image>
-<UpdateUrl>http://mycroft.mozdev.org/updateos.php/id0/jamendo.xml</UpdateUrl>
-<SearchForm>http://www.jamendo.com/en</SearchForm>
-<os:Url type="text/html" method="GET" template="http://www.jamendo.com/en/search#qs=q={searchTerms}">
-</os:Url>
-</SearchPlugin>
diff --git a/libre/mozilla-searchplugins/yacy.xml b/libre/mozilla-searchplugins/yacy.xml
index 2ac5f4996..9c97f16cc 100644
--- a/libre/mozilla-searchplugins/yacy.xml
+++ b/libre/mozilla-searchplugins/yacy.xml
@@ -4,7 +4,7 @@
xmlns:suggestions="http://www.opensearch.org/specifications/opensearch/extensions/suggestions/1.1">
<ShortName>YaCy</ShortName>
<LongName>YaCy.net - P2P Web Search</LongName>
- <Image type="image/gif">http://search.ipredator.se:8090/env/grafics/yacy.png</Image>
+ <Image type="image/gif">http://search.ipredator.se/env/grafics/yacy.png</Image>
<Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAAAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////Chiu+fBm+fRq+fRq+fRq+fRq+fRq8ehXMmk////////////////////////////++exjUqGfZsnjYsXbYsXbYsXbZsnjTp2W+fBr///////////////////////////+9exfs2r/69/L58+z58+z58+z59e/z59bChSn///////////////////////////+9fBnnz638+fX69O369e748un38Ob59O3Ll0fVrGz////////////////////////Jk0HJlUjXuYrWt4jVtYPr28T58+r59OzPn1fPnlX////////////////////////Rolu8eRXCiTPEjTvCijbNnlj169359e7Zs3vLlkf////////////////////////UqmrAgSLt3MP27eH1693169327+T59Ozo0rG/gB////////////////////////////+/gCDv4Mn48+v38Of59Oz58+v48+vr2b2+fRv///////////////////////////+9ehXr17n58+z48ejo0bDp07T48+zx49DBhCj///////////////////////////+/fhzjyJ/59Oz59OzQoVvNmU759Oz58+vKlUbXrnH////////////////////////LlkfUqmn59Oz48+vZtHzNm1D48+v59OzPoFjOnlX////////////////////////OnVPOnFL59e348+vq1rnEiC7u38j69vDXsHTIkT3////////////////////////UqWjIkD327+T58+3s2bzAgSLp07T79/Pmzqq+fBn///////////////////////////+/fx7v4Mr7+PTx5NDHkD3kyqP8+vjs2r+9exf///////////////////////////++fBjQoFnVq2zTp2bGjTjJk0LWrW7SpWC+exf////////////////////////////Nm1C6dQy7eBG8eBK9exe8ehS7dxC6dQzLlkj////////////AH///wB8x+sAf///AD/+PwA///8AP///AD///4A9PU+APoz/gB///4AdxvOAHoz/gB3368AfjU/AHT1PwB/+P
</Image>
<Language>en-us</Language>
@@ -13,16 +13,16 @@
<AdultContent>true</AdultContent>
<Description>YaCy is an open-source GPL-licensed software that can be used for stand-alone search engine installations or as a client for a multi-user P2P-based web indexing cluster. This is the access to peer '_anonufe-29422893-0'.</Description>
- <Url type="text/html" method="GET" template="http://search.ipredator.se:8090/yacysearch.html?query={searchTerms}&amp;startRecord={startIndex?}&amp;maximumRecords={count?}&amp;nav=all" />
- <Url type="application/rss+xml" method="GET" template="http://search.ipredator.se:8090/yacysearch.rss?nav=&amp;query={searchTerms}&amp;startRecord={startIndex?}&amp;maximumRecords={count?}&amp;verify=false" />
+ <Url type="text/html" method="GET" template="http://search.ipredator.se/yacysearch.html?query={searchTerms}&amp;startRecord={startIndex?}&amp;maximumRecords={count?}&amp;nav=all" />
+ <Url type="application/rss+xml" method="GET" template="http://search.ipredator.se/yacysearch.rss?nav=&amp;query={searchTerms}&amp;startRecord={startIndex?}&amp;maximumRecords={count?}&amp;verify=false" />
- <Url type="application/x-suggestions+json" template="http://search.ipredator.se:8090/suggest.json?query={searchTerms}"/>
- <Url type="application/x-suggestions+xml" template="http://search.ipredator.se:8090/suggest.xml?query={searchTerms}"/>
+ <Url type="application/x-suggestions+json" template="http://search.ipredator.se/suggest.json?query={searchTerms}"/>
+ <Url type="application/x-suggestions+xml" template="http://search.ipredator.se/suggest.xml?query={searchTerms}"/>
<!-- syntax according to http://www.loc.gov/standards/sru/. Set verify=true to get snippets in the search results -->
<Developer>See https://gitorious.org/+yacy-developers</Developer>
<Query role="example" searchTerms="yacy+open+source" />
<Tags>YaCy Open Source P2P Web Search</Tags>
- <Contact>See http://search.ipredator.se:8090/ViewProfile.html?hash=localhash</Contact>
+ <Contact>See http://search.ipredator.se/ViewProfile.html?hash=localhash</Contact>
<Attribution>YaCy Software &amp;copy; 2004-2012 by Michael Christen et al., YaCy.net; Content: ask peer owner</Attribution>
<SyndicationRight>open</SyndicationRight>
</OpenSearchDescription>
diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD
index 075b584cc..04773b21a 100644
--- a/libre/tp_smapi-libre/PKGBUILD
+++ b/libre/tp_smapi-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 95429 2013-08-12 07:16:37Z tpowa $
+# $Id: PKGBUILD 95735 2013-08-16 09:00:08Z tpowa $
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: xduugu
# Contributor: nh2
@@ -12,7 +12,7 @@
_pkgname=tp_smapi
pkgname=tp_smapi-libre
pkgver=0.41
-pkgrel=30
+pkgrel=31
pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)"
arch=('i686' 'x86_64' 'mips64el')
url='https://github.com/evgeni/tp_smapi'
diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
index 09495f984..d0a47e872 100644
--- a/libre/vhba-module-libre/PKGBUILD
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 95431 2013-08-12 07:16:54Z tpowa $
+# $Id: PKGBUILD 95737 2013-08-16 09:00:28Z tpowa $
# Maintainer: Ray Rashif <schiv@archlinux.org>
# Contributor: Mateusz Herych <heniekk@gmail.com>
# Contributor: Charles Lindsay <charles@chaoslizard.org>
@@ -8,7 +8,7 @@ _pkgname=vhba-module
pkgname=vhba-module-libre
pkgver=20130607
_extramodules=extramodules-3.10-LIBRE
-pkgrel=9
+pkgrel=10
pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)"
arch=('i686' 'x86_64' 'mips64el')
url="http://cdemu.sourceforge.net/"