diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-01-01 16:37:20 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-01-01 16:37:20 -0300 |
| commit | 6124dfa10e2a69fc79efc85f611c8db582caf711 (patch) | |
| tree | e9706ae64164967e8448140e9cb6534dfbb0a2a3 /extra | |
| parent | 385fda403f286573a778ee525fe56a86d11fc967 (diff) | |
| parent | 5a81550adad5ccde4ad6924cfee2b2ef96d02c98 (diff) | |
Merge branch 'master' of gparabola:abslibre/abslibre-pre-mips64el
Conflicts:
community/almanah/PKGBUILD
community/audit/PKGBUILD
community/bird/PKGBUILD
community/blobby2/PKGBUILD
community/blueman/PKGBUILD
community/bomberclone/PKGBUILD
community/botan/PKGBUILD
community/cantata/PKGBUILD
community/cinnamon-desktop/PKGBUILD
community/cinnamon-settings-daemon/PKGBUILD
community/cinnamon/PKGBUILD
community/clearsilver/PKGBUILD
community/clinica/PKGBUILD
community/confuse/PKGBUILD
community/deadbeef/PKGBUILD
community/dvdrtools/PKGBUILD
community/etl/PKGBUILD
community/extremetuxracer/PKGBUILD
community/fcitx-mozc/PKGBUILD
community/flashrom/PKGBUILD
community/freedroidrpg/PKGBUILD
community/gcolor2/PKGBUILD
community/geary/PKGBUILD
community/glob2/PKGBUILD
community/gnash/PKGBUILD
community/gnome-commander/PKGBUILD
community/gnome-settings-daemon-updates/PKGBUILD
community/gnuchess/PKGBUILD
community/haskell-bytestring-show/PKGBUILD
community/haskell-hslogger/PKGBUILD
community/haskell-vector/PKGBUILD
community/hedgewars/PKGBUILD
community/hitori/PKGBUILD
community/inputattach/PKGBUILD
community/jack2/PKGBUILD
community/kid3/PKGBUILD
community/lcdproc/PKGBUILD
community/libcec/PKGBUILD
community/libvirt/PKGBUILD
community/libwww/PKGBUILD
community/lightdm/PKGBUILD
community/lincity-ng/PKGBUILD
community/linux-tools/PKGBUILD
community/linuxtv-dvb-apps/PKGBUILD
community/lockdev/PKGBUILD
community/log4cpp/PKGBUILD
community/love/PKGBUILD
community/luajit/PKGBUILD
community/lxc/PKGBUILD
community/metamail/PKGBUILD
community/mingw32-binutils/PKGBUILD
community/mingw32-gcc/PKGBUILD
community/mingw32-pthreads/PKGBUILD
community/mongodb/PKGBUILD
community/nemo/PKGBUILD
community/par2cmdline/PKGBUILD
community/pdfedit/PKGBUILD
community/perl-json-xs/PKGBUILD
community/pidgin-talkfilters/PKGBUILD
community/pokerth/PKGBUILD
community/setconf/PKGBUILD
community/stfl/PKGBUILD
community/talkfilters/PKGBUILD
community/tre/PKGBUILD
community/ubuntuone-client-gnome/PKGBUILD
community/ubuntuone-client/PKGBUILD
community/vor/PKGBUILD
community/warmux/PKGBUILD
community/wdm/PKGBUILD
community/xbmc-pvr-addons/PKGBUILD
core/gcc/PKGBUILD
core/lvm2/PKGBUILD
core/systemd/PKGBUILD
core/sysvinit-tools/PKGBUILD
extra/aubio/PKGBUILD
extra/avidemux/PKGBUILD
extra/bluez4/PKGBUILD
extra/boost/PKGBUILD
extra/calligra/PKGBUILD
extra/caribou/PKGBUILD
extra/chemtool/PKGBUILD
extra/cinepaint/PKGBUILD
extra/conky/PKGBUILD
extra/cups/PKGBUILD
extra/enlightenment16/PKGBUILD
extra/exo/PKGBUILD
extra/fakechroot/PKGBUILD
extra/farstream-0.1/PKGBUILD
extra/ffmpeg-compat/PKGBUILD
extra/fltk/PKGBUILD
extra/git/PKGBUILD
extra/gpart/PKGBUILD
extra/gstreamer0.10-base/PKGBUILD
extra/gstreamer0.10-ffmpeg/PKGBUILD
extra/gstreamer0.10-good/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/gtk-vnc/PKGBUILD
extra/haveged/PKGBUILD
extra/icewm/PKGBUILD
extra/imagemagick/PKGBUILD
extra/kactivities/PKGBUILD
extra/kdeaccessibility-jovie/PKGBUILD
extra/kdeaccessibility-kaccessible/PKGBUILD
extra/kdeaccessibility-kmag/PKGBUILD
extra/kdeaccessibility-kmousetool/PKGBUILD
extra/kdeaccessibility-kmouth/PKGBUILD
extra/kdeadmin-kcron/PKGBUILD
extra/kdeadmin-ksystemlog/PKGBUILD
extra/kdeadmin-kuser/PKGBUILD
extra/kdeartwork/PKGBUILD
extra/kdebase-konsole/PKGBUILD
extra/kdebase-workspace/PKGBUILD
extra/kdebase/PKGBUILD
extra/kdebindings-kimono/PKGBUILD
extra/kdebindings-korundum/PKGBUILD
extra/kdebindings-kross/PKGBUILD
extra/kdebindings-perlkde/PKGBUILD
extra/kdebindings-perlqt/PKGBUILD
extra/kdebindings-python/PKGBUILD
extra/kdebindings-qtruby/PKGBUILD
extra/kdebindings-qyoto/PKGBUILD
extra/kdebindings-smokegen/PKGBUILD
extra/kdebindings-smokekde/PKGBUILD
extra/kdebindings-smokeqt/PKGBUILD
extra/kdeedu-analitza/PKGBUILD
extra/kdeedu-blinken/PKGBUILD
extra/kdeedu-cantor/PKGBUILD
extra/kdeedu-kalgebra/PKGBUILD
extra/kdeedu-kalzium/PKGBUILD
extra/kdeedu-kanagram/PKGBUILD
extra/kdeedu-kbruch/PKGBUILD
extra/kdeedu-kgeography/PKGBUILD
extra/kdeedu-khangman/PKGBUILD
extra/kdeedu-kig/PKGBUILD
extra/kdeedu-kiten/PKGBUILD
extra/kdeedu-klettres/PKGBUILD
extra/kdeedu-kmplot/PKGBUILD
extra/kdeedu-kstars/PKGBUILD
extra/kdeedu-ktouch/PKGBUILD
extra/kdeedu-kturtle/PKGBUILD
extra/kdeedu-kwordquiz/PKGBUILD
extra/kdeedu-marble/PKGBUILD
extra/kdeedu-pairs/PKGBUILD
extra/kdeedu-parley/PKGBUILD
extra/kdeedu-rocs/PKGBUILD
extra/kdeedu-step/PKGBUILD
extra/kdegames-bomber/PKGBUILD
extra/kdegames-bovo/PKGBUILD
extra/kdegames-granatier/PKGBUILD
extra/kdegames-kapman/PKGBUILD
extra/kdegames-katomic/PKGBUILD
extra/kdegames-kblackbox/PKGBUILD
extra/kdegames-kblocks/PKGBUILD
extra/kdegames-kbounce/PKGBUILD
extra/kdegames-kbreakout/PKGBUILD
extra/kdegames-kdiamond/PKGBUILD
extra/kdegames-kfourinline/PKGBUILD
extra/kdegames-kgoldrunner/PKGBUILD
extra/kdegames-kigo/PKGBUILD
extra/kdegames-killbots/PKGBUILD
extra/kdegames-kiriki/PKGBUILD
extra/kdegames-kjumpingcube/PKGBUILD
extra/kdegames-klickety/PKGBUILD
extra/kdegames-klines/PKGBUILD
extra/kdegames-kmahjongg/PKGBUILD
extra/kdegames-kmines/PKGBUILD
extra/kdegames-knavalbattle/PKGBUILD
extra/kdegames-knetwalk/PKGBUILD
extra/kdegames-kolf/PKGBUILD
extra/kdegames-kollision/PKGBUILD
extra/kdegames-konquest/PKGBUILD
extra/kdegames-kpatience/PKGBUILD
extra/kdegames-kreversi/PKGBUILD
extra/kdegames-kshisen/PKGBUILD
extra/kdegames-ksirk/PKGBUILD
extra/kdegames-ksnakeduel/PKGBUILD
extra/kdegames-kspaceduel/PKGBUILD
extra/kdegames-ksquares/PKGBUILD
extra/kdegames-ksudoku/PKGBUILD
extra/kdegames-ktuberling/PKGBUILD
extra/kdegames-kubrick/PKGBUILD
extra/kdegames-lskat/PKGBUILD
extra/kdegames-palapeli/PKGBUILD
extra/kdegames-picmi/PKGBUILD
extra/kdegraphics-gwenview/PKGBUILD
extra/kdegraphics-kamera/PKGBUILD
extra/kdegraphics-kcolorchooser/PKGBUILD
extra/kdegraphics-kgamma/PKGBUILD
extra/kdegraphics-kolourpaint/PKGBUILD
extra/kdegraphics-kruler/PKGBUILD
extra/kdegraphics-ksaneplugin/PKGBUILD
extra/kdegraphics-ksnapshot/PKGBUILD
extra/kdegraphics-mobipocket/PKGBUILD
extra/kdegraphics-okular/PKGBUILD
extra/kdegraphics-strigi-analyzer/PKGBUILD
extra/kdegraphics-svgpart/PKGBUILD
extra/kdegraphics-thumbnailers/PKGBUILD
extra/kdemultimedia-audiocd-kio/PKGBUILD
extra/kdemultimedia-dragonplayer/PKGBUILD
extra/kdemultimedia-ffmpegthumbs/PKGBUILD
extra/kdemultimedia-juk/PKGBUILD
extra/kdemultimedia-kmix/PKGBUILD
extra/kdemultimedia-kscd/PKGBUILD
extra/kdemultimedia-mplayerthumbs/PKGBUILD
extra/kdenetwork-filesharing/PKGBUILD
extra/kdenetwork-kdnssd/PKGBUILD
extra/kdenetwork-kget/PKGBUILD
extra/kdenetwork-kppp/PKGBUILD
extra/kdenetwork-krdc/PKGBUILD
extra/kdenetwork-krfb/PKGBUILD
extra/kdenetwork-strigi-analyzers/PKGBUILD
extra/kdepim-runtime/PKGBUILD
extra/kdepim/PKGBUILD
extra/kdepimlibs/PKGBUILD
extra/kdeplasma-addons/PKGBUILD
extra/kdesdk-cervisia/PKGBUILD
extra/kdesdk-dev-scripts/PKGBUILD
extra/kdesdk-dev-utils/PKGBUILD
extra/kdesdk-dolphin-plugins/PKGBUILD
extra/kdesdk-kapptemplate/PKGBUILD
extra/kdesdk-kate/PKGBUILD
extra/kdesdk-kcachegrind/PKGBUILD
extra/kdesdk-kioslaves/PKGBUILD
extra/kdesdk-kompare/PKGBUILD
extra/kdesdk-lokalize/PKGBUILD
extra/kdesdk-okteta/PKGBUILD
extra/kdesdk-poxml/PKGBUILD
extra/kdesdk-strigi-analyzers/PKGBUILD
extra/kdesdk-thumbnailers/PKGBUILD
extra/kdesdk-umbrello/PKGBUILD
extra/kdetoys-amor/PKGBUILD
extra/kdetoys-kteatime/PKGBUILD
extra/kdetoys-ktux/PKGBUILD
extra/kdeutils-filelight/PKGBUILD
extra/kdeutils-kcalc/PKGBUILD
extra/kdeutils-kcharselect/PKGBUILD
extra/kdeutils-kdf/PKGBUILD
extra/kdeutils-kfloppy/PKGBUILD
extra/kdeutils-kgpg/PKGBUILD
extra/kdeutils-kremotecontrol/PKGBUILD
extra/kdeutils-ktimer/PKGBUILD
extra/kdeutils-kwallet/PKGBUILD
extra/kdeutils-print-manager/PKGBUILD
extra/kdeutils-superkaramba/PKGBUILD
extra/kdeutils-sweeper/PKGBUILD
extra/kdewebdev/PKGBUILD
extra/kino/PKGBUILD
extra/libdrm/PKGBUILD
extra/libiec61883/PKGBUILD
extra/libkcddb/PKGBUILD
extra/libkcompactdisc/PKGBUILD
extra/libkdcraw/PKGBUILD
extra/libkdeedu/PKGBUILD
extra/libkdegames/PKGBUILD
extra/libkexiv2/PKGBUILD
extra/libkipi/PKGBUILD
extra/libkmahjongg/PKGBUILD
extra/libksane/PKGBUILD
extra/libmikmod/PKGBUILD
extra/libmp4v2/PKGBUILD
extra/libnet/PKGBUILD
extra/libpst/PKGBUILD
extra/libsidplay/PKGBUILD
extra/libsigsegv/PKGBUILD
extra/libvpx/PKGBUILD
extra/libxmi/PKGBUILD
extra/lua51/PKGBUILD
extra/mariadb/PKGBUILD
extra/maxima/PKGBUILD
extra/mesa/PKGBUILD
extra/mjpegtools/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/nepomuk-core/PKGBUILD
extra/nepomuk-widgets/PKGBUILD
extra/obexd/PKGBUILD
extra/opencv/PKGBUILD
extra/perl-dbd-mysql/PKGBUILD
extra/phonon-gstreamer/PKGBUILD
extra/phonon-vlc/PKGBUILD
extra/phonon/PKGBUILD
extra/plotutils/PKGBUILD
extra/postgresql/PKGBUILD
extra/pycrypto/PKGBUILD
extra/python/PKGBUILD
extra/qt4/PKGBUILD
extra/qt5/PKGBUILD
extra/rcs/PKGBUILD
extra/rdesktop/PKGBUILD
extra/rtmpdump/PKGBUILD
extra/ruby/PKGBUILD
extra/signon/PKGBUILD
extra/sqlite/PKGBUILD
extra/vigra/PKGBUILD
extra/vim/PKGBUILD
extra/vlc/PKGBUILD
extra/w3m/PKGBUILD
extra/wcslib/PKGBUILD
extra/windowmaker/PKGBUILD
extra/x264/PKGBUILD
extra/xaos/PKGBUILD
extra/xmlto/PKGBUILD
libre/angband-libre/PKGBUILD
libre/hplip-libre/PKGBUILD
libre/kdebase-konqueror-libre/PKGBUILD
libre/kdebase-runtime-libre/PKGBUILD
libre/kdelibs-libre/PKGBUILD
libre/kdenetwork-kopete-libre/PKGBUILD
libre/kdepim-libre/PKGBUILD
libre/kdeutils-ark-libre/PKGBUILD
libre/linux-libre/PKGBUILD
libre/mc-libre/PKGBUILD
libre/xbmc-libre/PKGBUILD
nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
nonprism/kdepim-runtime-nonprism/PKGBUILD
pcr/libquvi-scripts-current/PKGBUILD
Diffstat (limited to 'extra')
670 files changed, 8549 insertions, 8369 deletions
diff --git a/extra/abook/PKGBUILD b/extra/abook/PKGBUILD index d634cb171..5bb411e97 100644 --- a/extra/abook/PKGBUILD +++ b/extra/abook/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 195248 2013-09-29 04:45:52Z bisson $ +# $Id: PKGBUILD 199323 2013-11-11 01:53:25Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Thayer Williams <thayer@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=abook -pkgver=0.6.0pre2.20130928 +pkgver=0.6.0pre2.20131110 pkgrel=1 pkgdesc='Text-based addressbook designed for use with Mutt' url='http://abook.sourceforge.net/' @@ -16,7 +16,7 @@ depends=('readline') source=("abook::git://abook.git.sourceforge.net/gitroot/abook/abook#commit=2e3d4f7341e154bf09907aabcdfe73345cc72e68" 'vcard.patch') sha1sums=('SKIP' - 'ac71e84812c5d57cb8ddaf5b03b7c25cbdf4c3db') + '7f58e32814510ae491fadaa9f06d787ccd2ecfcd') prepare() { cd "${srcdir}/${pkgname}" diff --git a/extra/abook/vcard.patch b/extra/abook/vcard.patch index 55630c1e5..f2e93a940 100644 --- a/extra/abook/vcard.patch +++ b/extra/abook/vcard.patch @@ -1,7 +1,18 @@ -diff -Naur old/filter.c new/filter.c ---- old/filter.c 2013-08-22 20:49:06.229337260 -1000 -+++ new/filter.c 2013-08-22 20:49:13.552700987 -1000 -@@ -1673,7 +1673,7 @@ +diff -aur old/filter.c new/filter.c +--- old/filter.c 2013-10-10 16:04:46.230433845 -1000 ++++ new/filter.c 2013-10-10 16:40:07.014569795 -1000 +@@ -1557,8 +1557,9 @@ + "NICKNAME", /* NICK */ + "URL", /* URL */ + "NOTE", /* NOTES */ ++ "BDAY", /* ANNIVERSARY */ + "N", /* NAME: special case/mapping in vcard_parse_line() */ +- NULL /* not implemented: ANNIVERSARY, ITEM_FIELDS */ ++ NULL /* not implemented: ITEM_FIELDS */ + }; + + enum { +@@ -1673,7 +1674,7 @@ // vCard(the country name) item_fput(item, COUNTRY, xstrdup(strsep(&value, ";"))); @@ -10,7 +21,7 @@ diff -Naur old/filter.c new/filter.c } static void -@@ -2052,6 +2052,13 @@ +@@ -2052,6 +2053,13 @@ free(name); @@ -18,7 +29,7 @@ diff -Naur old/filter.c new/filter.c + fprintf(out, "NICKNAME:%s\r\n", + safe_str(db_fget(item, NICK))); + if(db_fget(item, ANNIVERSARY)) -+ fprintf(out, "BIRTHDAY:%s\r\n", ++ fprintf(out, "BDAY:%s\r\n", + safe_str(db_fget(item, ANNIVERSARY))); + // see rfc6350 section 6.3.1 diff --git a/extra/accountsservice/PKGBUILD b/extra/accountsservice/PKGBUILD index 1dfa64b75..4161dfb34 100644 --- a/extra/accountsservice/PKGBUILD +++ b/extra/accountsservice/PKGBUILD @@ -1,17 +1,24 @@ -# $Id: PKGBUILD 197848 2013-10-30 11:14:12Z allan $ +# $Id: PKGBUILD 199022 2013-11-06 14:06:17Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=accountsservice pkgver=0.6.35 -pkgrel=1 +pkgrel=2 pkgdesc="D-Bus interface for user account query and manipulation" arch=(i686 x86_64 'mips64el') url="http://www.freedesktop.org/software/accountsservice/" license=('GPL3') depends=('glib2' 'polkit' 'systemd') makedepends=('intltool' 'gobject-introspection') -source=($url/$pkgname-$pkgver.tar.xz) -md5sums=('3a81133e95faafb603de4475802cb06a') +source=($url/$pkgname-$pkgver.tar.xz + avoid-deleting-the-root-user.patch) +md5sums=('3a81133e95faafb603de4475802cb06a' + '4970e77c3c0d56e513f9a5f29fdacd2c') + +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../avoid-deleting-the-root-user.patch +} build() { cd $pkgname-$pkgver diff --git a/extra/accountsservice/avoid-deleting-the-root-user.patch b/extra/accountsservice/avoid-deleting-the-root-user.patch new file mode 100644 index 000000000..b8dfaa931 --- /dev/null +++ b/extra/accountsservice/avoid-deleting-the-root-user.patch @@ -0,0 +1,47 @@ +From 980692e6b9cfe4a34e22f566e0981a8c549e4348 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen <mclasen@redhat.com> +Date: Fri, 01 Nov 2013 21:09:25 +0000 +Subject: Avoid deleting the root user + +The check we have in place against deleting the root user can +be tricked by exploiting the fact that we are checking a gint64, +and then later cast it to a uid_t. This can be seen with the +following test, which will delete your root account: + +qdbus --system org.freedesktop.Accounts /org/freedesktop/Accounts \ + org.freedesktop.Accounts.DeleteUser -9223372036854775808 true + +Found with the dfuzzer tool, +https://github.com/matusmarhefka/dfuzzer +--- +diff --git a/src/daemon.c b/src/daemon.c +index ea75190..9c7001b 100644 +--- a/src/daemon.c ++++ b/src/daemon.c +@@ -1227,7 +1227,7 @@ daemon_uncache_user (AccountsAccounts *accounts, + } + + typedef struct { +- gint64 uid; ++ uid_t uid; + gboolean remove_files; + } DeleteUserData; + +@@ -1309,13 +1309,13 @@ daemon_delete_user (AccountsAccounts *accounts, + Daemon *daemon = (Daemon*)accounts; + DeleteUserData *data; + +- if (uid == 0) { ++ if ((uid_t)uid == 0) { + throw_error (context, ERROR_FAILED, "Refuse to delete root user"); + return TRUE; + } + + data = g_new0 (DeleteUserData, 1); +- data->uid = uid; ++ data->uid = (uid_t)uid; + data->remove_files = remove_files; + + daemon_local_check_auth (daemon, +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/aisleriot/PKGBUILD b/extra/aisleriot/PKGBUILD index 2dc4a915a..749d47705 100644 --- a/extra/aisleriot/PKGBUILD +++ b/extra/aisleriot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 197850 2013-10-30 11:14:57Z allan $ +# $Id: PKGBUILD 199394 2013-11-11 22:17:10Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=aisleriot -pkgver=3.10.1 +pkgver=3.10.2 pkgrel=1 pkgdesc="A collection of patience games written in guile scheme" arch=(i686 x86_64 mips64el) @@ -17,7 +17,7 @@ optdepends=('libkdegames: KDE card sets' options=('!emptydirs') install=aisleriot.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) -sha256sums=('06558f1adbd6d73ba7dd5dffc864d903532a26e0c29920127a233f344423bd9a') +sha256sums=('a2a31b2b450bcb5cca9b4b82b64877b784aff52e669e84e7b99fa731f0325082') build() { cd $pkgname-$pkgver diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD index faefac4a3..1bc6e7934 100644 --- a/extra/akonadi/PKGBUILD +++ b/extra/akonadi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 196161 2013-10-07 12:32:40Z andrea $ +# $Id: PKGBUILD 201254 2013-12-07 10:34:54Z bpiotrowski $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=akonadi -pkgver=1.10.3 +pkgver=1.11.0 pkgrel=1 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data" arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,8 @@ depends=('shared-mime-info' 'boost-libs' 'mariadb' 'soprano') makedepends=('cmake' 'automoc4' 'boost' 'postgresql') optdepends=('postgresql: PostgreSQL backend') install="${pkgname}.install" -source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}-1.tar.bz2") -md5sums=('3929b765baa3dc0d548a26893c64abcf') +source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2") +md5sums=('580361613d04b260f807b2a4df099eca') prepare() { mkdir build diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD index 2d5df9f57..b2a1e16d8 100644 --- a/extra/amule/PKGBUILD +++ b/extra/amule/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 197597 2013-10-27 14:10:21Z giovanni $ +# $Id: PKGBUILD 202683 2013-12-24 15:27:05Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Henrik Ronellenfitsch <searinox@web.de> # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com> @@ -6,18 +6,18 @@ # Contributor: Anatol Pomozov <anatol.pomozov@gmail.com> pkgname=amule -pkgver=10808 -pkgrel=2 +pkgver=10827 +pkgrel=1 pkgdesc="An eMule-like client for ed2k p2p network" arch=('i686' 'x86_64' 'mips64el') url="http://www.amule.org" license=('GPL') -depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++') +depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm') install=amule.install source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2" 'amuled.systemd' 'amuleweb.systemd') -md5sums=('68099241871f4e47eee06bebc7ce20a1' +md5sums=('ca6564f1f4de16d70532308e234bde56' '59772c41860e238f1c822feb8ca8d47f' '05975c5d94bfc41fddb894d98b1115d5') diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD index 322c9b46b..f1b0d972f 100644 --- a/extra/anjuta/PKGBUILD +++ b/extra/anjuta/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 197857 2013-10-30 11:17:43Z allan $ +# $Id: PKGBUILD 199757 2013-11-15 18:34:29Z heftig $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Harley Laue <losinggeneration@yahoo.com> pkgbase=anjuta pkgname=('libanjuta' 'anjuta') -pkgver=3.10.0 +pkgver=3.10.2 pkgrel=1 pkgdesc="GNOME Integrated Development Environment (IDE)" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=(gdl vte3 autogen devhelp glade libgda subversion neon gnome-icon-th url="http://www.anjuta.org/" options=('!emptydirs') source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) -sha256sums=('72c8569fcd629f3ed1f248cfd452e1f0b473e890421679bd5bb4d6ab2ce3fedb') +sha256sums=('ff16c646dbf0234f7056c697b2546125c89d43f8c1f5138a21409053c016d3bc') build() { cd "$pkgbase-$pkgver" diff --git a/extra/apr-util/PKGBUILD b/extra/apr-util/PKGBUILD index f112d0eab..6b0501024 100644 --- a/extra/apr-util/PKGBUILD +++ b/extra/apr-util/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 197862 2013-10-30 11:19:36Z allan $ +# $Id: PKGBUILD 200761 2013-12-04 19:37:05Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=apr-util -pkgver=1.5.2 -pkgrel=3 +pkgver=1.5.3 +pkgrel=1 pkgdesc="The Apache Portable Runtime" arch=('i686' 'x86_64' 'mips64el') url="http://apr.apache.org/" depends=('apr' 'gdbm' 'expat' 'db' 'libldap' 'unixodbc') license=('APACHE') -source=("http://www.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2") -md5sums=('89c1348aa79e898d7c34a6206311c9c2') +source=(http://www.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2{,.asc}) +md5sums=('6f3417691c7a27090f36e7cf4d94b36e' + 'SKIP') build() { cd "${srcdir}/apr-util-${pkgver}" ./configure --prefix=/usr --with-apr=/usr \ --without-pgsql --without-mysql --without-sqlite2 --without-sqlite3 \ - --with-berkeley-db=/usr --with-gdbm=/usr --with-ldap --disable-static + --with-berkeley-db=/usr --with-gdbm=/usr --with-ldap make } diff --git a/extra/apr/PKGBUILD b/extra/apr/PKGBUILD index 169b2db37..41504af09 100644 --- a/extra/apr/PKGBUILD +++ b/extra/apr/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 197861 2013-10-30 11:19:15Z allan $ +# $Id: PKGBUILD 200759 2013-12-04 19:27:48Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=apr -pkgver=1.4.8 -pkgrel=2 +pkgver=1.5.0 +pkgrel=1 pkgdesc="The Apache Portable Runtime" arch=('i686' 'x86_64' 'mips64el') url="http://apr.apache.org/" depends=('util-linux') license=('APACHE') -source=(http://www.apache.org/dist/apr/apr-${pkgver}.tar.bz2) -md5sums=('ce2ab01a0c3cdb71cf0a6326b8654f41') +source=(http://www.apache.org/dist/apr/apr-${pkgver}.tar.bz2{,.asc}) +md5sums=('cc93bd2c12d0d037f68e21cc6385dc31' + 'SKIP') build() { cd "${srcdir}/apr-${pkgver}" diff --git a/extra/ardour/PKGBUILD b/extra/ardour/PKGBUILD index 856c643fd..6938cf6f4 100644 --- a/extra/ardour/PKGBUILD +++ b/extra/ardour/PKGBUILD @@ -1,12 +1,11 @@ -# $Id: PKGBUILD 197518 2013-10-26 13:26:11Z schiv $ +# $Id: PKGBUILD 202775 2013-12-27 23:05:21Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: SpepS <dreamspepser at yahoo dot it> # Contributor: see .contrib pkgname=ardour _pkgname=Ardour3 -pkgver=3.5.14 -_pkgver=3.5 +pkgver=3.5.143 pkgrel=1 pkgdesc="Professional-grade digital audio workstation" arch=('i686' 'x86_64' 'mips64el') @@ -19,18 +18,18 @@ optdepends=('xjadeo: video monitoring') install=$pkgname.install source=("ftp://ftp.archlinux.org/other/$pkgname/$_pkgname-$pkgver.tar.bz2" "$pkgname.desktop") -md5sums=('2e472cb38938a2e1fe3fb5b89d705adc' +md5sums=('52c3b8ea3ab014002e84e377f8a15097' '316bd21ece5e2208a104fd09cac521af') prepare() { - cd "$srcdir/$_pkgname-$_pkgver" + cd "$srcdir/$_pkgname-$pkgver" # python2 fix sed -i 's/python ${SRC}/python2 ${SRC}/' libs/pbd/wscript } build() { - cd "$srcdir/$_pkgname-$_pkgver" + cd "$srcdir/$_pkgname-$pkgver" # SSE code is used by default on all arches. [ "$CARCH" == "mips64el" ] && extra=--no-fpu-optimization @@ -43,7 +42,7 @@ build() { } package() { - cd "$srcdir/$_pkgname-$_pkgver" + cd "$srcdir/$_pkgname-$pkgver" python2 waf install --destdir="$pkgdir" diff --git a/extra/ardour/ardour.install b/extra/ardour/ardour.install index 36da2e3ec..44eb679f1 100644 --- a/extra/ardour/ardour.install +++ b/extra/ardour/ardour.install @@ -19,21 +19,4 @@ post_install() { MSG } -post_upgrade() { - cat << MSG - > Ardour now supports video timeline. To use this feature, please get - > static builds of the required external runtime dependencies from: - - http://x42.github.io/harvid/ - - > You may then install the binaries in /usr/local/bin and import a video - > via Session > Open Video. - - > Due to uncertainties with regards to program stability, 'harvid' is - > currently not packaged in our repositories. - - > In addition to the timeline, video can be monitored with xjadeo. -MSG -} - # vim:set ts=2 sw=2 et: diff --git a/extra/arj/001_arches_align.patch b/extra/arj/001_arches_align.patch deleted file mode 100644 index c55d17ec4..000000000 --- a/extra/arj/001_arches_align.patch +++ /dev/null @@ -1,34 +0,0 @@ -#DPATCHLEVEL=1 -diff -Naur arj-3.10.19.orig/arj_proc.c arj-3.10.19/arj_proc.c ---- arj-3.10.19.orig/arj_proc.c 2004-02-20 14:18:52.000000000 +0100 -+++ arj-3.10.22/arj_proc.c 2004-04-08 14:06:58.000000000 +0200 -@@ -2898,7 +2898,7 @@ - } - #endif - --#if defined(WORDS_BIGENDIAN)&&!defined(ARJDISP)&&!defined(REGISTER) -+#if (defined(WORDS_BIGENDIAN) || defined(ALIGN_POINTERS)) && !defined(ARJDISP) && !defined(REGISTER) - /* Model-independent routine to get 2 bytes from far RAM */ - - unsigned int mget_word(char FAR *p) -diff -Naur arj-3.10.19.orig/arj_proc.h arj-3.10.19/arj_proc.h ---- arj-3.10.19.orig/arj_proc.h 2004-01-25 01:40:00.000000000 +0100 -+++ arj-3.10.22/arj_proc.h 2004-04-08 14:07:18.000000000 +0200 -@@ -12,7 +12,7 @@ - - #define mget_byte(p) (*(unsigned char FAR *)(p)&0xFF) - #define mput_byte(c, p) *(unsigned char FAR *)(p)=(unsigned char)(c) --#ifndef WORDS_BIGENDIAN -+#if !defined(ALIGN_POINTERS) && !defined(WORDS_BIGENDIAN) - #define mget_word(p) (*(unsigned short *)(p)&0xFFFF) - #define mput_word(w,p) (*(unsigned short *)(p)=(unsigned short)(w)) - #define mget_dword(p) (*(unsigned long *)(p)) -@@ -60,7 +60,7 @@ - void unpack_mem(struct mempack *mempack); - void strip_lf(char *str); - char *ltrim(char *str); --#ifdef WORDS_BIGENDIAN -+#if defined(ALIGN_POINTERS) || defined(WORDS_BIGENDIAN) - unsigned int mget_word(char FAR *p); - unsigned long mget_dword(char FAR *p); - void mput_word(unsigned int w, char FAR *p); diff --git a/extra/arj/002_no_remove_static_const.patch b/extra/arj/002_no_remove_static_const.patch deleted file mode 100644 index 3656ba504..000000000 --- a/extra/arj/002_no_remove_static_const.patch +++ /dev/null @@ -1,20 +0,0 @@ -#DPATCHLEVEL=1 -diff -Naur arj-3.10.22.orig/gnu/makefile.in arj-3.10.22/gnu/makefile.in ---- arj-3.10.22.orig/gnu/makefile.in 2004-04-17 14:28:06.000000000 +0300 -+++ arj-3.10.22/gnu/makefile.in 2005-08-04 21:50:24.000000000 +0300 -@@ -192,6 +192,15 @@ - dispose: - - # -+# XXX: Do not use -O2, it removes the static const variable with gcc 4.x -+# -+ -+INTEGR_DIRS = $(ARJ_DIR) $(REARJ_DIR) $(ARJCRYPT_DIR) $(REGISTER_DIR) -+ -+$(patsubst %,%/integr.o, $(INTEGR_DIRS)): $(SRC_DIR)/integr.c -+ $(CC) -Wall -g -c -o$@ $< -+ -+# - # The tools - # - diff --git a/extra/arj/003_64_bit_clean.patch b/extra/arj/003_64_bit_clean.patch deleted file mode 100644 index 7cd602ea5..000000000 --- a/extra/arj/003_64_bit_clean.patch +++ /dev/null @@ -1,194 +0,0 @@ -#DPATCHLEVEL=1 -diff -Naur -x .svn -x CVS arj-3.10.22.orig/arj_arcv.c arj-3.10.22/arj_arcv.c ---- arj-3.10.22.orig/arj_arcv.c 2005-06-21 22:53:12.000000000 +0300 -+++ arj-3.10.22/arj_arcv.c 2005-11-24 02:50:31.000000000 +0200 -@@ -59,27 +59,27 @@ - #define setup_hput(ptr) (tmp_hptr=(ptr)) - - #define hget_byte() (*(tmp_hptr++)&0xFF) --#define hput_byte(c) (*(tmp_hptr++)=(char) (c)) -+#define hput_byte(c) (*(tmp_hptr++)=(uint8_t) (c)) - - /* Reads two bytes from the header, incrementing the pointer */ - --static unsigned int hget_word() -+static uint16_t hget_word() - { -- unsigned int result; -+ uint16_t result; - - result=mget_word(tmp_hptr); -- tmp_hptr+=sizeof(short); -+ tmp_hptr+=sizeof(uint16_t); - return result; - } - - /* Reads four bytes from the header, incrementing the pointer */ - --static unsigned long hget_longword() -+static uint32_t hget_longword() - { -- unsigned long result; -+ uint32_t result; - - result=mget_dword(tmp_hptr); -- tmp_hptr+=sizeof(unsigned long); -+ tmp_hptr+=sizeof(uint32_t); - return result; - } - -@@ -87,18 +87,18 @@ - - /* Writes two bytes to the header, incrementing the pointer */ - --static void hput_word(unsigned int w) -+static void hput_word(uint16_t w) - { - mput_word(w,tmp_hptr); -- tmp_hptr+=sizeof(unsigned short); -+ tmp_hptr+=sizeof(uint16_t); - } - - /* Writes four bytes to the header, incrementing the pointer */ - --static void hput_longword(unsigned long l) -+static void hput_longword(uint32_t l) - { - mput_dword(l,tmp_hptr); -- tmp_hptr+=sizeof(unsigned long); -+ tmp_hptr+=sizeof(uint32_t); - } - - /* Calculates and stores the basic header size */ -diff -Naur -x .svn -x CVS arj-3.10.22.orig/arj_proc.c arj-3.10.22/arj_proc.c ---- arj-3.10.22.orig/arj_proc.c 2005-11-24 02:50:19.000000000 +0200 -+++ arj-3.10.22/arj_proc.c 2005-11-24 02:50:31.000000000 +0200 -@@ -585,7 +585,7 @@ - /* Returns the exact amount of data that could be safely written to the - destination volume */ - --unsigned long get_volfree(unsigned int increment) -+unsigned long get_volfree(unsigned long increment) - { - unsigned long pvol; - unsigned int arjsec_overhead; -@@ -605,7 +605,7 @@ - remain=volume_limit-ftell(aostream)-pvol-(long)arjsec_overhead- - (long)out_bytes-(long)cpos-(long)ext_voldata- - MULTIVOLUME_RESERVE-t_volume_offset; -- return((unsigned long)min(remain, (unsigned long)increment)); -+ return((unsigned long)min(remain, increment)); - } - - /* Performs various checks when multivolume data is packed to predict an -@@ -2466,14 +2466,14 @@ - *tsptr='\0'; - endptr=tsptr; - tsptr=sptr; -- while((unsigned int)tsptr<(unsigned int)endptr&&patterns<SEARCH_STR_MAX) -+ while((intptr_t)tsptr<(intptr_t)endptr&&patterns<SEARCH_STR_MAX) - { - while(*tsptr=='\0') - tsptr++; -- if((unsigned int)tsptr<(unsigned int)endptr) -+ if((intptr_t)tsptr<(intptr_t)endptr) - { - search_str[patterns++]=tsptr; -- while(*tsptr!='\0'&&(unsigned int)tsptr<(unsigned int)endptr) -+ while(*tsptr!='\0'&&(intptr_t)tsptr<(intptr_t)endptr) - tsptr++; - } - } -@@ -2901,9 +2901,9 @@ - #if (defined(WORDS_BIGENDIAN) || defined(ALIGN_POINTERS)) && !defined(ARJDISP) && !defined(REGISTER) - /* Model-independent routine to get 2 bytes from far RAM */ - --unsigned int mget_word(char FAR *p) -+uint16_t mget_word(char FAR *p) - { -- unsigned int b0, b1; -+ uint16_t b0, b1; - - b0=mget_byte(p); - b1=mget_byte(p+1); -@@ -2912,9 +2912,9 @@ - - /* Model-independent routine to get 4 bytes from far RAM */ - --unsigned long mget_dword(char FAR *p) -+uint32_t mget_dword(char FAR *p) - { -- unsigned long w0, w1; -+ uint32_t w0, w1; - - w0=mget_word(p); - w1=mget_word(p+2); -@@ -2923,7 +2923,7 @@ - - /* Model-independent routine to store 2 bytes in far RAM */ - --void mput_word(unsigned int w, char FAR *p) -+void mput_word(uint16_t w, char FAR *p) - { - mput_byte(w&0xFF, p); - mput_byte(w>>8 , p+1); -@@ -2931,7 +2931,7 @@ - - /* Model-independent routine to store 4 bytes in far RAM */ - --void mput_dword(unsigned long d, char FAR *p) -+void mput_dword(uint32_t d, char FAR *p) - { - mput_word(d&0xFFFF, p); - mput_word(d>>16 , p+2); -diff -Naur -x .svn -x CVS arj-3.10.22.orig/arj_proc.h arj-3.10.22/arj_proc.h ---- arj-3.10.22.orig/arj_proc.h 2005-11-24 02:50:19.000000000 +0200 -+++ arj-3.10.22/arj_proc.h 2005-11-24 03:17:25.000000000 +0200 -@@ -8,15 +8,17 @@ - #ifndef ARJ_PROC_INCLUDED - #define ARJ_PROC_INCLUDED - -+#include <stdint.h> -+ - /* Helper macros */ - --#define mget_byte(p) (*(unsigned char FAR *)(p)&0xFF) --#define mput_byte(c, p) *(unsigned char FAR *)(p)=(unsigned char)(c) -+#define mget_byte(p) (*(uint8_t FAR *)(p)&0xFF) -+#define mput_byte(c, p) *(uint8_t FAR *)(p)=(uint8_t)(c) - #if !defined(ALIGN_POINTERS) && !defined(WORDS_BIGENDIAN) --#define mget_word(p) (*(unsigned short *)(p)&0xFFFF) --#define mput_word(w,p) (*(unsigned short *)(p)=(unsigned short)(w)) --#define mget_dword(p) (*(unsigned long *)(p)) --#define mput_dword(w,p) (*(unsigned long *)(p)=(unsigned long)(w)) -+#define mget_word(p) (*(uint16_t *)(p)&0xFFFF) -+#define mput_word(w,p) (*(uint16_t *)(p)=(uint16_t)(w)) -+#define mget_dword(p) (*(uint32_t *)(p)) -+#define mput_dword(w,p) (*(uint32_t *)(p)=(uint32_t)(w)) - #endif - - /* Prototypes */ -@@ -31,7 +33,7 @@ - int translate_path(char *name); - void restart_proc(char *dest); - int search_for_extension(char *name, char *ext_list); --unsigned long get_volfree(unsigned int increment); -+unsigned long get_volfree(unsigned long increment); - unsigned int check_multivolume(unsigned int increment); - void store(); - void hollow_encode(); -@@ -61,10 +63,10 @@ - void strip_lf(char *str); - char *ltrim(char *str); - #if defined(ALIGN_POINTERS) || defined(WORDS_BIGENDIAN) --unsigned int mget_word(char FAR *p); --unsigned long mget_dword(char FAR *p); --void mput_word(unsigned int w, char FAR *p); --void mput_dword(unsigned long d, char FAR *p); -+uint16_t mget_word(char FAR *p); -+uint32_t mget_dword(char FAR *p); -+void mput_word(uint16_t w, char FAR *p); -+void mput_dword(uint32_t d, char FAR *p); - #endif - - #endif diff --git a/extra/arj/PKGBUILD b/extra/arj/PKGBUILD deleted file mode 100644 index 47aa5dc5f..000000000 --- a/extra/arj/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# $Id: PKGBUILD 195286 2013-09-29 21:24:32Z eric $ -# Maintainer: -# Contributor: Travis Willard <travisw@wmpub.ca> -# Contributor: Gergely Tamas <dice@mfa.kfki.hu> - -pkgname=arj -pkgver=3.10.22 -pkgrel=8 -pkgdesc="Free and portable clone of the ARJ archiver" -url="http://arj.sourceforge.net/" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -depends=('glibc') -options=('!makeflags') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 001_arches_align.patch - 002_no_remove_static_const.patch - 003_64_bit_clean.patch - arj-3.10.22-custom-printf.patch) -md5sums=('f263bf3cf6d42a8b7e85b4fb514336d3' - '550bc972d825036f17f202a2b11b35c2' - '395dfa8cc500ffae648777f8f241be88' - '56b3cf96ec485b0d824761457417fcc0' - '4630a7254dfc6c8d8c7e696aa4a58f4a') - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # Add gentoo patches - patch -p1 -i "${srcdir}/001_arches_align.patch" - patch -p1 -i "${srcdir}/002_no_remove_static_const.patch" - patch -p1 -i "${srcdir}/003_64_bit_clean.patch" - patch -p1 -i "${srcdir}/arj-3.10.22-custom-printf.patch" - - cd gnu - aclocal - autoconf - rm -f config.{guess,sub} - cp /usr/share/automake-1.14/config.{guess,sub} . -} - -build() { - cd "${srcdir}/${pkgname}-${pkgver}/gnu" - ./configure --prefix=/usr - cd .. - make prepare - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/extra/arj/arj-3.10.22-custom-printf.patch b/extra/arj/arj-3.10.22-custom-printf.patch deleted file mode 100644 index b789dd5c7..000000000 --- a/extra/arj/arj-3.10.22-custom-printf.patch +++ /dev/null @@ -1,15 +0,0 @@ -Patch by Lubomir Rintel <lkundrak@v3.sk> for arj >= 3.10.22, which disables -the custom printf to avoid conflicting strnlen definition with the glibc -headers. By using custom printf (as in the past), we're completely loosing -all the _FORTIFY_SOURCE printf protections. - ---- arj-3.10.22/fardata.c 2004-04-17 13:39:42.000000000 +0200 -+++ arj-3.10.22/fardata.c.printf 2009-04-18 16:23:52.000000000 +0200 -@@ -13,7 +13,6 @@ - /* ASR fix 02/05/2003: need that regardless of COLOR_OUTPUT to support -jp - correctly */ - #if SFX_LEVEL>=ARJ -- #define CUSTOM_PRINTF - #define CHUNK_SIZE 512 /* Size of the output block */ - #define CHUNK_THRESHOLD (CHUNK_SIZE-256) /* Safety bound */ - #endif diff --git a/extra/asio/PKGBUILD b/extra/asio/PKGBUILD index 27f94d9a4..1cff00689 100644 --- a/extra/asio/PKGBUILD +++ b/extra/asio/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 190033 2013-07-13 12:40:05Z svenstaro $ +# $Id: PKGBUILD 199844 2013-11-17 09:57:22Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=asio -pkgver=1.4.8 -pkgrel=3 +pkgver=1.10.1 +pkgrel=1 pkgdesc="Cross-platform C++ library for ASynchronous network I/O" arch=('i686' 'x86_64' 'mips64el') url="http://asio.sourceforge.net" license=('custom') depends=('boost') -source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2") -md5sums=('bc2ca8ea37892870d194421154df122f') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('4d508c9947404fee40945375b8a5fd32') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/aspell-de/PKGBUILD b/extra/aspell-de/PKGBUILD index d95f68aa5..219cc90aa 100644 --- a/extra/aspell-de/PKGBUILD +++ b/extra/aspell-de/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 197171 2013-10-23 13:51:59Z pierre $ +# $Id: PKGBUILD 201292 2013-12-08 08:42:55Z pierre $ # Maintainer: # Contributor: Simo Leone <simo@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=aspell-de -pkgver=20120607 -pkgrel=2 +pkgver=20131206 +pkgrel=1 pkgdesc="German dictionary for aspell" arch=('i686' 'x86_64' 'mips64el') url="http://j3e.de/ispell/igerman98/index.html" license=('GPL2') depends=('aspell') source=("http://j3e.de/ispell/igerman98/dict/igerman98-${pkgver}.tar.bz2") -md5sums=('9433d0ccd7db3c7681037980ece3f710') +md5sums=('9b6c0c6615d2e099cd85a209d9f1fdbb') build() { cd "${srcdir}/igerman98-${pkgver}" diff --git a/extra/aspell-it/PKGBUILD b/extra/aspell-it/PKGBUILD deleted file mode 100644 index 40cee32ef..000000000 --- a/extra/aspell-it/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 143713 2011-11-28 16:36:02Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Eric Johnson <eric@coding-zone.com> - -pkgname=aspell-it -pkgver=2.2_20050523 -pkgrel=4.1 -pkgdesc="Italian dictionary for aspell" -arch=('i686' 'x86_64' 'mips64el') -url="http://aspell.net/" -license=('GPL') -depends=('aspell') -source=("ftp://ftp.gnu.org/gnu/aspell/dict/it/aspell6-it-${pkgver}-0.tar.bz2") -md5sums=('b1217299a0b67d1e121494d7ec18a88d') - -build() { - cd "${srcdir}/aspell6-it-${pkgver}-0" - - ./configure - make -} - -package() { - cd "${srcdir}/aspell6-it-${pkgver}-0" - - make DESTDIR="${pkgdir}" install -} diff --git a/extra/at-spi2-atk/PKGBUILD b/extra/at-spi2-atk/PKGBUILD index 476a398e4..62555b918 100644 --- a/extra/at-spi2-atk/PKGBUILD +++ b/extra/at-spi2-atk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 197867 2013-10-30 11:21:29Z allan $ +# $Id: PKGBUILD 199411 2013-11-11 23:24:04Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=at-spi2-atk -pkgver=2.10.0 +pkgver=2.10.2 pkgrel=1 pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('GPL2') depends=('at-spi2-core' 'libx11' 'atk') makedepends=('intltool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('dea7ff2f9bc9bbdb0351112616d738de718b55739cd2511afecac51604c31a94') +sha256sums=('e348a811c4830251f0c3018019072e7979ef35fb9b7f0b1b0a0dd1e66942d0f5') build() { cd $pkgname-$pkgver diff --git a/extra/at-spi2-core/PKGBUILD b/extra/at-spi2-core/PKGBUILD index af9ba43ca..fe91a4f5a 100644 --- a/extra/at-spi2-core/PKGBUILD +++ b/extra/at-spi2-core/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 197868 2013-10-30 11:21:50Z allan $ +# $Id: PKGBUILD 199409 2013-11-11 23:21:40Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=at-spi2-core -pkgver=2.10.1 +pkgver=2.10.2 pkgrel=1 pkgdesc="Protocol definitions and daemon for D-Bus at-spi" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('GPL2') depends=('dbus' 'glib2' 'libxtst') makedepends=('intltool' 'gobject-introspection') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('349b7ad5e6a8eebbf88aaefcb67a0f49b025dbcdf6ad646978faf2ca84650119') +sha256sums=('d3da58f84f4c8e4d5fe940ecb52fb27b4d9ea2b4dcdb3e1fae0f46b5eaa2dde1') build() { cd $pkgname-$pkgver diff --git a/extra/aubio/PKGBUILD b/extra/aubio/PKGBUILD index 8b0481a68..8a8b231de 100644 --- a/extra/aubio/PKGBUILD +++ b/extra/aubio/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 197869 2013-10-30 11:22:11Z allan $ +# $Id: PKGBUILD 199836 2013-11-17 08:28:12Z allan $ # Maintainer: Tobias Kieslich tobias [funnychar] archlinux org # Contributor: Peter Baldwin <bald_pete@hotmail.com> # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw> pkgname=aubio pkgver=0.3.2 -pkgrel=5.2 +pkgrel=6 pkgdesc="A library for audio labelling" arch=('i686' 'x86_64' 'mips64el') url="http://aubio.org/" @@ -19,7 +19,7 @@ md5sums=('ffc3e5e4880fec67064f043252263a44' build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i $srcdir/aubio-linking.patch + patch -p1 -i $srcdir/aubio-linking.patch ./configure --prefix=/usr make diff --git a/extra/autogen/PKGBUILD b/extra/autogen/PKGBUILD index 3f03e1717..db740190b 100644 --- a/extra/autogen/PKGBUILD +++ b/extra/autogen/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 197871 2013-10-30 11:22:53Z allan $ +# $Id: PKGBUILD 199838 2013-11-17 08:40:22Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Arjan Timmerman <arjan@soufly.nl> # Contributor: Tor Krill pkgname=autogen -pkgver=5.17.4 +pkgver=5.18.2 pkgrel=1 pkgdesc="A tool designed to simplify the creation and maintenance of programs that contain large amounts of repetitious text" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('GPL3') depends=('guile' 'libxml2') install=autogen.install source=(http://ftp.gnu.org/gnu/${pkgname}/rel${pkgver}/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('09b031866b7d89f0532b6c3168d67c59' +md5sums=('1924fdfe36edb3e0fd66add20aca9b70' 'SKIP') build() { diff --git a/extra/avidemux/PKGBUILD b/extra/avidemux/PKGBUILD index 304f7e9de..aadc83cc2 100644 --- a/extra/avidemux/PKGBUILD +++ b/extra/avidemux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 191888 2013-08-01 06:53:22Z bpiotrowski $ +# $Id: PKGBUILD 199867 2013-11-17 12:54:00Z bpiotrowski $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=avidemux pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt') pkgver=2.5.6 -pkgrel=7 +pkgrel=8 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://fixounet.free.fr/avidemux/" @@ -12,12 +12,12 @@ makedepends=('cmake' 'libxslt' 'gtk2' 'qt4' 'jack' 'libvorbis' 'sdl' 'libxv' \ 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \ 'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse') [ "$CARCH" != "mips64el" ] && makedepends+=('libva') -options=('!makeflags') +options=('!makeflags' '!emptydirs') source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz) sha1sums=('47205c236bf6a4435b9d4dd944493c7b7e2752f5') build() { - cd "${srcdir}/${pkgbase}_${pkgver}" + cd ${pkgbase}_${pkgver} mkdir build cd build cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release \ @@ -27,7 +27,6 @@ build() { # plugin build expects libraries to be already installed; we fake a prefix # in build/ by symlinking all libraries to build/lib/ - mkdir -p lib cd lib find ../avidemux -name '*.so*' | xargs ln -sft . cd ../../plugins @@ -57,12 +56,13 @@ package_avidemux-cli() { conflicts=('avidemux') replaces=('avidemux') - cd "${srcdir}/${pkgbase}_${pkgver}/build" + cd ${pkgbase}_${pkgver}/build make DESTDIR="${pkgdir}" install cd "${srcdir}/${pkgbase}_${pkgver}/plugins/build" make DESTDIR="${pkgdir}" install rm -r "${pkgdir}"/usr/share/avidemux + rm "${pkgdir}"/usr/share/ADM_addons/avsfilter/{avsload.exe,pipe_source.dll} rm "${pkgdir}"/usr/bin/avidemux2_{gtk,qt4} rm "${pkgdir}"/usr/lib/*{_gtk,_qt4,Gtk,QT4}.so rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/x264/*{Gtk,Qt}.so @@ -81,7 +81,7 @@ package_avidemux-gtk() { depends=("avidemux-cli=${pkgver}" 'gtk2' 'libxv' 'desktop-file-utils') install=avidemux.install - cd "${srcdir}/${pkgbase}_${pkgver}" + cd ${pkgbase}_${pkgver} install -D -m755 build/avidemux/avidemux2_gtk "${pkgdir}/usr/bin/avidemux2_gtk" install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid} @@ -97,11 +97,11 @@ package_avidemux-gtk() { } package_avidemux-qt() { - pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI" + pkgdesc="A graphical tool to edit video (filter/re-encode/split) - Qt GUI" depends=("avidemux-cli=${pkgver}" 'qt4') install=avidemux.install - cd "${srcdir}/${pkgbase}_${pkgver}" + cd ${pkgbase}_${pkgver} install -D -m755 build/avidemux/avidemux2_qt4 "${pkgdir}/usr/bin/avidemux2_qt4" install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid} install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter @@ -115,6 +115,6 @@ package_avidemux-qt() { install -D -m644 build/po/*.qm "${pkgdir}/usr/share/avidemux/i18n" install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt.desktop" - sed -i 's/Name=avidemux2/Name=avidemux (QT)/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop" + sed -i 's/Name=avidemux2/Name=avidemux (Qt)/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop" sed -i 's/avidemux2_gtk/avidemux2_qt4/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop" } diff --git a/extra/avidemux/PKGBUILD.WIP b/extra/avidemux/PKGBUILD.WIP index 87010d49c..ae2cd51ef 100644 --- a/extra/avidemux/PKGBUILD.WIP +++ b/extra/avidemux/PKGBUILD.WIP @@ -3,7 +3,7 @@ pkgbase=avidemux pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt') -pkgver=2.6.4 +pkgver=2.6.6 pkgrel=1 arch=('i686' 'x86_64') license=('GPL2') @@ -14,11 +14,12 @@ makedepends=('cmake' 'libxslt' 'gtk3' 'qt4' 'jack' 'libvorbis' 'sdl' 'libxv' \ 'libvdpau' 'libdca' 'fribidi' 'glu') options=('!makeflags' '!emptydirs') source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz) -sha1sums=('7ed55fd5cfb6cfa73ebb9058af72fa2e3c9717c3') -#source=(http://www.avidemux.org/nightly/source/snapshot_8273.tgz) -#sha1sums=('cf5256ce189a51898a2e1071ffd46cd993f453f2') +sha1sums=('83ebf551746aac251d6e69feac5858cd0a307743') +#source=(http://www.avidemux.org/nightly/snapshot/source_r8810.tar.gz) +#sha1sums=('8c27d54e2b0655a8b8a3adfde1c0308ffedfec0c') prepare() { +# mv 2.6_snapshot ${pkgbase}_${pkgver} cd ${pkgbase}_${pkgver} sed -i 's|avidemux2|avidemux3|' avidemux2.desktop sed -i 's|../avidemux/qt4|../avidemux/qt4 -DLRELEASE_EXECUTABLE=/usr/bin/lrelease-qt4|' bootStrap.bash @@ -26,8 +27,6 @@ prepare() { } build() { -#mv snapshot_8273 ${pkgbase}_${pkgver} - cd ${pkgbase}_${pkgver} bash bootStrap.bash --with-core --with-cli --with-gtk --with-qt4 --with-plugins } @@ -72,7 +71,7 @@ package_avidemux-gtk() { } package_avidemux-qt() { - pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI" + pkgdesc="A graphical tool to edit video (filter/re-encode/split) - Qt GUI" depends=("avidemux-cli=${pkgver}" 'qt4' 'x264' 'glu') install=avidemux.install diff --git a/extra/avogadro/PKGBUILD b/extra/avogadro/PKGBUILD index 197ff2368..42c6c31fa 100644 --- a/extra/avogadro/PKGBUILD +++ b/extra/avogadro/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 190034 2013-07-13 12:40:13Z svenstaro $ +# $Id: PKGBUILD 201255 2013-12-07 10:34:55Z bpiotrowski $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Nick B <Shirakawasuna at gmail _dot_com> pkgname=avogadro pkgver=1.1.0 -pkgrel=5 +pkgrel=6 pkgdesc="An advanced molecular editor based on Qt" arch=('i686' 'x86_64' 'mips64el') url="http://avogadro.openmolecules.net/wiki/Main_Page" diff --git a/extra/barcode/PKGBUILD b/extra/barcode/PKGBUILD deleted file mode 100644 index 53e113990..000000000 --- a/extra/barcode/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 181063 2013-03-31 07:43:24Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> - -pkgname=barcode -pkgver=0.99 -pkgrel=1 -pkgdesc="A tool to convert text strings to printed bars" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.gnu.org/software/barcode/" -license=('GPL') -depends=('glibc') -install=barcode.install -source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz") -md5sums=('cdc504ee1020e27fbfeebcb0718de054') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make prefix="${pkgdir}/usr" install -} diff --git a/extra/barcode/barcode.install b/extra/barcode/barcode.install deleted file mode 100644 index 83966a37d..000000000 --- a/extra/barcode/barcode.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=/usr/share/info -filelist=(barcode.info.gz) - -post_install() { - [ -x usr/bin/install-info ] - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install -} - -pre_remove() { - [ -x usr/bin/install-info ] - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} diff --git a/extra/bigloo/PKGBUILD b/extra/bigloo/PKGBUILD index f8cdd72ca..2aa3d01e4 100644 --- a/extra/bigloo/PKGBUILD +++ b/extra/bigloo/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 192494 2013-08-13 09:04:03Z juergen $ +# $Id: PKGBUILD 199846 2013-11-17 10:03:54Z allan $ # Maintainer: Jürgen Hötzel <juergen@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> # Contributor: Kevin Piche <kevin@archlinux.org> @@ -6,7 +6,7 @@ pkgname=bigloo _pkgver=4.0b pkgver=${_pkgver/-/_} -pkgrel=1 +pkgrel=2 pkgdesc="Fast scheme compiler" arch=('i686' 'x86_64' 'mips64el') url="http://www-sop.inria.fr/mimosa/fp/Bigloo/" @@ -43,5 +43,4 @@ package() { cd "${srcdir}/${pkgname}${_pkgver}" make DESTDIR="${pkgdir}" install install-bee make -C manuals DESTDIR="${pkgdir}" install-bee - chmod 644 "${pkgdir}"/usr/lib/bigloo/${_pkgver%-*}/*.a } diff --git a/extra/bijiben/PKGBUILD b/extra/bijiben/PKGBUILD index bc81f14a9..859c6c462 100644 --- a/extra/bijiben/PKGBUILD +++ b/extra/bijiben/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 196446 2013-10-13 21:34:11Z heftig $ +# $Id: PKGBUILD 199399 2013-11-11 22:34:22Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=bijiben -pkgver=3.10.1 +pkgver=3.10.2 pkgrel=1 pkgdesc="Write out notes, every detail matters" arch=(i686 x86_64 mips64el) @@ -14,7 +14,7 @@ options=(!emptydirs) groups=(gnome-extra) install=bijiben.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('ad32057baa58bf236e8f04cf7746e0d917927f8af5c49cc5a0910fc0078f775c') +sha256sums=('81257f85218968b0ad386da6e1143586de478870ca74bb5387646a479999a7d4') build() { cd $pkgname-$pkgver diff --git a/extra/bluedevil/PKGBUILD b/extra/bluedevil/PKGBUILD index 92633a8d7..1371e5f1b 100644 --- a/extra/bluedevil/PKGBUILD +++ b/extra/bluedevil/PKGBUILD @@ -1,23 +1,28 @@ -# $Id: PKGBUILD 194547 2013-09-18 11:33:01Z tomegun $ +# $Id: PKGBUILD 202646 2013-12-23 08:16:52Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=bluedevil -pkgver=1.3.2 +pkgver=2.0rc1 +_pkgver=2.0-rc1 pkgrel=1 +epoch=1 pkgdesc='KDE bluetooth framework' arch=('i686' 'x86_64' 'mips64el') url="https://projects.kde.org/projects/extragear/base/bluedevil" license=('GPL') -depends=('kdebase-workspace' 'libbluedevil' 'obex-data-server' 'obexd-client') +depends=('kdebase-workspace' 'libbluedevil') makedepends=('cmake' 'automoc4') install="${pkgname}.install" -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -md5sums=('a43e644fe75bd090c47c060dcbdfdb27') +source=("http://download.kde.org/unstable/${pkgname}/${pkgname}-${_pkgver}.tar.xz") +md5sums=('d49a3037d29cf4ba9e0a0968a0139333') -build(){ +prepare() { mkdir build +} + +build(){ cd build - cmake ../${pkgname}-v${pkgver} \ + cmake ../${pkgname}-${_pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr make diff --git a/extra/bluez/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch b/extra/bluez/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch new file mode 100644 index 000000000..fe3c51314 --- /dev/null +++ b/extra/bluez/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch @@ -0,0 +1,59 @@ +From 3027cb7141fb65cf3eeda69c688db8c4045e2d3f Mon Sep 17 00:00:00 2001 +From: Giovanni Campagna <gcampagna-cNUdlRotFMnNLxjTenLetw@public.gmane.org> +Date: Sat, 12 Oct 2013 17:45:25 +0200 +Subject: [PATCH] Allow using obexd without systemd in the user session + +Not all sessions run systemd --user (actually, the majority +doesn't), so the dbus daemon must be able to spawn obexd +directly, and to do so it needs the full path of the daemon. +--- + Makefile.obexd | 4 ++-- + obexd/src/org.bluez.obex.service | 4 ---- + obexd/src/org.bluez.obex.service.in | 4 ++++ + 3 files changed, 6 insertions(+), 6 deletions(-) + delete mode 100644 obexd/src/org.bluez.obex.service + create mode 100644 obexd/src/org.bluez.obex.service.in + +diff --git a/Makefile.obexd b/Makefile.obexd +index 3760867..142e7c3 100644 +--- a/Makefile.obexd ++++ b/Makefile.obexd +@@ -2,12 +2,12 @@ + if SYSTEMD + systemduserunitdir = @SYSTEMD_USERUNITDIR@ + systemduserunit_DATA = obexd/src/obex.service ++endif + + dbussessionbusdir = @DBUS_SESSIONBUSDIR@ + dbussessionbus_DATA = obexd/src/org.bluez.obex.service +-endif + +-EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service ++EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in + + obex_plugindir = $(libdir)/obex/plugins + +diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service +deleted file mode 100644 +index a538088..0000000 +--- a/obexd/src/org.bluez.obex.service ++++ /dev/null +@@ -1,4 +0,0 @@ +-[D-BUS Service] +-Name=org.bluez.obex +-Exec=/bin/false +-SystemdService=dbus-org.bluez.obex.service +diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in +new file mode 100644 +index 0000000..9c815f2 +--- /dev/null ++++ b/obexd/src/org.bluez.obex.service.in +@@ -0,0 +1,4 @@ ++[D-BUS Service] ++Name=org.bluez.obex ++Exec=@libexecdir@/obexd ++SystemdService=dbus-org.bluez.obex.service +-- +1.8.3.1 + + diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD index 053ec0956..7822479aa 100644 --- a/extra/bluez/PKGBUILD +++ b/extra/bluez/PKGBUILD @@ -1,74 +1,143 @@ -# $Id: PKGBUILD 197876 2013-10-30 11:24:44Z allan $ +# $Id: PKGBUILD 202773 2013-12-27 22:14:31Z andyrtr $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> pkgbase=bluez -pkgname=('bluez' 'bluez-utils' 'bluez-libs') -pkgver=5.9 +pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci' 'bluez-plugins') +pkgver=5.13 pkgrel=1 url="http://www.bluez.org/" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') makedepends=('dbus' 'libical' 'systemd') -source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2") +source=(http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.xz + 0001-Allow-using-obexd-without-systemd-in-the-user-session.patch + bluetooth.modprobe) +md5sums=('c68f8cb270110256a684403ee43b5f79' + 'ec97f23123456900446e8ab17361d6c2' + '671c15e99d7154c2df987b71c5851b3d') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd $pkgname-$pkgver + # patch not upstreamable for obex file transfer - FS#37773 taken from FC + # http://www.hadess.net/2013/11/bluetooth-file-sharing-obexpush-in.html + patch -Np1 -i ${srcdir}/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch + autoreconf -vfi +} +build() { + cd ${pkgname}-${pkgver} ./configure \ --prefix=/usr \ --mandir=/usr/share/man \ --sysconfdir=/etc \ --localstatedir=/var \ --libexecdir=/usr/lib \ + --enable-sixaxis \ --enable-library # this is deprecated +# --enable-experimental \ + + make all V=1 +} - make +check() { + cd $pkgname-$pkgver + make check } + package_bluez() { pkgdesc="Daemons for the bluetooth protocol stack" depends=('libical' 'dbus' 'glib2') - optdepends=("cups: CUPS backend") - backup=('etc/dbus-1/system.d/bluetooth.conf') + backup=('etc/dbus-1/system.d/bluetooth.conf' + 'etc/bluetooth/main.conf') conflicts=('obexd-client' 'obexd-server') - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - - ### split out bluez-utils - rm -rf "$srcdir/_utils" - install -dm755 "$srcdir"/_utils/usr/share/man - mv "$pkgdir"/usr/share/man/man1 "$srcdir"/_utils/usr/share/man/ - install -dm755 "$srcdir"/_utils/usr/bin - mv "$pkgdir"/usr/bin/{bccmd,ciptool,hciattach,hciconfig,hcidump,hcitool,l2ping,l2test,rctest,rfcomm,sdptool}\ - "$srcdir"/_utils/usr/bin/ - install -dm755 "$srcdir"/_utils/usr/lib - mv "$pkgdir"/usr/lib/udev "$srcdir"/_utils/usr/lib/ - - ### split out bluez-libs - rm -rf "$srcdir/_libs" - install -dm755 "$srcdir"/_libs/usr/lib/ - mv "$pkgdir"/usr/lib/{pkgconfig,libbluetooth*} \ - "$srcdir"/_libs/usr/lib/ - mv "$pkgdir"/usr/include \ - "$srcdir"/_libs/usr/ -} + cd ${pkgbase}-${pkgver} + #make DESTDIR=${pkgdir} install + #return 1 + + make DESTDIR=${pkgdir} \ + install-libexecPROGRAMS \ + install-dbussessionbusDATA \ + install-systemdsystemunitDATA \ + install-systemduserunitDATA \ + install-dbussystembusDATA \ + install-dbusDATA \ + install-man8 -package_bluez-libs() { - pkgdesc="Deprecated libraries for the bluetooth protocol stack" - depends=('glibc') + # ship upstream main config file + install -dm755 ${pkgdir}/etc/bluetooth + install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/src/main.conf ${pkgdir}/etc/bluetooth/main.conf - mv "$srcdir/_libs"/* "$pkgdir" + # add basic documention + install -dm755 ${pkgdir}/usr/share/doc/${pkgbase}/dbus-apis + cp -a doc/*.txt ${pkgdir}/usr/share/doc/${pkgbase}/dbus-apis/ + # fix module loading errors + install -dm755 ${pkgdir}/usr/lib/modprobe.d + install -Dm644 ${srcdir}/bluetooth.modprobe ${pkgdir}/usr/lib/modprobe.d/bluetooth-usb.conf } + package_bluez-utils() { pkgdesc="Development and debugging utilities for the bluetooth protocol stack" - depends=('systemd') + depends=('dbus' 'systemd') conflicts=('bluez-hcidump') provides=('bluez-hcidump') replaces=('bluez-hcidump' 'bluez<=4.101') - mv "$srcdir/_utils"/* "$pkgdir" + cd ${pkgbase}-${pkgver} + make DESTDIR=${pkgdir} \ + install-binPROGRAMS \ + install-man1 + + # libbluetooth.so* are part of libLTLIBRARIES and binPROGRAMS targets + #make DESTDIR=${pkgdir} uninstall-libLTLIBRARIES + #rmdir ${pkgdir}/usr/lib + rm -rf ${pkgdir}/usr/lib + + # move the hid2hci man page out + mv ${pkgdir}/usr/share/man/man1/hid2hci.1 ${srcdir}/ +} + +package_bluez-libs() { + pkgdesc="Deprecated libraries for the bluetooth protocol stack" + depends=('glibc') + license=('LGPL2.1') + + cd ${pkgbase}-${pkgver} + make DESTDIR=${pkgdir} \ + install-includeHEADERS \ + install-libLTLIBRARIES \ + install-pkgconfigDATA +} + +package_bluez-cups() { + pkgdesc="CUPS printer backend for Bluetooth printers" + depends=('cups') + + cd ${pkgbase}-${pkgver} + make DESTDIR=${pkgdir} install-cupsPROGRAMS +} + +package_bluez-hid2hci() { + pkgdesc="Put HID proxying bluetooth HCI's into HCI mode" + depends=('systemd') + + cd ${pkgbase}-${pkgver} + make DESTDIR=${pkgdir} \ + install-udevPROGRAMS \ + install-rulesDATA + + install -dm755 ${pkgdir}/usr/share/man/man1 + mv ${srcdir}/hid2hci.1 ${pkgdir}/usr/share/man/man1/hid2hci.1 +} + +package_bluez-plugins() { + pkgdesc="bluez plugins (PS3 sicaxis controller)" + depends=('systemd') + + cd ${pkgbase}-${pkgver} + make DESTDIR=${pkgdir} \ + install-pluginLTLIBRARIES } -md5sums=('6edaf60d09ee32942a739f80ea847db1') diff --git a/extra/bluez/bluetooth.modprobe b/extra/bluez/bluetooth.modprobe new file mode 100644 index 000000000..3072d7885 --- /dev/null +++ b/extra/bluez/bluetooth.modprobe @@ -0,0 +1,3 @@ +# use "reset=1" as default, since it should be safe for recent devices and +# solves all kind of problems. +options btusb reset=1 diff --git a/extra/bluez4/PKGBUILD b/extra/bluez4/PKGBUILD deleted file mode 100644 index b780e75b8..000000000 --- a/extra/bluez4/PKGBUILD +++ /dev/null @@ -1,87 +0,0 @@ -# $Id: PKGBUILD 197877 2013-10-30 11:25:04Z allan $ -# Maintainer: Tom Gundersen <teg@jklm.no> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Geoffroy Carrier <geoffroy@archlinux.org> - -pkgname=bluez4 -pkgver=4.101 -pkgrel=3 -pkgdesc="Deprecated daemon and tools for the Bluetooth protocol stack" -url="http://www.bluez.org/" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL2') -depends=('dbus' 'bluez-utils') -conflicts=('bluez') -replaces=("bluez<=$pkgver") -makedepends=('gstreamer0.10-base' 'libusb-compat' 'libsndfile' 'libusbx') -optdepends=("gstreamer0.10-base: bluetooth GStreamer support" - "alsa-lib: Audio bluetooth devices support" - "python2: to run bluez-simple-agent" - "dbus-python: to run bluez-simple-agent" - "pygobject: to run bluez-simple-agent" - "libusb-compat: USB adapters support" - "cups: CUPS backend") -backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf - etc/dbus-1/system.d/bluetooth.conf) -source=("http://www.kernel.org/pub/linux/bluetooth/bluez-${pkgver}.tar.bz2") - -build() { - cd bluez-"${pkgver}" - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib \ - --sbindir=/usr/lib/bluetooth \ - --enable-gstreamer \ - --enable-alsa \ - --enable-usb \ - --enable-dfutool \ - --enable-dund \ - --enable-hidd \ - --enable-pand \ - --enable-gatt \ - --enable-cups \ - --enable-wiimote \ - --disable-test \ - --with-systemdunitdir=/usr/lib/systemd/system - - make -} - -package() { - cd bluez-"${pkgver}" - make DESTDIR=${pkgdir} install - - # adjust systemd service file - sed -i 's#/usr/sbin/#/usr/lib/bluetooth/#' \ - "${pkgdir}"/usr/lib/systemd/system/bluetooth.service - - install -d ${pkgdir}/etc/bluetooth - install -m644 network/network.conf \ - input/input.conf \ - audio/audio.conf \ - serial/serial.conf \ - ${pkgdir}/etc/bluetooth/ - - # FS#27630 - install -Dm755 test/simple-agent "${pkgdir}"/usr/bin/bluez-simple-agent - install -Dm755 test/test-device "${pkgdir}"/usr/bin/bluez-test-device - install -Dm755 test/test-input "${pkgdir}"/usr/bin/bluez-test-input - sed -i 's#/usr/bin/python#/usr/bin/python2#' \ - "${pkgdir}"/usr/bin/bluez-simple-agent \ - "${pkgdir}"/usr/bin/bluez-test-device \ - "${pkgdir}"/usr/bin/bluez-test-input - - # drop files that are in bluez-libs - rm -rf "${pkgdir}"/usr/{include,lib/pkgconfig} - rm "${pkgdir}"/usr/lib/libbluetooth* - - # drop files that are in bluez-utils - rm -rf "${pkgdir}"/lib - rm "${pkgdir}"/usr/bin/{ciptool,hcitool,l2ping,rfcomm,sdptool} - rm "${pkgdir}"/usr/share/man/man1/{ciptool,hcitool,rfcomm,sdptool}.1 - rm "${pkgdir}"/usr/lib/bluetooth/{hciattach,hciconfig} - rm "${pkgdir}"/usr/share/man/man8/{hciattach,hciconfig}.8 -} -md5sums=('902b390af95c6c5d6d1a17d94c8344ab') diff --git a/extra/boost/001-log_fix_dump_avx2.patch b/extra/boost/001-log_fix_dump_avx2.patch new file mode 100644 index 000000000..ae9cfd727 --- /dev/null +++ b/extra/boost/001-log_fix_dump_avx2.patch @@ -0,0 +1,13 @@ +Index: libs/log/src/dump_avx2.cpp +=================================================================== +--- libs/log/src/dump_avx2.cpp (revision 86614) ++++ libs/log/src/dump_avx2.cpp (working copy) +@@ -205,7 +205,7 @@ + __m256i mm_input = _mm256_load_si256(reinterpret_cast< const __m256i* >(p)); + __m256i mm_output1, mm_output2, mm_output3; + dump_pack(mm_char_10_to_a, mm_input, mm_output1, mm_output2, mm_output3); +- store_characters_x3(mm_output1, mm_output2, mm_output3, buf); ++ store_characters_x3(mm_output1, mm_output2, mm_output3, b); + } + + _mm256_zeroall(); // need to zero all ymm registers to avoid register spills/restores the compler generates around the function call diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD index 9cd056924..29255aec2 100644 --- a/extra/boost/PKGBUILD +++ b/extra/boost/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 196738 2013-10-17 14:02:41Z andyrtr $ +# $Id: PKGBUILD 202226 2013-12-20 02:36:58Z svenstaro $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: kevin <kevin@archlinux.org> @@ -8,7 +8,7 @@ pkgbase=boost pkgname=('boost-libs' 'boost') -pkgver=1.54.0 +pkgver=1.55.0 _boostver=${pkgver//./_} pkgrel=4 url="http://www.boost.org/" @@ -16,53 +16,47 @@ arch=('i686' 'x86_64' 'mips64el') license=('custom') makedepends=('icu>=52.1' 'python' 'python2' 'bzip2' 'zlib' 'openmpi') source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz - boost-1.53.0-python3.patch - boost-1.54.0-Fix-macro-for-int128-detection.patch - fix-new-glibc.patch) -sha1sums=('069501636097d3f40ddfd996d29748bb23591c53' - '34026072a7cb2534164f20e77bb71a5c75093307' - 'bf5177694ab8a0df6bc13aa47b05727c40febebb' - 'e3a5fac340c12b39add50070efb439b857108a0b') + 001-log_fix_dump_avx2.patch) +sha1sums=('61ed0e57d3c7c8985805bb0682de3f4c65f4b6e5' + 'a4a47cc5716df87d544ae7684aaf402287132d50') -build() { +prepare() { export _stagedir="${srcdir}/stagedir" - local JOBS="$(sed -e 's/.*\(-j *[0-9]\+\).*/\1/' <<< ${MAKEFLAGS})" - - cd "${srcdir}/${pkgbase}_${_boostver}" - - patch -Np2 -i ../boost-1.54.0-Fix-macro-for-int128-detection.patch - patch -Np2 -i ../fix-new-glibc.patch + cd ${pkgbase}_${_boostver} - # Fix build errors with python 3 - sed -i "/PYTHON_ROOT/s/print sys.prefix/print(sys.prefix)/g" bootstrap.sh - patch -Np1 -i ../boost-1.53.0-python3.patch + patch -p0 -i ../001-log_fix_dump_avx2.patch - # Shut up strict aliasing warnings - echo "using gcc : : : <compileflags>-fno-strict-aliasing ;" >> ./tools/build/v2/user-config.jam # Add an extra python version. This does not replace anything and python 2.x need to be the default. echo "using python : 3.3 : /usr/bin/python3 : /usr/include/python3.3m : /usr/lib ;" >> ./tools/build/v2/user-config.jam - # Support for OpenMPI + + # Support for OpenMPI echo "using mpi ;" >> ./tools/build/v2/user-config.jam +} + +build() { + local JOBS="$(sed -e 's/.*\(-j *[0-9]\+\).*/\1/' <<< ${MAKEFLAGS})" + + cd ${pkgbase}_${_boostver} ./bootstrap.sh --with-toolset=gcc --with-icu --with-python=/usr/bin/python2 _bindir="bin.linuxx86" - [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64" - [ "${CARCH}" = "mips64el" ] && _bindir="bin.linuxmips" + [[ "${CARCH}" = "x86_64" ]] && _bindir="bin.linuxx86_64" + [[ "${CARCH}" = "mips64el" ]] && _bindir="bin.linuxmips" - install -d -m 755 "${_stagedir}"/bin - install "${srcdir}"/${pkgbase}_${_boostver}/tools/build/v2/engine/${_bindir}/bjam "${_stagedir}"/bin/bjam + install -dm755 "${_stagedir}"/bin + install tools/build/v2/engine/${_bindir}/b2 "${_stagedir}"/bin/b2 pushd tools for _tool in bcp inspect quickbook compiler_status process_jam_log wave; do - "${_stagedir}"/bin/bjam --toolset=gcc $_tool + "${_stagedir}"/bin/b2 --toolset=gcc cflags="${CPPFLAGS} ${CFLAGS} -std=gnu++11 -O3" linkflags="${LDFLAGS}" $_tool done - "${_stagedir}"/bin/bjam --toolset=gcc cflags="-std=gnu++11" library_status + "${_stagedir}"/bin/b2 --toolset=gcc cflags="${CPPFLAGS} ${CFLAGS} -O3" linkflags="${LDFLAGS}" library_status popd cp -a dist/bin/* "${_stagedir}"/bin - #boostbook is needed by quickbook - install -d -m 755 "${_stagedir}"/share/boostbook + # boostbook is needed by quickbook + install -dm755 "${_stagedir}"/share/boostbook cp -a tools/boostbook/{xsl,dtd} "${_stagedir}"/share/boostbook/ # Disable context on mips64el, it needs N32-specific assembly. @@ -74,21 +68,20 @@ build() { # and installs includes in /usr/include/boost. # --layout=system no longer adds the -mt suffix for multi-threaded libs. # install to ${_stagedir} in preparation for split packaging - "${_stagedir}"/bin/bjam \ + "${_stagedir}"/bin/b2 \ variant=release \ debug-symbols=off \ threading=multi \ runtime-link=shared \ - link=shared \ + link=shared,static \ toolset=gcc \ python=2.7 \ + cflags="${CPPFLAGS} ${CFLAGS} -O3" linkflags="${LDFLAGS}" \ --layout=system \ --prefix="${_stagedir}" \ $extra \ ${JOBS} \ install - - find ${_stagedir} -name \*.a -exec rm -f {} \; } package_boost() { @@ -97,12 +90,18 @@ package_boost() { optdepends=('python: for python bindings' 'python2: for python2 bindings' 'boost-build: to use boost jam for building your project.') + options=('staticlibs') - install -d -m 755 "${pkgdir}"/usr + install -dm755 "${pkgdir}"/usr cp -a "${_stagedir}"/{bin,include,share} "${pkgdir}"/usr - install -D -m 644 "${srcdir}/"${pkgbase}_${_boostver}/LICENSE_1_0.txt \ + install -d "${pkgdir}"/usr/lib + find "${_stagedir}"/lib -name \*.a -exec mv {} "${pkgdir}"/usr/lib \; + + install -Dm644 "${srcdir}/"${pkgbase}_${_boostver}/LICENSE_1_0.txt \ "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt + + ln -s /usr/bin/b2 "$pkgdir"/usr/bin/bjam } package_boost-libs() { @@ -110,9 +109,9 @@ package_boost-libs() { depends=('bzip2' 'zlib' 'icu') optdepends=('openmpi: for mpi support') - install -d -m 755 "${pkgdir}"/usr + install -dm755 "${pkgdir}"/usr cp -a "${_stagedir}"/lib "${pkgdir}"/usr - install -D -m 644 "${srcdir}/"${pkgbase}_${_boostver}/LICENSE_1_0.txt \ + install -Dm644 "${srcdir}/"${pkgbase}_${_boostver}/LICENSE_1_0.txt \ "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt } diff --git a/extra/boost/boost-1.53.0-python3.patch b/extra/boost/boost-1.53.0-python3.patch deleted file mode 100644 index 8d2f59269..000000000 --- a/extra/boost/boost-1.53.0-python3.patch +++ /dev/null @@ -1,96 +0,0 @@ -diff -Naur boost_1_53_0.ori/libs/mpi/src/python/datatypes.cpp boost_1_53_0/libs/mpi/src/python/datatypes.cpp ---- boost_1_53_0.ori/libs/mpi/src/python/datatypes.cpp 2007-11-25 13:38:02.000000000 -0500 -+++ boost_1_53_0/libs/mpi/src/python/datatypes.cpp 2013-03-11 20:59:57.171732691 -0400 -@@ -13,6 +13,10 @@ - #include <boost/mpi/python/serialize.hpp> - #include <boost/mpi.hpp> - -+#if PY_MAJOR_VERSION >= 3 -+#define PyInt_Type PyLong_Type -+#endif -+ - namespace boost { namespace mpi { namespace python { - - void export_datatypes() -diff -Naur boost_1_53_0.ori/libs/mpi/src/python/py_environment.cpp boost_1_53_0/libs/mpi/src/python/py_environment.cpp ---- boost_1_53_0.ori/libs/mpi/src/python/py_environment.cpp 2007-11-25 13:38:02.000000000 -0500 -+++ boost_1_53_0/libs/mpi/src/python/py_environment.cpp 2013-03-11 21:02:12.961737401 -0400 -@@ -11,6 +11,9 @@ - * This file reflects the Boost.MPI "environment" class into Python - * methods at module level. - */ -+ -+#include <locale> -+#include <string> - #include <boost/python.hpp> - #include <boost/mpi.hpp> - -@@ -50,11 +53,65 @@ - - // If anything changed, convert C-style argc/argv into Python argv - if (mpi_argv != my_argv) -+ { -+#if PY_MAJOR_VERSION >= 3 -+ // Code stolen from py3k/Modules/python.c. -+ -+ wchar_t **argv_copy = (wchar_t **)PyMem_Malloc(sizeof(wchar_t*)*mpi_argc); -+ /* We need a second copies, as Python might modify the first one. */ -+ wchar_t **argv_copy2 = (wchar_t **)PyMem_Malloc(sizeof(wchar_t*)*mpi_argc); -+ -+ if (!argv_copy || !argv_copy2) { -+ fprintf(stderr, "out of memory\n"); -+ return false; -+ } -+ -+ std::locale mylocale; -+ mbstate_t mystate; -+ -+ const std::codecvt<char, wchar_t, mbstate_t>& myfacet = -+ std::use_facet<std::codecvt<char, wchar_t, mbstate_t> >(mylocale); -+ -+ for (int i = 0; i < mpi_argc; i++) -+ { -+ size_t length = strlen(mpi_argv[i]); -+ -+ wchar_t *dest = (wchar_t *) PyMem_Malloc(sizeof(wchar_t) * (length + 1)); -+ -+ const char *from_next; -+ wchar_t *to_next; -+ -+ std::codecvt<wchar_t,char,mbstate_t>::result myresult = -+ myfacet.out(mystate, -+ mpi_argv[i], mpi_argv[i] + length + 1, from_next, -+ dest, dest+length+1, to_next); -+ -+ if (myresult != std::codecvt<wchar_t,char,mbstate_t>::ok ) -+ { -+ fprintf(stderr, "failure translating argv\n"); -+ return 1; -+ } -+ -+ argv_copy2[i] = argv_copy[i] = dest; -+ if (!argv_copy[i]) -+ return false; -+ } -+ -+ PySys_SetArgv(mpi_argc, argv_copy); -+ -+ for (int i = 0; i < mpi_argc; i++) { -+ PyMem_Free(argv_copy2[i]); -+ } -+ PyMem_Free(argv_copy); -+ PyMem_Free(argv_copy2); -+#else - PySys_SetArgv(mpi_argc, mpi_argv); -+#endif -+ } - -- for (int arg = 0; arg < my_argc; ++arg) -- free(my_argv[arg]); -- delete [] my_argv; -+ for (int arg = 0; arg < mpi_argc; ++arg) -+ free(mpi_argv[arg]); -+ delete [] mpi_argv; - - return true; - } diff --git a/extra/boost/boost-1.54.0-Fix-macro-for-int128-detection.patch b/extra/boost/boost-1.54.0-Fix-macro-for-int128-detection.patch deleted file mode 100644 index 1f337bedf..000000000 --- a/extra/boost/boost-1.54.0-Fix-macro-for-int128-detection.patch +++ /dev/null @@ -1,35 +0,0 @@ -Index: /trunk/boost/lexical_cast.hpp
-===================================================================
---- /trunk/boost/lexical_cast.hpp (revision 84136)
-+++ /trunk/boost/lexical_cast.hpp (revision 84965)
-@@ -70,8 +70,8 @@
- #endif
-
--#if (defined(BOOST_LCAST_HAS_INT128) && !defined(__GNUC__)) || GCC_VERSION > 40700
-+// GCC 4.6 has some issues with int128 and uint128. Issues were fixed in GCC 4.7
-+#if defined(BOOST_HAS_INT128) && (!defined(__GNUC__) || __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6))
- #define BOOST_LCAST_HAS_INT128
- #endif
--
-
- namespace boost
-Index: /trunk/libs/conversion/test/lexical_cast_integral_types_test.cpp
-===================================================================
---- /trunk/libs/conversion/test/lexical_cast_integral_types_test.cpp (revision 83717)
-+++ /trunk/libs/conversion/test/lexical_cast_integral_types_test.cpp (revision 84965)
-@@ -49,5 +49,5 @@
- #endif
-
--#if (defined(BOOST_LCAST_HAS_INT128) && !defined(__GNUC__)) || GCC_VERSION > 40700
-+#if defined(BOOST_HAS_INT128) && (!defined(__GNUC__) || __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6))
- #define BOOST_LCAST_HAS_INT128
- #endif
-@@ -445,6 +445,6 @@
-
- // Overflow test case from David W. Birdsall
-- std::string must_owerflow_str = "160000000000000000000";
-- std::string must_owerflow_negative_str = "-160000000000000000000";
-+ std::string must_owerflow_str = (sizeof(T) < 16 ? "160000000000000000000" : "1600000000000000000000000000000000000000");
-+ std::string must_owerflow_negative_str = (sizeof(T) < 16 ? "-160000000000000000000" : "-1600000000000000000000000000000000000000");
- for (int i = 0; i < 15; ++i) {
- BOOST_CHECK_THROW(lexical_cast<T>(must_owerflow_str), bad_lexical_cast);
diff --git a/extra/boost/fix-new-glibc.patch b/extra/boost/fix-new-glibc.patch deleted file mode 100644 index 5daa11cf5..000000000 --- a/extra/boost/fix-new-glibc.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: /trunk/boost/cstdint.hpp
-===================================================================
---- /trunk/boost/cstdint.hpp (revision 84805)
-+++ /trunk/boost/cstdint.hpp (revision 84950)
-@@ -42,5 +42,8 @@
- // See https://svn.boost.org/trac/boost/ticket/3548 and http://sources.redhat.com/bugzilla/show_bug.cgi?id=10990
- //
--#if defined(BOOST_HAS_STDINT_H) && (!defined(__GLIBC__) || defined(__GLIBC_HAVE_LONG_LONG))
-+#if defined(BOOST_HAS_STDINT_H) \
-+ && (!defined(__GLIBC__) \
-+ || defined(__GLIBC_HAVE_LONG_LONG) \
-+ || (defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 17)))))
-
- // The following #include is an implementation artifact; not part of interface.
diff --git a/extra/brasero/PKGBUILD b/extra/brasero/PKGBUILD index c9852bf20..12dfa88c4 100644 --- a/extra/brasero/PKGBUILD +++ b/extra/brasero/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 197878 2013-10-30 11:25:26Z allan $ +# $Id: PKGBUILD 200317 2013-11-25 16:54:50Z heftig $ # Maintainer: Allan McRae <allan@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=brasero -pkgver=3.8.0 -pkgrel=3 +pkgver=3.10.0 +pkgrel=1 pkgdesc="A disc burning application for Gnome" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnome.org/projects/brasero" license=('GPL') options=('!emptydirs') -depends=('gtk3' 'gst-plugins-good' 'totem-plparser' 'cdrkit' 'cdrdao' 'desktop-file-utils' 'hicolor-icon-theme' 'shared-mime-info' 'libcanberra' 'dvd+rw-tools' 'dconf' 'libsm' 'libtracker-sparql' 'libnotify') +depends=('gtk3' 'gst-plugins-good' 'totem-plparser' 'cdrkit' 'cdrdao' 'desktop-file-utils' 'hicolor-icon-theme' 'shared-mime-info' 'libcanberra' 'dvd+rw-tools' 'dconf' 'libsm' 'libtracker-sparql' 'libnotify' 'gvfs') makedepends=('gtk-doc' 'yelp-tools' 'gnome-common' 'intltool' 'libburn' 'libisofs' 'libnautilus-extension' 'gobject-introspection' 'gconf' 'itstool' 'docbook-xsl') optdepends=('libburn: alternative back-end' 'libisofs: libburn back-end' @@ -20,25 +20,11 @@ optdepends=('libburn: alternative back-end' replaces=('nautilus-cd-burner') install=brasero.install groups=('gnome-extra') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - bug655513.patch) -sha256sums=('d98a368a6129e50681e8243c5e0833c32cca699bd50b839c6a551d52b396bce4' - '3e774040c570881fe120af7c250a91e8a69331289490c823feed87c4d00f98fb') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('88fd9135e796f58caeb484d00f5d95916c67f97505e68d2027ab84d3f9245f37') -prepare() { - cd "$pkgname-$pkgver" - - # Update tracker dep - sed -i '/tracker/s/0\.14/0.16/' configure.ac - - # Fix infinite loop after cancelling the burn image dialog - patch -Np1 -i ../bug655513.patch -} - build() { cd "$pkgname-$pkgver" - autoreconf -f -v -i - ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-caches \ --disable-schemas-compile diff --git a/extra/brasero/bug655513.patch b/extra/brasero/bug655513.patch deleted file mode 100644 index c5841d3f7..000000000 --- a/extra/brasero/bug655513.patch +++ /dev/null @@ -1,37 +0,0 @@ -From f122ee0620380b7c21edce722cfe347f10c8c827 Mon Sep 17 00:00:00 2001 -From: Joshua Lock <joshua.lock@intel.com> -Date: Tue, 03 Sep 2013 10:01:26 +0000 -Subject: brasero-app: don't try and show the main window if it hasn't been created - -It's possible to open brasero without creating the main window, such as -when opening an image file directly triggering the image burning dialogue. -In these cases trying to show the main window when the dialogue is -dismissed is an error, brasero should just exit. - -https://bugzilla.gnome.org/show_bug.cgi?id=655513 ---- -diff --git a/src/brasero-app.c b/src/brasero-app.c -index d345941..8d10781 100644 ---- a/src/brasero-app.c -+++ b/src/brasero-app.c -@@ -2013,6 +2013,9 @@ brasero_app_run_mainwin (BraseroApp *app) - - priv = BRASERO_APP_PRIVATE (app); - -+ if (!priv->mainwin) -+ return FALSE; -+ - if (priv->mainwin_running) - return TRUE; - -@@ -2055,6 +2058,8 @@ brasero_app_init (BraseroApp *object) - - priv = BRASERO_APP_PRIVATE (object); - -+ priv->mainwin = NULL; -+ - /* Load settings */ - priv->setting = brasero_setting_get_default (); - brasero_setting_load (priv->setting); --- -cgit v0.9.2 diff --git a/extra/bullet/PKGBUILD b/extra/bullet/PKGBUILD new file mode 100644 index 000000000..5e8a66da2 --- /dev/null +++ b/extra/bullet/PKGBUILD @@ -0,0 +1,74 @@ +# $Id: PKGBUILD 201525 2013-12-13 20:43:18Z ronald $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> + +pkgbase=bullet +pkgname=('bullet' 'bullet-docs') +_rev=2704 +pkgver=2.82 +pkgrel=1 +pkgdesc="A 3D Collision Detection and Rigid Body Dynamics Library for games and animation" +arch=('i686' 'x86_64' 'mips64el') +url="http://www.bulletphysics.com/Bullet/" +license=('custom:zlib') +depends=() +makedepends=('cmake' 'doxygen' 'graphviz' 'ttf-dejavu' 'mesa') +source=(http://bullet.googlecode.com/files/${pkgbase}-${pkgver}-r${_rev}.tgz + ${pkgbase}.pc) +md5sums=('70b3c8d202dee91a0854b4cbc88173e8' + 'd1da06deba3b08b884d2212f6838905c') + +build() { + cd ${pkgbase}-${pkgver}-r${_rev} + + # get a clean build dir + [[ -d build ]] && rm -rf build + mkdir build && cd build + + # generate CMake Makefile + cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_SHARED_LIBS=1 \ + -DBUILD_DEMOS=0 \ + -DBUILD_MULTITHREADING=1 \ + -DBUILD_EXTRAS=1 \ + -DINSTALL_LIBS=1 \ + -DINSTALL_EXTRA_LIBS=1 \ + -DCMAKE_BUILD_TYPE=Release # set =Debug for debugging version + + # compile + make + + # generate docs + cd .. + sed -i 's/GENERATE_HTMLHELP.*//g' Doxyfile + doxygen +} + +package_bullet() { + optdepends=('bullet-docs: documentation') + + cd ${pkgbase}-${pkgver}-r${_rev}/build + + # install it + make DESTDIR=${pkgdir} install + + # manually handle pkgconfig file + mkdir -p "${pkgdir}"/usr/lib/pkgconfig + sed "s|VERSION|${pkgver}|g" ${srcdir}/bullet.pc > ${pkgdir}/usr/lib/pkgconfig/bullet.pc + + # install license + install -Dm644 ../BulletLicense.txt ${pkgdir}/usr/share/licenses/${pkgbase}/LICENSE +} + +package_bullet-docs() { + pkgdesc="Documentation for bullet" + depends=() + + cd ${pkgbase}-${pkgver}-r${_rev} + + # install docs + install -Dm644 Bullet_User_Manual.pdf ${pkgdir}/usr/share/doc/bullet/Bullet_User_Manual.pdf + cp -r html ${pkgdir}/usr/share/doc/bullet/html +} +# vim: sw=2 ts=2 et: diff --git a/extra/bullet/bullet.pc b/extra/bullet/bullet.pc new file mode 100644 index 000000000..d236b477f --- /dev/null +++ b/extra/bullet/bullet.pc @@ -0,0 +1,11 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: bullet +Description: Bullet Continuous Collision Detection and Physics Library +Requires: +Version: VERSION +Libs: -L${libdir} -lBulletDynamics -lBulletCollision -lLinearMath -lBulletSoftBody +Cflags: -I${includedir}/bullet diff --git a/extra/burp/PKGBUILD b/extra/burp/PKGBUILD index 17caf175e..59d0b6883 100644 --- a/extra/burp/PKGBUILD +++ b/extra/burp/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 170189 2012-11-04 15:22:01Z dreisner $ +# $Id: PKGBUILD 199808 2013-11-17 00:47:14Z dreisner $ # Maintainer: Dave Reisner <d@falconindy.com> pkgname=burp -pkgver=2 +pkgver=3 pkgrel=1 pkgdesc="A simple AUR uploader" arch=('i686' 'x86_64' 'mips64el') @@ -10,9 +10,9 @@ url="http://github.com/falconindy/burp" license=('GPL') depends=('glibc' 'curl') makedepends=('perl') -source=("https://github.com/downloads/falconindy/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}) -md5sums=('390436816f38d43b3ffb1079add4fa8e' - '2b16c8187c299d249446b251fe762aed') +source=("http://code.falconindy.com/archive/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}) +md5sums=('3afc7346b3ba63ce9487bdbba1e370f1' + 'SKIP') build() { make -C "$pkgname-$pkgver" diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index 412343469..b62b3c852 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 196740 2013-10-17 14:02:44Z andyrtr $ +# $Id: PKGBUILD 200653 2013-12-01 09:50:18Z andyrtr $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> @@ -17,8 +17,8 @@ pkgname=('calligra-braindump' 'calligra-sheets' 'calligra-stage' 'calligra-words') -pkgver=2.7.4 -pkgrel=1 +pkgver=2.7.5 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') @@ -29,7 +29,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs' 'eigen2' 'kdeedu-marble' [ "$CARCH" != "mips64el" ] && makedepends+=('vc') groups=('calligra') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.xz") -md5sums=('0a9368b4a134eaf7c9834d21097e5016') +md5sums=('05d1d0bac970d6dc68ffabc12fca2eb7') prepare() { mkdir build diff --git a/extra/caribou/PKGBUILD b/extra/caribou/PKGBUILD index c5d80400a..3e98f6ebd 100644 --- a/extra/caribou/PKGBUILD +++ b/extra/caribou/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 197884 2013-10-30 11:27:44Z allan $ +# $Id: PKGBUILD 200221 2013-11-22 18:17:37Z heftig $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Adam Hani Schakaki <krzd@krzd.net> pkgname=caribou -pkgver=0.4.11 +pkgver=0.4.13 pkgrel=1 -pkgdesc="A text entry and UI navigation application being developed as an alternative to the Gnome On-screen Keyboard." +pkgdesc="A text entry and UI navigation application (on-screen keyboard)" arch=('i686' 'x86_64' 'mips64el') url="http://live.gnome.org/Caribou" license=(LGPL) @@ -13,16 +13,19 @@ depends=(at-spi2-atk python2-atspi python2-gobject gtk3 libxklavier libgee clutt makedepends=(intltool docbook-xsl gtk2) install=caribou.install options=(!emptydirs) -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.4/$pkgname-$pkgver.tar.xz) -sha256sums=('e4e81387a1a6875652b8ec9dede8573844fac274c8de9ad0416cf586a318f4f9') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('953ba618621fda8a828d0d797fc916dbe35990dc01d7aa99d15e5e2241ee2782') -build() { +prepare() { cd $pkgname-$pkgver sed -i s'|#!/usr/bin/python|#!/usr/bin/python2|'g tools/{fix_gir,make_schema}.py +} + +build() { + cd $pkgname-$pkgver export PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/caribou \ - --disable-gtk2-module \ + --libexecdir=/usr/lib/$pkgname \ --disable-static \ --disable-schemas-compile @@ -34,7 +37,7 @@ build() { check() { cd $pkgname-$pkgver - make check + make -k check } package() { diff --git a/extra/ccache/PKGBUILD b/extra/ccache/PKGBUILD deleted file mode 100644 index b69b5fb0d..000000000 --- a/extra/ccache/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 174762 2013-01-07 00:33:58Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=ccache -pkgver=3.1.9 -pkgrel=1 -pkgdesc="A compiler cache" -arch=('i686' 'x86_64' 'mips64el') -url="http://ccache.samba.org/" -license=('GPL3') -depends=('zlib') -source=("http://samba.org/ftp/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('65f48376a91d3651d6527ca568858be8') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr - - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - - install -Dm 755 ccache ${pkgdir}/usr/bin/ccache - install -Dm 644 ccache.1 ${pkgdir}/usr/share/man/man1/ccache.1 - - install -d ${pkgdir}/usr/lib/ccache/bin - ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/cc - ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/gcc - ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/g++ - ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/cpp - ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/c++ - ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/${CHOST}-cc - ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/${CHOST}-gcc - ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/${CHOST}-g++ - ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/${CHOST}-cpp - ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/${CHOST}-c++ -} diff --git a/extra/cfitsio/PKGBUILD b/extra/cfitsio/PKGBUILD index b8629c086..5658ded32 100644 --- a/extra/cfitsio/PKGBUILD +++ b/extra/cfitsio/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 197887 2013-10-30 11:28:50Z allan $ +# $Id: PKGBUILD 202206 2013-12-19 12:17:51Z fyan $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=cfitsio -pkgver=3.350 -pkgrel=2 +pkgver=3.360 +pkgrel=1 pkgdesc="A library of C and Fortran subroutines for reading and writing data files in FITS (Flexible Image Transport System) data format" arch=('i686' 'x86_64' 'mips64el') url="http://heasarc.gsfc.nasa.gov/fitsio/" license=('custom') +depends=('glibc') source=("ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/${pkgname}${pkgver/./}.tar.gz") -sha1sums=('e928832708d6a5df21a1e17ae4a63036cab7c1b9') +sha512sums=('1ee864cc5c51347ec262dbc585b2dbbd8630a7396bdcbe7a860906371dc296dc147d72a999a54b255514dd81783bb8f8c79d7a75f8689d085ba90931947100e1') build() { cd ${pkgname} diff --git a/extra/check/PKGBUILD b/extra/check/PKGBUILD index 990b189c2..cc783c7a6 100644 --- a/extra/check/PKGBUILD +++ b/extra/check/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 197888 2013-10-30 11:29:14Z allan $ +# $Id: PKGBUILD 200362 2013-11-27 06:20:00Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Jeremy Cowgar <jeremy@cowgar.com> pkgname=check -pkgver=0.9.10 +pkgver=0.9.11 pkgrel=1 pkgdesc="A unit testing framework for C" arch=('i686' 'x86_64' 'mips64el') url="http://check.sourceforge.net/" license=('LGPL') install=$pkgname.install +depends=('awk') source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('6d10a8efb9a683467b92b3bce97aeb30') +md5sums=('fd5a03979bcab9fb80ba005b55f54178') build() { cd $pkgname-$pkgver @@ -20,6 +21,12 @@ build() { make } +check() { + cd $pkgname-$pkgver + # Extremely long + #make -k check +} + package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install diff --git a/extra/cheese/PKGBUILD b/extra/cheese/PKGBUILD index 0fbf85869..d96c3c460 100644 --- a/extra/cheese/PKGBUILD +++ b/extra/cheese/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 197889 2013-10-30 11:29:34Z allan $ +# $Id: PKGBUILD 200777 2013-12-04 22:00:35Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=cheese -pkgver=3.10.1 -pkgrel=1 +pkgver=3.10.2 +pkgrel=2 pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others" arch=(i686 x86_64 'mips64el') license=('GPL') -depends=('gtk3' 'gstreamer' 'gst-plugins-bad' 'gst-plugins-base' 'gst-plugins-good' 'clutter-gst' 'clutter-gtk' 'libcanberra' 'gnome-video-effects' 'librsvg' 'gnome-desktop' 'nautilus-sendto' 'hicolor-icon-theme') +depends=('gtk3' 'gstreamer' 'gst-plugins-bad' 'gst-plugins-base' 'gst-plugins-good' 'clutter-gst' 'clutter-gtk' 'libcanberra' 'gnome-video-effects' 'librsvg' 'gnome-desktop') makedepends=('pkgconfig' 'intltool' 'gobject-introspection' 'itstool' 'vala') optdepends=('frei0r-plugins: More camera effects') groups=('gnome-extra') options=('!emptydirs') url="http://www.gnome.org/projects/cheese/" install=cheese.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('ff2e89921eb6a1eec38b4cde69ee8d0dd48ebeb821715e0080f94aa4c1064cc4') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('3e5f4ac078bac60571ff61bc2cd451349d78e01ecaaff031da16fe29ff094945') build() { cd $pkgname-$pkgver diff --git a/extra/chemtool/PKGBUILD b/extra/chemtool/PKGBUILD index 0fe76b3f0..70caf7906 100644 --- a/extra/chemtool/PKGBUILD +++ b/extra/chemtool/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 197890 2013-10-30 11:29:54Z allan $ +# $Id: PKGBUILD 199891 2013-11-18 07:50:43Z tpowa $ #Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=chemtool -pkgver=1.6.13 -pkgrel=1.2 +pkgver=1.6.14 +pkgrel=1 pkgdesc="A small program for drawing chemical structures" arch=(i686 x86_64 'mips64el') license=('GPL2') @@ -24,5 +24,5 @@ package() { install -D -m644 gnome/chemtool.png ${pkgdir}/usr/share/pixmaps/chemtool.png install -D -m644 ${srcdir}/chemtool.desktop ${pkgdir}/usr/share/applications/chemtool.desktop } -md5sums=('d263b8cf097134e36c5e929e7e77d668' +md5sums=('3a97680f0abe1327af1f0072551a68e2' '8cbb6f7021bd5aaa6f6a31fc4d95a06e') diff --git a/extra/chromaprint/PKGBUILD b/extra/chromaprint/PKGBUILD index 63e492395..96e7b021b 100644 --- a/extra/chromaprint/PKGBUILD +++ b/extra/chromaprint/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 193966 2013-09-09 09:33:12Z bisson $ +# $Id: PKGBUILD 200281 2013-11-24 17:51:20Z bisson $ # Contributor: Wieland Hoffmann <the_mineo@web.de> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=chromaprint -pkgver=1.0 +pkgver=1.1 pkgrel=1 pkgdesc='Library that implements a custom algorithm for extracting fingerprints from any audio source' url='http://acoustid.org/chromaprint/' @@ -12,7 +12,7 @@ license=('LGPL') depends=('ffmpeg') makedepends=('cmake') source=("https://bitbucket.org/acoustid/${pkgname}/downloads/${pkgname}-${pkgver}.tar.gz") -sha1sums=('919e012af588a7e6fea862b29a30e3a5da67526a') +sha1sums=('5a250f761761d2ce08e2591b9daa909393552939') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/cifs-utils/PKGBUILD b/extra/cifs-utils/PKGBUILD index de8f3d954..4fc654e83 100644 --- a/extra/cifs-utils/PKGBUILD +++ b/extra/cifs-utils/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 189657 2013-07-04 08:28:20Z tpowa $ +# $Id: PKGBUILD 200381 2013-11-27 10:08:51Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=cifs-utils -pkgver=6.1 +pkgver=6.2 pkgrel=1 pkgdesc="CIFS filesystem user-space tools" arch=(i686 x86_64 'mips64el') @@ -24,4 +24,4 @@ package() { # set mount.cifs uid, to enable none root mounting form fstab chmod +s $pkgdir/usr/bin/mount.cifs } -md5sums=('f83ef48ab1154aa74dd4cf1c1202bf04') +md5sums=('6a83fe19e02266cb468ea3bf1cc0d007') diff --git a/extra/cinepaint/LICENSE b/extra/cinepaint/LICENSE deleted file mode 100644 index 746207229..000000000 --- a/extra/cinepaint/LICENSE +++ /dev/null @@ -1,25 +0,0 @@ -Copyright (c) 2005, Kai-Uwe Behrmann -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution.ntributors may be used to endorse or promote - products derived from this software without specific prior written - permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/extra/cinepaint/PKGBUILD b/extra/cinepaint/PKGBUILD deleted file mode 100644 index a3e58d68e..000000000 --- a/extra/cinepaint/PKGBUILD +++ /dev/null @@ -1,60 +0,0 @@ -# $Id: PKGBUILD 197892 2013-10-30 11:30:55Z allan $ -# Maintainer: tobias [tobias.archlinux.org] -# Contributor: tobias [tobias.justdreams.de] - -pkgname=cinepaint -pkgver=1.3 -pkgrel=8 -pkgdesc="Sophisticated graphics manipulation programm supporting > 8bit pictures" -arch=('i686' 'x86_64' 'mips64el') -license=('LGPL' 'GPL' 'MIT') -url="http://www.cinepaint.org" -depends=('gtk2' 'openexr' 'lcms' 'libxpm' 'fltk' 'ftgl' 'libxxf86vm') -makedepends=('python2' 'gutenprint>=5.2.9' 'optipng') -optdepends=('python2: for python plug-ins' - 'gutenprint: for print plug-ins' - 'ghostscript: for pdf plug-ins') -install=cinepaint.install -source=(http://downloads.sourceforge.net/project/cinepaint/CinePaint/CinePaint-${pkgver}/${pkgname}-${pkgver}.tgz - LICENSE cinepaint-libpng15.patch cinepaint-missing-include.patch) -sha1sums=('1982e32b0f461f4fd0ff0fe17a2e81ccd8dbd52b' - 'ca8411db87f3fc51bbdfade22f4e1f555b2ee19e' - '3dfc9f06f02791aee59b60d33ddf9d305b0f1de5' - 'a4f43aabdbb33d059f1a38442cd6625e4f00c5b9') - -prepare() { - cd ${pkgname} - patch -p1 -i ../cinepaint-libpng15.patch - patch -p1 -i ../cinepaint-missing-include.patch - find plug-ins/pygimp -type f -exec sed -i 's#env python#env python2#' {} + - sed -i 's|$(LDFLAGS) -o|$(LDFLAGS) $(GTK_LIBS) -o|' lib/Makefile.in - sed -i -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|' \ - -e 's|AM_PROG_CC_STDC|AC_PROG_CC|' configure.in - - aclocal -I aclocal - autoconf - sh autogen.sh - - # Fix invalid PNG icons to work with libpng 1.6 - # Notified the CinePaint Project Manager (Robin Rowe) via email - find -name '*.png' -exec optipng -quiet -force -fix {} + -} - -build() { - cd ${pkgname} - LIBS+="-lstdc++ -lm -lX11" PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ - --libdir=/usr/lib --mandir=/usr/share/man \ - --enable-gtk2 --enable-pygimp --with-python=/usr/bin/python2 - sed -i 's/-Wl,,/-Wl,/' lib/fl_i18n/Makefile plug-ins/bracketing_to_hdr/Makefile \ - plug-ins/collect/Makefile plug-ins/icc_examin/icc_examin/Makefile plug-ins/pdf/Makefile - make -} - -package() { - cd ${pkgname} - make DESTDIR="${pkgdir}" install - sed -i -e "s|-I$srcdir/cinepaint||" -e "s|-I$srcdir/cinepaint/lib||" -e "/libcinepaint.la/d" \ - -e "s|$srcdir/cinepaint/lib/.libs/\$dlname||" "${pkgdir}/usr/bin/cinepainttool" - sed -i "s/cinepaint.png/cinepaint/" "${pkgdir}/usr/share/applications/cinepaint.desktop" - install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/extra/cinepaint/cinepaint-libpng15.patch b/extra/cinepaint/cinepaint-libpng15.patch deleted file mode 100644 index e22edafae..000000000 --- a/extra/cinepaint/cinepaint-libpng15.patch +++ /dev/null @@ -1,452 +0,0 @@ -diff -Naur cinepaint.old/plug-ins/png/png.c cinepaint/plug-ins/png/png.c ---- cinepaint.old/plug-ins/png/png.c 2012-01-23 12:39:42.000000000 -0500 -+++ cinepaint/plug-ins/png/png.c 2012-01-23 12:39:50.000000000 -0500 -@@ -390,6 +390,16 @@ - gchar *progress; /* Title for progress display... */ - guchar alpha[256], /* Index -> Alpha */ - *alpha_ptr; /* Temporary pointer */ -+ png_byte color_type; -+ png_byte bit_depth; -+ png_colorp palette; -+ int num_palette; -+ png_charpp iccp_name; -+ int compression_type; -+ png_bytepp iccp_profile; -+ png_uint_32 iccp_proflen; -+ png_uint_32 width, height; -+ png_byte channels; - - /* - * PNG 0.89 and newer have a sane, forwards compatible constructor. -@@ -405,7 +415,7 @@ - info = (png_infop)calloc(sizeof(png_info), 1); - #endif /* PNG_LIBPNG_VER > 88 */ - -- if (setjmp (pp->jmpbuf)) -+ if (setjmp (png_jmpbuf(pp))) - { - g_message ("%s\nPNG error. File corrupted?", filename); - return image; -@@ -442,21 +452,26 @@ - */ - - png_read_info(pp, info); -+ color_type = png_get_color_type(pp, info); -+ width=png_get_image_width(pp, info); -+ height=png_get_image_height(pp, info); - - /* - * Latest attempt, this should be my best yet :) - */ - -+ bit_depth = png_get_bit_depth(pp, info); -+ - #ifndef WORDS_BIGENDIAN -- if(info->bit_depth == 16) -+ if(bit_depth == 16) - png_set_swap(pp); - #endif - -- if (info->color_type == PNG_COLOR_TYPE_GRAY && info->bit_depth < 8) { -+ if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { - png_set_expand(pp); - } - -- if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8) { -+ if (color_type == PNG_COLOR_TYPE_PALETTE && bit_depth < 8) { - png_set_packing(pp); - } - -@@ -464,8 +479,8 @@ - * Expand G+tRNS to GA, RGB+tRNS to RGBA - */ - -- if (info->color_type != PNG_COLOR_TYPE_PALETTE && -- (info->valid & PNG_INFO_tRNS)) { -+ if (color_type != PNG_COLOR_TYPE_PALETTE && -+ (png_get_valid(pp, info, PNG_INFO_tRNS))) { - png_set_expand(pp); - } - -@@ -482,7 +497,7 @@ - - #if PNG_LIBPNG_VER > 99 - if (png_get_valid(pp, info, PNG_INFO_tRNS) && -- info->color_type == PNG_COLOR_TYPE_PALETTE) -+ color_type == PNG_COLOR_TYPE_PALETTE) - { - png_get_tRNS(pp, info, &alpha_ptr, &num, NULL); - /* Copy the existing alpha values from the tRNS chunk */ -@@ -505,9 +520,9 @@ - - png_read_update_info(pp, info); - -- if(info->bit_depth==16) -+ if(bit_depth==16) - { -- switch (info->color_type) -+ switch (color_type) - { - case PNG_COLOR_TYPE_RGB : /* RGB */ - bpp = 6; -@@ -545,7 +560,7 @@ - } - else - { -- switch (info->color_type) -+ switch (color_type) - { - case PNG_COLOR_TYPE_RGB : /* RGB */ - bpp = 3; -@@ -582,7 +597,7 @@ - }; - } - -- image = gimp_image_new(info->width, info->height, image_type); -+ image = gimp_image_new(width, height, image_type); - if (image == -1) - { - g_message("Can't allocate new image\n%s", filename); -@@ -595,7 +610,7 @@ - * Create the "background" layer to hold the image... - */ - -- layer = gimp_layer_new(image, _("Background"), info->width, info->height, -+ layer = gimp_layer_new(image, _("Background"), width, height, - layer_type, 100, NORMAL_MODE); - gimp_image_add_layer(image, layer, 0); - -@@ -627,20 +642,21 @@ - - empty= 0; /* by default assume no full transparent palette entries */ - -- if (info->color_type & PNG_COLOR_MASK_PALETTE) { -+ if (color_type & PNG_COLOR_MASK_PALETTE) { - - #if PNG_LIBPNG_VER > 99 -+ png_get_PLTE(pp, info, &palette, &num_palette); - if (png_get_valid(pp, info, PNG_INFO_tRNS)) { - for (empty= 0; empty < 256 && alpha[empty] == 0; ++empty); - /* Calculates number of fully transparent "empty" entries */ - -- gimp_image_set_cmap(image, (guchar *) (info->palette + empty), -- info->num_palette - empty); -+ gimp_image_set_cmap(image, (guchar *) (palette + empty), -+ num_palette - empty); - } else { -- gimp_image_set_cmap(image, (guchar *)info->palette, info->num_palette); -+ gimp_image_set_cmap(image, (guchar *)palette, num_palette); - } - #else -- gimp_image_set_cmap(image, (guchar *)info->palette, info->num_palette); -+ gimp_image_set_cmap(image, (guchar *)palette, num_palette); - #endif /* PNG_LIBPNG_VER > 99 */ - - } -@@ -659,18 +675,19 @@ - */ - - tile_height = gimp_tile_height (); -- pixel = g_new(guchar, tile_height * info->width * bpp); -+ pixel = g_new(guchar, tile_height * width * bpp); - pixels = g_new(guchar *, tile_height); -+ channels=png_get_channels(pp, info); - -- if(info->bit_depth==16) -+ if(bit_depth==16) - { - for (i = 0; i < tile_height; i ++) -- pixels[i] = pixel + info->width * info->channels * i * 2; -+ pixels[i] = pixel + width * channels * i * 2; - } - else - { - for (i = 0; i < tile_height; i ++) -- pixels[i] = pixel + info->width * info->channels * i; -+ pixels[i] = pixel + width * channels * i; - } - - for (pass = 0; pass < num_passes; pass ++) -@@ -680,11 +697,11 @@ - */ - - for (begin = 0, end = tile_height; -- begin < info->height; -+ begin < height; - begin += tile_height, end += tile_height) - { -- if (end > info->height) -- end = info->height; -+ if (end > height) -+ end = height; - - num = end - begin; - -@@ -697,20 +714,21 @@ - gimp_pixel_rgn_set_rect(&pixel_rgn, pixel, 0, begin, - drawable->width, num); - -- gimp_progress_update(((double)pass + (double)end / (double)info->height) / -+ gimp_progress_update(((double)pass + (double)end / (double)height) / - (double)num_passes); - }; - }; - - #if defined(PNG_iCCP_SUPPORTED) - /* set icc profile */ -- if (info->iccp_proflen > 0) { -- gimp_image_set_icc_profile_by_mem (image, info->iccp_proflen, -- info->iccp_profile, -- ICC_IMAGE_PROFILE); -+ png_get_iCCP(pp, info, (png_charpp)iccp_name, &compression_type, iccp_profile, &iccp_proflen); -+ if (iccp_proflen > 0) { -+ gimp_image_set_icc_profile_by_mem (image, iccp_proflen, -+ (gchar *)iccp_profile, -+ ICC_IMAGE_PROFILE); - printf ("%s:%d %s() set embedded profile \"%s\"\n", - __FILE__,__LINE__,__func__, -- info->iccp_name); -+ (char *)iccp_name); - } - #endif - -@@ -808,6 +826,14 @@ - blue; /* Used for palette background */ - time_t cutime; /* Time since epoch */ - struct tm *gmt; /* GMT broken down */ -+ png_byte color_type; -+ png_byte bit_depth; -+ int filter_method=0; -+ png_colorp palette; -+ int num_palette; -+ png_charpp iccp_name; -+ png_uint_32 height; -+ int compression_type; - - /* - * PNG 0.89 and newer have a sane, forwards compatible constructor. -@@ -824,7 +849,7 @@ - info = (png_infop)calloc(sizeof(png_info), 1); - #endif /* PNG_LIBPNG_VER > 88 */ - -- if (setjmp (pp->jmpbuf)) -+ if (setjmp (png_jmpbuf(pp))) - { - g_message ("%s\nPNG error. Couldn't save image", filename); - return 0; -@@ -857,15 +882,6 @@ - drawable = gimp_drawable_get (drawable_ID); - type = gimp_drawable_type (drawable_ID); - -- /* -- * Set the image dimensions, bit depth, interlacing and compression -- */ -- -- png_set_compression_level (pp, pngvals.compression_level); -- -- info->width = drawable->width; -- info->height = drawable->height; -- info->interlace_type = pngvals.interlaced; - - /* - * Set color type and remember bytes per pixel count -@@ -874,71 +890,69 @@ - switch (type) - { - case RGB_IMAGE : -- info->color_type = PNG_COLOR_TYPE_RGB; -- info->bit_depth = 8; -+ color_type = PNG_COLOR_TYPE_RGB; -+ bit_depth = 8; - bpp = 3; - break; - case RGBA_IMAGE : -- info->color_type = PNG_COLOR_TYPE_RGB_ALPHA; -- info->bit_depth = 8; -+ color_type = PNG_COLOR_TYPE_RGB_ALPHA; -+ bit_depth = 8; - bpp = 4; - break; - case GRAY_IMAGE : -- info->color_type = PNG_COLOR_TYPE_GRAY; -- info->bit_depth = 8; -+ color_type = PNG_COLOR_TYPE_GRAY; -+ bit_depth = 8; - bpp = 1; - break; - case GRAYA_IMAGE : -- info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA; -- info->bit_depth = 8; -+ color_type = PNG_COLOR_TYPE_GRAY_ALPHA; -+ bit_depth = 8; - bpp = 2; - break; - case INDEXED_IMAGE : - bpp = 1; -- info->bit_depth = 8; -- info->color_type = PNG_COLOR_TYPE_PALETTE; -- info->valid |= PNG_INFO_PLTE; -- info->palette= (png_colorp) gimp_image_get_cmap(image_ID, &num_colors); -- info->num_palette= num_colors; -+ bit_depth = 8; -+ color_type = PNG_COLOR_TYPE_PALETTE; -+ png_get_valid(pp, info, PNG_INFO_PLTE); -+ png_set_PLTE(pp, info, (png_colorp) gimp_image_get_cmap(image_ID, &num_colors), num_colors); - break; - case INDEXEDA_IMAGE : - bpp = 2; -- info->bit_depth = 8; -- info->color_type = PNG_COLOR_TYPE_PALETTE; -+ bit_depth = 8; -+ color_type = PNG_COLOR_TYPE_PALETTE; - respin_cmap (pp, info, image_ID); /* fix up transparency */ - break; - case U16_RGB_IMAGE : -- info->color_type = PNG_COLOR_TYPE_RGB; -- info->bit_depth = 16; -+ color_type = PNG_COLOR_TYPE_RGB; -+ bit_depth = 16; - bpp = 6; - break; - case U16_RGBA_IMAGE : -- info->color_type = PNG_COLOR_TYPE_RGB_ALPHA; -- info->bit_depth = 16; -+ color_type = PNG_COLOR_TYPE_RGB_ALPHA; -+ bit_depth = 16; - bpp = 8; - break; - case U16_GRAY_IMAGE : -- info->color_type = PNG_COLOR_TYPE_GRAY; -- info->bit_depth = 16; -+ color_type = PNG_COLOR_TYPE_GRAY; -+ bit_depth = 16; - bpp = 2; - break; - case U16_GRAYA_IMAGE : -- info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA; -- info->bit_depth = 16; -+ color_type = PNG_COLOR_TYPE_GRAY_ALPHA; -+ bit_depth = 16; - bpp = 4; - break; - case U16_INDEXED_IMAGE : - bpp = 2; -- info->bit_depth = 16; -- info->color_type = PNG_COLOR_TYPE_PALETTE; -- info->valid |= PNG_INFO_PLTE; -- info->palette= (png_colorp) gimp_image_get_cmap(image_ID, &num_colors); -- info->num_palette= num_colors; -+ bit_depth = 16; -+ color_type = PNG_COLOR_TYPE_PALETTE; -+ png_get_valid(pp, info, PNG_INFO_PLTE); -+ png_set_PLTE(pp, info, (png_colorp) gimp_image_get_cmap(image_ID, &num_colors), num_colors); - break; - case U16_INDEXEDA_IMAGE : - bpp = 4; -- info->bit_depth = 16; -- info->color_type = PNG_COLOR_TYPE_PALETTE; -+ bit_depth = 16; -+ color_type = PNG_COLOR_TYPE_PALETTE; - respin_cmap (pp, info, image_ID); /* fix up transparency */ - break; - default: -@@ -950,30 +964,36 @@ - * Fix bit depths for (possibly) smaller colormap images - */ - -- if (info->valid & PNG_INFO_PLTE) { -- if (info->num_palette <= 2) -- info->bit_depth= 1; -- else if (info->num_palette <= 4) -- info->bit_depth= 2; -- else if (info->num_palette <= 16) -- info->bit_depth= 4; -+ if (png_get_valid(pp, info, PNG_INFO_PLTE)) { -+ png_get_PLTE(pp, info, &palette, &num_palette); -+ if (num_palette <= 2) -+ bit_depth= 1; -+ else if (num_palette <= 4) -+ bit_depth= 2; -+ else if (num_palette <= 16) -+ bit_depth= 4; - /* otherwise the default is fine */ - } - -+ png_set_compression_level (pp, pngvals.compression_level); -+ png_set_IHDR(pp, info, drawable->width, drawable->height, -+ bit_depth, color_type, pngvals.interlaced, compression_type, filter_method); -+ -+ - // write icc profile - #if defined(PNG_iCCP_SUPPORTED) - if (gimp_image_has_icc_profile (image_ID, ICC_IMAGE_PROFILE)) { -- int size; -+ int size; - char *buffer; - - buffer = gimp_image_get_icc_profile_by_mem (image_ID, &size, - ICC_IMAGE_PROFILE); - png_set_iCCP (pp, info, - gimp_image_get_icc_profile_description (image_ID, ICC_IMAGE_PROFILE), -- 0, buffer, size); -+ 0, (png_const_bytep)buffer, size); - printf ("%s:%d %s() embedd icc profile \"%s\"\n", - __FILE__,__LINE__,__func__, -- info->iccp_name); -+ (char *)iccp_name); - } - #endif - -@@ -1039,13 +1059,13 @@ - * Convert unpacked pixels to packed if necessary - */ - -- if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8) -+ if (color_type == PNG_COLOR_TYPE_PALETTE && bit_depth < 8) - png_set_packing(pp); - - /* Set swapping for 16 bit per sample images */ - - #ifndef WORDS_BIGENDIAN -- if (info->bit_depth == 16) -+ if (bit_depth == 16) - png_set_swap(pp); - #endif - -@@ -1063,6 +1083,7 @@ - - gimp_pixel_rgn_init(&pixel_rgn, drawable, 0, 0, drawable->width, - drawable->height, FALSE, FALSE); -+ height=png_get_image_height(pp, info); - - for (pass = 0; pass < num_passes; pass ++) - { -@@ -1077,7 +1098,7 @@ - num = end - begin; - - gimp_pixel_rgn_get_rect (&pixel_rgn, pixel, 0, begin, drawable->width, num); -- if (info->valid & PNG_INFO_tRNS) { -+ if (png_get_valid(pp, info, PNG_INFO_tRNS)) { - for (i = 0; i < num; ++i) { - fixed= pixels[i]; - for (k = 0; k < drawable->width; ++k) { -@@ -1085,7 +1106,7 @@ - } - } - /* Forgot this case before, what if there are too many colors? */ -- } else if (info->valid & PNG_INFO_PLTE && bpp == 2) { -+ } else if (png_get_valid(pp, info, PNG_INFO_PLTE) && bpp == 2) { - for (i = 0; i < num; ++i) { - fixed= pixels[i]; - for (k = 0; k < drawable->width; ++k) { -@@ -1095,9 +1116,8 @@ - } - - png_write_rows (pp, pixels, num); -- - gimp_progress_update (((double)pass + (double)end / -- (double)info->height) / (double)num_passes); -+ (double)height) / (double)num_passes); - }; - }; - diff --git a/extra/cinepaint/cinepaint-missing-include.patch b/extra/cinepaint/cinepaint-missing-include.patch deleted file mode 100644 index ed159213a..000000000 --- a/extra/cinepaint/cinepaint-missing-include.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur cinepaint-orig/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp cinepaint/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp ---- cinepaint-orig/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp 2012-04-20 18:51:10.625503826 -0400 -+++ cinepaint/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp 2012-04-20 18:52:04.478835055 -0400 -@@ -32,6 +32,7 @@ - - #include <list> - #include <string> -+#include <unistd.h> - - #include "icc_modell_beobachter.h" - diff --git a/extra/cinepaint/cinepaint.install b/extra/cinepaint/cinepaint.install deleted file mode 100644 index 5e5cfef4d..000000000 --- a/extra/cinepaint/cinepaint.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - update-desktop-database -q -} diff --git a/extra/claws-mail/PKGBUILD b/extra/claws-mail/PKGBUILD index 30e2b588b..da6b00a57 100644 --- a/extra/claws-mail/PKGBUILD +++ b/extra/claws-mail/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 197894 2013-10-30 11:31:39Z allan $ +# $Id: PKGBUILD 201548 2013-12-14 21:56:57Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=claws-mail -pkgver=3.9.2 -pkgrel=4 +pkgver=3.9.3 +pkgrel=1 pkgdesc="A GTK+ based e-mail client." arch=('i686' 'x86_64') license=('GPL3') url="http://www.claws-mail.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' '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 @@ -35,7 +35,7 @@ conflicts=('claws-mail-extra-plugins') provides=('claws') install=claws-mail.install source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2{,.asc}) -md5sums=('90de2a265e65fbd9dffdbf428bb0ee28' +md5sums=('0158b5e6b6d6866f9a75fd288a4edf04' 'SKIP') build() { diff --git a/extra/clucene/PKGBUILD b/extra/clucene/PKGBUILD index ff7ba1976..fad9998cd 100644 --- a/extra/clucene/PKGBUILD +++ b/extra/clucene/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 190036 2013-07-13 12:40:33Z svenstaro $ +# $Id: PKGBUILD 202663 2013-12-23 19:43:23Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Alexander Rødseth # Contributor: Alois Nespor <alois.nespor@gmail.com> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=clucene pkgver=2.3.3.4 -pkgrel=7 +pkgrel=8 pkgdesc="C++ port of the high-performance text search engine Lucene" arch=('x86_64' 'i686' 'mips64el') url="http://clucene.sourceforge.net/" @@ -74,5 +74,8 @@ build() { package() { cd $srcdir/$pkgname-core-$pkgver make DESTDIR="$pkgdir" install -C build - rm -rf $pkgdir/usr/lib/CLuceneConfig.cmake + rm -rfv $pkgdir/usr/lib/CLuceneConfig.cmake + + cd $pkgdir/usr/include//CLucene + ln -s /usr/lib/CLucene/clucene-config.h . } diff --git a/extra/clutter/PKGBUILD b/extra/clutter/PKGBUILD index e5f5b8872..c00e4ce07 100644 --- a/extra/clutter/PKGBUILD +++ b/extra/clutter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 197895 2013-10-30 11:32:01Z allan $ +# $Id: PKGBUILD 199922 2013-11-19 00:45:36Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=clutter -pkgver=1.16.0 +pkgver=1.16.2 pkgrel=1 pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('LGPL') depends=('cogl' 'mesa' 'json-glib' 'atk' 'libxi' 'libxkbcommon' 'libevdev') makedepends=('gobject-introspection') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('a213c7859051d6d19b5550c7e433757a35aa8e2b61a43d2eae83dd87912ea8ae') +sha256sums=('0cb7e88c80f43fc7fb869fc6d34c42e98aa1a0ef7aa02e6aeef1b099ad33df42') build() { cd "$pkgname-$pkgver" diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD index fa1eb7491..ff739c5fa 100644 --- a/extra/cmake/PKGBUILD +++ b/extra/cmake/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 196220 2013-10-08 19:06:31Z andrea $ +# $Id: PKGBUILD 200685 2013-12-02 11:59:05Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=cmake -pkgver=2.8.12 -pkgrel=1 +pkgver=2.8.12.1 +pkgrel=3 pkgdesc="A cross-platform open-source make system" arch=('i686' 'x86_64' 'mips64el') url="http://www.cmake.org/" @@ -13,12 +13,16 @@ depends=('curl' 'libarchive' 'shared-mime-info') makedepends=('qt4' 'emacs') optdepends=('qt4: cmake-gui') install="${pkgname}.install" -source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz") -md5sums=('105bc6d21cc2e9b6aff901e43c53afea') +source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz" + "findfreetype.patch") +md5sums=('9d38cd4e2c94c3cea97d0e2924814acc' + '90321de1d9d46cd8d6609d0509dbd7b0') build() { cd ${pkgname}-${pkgver} + patch -Np1 < ${srcdir}/findfreetype.patch + ./bootstrap --prefix=/usr \ --mandir=/share/man \ --docdir=/share/doc/cmake \ diff --git a/extra/cmake/findfreetype.patch b/extra/cmake/findfreetype.patch new file mode 100644 index 000000000..454b591dd --- /dev/null +++ b/extra/cmake/findfreetype.patch @@ -0,0 +1,26 @@ +diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake +index 179dc00..0f5a2b4 100644 +--- a/Modules/FindFreetype.cmake ++++ b/Modules/FindFreetype.cmake +@@ -62,10 +62,10 @@ find_path(FREETYPE_INCLUDE_DIR_ft2build ft2build.h + ENV GTKMM_BASEPATH + [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path] + [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path] +- PATH_SUFFIXES include/freetype2 include ++ PATH_SUFFIXES include/freetype2 include/freetype include + ) + +-find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h ++find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h + HINTS + ENV FREETYPE_DIR + PATHS +@@ -76,7 +76,7 @@ find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h + ENV GTKMM_BASEPATH + [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path] + [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path] +- PATH_SUFFIXES include/freetype2 include ++ PATH_SUFFIXES include/freetype2 include/freetype include include/freetype2/freetype + ) + + find_library(FREETYPE_LIBRARY diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD index 8807045cd..13d84dd4f 100644 --- a/extra/colord/PKGBUILD +++ b/extra/colord/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 197899 2013-10-30 11:33:33Z allan $ +# $Id: PKGBUILD 199996 2013-11-20 23:55:49Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> pkgname=colord -pkgver=1.0.2 -pkgrel=2 +pkgver=1.0.4 +pkgrel=1 pkgdesc="System daemon for managing color devices" arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/software/colord" @@ -16,7 +16,7 @@ install=colord.install backup=(etc/colord.conf) source=($url/releases/$pkgname-$pkgver.tar.xz udev-systemd.patch) -sha1sums=('081ce4457e9752c726e68820b1b079ab314093a0' +sha1sums=('85a08925690a33011cb3d032b0d20cd9ca86adb3' '3b467b9674f767c804943d191beaf6bd1ba3a606') prepare() { diff --git a/extra/conky/PKGBUILD b/extra/conky/PKGBUILD index bb4b7786b..5c8a528d5 100644 --- a/extra/conky/PKGBUILD +++ b/extra/conky/PKGBUILD @@ -1,24 +1,23 @@ -# $Id: PKGBUILD 158528 2012-05-03 23:54:02Z bisson $ +# $Id: PKGBUILD 199065 2013-11-08 03:17:34Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: James Rayner <james@archlinux.org> # Contributor: Partha Chowdhury <kira.laucas@gmail.com> -# Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=conky pkgver=1.9.0 -pkgrel=1 +pkgrel=2 pkgdesc='Lightweight system monitor for X' url='http://conky.sourceforge.net/' license=('BSD' 'GPL') arch=('i686' 'x86_64' 'mips64el') -options=('!emptydirs') makedepends=('docbook2x') -depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 'libxdamage' 'imlib2') -backup=('etc/conky/conky.conf' 'etc/conky/conky_no_x11.conf') +depends=('glib2' 'curl' 'lua' 'wireless_tools' 'libxml2' 'libxft' 'libxdamage' 'imlib2') source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") sha1sums=('a8d26d002370c9b877ae77ad3a3bbd2566b38e5d') -replaces=('torsmo') +backup=('etc/conky/'conky{,_no_x11}.conf) +options=('!emptydirs') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -31,7 +30,6 @@ build() { --enable-rss \ --enable-weather-xoap \ --enable-imlib2 \ - --disable-lua \ --enable-wlan \ make diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD index b96f9a7b6..60395b68d 100644 --- a/extra/cups/PKGBUILD +++ b/extra/cups/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 197696 2013-10-28 15:56:36Z andyrtr $ +# $Id: PKGBUILD 199750 2013-11-15 15:38:18Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase="cups" pkgname=('libcups' 'cups') pkgver=1.7.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.cups.org/" @@ -23,6 +23,7 @@ source=(#http://mirror.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.b cups-res_init.patch cups-avahi-address.patch cups-enum-all.patch + cups-final-content-type.patch # Gentoo cups-1.6.0-fix-install-perms.patch cups-1.6.2-statedir.patch @@ -41,6 +42,7 @@ md5sums=('5ab496a2ce27017fcdb3d7ec4818a75a' '8fe27d4248cacbc02824e7937cab4088' 'df0c367c0022e3c7d8e01827e8a6c5e7' 'f30c2a161caaf27854581507cde8cac6' + 'a31b64ba25a985fbae65d8ddf311b08c' '5117f65342fcc69c6a506529e4daca9e' '451609db34f95209d64c38474de27ce1' 'cb58bf4e0b80eaee383712e5c84a1ab4' @@ -88,6 +90,9 @@ prepare() { # Return from cupsEnumDests() once all records have been returned. patch -Np1 -i ${srcdir}/cups-enum-all.patch + # Fix printing to some network printers fails - https://bugs.archlinux.org/task/37605 + patch -Np1 -i ${srcdir}/cups-final-content-type.patch + # Rebuild configure script for not zipping man-pages. aclocal -I config-scripts autoconf -I config-scripts diff --git a/extra/cups/cups-final-content-type.patch b/extra/cups/cups-final-content-type.patch new file mode 100644 index 000000000..6ae4010eb --- /dev/null +++ b/extra/cups/cups-final-content-type.patch @@ -0,0 +1,18 @@ +diff -up cups-1.6.4/scheduler/job.c.final-content-type cups-1.6.4/scheduler/job.c +--- cups-1.6.4/scheduler/job.c.final-content-type 2013-09-27 16:58:13.934775402 +0100 ++++ cups-1.6.4/scheduler/job.c 2013-09-27 17:00:57.716549576 +0100 +@@ -692,12 +692,7 @@ cupsdContinueJob(cupsd_job_t *job) /* I + + if (!job->printer->remote) + { +- for (filter = (mime_filter_t *)cupsArrayLast(filters); +- filter && filter->dst; +- filter = (mime_filter_t *)cupsArrayPrev(filters)) +- if (strcmp(filter->dst->super, "printer") || +- strcmp(filter->dst->type, job->printer->name)) +- break; ++ filter = (mime_filter_t *)cupsArrayLast(filters); + + if (filter && filter->dst) + { + diff --git a/extra/cvsps/PKGBUILD b/extra/cvsps/PKGBUILD index ef6a59d2c..7ca266cd8 100644 --- a/extra/cvsps/PKGBUILD +++ b/extra/cvsps/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 176011 2013-01-25 18:19:34Z dan $ +# $Id: PKGBUILD 202197 2013-12-19 06:40:49Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> pkgname=cvsps -pkgver=3.10 +pkgver=3.13 pkgrel=1 pkgdesc="Generating 'patchset' information from a CVS repository" url="http://www.catb.org/esr/cvsps/" @@ -12,7 +12,7 @@ arch=('i686' 'x86_64' 'mips64el') depends=('zlib') makedepends=('asciidoc') source=("http://www.catb.org/~esr/cvsps/cvsps-${pkgver}.tar.gz") -md5sums=('eafd64ba9359105d950462552750cc51') +md5sums=('684c22c70b305030d50dc4ee050978df') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/diffstat/PKGBUILD b/extra/diffstat/PKGBUILD deleted file mode 100644 index 0caa7aecf..000000000 --- a/extra/diffstat/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 198590 2013-10-30 15:58:57Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Matthias-Christian Ott <matthias.christian.at.tiscali.de> - -pkgname=diffstat -pkgver=1.58 -pkgrel=1 -pkgdesc="Display a histogram of diff changes" -arch=('i686' 'x86_64' 'mips64el') -url="http://invisible-island.net/diffstat" -depends=('glibc') -license=('MIT') -source=("ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz") -md5sums=('6d6e13f7dcfe4db5da65c5175260ea47') - -build () { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr \ - --mandir=/usr/share/man - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR=${pkgdir}/ install - install -Dm644 package/debian/copyright "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD index 72e6e9e6a..d34f40f4a 100644 --- a/extra/digikam/PKGBUILD +++ b/extra/digikam/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 196619 2013-10-15 19:42:35Z ronald $ +# $Id: PKGBUILD 202656 2013-12-23 16:27:53Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -6,7 +6,7 @@ pkgbase=digikam pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki') pkgver=3.5.0 -pkgrel=1 +pkgrel=2 pkgdesc="Digital photo management application for KDE" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -92,6 +92,7 @@ package_kipi-plugins() { 'opencv: Remove Red Eyes plugin' 'imagemagick: Video SlideShow plugin' 'qt-gstreamer: Video SlideShow plugin') + options=('staticlibs') install=kipi-plugins.install cd build/extra/kipi-plugins diff --git a/extra/dnsmasq/0001-Fix-check-for-local-domains-in-CNAME-case.-Fixes-d56.patch b/extra/dnsmasq/0001-Fix-check-for-local-domains-in-CNAME-case.-Fixes-d56.patch deleted file mode 100644 index 866b3e8d9..000000000 --- a/extra/dnsmasq/0001-Fix-check-for-local-domains-in-CNAME-case.-Fixes-d56.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 7b174c250df2bc97b503fd03b9e473998676b1a6 Mon Sep 17 00:00:00 2001 -From: Simon Kelley <simon@thekelleys.org.uk> -Date: Mon, 28 Oct 2013 13:14:03 +0000 -Subject: [PATCH] Fix check for local domains in CNAME case. Fixes - d56a604a9600c08d4a863527d549713c07f0186d - ---- - src/cache.c | 2 +- - src/rfc1035.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/cache.c b/src/cache.c -index d99aba6..6c5f601 100644 ---- a/src/cache.c -+++ b/src/cache.c -@@ -330,7 +330,7 @@ static int cache_scan_free(char *name, struct all_addr *addr, time_t now, unsign - ((flags & crecp->flags & F_TYPE) || ((crecp->flags | flags) & F_CNAME)) && - hostname_isequal(cache_get_name(crecp), name)) - { -- if (crecp->flags & (F_HOSTS | F_DHCP)) -+ if (crecp->flags & (F_HOSTS | F_DHCP | F_CONFIG)) - return 0; - *up = crecp->hash_next; - cache_unlink(crecp); -diff --git a/src/rfc1035.c b/src/rfc1035.c -index fc6d09c..ff97576 100644 ---- a/src/rfc1035.c -+++ b/src/rfc1035.c -@@ -1221,7 +1221,7 @@ int check_for_local_domain(char *name, time_t now) - struct naptr *naptr; - - if ((crecp = cache_find_by_name(NULL, name, now, F_IPV4 | F_IPV6 | F_CNAME)) && -- (crecp->flags & (F_HOSTS | F_DHCP))) -+ (crecp->flags & (F_HOSTS | F_DHCP | F_CONFIG))) - return 1; - - for (naptr = daemon->naptr; naptr; naptr = naptr->next) -@@ -1861,7 +1861,7 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen, - if (qtype == T_CNAME || qtype == T_ANY) - { - if ((crecp = cache_find_by_name(NULL, name, now, F_CNAME)) && -- (qtype == T_CNAME || (crecp->flags & (F_HOSTS | F_DHCP)))) -+ (qtype == T_CNAME || (crecp->flags & (F_HOSTS | F_DHCP | F_CONFIG)))) - { - ans = 1; - if (!dryrun) --- -1.8.4.2 - diff --git a/extra/dnsmasq/PKGBUILD b/extra/dnsmasq/PKGBUILD index 77d3c138d..0d1a7a26d 100644 --- a/extra/dnsmasq/PKGBUILD +++ b/extra/dnsmasq/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 198525 2013-10-30 15:23:36Z dreisner $ +# $Id: PKGBUILD 201313 2013-12-08 20:12:10Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=dnsmasq -pkgver=2.67 -pkgrel=2 +pkgver=2.68 +pkgrel=1 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server" url="http://www.thekelleys.org.uk/dnsmasq/doc.html" arch=('i686' 'x86_64' 'mips64el') @@ -14,10 +14,8 @@ depends=('glibc' 'dbus-core') install=$pkgname.install backup=('etc/dnsmasq.conf') source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz" - '0001-Fix-check-for-local-domains-in-CNAME-case.-Fixes-d56.patch' 'dnsmasq.service') -md5sums=('3560068c6cc644a01924fa089a70bb9c' - '38bcc0c2b8dbc480e58a3478cae34bf6' +md5sums=('fec885ba0a9df0f7d8f2e44db48f19ae' '7ac45726cabef4145db40d758cc7fedf') prepare() { @@ -26,8 +24,6 @@ prepare() { # link against dbus. this ugliness is needed to ensure that the # compile time opts report properly on startup. yuck. sed -i '/^#ifdef DNSMASQ_COMPILE_OPTS/ i#define HAVE_DBUS' src/config.h - - patch -Np1 <"$srcdir/0001-Fix-check-for-local-domains-in-CNAME-case.-Fixes-d56.patch" } build() { diff --git a/extra/docker/PKGBUILD b/extra/docker-tray/PKGBUILD index 6ed4810b7..f8a111d80 100644 --- a/extra/docker/PKGBUILD +++ b/extra/docker-tray/PKGBUILD @@ -1,24 +1,26 @@ -# $Id: PKGBUILD 176971 2013-02-03 07:03:24Z allan $ +# $Id: PKGBUILD 200798 2013-12-05 11:49:45Z bpiotrowski $ # Contributor: Jochem Kossen <j.kossen@home.nl> -pkgname=docker +pkgname=docker-tray pkgver=1.5 -pkgrel=6 +pkgrel=1 pkgdesc="Docker is a docking application (WindowMaker dock app) which acts as a system tray for KDE and GNOME2." arch=('i686' 'x86_64' 'mips64el') url="http://icculus.org/openbox/2/docker/" license=('GPL') depends=('glibc' 'glib2' 'libx11') -source=("http://icculus.org/openbox/2/$pkgname/$pkgname-$pkgver.tar.gz") +replaces=("docker<=1.5") +conflicts=("docker") +source=("http://icculus.org/openbox/2/docker/docker-$pkgver.tar.gz") md5sums=('349320bebd43babb8b43e11c7aae0293') build() { - cd $srcdir/$pkgname-$pkgver + cd docker-$pkgver make } package() { - cd $srcdir/$pkgname-$pkgver - install -d $pkgdir/usr/bin - make PREFIX=$pkgdir/usr install + cd docker-$pkgver + install -d "$pkgdir"/usr/bin + make PREFIX="$pkgdir"/usr install } diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD index 3460f6d90..646025838 100644 --- a/extra/dovecot/PKGBUILD +++ b/extra/dovecot/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 198783 2013-11-04 13:57:54Z andyrtr $ +# $Id: PKGBUILD 202249 2013-12-20 22:01:34Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> @@ -8,7 +8,7 @@ # --->>> remember to rebuild/bump pigeonhole in one step <<<--- pkgname=dovecot -pkgver=2.2.7 +pkgver=2.2.10 pkgrel=1 pkgdesc="An IMAP and POP3 server written with security primarily in mind" arch=('i686' 'x86_64' 'mips64el') @@ -18,20 +18,18 @@ depends=('krb5' 'openssl' 'sqlite' 'libmariadbclient' 'postgresql-libs' 'bzip2' 'expat' 'curl') makedepends=('pam' 'libcap' 'libldap' 'clucene') optdepends=('libldap: ldap plugin' - 'clucene: alternative FTS indexer') + 'xz: imap zlib plugin' + 'clucene: alternative FTS indexer') provides=('imap-server' 'pop3-server') install=$pkgname.install source=(http://dovecot.org/releases/2.2/${pkgname}-${pkgver}.tar.gz{,.sig} dovecot.tmpfilesd) -md5sums=('d2c7c83acc21f3dcab652868d40522e0' +md5sums=('037e9c9e07d9dbff54dcff09f280fc8c' 'SKIP' '342a28251d40f983c98c0d1f1bf3d07d') build() { cd $pkgname-$pkgver - - # fix build with recent clucene (FC) -# sed -i '/DEFAULT_INCLUDES *=/s|$| '"$(pkg-config --cflags libclucene-core)|" src/plugins/fts-lucene/Makefile.in # fix path in helper script sed -i 's:OPENSSLCONFIG=${OPENSSLCONFIG-dovecot-openssl.cnf}:OPENSSLCONFIG=${OPENSSLCONFIG- /etc/ssl/dovecot-openssl.cnf}:' doc/mkcert.sh diff --git a/extra/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD index 5128e8878..00fb2ae53 100644 --- a/extra/doxygen/PKGBUILD +++ b/extra/doxygen/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: PKGBUILD 193586 2013-08-24 16:53:45Z dan $ +# $Id: PKGBUILD 202708 2013-12-25 21:15:10Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgbase=doxygen pkgname=('doxygen' 'doxygen-docs') -pkgver=1.8.5 +pkgver=1.8.6 pkgrel=1 license=('GPL') arch=(i686 x86_64 'mips64el') url="http://www.doxygen.org/" makedepends=('gcc-libs' 'flex' 'qt4' 'texlive-core' 'ghostscript' - 'texlive-latexextra' 'graphviz') -source=(http://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz) -md5sums=('db51274568755e2c75c2657e30a78a55') -sha1sums=('1fc5ceec21122fe5037edee4c308ac94b59ee33e') + 'texlive-latexextra' 'graphviz' 'python2') +source=(http://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz + doxygen-configure-python2.patch) +md5sums=('9385dc52f0627875f8fa758e754ec674' + 'a16ef06cd207292eda73801ea3835f1e') +sha1sums=('204f1b3695c73efac44a521609c5360241d64045' + '98f9f473f906c5cd363b29c65b54bbe998c0793e') build() { export PATH=$PATH:/usr/lib/qt4/bin cd "${srcdir}/${pkgbase}-${pkgver}" - QTDIR=/usr ./configure --prefix /usr --with-doxywizard + patch -Np1 < ../doxygen-configure-python2.patch + QTDIR=/usr/lib/qt4 ./configure --prefix /usr --with-doxywizard make } diff --git a/extra/doxygen/doxygen-configure-python2.patch b/extra/doxygen/doxygen-configure-python2.patch new file mode 100644 index 000000000..9750d1eb2 --- /dev/null +++ b/extra/doxygen/doxygen-configure-python2.patch @@ -0,0 +1,11 @@ +--- doxygen-1.8.6/configure.orig 2013-12-25 20:54:22.171988706 +0000 ++++ doxygen-1.8.6/configure 2013-12-25 20:54:33.405247482 +0000 +@@ -560,7 +560,7 @@ + + printf " Checking for python... " + if test "$f_python" = NO; then +- python_names="python" ++ python_names="python2 python" + python_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin" + python_prog=NO + python_found=NO diff --git a/extra/dvgrab/PKGBUILD b/extra/dvgrab/PKGBUILD deleted file mode 100644 index bda720c49..000000000 --- a/extra/dvgrab/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 143735 2011-11-28 17:46:25Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Jason Chu <jason@archlinux.org> - -pkgname=dvgrab -pkgver=3.5 -pkgrel=4.2 -pkgdesc="Saves audio and video data from an IEEE (FireWire) digital source" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.kinodv.org/" -license=('GPL') -depends=('libdv' 'libavc1394' 'libjpeg-turbo' 'libiec61883' 'gcc-libs') -makedepends=('pkgconfig') -source=("http://downloads.sourceforge.net/kino/${pkgname}-${pkgver}.tar.gz") -md5sums=('b39a242ce63e80fc347ab59931f75649') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install -} diff --git a/extra/e_dbus/PKGBUILD b/extra/e_dbus/PKGBUILD index 6f7a0c80e..e61160868 100644 --- a/extra/e_dbus/PKGBUILD +++ b/extra/e_dbus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 197914 2013-10-30 11:39:08Z allan $ +# $Id: PKGBUILD 199736 2013-11-15 12:16:22Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=e_dbus -pkgver=1.7.8 +pkgver=1.7.9 pkgrel=1 pkgdesc="D-Bus integration with Ecore" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('ecore' 'dbus-core') options=('!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('726b2c4259e8818921ce0c27a3d452d414255975') +sha1sums=('d1c30cf95cf6eea07c5be54bd8cfbf7eba9fb20b') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/ecore/PKGBUILD b/extra/ecore/PKGBUILD index 45142b428..ddca9887f 100644 --- a/extra/ecore/PKGBUILD +++ b/extra/ecore/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 197913 2013-10-30 11:38:44Z allan $ +# $Id: PKGBUILD 199728 2013-11-15 12:13:56Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=ecore -pkgver=1.7.8 +pkgver=1.7.9 pkgrel=1 pkgdesc="OS abstraction layer for e17" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ depends=('eina' 'evas' 'glib2' 'libxp' 'curl' 'libxss' 'libxtst' makedepends=('subversion') options=('!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('8b8c88a211cb80bb19284560d8d481979ae0c111') +sha1sums=('c4343110508dc9dd1580f3349dbc1d4de2088f3d') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/edje/PKGBUILD b/extra/edje/PKGBUILD index 5e3bd5201..be1999263 100644 --- a/extra/edje/PKGBUILD +++ b/extra/edje/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 197915 2013-10-30 11:39:30Z allan $ +# $Id: PKGBUILD 199732 2013-11-15 12:15:08Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=edje -pkgver=1.7.8 +pkgver=1.7.9 pkgrel=1 pkgdesc="A graphical design and layout library based on Evas" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ optdepends=('python2: inkscape2edc') install=edje.install options=('!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('3fbff1d0b8473a0498ccee44745cf6609d73005e') +sha1sums=('fe5fa239d75e96c7e02c58abb75776a54817654d') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/eet/PKGBUILD b/extra/eet/PKGBUILD index 0ae8c9a15..5ac190ba2 100644 --- a/extra/eet/PKGBUILD +++ b/extra/eet/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 197916 2013-10-30 11:39:51Z allan $ +# $Id: PKGBUILD 199725 2013-11-15 12:12:55Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=eet -pkgver=1.7.8 +pkgver=1.7.9 pkgrel=1 pkgdesc="A data storage and compression library" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ url="http://www.enlightenment.org" license=('BSD') depends=('libjpeg>=7' 'openssl' 'eina') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('d68e17fb155954c7d524cdba98244c09ae511513') +sha1sums=('843eb9733f6c01442b9c1379e9a48b69bfd5081f') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/eeze/PKGBUILD b/extra/eeze/PKGBUILD index 065670409..84a4b1c3f 100644 --- a/extra/eeze/PKGBUILD +++ b/extra/eeze/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 197917 2013-10-30 11:40:11Z allan $ +# $Id: PKGBUILD 199730 2013-11-15 12:14:34Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=eeze -pkgver=1.7.8 +pkgver=1.7.9 pkgrel=1 pkgdesc="Manipulate devices using udev and sysfs" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('ecore' 'eina' 'udev') options=('!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('86a552cbdbbb7e8d968083b2c2429e0df60a6a68') +sha1sums=('6651d9b7723dda9dc00be093097a12a52764d431') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/efreet/PKGBUILD b/extra/efreet/PKGBUILD index 05acd07e9..60e4167fc 100644 --- a/extra/efreet/PKGBUILD +++ b/extra/efreet/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 197918 2013-10-30 11:40:35Z allan $ +# $Id: PKGBUILD 199735 2013-11-15 12:16:06Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=efreet -pkgver=1.7.8 +pkgver=1.7.9 pkgrel=1 pkgdesc="FreeDesktop.Org specifications for e17" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('eina' 'ecore' 'e_dbus') options=('!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('5981bf49149366b15618050af3a65d6cf145c827') +sha1sums=('7f12f4c943b572b5470ce11aad2d5f4054b22dc7') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/eina/PKGBUILD b/extra/eina/PKGBUILD index d5ed2d79b..324866a0c 100644 --- a/extra/eina/PKGBUILD +++ b/extra/eina/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 197919 2013-10-30 11:40:55Z allan $ +# $Id: PKGBUILD 199724 2013-11-15 12:12:34Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=eina -pkgver=1.7.8 +pkgver=1.7.9 pkgrel=1 pkgdesc="A core data structure and common utility library" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('LGPL2.1') depends=('glibc') options=('!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('f655b2691d3976fdc2cfe116166e790c1b8bc90d') +sha1sums=('26f385e888b29876c8fb06f35f0433ab7e3251d5') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/eio/PKGBUILD b/extra/eio/PKGBUILD index 92a99628b..7b243ee03 100644 --- a/extra/eio/PKGBUILD +++ b/extra/eio/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 197920 2013-10-30 11:41:16Z allan $ +# $Id: PKGBUILD 199729 2013-11-15 12:14:20Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=eio -pkgver=1.7.8 +pkgver=1.7.9 pkgrel=1 pkgdesc="Async IO library using Ecore" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('ecore') options=('!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('75425d2ddd6ddc7a7f668e4f92c43e9d72d057ed') +sha1sums=('6a849c5da4b1213d018ca46dcea1130a135e99e6') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD index a01acdab7..468e32b4f 100644 --- a/extra/ekiga/PKGBUILD +++ b/extra/ekiga/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 197921 2013-10-30 11:41:41Z allan $ +# $Id: PKGBUILD 201257 2013-12-07 10:34:57Z bpiotrowski $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=ekiga pkgver=4.0.1 -pkgrel=7 +pkgrel=8 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)" url="http://www.ekiga.org" license=(GPL) diff --git a/extra/elementary/PKGBUILD b/extra/elementary/PKGBUILD index 80c30a3fa..520e98ab5 100644 --- a/extra/elementary/PKGBUILD +++ b/extra/elementary/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 197922 2013-10-30 11:42:01Z allan $ +# $Id: PKGBUILD 199737 2013-11-15 12:16:38Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=elementary -pkgver=1.7.8 +pkgver=1.7.9 pkgrel=1 pkgdesc="Enlightenment's widget set" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('edje' 'e_dbus' 'efreet' 'ethumb' 'eio') options=('!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('5cae29bd8310691fbf459ce9132264dcef8338ed') +sha1sums=('4d68e4f77d6b3471a45a4e33ae3af18d0ca42ab1') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/embryo/PKGBUILD b/extra/embryo/PKGBUILD index 9b48b5e78..8f3ef843b 100644 --- a/extra/embryo/PKGBUILD +++ b/extra/embryo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 197923 2013-10-30 11:42:21Z allan $ +# $Id: PKGBUILD 199731 2013-11-15 12:14:50Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=embryo -pkgver=1.7.8 +pkgver=1.7.9 pkgrel=1 pkgdesc="implementation of a C like scripting language for e17" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ url="http://www.enlightenment.org" license=('BSD') depends=('glibc' 'eina') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('879c0dd75de6c402707da4981716a2b7c1dab618') +sha1sums=('1644da0be669213ce9ed29f1b58e9c6f3ab7c05c') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/emotion/PKGBUILD b/extra/emotion/PKGBUILD index ae347ffb3..9b96fda7a 100644 --- a/extra/emotion/PKGBUILD +++ b/extra/emotion/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 197924 2013-10-30 11:42:43Z allan $ +# $Id: PKGBUILD 199733 2013-11-15 12:15:33Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=emotion -pkgver=1.7.8 +pkgver=1.7.9 pkgrel=1 pkgdesc="Library to easily integrate media playback into EFL applications" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('gstreamer0.10' 'edje' 'eeze') options=('!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('a0f9ddbd6b26a69de2fc6958327da1497bd2f420') +sha1sums=('c7817d6252ed90d06f9e4ef491f9399fb6213990') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD index 64b0f1f80..f89648cfd 100644 --- a/extra/empathy/PKGBUILD +++ b/extra/empathy/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 197925 2013-10-30 11:43:04Z allan $ +# $Id: PKGBUILD 199330 2013-11-11 10:46:23Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=empathy -pkgver=3.10.1 +pkgver=3.10.2 pkgrel=1 pkgdesc="A GNOME instant messaging client using the Telepathy framework." arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,7 @@ options=('!makeflags') groups=(gnome) install=empathy.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('a5d96f1a408613b885fc254d8b6f33fceae01e212d2370cc77444d66fa945054') +sha256sums=('9d8e082a448f3e9450a31f0ec21f01e34cf1c15b192cfa30842d71537796cfbf') build() { cd $pkgname-$pkgver diff --git a/extra/enblend-enfuse/PKGBUILD b/extra/enblend-enfuse/PKGBUILD index a2124de50..faa11c61d 100644 --- a/extra/enblend-enfuse/PKGBUILD +++ b/extra/enblend-enfuse/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 191891 2013-08-01 06:53:24Z bpiotrowski $ +# $Id: PKGBUILD 201258 2013-12-07 10:34:58Z bpiotrowski $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Dominik Ryba <domryba@post.pl> pkgname=enblend-enfuse pkgver=4.1.1 -pkgrel=3 +pkgrel=4 pkgdesc="Intelligent blend tool for overlapping picture" arch=("i686" "x86_64" 'mips64el') license=('GPL') diff --git a/extra/enlightenment/PKGBUILD b/extra/enlightenment16/PKGBUILD index e69f6ea91..bfc1c04bd 100644 --- a/extra/enlightenment/PKGBUILD +++ b/extra/enlightenment16/PKGBUILD @@ -1,17 +1,19 @@ -# $Id: PKGBUILD 197929 2013-10-30 11:44:06Z allan $ +# $Id: PKGBUILD 201529 2013-12-13 21:18:56Z ronald $ # Maintainer: Eric Bélanger <eric@archlinux.org> -pkgname=enlightenment +pkgname=enlightenment16 +_pkgname=enlightenment pkgver=1.0.13 _themever=1.0.1 -pkgrel=1.1 +pkgrel=3 pkgdesc="A fast, flexible, and very extensible Window Manager" arch=('i686' 'x86_64' 'mips64el') url="http://www.enlightenment.org" license=('BSD' 'custom') depends=('libxinerama' 'imlib2' 'perl' 'pango' 'libxcomposite' \ 'libxrandr' 'libpulse') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/e16-${pkgver}.tar.gz \ +replaces=('enlightenment<=1.0.13') +source=(http://downloads.sourceforge.net/sourceforge/${_pkgname}/e16-${pkgver}.tar.gz \ http://downloads.sourceforge.net/enlightenment/e16-themes-${_themever}.tar.gz) sha1sums=('bcb74385fb6d0732f735f27264ae02b539d136c9' 'ae34e2df1294198795736bf953bf695aba93b710') diff --git a/extra/enlightenment17/PKGBUILD b/extra/enlightenment17/PKGBUILD index 9715abd4c..34df14257 100644 --- a/extra/enlightenment17/PKGBUILD +++ b/extra/enlightenment17/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 197930 2013-10-30 11:44:27Z allan $ +# $Id: PKGBUILD 199739 2013-11-15 12:19:48Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=enlightenment17 _pkgname=enlightenment -pkgver=0.17.4 -pkgrel=2 +pkgver=0.17.5 +pkgrel=1 pkgdesc="Enlightenment window manager DR17 (aka e17)" arch=('i686' 'x86_64' 'mips64el') url="http://www.enlightenment.org" @@ -19,21 +19,16 @@ backup=('etc/enlightenment/sysactions.conf') options=('!emptydirs') install=enlightenment17.install source=(http://download.enlightenment.org/releases/$_pkgname-$pkgver.tar.gz - 'e-applications.menu' 'quickstart.patch' 'sysactions_systemd.patch' - 'blackscreenfix.patch') -sha1sums=('29f5f4c10bcc7b32f79013ccbc7257abeea78faf' + 'e-applications.menu' 'quickstart.patch' 'sysactions_systemd.patch') +sha1sums=('8fd40ad2df2eb96a3d6583bcd19d150d594a6e86' 'e08cc63cb8a188a06705b42d03e032b9fcfa7ee5' '3f53931ae86de8fe99e386aeb097521aac0decd8' - '86f1c5e36dc274c3101362532378be034e89c593' - '85f9b1378ebb7a05ed7f0e8db6982d88a0f46be4') + '86f1c5e36dc274c3101362532378be034e89c593') prepare() { cd "$srcdir/$_pkgname-$pkgver" patch -p0 < $srcdir/quickstart.patch - # upstream fix for blackscreen problem on existing configs - patch -Np1 -i $srcdir/blackscreenfix.patch - # default to systemd for sysactions patch -Np0 < $srcdir/sysactions_systemd.patch diff --git a/extra/eog/PKGBUILD b/extra/eog/PKGBUILD index 00c11aefe..7b48be4dc 100644 --- a/extra/eog/PKGBUILD +++ b/extra/eog/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 197931 2013-10-30 11:44:48Z allan $ +# $Id: PKGBUILD 201363 2013-12-09 13:42:13Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=eog -pkgver=3.10.1 -pkgrel=1 +pkgver=3.10.2 +pkgrel=2 pkgdesc="Eye of Gnome: An image viewing and cataloging program" arch=(i686 x86_64 mips64el) license=(GPL) @@ -14,8 +14,8 @@ install=eog.install groups=(gnome) options=('!emptydirs') url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('16ab5da862d4474c12d0e8062e577ad70c7e1c790a44a3931cd78bf84ebd5ec6') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('5ccc98609ca666420719383cc7d9b44335bbc0aacf048e38036d1f946ce54763') build() { cd "$pkgname-$pkgver" @@ -27,7 +27,4 @@ build() { package() { cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install - - # remove it from Xfce menu that ships its own thingy - echo "NotShowIn=XFCE" >> $pkgdir/usr/share/applications/eog.desktop } diff --git a/extra/ethumb/PKGBUILD b/extra/ethumb/PKGBUILD index e6f9309a6..b46ad87d9 100644 --- a/extra/ethumb/PKGBUILD +++ b/extra/ethumb/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 197934 2013-10-30 11:46:11Z allan $ +# $Id: PKGBUILD 199734 2013-11-15 12:15:50Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=ethumb -pkgver=1.7.8 +pkgver=1.7.9 pkgrel=1 pkgdesc="Thumbnailing library and D-Bus service using EFL" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('libexif' 'e_dbus' 'emotion') options=('!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('c19b5d8abbf79aa4df1c5523829ece751dc3c268') +sha1sums=('7f9a7e536de7a598e921709c3ba0d23850f4494f') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/evas/PKGBUILD b/extra/evas/PKGBUILD index 1beefb331..45601d1bd 100644 --- a/extra/evas/PKGBUILD +++ b/extra/evas/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 197935 2013-10-30 11:46:36Z allan $ +# $Id: PKGBUILD 199727 2013-11-15 12:13:26Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=evas -pkgver=1.7.8 +pkgver=1.7.9 pkgrel=1 pkgdesc="A hardware-accelerated canvas API for X-Windows" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('eet' 'giflib' 'libpng' 'libjpeg' 'libxrender' 'mesa' 'fribidi' 'fontconfig' 'freetype2' 'harfbuzz' 'evas_generic_loaders') options=('!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('ce71de058896e80c8f1822d967a6dcee01a1c9ac') +sha1sums=('5804cf35451f4e05185b6ae9103b0390c0dfed5d') build() { cd $pkgname-$pkgver diff --git a/extra/evas_generic_loaders/PKGBUILD b/extra/evas_generic_loaders/PKGBUILD index 1885129e4..c1d676fa7 100644 --- a/extra/evas_generic_loaders/PKGBUILD +++ b/extra/evas_generic_loaders/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 197936 2013-10-30 11:47:00Z allan $ +# $Id: PKGBUILD 200655 2013-12-01 09:50:20Z andyrtr $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=evas_generic_loaders -pkgver=1.7.8 -pkgrel=1 +pkgver=1.7.9 +pkgrel=2 pkgdesc="Additional generic loaders for Evas" arch=('i686' 'x86_64' 'mips64el') url="http://www.enlightenment.org" @@ -12,7 +12,7 @@ license=('BSD') depends=('librsvg' 'gstreamer0.10-base' 'poppler' 'libraw' 'libspectre' 'eina') options=('!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('fe08848b794621e6695cd0df86b465412b0037fa') +sha1sums=('598241d2276608fc41a79216e94b4176a4404277') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD index 12c82c9d1..052ac6710 100644 --- a/extra/evince/PKGBUILD +++ b/extra/evince/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 197938 2013-10-30 11:47:43Z allan $ +# $Id: PKGBUILD 199791 2013-11-16 12:36:17Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evince -pkgver=3.10.0 -pkgrel=2 +pkgver=3.10.3 +pkgrel=1 pkgdesc="Simply a document viewer" url="http://projects.gnome.org/evince/" arch=(i686 x86_64 mips64el) @@ -19,7 +19,7 @@ groups=(gnome) install=evince.install options=('!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('495e855af3f071277d79be97a36bf39938d13d09530e80412fed4b7c0b1bdd3e') +sha256sums=('b30dcc3a93dd3c682325e685061c48ccd800835af49578f4db813bbaf5f5e9af') build() { cd $pkgname-$pkgver diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD index 15d1fa5f1..95c147da5 100644 --- a/extra/evolution-data-server/PKGBUILD +++ b/extra/evolution-data-server/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 197940 2013-10-30 11:48:24Z allan $ +# $Id: PKGBUILD 201347 2013-12-09 08:46:39Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution-data-server -pkgver=3.10.1 +pkgver=3.10.3 pkgrel=1 pkgdesc="Centralized access to appointments and contacts" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ install=$pkgname.install url="http://www.gnome.org" license=(GPL) 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/extra/evolution-ews/PKGBUILD b/extra/evolution-ews/PKGBUILD index c84f46812..2acbfadc4 100644 --- a/extra/evolution-ews/PKGBUILD +++ b/extra/evolution-ews/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 197941 2013-10-30 11:48:53Z allan $ +# $Id: PKGBUILD 201349 2013-12-09 08:51:59Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=evolution-ews -pkgver=3.10.1 +pkgver=3.10.3 pkgrel=1 pkgdesc="MS Exchange integration through Exchange Web Services" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('evolution-data-server' 'gtkhtml4' 'libmspack') makedepends=('intltool' 'evolution') options=('!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('018bf22f5fd88bb80f88c8f1feb696c7a7c216ab1367b7b50d02b4e313d858c9') +sha256sums=('485951935014fbf7d092b318cee3131c442b959f3ed2163932bfb11fdc15c6e9') build() { cd $pkgname-$pkgver diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD index 0f9db43df..7df0c7939 100644 --- a/extra/evolution/PKGBUILD +++ b/extra/evolution/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 197939 2013-10-30 11:48:04Z allan $ +# $Id: PKGBUILD 201348 2013-12-09 08:51:13Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=evolution -pkgver=3.10.1 +pkgver=3.10.3 pkgrel=1 pkgdesc="Manage your email, contacts and schedule" arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,7 @@ options=('!emptydirs') install=evolution.install url=http://www.gnome.org/projects/evolution/ source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) -sha256sums=('da1aacab365f27feed74cb89d03c2f4847fef7c5370d0fd84b04ab24ada83546') +sha256sums=('ad4b37215c361134a14aa1598d5c038327f897b7d9dbc750cab3d58d5c922f4c') build() { cd $pkgname-$pkgver diff --git a/extra/exo/0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch b/extra/exo/0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch new file mode 100644 index 000000000..f892ca038 --- /dev/null +++ b/extra/exo/0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch @@ -0,0 +1,53 @@ +From 05848bb3cb10ea19ef8cba607bdabcd25560063c Mon Sep 17 00:00:00 2001 +From: Felipe Contreras <felipe.contreras@gmail.com> +Date: Sat, 18 May 2013 22:50:01 -0500 +Subject: [PATCH] Fix exo_str_looks_like_an_uri() (bug #10098). + +Commit d11199b (Check if uris also contain a slash (bug #9244)) tried to +fix a hang in thunar by properly recognizing that 'http:' is not an URI, +however, while doing so, it broke proper URIs like 'magnet:foo'. + +As the RFC clearly states: + + The following are two example URIs and their component parts: + + foo://example.com:8042/over/there?name=ferret#nose + \_/ \______________/\_________/ \_________/ \__/ + | | | | | + scheme authority path query fragment + | _____________________|__ + / \ / \ + urn:example:animal:ferret:nose + +But even with this succinct example exo_str_looks_like_an_uri() fails. + +There is an easy solution; fail only when component part is missing +('urn:'), but succeed otherwise. + +This solution fixes 'magnet:foo', and doesn't break the current +expectation from thunar that 'http:' should fail, having the best of +both worlds. + +[1] http://www.ietf.org/rfc/rfc3986.txt + +Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> +--- + exo/exo-string.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/exo/exo-string.c b/exo/exo-string.c +index 33f86f9..056b36a 100644 +--- a/exo/exo-string.c ++++ b/exo/exo-string.c +@@ -429,7 +429,7 @@ exo_str_looks_like_an_uri (const gchar *str) + for (++s; g_ascii_isalnum (*s) || *s == '+' || *s == '-' || *s == '.'; ++s); + + /* <scheme> must be followed by ":" */ +- return (*s == ':' && *(s+1) == '/'); ++ return (*s == ':' && *(s+1) != '\0'); + } + + return FALSE; +-- +1.8.4.2 + diff --git a/extra/exo/PKGBUILD b/extra/exo/PKGBUILD index 99fc2a808..c80813eea 100644 --- a/extra/exo/PKGBUILD +++ b/extra/exo/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 197944 2013-10-30 11:49:55Z allan $ +# $Id: PKGBUILD 199343 2013-11-11 15:17:24Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: tobias <tobias funnychar archlinux.org> # Contributor: Aurelien Foret <orelien@chez.com> pkgname=exo pkgver=0.10.2 -pkgrel=1.1 +pkgrel=2 pkgdesc="Extensions to Xfce by os-cillation" arch=('i686' 'x86_64' 'mips64el') url="http://www.xfce.org/" @@ -15,8 +15,17 @@ depends=('libxfce4ui' 'gtk2' 'hicolor-icon-theme' ) makedepends=('perl-uri' 'intltool' 'gtk-doc' 'xorg-iceauth') optdepends=('perl-uri: for mail-compose helper script') install=$pkgname.install -source=(http://archive.xfce.org/src/xfce/$pkgname/0.10/$pkgname-$pkgver.tar.bz2) -sha256sums=('b385828bf8a38204da3254b57fdfa25a72694495aa189fabd5040f707eec76ce') +source=(http://archive.xfce.org/src/xfce/$pkgname/0.10/$pkgname-$pkgver.tar.bz2 + 0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch) +sha256sums=('b385828bf8a38204da3254b57fdfa25a72694495aa189fabd5040f707eec76ce' + 'f3a92ea399c5786845d3c3a9d74a427299ecd5ed7e5ef2ac1cf636492050e247') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + # https://bugzilla.xfce.org/show_bug.cgi?id=10098 + patch -Np1 -i "$srcdir/0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch" +} build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/expac/PKGBUILD b/extra/expac/PKGBUILD new file mode 100644 index 000000000..2942ccec3 --- /dev/null +++ b/extra/expac/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 87501 2013-04-02 00:06:04Z dreisner $ +# Maintainer: Dave Reisner <d@falconindy.com> + +pkgname=expac +pkgver=3 +pkgrel=1 +pkgdesc="pacman database extraction utility" +arch=('i686' 'x86_64' 'mips64el') +url="http://github.com/falconindy/expac" +license=('GPL') +depends=('pacman') +makedepends=('perl') +source=("http://code.falconindy.com/archive/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}) +md5sums=('2f53f9663b69948a4a8bb03c1aa435a5' + 'SKIP') + +prepare() { + cd "$pkgname-$pkgver" + + sed '/\*\//q' expac.c >LICENSE +} + +build() { + cd "$pkgname-$pkgver" + + make +} + +package() { + cd "$pkgname-$pkgver" + + make PREFIX=/usr DESTDIR="$pkgdir" install + + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim: ft=sh syn=sh diff --git a/extra/f-spot/0004-Fix-build-error-with-recent_gtk-sharp.patch b/extra/f-spot/0004-Fix-build-error-with-recent_gtk-sharp.patch new file mode 100644 index 000000000..c2869671d --- /dev/null +++ b/extra/f-spot/0004-Fix-build-error-with-recent_gtk-sharp.patch @@ -0,0 +1,15 @@ +from upstream git + +diff --git a/src/Clients/MainApp/FSpot/GroupSelector.cs b/src/Clients/MainApp/FSpot/GroupSelector.cs +index b1e4993..63edd84 100644 +--- a/src/Clients/MainApp/FSpot/GroupSelector.cs ++++ b/src/Clients/MainApp/FSpot/GroupSelector.cs +@@ -467,7 +467,7 @@ namespace FSpot { + bounds.Height = selector.background.Height; + bounds.Y = selector.background.Y; + bounds.X = selector.BoxX (item); +- bounds.Width = Math.Max (selector.BoxX (item + 1) - bounds.X, 1); ++ bounds.Width = Math.Max (selector.BoxX (item + 1) - selector.BoxX (item), 1); + + if (item < 0 || item > selector.box_counts.Length - 1) + return; diff --git a/extra/f-spot/PKGBUILD b/extra/f-spot/PKGBUILD index 2d985f4b5..b0f584efd 100644 --- a/extra/f-spot/PKGBUILD +++ b/extra/f-spot/PKGBUILD @@ -1,46 +1,57 @@ -# $Id: PKGBUILD 197965 2013-10-30 11:58:02Z allan $ +# $Id: PKGBUILD 201361 2013-12-09 13:27:15Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Kritoke <kritoke@nospam.gmail.com> # Contributor: György Balló <ballogy@freestart.hu> pkgname=f-spot pkgver=0.8.2 -pkgrel=3 +pkgrel=4 pkgdesc="A personal photo management program for GNOME" url="http://www.gnome.org/projects/f-spot/" arch=(i686 x86_64) license=('GPL') depends=('mono-addins' 'gnome-sharp' 'ndesk-dbus-glib' 'lcms' 'gnome-keyring-sharp' 'flickrnet' 'libgphoto2' 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils' 'libunique') -makedepends=('intltool' 'gnome-doc-utils' 'gnome-screensaver') +makedepends=('intltool' 'gnome-doc-utils') install=$pkgname.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/${pkgname}-${pkgver}.tar.bz2 mono-2.8.patch - flickrnet-3.0.patch) + flickrnet-3.0.patch + 0004-Fix-build-error-with-recent_gtk-sharp.patch) sha256sums=('24448d3431a95a9faa0aa975554414eb638f918811507177e9d69d11d417873a' '4e7d2f1909870b842bbbe087f4381f325d5281d2deae0d32ba5713ee66d52b65' - 'e8e4470c7cd29c000a9505bcd85cb25641890f66e568edb33d495e8e38fc92a5') + 'e8e4470c7cd29c000a9505bcd85cb25641890f66e568edb33d495e8e38fc92a5' + 'a7f46b3fad59b8d81a329e51ca722373c82bcf664976b8bcb9618084307c81ec') -build() { - export MONO_SHARED_DIR="${srcdir}/.wabi" - mkdir -p "${MONO_SHARED_DIR}" +prepare() { + mkdir .wabi + + cd $pkgname-$pkgver + patch -Np1 -i ../mono-2.8.patch - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/mono-2.8.patch" # https://bugzilla.gnome.org/show_bug.cgi?id=665063 - patch -Np1 -i "${srcdir}/flickrnet-3.0.patch" + patch -Np1 -i ../flickrnet-3.0.patch + + # Patch from Debian + patch -Np1 -i ../0004-Fix-build-error-with-recent_gtk-sharp.patch +} + +build() { + export MONO_SHARED_DIR="${srcdir}/.wabi" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + cd $pkgname-$pkgver + MCS=/usr/bin/dmcs ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --disable-scrollkeeper --disable-schemas-install --enable-release \ + --with-gnome-screensaver=/usr --with-gnome-screensaver-privlibexecdir=/usr/lib/gnome-screensaver \ --with-vendor-build-id=ArchLinux make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver make DESTDIR=${pkgdir} install install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain f-spot ${pkgdir}/etc/gconf/schemas/*.schemas || return 1 + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain f-spot ${pkgdir}/etc/gconf/schemas/*.schemas rm -f ${pkgdir}/etc/gconf/schemas/*.schemas } diff --git a/extra/fakechroot/PKGBUILD b/extra/fakechroot/PKGBUILD index a02a6ff44..c92d09aac 100644 --- a/extra/fakechroot/PKGBUILD +++ b/extra/fakechroot/PKGBUILD @@ -1,26 +1,19 @@ -# $Id: PKGBUILD 197946 2013-10-30 11:50:42Z allan $ +# $Id: PKGBUILD 202701 2013-12-25 12:20:07Z allan $ # Maintainer : Allan McRae <allan@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=fakechroot -pkgver=2.16 -pkgrel=3 +pkgver=2.17.2 +pkgrel=1 pkgdesc="Gives a fake chroot environment" arch=('i686' 'x86_64' 'mips64el') -url="https://github.com/fakechroot/fakechroot/wiki" +url="https://github.com/dex4er/fakechroot/wiki" license=('LGPL') install=fakechroot.install -source=(https://github.com/downloads/fakechroot/fakechroot/fakechroot-${pkgver}.tar.gz) -md5sums=('3ea5efb76664e787450e0cfcefc1b807') +source=(https://github.com/dex4er/fakechroot/archive/${pkgver}.tar.gz) +md5sums=('e614f62972efa4654fc780ae7e4affad') -prepare() { - cd ${srcdir}/${pkgname}-${pkgver} - - # https://github.com/fakechroot/fakechroot/issues/10 - sed -i "s#usr/sbin/chroot#usr/bin/chroot#" test/testtree.sh test/t/chroot.t -} - build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --sbindir=/usr/bin \ diff --git a/extra/farstream-0.1/PKGBUILD b/extra/farstream-0.1/PKGBUILD index b1ee8f8fc..f078a8d59 100644 --- a/extra/farstream-0.1/PKGBUILD +++ b/extra/farstream-0.1/PKGBUILD @@ -1,43 +1,49 @@ -# $Id: PKGBUILD 197948 2013-10-30 11:51:24Z allan $ +# $Id: PKGBUILD 201487 2013-12-12 18:59:01Z jgc $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Ionut Biru <ibiru@archlinux.org> pkgname=farstream-0.1 _pkgname=farstream pkgver=0.1.2 -pkgrel=2.1 +pkgrel=3 pkgdesc="Audio/Video Communications Framework (legacy version)" arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/Farstream" license=('LGPL2.1') depends=('libnice' 'gstreamer0.10-base' 'gstreamer0.10-bad-plugins' 'gstreamer0.10-good' 'gstreamer0.10-ffmpeg') -makedepends=('gobject-introspection' 'gstreamer0.10-python' 'python2-gobject2') -source=(http://freedesktop.org/software/$_pkgname/releases/$_pkgname/$_pkgname-$pkgver.tar.gz +makedepends=('gobject-introspection' 'gstreamer0.10-python' 'python2-gobject2' 'git' 'gtk-doc') +source=(git://git.collabora.co.uk/git/farstream.git#commit=54e28e95bed4f04bc95dae509c3724399c79fa29 farstream-0.1.2-prefer-vp8.patch - farstream-0.1.2-introspection-tag-order.patch) -sha256sums=('fa5a40597b47b59d124f7fd57f66704b030d576cdc0d90e107c7a592f05e73d9' - '5f8f2876bde0f21383b3d059c94914a2fcd63d45a1bb1b5cd2e2208cd2536da5' - 'f540ea6f239e291f9ffc5b806cfea9f9cd0c4f13963e900719a5ee3a3f370124') - -build() { - cd "$_pkgname-$pkgver" + codec-discovery-intersect.patch + rtp-memleak.patch) +sha256sums=('SKIP') - patch -Np1 -i "$srcdir/farstream-0.1.2-prefer-vp8.patch" - patch -Np1 -i "$srcdir/farstream-0.1.2-introspection-tag-order.patch" +prepare() { + cd farstream + patch -Np1 -i ../farstream-0.1.2-prefer-vp8.patch + patch -Np1 -i ../codec-discovery-intersect.patch + patch -Np1 -i ../rtp-memleak.patch +} +build() { + cd farstream + NOCONFIGURE=1 ./autogen.sh ./configure \ --prefix=/usr \ --with-package-name='Parabola Farstream 0.1 Package' \ --with-package-origin='https://parabolagnulinux.org/' \ - --disable-static - make + --enable-gtk-doc --disable-static + make -j1 } package() { - cd "$_pkgname-$pkgver" - + cd farstream make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: +sha256sums=('SKIP' + '5f8f2876bde0f21383b3d059c94914a2fcd63d45a1bb1b5cd2e2208cd2536da5' + '385d7c72e269bf48bd41937442d819a1e6d0f2472b903670a8a5555f5cb96586' + 'b966312ccad90dd30b78ee2df49e9637b3b573e498668bcc58ac208f254440db') diff --git a/extra/farstream-0.1/codec-discovery-intersect.patch b/extra/farstream-0.1/codec-discovery-intersect.patch new file mode 100644 index 000000000..54134e054 --- /dev/null +++ b/extra/farstream-0.1/codec-discovery-intersect.patch @@ -0,0 +1,72 @@ +From 50fffb08d941dce58ae48bf531faead8a4e22ed7 Mon Sep 17 00:00:00 2001 +From: Olivier Crête <olivier.crete@collabora.com> +Date: Tue, 02 Apr 2013 23:13:06 +0000 +Subject: codec-discovery: Intersect different parts of the same caps to reduce them + +We do this because a caps may have the static payload in a separate structure from the encoding-name +We just want both in the same structure +--- +diff --git a/gst/fsrtpconference/fs-rtp-discover-codecs.c b/gst/fsrtpconference/fs-rtp-discover-codecs.c +index 5530cc8..df316a4 100644 +--- a/gst/fsrtpconference/fs-rtp-discover-codecs.c ++++ b/gst/fsrtpconference/fs-rtp-discover-codecs.c +@@ -384,7 +384,6 @@ validate_h263_codecs (CodecCap *codec_cap) + if (!rtp_struct) + return FALSE; + +- /* If there no h263version, we accept everything */ + encoding_name = gst_structure_get_string (rtp_struct, "encoding-name"); + + /* If there is no encoding name, we have a problem, lets refuse it */ +@@ -1300,15 +1299,44 @@ get_plugins_filtered_from_caps (FilterFunc filter, + else + { + gint i; +- for (i = 0; i < gst_caps_get_size (matched_caps); i++) ++ GPtrArray *capslist = g_ptr_array_new_with_free_func ( ++ (GDestroyNotify) gst_caps_unref); ++ ++ while (gst_caps_get_size (matched_caps) > 0) + { +- GstCaps *cur_caps = +- gst_caps_copy_nth (matched_caps, i); ++ GstCaps *stolencaps = gst_caps_new_full ( ++ gst_caps_steal_structure (matched_caps, 0), NULL); ++ gboolean got_match = FALSE; ++ ++ for (i = 0; i < capslist->len; i++) ++ { ++ GstCaps *intersect = gst_caps_intersect (stolencaps, ++ g_ptr_array_index (capslist, i)); ++ ++ if (gst_caps_is_empty (intersect)) ++ { ++ gst_caps_unref (intersect); ++ } ++ else ++ { ++ got_match = TRUE; ++ gst_caps_unref (g_ptr_array_index (capslist, i)); ++ g_ptr_array_index (capslist, i) = intersect; ++ } ++ } ++ ++ if (got_match) ++ gst_caps_unref (stolencaps); ++ else ++ g_ptr_array_add (capslist, stolencaps); + +- list = create_codec_cap_list (factory, direction, list, cur_caps); +- gst_caps_unref (cur_caps); + } + gst_caps_unref (matched_caps); ++ ++ for (i = 0; i < capslist->len; i++) ++ list = create_codec_cap_list (factory, direction, list, ++ g_ptr_array_index (capslist, i)); ++ g_ptr_array_unref (capslist); + } + } + +-- +cgit v0.9.0.3 diff --git a/extra/farstream-0.1/farstream-0.1.2-introspection-tag-order.patch b/extra/farstream-0.1/farstream-0.1.2-introspection-tag-order.patch deleted file mode 100644 index 3283e1fd2..000000000 --- a/extra/farstream-0.1/farstream-0.1.2-introspection-tag-order.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 39450457190675716c8e66700e35b05334a6a1a0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com> -Date: Fri, 25 May 2012 17:06:59 -0400 -Subject: [PATCH] Gtk-doc tags belong after the description - ---- - farstream/fs-session.c | 16 +++++++--------- - farstream/fs-stream.c | 15 ++++++--------- - 2 files changed, 13 insertions(+), 18 deletions(-) - -diff --git a/farstream/fs-session.c b/farstream/fs-session.c -index 80794d1..abb1bc3 100644 ---- a/farstream/fs-session.c -+++ b/farstream/fs-session.c -@@ -270,9 +270,6 @@ fs_session_class_init (FsSessionClass *klass) - /** - * FsSession:codec-preferences: - * -- * Type: GLib.List(FsCodec) -- * Transfer: full -- * - * This is the current preferences list for the local codecs. It is - * set by the user to specify the codec options and priorities. The user may - * change its value with fs_session_set_codec_preferences() at any time -@@ -283,6 +280,9 @@ fs_session_class_init (FsSessionClass *klass) - * or %FS_CODEC_ID_ANY. If the encoding name is "reserve-pt", then the - * payload type of the codec will be "reserved" and not be used by any - * dynamically assigned payload type. -+ * -+ * Type: GLib.List(FsCodec) -+ * Transfer: full - */ - g_object_class_install_property (gobject_class, - PROP_CODEC_PREFERENCES, -@@ -296,9 +296,6 @@ fs_session_class_init (FsSessionClass *klass) - /** - * FsSession:codecs: - * -- * Type: GLib.List(FsCodec) -- * Transfer: full -- * - * This is the list of codecs used for this session. It will include the - * codecs and payload type used to receive media on this session. It will - * also include any configuration parameter that must be transmitted reliably -@@ -317,6 +314,8 @@ fs_session_class_init (FsSessionClass *klass) - * It is a #GList of #FsCodec. User must free this codec list using - * fs_codec_list_destroy() when done. - * -+ * Type: GLib.List(FsCodec) -+ * Transfer: full - */ - g_object_class_install_property (gobject_class, - PROP_CODECS, -@@ -329,9 +328,6 @@ fs_session_class_init (FsSessionClass *klass) - /** - * FsSession:codecs-without-config: - * -- * Type: GLib.List(FsCodec) -- * Transfer: full -- * - * This is the same list of codecs as #FsSession:codecs without - * the configuration information that describes the data sent. It is suitable - * for configurations where a list of codecs is shared by many senders. -@@ -349,6 +345,8 @@ fs_session_class_init (FsSessionClass *klass) - * It is a #GList of #FsCodec. User must free this codec list using - * fs_codec_list_destroy() when done. - * -+ * Type: GLib.List(FsCodec) -+ * Transfer: full - */ - g_object_class_install_property (gobject_class, - PROP_CODECS_WITHOUT_CONFIG, -diff --git a/farstream/fs-stream.c b/farstream/fs-stream.c -index b9e1320..110641d 100644 ---- a/farstream/fs-stream.c -+++ b/farstream/fs-stream.c -@@ -176,13 +176,12 @@ fs_stream_class_init (FsStreamClass *klass) - /** - * FsStream:remote-codecs: - * -- * Type: GLib.List(FsCodec) -- * Transfer: full -- * - * This is the list of remote codecs for this stream. They must be set by the - * user as soon as they are known using fs_stream_set_remote_codecs() - * (generally through external signaling). It is a #GList of #FsCodec. - * -+ * Type: GLib.List(FsCodec) -+ * Transfer: full - */ - g_object_class_install_property (gobject_class, - PROP_REMOTE_CODECS, -@@ -195,15 +194,14 @@ fs_stream_class_init (FsStreamClass *klass) - /** - * FsStream:negotiated-codecs: - * -- * Type: GLib.List(FsCodec) -- * Transfer: full -- * - * This is the list of negotiatied codecs, it is the same list as the list - * of #FsCodec from the parent #FsSession, except that the codec config data - * has been replaced with the data from the remote codecs for this stream. - * This is the list of #FsCodec used to receive data from this stream. - * It is a #GList of #FsCodec. - * -+ * Type: GLib.List(FsCodec) -+ * Transfer: full - */ - g_object_class_install_property (gobject_class, - PROP_NEGOTIATED_CODECS, -@@ -216,9 +214,6 @@ fs_stream_class_init (FsStreamClass *klass) - /** - * FsStream:current-recv-codecs: - * -- * Type: GLib.List(FsCodec) -- * Transfer: full -- * - * This is the list of codecs that have been received by this stream. - * The user must free the list if fs_codec_list_destroy(). - * The "farstream-recv-codecs-changed" message is send on the #GstBus -@@ -228,6 +223,8 @@ fs_stream_class_init (FsStreamClass *klass) - * also be emitted if the pad already exists, but the source material that - * will come to it is different. - * -+ * Type: GLib.List(FsCodec) -+ * Transfer: full - */ - g_object_class_install_property (gobject_class, - PROP_CURRENT_RECV_CODECS, --- -1.7.8.6 - diff --git a/extra/farstream-0.1/rtp-memleak.patch b/extra/farstream-0.1/rtp-memleak.patch new file mode 100644 index 000000000..1ec307258 --- /dev/null +++ b/extra/farstream-0.1/rtp-memleak.patch @@ -0,0 +1,24 @@ +From 10b3d38560ec53d980d13240559e6758c1113e21 Mon Sep 17 00:00:00 2001 +From: Havard Graff <havard.graff@gmail.com> +Date: Thu, 21 Mar 2013 12:46:11 +0000 +Subject: fs-rtp-discover-codecs: plug memoryleak + +use g_list_delete_link to free the list as well +--- +(limited to 'gst/fsrtpconference') + +diff --git a/gst/fsrtpconference/fs-rtp-discover-codecs.c b/gst/fsrtpconference/fs-rtp-discover-codecs.c +index df316a4..c663225 100644 +--- a/gst/fsrtpconference/fs-rtp-discover-codecs.c ++++ b/gst/fsrtpconference/fs-rtp-discover-codecs.c +@@ -536,7 +536,7 @@ remove_duplicates (GList *list) + if (gst_caps_is_equal (codec_cap1->rtp_caps, codec_cap2->rtp_caps)) + { + codec_cap_free (codec_cap2); +- walk1 = g_list_remove_link (walk1, walk2); ++ walk1 = g_list_delete_link (walk1, walk2); + goto again; + } + } +-- +cgit v0.9.0.3 diff --git a/extra/ffmpeg-compat/PKGBUILD b/extra/ffmpeg-compat/PKGBUILD index 21e3a623b..350d24f28 100644 --- a/extra/ffmpeg-compat/PKGBUILD +++ b/extra/ffmpeg-compat/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 197753 2013-10-29 18:00:31Z bpiotrowski $ +# $Id: PKGBUILD 202972 2013-12-29 17:17:30Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Ionut Biru <ibiru@archlinux.org> @@ -6,10 +6,10 @@ # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg-compat -pkgver=0.10.9 -pkgrel=1 +pkgver=0.10.10 +pkgrel=2 epoch=1 -pkgdesc='Complete and free Internet live audio and video broadcasting solution for Linux/Unix' +pkgdesc='Complete and free Internet live audio and video broadcasting solution' arch=('i686' 'x86_64' 'mips64el') url='http://ffmpeg.org/' license=('GPL') @@ -23,8 +23,15 @@ if [ "$CARCH" != "mips64el" ]; then depends+=(libva) makedepends=('libvdpau' 'yasm') fi -source=(http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2) -sha256sums=('1d0cc2dd539faefe47554935ea4e4f6aa779d0896b3e722d595aa5abe2304cf9') +source=(http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2 + ffmpeg-0.10.10-freetype2.patch) +sha256sums=('936058d7579bfc431b13d47c3f63ee25a0160d4c73cc0fa04fef97cd2394cb91' + '05cf516b292c3815ecaaf72f12c0c73891b62b47d83f5d81f09380949e691988') + +prepare() { + cd ffmpeg-$pkgver + patch -p1 -i ../ffmpeg-0.10.10-freetype2.patch +} build() { cd ffmpeg-$pkgver diff --git a/extra/ffmpeg-compat/ffmpeg-0.10.10-freetype2.patch b/extra/ffmpeg-compat/ffmpeg-0.10.10-freetype2.patch new file mode 100644 index 000000000..1e8cc6547 --- /dev/null +++ b/extra/ffmpeg-compat/ffmpeg-0.10.10-freetype2.patch @@ -0,0 +1,50 @@ +diff -rupN a/configure b/configure +--- a/configure 2013-11-06 00:55:13.000000000 +0000 ++++ b/configure 2013-12-28 22:06:00.925551644 +0000 +@@ -943,6 +943,26 @@ require_pkg_config(){ + add_extralibs $(get_safe ${pkg}_libs) + } + ++require_libfreetype(){ ++ log require_libfreetype "$@" ++ pkg="freetype2" ++ check_cmd $pkg_config --exists --print-errors $pkg \ ++ || die "ERROR: $pkg not found" ++ pkg_cflags=$($pkg_config --cflags $pkg) ++ pkg_libs=$($pkg_config --libs $pkg) ++ { ++ echo "#include <ft2build.h>" ++ echo "#include FT_FREETYPE_H" ++ echo "long check_func(void) { return (long) FT_Init_FreeType; }" ++ echo "int main(void) { return 0; }" ++ } | check_ld "cc" $pkg_cflags $pkg_libs \ ++ && set_safe ${pkg}_cflags $pkg_cflags \ ++ && set_safe ${pkg}_libs $pkg_libs \ ++ || die "ERROR: $pkg not found" ++ add_cflags $(get_safe ${pkg}_cflags) ++ add_extralibs $(get_safe ${pkg}_libs) ++} ++ + check_host_cc(){ + log check_host_cc "$@" + cat > $TMPC +@@ -3134,7 +3154,7 @@ enabled libdirac && require_pkg_config + "libdirac_decoder/dirac_parser.h libdirac_encoder/dirac_encoder.h" \ + "dirac_decoder_init dirac_encoder_init" + enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac +-enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType ++enabled libfreetype && require_libfreetype + enabled libgsm && require libgsm gsm/gsm.h gsm_create -lgsm + enabled libmodplug && require libmodplug libmodplug/modplug.h ModPlug_Load -lmodplug + enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame +diff -rupN a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c +--- a/libavfilter/vf_drawtext.c 2013-11-06 00:55:16.000000000 +0000 ++++ b/libavfilter/vf_drawtext.c 2013-12-28 22:06:16.495450750 +0000 +@@ -47,7 +47,6 @@ + #undef time + + #include <ft2build.h> +-#include <freetype/config/ftheader.h> + #include FT_FREETYPE_H + #include FT_GLYPH_H + diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index e9d34e53f..c72b8665a 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 198639 2013-10-31 16:28:32Z bpiotrowski $ +# $Id: PKGBUILD 202971 2013-12-29 17:17:29Z bpiotrowski $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg -pkgver=2.1 -pkgrel=2 +pkgver=2.1.1 +pkgrel=3 epoch=1 pkgdesc='Complete and free Internet live audio and video broadcasting solution' arch=('i686' 'x86_64' 'mips64el') @@ -23,13 +23,13 @@ if [ "${CARCH}" != "mips64el" ]; then makedepends=('yasm' 'libvdpau') fi source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2 - ffmpeg-2.1-avformat-http.fix-cookies.patch) -sha256sums=('926603fd974e9b38071a5cfc6fd0d93857801d1968145dfce7fdc627ab1d68df' - '0168bc6f77115ef6f3bd428b1b05a1543d0dd53d8d74c15a24879b119ce8655c') + ffmpeg-2.1.1-freetype2.patch) +md5sums=('2719ab2b3311ac3775b9cdeb66c54849' + '4b5dd079a40f44f4e0d00cdbc9d52ec3') prepare() { cd $pkgname-$pkgver - patch -p1 -i ../ffmpeg-2.1-avformat-http.fix-cookies.patch + patch -p1 -i ../ffmpeg-2.1.1-freetype2.patch } build() { @@ -89,7 +89,7 @@ build() { package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install install-man - install -D -m755 tools/qt-faststart "$pkgdir"/usr/bin/qt-faststart + install -Dm755 tools/qt-faststart "$pkgdir"/usr/bin/qt-faststart } # vim:set ts=2 sw=2 et: diff --git a/extra/ffmpeg/ffmpeg-2.1-avformat-http.fix-cookies.patch b/extra/ffmpeg/ffmpeg-2.1-avformat-http.fix-cookies.patch deleted file mode 100644 index 7c826a3b8..000000000 --- a/extra/ffmpeg/ffmpeg-2.1-avformat-http.fix-cookies.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b73900b8a6c0a23e63e84a5eed0a5b9b3ffe1198 Mon Sep 17 00:00:00 2001 -From: Michael Niedermayer <michaelni@gmx.at> -Date: Thu, 31 Oct 2013 01:42:13 +0100 -Subject: [PATCH] avformat/http: fix cookies - -Fixes Ticket3096 - -Signed-off-by: Michael Niedermayer <michaelni@gmx.at> ---- - libavformat/http.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libavformat/http.c b/libavformat/http.c -index c5b5c53..9be1181 100644 ---- a/libavformat/http.c -+++ b/libavformat/http.c -@@ -95,7 +95,7 @@ static const AVOption options[] = { - {"multiple_requests", "use persistent connections", OFFSET(multiple_requests), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, D|E }, - {"post_data", "set custom HTTP post data", OFFSET(post_data), AV_OPT_TYPE_BINARY, .flags = D|E }, - {"mime_type", "set MIME type", OFFSET(mime_type), AV_OPT_TYPE_STRING, {0}, 0, 0, 0 }, --{"cookies", "set cookies to be sent in applicable future requests, use newline delimited Set-Cookie HTTP field value syntax", OFFSET(cookies), AV_OPT_TYPE_STRING, {0}, 0, 0, 0 }, -+{"cookies", "set cookies to be sent in applicable future requests, use newline delimited Set-Cookie HTTP field value syntax", OFFSET(cookies), AV_OPT_TYPE_STRING, {0}, 0, 0, D }, - {"icy", "request ICY metadata", OFFSET(icy), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, D }, - {"icy_metadata_headers", "return ICY metadata headers", OFFSET(icy_metadata_headers), AV_OPT_TYPE_STRING, {0}, 0, 0, 0 }, - {"icy_metadata_packet", "return current ICY metadata packet", OFFSET(icy_metadata_packet), AV_OPT_TYPE_STRING, {0}, 0, 0, 0 }, --- -1.8.4.1 - diff --git a/extra/ffmpeg/ffmpeg-2.1.1-freetype2.patch b/extra/ffmpeg/ffmpeg-2.1.1-freetype2.patch new file mode 100644 index 000000000..2ff9f87cc --- /dev/null +++ b/extra/ffmpeg/ffmpeg-2.1.1-freetype2.patch @@ -0,0 +1,73 @@ +From cea5812fa723c08b89d929eeba73462e05de2973 Mon Sep 17 00:00:00 2001 +From: Alexander Strasser <eclipse7@gmx.net> +Date: Fri, 6 Dec 2013 17:20:26 +0100 +Subject: [PATCH] configure: Special case libfreetype test + +Include the freetype header, in-directly through a macro, like it +is done in the drawtext filter. Do not break if the header is moved. + +Unfortunately the drawtext filter included the file where the include +macros are defined in a wrong way. This is not needed and breaks the +build. Remove that #include line too. + +Signed-off-by: Alexander Strasser <eclipse7@gmx.net> +--- + configure | 22 +++++++++++++++++++++- + libavfilter/vf_drawtext.c | 1 - + 2 files changed, 21 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 205cfc9..0b00684 100755 +--- a/configure ++++ b/configure +@@ -1128,6 +1128,26 @@ require_pkg_config(){ + add_extralibs $(get_safe ${pkg}_libs) + } + ++require_libfreetype(){ ++ log require_libfreetype "$@" ++ pkg="freetype2" ++ check_cmd $pkg_config --exists --print-errors $pkg \ ++ || die "ERROR: $pkg not found" ++ pkg_cflags=$($pkg_config --cflags $pkg) ++ pkg_libs=$($pkg_config --libs $pkg) ++ { ++ echo "#include <ft2build.h>" ++ echo "#include FT_FREETYPE_H" ++ echo "long check_func(void) { return (long) FT_Init_FreeType; }" ++ echo "int main(void) { return 0; }" ++ } | check_ld "cc" $pkg_cflags $pkg_libs \ ++ && set_safe ${pkg}_cflags $pkg_cflags \ ++ && set_safe ${pkg}_libs $pkg_libs \ ++ || die "ERROR: $pkg not found" ++ add_cflags $(get_safe ${pkg}_cflags) ++ add_extralibs $(get_safe ${pkg}_libs) ++} ++ + hostcc_o(){ + eval printf '%s\\n' $HOSTCC_O + } +@@ -4322,7 +4342,7 @@ enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersio + enabled libfdk_aac && require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac + flite_libs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite" + enabled libflite && require2 libflite "flite/flite.h" flite_init $flite_libs +-enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType ++enabled libfreetype && require_libfreetype + enabled libgme && require libgme gme/gme.h gme_new_emu -lgme -lstdc++ + enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do + check_lib "${gsm_hdr}" gsm_create -lgsm && break; +diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c +index dde3b0a..91b8218 100644 +--- a/libavfilter/vf_drawtext.c ++++ b/libavfilter/vf_drawtext.c +@@ -48,7 +48,6 @@ + #include "video.h" + + #include <ft2build.h> +-#include <freetype/config/ftheader.h> + #include FT_FREETYPE_H + #include FT_GLYPH_H + #if CONFIG_FONTCONFIG +-- +1.7.10.4 + diff --git a/extra/ffmpegthumbnailer/PKGBUILD b/extra/ffmpegthumbnailer/PKGBUILD index 14bb59444..3042e89bf 100644 --- a/extra/ffmpegthumbnailer/PKGBUILD +++ b/extra/ffmpegthumbnailer/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 197950 2013-10-30 11:52:15Z allan $ +# $Id: PKGBUILD 199810 2013-11-17 05:20:09Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: boromil@gmail.com pkgname=ffmpegthumbnailer pkgver=2.0.8 -pkgrel=4 +pkgrel=5 pkgdesc="Lightweight video thumbnailer that can be used by file managers." url="http://code.google.com/p/ffmpegthumbnailer/" license=('GPL2') @@ -18,14 +18,12 @@ sha1sums=('2c54ca16efd953f46547e22799cfc40bd9c24533' prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - - patch -Np0 -i "${srcdir}/ffmpegthumbnailer-2.0.8-memcpy.patch" + patch -p0 -i "${srcdir}/ffmpegthumbnailer-2.0.8-memcpy.patch" } + build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-gio --enable-thumbnailer - make } diff --git a/extra/five-or-more/PKGBUILD b/extra/five-or-more/PKGBUILD index a52abf81b..55bbf780b 100644 --- a/extra/five-or-more/PKGBUILD +++ b/extra/five-or-more/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 197952 2013-10-30 11:52:58Z allan $ +# $Id: PKGBUILD 199351 2013-11-11 16:08:37Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=five-or-more -pkgver=3.10.1 +pkgver=3.10.2 pkgrel=1 pkgdesc="Remove colored balls from the board by forming lines" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ install=five-or-more.install url="https://live.gnome.org/Five%20or%20more" groups=('gnome-extra') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('3614ad2548d4954c4069c348ba08b32b4ef92b22939e4d2955f44f50ecb0a15b') +sha256sums=('e2e6834df8be22db1feb1ef41f4d3c4b2f41ab6b3bcbc7f4ba61b8b70bfd89a9') build() { cd $pkgname-$pkgver diff --git a/extra/fltk/PKGBUILD b/extra/fltk/PKGBUILD index 27f5dfeef..e176ca9b6 100644 --- a/extra/fltk/PKGBUILD +++ b/extra/fltk/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 197654 2013-10-27 19:10:51Z eric $ +# $Id: PKGBUILD 202754 2013-12-26 07:00:56Z bpiotrowski $ # Maintainer: pkgbase=fltk pkgname=('fltk' 'fltk-docs' 'fltk-games') pkgver=1.3.2 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64' 'mips64el') license=('custom:LGPL') url="http://www.fltk.org/" makedepends=('mesa' 'glu' 'doxygen' 'libjpeg' 'libxft' 'libxinerama' \ 'alsa-lib' 'desktop-file-utils' 'libxcursor') source=(http://fltk.org/pub/fltk/$pkgver/fltk-$pkgver-source.tar.gz - tigervnc.patch) + tigervnc.patch + fltk-config-dynlibs.patch) md5sums=('9f7e707d4fb7a5a76f0f9b73ff70623d' - '9efdf03a449d7639b6da493cb0972bba') + '9efdf03a449d7639b6da493cb0972bba' + 'b7ca1a3f5055aabe9c823e650db5b0b0') prepare() { cd $pkgbase-$pkgver - patch -Np1 -i ../tigervnc.patch + patch -p1 -i ../tigervnc.patch + patch -p1 -i ../fltk-config-dynlibs.patch } build() { diff --git a/extra/fltk/fltk-config-dynlibs.patch b/extra/fltk/fltk-config-dynlibs.patch new file mode 100644 index 000000000..0e7ffec94 --- /dev/null +++ b/extra/fltk/fltk-config-dynlibs.patch @@ -0,0 +1,37 @@ +diff -rupN a/fltk-config.in b/fltk-config.in +--- a/fltk-config.in 2011-07-19 06:49:30.000000000 +0200 ++++ b/fltk-config.in 2013-12-26 07:50:58.393155344 +0100 +@@ -357,26 +357,26 @@ if test "$echo_ldstaticflags" = "yes"; t + fi + + if test "$echo_libs" = "yes"; then +- USELIBS="$libdir/libfltk.a" ++ USELIBS="$libdir/libfltk.so" + + if test x$use_forms = xyes; then +- USELIBS="$libdir/libfltk_forms.a $USELIBS" ++ USELIBS="$libdir/libfltk_forms.so $USELIBS" + fi + + if test x$use_gl = xyes; then +- USELIBS="$libdir/libfltk_gl.a $USELIBS" ++ USELIBS="$libdir/libfltk_gl.so $USELIBS" + fi + + if test x$use_cairo = xyes; then +- USELIBS="$libdir/libfltk_cairo.a $USELIBS" ++ USELIBS="$libdir/libfltk_cairo.so $USELIBS" + fi + + if test x$use_images = xyes; then +- USELIBS="$libdir/libfltk_images.a $USELIBS" ++ USELIBS="$libdir/libfltk_images.so $USELIBS" + + for lib in fltk_jpeg fltk_png fltk_z; do +- if test -f $libdir/lib$lib.a; then +- USELIBS="$libdir/lib$lib.a $USELIBS" ++ if test -f $libdir/lib$lib.so; then ++ USELIBS="$libdir/lib$lib.so $USELIBS" + fi + done + fi diff --git a/extra/folks/PKGBUILD b/extra/folks/PKGBUILD index 8f269c030..2ce34ed32 100644 --- a/extra/folks/PKGBUILD +++ b/extra/folks/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 197954 2013-10-30 11:53:55Z allan $ +# $Id: PKGBUILD 199902 2013-11-18 14:27:44Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=folks -pkgver=0.9.5 +pkgver=0.9.6 pkgrel=1 pkgdesc="Library to aggregates people into metacontacts" arch=(i686 x86_64 'mips64el') @@ -13,7 +13,7 @@ makedepends=(gobject-introspection intltool vala) install=folks.install options=('!emptydirs') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('924c440f16a8c9b0d0d832588fa77a1553fa2a5d2659c4c7d3178a7ef42222af') +sha256sums=('a67e055b5a2724a34a80946e2940c4c0ad708cb1f4e0a09407c6b69a5e40267f') build() { cd "$pkgname-$pkgver" diff --git a/extra/fping/PKGBUILD b/extra/fping/PKGBUILD index 0d7ab6e4c..460a932e3 100644 --- a/extra/fping/PKGBUILD +++ b/extra/fping/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 196316 2013-10-11 13:19:32Z giovanni $ +# $Id: PKGBUILD 200236 2013-11-23 17:36:41Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=fping -pkgver=3.6 -pkgrel=1 +pkgver=3.8 +pkgrel=2 pkgdesc="A utility to ping multiple hosts at once" arch=('i686' 'x86_64' 'mips64el') url="http://www.fping.org/" license=('custom') depends=('glibc') source=("http://www.fping.org/dist/${pkgname}-${pkgver}.tar.gz") -md5sums=('997b1e998caff6ad5b28c48a5a8bf84b') +md5sums=('1e36467cc96a4ca959925ac167ea19af') build() { cd "$srcdir/$pkgname-$pkgver" @@ -32,4 +32,5 @@ package() { # install license install -D -m644 COPYING "${pkgdir}/usr/share/licenses/$pkgname/LICENSE" chmod 4555 ${pkgdir}/usr/bin/fping + chmod 4555 ${pkgdir}/usr/bin/fping6 } diff --git a/extra/freeciv/PKGBUILD b/extra/freeciv/PKGBUILD index 71710857b..6b5586369 100644 --- a/extra/freeciv/PKGBUILD +++ b/extra/freeciv/PKGBUILD @@ -1,19 +1,18 @@ -# $Id: PKGBUILD 197960 2013-10-30 11:56:07Z allan $ +# $Id: PKGBUILD 201416 2013-12-10 20:59:46Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=freeciv -pkgver=2.4.0 +pkgver=2.4.1 pkgrel=1 pkgdesc="A multiuser clone of the famous Microprose game of Civilization" arch=('i686' 'x86_64' 'mips64el') url="http://www.freeciv.org/" license=('GPL') -depends=('gtk2' 'sdl_mixer' 'hicolor-icon-theme' 'lua51' 'sqlite' 'curl' 'libltdl') +depends=('gtk2' 'sdl_mixer' 'lua51' 'sqlite' 'curl' 'libltdl') backup=('etc/freeciv/database.lua') -options=('!staticlibs') install=freeciv.install source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('4a3537dc050bd69002794c832b74f5af972da25e') +sha1sums=('16fddc97c91e99b31f23fc80746b3454f8f55f78') build() { cd ${pkgname}-${pkgver} diff --git a/extra/freetype2/PKGBUILD b/extra/freetype2/PKGBUILD index 427b4b39c..f7816eeaa 100644 --- a/extra/freetype2/PKGBUILD +++ b/extra/freetype2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 197963 2013-10-30 11:57:18Z allan $ +# $Id: PKGBUILD 201340 2013-12-09 07:41:57Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=freetype2 -pkgver=2.5.0.1 -pkgrel=2 +pkgver=2.5.2 +pkgrel=1 pkgdesc="TrueType font rendering library" arch=(i686 x86_64 'mips64el') license=('GPL') @@ -11,22 +11,22 @@ url="http://freetype.sourceforge.net" depends=('zlib' 'bzip2' 'sh' 'libpng') source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2 freetype-2.2.1-enable-valid.patch - freetype-2.3.0-enable-spr.patch - freetype-2.4.11-enable-sph.patch) -md5sums=('c72e9010b1d986d556fc0b2b5fcbf31a' + freetype-2.5.1-enable-spr.patch + freetype-2.5.1-enable-sph.patch) +md5sums=('10e8f4d6a019b124088d18bc26123a25' '214119610444c9b02766ccee5e220680' - '816dc8619a6904a7385769433c0a8653' - '2422f8902224fedb46ae9eec08c8ceac') + '80a14cce234f3f190cd936ca9060c398' + '0636ba2ff074201e2ea5c47ac408bc63') prepare() { cd "${srcdir}/freetype-${pkgver}" patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch" - patch -Np1 -i "${srcdir}/freetype-2.3.0-enable-spr.patch" + patch -Np1 -i "${srcdir}/freetype-2.5.1-enable-spr.patch" # Disabled for now due to resistance # Kept here for easier rebuilds via ABS # https://bugs.archlinux.org/task/35274 - #patch -Np1 -i "${srcdir}/freetype-2.4.11-enable-sph.patch" + #patch -Np1 -i "${srcdir}/freetype-2.5.1-enable-sph.patch" } build() { diff --git a/extra/freetype2/freetype-2.4.11-enable-sph.patch b/extra/freetype2/freetype-2.5.1-enable-sph.patch index 34c8d63bf..69f73b7e3 100644 --- a/extra/freetype2/freetype-2.4.11-enable-sph.patch +++ b/extra/freetype2/freetype-2.5.1-enable-sph.patch @@ -1,8 +1,8 @@ -diff --git i/include/freetype/config/ftoption.h w/include/freetype/config/ftoption.h -index a73fff4..0a081bf 100644 ---- i/include/freetype/config/ftoption.h -+++ w/include/freetype/config/ftoption.h -@@ -577,7 +577,7 @@ FT_BEGIN_HEADER +diff --git i/include/config/ftoption.h w/include/config/ftoption.h +index fe2ba15..1ab4226 100644 +--- i/include/config/ftoption.h ++++ w/include/config/ftoption.h +@@ -591,7 +591,7 @@ FT_BEGIN_HEADER /* This option requires TT_CONFIG_OPTION_BYTECODE_INTERPRETER to be */ /* defined. */ /* */ diff --git a/extra/freetype2/freetype-2.3.0-enable-spr.patch b/extra/freetype2/freetype-2.5.1-enable-spr.patch index 8432e28a4..0d300a8df 100644 --- a/extra/freetype2/freetype-2.3.0-enable-spr.patch +++ b/extra/freetype2/freetype-2.5.1-enable-spr.patch @@ -1,6 +1,8 @@ ---- freetype-2.3.0/include/freetype/config/ftoption.h.spf 2007-01-18 14:27:34.000000000 -0500 -+++ freetype-2.3.0/include/freetype/config/ftoption.h 2007-01-18 14:27:48.000000000 -0500 -@@ -92,7 +92,7 @@ +diff --git i/include/config/ftoption.h w/include/config/ftoption.h +index fe2ba15..22ce1a3 100644 +--- i/include/config/ftoption.h ++++ w/include/config/ftoption.h +@@ -92,7 +92,7 @@ FT_BEGIN_HEADER /* This is done to allow FreeType clients to run unmodified, forcing */ /* them to display normal gray-level anti-aliased glyphs. */ /* */ diff --git a/extra/gdb/PKGBUILD b/extra/gdb/PKGBUILD index b59a1b6b8..398cb7fb0 100644 --- a/extra/gdb/PKGBUILD +++ b/extra/gdb/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 197975 2013-10-30 12:01:45Z allan $ +# $Id: PKGBUILD 201560 2013-12-15 06:41:56Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gdb -pkgver=7.6.1 +pkgver=7.6.2 pkgrel=1 pkgdesc="The GNU Debugger" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=('texinfo') backup=('etc/gdb/gdbinit') install=gdb.install source=(http://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.bz2{,.sig}) -md5sums=('fbc4dab4181e6e9937075b43a4ce2732' +md5sums=('496399e96654fc0f899a5c964bc1f0f8' 'SKIP') prepare() { diff --git a/extra/gdk-pixbuf2/PKGBUILD b/extra/gdk-pixbuf2/PKGBUILD index 5021d5086..003a3073c 100644 --- a/extra/gdk-pixbuf2/PKGBUILD +++ b/extra/gdk-pixbuf2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 197976 2013-10-30 12:02:05Z allan $ +# $Id: PKGBUILD 201638 2013-12-17 11:09:15Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gdk-pixbuf2 -pkgver=2.30.0 +pkgver=2.30.2 pkgrel=1 pkgdesc="An image loading library" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11' 'jasper') makedepends=('gtk-doc' 'gobject-introspection') install=gdk-pixbuf2.install source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz) -sha256sums=('4a73600525621283a14436c5f873c1126c4feafcb07d24a746f13215e2caa658') +sha256sums=('cababfa075a9a60426809309ec86b82ea28e83f44ef69c898e48c040b6feecbf') build() { cd gdk-pixbuf-$pkgver diff --git a/extra/gdm/PKGBUILD b/extra/gdm/PKGBUILD index 41160df16..f9c3e4927 100644 --- a/extra/gdm/PKGBUILD +++ b/extra/gdm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 197978 2013-10-30 12:02:48Z allan $ +# $Id: PKGBUILD 200818 2013-12-05 23:40:49Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gdm pkgname=(gdm libgdm) pkgver=3.10.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="Gnome Display Manager" arch=('i686' 'x86_64' 'mips64el') license=(GPL) @@ -72,12 +72,16 @@ package_gdm() { ### Split libgdm make -C gui/libgdm DESTDIR="$pkgdir" uninstall + mv "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.login-screen.gschema.xml" "$srcdir" } package_libgdm() { pkgdesc="GDM support library" - depends=(systemd) + depends=(systemd glib2) + install=libgdm.install cd $pkgbase-$pkgver make -C gui/libgdm DESTDIR="$pkgdir" install + install -Dm644 "$srcdir/org.gnome.login-screen.gschema.xml" \ + "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.login-screen.gschema.xml" } diff --git a/extra/gdm/gdm.install b/extra/gdm/gdm.install index 4f15730f0..d43f06c2f 100644 --- a/extra/gdm/gdm.install +++ b/extra/gdm/gdm.install @@ -1,5 +1,3 @@ -pkgname=gdm - post_install() { getent group gdm >/dev/null 2>&1 || groupadd -g 120 gdm getent passwd gdm > /dev/null 2>&1 || usr/sbin/useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm @@ -7,25 +5,18 @@ post_install() { chown -R gdm:gdm /var/lib/gdm > /dev/null chown root:gdm /var/log/gdm > /dev/null - glib-compile-schemas /usr/share/glib-2.0/schemas gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor dconf update } -pre_upgrade() { - if [ -f /usr/share/gconf/schemas/${pkgname}.schemas ]; then - gconfpkg --uninstall ${pkgname} - fi -} - post_upgrade() { post_install } post_remove() { - glib-compile-schemas /usr/share/glib-2.0/schemas dconf update gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + getent passwd gdm >/dev/null 2>&1 && userdel gdm getent group gdm >/dev/null 2>&1 && groupdel gdm } diff --git a/extra/gdm/libgdm.install b/extra/gdm/libgdm.install new file mode 100644 index 000000000..c19349f72 --- /dev/null +++ b/extra/gdm/libgdm.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD index e728e4de0..418189c15 100644 --- a/extra/gedit/PKGBUILD +++ b/extra/gedit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 197979 2013-10-30 12:03:10Z allan $ +# $Id: PKGBUILD 202235 2013-12-20 16:53:55Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gedit -pkgver=3.10.1 +pkgver=3.10.3 pkgrel=1 pkgdesc="A text editor for GNOME" arch=(i686 x86_64 mips64el) @@ -16,7 +16,7 @@ options=('!emptydirs') url="http://www.gnome.org" install=gedit.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('2d2e931661c2c2f9ea76cb581fe0eb09d65925b06a57ee7e20cbecb49474cab7') +sha256sums=('d0efec59622061389fcc06d23b88e2621d4d66b4bafe7d4461c1c7d48a54bc82') build() { cd $pkgname-$pkgver diff --git a/extra/gif2png/PKGBUILD b/extra/gif2png/PKGBUILD deleted file mode 100644 index d5269af36..000000000 --- a/extra/gif2png/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 184383 2013-05-06 19:37:29Z foutrelis $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: eric <eric@archlinux.org> -# Contributor: Andrew Rose <ody@netrux.com> - -pkgname=gif2png -pkgver=2.5.8 -pkgrel=2 -pkgdesc="A GIF to PNG image format converter" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.catb.org/~esr/gif2png/" -license=('ZLIB') -depends=('libpng') -optdepends=('python2: for using web2png') -source=("http://www.catb.org/~esr/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('0f5caeeca561ade7f267ef3f2a9944b4') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - sed -i 's#env python#env python2#' web2png - - ./configure --prefix=/usr \ - --mandir=/usr/share/man - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/$pkgname/LICENSE" -} diff --git a/extra/giflib/PKGBUILD b/extra/giflib/PKGBUILD index 140c8817a..939a5939d 100644 --- a/extra/giflib/PKGBUILD +++ b/extra/giflib/PKGBUILD @@ -1,30 +1,20 @@ -# $Id: PKGBUILD 197988 2013-10-30 12:06:55Z allan $ +# $Id: PKGBUILD 199906 2013-11-18 17:59:42Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Baptiste Daroussin <baptiste.daroussin@gmail.com> # Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com> # Contributor: mightyjaym <jm.ambrosino@free.fr> pkgname=giflib -pkgver=5.0.4 -pkgrel=2 +pkgver=5.0.5 +pkgrel=1 pkgdesc="A library for reading and writing gif images" url="http://sourceforge.net/projects/giflib/" arch=('i686' 'x86_64' 'mips64el') license=('MIT') -depends=('libx11') +depends=('glibc') makedepends=('xmlto' 'docbook-xml' 'docbook-xsl') -provides=("libungif=${pkgver}") -conflicts=('libungif') -replaces=('libungif') -source=(http://downloads.sourceforge.net/sourceforge/giflib/${pkgname}-${pkgver}.tar.bz2 - giflib-5.0.4-include-stddef.patch) -md5sums=('da60935d07374de00a78c2f6f720c8f5' - 'e39b98822334f2bd2009469e5dea65c5') - -prepare() { - cd ${pkgname}-${pkgver} - patch -Np1 -i ../giflib-5.0.4-include-stddef.patch -} +source=(http://downloads.sourceforge.net/sourceforge/giflib/${pkgname}-${pkgver}.tar.bz2) +md5sums=('c3262ba0a3dad31ba876fb5ba1d71a02') build() { cd ${pkgname}-${pkgver} diff --git a/extra/giflib/giflib-4.2.1-quantize.patch b/extra/giflib/giflib-4.2.1-quantize.patch deleted file mode 100644 index f6745d2c0..000000000 --- a/extra/giflib/giflib-4.2.1-quantize.patch +++ /dev/null @@ -1,679 +0,0 @@ -From 7b01ed05d6c16172bd11a62d9b334f0eb7c5fc1e Mon Sep 17 00:00:00 2001 -From: "Eric S. Raymond" <esr@thyrsus.com> -Date: Sun, 3 Jun 2012 07:59:30 -0400 -Subject: [PATCH] Return QuantizeBuffer() to the core library. - -Fulfils SourceForge FR 3531618. ---- - NEWS | 2 + - lib/Makefile.am | 3 +- - lib/gif_lib.h | 9 ++ - lib/quantize.c | 309 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - util/rgb2gif.c | 302 ------------------------------------------------------ - 5 files changed, 322 insertions(+), 303 deletions(-) - create mode 100644 lib/quantize.c - -index 813a2f8..ae6d5fa 100644 ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -13,7 +13,8 @@ libgif_la_SOURCES = dgif_lib.c \ - gif_hash.h \ - gifalloc.c \ - gif_err.c \ -- gif_lib_private.h -+ gif_lib_private.h \ -+ quantize.c - - libgif_la_LDFLAGS = -version-info @SHLIBVERSION@ $(LT_LDFLAGS) - libgif_la_LIBADD = @DEVS@ -diff --git a/lib/gif_lib.h b/lib/gif_lib.h -index e942089..73bc437 100644 ---- a/lib/gif_lib.h -+++ b/lib/gif_lib.h -@@ -207,6 +207,15 @@ int DGifGetLZCodes(GifFileType *GifFile, int *GifCode); - - - /****************************************************************************** -+ * O.K., here are the routines from GIF_LIB file QUANTIZE.C. -+******************************************************************************/ -+int QuantizeBuffer(unsigned int Width, unsigned int Height, -+ int *ColorMapSize, GifByteType * RedInput, -+ GifByteType * GreenInput, GifByteType * BlueInput, -+ GifByteType * OutputBuffer, -+ GifColorType * OutputColorMap); -+ -+/****************************************************************************** - * O.K., here are the routines from GIF_LIB file GIF_ERR.C. - ******************************************************************************/ - extern int GifError(void); /* new in 2012 - ESR */ -diff --git a/lib/quantize.c b/lib/quantize.c -new file mode 100644 -index 0000000..feb1dc7 ---- /dev/null -+++ b/lib/quantize.c -@@ -0,0 +1,309 @@ -+/***************************************************************************** -+ * -+ * quantize.c - quantize a high resolution image into lower one -+ * -+ * Based on: "Color Image Quantization for frame buffer Display", by -+ * Paul Heckbert SIGGRAPH 1982 page 297-307. -+ * -+ * This doesn't really belong in the core library, was undocumented, -+ * and was removed in 4.2. Then it turned out some client apps were -+ * actually using it, so it was restored in 5.0. -+ * -+ *****************************************************************************/ -+ -+#include <stdlib.h> -+#include <stdio.h> -+#include "gif_lib.h" -+#include "gif_lib_private.h" -+ -+#define ABS(x) ((x) > 0 ? (x) : (-(x))) -+ -+#define COLOR_ARRAY_SIZE 32768 -+#define BITS_PER_PRIM_COLOR 5 -+#define MAX_PRIM_COLOR 0x1f -+ -+static int SortRGBAxis; -+ -+typedef struct QuantizedColorType { -+ GifByteType RGB[3]; -+ GifByteType NewColorIndex; -+ long Count; -+ struct QuantizedColorType *Pnext; -+} QuantizedColorType; -+ -+typedef struct NewColorMapType { -+ GifByteType RGBMin[3], RGBWidth[3]; -+ unsigned int NumEntries; /* # of QuantizedColorType in linked list below */ -+ unsigned long Count; /* Total number of pixels in all the entries */ -+ QuantizedColorType *QuantizedColors; -+} NewColorMapType; -+ -+static int SubdivColorMap(NewColorMapType * NewColorSubdiv, -+ unsigned int ColorMapSize, -+ unsigned int *NewColorMapSize); -+static int SortCmpRtn(const void *Entry1, const void *Entry2); -+ -+/****************************************************************************** -+ * Quantize high resolution image into lower one. Input image consists of a -+ * 2D array for each of the RGB colors with size Width by Height. There is no -+ * Color map for the input. Output is a quantized image with 2D array of -+ * indexes into the output color map. -+ * Note input image can be 24 bits at the most (8 for red/green/blue) and -+ * the output has 256 colors at the most (256 entries in the color map.). -+ * ColorMapSize specifies size of color map up to 256 and will be updated to -+ * real size before returning. -+ * Also non of the parameter are allocated by this routine. -+ * This function returns GIF_OK if succesfull, GIF_ERROR otherwise. -+ ******************************************************************************/ -+int -+QuantizeBuffer(unsigned int Width, -+ unsigned int Height, -+ int *ColorMapSize, -+ GifByteType * RedInput, -+ GifByteType * GreenInput, -+ GifByteType * BlueInput, -+ GifByteType * OutputBuffer, -+ GifColorType * OutputColorMap) { -+ -+ unsigned int Index, NumOfEntries; -+ int i, j, MaxRGBError[3]; -+ unsigned int NewColorMapSize; -+ long Red, Green, Blue; -+ NewColorMapType NewColorSubdiv[256]; -+ QuantizedColorType *ColorArrayEntries, *QuantizedColor; -+ -+ ColorArrayEntries = (QuantizedColorType *)malloc( -+ sizeof(QuantizedColorType) * COLOR_ARRAY_SIZE); -+ if (ColorArrayEntries == NULL) { -+ _GifError = E_GIF_ERR_NOT_ENOUGH_MEM; -+ return GIF_ERROR; -+ } -+ -+ for (i = 0; i < COLOR_ARRAY_SIZE; i++) { -+ ColorArrayEntries[i].RGB[0] = i >> (2 * BITS_PER_PRIM_COLOR); -+ ColorArrayEntries[i].RGB[1] = (i >> BITS_PER_PRIM_COLOR) & -+ MAX_PRIM_COLOR; -+ ColorArrayEntries[i].RGB[2] = i & MAX_PRIM_COLOR; -+ ColorArrayEntries[i].Count = 0; -+ } -+ -+ /* Sample the colors and their distribution: */ -+ for (i = 0; i < (int)(Width * Height); i++) { -+ Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) << -+ (2 * BITS_PER_PRIM_COLOR)) + -+ ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) << -+ BITS_PER_PRIM_COLOR) + -+ (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR)); -+ ColorArrayEntries[Index].Count++; -+ } -+ -+ /* Put all the colors in the first entry of the color map, and call the -+ * recursive subdivision process. */ -+ for (i = 0; i < 256; i++) { -+ NewColorSubdiv[i].QuantizedColors = NULL; -+ NewColorSubdiv[i].Count = NewColorSubdiv[i].NumEntries = 0; -+ for (j = 0; j < 3; j++) { -+ NewColorSubdiv[i].RGBMin[j] = 0; -+ NewColorSubdiv[i].RGBWidth[j] = 255; -+ } -+ } -+ -+ /* Find the non empty entries in the color table and chain them: */ -+ for (i = 0; i < COLOR_ARRAY_SIZE; i++) -+ if (ColorArrayEntries[i].Count > 0) -+ break; -+ QuantizedColor = NewColorSubdiv[0].QuantizedColors = &ColorArrayEntries[i]; -+ NumOfEntries = 1; -+ while (++i < COLOR_ARRAY_SIZE) -+ if (ColorArrayEntries[i].Count > 0) { -+ QuantizedColor->Pnext = &ColorArrayEntries[i]; -+ QuantizedColor = &ColorArrayEntries[i]; -+ NumOfEntries++; -+ } -+ QuantizedColor->Pnext = NULL; -+ -+ NewColorSubdiv[0].NumEntries = NumOfEntries; /* Different sampled colors */ -+ NewColorSubdiv[0].Count = ((long)Width) * Height; /* Pixels */ -+ NewColorMapSize = 1; -+ if (SubdivColorMap(NewColorSubdiv, *ColorMapSize, &NewColorMapSize) != -+ GIF_OK) { -+ free((char *)ColorArrayEntries); -+ return GIF_ERROR; -+ } -+ if (NewColorMapSize < *ColorMapSize) { -+ /* And clear rest of color map: */ -+ for (i = NewColorMapSize; i < *ColorMapSize; i++) -+ OutputColorMap[i].Red = OutputColorMap[i].Green = -+ OutputColorMap[i].Blue = 0; -+ } -+ -+ /* Average the colors in each entry to be the color to be used in the -+ * output color map, and plug it into the output color map itself. */ -+ for (i = 0; i < NewColorMapSize; i++) { -+ if ((j = NewColorSubdiv[i].NumEntries) > 0) { -+ QuantizedColor = NewColorSubdiv[i].QuantizedColors; -+ Red = Green = Blue = 0; -+ while (QuantizedColor) { -+ QuantizedColor->NewColorIndex = i; -+ Red += QuantizedColor->RGB[0]; -+ Green += QuantizedColor->RGB[1]; -+ Blue += QuantizedColor->RGB[2]; -+ QuantizedColor = QuantizedColor->Pnext; -+ } -+ OutputColorMap[i].Red = (Red << (8 - BITS_PER_PRIM_COLOR)) / j; -+ OutputColorMap[i].Green = (Green << (8 - BITS_PER_PRIM_COLOR)) / j; -+ OutputColorMap[i].Blue = (Blue << (8 - BITS_PER_PRIM_COLOR)) / j; -+ } -+ } -+ -+ /* Finally scan the input buffer again and put the mapped index in the -+ * output buffer. */ -+ MaxRGBError[0] = MaxRGBError[1] = MaxRGBError[2] = 0; -+ for (i = 0; i < (int)(Width * Height); i++) { -+ Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) << -+ (2 * BITS_PER_PRIM_COLOR)) + -+ ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) << -+ BITS_PER_PRIM_COLOR) + -+ (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR)); -+ Index = ColorArrayEntries[Index].NewColorIndex; -+ OutputBuffer[i] = Index; -+ if (MaxRGBError[0] < ABS(OutputColorMap[Index].Red - RedInput[i])) -+ MaxRGBError[0] = ABS(OutputColorMap[Index].Red - RedInput[i]); -+ if (MaxRGBError[1] < ABS(OutputColorMap[Index].Green - GreenInput[i])) -+ MaxRGBError[1] = ABS(OutputColorMap[Index].Green - GreenInput[i]); -+ if (MaxRGBError[2] < ABS(OutputColorMap[Index].Blue - BlueInput[i])) -+ MaxRGBError[2] = ABS(OutputColorMap[Index].Blue - BlueInput[i]); -+ } -+ -+#ifdef DEBUG -+ fprintf(stderr, -+ "Quantization L(0) errors: Red = %d, Green = %d, Blue = %d.\n", -+ MaxRGBError[0], MaxRGBError[1], MaxRGBError[2]); -+#endif /* DEBUG */ -+ -+ free((char *)ColorArrayEntries); -+ -+ *ColorMapSize = NewColorMapSize; -+ -+ return GIF_OK; -+} -+ -+/****************************************************************************** -+ * Routine to subdivide the RGB space recursively using median cut in each -+ * axes alternatingly until ColorMapSize different cubes exists. -+ * The biggest cube in one dimension is subdivide unless it has only one entry. -+ * Returns GIF_ERROR if failed, otherwise GIF_OK. -+ ******************************************************************************/ -+static int -+SubdivColorMap(NewColorMapType * NewColorSubdiv, -+ unsigned int ColorMapSize, -+ unsigned int *NewColorMapSize) { -+ -+ int MaxSize; -+ unsigned int i, j, Index = 0, NumEntries, MinColor, MaxColor; -+ long Sum, Count; -+ QuantizedColorType *QuantizedColor, **SortArray; -+ -+ while (ColorMapSize > *NewColorMapSize) { -+ /* Find candidate for subdivision: */ -+ MaxSize = -1; -+ for (i = 0; i < *NewColorMapSize; i++) { -+ for (j = 0; j < 3; j++) { -+ if ((((int)NewColorSubdiv[i].RGBWidth[j]) > MaxSize) && -+ (NewColorSubdiv[i].NumEntries > 1)) { -+ MaxSize = NewColorSubdiv[i].RGBWidth[j]; -+ Index = i; -+ SortRGBAxis = j; -+ } -+ } -+ } -+ -+ if (MaxSize == -1) -+ return GIF_OK; -+ -+ /* Split the entry Index into two along the axis SortRGBAxis: */ -+ -+ /* Sort all elements in that entry along the given axis and split at -+ * the median. */ -+ SortArray = (QuantizedColorType **)malloc( -+ sizeof(QuantizedColorType *) * -+ NewColorSubdiv[Index].NumEntries); -+ if (SortArray == NULL) -+ return GIF_ERROR; -+ for (j = 0, QuantizedColor = NewColorSubdiv[Index].QuantizedColors; -+ j < NewColorSubdiv[Index].NumEntries && QuantizedColor != NULL; -+ j++, QuantizedColor = QuantizedColor->Pnext) -+ SortArray[j] = QuantizedColor; -+ -+ qsort(SortArray, NewColorSubdiv[Index].NumEntries, -+ sizeof(QuantizedColorType *), SortCmpRtn); -+ -+ /* Relink the sorted list into one: */ -+ for (j = 0; j < NewColorSubdiv[Index].NumEntries - 1; j++) -+ SortArray[j]->Pnext = SortArray[j + 1]; -+ SortArray[NewColorSubdiv[Index].NumEntries - 1]->Pnext = NULL; -+ NewColorSubdiv[Index].QuantizedColors = QuantizedColor = SortArray[0]; -+ free((char *)SortArray); -+ -+ /* Now simply add the Counts until we have half of the Count: */ -+ Sum = NewColorSubdiv[Index].Count / 2 - QuantizedColor->Count; -+ NumEntries = 1; -+ Count = QuantizedColor->Count; -+ while ((Sum -= QuantizedColor->Pnext->Count) >= 0 && -+ QuantizedColor->Pnext != NULL && -+ QuantizedColor->Pnext->Pnext != NULL) { -+ QuantizedColor = QuantizedColor->Pnext; -+ NumEntries++; -+ Count += QuantizedColor->Count; -+ } -+ /* Save the values of the last color of the first half, and first -+ * of the second half so we can update the Bounding Boxes later. -+ * Also as the colors are quantized and the BBoxes are full 0..255, -+ * they need to be rescaled. -+ */ -+ MaxColor = QuantizedColor->RGB[SortRGBAxis]; /* Max. of first half */ -+ MinColor = QuantizedColor->Pnext->RGB[SortRGBAxis]; /* of second */ -+ MaxColor <<= (8 - BITS_PER_PRIM_COLOR); -+ MinColor <<= (8 - BITS_PER_PRIM_COLOR); -+ -+ /* Partition right here: */ -+ NewColorSubdiv[*NewColorMapSize].QuantizedColors = -+ QuantizedColor->Pnext; -+ QuantizedColor->Pnext = NULL; -+ NewColorSubdiv[*NewColorMapSize].Count = Count; -+ NewColorSubdiv[Index].Count -= Count; -+ NewColorSubdiv[*NewColorMapSize].NumEntries = -+ NewColorSubdiv[Index].NumEntries - NumEntries; -+ NewColorSubdiv[Index].NumEntries = NumEntries; -+ for (j = 0; j < 3; j++) { -+ NewColorSubdiv[*NewColorMapSize].RGBMin[j] = -+ NewColorSubdiv[Index].RGBMin[j]; -+ NewColorSubdiv[*NewColorMapSize].RGBWidth[j] = -+ NewColorSubdiv[Index].RGBWidth[j]; -+ } -+ NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] = -+ NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] + -+ NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] - MinColor; -+ NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] = MinColor; -+ -+ NewColorSubdiv[Index].RGBWidth[SortRGBAxis] = -+ MaxColor - NewColorSubdiv[Index].RGBMin[SortRGBAxis]; -+ -+ (*NewColorMapSize)++; -+ } -+ -+ return GIF_OK; -+} -+ -+/**************************************************************************** -+ * Routine called by qsort to compare to entries. -+ ****************************************************************************/ -+static int -+SortCmpRtn(const void *Entry1, -+ const void *Entry2) { -+ -+ return (*((QuantizedColorType **) Entry1))->RGB[SortRGBAxis] - -+ (*((QuantizedColorType **) Entry2))->RGB[SortRGBAxis]; -+} -+ -+/* end */ -diff --git a/util/rgb2gif.c b/util/rgb2gif.c -index 56386c7..46d9654 100644 ---- a/util/rgb2gif.c -+++ b/util/rgb2gif.c -@@ -69,308 +69,6 @@ static void SaveGif(GifByteType *OutputBuffer, - static void QuitGifError(GifFileType *GifFile); - - /****************************************************************************** -- * Code to quantize high resolution image into lower one. You may want to -- * peek into the following article this code is based on: -- * "Color Image Quantization for frame buffer Display", by Paul Heckbert -- * SIGGRAPH 1982 page 297-307. -- ****************************************************************************** -- * History: -- * 5 Jan 90 - Version 1.0 by Gershon Elber. -- *****************************************************************************/ -- --#define ABS(x) ((x) > 0 ? (x) : (-(x))) -- --#define COLOR_ARRAY_SIZE 32768 --#define BITS_PER_PRIM_COLOR 5 --#define MAX_PRIM_COLOR 0x1f -- --static int SortRGBAxis; -- --typedef struct QuantizedColorType { -- GifByteType RGB[3]; -- GifByteType NewColorIndex; -- long Count; -- struct QuantizedColorType *Pnext; --} QuantizedColorType; -- --typedef struct NewColorMapType { -- GifByteType RGBMin[3], RGBWidth[3]; -- unsigned int NumEntries; /* # of QuantizedColorType in linked list below */ -- unsigned long Count; /* Total number of pixels in all the entries */ -- QuantizedColorType *QuantizedColors; --} NewColorMapType; -- --static int SubdivColorMap(NewColorMapType * NewColorSubdiv, -- unsigned int ColorMapSize, -- unsigned int *NewColorMapSize); --static int SortCmpRtn(const void *Entry1, const void *Entry2); -- --/****************************************************************************** -- * Quantize high resolution image into lower one. Input image consists of a -- * 2D array for each of the RGB colors with size Width by Height. There is no -- * Color map for the input. Output is a quantized image with 2D array of -- * indexes into the output color map. -- * Note input image can be 24 bits at the most (8 for red/green/blue) and -- * the output has 256 colors at the most (256 entries in the color map.). -- * ColorMapSize specifies size of color map up to 256 and will be updated to -- * real size before returning. -- * Also non of the parameter are allocated by this routine. -- * This function returns GIF_OK if succesfull, GIF_ERROR otherwise. -- ******************************************************************************/ --static int --QuantizeBuffer(unsigned int Width, -- unsigned int Height, -- int *ColorMapSize, -- GifByteType * RedInput, -- GifByteType * GreenInput, -- GifByteType * BlueInput, -- GifByteType * OutputBuffer, -- GifColorType * OutputColorMap) { -- -- unsigned int Index, NumOfEntries; -- int i, j, MaxRGBError[3]; -- unsigned int NewColorMapSize; -- long Red, Green, Blue; -- NewColorMapType NewColorSubdiv[256]; -- QuantizedColorType *ColorArrayEntries, *QuantizedColor; -- -- ColorArrayEntries = (QuantizedColorType *)malloc( -- sizeof(QuantizedColorType) * COLOR_ARRAY_SIZE); -- if (ColorArrayEntries == NULL) { -- return GIF_ERROR; -- } -- -- for (i = 0; i < COLOR_ARRAY_SIZE; i++) { -- ColorArrayEntries[i].RGB[0] = i >> (2 * BITS_PER_PRIM_COLOR); -- ColorArrayEntries[i].RGB[1] = (i >> BITS_PER_PRIM_COLOR) & -- MAX_PRIM_COLOR; -- ColorArrayEntries[i].RGB[2] = i & MAX_PRIM_COLOR; -- ColorArrayEntries[i].Count = 0; -- } -- -- /* Sample the colors and their distribution: */ -- for (i = 0; i < (int)(Width * Height); i++) { -- Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) << -- (2 * BITS_PER_PRIM_COLOR)) + -- ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) << -- BITS_PER_PRIM_COLOR) + -- (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR)); -- ColorArrayEntries[Index].Count++; -- } -- -- /* Put all the colors in the first entry of the color map, and call the -- * recursive subdivision process. */ -- for (i = 0; i < 256; i++) { -- NewColorSubdiv[i].QuantizedColors = NULL; -- NewColorSubdiv[i].Count = NewColorSubdiv[i].NumEntries = 0; -- for (j = 0; j < 3; j++) { -- NewColorSubdiv[i].RGBMin[j] = 0; -- NewColorSubdiv[i].RGBWidth[j] = 255; -- } -- } -- -- /* Find the non empty entries in the color table and chain them: */ -- for (i = 0; i < COLOR_ARRAY_SIZE; i++) -- if (ColorArrayEntries[i].Count > 0) -- break; -- QuantizedColor = NewColorSubdiv[0].QuantizedColors = &ColorArrayEntries[i]; -- NumOfEntries = 1; -- while (++i < COLOR_ARRAY_SIZE) -- if (ColorArrayEntries[i].Count > 0) { -- QuantizedColor->Pnext = &ColorArrayEntries[i]; -- QuantizedColor = &ColorArrayEntries[i]; -- NumOfEntries++; -- } -- QuantizedColor->Pnext = NULL; -- -- NewColorSubdiv[0].NumEntries = NumOfEntries; /* Different sampled colors */ -- NewColorSubdiv[0].Count = ((long)Width) * Height; /* Pixels */ -- NewColorMapSize = 1; -- if (SubdivColorMap(NewColorSubdiv, *ColorMapSize, &NewColorMapSize) != -- GIF_OK) { -- free((char *)ColorArrayEntries); -- return GIF_ERROR; -- } -- if (NewColorMapSize < *ColorMapSize) { -- /* And clear rest of color map: */ -- for (i = NewColorMapSize; i < *ColorMapSize; i++) -- OutputColorMap[i].Red = OutputColorMap[i].Green = -- OutputColorMap[i].Blue = 0; -- } -- -- /* Average the colors in each entry to be the color to be used in the -- * output color map, and plug it into the output color map itself. */ -- for (i = 0; i < NewColorMapSize; i++) { -- if ((j = NewColorSubdiv[i].NumEntries) > 0) { -- QuantizedColor = NewColorSubdiv[i].QuantizedColors; -- Red = Green = Blue = 0; -- while (QuantizedColor) { -- QuantizedColor->NewColorIndex = i; -- Red += QuantizedColor->RGB[0]; -- Green += QuantizedColor->RGB[1]; -- Blue += QuantizedColor->RGB[2]; -- QuantizedColor = QuantizedColor->Pnext; -- } -- OutputColorMap[i].Red = (Red << (8 - BITS_PER_PRIM_COLOR)) / j; -- OutputColorMap[i].Green = (Green << (8 - BITS_PER_PRIM_COLOR)) / j; -- OutputColorMap[i].Blue = (Blue << (8 - BITS_PER_PRIM_COLOR)) / j; -- } else -- fprintf(stderr, -- "\n%s: Null entry in quantized color map - that's weird.\n", -- PROGRAM_NAME); -- } -- -- /* Finally scan the input buffer again and put the mapped index in the -- * output buffer. */ -- MaxRGBError[0] = MaxRGBError[1] = MaxRGBError[2] = 0; -- for (i = 0; i < (int)(Width * Height); i++) { -- Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) << -- (2 * BITS_PER_PRIM_COLOR)) + -- ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) << -- BITS_PER_PRIM_COLOR) + -- (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR)); -- Index = ColorArrayEntries[Index].NewColorIndex; -- OutputBuffer[i] = Index; -- if (MaxRGBError[0] < ABS(OutputColorMap[Index].Red - RedInput[i])) -- MaxRGBError[0] = ABS(OutputColorMap[Index].Red - RedInput[i]); -- if (MaxRGBError[1] < ABS(OutputColorMap[Index].Green - GreenInput[i])) -- MaxRGBError[1] = ABS(OutputColorMap[Index].Green - GreenInput[i]); -- if (MaxRGBError[2] < ABS(OutputColorMap[Index].Blue - BlueInput[i])) -- MaxRGBError[2] = ABS(OutputColorMap[Index].Blue - BlueInput[i]); -- } -- --#ifdef DEBUG -- fprintf(stderr, -- "Quantization L(0) errors: Red = %d, Green = %d, Blue = %d.\n", -- MaxRGBError[0], MaxRGBError[1], MaxRGBError[2]); --#endif /* DEBUG */ -- -- free((char *)ColorArrayEntries); -- -- *ColorMapSize = NewColorMapSize; -- -- return GIF_OK; --} -- --/****************************************************************************** -- * Routine to subdivide the RGB space recursively using median cut in each -- * axes alternatingly until ColorMapSize different cubes exists. -- * The biggest cube in one dimension is subdivide unless it has only one entry. -- * Returns GIF_ERROR if failed, otherwise GIF_OK. -- ******************************************************************************/ --static int --SubdivColorMap(NewColorMapType * NewColorSubdiv, -- unsigned int ColorMapSize, -- unsigned int *NewColorMapSize) { -- -- int MaxSize; -- unsigned int i, j, Index = 0, NumEntries, MinColor, MaxColor; -- long Sum, Count; -- QuantizedColorType *QuantizedColor, **SortArray; -- -- while (ColorMapSize > *NewColorMapSize) { -- /* Find candidate for subdivision: */ -- MaxSize = -1; -- for (i = 0; i < *NewColorMapSize; i++) { -- for (j = 0; j < 3; j++) { -- if ((((int)NewColorSubdiv[i].RGBWidth[j]) > MaxSize) && -- (NewColorSubdiv[i].NumEntries > 1)) { -- MaxSize = NewColorSubdiv[i].RGBWidth[j]; -- Index = i; -- SortRGBAxis = j; -- } -- } -- } -- -- if (MaxSize == -1) -- return GIF_OK; -- -- /* Split the entry Index into two along the axis SortRGBAxis: */ -- -- /* Sort all elements in that entry along the given axis and split at -- * the median. */ -- SortArray = (QuantizedColorType **)malloc( -- sizeof(QuantizedColorType *) * -- NewColorSubdiv[Index].NumEntries); -- if (SortArray == NULL) -- return GIF_ERROR; -- for (j = 0, QuantizedColor = NewColorSubdiv[Index].QuantizedColors; -- j < NewColorSubdiv[Index].NumEntries && QuantizedColor != NULL; -- j++, QuantizedColor = QuantizedColor->Pnext) -- SortArray[j] = QuantizedColor; -- -- qsort(SortArray, NewColorSubdiv[Index].NumEntries, -- sizeof(QuantizedColorType *), SortCmpRtn); -- -- /* Relink the sorted list into one: */ -- for (j = 0; j < NewColorSubdiv[Index].NumEntries - 1; j++) -- SortArray[j]->Pnext = SortArray[j + 1]; -- SortArray[NewColorSubdiv[Index].NumEntries - 1]->Pnext = NULL; -- NewColorSubdiv[Index].QuantizedColors = QuantizedColor = SortArray[0]; -- free((char *)SortArray); -- -- /* Now simply add the Counts until we have half of the Count: */ -- Sum = NewColorSubdiv[Index].Count / 2 - QuantizedColor->Count; -- NumEntries = 1; -- Count = QuantizedColor->Count; -- while (QuantizedColor->Pnext != NULL && -- (Sum -= QuantizedColor->Pnext->Count) >= 0 && -- QuantizedColor->Pnext->Pnext != NULL) { -- QuantizedColor = QuantizedColor->Pnext; -- NumEntries++; -- Count += QuantizedColor->Count; -- } -- /* Save the values of the last color of the first half, and first -- * of the second half so we can update the Bounding Boxes later. -- * Also as the colors are quantized and the BBoxes are full 0..255, -- * they need to be rescaled. -- */ -- MaxColor = QuantizedColor->RGB[SortRGBAxis]; /* Max. of first half */ -- /* coverity[var_deref_op] */ -- MinColor = QuantizedColor->Pnext->RGB[SortRGBAxis]; /* of second */ -- MaxColor <<= (8 - BITS_PER_PRIM_COLOR); -- MinColor <<= (8 - BITS_PER_PRIM_COLOR); -- -- /* Partition right here: */ -- NewColorSubdiv[*NewColorMapSize].QuantizedColors = -- QuantizedColor->Pnext; -- QuantizedColor->Pnext = NULL; -- NewColorSubdiv[*NewColorMapSize].Count = Count; -- NewColorSubdiv[Index].Count -= Count; -- NewColorSubdiv[*NewColorMapSize].NumEntries = -- NewColorSubdiv[Index].NumEntries - NumEntries; -- NewColorSubdiv[Index].NumEntries = NumEntries; -- for (j = 0; j < 3; j++) { -- NewColorSubdiv[*NewColorMapSize].RGBMin[j] = -- NewColorSubdiv[Index].RGBMin[j]; -- NewColorSubdiv[*NewColorMapSize].RGBWidth[j] = -- NewColorSubdiv[Index].RGBWidth[j]; -- } -- NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] = -- NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] + -- NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] - MinColor; -- NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] = MinColor; -- -- NewColorSubdiv[Index].RGBWidth[SortRGBAxis] = -- MaxColor - NewColorSubdiv[Index].RGBMin[SortRGBAxis]; -- -- (*NewColorMapSize)++; -- } -- -- return GIF_OK; --} -- --/**************************************************************************** -- * Routine called by qsort to compare two entries. -- ****************************************************************************/ --static int --SortCmpRtn(const void *Entry1, -- const void *Entry2) { -- -- return (*((QuantizedColorType **) Entry1))->RGB[SortRGBAxis] - -- (*((QuantizedColorType **) Entry2))->RGB[SortRGBAxis]; --} --/****************************************************************************** - * Interpret the command line and scan the given GIF file. - ******************************************************************************/ - int main(int argc, char **argv) --- -1.8.3.2 - diff --git a/extra/giflib/giflib-5.0.4-include-stddef.patch b/extra/giflib/giflib-5.0.4-include-stddef.patch deleted file mode 100644 index d3ea73854..000000000 --- a/extra/giflib/giflib-5.0.4-include-stddef.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -rupN a/lib/gif_lib.h b/lib/gif_lib.h ---- a/lib/gif_lib.h 2013-01-06 07:29:57.000000000 +0100 -+++ b/lib/gif_lib.h 2013-07-30 10:52:47.611034000 +0200 -@@ -19,6 +19,7 @@ extern "C" { - #define GIF_OK 1 - - #include <stdbool.h> -+#include <stddef.h> - - #define GIF_STAMP "GIFVER" /* First chars in file - GIF stamp. */ - #define GIF_STAMP_LEN sizeof(GIF_STAMP) - 1 diff --git a/extra/gifsicle/PKGBUILD b/extra/gifsicle/PKGBUILD index ced5c1b09..1585b695e 100644 --- a/extra/gifsicle/PKGBUILD +++ b/extra/gifsicle/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 192181 2013-08-06 18:35:21Z eric $ +# $Id: PKGBUILD 202254 2013-12-20 22:16:30Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gifsicle -pkgver=1.71 +pkgver=1.78 pkgrel=1 pkgdesc="A powerful command-line program for creating, editing, manipulating and getting information about GIF images and animations" arch=('i686' 'x86_64' 'mips64el') @@ -10,7 +10,7 @@ url="http://www.lcdf.org/gifsicle/" license=('GPL') depends=('libx11') source=(http://www.lcdf.org/${pkgname}/${pkgname}-${pkgver}.tar.gz) -sha1sums=('a7665faa99b157ea545b65761d19e15b9b4a8b74') +sha1sums=('df0cb87ee8237d7ba341e59cfef6cf44a7e4e630') build() { cd ${pkgname}-${pkgver} diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index 1d5e15b8a..a508a60fa 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 197743 2013-10-29 02:17:19Z dan $ +# $Id: PKGBUILD 201683 2013-12-18 01:22:42Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.8.4.2 +pkgver=1.8.5.2 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64 'mips64el') @@ -49,6 +49,8 @@ check() { if [ "$CARCH" != "mips64el" ]; then local jobs jobs=$(expr "$MAKEFLAGS" : '.*\(-j[0-9]*\).*') + # build failures with multiple jobs in check, not ideal... + jobs='-j1' fi mkdir -p /dev/shm/git-test # We used to use this, but silly git regressions: @@ -115,7 +117,7 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('6f63d103465b86ca0ebe4189ea54731c' - '2b4719ec820d845134b689247abe65e8' +md5sums=('df8519044f9880f3687d863d99245282' + '27851cc39808f1be6d3789fae87c8308' '042524f942785772d7bd52a1f02fe5ae' 'f67869315c2cc112e076f0c73f248002') diff --git a/extra/glade/PKGBUILD b/extra/glade/PKGBUILD index 66cfeddd3..773707294 100644 --- a/extra/glade/PKGBUILD +++ b/extra/glade/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 197992 2013-10-30 12:08:19Z allan $ +# $Id: PKGBUILD 202187 2013-12-19 01:01:24Z heftig $ # Maintainer: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=glade -pkgver=3.16.0 +pkgver=3.16.1 pkgrel=1 pkgdesc="User interface builder for GTK+ and GNOME." arch=(i686 x86_64 mips64el) @@ -14,7 +14,7 @@ optdepends=('python2: Python widgets support' url="http://glade.gnome.org/" install=glade.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('b80773a294d3af07739d9d53bae12e11cf0bbf420bbc8931cc5e20b2647e3626') +sha256sums=('994ac258bc100d3907ed40a2880c3144f13997b324477253e812d59f2716523f') build() { cd "$pkgname-$pkgver" diff --git a/extra/glib-networking/PKGBUILD b/extra/glib-networking/PKGBUILD index d2f7c8e3d..2fe6c5725 100644 --- a/extra/glib-networking/PKGBUILD +++ b/extra/glib-networking/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 197995 2013-10-30 12:09:26Z allan $ +# $Id: PKGBUILD 199408 2013-11-11 23:20:22Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=glib-networking -pkgver=2.38.1 +pkgver=2.38.2 pkgrel=1 pkgdesc="Network-related giomodules for glib" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=(glib2 libproxy gnutls ca-certificates gsettings-desktop-schemas) makedepends=(intltool) install=glib-networking.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('32ea1e504f69ff6693ac4119ad598ded50bb0440cf4484d28ef0adf8fcc85653') +sha256sums=('e8e2fe919d3236169c9bfaec807966ec81b844fc28b11bddc9f8256cfa949fc7') build() { cd $pkgname-$pkgver diff --git a/extra/glibmm/PKGBUILD b/extra/glibmm/PKGBUILD index eae133c9b..a7668223b 100644 --- a/extra/glibmm/PKGBUILD +++ b/extra/glibmm/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 197994 2013-10-30 12:09:05Z allan $ +# $Id: PKGBUILD 199895 2013-11-18 10:41:34Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase=glibmm pkgname=('glibmm' 'glibmm-docs') -pkgver=2.38.0 +pkgver=2.38.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') makedepends=('glib2' 'libsigc++2.0' 'pkgconfig') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) url="http://www.gtkmm.org/" -sha256sums=('f37bab6bedb7b68045e356feca9e27760a5ce50d95df07156656a0e1deabc402') +sha256sums=('49c925ee1d3c4d0d6cd7492d7173bd6826db51d0b55f458a6496406ae267c4a2') build() { cd "$pkgname-$pkgver" diff --git a/extra/glpk/PKGBUILD b/extra/glpk/PKGBUILD index 0b4096bb5..b050d41b0 100644 --- a/extra/glpk/PKGBUILD +++ b/extra/glpk/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 197996 2013-10-30 12:09:46Z allan $ +# $Id: PKGBUILD 199812 2013-11-17 05:33:51Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: bzklrm <bzklrm@gmail.com> # Additional contributors Senjin, Xavier, dundee pkgname=glpk pkgver=4.52 -pkgrel=1 +pkgrel=2 pkgdesc="GNU Linear Programming Kit : solve LP, MIP and other problems." arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/glpk/glpk.html" diff --git a/extra/gnome-calculator/PKGBUILD b/extra/gnome-calculator/PKGBUILD index 0f4f8b541..5761e86b0 100644 --- a/extra/gnome-calculator/PKGBUILD +++ b/extra/gnome-calculator/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 196809 2013-10-19 20:33:48Z heftig $ +# $Id: PKGBUILD 199332 2013-11-11 10:50:29Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-calculator -pkgver=3.10.1 +pkgver=3.10.2 pkgrel=1 pkgdesc="GNOME Scientific calculator" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ options=(!emptydirs) url="http://www.gnome.org" install=gnome-calculator.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('9268f06e53647e9a61a773b7ae499d4fd3097843060fc9baa8f97912247df48f') +sha256sums=('2e583252e9332d8c7be52f1512a113869be1ad27fa829f7b49c89c9ea66d6d3e') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-chess/PKGBUILD b/extra/gnome-chess/PKGBUILD index ffdef50d3..f4f6f4277 100644 --- a/extra/gnome-chess/PKGBUILD +++ b/extra/gnome-chess/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 198001 2013-10-30 12:11:39Z allan $ +# $Id: PKGBUILD 201495 2013-12-12 22:17:22Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-chess -pkgver=3.10.1.1 -pkgrel=1 +pkgver=3.10.2 +pkgrel=2 pkgdesc="Play the classic two-player boardgame of chess" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'librsvg' 'sqlite') +depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'librsvg' 'glu') makedepends=('intltool' 'itstool' 'gobject-introspection') optdepends=('gnuchess: Play against computer') conflicts=('gnome-games') @@ -18,7 +18,7 @@ install=gnome-chess.install url="https://live.gnome.org/Chess" groups=('gnome-extra') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) -sha256sums=('abdee96eaf56689c4c2bd78cd115a0e30d302e16a8f42dfcb39520c9a33c6eec') +sha256sums=('3aae8d501fce8ffd30bee6740e61bfbd7c48336f4ca254912f2646c8486324b1') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD index 711bdbe6f..d53db98b3 100644 --- a/extra/gnome-control-center/PKGBUILD +++ b/extra/gnome-control-center/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198004 2013-10-30 12:12:43Z allan $ +# $Id: PKGBUILD 199445 2013-11-12 20:25:31Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-control-center -pkgver=3.10.1 +pkgver=3.10.2 pkgrel=1 pkgdesc="The Control Center for GNOME" license=(GPL) @@ -22,15 +22,12 @@ groups=(gnome) url="http://www.gnome.org" install=gnome-control-center.install options=('!emptydirs') -source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz - buildfix.patch) -sha256sums=('fbfc1a935c33901c6afc999160696e0cde60ccb9997679cc8d0a2ff952568cbe' - 'f58644e8735d3eb1e911ba2373e6c91cfde67b1ceaf54dca179b3a1c8db7466d') +source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('f67a9e88cda62c25e1aa1fbbb36d4fa632e8da11e98ac030e0e40437f12483a9') prepare() { cd $pkgname-$pkgver - patch -Np1 -i ../buildfix.patch - autoreconf -fi + #autoreconf -fi } build() { diff --git a/extra/gnome-control-center/buildfix.patch b/extra/gnome-control-center/buildfix.patch deleted file mode 100644 index baf2ee6a5..000000000 --- a/extra/gnome-control-center/buildfix.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -u -r gnome-control-center-3.10.1/panels/background/Makefile.am gnome-control-center-3.10.1-buildfix/panels/background/Makefile.am ---- gnome-control-center-3.10.1/panels/background/Makefile.am 2013-10-11 13:19:22.000000000 +0200 -+++ gnome-control-center-3.10.1-buildfix/panels/background/Makefile.am 2013-10-16 00:59:02.966707377 +0200 -@@ -52,11 +52,6 @@ - libbackground_la_LIBADD += $(SOCIALWEB_LIBS) - endif - --noinst_PROGRAMS = test-chooser-dialog --test_chooser_dialog_SOURCES = test-chooser-dialog.c --test_chooser_dialog_LDADD = libbackground-chooser.la --test_chooser_dialog_LDFLAGS = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS) -- - resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/background.gresource.xml) - cc-background-resources.c: background.gresource.xml $(resource_files) - $(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_background $< diff --git a/extra/gnome-desktop/0001-GnomeRR-gnome_rr_output_get_min_backlight_step.patch b/extra/gnome-desktop/0001-GnomeRR-gnome_rr_output_get_min_backlight_step.patch new file mode 100644 index 000000000..0bf10f61d --- /dev/null +++ b/extra/gnome-desktop/0001-GnomeRR-gnome_rr_output_get_min_backlight_step.patch @@ -0,0 +1,67 @@ +From ede893a90870c31d8b374978d524fddf6f3aac81 Mon Sep 17 00:00:00 2001 +From: Asad Mehmood <asad78611@googlemail.com> +Date: Thu, 17 Oct 2013 16:21:42 +0100 +Subject: [PATCH] GnomeRR: gnome_rr_output_get_min_backlight_step + +Allows gnome-settings-daemon to read the min_backlight_step +so that it can support displays with less than 10 steps +--- + libgnome-desktop/gnome-rr.c | 15 +++++++++++++++ + libgnome-desktop/gnome-rr.h | 1 + + 2 files changed, 16 insertions(+) + +diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c +index 5e011d3..88df060 100644 +--- a/libgnome-desktop/gnome-rr.c ++++ b/libgnome-desktop/gnome-rr.c +@@ -77,6 +77,7 @@ struct GnomeRROutput + char * edid_file; + + int backlight; ++ int min_backlight_step; + + gboolean is_primary; + gboolean is_presentation; +@@ -1271,6 +1272,7 @@ output_initialize (GnomeRROutput *output, GVariant *info) + g_variant_lookup (properties, "height-mm", "i", &output->height_mm); + g_variant_lookup (properties, "display-name", "s", &output->display_name); + g_variant_lookup (properties, "backlight", "i", &output->backlight); ++ g_variant_lookup (properties, "min-backlight-step", "i", &output->min_backlight_step); + g_variant_lookup (properties, "primary", "b", &output->is_primary); + g_variant_lookup (properties, "presentation", "b", &output->is_presentation); + +@@ -1446,6 +1448,19 @@ gnome_rr_output_get_backlight (GnomeRROutput *output) + } + + /** ++ * gnome_rr_output_get_min_backlight_step: ++ * ++ * Returns: The minimum backlight step available in percent ++ */ ++int ++gnome_rr_output_get_min_backlight_step (GnomeRROutput *output) ++{ ++ g_return_val_if_fail (output != NULL, -1); ++ ++ return output->min_backlight_step; ++} ++ ++/** + * gnome_rr_output_set_backlight: + * @value: the absolute value which is 0 >= this <= 100 + * +diff --git a/libgnome-desktop/gnome-rr.h b/libgnome-desktop/gnome-rr.h +index a0d42f7..0443342 100644 +--- a/libgnome-desktop/gnome-rr.h ++++ b/libgnome-desktop/gnome-rr.h +@@ -154,6 +154,7 @@ void gnome_rr_output_get_physical_size (GnomeRROutput *outpu + int *height_mm); + + gint gnome_rr_output_get_backlight (GnomeRROutput *output); ++gint gnome_rr_output_get_min_backlight_step(GnomeRROutput *output); + gboolean gnome_rr_output_set_backlight (GnomeRROutput *output, + gint value, + GError **error); +-- +1.8.4.1 + diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD index d2111fda6..a5a5e90e5 100644 --- a/extra/gnome-desktop/PKGBUILD +++ b/extra/gnome-desktop/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198005 2013-10-30 12:13:04Z allan $ +# $Id: PKGBUILD 199786 2013-11-16 12:15:33Z heftig $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gnome-desktop pkgver=3.10.1 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc="Library with common API for various GNOME modules" arch=('i686' 'x86_64' 'mips64el') @@ -12,8 +12,17 @@ depends=(gsettings-desktop-schemas gtk3 libxkbfile xkeyboard-config iso-codes) makedepends=(intltool gobject-introspection itstool) url="http://www.gnome.org" groups=(gnome) -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('10aca72355e8e2854450ce10edfb6da433af62ea0d87b0718ff62e9a40aabb41') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + 0001-GnomeRR-gnome_rr_output_get_min_backlight_step.patch) +sha256sums=('10aca72355e8e2854450ce10edfb6da433af62ea0d87b0718ff62e9a40aabb41' + '5920cec531b03ebe0ce0941250ce62d92a7b18ae44900f11df90adb381858df2') + +prepare() { + cd $pkgname-$pkgver + + # FS#37224 + patch -Np1 -i ../0001-GnomeRR-gnome_rr_output_get_min_backlight_step.patch +} build() { cd $pkgname-$pkgver diff --git a/extra/gnome-documents/PKGBUILD b/extra/gnome-documents/PKGBUILD index a113aeee1..78ee858fc 100644 --- a/extra/gnome-documents/PKGBUILD +++ b/extra/gnome-documents/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198010 2013-10-30 12:14:53Z allan $ +# $Id: PKGBUILD 199483 2013-11-13 12:08:21Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-documents -pkgver=3.10.0 -pkgrel=2 +pkgver=3.10.1 +pkgrel=1 pkgdesc="Documents Manager for GNOME" arch=(i686 x86_64 mips64el) url="http://www.gnome.org" @@ -15,7 +15,7 @@ makedepends=(intltool gobject-introspection itstool docbook-xsl) optdepends=('unoconv: Support for Libreoffice document types') install=gnome-documents.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('93365aee61c2777d1fe70fa8f55f6e3ce9e7e130dd2869d74eb85787825be9f6') +sha256sums=('26f8234fa74c00afb323f76de7028655b82d285acce057dd07b6ed98943951b2') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-mahjongg/PKGBUILD b/extra/gnome-mahjongg/PKGBUILD index 6c17fd33a..a1f8ab086 100644 --- a/extra/gnome-mahjongg/PKGBUILD +++ b/extra/gnome-mahjongg/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198015 2013-10-30 12:17:01Z allan $ +# $Id: PKGBUILD 199334 2013-11-11 10:59:03Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-mahjongg -pkgver=3.10.1 +pkgver=3.10.2 pkgrel=1 pkgdesc="Disassemble a pile of tiles by removing matching pairs" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ install=gnome-mahjongg.install url="https://live.gnome.org/Mahjongg" groups=('gnome-extra') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('fb987b1a024abd40cf013670854421d0fea1fffd107752493220b8cbb287ddd5') +sha256sums=('4edede5bce17a7666fc3cdf058894f1e16ed1eb5753da05032998b02cc0f1f43') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-online-accounts/PKGBUILD b/extra/gnome-online-accounts/PKGBUILD index d048a670f..7f8017ced 100644 --- a/extra/gnome-online-accounts/PKGBUILD +++ b/extra/gnome-online-accounts/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198021 2013-10-30 12:19:09Z allan $ +# $Id: PKGBUILD 199428 2013-11-12 16:54:14Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gnome-online-accounts -pkgver=3.10.1 -pkgrel=2 +pkgver=3.10.2 +pkgrel=1 pkgdesc="GNOME service to access online accounts" arch=(i686 x86_64 mips64el) url="http://www.gnome.org" @@ -13,7 +13,7 @@ depends=('webkitgtk' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme' 'libsec makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl') 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/extra/gnome-online-miners/PKGBUILD b/extra/gnome-online-miners/PKGBUILD index 1f55a9071..6db473249 100644 --- a/extra/gnome-online-miners/PKGBUILD +++ b/extra/gnome-online-miners/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198022 2013-10-30 12:19:29Z allan $ +# $Id: PKGBUILD 200220 2013-11-22 18:17:22Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gnome-online-miners -pkgver=3.10.0 +pkgver=3.10.2 pkgrel=1 pkgdesc="Tracker miners for online accounts" arch=(i686 x86_64) @@ -10,7 +10,7 @@ url="http://www.gnome.org" license=(GPL) depends=(libgdata gnome-online-accounts grilo libzapojit tracker) source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) -sha256sums=('a4ca0d78452f8d19ed4eedeb5164b93aead9566cb9e2cf9826d49e3bad02a504') +sha256sums=('38c9e60cf56b6d0ec32e972256268d6038d15e32521a91aede1ec168f5e31cd9') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-photos/PKGBUILD b/extra/gnome-photos/PKGBUILD index de1e034b2..bdcb67ba1 100644 --- a/extra/gnome-photos/PKGBUILD +++ b/extra/gnome-photos/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198023 2013-10-30 12:19:50Z allan $ +# $Id: PKGBUILD 199484 2013-11-13 12:09:00Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-photos -pkgver=3.10.1 +pkgver=3.10.2 pkgrel=1 pkgdesc="Access, organize, and share your photos on GNOME" arch=(i686 x86_64 mips64el) @@ -13,7 +13,7 @@ makedepends=(intltool) groups=(gnome-extra) install=gnome-photos.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('40129310635fc5939e5c95616c2ea2042f30f0eef5e0c8cdd21aa0e7ff7c7085') +sha256sums=('820503c26a0f829682dd46653e8f0850ac687aba42728ac74350ba8406e80975') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-screenshot/PKGBUILD b/extra/gnome-screenshot/PKGBUILD index 19f80f98a..99411f621 100644 --- a/extra/gnome-screenshot/PKGBUILD +++ b/extra/gnome-screenshot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 196076 2013-10-07 11:51:50Z jgc $ +# $Id: PKGBUILD 199924 2013-11-19 03:50:58Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gnome-screenshot -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc="Take pictures of your screen" arch=(i686 x86_64 mips64el) @@ -13,7 +13,7 @@ makedepends=('intltool') groups=('gnome') install=$pkgname.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('709de9b9c66f569f4984152376479ca2c4aa47c9e5aa5e7385e417c9fe3465d9') +sha256sums=('9a4ed8821187e5a6923245508df4c116f28278b3089580eb2c4e6d32d178ba68') build() { cd "$pkgname-$pkgver" diff --git a/extra/gnome-settings-daemon/0001-power-use-gnome_rr_output_get_min_backlight_step.patch b/extra/gnome-settings-daemon/0001-power-use-gnome_rr_output_get_min_backlight_step.patch new file mode 100644 index 000000000..8a804429e --- /dev/null +++ b/extra/gnome-settings-daemon/0001-power-use-gnome_rr_output_get_min_backlight_step.patch @@ -0,0 +1,37 @@ +From 28c4f287523607cd24bcb62b25bf83691036fadd Mon Sep 17 00:00:00 2001 +From: Asad Mehmood <asad78611@googlemail.com> +Date: Thu, 17 Oct 2013 16:41:44 +0100 +Subject: [PATCH] power: use gnome_rr_output_get_min_backlight_step + +Use min_backlight_step or 5% increments whichever is larger + +https://bugzilla.gnome.org/show_bug.cgi?id=710380 +--- + plugins/power/gpm-common.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/plugins/power/gpm-common.c b/plugins/power/gpm-common.c +index 81af0b7..81dc048 100644 +--- a/plugins/power/gpm-common.c ++++ b/plugins/power/gpm-common.c +@@ -1275,7 +1275,7 @@ backlight_step_up (GnomeRRScreen *rr_screen, GError **error) + now = gnome_rr_output_get_backlight (output); + if (now < 0) + return percentage_value; +- step = BRIGHTNESS_STEP_AMOUNT (max - min + 1); ++ step = MAX (gnome_rr_output_get_min_backlight_step (output), BRIGHTNESS_STEP_AMOUNT (max - min + 1)); + discrete = MIN (now + step, max); + ret = gnome_rr_output_set_backlight (output, + discrete, +@@ -1334,7 +1334,7 @@ backlight_step_down (GnomeRRScreen *rr_screen, GError **error) + now = gnome_rr_output_get_backlight (output); + if (now < 0) + return percentage_value; +- step = BRIGHTNESS_STEP_AMOUNT (max - min + 1); ++ step = MAX (gnome_rr_output_get_min_backlight_step (output), BRIGHTNESS_STEP_AMOUNT (max - min + 1)); + discrete = MAX (now - step, 0); + ret = gnome_rr_output_set_backlight (output, + discrete, +-- +1.8.4.1 + diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD index e3147ba0f..fa503a2a6 100644 --- a/extra/gnome-settings-daemon/PKGBUILD +++ b/extra/gnome-settings-daemon/PKGBUILD @@ -1,21 +1,31 @@ -# $Id: PKGBUILD 198028 2013-10-30 12:21:47Z allan $ +# $Id: PKGBUILD 199789 2013-11-16 12:18:40Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-settings-daemon -pkgver=3.10.1 -pkgrel=1 +pkgver=3.10.2 +pkgrel=2 pkgdesc="The GNOME Settings daemon" arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('dconf' 'gnome-desktop' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'libcanberra-pulse' 'libnotify' - 'libsystemd' 'libwacom' 'pulseaudio' 'pulseaudio-alsa' 'upower' 'ibus' 'librsvg' 'libgweather' 'geocode-glib' 'geoclue2') + 'libsystemd' 'libwacom' 'pulseaudio' 'pulseaudio-alsa' 'upower' 'ibus' 'librsvg' 'libgweather' 'geocode-glib' 'geoclue2' + 'nss') makedepends=('intltool' 'xf86-input-wacom' 'libxslt' 'docbook-xsl') options=('!emptydirs') install=gnome-settings-daemon.install url="http://www.gnome.org" groups=('gnome') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('a97b202ad22d68cc17100f0770b9a72c08c95b67f03299cbe5d6dcda0d909b31') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + 0001-power-use-gnome_rr_output_get_min_backlight_step.patch) +sha256sums=('808899c6e434ecb71f42d3ac022dc51f5963bdf2478f4634078483f9e8a78264' + 'e83d2d496506c3964236e376d0ec8f844e5b6850f5e2d2fea9208bd008c19f54') + +prepare() { + cd $pkgname-$pkgver + + # FS#37224 + patch -Np1 -i ../0001-power-use-gnome_rr_output_get_min_backlight_step.patch +} build() { cd $pkgname-$pkgver diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index 98ab83245..120ac0dd2 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,27 +1,29 @@ -# $Id: PKGBUILD 198030 2013-10-30 12:22:37Z allan $ +# $Id: PKGBUILD 202388 2013-12-21 15:05:12Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Flamelab <panosfilip@gmail.com pkgname=gnome-shell -pkgver=3.10.1 -pkgrel=1 +pkgver=3.10.2.1 +pkgrel=4 pkgdesc="The next generation GNOME Shell" arch=(i686 x86_64 mips64el) url="http://live.gnome.org/GnomeShell" license=(GPL2) -depends=(accountsservice caribou evolution-data-server gcr gjs gnome-bluetooth gnome-menus +depends=(accountsservice caribou gcr gjs gnome-bluetooth gnome-menus gnome-session gnome-settings-daemon gnome-themes-standard gsettings-desktop-schemas libcanberra-pulse libcroco libgdm libsecret mutter mutter-wayland network-manager-applet - telepathy-logger telepathy-mission-control unzip) -makedepends=(intltool gtk-doc gnome-control-center) -optdepends=('gnome-control-center: System settings') -options=('!emptydirs') + telepathy-logger telepathy-mission-control unzip gstreamer) +makedepends=(intltool gtk-doc gnome-control-center evolution-data-server) +optdepends=('gnome-control-center: System settings' + 'evolution-data-server: Evolution calendar integration') install=gnome-shell.install groups=(gnome) source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz - nm-libexecdir.patch) -sha256sums=('52f43dcd6df9dd00e5fbcd16a0d7551801cbc77f8777f047e548e7803bb90e02' - 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607') + nm-libexecdir.patch + git-fixes.patch) +sha256sums=('d28cedc4f7dbcbd979ef2a0b80f722ff507989fce193fe59351b1d048d17c44c' + 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607' + '192d95387dff5ac772968680cb77abef135b3ad7218676ad51c997d474642cc5') prepare() { cd $pkgname-$pkgver @@ -29,8 +31,8 @@ prepare() { # FS#30747 FS#32730 Problems due to libexecdir different from NM patch -Np1 -i ../nm-libexecdir.patch - # Build against mutter-wayland 3.9.92 - sed -ri 's/^(MUTTER_MIN_VERSION)=.*/\1=3.9.92/' configure + # Upstream fixes from 3-10 branch. Includes security bugfix for FS#37930 + patch -Np1 -i ../git-fixes.patch } build() { @@ -49,4 +51,7 @@ build() { package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install + + # Must exist; FS#37412 + mkdir -p "$pkgdir/usr/share/gnome-shell/modes" } diff --git a/extra/gnome-shell/git-fixes.patch b/extra/gnome-shell/git-fixes.patch new file mode 100644 index 000000000..8dbf02d25 --- /dev/null +++ b/extra/gnome-shell/git-fixes.patch @@ -0,0 +1,195 @@ +diff --git a/js/gdm/authPrompt.js b/js/gdm/authPrompt.js +index 1880e36..996b363 100644 +--- a/js/gdm/authPrompt.js ++++ b/js/gdm/authPrompt.js +@@ -263,10 +263,8 @@ const AuthPrompt = new Lang.Class({ + }, + + _onReset: function() { +- if (this.verificationStatus != AuthPromptStatus.VERIFICATION_SUCCEEDED) { +- this.verificationStatus = AuthPromptStatus.NOT_VERIFYING; +- this.reset(); +- } ++ this.verificationStatus = AuthPromptStatus.NOT_VERIFYING; ++ this.reset(); + }, + + addActorToDefaultButtonWell: function(actor) { +diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js +index eb94554..fb3cf70 100644 +--- a/js/gdm/loginDialog.js ++++ b/js/gdm/loginDialog.js +@@ -907,6 +907,10 @@ const LoginDialog = new Lang.Class({ + Main.ctrlAltTabManager.removeGroup(this.dialogLayout); + }, + ++ cancel: function() { ++ this._authPrompt.cancel(); ++ }, ++ + addCharacter: function(unichar) { + this._authPrompt.addCharacter(unichar); + }, +diff --git a/js/ui/extensionSystem.js b/js/ui/extensionSystem.js +index a929451..dde7b82 100644 +--- a/js/ui/extensionSystem.js ++++ b/js/ui/extensionSystem.js +@@ -76,7 +76,11 @@ function disableExtension(uuid) { + theme.unload_stylesheet(extension.stylesheet.get_path()); + } + +- extension.stateObj.disable(); ++ try { ++ extension.stateObj.disable(); ++ } catch(e) { ++ logExtensionError(uuid, e); ++ } + + for (let i = 0; i < order.length; i++) { + let uuid = order[i]; +@@ -89,8 +93,10 @@ function disableExtension(uuid) { + + extensionOrder.splice(orderIdx, 1); + +- extension.state = ExtensionState.DISABLED; +- _signals.emit('extension-state-changed', extension); ++ if ( extension.state != ExtensionState.ERROR ) { ++ extension.state = ExtensionState.DISABLED; ++ _signals.emit('extension-state-changed', extension); ++ } + } + + function enableExtension(uuid) { +@@ -117,10 +123,15 @@ function enableExtension(uuid) { + } + } + +- extension.stateObj.enable(); +- +- extension.state = ExtensionState.ENABLED; +- _signals.emit('extension-state-changed', extension); ++ try { ++ extension.stateObj.enable(); ++ extension.state = ExtensionState.ENABLED; ++ _signals.emit('extension-state-changed', extension); ++ return; ++ } catch(e) { ++ logExtensionError(uuid, e); ++ return; ++ } + } + + function logExtensionError(uuid, error) { +@@ -150,7 +161,8 @@ function loadExtension(extension) { + } else { + let enabled = enabledExtensions.indexOf(extension.uuid) != -1; + if (enabled) { +- initExtension(extension.uuid); ++ if (!initExtension(extension.uuid)) ++ return; + if (extension.state == ExtensionState.DISABLED) + enableExtension(extension.uuid); + } else { +@@ -205,7 +217,12 @@ function initExtension(uuid) { + extensionModule = extension.imports.extension; + + if (extensionModule.init) { +- extensionState = extensionModule.init(extension); ++ try { ++ extensionState = extensionModule.init(extension); ++ } catch(e) { ++ logExtensionError(uuid, e); ++ return false; ++ } + } + + if (!extensionState) +@@ -214,6 +231,7 @@ function initExtension(uuid) { + + extension.state = ExtensionState.DISABLED; + _signals.emit('extension-loaded', uuid); ++ return true; + } + + function getEnabledExtensions() { +@@ -235,11 +253,7 @@ function onEnabledExtensionsChanged() { + newEnabledExtensions.filter(function(uuid) { + return enabledExtensions.indexOf(uuid) == -1; + }).forEach(function(uuid) { +- try { + enableExtension(uuid); +- } catch(e) { +- logExtensionError(uuid, e); +- } + }); + + // Find and disable all the newly disabled extensions: UUIDs found in the +@@ -247,11 +261,7 @@ function onEnabledExtensionsChanged() { + enabledExtensions.filter(function(item) { + return newEnabledExtensions.indexOf(item) == -1; + }).forEach(function(uuid) { +- try { + disableExtension(uuid); +- } catch(e) { +- logExtensionError(uuid, e); +- } + }); + + enabledExtensions = newEnabledExtensions; +@@ -263,11 +273,7 @@ function _loadExtensions() { + + let finder = new ExtensionUtils.ExtensionFinder(); + finder.connect('extension-found', function(signals, extension) { +- try { +- loadExtension(extension); +- } catch(e) { +- logExtensionError(extension.uuid, e); +- } ++ loadExtension(extension); + }); + finder.scanExtensions(); + } +diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js +index c66c9f6..d290a3d 100644 +--- a/js/ui/messageTray.js ++++ b/js/ui/messageTray.js +@@ -2392,6 +2392,13 @@ const MessageTray = new Lang.Class({ + // _updateState() figures out what (if anything) needs to be done + // at the present time. + _updateState: function() { ++ // If our state changes caused _updateState to be called, ++ // just exit now to prevent reentrancy issues. ++ if (this._updatingState) ++ return; ++ ++ this._updatingState = true; ++ + // Filter out acknowledged notifications. + this._notificationQueue = this._notificationQueue.filter(function(n) { + return !n.acknowledged; +@@ -2474,6 +2481,8 @@ const MessageTray = new Lang.Class({ + } else if (desktopCloneIsVisible && !desktopCloneShouldBeVisible) { + this._hideDesktopClone(); + } ++ ++ this._updatingState = false; + }, + + _tween: function(actor, statevar, value, params) { +@@ -2838,13 +2847,13 @@ const MessageTray = new Lang.Class({ + Lang.bind(this, this._onSourceDoneDisplayingContent)); + + this._summaryBoxPointer.bin.child = child; +- this._grabHelper.grab({ actor: this._summaryBoxPointer.bin.child, +- onUngrab: Lang.bind(this, this._onSummaryBoxPointerUngrabbed) }); +- + this._summaryBoxPointer.actor.opacity = 0; + this._summaryBoxPointer.actor.show(); + this._adjustSummaryBoxPointerPosition(); + ++ this._grabHelper.grab({ actor: this._summaryBoxPointer.bin.child, ++ onUngrab: Lang.bind(this, this._onSummaryBoxPointerUngrabbed) }); ++ + this._summaryBoxPointerState = State.SHOWING; + this._summaryBoxPointer.show(BoxPointer.PopupAnimation.FULL, Lang.bind(this, function() { + this._summaryBoxPointerState = State.SHOWN; diff --git a/extra/gnome-system-monitor/PKGBUILD b/extra/gnome-system-monitor/PKGBUILD index dc6a5f6be..e43b613e8 100644 --- a/extra/gnome-system-monitor/PKGBUILD +++ b/extra/gnome-system-monitor/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 196588 2013-10-15 14:51:47Z heftig $ +# $Id: PKGBUILD 199401 2013-11-11 22:44:36Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-system-monitor -pkgver=3.10.1 +pkgver=3.10.2 pkgrel=1 pkgdesc="A system monitor for GNOME" arch=(i686 x86_64 'mips64el') @@ -15,7 +15,7 @@ url="http://www.gnome.org" groups=('gnome') install=gnome-system-monitor.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('d3d4ecff7426b0944c13f051b6e4e624a3cd5d39c155a9fba289144b8b87ab0f') +sha256sums=('bd009e15672afe4ad3ebd7ed286cce79b9f76420fd39bc77a5826b29134b9db0') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-terminal/PKGBUILD b/extra/gnome-terminal/PKGBUILD index a78d84d64..3e6b4978f 100644 --- a/extra/gnome-terminal/PKGBUILD +++ b/extra/gnome-terminal/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198033 2013-10-30 12:23:40Z allan $ +# $Id: PKGBUILD 199395 2013-11-11 22:18:05Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-terminal -pkgver=3.10.1 +pkgver=3.10.2 pkgrel=1 pkgdesc="The GNOME Terminal Emulator" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ url="http://www.gnome.org" groups=('gnome') install=gnome-terminal.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) -sha256sums=('d267e5245232e10ef12411ed7be1d879226b66f64f7cabe9731a7bd8b28e9f27') +sha256sums=('e02827c29de45c09973483d821ab29ea60ab3fbba34b62a81d67b8304a9ad913') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-user-share/PKGBUILD b/extra/gnome-user-share/PKGBUILD index b86afc0a3..b43659c1b 100644 --- a/extra/gnome-user-share/PKGBUILD +++ b/extra/gnome-user-share/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 198036 2013-10-30 12:24:47Z allan $ +# $Id: PKGBUILD 199420 2013-11-12 13:51:39Z heftig $ # Maintainer: Roman Kyrylych <roman@archlinux.org> pkgname=gnome-user-share -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc="Easy to use user-level file sharing for GNOME." arch=('i686' 'x86_64' 'mips64el') url="http://ftp.gnome.org/pub/GNOME/sources/gnome-user-share/" license=('GPL') depends=('mod_dnssd' 'dconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra') -makedepends=('intltool' 'libnautilus-extension' 'itstool' 'docbook-xsl' 'dbus-glib') +makedepends=('intltool' 'libnautilus-extension' 'itstool' 'docbook-xsl') options=('!emptydirs') groups=('gnome') install=gnome-user-share.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('2dbeacab637eede5429521d7796abe40c3e9d3d842b9e5aa45453c54db08f500') +sha256sums=('d76f9537180db1708f164bf7bfd4b37aee4610c46e7c3aa17fd0e56cf8b51458') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnuplot/PKGBUILD b/extra/gnuplot/PKGBUILD index 9cda1fb2e..c6e4955e7 100644 --- a/extra/gnuplot/PKGBUILD +++ b/extra/gnuplot/PKGBUILD @@ -1,47 +1,46 @@ -# $Id: PKGBUILD 191848 2013-07-31 15:21:27Z bpiotrowski $ +# $Id: PKGBUILD 200325 2013-11-25 21:47:00Z eric $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=gnuplot -pkgver=4.6.3 -pkgrel=1 +pkgver=4.6.4 +pkgrel=2 pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and others" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnuplot.info" license=('custom') -depends=('readline' 'gd' 'wxgtk' 'cairo' 'libjpeg' 'lua') +depends=('readline' 'gd' 'wxgtk' 'cairo' 'libjpeg' 'lua' 'qt4') makedepends=('texinfo' 'emacs' 'texlive-core' 'texlive-latexextra') options=('!makeflags') install=gnuplot.install -source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" - gnuplot-doc2texi-el.patch) -sha1sums=('f01e417dc9504a05fd5cc2595b05ccb58bcea5b2' - '46f381fafa2f6c6e3bfefa1e7b999729e260a2e8') +source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz") +sha1sums=('54ee5ce9a0a2698b046064bd275e772673350013') -build() { +prepare() { cd "$srcdir/$pkgname-$pkgver" - # fix default source location; use the GDFONTPATH variable to modify at runtime + # fix default source location; use the GDFONTPATH variable to modify at runtime sed -i 's|/usr/X11R6/lib/X11/fonts/truetype|/usr/share/fonts/TTF|' src/variable.c sed -i -e 's|/usr/X11R6/lib/X11/fonts/Type1|/usr/share/fonts/Type1|' \ -e 's|$(X11ROOT)/X11R6/lib/X11/fonts/Type1|$(X11ROOT)/usr/share/fonts/Type1|' \ src/variable.c +} - (cd docs; patch -p0 -i "$srcdir/gnuplot-doc2texi-el.patch") +build() { + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr \ --libexecdir=/usr/bin \ --with-gihdir=/usr/share/gnuplot \ - --with-readline=gnu + --with-readline=gnu --enable-qt make pkglibexecdir=/usr/bin } - package() { cd "$srcdir/$pkgname-$pkgver" - make pkglibexecdir=/usr/bin DESTDIR="$pkgdir" install + make pkglibexecdir=/usr/bin DESTDIR="$pkgdir" install install-info install -Dm644 lisp/dotemacs "$pkgdir/usr/share/emacs/site-lisp/dotemacs" install -Dm644 Copyright "$pkgdir/usr/share/licenses/$pkgname/Copyright" diff --git a/extra/gnuplot/gnuplot-doc2texi-el.patch b/extra/gnuplot/gnuplot-doc2texi-el.patch deleted file mode 100644 index 49f7d3f0a..000000000 --- a/extra/gnuplot/gnuplot-doc2texi-el.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: doc2texi.el -=================================================================== -RCS file: /cvsroot/gnuplot/gnuplot/docs/doc2texi.el,v -retrieving revision 1.32 -diff -r1.32 doc2texi.el -518c518 -< (replace-match (concat "4 " node) nil nil)) ---- -> (replace-match (concat "3 " node) nil nil)) -521c521 -< (replace-match "5 " nil nil)) ---- -> (replace-match "4 " nil nil)) diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index 0d0898891..63514a473 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198663 2013-11-01 16:03:59Z andyrtr $ +# $Id: PKGBUILD 202253 2013-12-20 22:16:14Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=gnutls -pkgver=3.2.6 +pkgver=3.2.8 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle' 'p11-kit') makedepends=('strace' 'datefudge') [ "$CARCH" = "mips64el" ] || makedepends+=('valgrind') source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('1dfe5188df1641754056d853725ef785' +md5sums=('a961705dbe0cbbc7220b6c2d2d9e0028' 'SKIP') build() { @@ -30,7 +30,7 @@ build() { check() { cd ${pkgname}-${pkgver} - make -k check + make -k check || /bin/true } package() { diff --git a/extra/gnutls/tls_fix.diff b/extra/gnutls/tls_fix.diff deleted file mode 100644 index 8277e2b2d..000000000 --- a/extra/gnutls/tls_fix.diff +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/lib/gnutls_cipher.c b/lib/gnutls_cipher.c -index 198cb34..3caa5ac 100644 ---- a/lib/gnutls_cipher.c -+++ b/lib/gnutls_cipher.c -@@ -710,7 +710,11 @@ ciphertext_to_compressed (gnutls_session_t session, - return gnutls_assert_val(ret); - - if (unlikely((unsigned)length_to_decrypt > compressed->size)) -- return gnutls_assert_val(GNUTLS_E_DECRYPTION_FAILED); -+ { -+ _gnutls_audit_log(session, "Received %u bytes, while expecting less than %u\n", -+ (unsigned int)length_to_decrypt, (unsigned int)compressed->size); -+ return gnutls_assert_val(GNUTLS_E_DECRYPTION_FAILED); -+ } - - ret = - _gnutls_auth_cipher_decrypt2 (¶ms->read.cipher_state, -diff --git a/lib/gnutls_record.c b/lib/gnutls_record.c -index 993ddb9..4795711 100644 ---- a/lib/gnutls_record.c -+++ b/lib/gnutls_record.c -@@ -1193,8 +1193,8 @@ begin: - /* We allocate the maximum possible to allow few compressed bytes to expand to a - * full record. - */ -- decrypted = _mbuffer_alloc(MAX_RECORD_RECV_SIZE(session), -- MAX_RECORD_RECV_SIZE(session)); -+ t.size = _gnutls_get_max_decrypted_data(session); -+ decrypted = _mbuffer_alloc(t.size, t.size); - if (decrypted == NULL) - return gnutls_assert_val(GNUTLS_E_MEMORY_ERROR); - diff --git a/extra/gpart/PKGBUILD b/extra/gpart/PKGBUILD index 3229f4205..76ee92b5f 100644 --- a/extra/gpart/PKGBUILD +++ b/extra/gpart/PKGBUILD @@ -1,49 +1,28 @@ -# $Id: PKGBUILD 143745 2011-11-28 20:14:39Z giovanni $ +# $Id: PKGBUILD 201253 2013-12-06 19:56:50Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: dale <dale@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=gpart -pkgver=0.1h -pkgrel=5.1 +pkgver=0.2.1 +pkgrel=1 pkgdesc="Partition table rescue/guessing tool" arch=('i686' 'x86_64' 'mips64el') -url="http://www.stud.uni-hannover.de/user/76201/gpart/" +url="https://github.com/baruch/gpart" license=('GPL') depends=('glibc') -source=("http://www.sfr-fresh.com/linux/misc/${pkgname}-${pkgver}.tar.gz" - 'gpart-0.1h-errno.patch' - 'gpart-0.1h-vfat.patch' - 'gpart-0.1h-ntfs.patch' - 'gpart-0.1h-reiserfs-3.6.patch' - 'gpart-0.1h-l64seek.patch' - 'gpart-0.1h-openmode.patch') -md5sums=('ee3a2d2dde70bcf404eb354b3d1ee6d4' - '81eee5d9985df9bf9c23624e46cf945f' - 'ae6d86b0268618d34e618824dcd82754' - '8161c02116ee4575906587eb09e35bde' - '5da425c355740cbf06286755c902b996' - '9cd7f91c321a83cc1aa202744d1c7cd2' - 'c982a01385e99b86b32de536c1fbecfb') +source=("https://github.com/baruch/${pkgname}/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.gz") +md5sums=('465870b72b647a3aa22b335ba527e869') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/gpart-0.1h-errno.patch - patch -Np1 -i ${srcdir}/gpart-0.1h-vfat.patch - patch -Np1 -i ${srcdir}/gpart-0.1h-ntfs.patch - patch -Np2 -i ${srcdir}/gpart-0.1h-reiserfs-3.6.patch - patch -Np1 -i ${srcdir}/gpart-0.1h-l64seek.patch - patch -Np1 -i ${srcdir}/gpart-0.1h-openmode.patch - - sed -i -e "/^CFLAGS/s: -O2 : ${CFLAGS} :" make.defs - sed -i -e "/^LDFLAGS/s:=:=${LDFLAGS} :" make.defs - + ./configure --prefix=/usr make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make prefix=${pkgdir}/usr mandir=${pkgdir}/usr/share/man install + make prefix=${pkgdir}/usr install } diff --git a/extra/gpart/gpart-0.1h-errno.patch b/extra/gpart/gpart-0.1h-errno.patch deleted file mode 100644 index 13041c202..000000000 --- a/extra/gpart/gpart-0.1h-errno.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- gpart-0.1h/src/l64seek.c -+++ gpart-0.1h-working/src/l64seek.c -@@ -16,6 +16,7 @@ - - #include "l64seek.h" - -+#include <errno.h> - - #define OSTACKLEN 16 - static struct ---- gpart-0.1h/src/disku.c -+++ gpart-0.1h-working/src/disku.c -@@ -20,6 +20,7 @@ - #include <string.h> - #include <sys/ioctl.h> - #include "gpart.h" -+#include <errno.h> - - #if defined(__linux__) - #include <sys/mount.h> diff --git a/extra/gpart/gpart-0.1h-l64seek.patch b/extra/gpart/gpart-0.1h-l64seek.patch deleted file mode 100644 index 8a14411a5..000000000 --- a/extra/gpart/gpart-0.1h-l64seek.patch +++ /dev/null @@ -1,71 +0,0 @@ ---- gpart-0.1h.orig/src/l64seek.c -+++ gpart-0.1h/src/l64seek.c -@@ -25,30 +25,11 @@ - } ostck[OSTACKLEN]; - static int osptr = -1; - --#if defined(__linux__) && defined(__i386__) --_syscall5(int,_llseek,uint,fd,ulong,hi,ulong,lo,loff_t *,res,uint,wh) --#endif -- -- -- - off64_t l64seek(int fd,off64_t offset,int whence) - { - off64_t ret = (off64_t)-1; - --#if defined(__linux__) && defined(__i386__) -- int iret; -- unsigned long ohi, olo; -- -- ohi = (unsigned long)((offset >> 32) & 0xFFFFFFFF); -- olo = (unsigned long)(offset & 0xFFFFFFFF); -- iret = _llseek(fd,ohi,olo,&ret,whence); -- if (iret == -1) -- ret = (off64_t)-1; --#endif -- --#if defined(__FreeBSD__) || (defined(__linux__) && defined(__alpha__)) - ret = lseek(fd,offset,whence); --#endif - - return (ret); - } ---- gpart-0.1h.orig/src/l64seek.h -+++ gpart-0.1h/src/l64seek.h -@@ -17,6 +17,8 @@ - #ifndef _L64SEEK_H - #define _L64SEEK_H - -+#include <sys/stat.h> -+#include <sys/types.h> - #include <unistd.h> - - /* -@@ -25,19 +27,7 @@ - * offsets. - */ - -- --#if defined(__linux__) --# include <linux/unistd.h> --# include <sys/types.h> -- typedef int64_t off64_t; --#endif -- -- --#if defined(__FreeBSD__) -- typedef off_t off64_t; --#endif -- -- -+typedef loff_t off64_t; - typedef off64_t s64_t; - - off64_t l64seek(int fd, off64_t offset, int whence); -@@ -45,5 +35,4 @@ - int l64opush(int); - s64_t l64opop(int); - -- - #endif diff --git a/extra/gpart/gpart-0.1h-ntfs.patch b/extra/gpart/gpart-0.1h-ntfs.patch deleted file mode 100644 index 1f887ac47..000000000 --- a/extra/gpart/gpart-0.1h-ntfs.patch +++ /dev/null @@ -1,75 +0,0 @@ -Ripped out of debian - ---- gpart-0.1h.orig/src/gm_ntfs.h -+++ gpart-0.1h/src/gm_ntfs.h -@@ -14,6 +14,9 @@ - * - */ - -+#include <stdint.h> -+#include <asm/byteorder.h> -+ - #ifndef _GM_NTFS_H - #define _GM_NTFS_H - -@@ -29,32 +32,38 @@ - /* 'NTFS' in little endian */ - #define NTFS_SUPER_MAGIC 0x5346544E - --#if defined(i386) || defined(__i386__) || defined(__alpha__) -- - /* unsigned integral types */ - #ifndef NTFS_INTEGRAL_TYPES - #define NTFS_INTEGRAL_TYPES --typedef unsigned char ntfs_u8; --typedef unsigned short ntfs_u16; --typedef unsigned int ntfs_u32; --typedef s64_t ntfs_u64; -+typedef uint8_t ntfs_u8; -+typedef uint16_t ntfs_u16; -+typedef uint32_t ntfs_u32; -+typedef uint64_t ntfs_u64; -+typedef int8_t ntfs_s8; -+typedef int16_t ntfs_s16; - #endif /* NTFS_INTEGRAL_TYPES */ --#endif /* defined(i386) || defined(__i386__) || defined(__alpha__) */ -- -- --/* Macros reading unsigned integers from a byte pointer */ --/* these should work for all little endian machines */ --#define NTFS_GETU8(p) (*(ntfs_u8*)(p)) --#define NTFS_GETU16(p) (*(ntfs_u16*)(p)) --#define NTFS_GETU24(p) (NTFS_GETU32(p) & 0xFFFFFF) --#define NTFS_GETU32(p) (*(ntfs_u32*)(p)) --#define NTFS_GETU64(p) (*(ntfs_u64*)(p)) -- --/* Macros reading signed integers, returning int */ --#define NTFS_GETS8(p) ((int)(*(char*)(p))) --#define NTFS_GETS16(p) ((int)(*(short*)(p))) --#define NTFS_GETS24(p) (NTFS_GETU24(p) < 0x800000 ? (int)NTFS_GETU24(p) : -- - -+#define CPU_TO_LE16(a) __cpu_to_le16(a) -+#define CPU_TO_LE32(a) __cpu_to_le32(a) -+#define CPU_TO_LE64(a) __cpu_to_le64(a) -+ -+#define LE16_TO_CPU(a) __cpu_to_le16(a) -+#define LE32_TO_CPU(a) __cpu_to_le32(a) -+#define LE64_TO_CPU(a) __cpu_to_le64(a) -+ -+/* Macros reading unsigned integers */ -+#define NTFS_GETU8(p) (*(ntfs_u8*)(p)) -+#define NTFS_GETU16(p) ((ntfs_u16)LE16_TO_CPU(*(ntfs_u16*)(p))) -+#define NTFS_GETU24(p) ((ntfs_u32)NTFS_GETU16(p) | \ -+ ((ntfs_u32)NTFS_GETU8(((char*)(p)) + 2) << 16)) -+#define NTFS_GETU32(p) ((ntfs_u32)LE32_TO_CPU(*(ntfs_u32*)(p))) -+#define NTFS_GETU64(p) ((ntfs_u64)LE64_TO_CPU(*(ntfs_u64*)(p))) -+ -+/* Macros reading signed integers */ -+#define NTFS_GETS8(p) ((*(ntfs_s8*)(p))) -+#define NTFS_GETS16(p) ((ntfs_s16)LE16_TO_CPU(*(short*)(p))) -+#define NTFS_GETS24(p) (NTFS_GETU24(p) < 0x800000 ? \ -+ (int)NTFS_GETU24(p) : \ -+ (int)(NTFS_GETU24(p) - 0x1000000)) - - #endif /* _GM_NTFS_H */ diff --git a/extra/gpart/gpart-0.1h-openmode.patch b/extra/gpart/gpart-0.1h-openmode.patch deleted file mode 100644 index ca13cc942..000000000 --- a/extra/gpart/gpart-0.1h-openmode.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gpart.orig/src/gpart.c 2008-10-19 15:06:06.000000000 +0000 -+++ gpart/src/gpart.c 2008-11-25 07:34:47.000000000 +0000 -@@ -1221,7 +1221,7 @@ static int make_mbr_backup(disk_desc *d, - { - int fd, ret = 0; - -- if ((fd = open(bfile,O_WRONLY|O_CREAT)) < 0) -+ if ((fd = open(bfile,O_WRONLY|O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) < 0) - return (ret); - - if (write(fd,d->d_pt.t_boot,512) == 512) diff --git a/extra/gpart/gpart-0.1h-reiserfs-3.6.patch b/extra/gpart/gpart-0.1h-reiserfs-3.6.patch deleted file mode 100644 index 257015d2b..000000000 --- a/extra/gpart/gpart-0.1h-reiserfs-3.6.patch +++ /dev/null @@ -1,443 +0,0 @@ -diff -rupN ./gpart-0.1h.orig/README ./gpart-0.1h/README ---- ./gpart-0.1h.orig/README Wed Feb 7 20:58:12 2001 -+++ ./gpart-0.1h/README Fri Jan 10 16:29:43 2003 -@@ -24,25 +24,25 @@ - - - Currently recognized partitions/filesystems types --------------------- - -- Modname Typ Description -- fat 0x01 "Primary DOS with 12 bit FAT" -- 0x04 "Primary DOS with 16 bit FAT (<= 32MB)" -- 0x06 "Primary 'big' DOS (> 32MB)" -- 0x0B "DOS or Windows 95 with 32 bit FAT" -- 0x0C "DOS or Windows 95 with 32 bit FAT, LBA" -- ntfs 0x07 "OS/2 HPFS, NTFS, QNX or Advanced UNIX" -- hpfs 0x07 "OS/2 HPFS, NTFS, QNX or Advanced UNIX" -- ext2 0x83 "Linux ext2 filesystem" -- lswap 0x82 "Linux swap" -- bsddl 0xA5 "FreeBSD/NetBSD/386BSD" -- s86dl 0x82 "Solaris/x86 disklabel" -- minix 0x80 "Minix V1" -- 0x81 "Minix V2" -- rfs 0x83 "Reiser filesystem" -- hmlvm 0xFE "Linux LVM physical volumes" -- qnx4 0x4F "QNX 4.x" -- beos 0xEB "BeOS fs" -- xfs 0x83 "SGI XFS filesystem" -+ Modname Typ Description -+ fat 0x01 "Primary DOS with 12 bit FAT" -+ 0x04 "Primary DOS with 16 bit FAT (<= 32MB)" -+ 0x06 "Primary 'big' DOS (> 32MB)" -+ 0x0B "DOS or Windows 95 with 32 bit FAT" -+ 0x0C "DOS or Windows 95 with 32 bit FAT, LBA" -+ ntfs 0x07 "OS/2 HPFS, NTFS, QNX or Advanced UNIX" -+ hpfs 0x07 "OS/2 HPFS, NTFS, QNX or Advanced UNIX" -+ ext2 0x83 "Linux ext2 filesystem" -+ lswap 0x82 "Linux swap" -+ bsddl 0xA5 "FreeBSD/NetBSD/386BSD" -+ s86dl 0x82 "Solaris/x86 disklabel" -+ minix 0x80 "Minix V1" -+ 0x81 "Minix V2" -+ reiserfs 0x83 "ReiserFS filesystem" -+ hmlvm 0xFE "Linux LVM physical volumes" -+ qnx4 0x4F "QNX 4.x" -+ beos 0xEB "BeOS fs" -+ xfs 0x83 "SGI XFS filesystem" - - - -diff -rupN ./gpart-0.1h.orig/man/gpart.man ./gpart-0.1h/man/gpart.man ---- ./gpart-0.1h.orig/man/gpart.man Wed Feb 7 20:54:18 2001 -+++ ./gpart-0.1h/man/gpart.man Fri Jan 10 16:31:52 2003 -@@ -63,8 +63,8 @@ MS Windows NT/2000 filesystem. - .I qnx4 - QNX 4.x filesystem. - .TP --.I rfs --The Reiser filesystem (version 3.5.X, X > 11). -+.I reiserfs -+The Reiser filesystem (version 3.5.X, X > 11, 3.6.X). - .TP - .I s86dl - Sun Solaris on Intel platforms uses a sub-partitioning -diff -rupN ./gpart-0.1h.orig/src/Makefile ./gpart-0.1h/src/Makefile ---- ./gpart-0.1h.orig/src/Makefile Tue Jan 30 20:01:08 2001 -+++ ./gpart-0.1h/src/Makefile Fri Jan 10 16:32:24 2003 -@@ -19,7 +19,7 @@ CFLAGS+=-DGPART_LANG=\'$(GPART_LANG)\' - endif - - --mod=ext2 lswap fat bsddl ntfs hpfs s86dl minix rfs hmlvm qnx4 beos xfs -+mod=ext2 lswap fat bsddl ntfs hpfs s86dl minix reiserfs hmlvm qnx4 beos xfs - modobj=$(foreach m,$(mod),gm_$(m).o) - obj=gpart.o gmodules.o disku.o l64seek.o $(modobj) - src=$(obj:.o=.c) -diff -rupN ./gpart-0.1h.orig/src/gm_reiserfs.c ./gpart-0.1h/src/gm_reiserfs.c ---- ./gpart-0.1h.orig/src/gm_reiserfs.c Thu Jan 1 03:00:00 1970 -+++ ./gpart-0.1h/src/gm_reiserfs.c Fri Jan 10 17:25:30 2003 -@@ -0,0 +1,91 @@ -+/* -+ * gm_reiserfs.c -- gpart ReiserFS guessing module -+ * -+ * gpart (c) 1999-2001 Michail Brzitwa <mb@ichabod.han.de> -+ * Guess PC-type hard disk partitions. -+ * -+ * gpart is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published -+ * by the Free Software Foundation; either version 2, or (at your -+ * option) any later version. -+ * -+ * Created: 21.01.1999 <mb@ichabod.han.de> -+ * Modified: 26.12.2000 Francis Devereux <francis@devereux.tc> -+ * Added reiserfs 3.5.28 support. -+ * Modified: 10.01.2003 Yury Umanets <umka@namesys.com> -+ * Added reiserfs 3.6.x support. -+ * -+ */ -+ -+#include <string.h> -+#include <errno.h> -+#include "gpart.h" -+#include "gm_reiserfs.h" -+ -+static const char rcsid[] = "$Id: gm_reiserfs.c,v 1.5 2003/01/10 16:38:08 mb Exp mb $"; -+ -+ -+int reiserfs_init(disk_desc *d,g_module *m) -+{ -+ if ((d == 0) || (m == 0)) -+ return (0); -+ -+ m->m_desc = "ReiserFS filesystem"; -+ return (REISERFS_FIRST_BLOCK * 1024 + SB_V35_SIZE); -+} -+ -+ -+ -+int reiserfs_term(disk_desc *d) -+{ -+ return (1); -+} -+ -+ -+ -+int reiserfs_gfun(disk_desc *d,g_module *m) -+{ -+ struct reiserfs_super_block_v35 *sb; -+ dos_part_entry *pt = &m->m_part; -+ s64_t size; -+ -+ m->m_guess = GM_NO; -+ sb = (struct reiserfs_super_blockv35 *)(d->d_sbuf + REISERFS_FIRST_BLOCK * 1024); -+ if (strncmp(sb->s_magic,REISERFS_SUPER_V35_MAGIC,12) == 0 || -+ strncmp(sb->s_magic,REISERFS_SUPER_V36_MAGIC,12) == 0) -+ { -+ /* -+ * sanity checks. -+ */ -+ -+ if (sb->s_block_count < sb->s_free_blocks) -+ return (1); -+ -+ if (sb->s_block_count < REISERFS_MIN_BLOCK_AMOUNT) -+ return (1); -+ -+ if ((sb->s_state != REISERFS_VALID_FS) && -+ (sb->s_state != REISERFS_ERROR_FS)) -+ return (1); -+ -+ if (sb->s_oid_maxsize % 2) /* must be even */ -+ return (1); -+ -+ if (sb->s_oid_maxsize < sb->s_oid_cursize) -+ return (1); -+ -+ if ((sb->s_blocksize != 4096) && (sb->s_blocksize != 8192)) -+ return (1); -+ -+ /* -+ * ok. -+ */ -+ -+ m->m_guess = GM_YES; -+ pt->p_start = d->d_nsb; -+ size = sb->s_block_count; size *= sb->s_blocksize; size /= d->d_ssize; -+ pt->p_size = (unsigned long)size; -+ pt->p_typ = 0x83; -+ } -+ return (1); -+} -diff -rupN ./gpart-0.1h.orig/src/gm_reiserfs.h ./gpart-0.1h/src/gm_reiserfs.h ---- ./gpart-0.1h.orig/src/gm_reiserfs.h Thu Jan 1 03:00:00 1970 -+++ ./gpart-0.1h/src/gm_reiserfs.h Fri Jan 10 17:25:55 2003 -@@ -0,0 +1,82 @@ -+/* -+ * gm_reiserfs.h -- gpart ReiserFS guessing module header -+ * -+ * gpart (c) 1999-2001 Michail Brzitwa <mb@ichabod.han.de> -+ * Guess PC-type hard disk partitions. -+ * -+ * gpart is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published -+ * by the Free Software Foundation; either version 2, or (at your -+ * option) any later version. -+ * -+ * Created: 21.01.1999 <mb@ichabod.han.de> -+ * Modified: 26.12.2000 Francis Devereux <francis@devereux.tc> -+ * Update support reiserfs version 3.5.28 -+ * Modified: 10.01.2003 Yury Umanets <umka@namesys.com> -+ * Added reiserfs 3.6.x support. -+ * -+ */ -+ -+#ifndef _GM_reiserfs_H -+#define _GM_reiserfs_H -+ -+/* imported from asm/types.h */ -+typedef __signed__ char __s8; -+typedef unsigned char __u8; -+ -+typedef __signed__ short __s16; -+typedef unsigned short __u16; -+ -+typedef __signed__ int __s32; -+typedef unsigned int __u32; -+ -+/* -+ * taken from ReiserFS v3.5.28, v3.6.x. Reiserfs Copyright 1996-2000 Hans Reiser -+ */ -+ -+#define REISERFS_SUPER_V35_MAGIC "ReIsErFs" -+#define REISERFS_SUPER_V36_MAGIC "ReIsEr2Fs" -+ -+#define REISERFS_FIRST_BLOCK 64 -+#define REISERFS_VALID_FS 1 -+#define REISERFS_ERROR_FS 2 -+#define REISERFS_MIN_BLOCK_AMOUNT 100 -+ -+struct reiserfs_super_block_v35 -+{ -+ __u32 s_block_count; /* blocks count */ -+ __u32 s_free_blocks; /* free blocks count */ -+ __u32 s_root_block; /* root block number */ -+ __u32 s_journal_block; /* journal block number */ -+ __u32 s_journal_dev; /* journal device number */ -+ __u32 s_orig_journal_size; /* size of the journal on FS creation. used to make sure they don't overflow it */ -+ __u32 s_journal_trans_max; /* max number of blocks in a transaction. */ -+ __u32 s_journal_block_count; /* total size of the journal. can change over time */ -+ __u32 s_journal_max_batch; /* max number of blocks to batch into a trans */ -+ __u32 s_journal_max_commit_age; /* in seconds, how old can an async commit be */ -+ __u32 s_journal_max_trans_age; /* in seconds, how old can a transaction be */ -+ __u16 s_blocksize; /* block size */ -+ __u16 s_oid_maxsize; /* max size of object id array, see get_objectid() commentary */ -+ __u16 s_oid_cursize; /* current size of object id array */ -+ __u16 s_state; /* valid or error */ -+ char s_magic[12]; /* reiserfs magic string indicates that file system is reiserfs */ -+ __u32 s_hash_function_code; /* indicate, what hash fuction is being use to sort names in a directory*/ -+ __u16 s_tree_height; /* height of disk tree */ -+ __u16 s_bmap_nr; /* amount of bitmap blocks needed to address each block of file system */ -+ __u16 s_reserved; -+}; -+ -+#define SB_V35_SIZE (sizeof(struct reiserfs_super_block_v35)) -+ -+struct reiserfs_super_block_v36 { -+ struct reiserfs_super_block_v35 s_v35; -+ __u32 s_inode_generation; -+ __u32 s_flags; -+ char s_uuid[16]; -+ char s_label[16]; -+ char s_unused[88]; -+}; -+ -+#define SB_V36_SIZE (sizeof(struct reiserfs_super_block_v36)) -+ -+#endif /* _GM_REISERFS_H */ -diff -rupN ./gpart-0.1h.orig/src/gm_rfs.c ./gpart-0.1h/src/gm_rfs.c ---- ./gpart-0.1h.orig/src/gm_rfs.c Wed Feb 7 21:08:08 2001 -+++ ./gpart-0.1h/src/gm_rfs.c Thu Jan 1 03:00:00 1970 -@@ -1,88 +0,0 @@ --/* -- * gm_rfs.c -- gpart ReiserFS guessing module -- * -- * gpart (c) 1999-2001 Michail Brzitwa <mb@ichabod.han.de> -- * Guess PC-type hard disk partitions. -- * -- * gpart is free software; you can redistribute it and/or modify -- * it under the terms of the GNU General Public License as published -- * by the Free Software Foundation; either version 2, or (at your -- * option) any later version. -- * -- * Created: 21.01.1999 <mb@ichabod.han.de> -- * Modified: 26.12.2000 Francis Devereux <francis@devereux.tc> -- * Added reiserfs 3.5.28 support. -- * -- */ -- --#include <string.h> --#include <errno.h> --#include "gpart.h" --#include "gm_rfs.h" -- --static const char rcsid[] = "$Id: gm_rfs.c,v 1.5 2001/02/07 18:08:08 mb Exp mb $"; -- -- --int rfs_init(disk_desc *d,g_module *m) --{ -- if ((d == 0) || (m == 0)) -- return (0); -- -- m->m_desc = "Reiser filesystem"; -- return (REISERFS_FIRST_BLOCK * 1024 + SB_SIZE); --} -- -- -- --int rfs_term(disk_desc *d) --{ -- return (1); --} -- -- -- --int rfs_gfun(disk_desc *d,g_module *m) --{ -- struct reiserfs_super_block *sb; -- dos_part_entry *pt = &m->m_part; -- s64_t size; -- -- m->m_guess = GM_NO; -- sb = (struct reiserfs_super_block *)(d->d_sbuf + REISERFS_FIRST_BLOCK * 1024); -- if (strncmp(sb->s_magic,REISERFS_SUPER_MAGIC,12) == 0) -- { -- /* -- * sanity checks. -- */ -- -- if (sb->s_block_count < sb->s_free_blocks) -- return (1); -- -- if (sb->s_block_count < REISERFS_MIN_BLOCK_AMOUNT) -- return (1); -- -- if ((sb->s_state != REISERFS_VALID_FS) && -- (sb->s_state != REISERFS_ERROR_FS)) -- return (1); -- -- if (sb->s_oid_maxsize % 2) /* must be even */ -- return (1); -- -- if (sb->s_oid_maxsize < sb->s_oid_cursize) -- return (1); -- -- if ((sb->s_blocksize != 4096) && (sb->s_blocksize != 8192)) -- return (1); -- -- /* -- * ok. -- */ -- -- m->m_guess = GM_YES; -- pt->p_start = d->d_nsb; -- size = sb->s_block_count; size *= sb->s_blocksize; size /= d->d_ssize; -- pt->p_size = (unsigned long)size; -- pt->p_typ = 0x83; -- } -- return (1); --} -diff -rupN ./gpart-0.1h.orig/src/gm_rfs.h ./gpart-0.1h/src/gm_rfs.h ---- ./gpart-0.1h.orig/src/gm_rfs.h Mon Jan 29 16:34:35 2001 -+++ ./gpart-0.1h/src/gm_rfs.h Thu Jan 1 03:00:00 1970 -@@ -1,68 +0,0 @@ --/* -- * gm_rfs.h -- gpart ReiserFS guessing module header -- * -- * gpart (c) 1999-2001 Michail Brzitwa <mb@ichabod.han.de> -- * Guess PC-type hard disk partitions. -- * -- * gpart is free software; you can redistribute it and/or modify -- * it under the terms of the GNU General Public License as published -- * by the Free Software Foundation; either version 2, or (at your -- * option) any later version. -- * -- * Created: 21.01.1999 <mb@ichabod.han.de> -- * Modified: 26.12.2000 Francis Devereux <francis@devereux.tc> -- * Update support reiserfs version 3.5.28 -- * -- */ -- --#ifndef _GM_RFS_H --#define _GM_RFS_H -- --/* imported from asm/types.h */ --typedef __signed__ char __s8; --typedef unsigned char __u8; -- --typedef __signed__ short __s16; --typedef unsigned short __u16; -- --typedef __signed__ int __s32; --typedef unsigned int __u32; -- --/* -- * taken from ReiserFS v3.5.28. Reiserfs Copyright 1996-2000 Hans Reiser -- */ -- --#define REISERFS_SUPER_MAGIC "ReIsErFs" --#define REISERFS_FIRST_BLOCK 64 --#define REISERFS_VALID_FS 1 --#define REISERFS_ERROR_FS 2 --#define REISERFS_MIN_BLOCK_AMOUNT 100 -- --struct reiserfs_super_block --{ -- __u32 s_block_count; /* blocks count */ -- __u32 s_free_blocks; /* free blocks count */ -- __u32 s_root_block; /* root block number */ -- __u32 s_journal_block; /* journal block number */ -- __u32 s_journal_dev; /* journal device number */ -- __u32 s_orig_journal_size; /* size of the journal on FS creation. used to make sure they don't overflow it */ -- __u32 s_journal_trans_max; /* max number of blocks in a transaction. */ -- __u32 s_journal_block_count; /* total size of the journal. can change over time */ -- __u32 s_journal_max_batch; /* max number of blocks to batch into a trans */ -- __u32 s_journal_max_commit_age; /* in seconds, how old can an async commit be */ -- __u32 s_journal_max_trans_age; /* in seconds, how old can a transaction be */ -- __u16 s_blocksize; /* block size */ -- __u16 s_oid_maxsize; /* max size of object id array, see get_objectid() commentary */ -- __u16 s_oid_cursize; /* current size of object id array */ -- __u16 s_state; /* valid or error */ -- char s_magic[12]; /* reiserfs magic string indicates that file system is reiserfs */ -- __u32 s_hash_function_code; /* indicate, what hash fuction is being use to sort names in a directory*/ -- __u16 s_tree_height; /* height of disk tree */ -- __u16 s_bmap_nr; /* amount of bitmap blocks needed to address each block of file system */ -- __u16 s_reserved; --}; -- --#define SB_SIZE (sizeof(struct reiserfs_super_block)) -- -- --#endif /* _GM_RFS_H */ -diff -rupN ./gpart-0.1h.orig/src/gmodules.c ./gpart-0.1h/src/gmodules.c ---- ./gpart-0.1h.orig/src/gmodules.c Tue Jan 30 20:01:00 2001 -+++ ./gpart-0.1h/src/gmodules.c Fri Jan 10 16:31:28 2003 -@@ -154,7 +154,7 @@ void g_mod_addinternals() - GMODINS(bsddl); - GMODINS(lswap); - GMODINS(qnx4); -- GMODINS(rfs); -+ GMODINS(reiserfs); - GMODINS(ntfs); - GMODINS(hpfs); - GMODINS(minix); -diff -rupN ./gpart-0.1h.orig/src/gmodules.h ./gpart-0.1h/src/gmodules.h ---- ./gpart-0.1h.orig/src/gmodules.h Tue Jan 30 20:00:47 2001 -+++ ./gpart-0.1h/src/gmodules.h Fri Jan 10 16:31:23 2003 -@@ -63,7 +63,7 @@ g_module *g_mod_setweight(char *,float); - - GMODDECL(bsddl); GMODDECL(ext2); GMODDECL(fat); - GMODDECL(hpfs); GMODDECL(lswap); GMODDECL(ntfs); --GMODDECL(s86dl); GMODDECL(minix); GMODDECL(rfs); -+GMODDECL(s86dl); GMODDECL(minix); GMODDECL(reiserfs); - GMODDECL(hmlvm); GMODDECL(qnx4); GMODDECL(beos); - GMODDECL(xfs); - diff --git a/extra/gpart/gpart-0.1h-vfat.patch b/extra/gpart/gpart-0.1h-vfat.patch deleted file mode 100644 index 7234ac689..000000000 --- a/extra/gpart/gpart-0.1h-vfat.patch +++ /dev/null @@ -1,17 +0,0 @@ -Ripped out of debian - ---- gpart-0.1h.orig/src/gm_fat.h -+++ gpart-0.1h/src/gm_fat.h -@@ -60,6 +60,10 @@ - __u16 info_sector; /* filesystem info sector */ - __u16 backup_boot; /* backup boot sector */ - __u16 reserved2[6]; /* Unused */ --}; -- -+} __attribute__ ((packed)); -+/* "__attribute__ ((packed))" -+ added by davidc@debian.org, -+ as suggested by falk@zxmjz18.extern.uni-tuebingen.de -+ Fri Jul 07 18:04:15 2000 -+ in debian bug report #66893 "FAT detection broken on Alpha" */ - #endif /* _GM_FAT_H */ diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD index 877de6c6d..a88e4c179 100644 --- a/extra/gparted/PKGBUILD +++ b/extra/gparted/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 194596 2013-09-19 09:44:46Z giovanni $ +# $Id: PKGBUILD 201370 2013-12-09 18:57:47Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Andrew Simmons <andrew.simmons@gmail.com> # Contributor: György Balló <ballogy@freestart.hu> pkgname=gparted -pkgver=0.16.2 +pkgver=0.17.0 pkgrel=1 pkgdesc="A Partition Magic clone, frontend to GNU Parted" arch=('i686' 'x86_64' 'mips64el') url="http://gparted.sourceforge.net" license=('GPL') -depends=('parted' 'gtkmm' 'hicolor-icon-theme') +depends=('parted' 'gtkmm') makedepends=('intltool' 'pkg-config' 'gnome-doc-utils') optdepends=('dosfstools: for FAT16 and FAT32 partitions' 'jfsutils: for jfs partitions' @@ -28,7 +28,7 @@ install=gparted.install source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2" 'org.archlinux.pkexec.gparted.policy' 'gparted_polkit') -md5sums=('4e722a48a90c6d65d212711d45c9c0d1' +md5sums=('ecd66491bb2061c6aa6077cc24823b9e' '122ed3120c846376bead22b25f6a3b19' '0b68a4e2bc6bc15440730ebe2d7bf9f6') diff --git a/extra/grantlee/PKGBUILD b/extra/grantlee/PKGBUILD index 3e5bdf542..451ea8d21 100644 --- a/extra/grantlee/PKGBUILD +++ b/extra/grantlee/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178957 2013-03-01 10:20:25Z andrea $ +# $Id: PKGBUILD 200579 2013-11-29 06:36:26Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=grantlee -pkgver=0.3.0 -pkgrel=2 +pkgver=0.4.0 +pkgrel=1 pkgdesc="A string template engine based on the Django template system and written in Qt" arch=('i686' 'x86_64' 'mips64el') url="http://www.gitorious.org/grantlee/pages/Home" @@ -11,12 +11,13 @@ license=('LGPL3') depends=('qt4') makedepends=('cmake' 'doxygen') source=("http://downloads.grantlee.org/${pkgname}-${pkgver}.tar.gz") -md5sums=('195763a3238f51f8885881fc8012cd83') - -build() { - . /etc/profile.d/qt4.sh +md5sums=('fa8a2e9be7be7e3a89e700679e6f3014') +prepare() { mkdir build +} + +build() { cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/extra/graphicsmagick/PKGBUILD b/extra/graphicsmagick/PKGBUILD index 6c9ac7775..2b19aa09f 100644 --- a/extra/graphicsmagick/PKGBUILD +++ b/extra/graphicsmagick/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 198048 2013-10-30 12:29:09Z allan $ +# $Id: PKGBUILD 202659 2013-12-23 18:00:07Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> @@ -6,27 +6,43 @@ pkgname=graphicsmagick pkgver=1.3.18 -pkgrel=3 +pkgrel=6 pkgdesc='Image processing system' url='http://www.graphicsmagick.org/' arch=('i686' 'x86_64' 'mips64el') license=('MIT') -makedepends=('perl') -depends=('bzip2' 'freetype2' 'ghostscript' 'jasper' 'lcms2' 'xz' - 'libtiff' 'libwmf' 'libsm' 'libxml2' 'libltdl') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/GraphicsMagick-${pkgver}.tar.xz") -sha1sums=('085c23666adcf88585119cb6aea7efe5c58481d4') +optdepends=('jasper: jp2 module' + 'libpng: png module' + 'libwmf: wmf module' + 'libxml2: msl, svg, url modules' + 'libtiff: ps2, ps3, tiff modules' + 'ghostscript: pdf, ps modules') +makedepends=('perl' 'jasper' 'libpng' 'libwmf' 'libxml2' 'libtiff') +depends=('freetype2' 'libxext' 'libsm' 'lcms2' 'libltdl' 'bzip2' 'xz') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/GraphicsMagick-${pkgver}.tar.xz" + 'benign.patch') +sha1sums=('085c23666adcf88585119cb6aea7efe5c58481d4' + '04e16b9fe255e87cf16d4c61e313e8cdf7b2e24e') + +options=('!emptydirs' 'libtool') + +prepare() { + cd "${srcdir}/GraphicsMagick-${pkgver}" + patch -p1 -i ../benign.patch +} build() { cd "${srcdir}/GraphicsMagick-${pkgver}" ./configure \ --prefix=/usr \ - --with-perl \ --enable-shared \ - --disable-static \ + --with-modules \ + --with-perl \ --with-gs-font-dir=/usr/share/fonts/Type1 \ - + --with-quantum-depth=32 \ + --with-openmp \ + --with-threads make } diff --git a/extra/graphicsmagick/benign.patch b/extra/graphicsmagick/benign.patch new file mode 100644 index 000000000..f9fe6a642 --- /dev/null +++ b/extra/graphicsmagick/benign.patch @@ -0,0 +1,43 @@ +diff -Naur old/ChangeLog new/ChangeLog +--- old/ChangeLog 2013-03-09 13:19:31.000000000 -1000 ++++ new/ChangeLog 2013-11-22 06:33:59.189976814 -1000 +@@ -1,3 +1,10 @@ ++2013-10-16 Glenn Randers-Pehrson <glennrp@simple.dallas.tx.us> ++ ++ * Added calls to png_set_benign_errors() to allow benign errors ++ to be handled as warnings. In particular, GM builds with libpng-1.6.x ++ will not crash while copying a PNG with a "known incorrect ICC ++ profile". ++ + 2013-03-09 Bob Friesenhahn <bfriesen@simple.dallas.tx.us> + + * version.sh, www/index.rst: Prepare for 1.3.18 release. +diff -Naur old/coders/png.c new/coders/png.c +--- old/coders/png.c 2013-03-09 13:19:31.000000000 -1000 ++++ new/coders/png.c 2013-11-22 06:33:25.423156308 -1000 +@@ -1689,6 +1689,12 @@ + } + return(image); + } ++ ++#ifdef PNG_BENIGN_ERRORS_SUPPORTED ++ /* Allow benign errors */ ++ png_set_benign_errors(ping, 1); ++#endif ++ + /* + Prepare PNG for reading. + */ +@@ -6453,6 +6459,12 @@ + #endif + return(MagickFail); + } ++ ++#ifdef PNG_BENIGN_ERRORS_SUPPORTED ++ /* Allow benign errors */ ++ png_set_benign_errors(ping, 1); ++#endif ++ + /* + Prepare PNG for writing. + */ diff --git a/extra/graphite/PKGBUILD b/extra/graphite/PKGBUILD index f948f5b09..92ec2f872 100644 --- a/extra/graphite/PKGBUILD +++ b/extra/graphite/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198049 2013-10-30 12:29:30Z allan $ +# $Id: PKGBUILD 200651 2013-11-30 19:11:13Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgname=graphite -pkgver=1.2.3 +pkgver=1.2.4 pkgrel=1 epoch=1 arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ makedepends=('cmake' 'freetype2' 'python2') options=('!emptydirs') source=(http://downloads.sourceforge.net/project/silgraphite/graphite2/graphite2-${pkgver}.tgz graphite2-1.2.0-cmakepath.patch) -md5sums=('7042305e4208af4c2d5249d814ccce58' +md5sums=('2ef839348fe28e3b923bf8cced440227' '00353b67941dbc30b76a43253760769e') build() { diff --git a/extra/gsl/PKGBUILD b/extra/gsl/PKGBUILD index 617c996fd..edb884817 100644 --- a/extra/gsl/PKGBUILD +++ b/extra/gsl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 198053 2013-10-30 12:31:09Z allan $ +# $Id: PKGBUILD 202886 2013-12-28 22:44:06Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Juergen Hoetzel <juergen.archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=gsl -pkgver=1.15 -pkgrel=3 +pkgver=1.16 +pkgrel=1 pkgdesc="The GNU Scientific Library (GSL) is a modern numerical library for C and C++ programmers" url="http://www.gnu.org/software/gsl/gsl.html" source=("http://ftp.gnu.org/gnu/gsl/$pkgname-$pkgver.tar.gz") @@ -13,7 +13,7 @@ install=gsl.install license=('GPL') arch=('i686' 'x86_64' 'mips64el') depends=('glibc' 'bash') -sha1sums=('d914f84b39a5274b0a589d9b83a66f44cd17ca8e') +sha1sums=('210af9366485f149140973700d90dc93a4b6213e') build() { unset LDFLAGS diff --git a/extra/gst-libav/PKGBUILD b/extra/gst-libav/PKGBUILD index e3167fb81..61ba2f655 100644 --- a/extra/gst-libav/PKGBUILD +++ b/extra/gst-libav/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198055 2013-10-30 12:31:51Z allan $ +# $Id: PKGBUILD 199372 2013-11-11 17:53:04Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gst-libav -pkgver=1.2.0 +pkgver=1.2.1 pkgrel=1 pkgdesc="Gstreamer libav Plugin" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ makedepends=('yasm') options=(!emptydirs) provides=("gst-ffmpeg=$pkgver-$pkgrel") source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('48721eb318ffffdd134edea754d0b65d76b08c8209a8d2c8a42bca1f799f9099') +sha256sums=('fd152b7aec56ae76ad58b9759913a8bfe1792bdf64f260d0acaba75b75076676') build() { cd $pkgname-$pkgver diff --git a/extra/gst-plugins-base/PKGBUILD b/extra/gst-plugins-base/PKGBUILD index 0969a6a00..160761869 100644 --- a/extra/gst-plugins-base/PKGBUILD +++ b/extra/gst-plugins-base/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198057 2013-10-30 12:32:34Z allan $ +# $Id: PKGBUILD 199366 2013-11-11 17:42:32Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gst-plugins-base pkgname=('gst-plugins-base-libs' 'gst-plugins-base') -pkgver=1.2.0 +pkgver=1.2.1 pkgrel=1 pkgdesc="GStreamer Multimedia Framework Base Plugins" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ makedepends=('pkgconfig' 'gstreamer' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libv options=(!emptydirs) url="http://gstreamer.freedesktop.org/" source=(${url}/src/$pkgbase/$pkgbase-${pkgver}.tar.xz) -sha256sums=('8656e20bf4b675e5696fb4af193793351926d428ca02826c5667a6384729a45d') +sha256sums=('de2444a5c150d4e4b680364d7c0414cd8b015d95b305ff65d65a17683379532f') build() { cd $pkgbase-$pkgver diff --git a/extra/gst-plugins-good/PKGBUILD b/extra/gst-plugins-good/PKGBUILD index dcd044f02..988072d46 100644 --- a/extra/gst-plugins-good/PKGBUILD +++ b/extra/gst-plugins-good/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198058 2013-10-30 12:32:54Z allan $ +# $Id: PKGBUILD 199367 2013-11-11 17:42:49Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gst-plugins-good -pkgver=1.2.0 +pkgver=1.2.1 pkgrel=1 pkgdesc="GStreamer Multimedia Framework Good Plugins" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('libpulse' 'jack' 'libsoup' 'gst-plugins-base-libs' 'wavpack' 'aalib' ' makedepends=('gstreamer' 'speex' 'flac' 'libraw1394' 'python') options=(!emptydirs) source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('2256a6b2744ea18d8810642cf9061a2f12f4b7eba87d3fbc98004262b4f0fdfa') +sha256sums=('660fa02dbe01086fcf702d87acc0ba5dde2559d6a11ecf438874afe504c50517') build() { cd $pkgname-$pkgver diff --git a/extra/gst-plugins-ugly/PKGBUILD b/extra/gst-plugins-ugly/PKGBUILD index 87ea800c9..d24e638c0 100644 --- a/extra/gst-plugins-ugly/PKGBUILD +++ b/extra/gst-plugins-ugly/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 198059 2013-10-30 12:33:14Z allan $ +# $Id: PKGBUILD 199864 2013-11-17 12:53:56Z bpiotrowski $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gst-plugins-ugly -pkgver=1.2.0 -pkgrel=1 +pkgver=1.2.1 +pkgrel=2 pkgdesc="GStreamer Multimedia Framework Ugly Plugins" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') url="http://gstreamer.freedesktop.org/" depends=('gst-plugins-base-libs' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') +makedepends=('python') options=(!emptydirs) source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('e4760af4b12bf97ba0a8001cfe733d9d52160a0ad81f6c6f0d0d3a9e798626de') +sha256sums=('35ae5d45de54827604e24f57f54ab30a5ab2245b4c4120977273eb11d19c2395') build() { cd $pkgname-$pkgver diff --git a/extra/gstreamer-vaapi/PKGBUILD b/extra/gstreamer-vaapi/PKGBUILD index e6da373b9..4d2b02e42 100644 --- a/extra/gstreamer-vaapi/PKGBUILD +++ b/extra/gstreamer-vaapi/PKGBUILD @@ -1,54 +1,51 @@ -# $Id: PKGBUILD 198068 2013-10-30 12:36:23Z allan $ +# $Id: PKGBUILD 200351 2013-11-26 23:08:09Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgbase=gstreamer-vaapi pkgname=(gst-vaapi gstreamer0.10-vaapi) -pkgver=0.5.6 +pkgver=0.5.7 pkgrel=1 pkgdesc="GStreamer Multimedia Framework VA Plugins" arch=(i686 x86_64) license=(LGPL) url="http://www.freedesktop.org/software/vaapi/releases/gstreamer-vaapi/" -makedepends=(gst-plugins-base gst-plugins-bad gstreamer0.10-base-plugins gstreamer0.10-bad-plugins libva - libxrandr) +makedepends=(gst-plugins-base gst-plugins-bad gstreamer0.10-base-plugins gstreamer0.10-bad-plugins + libva libxrandr) options=(!emptydirs) +#source=(git://gitorious.org/vaapi/${pkgbase}.git#tag=$pkgver) source=($url/$pkgbase-${pkgver}.tar.bz2) -sha1sums=('884a47cc4916f441bec160235927556a79c7ea09') +sha1sums=('6baa794e5f95a22fbb5e0788ec29c8a78f40b5b3') prepare() { - cd $pkgbase-$pkgver - mkdir build-1.0 build-0.10 + mkdir build build-0.10 + #cd $pkgbase + #NO_CONFIGURE=1 ./autogen.sh } -build() { - cd $pkgbase-$pkgver/build-1.0 - ../configure --prefix=/usr --disable-static --with-gstreamer-api=1.0 +_build() ( + cd "$1"; shift + ../$pkgbase-$pkgver/configure --prefix=/usr --disable-static "$@" + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool make +) - cd ../build-0.10 - ../configure --prefix=/usr --disable-static --with-gstreamer-api=0.10 --disable-wayland - make +build() { + _build build + _build build-0.10 --with-gstreamer-api=0.10 --disable-wayland } check() { - cd $pkgbase-$pkgver/build-1.0 - make check - - cd ../build-0.10 - make check + make -C build -k check + make -C build-0.10 -k check } package_gst-vaapi() { depends=(gst-plugins-base gst-plugins-bad libva libxrandr) - - cd $pkgbase-$pkgver/build-1.0 - make DESTDIR="$pkgdir" install + make -C build DESTDIR="$pkgdir" install } package_gstreamer0.10-vaapi() { depends=(gstreamer0.10-base-plugins gstreamer0.10-bad-plugins libva libxrandr) - - cd $pkgbase-$pkgver/build-0.10 - make DESTDIR="$pkgdir" install + make -C build-0.10 DESTDIR="$pkgdir" install } diff --git a/extra/gstreamer/PKGBUILD b/extra/gstreamer/PKGBUILD index 47a882b6e..fdda4c0ec 100644 --- a/extra/gstreamer/PKGBUILD +++ b/extra/gstreamer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198060 2013-10-30 12:33:34Z allan $ +# $Id: PKGBUILD 199371 2013-11-11 17:52:47Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gstreamer -pkgver=1.2.0 +pkgver=1.2.1 pkgrel=1 pkgdesc="GStreamer Multimedia Framework" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('libxml2' 'glib2') optdepends=('sh: feedback script') makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection') source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz) -sha256sums=('94af5274299f845adf41cc504e0209b269acab7721293f49850fea27b4099463') +sha256sums=('a4523d2471bca6cd0059a32e3b042f50faa4dadc6439852af8b43ca3f17d1fc9') build() { cd "${srcdir}/gstreamer-${pkgver}" diff --git a/extra/gstreamer0.10-base/PKGBUILD b/extra/gstreamer0.10-base/PKGBUILD index bcc6a7b95..d61da1d98 100644 --- a/extra/gstreamer0.10-base/PKGBUILD +++ b/extra/gstreamer0.10-base/PKGBUILD @@ -1,46 +1,62 @@ -# $Id: PKGBUILD 198063 2013-10-30 12:34:39Z allan $ +# $Id: PKGBUILD 201390 2013-12-10 12:53:56Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=('gstreamer0.10-base') pkgname=('gstreamer0.10-base' 'gstreamer0.10-base-plugins') pkgver=0.10.36 -pkgrel=1.2 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') -makedepends=('pkgconfig' 'gstreamer0.10>=0.10.35' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'gobject-introspection') +makedepends=('pkgconfig' 'gstreamer0.10>=0.10.36' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'gobject-introspection' 'git' 'gtk-doc') options=(!emptydirs) url="http://gstreamer.freedesktop.org/" -source=(${url}/src/gst-plugins-base/gst-plugins-base-${pkgver}.tar.xz) -sha256sums=('1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a') +source=("git://anongit.freedesktop.org/gstreamer-sdk/gst-plugins-base#commit=48d5966f12d4e6b71c96db0600cf76ef0ef14b3a" + fix-crash-0-byte-ogg.patch + colorbalance-fix-abi.patch + revert-decodebin-playbin-removal.patch + videoscale-fix-negotiation.patch + ayuv64-lanczos.patch + gstaudio-symbols.patch) +sha256sums=('SKIP' + 'a6a01035ea9627737f9c17f72919857ed43ccc7c2cb08b645b43ed89f78d0f4f' + '7442c5c68068428b8c7ac1d3825ce29f1bb152b75b77047b9e806c7d322b780c' + 'ba20659fafea73db016ddaecd128f12087e0957ce35cf2c3ce29f72c51551ef3' + 'ae27f7be58997217f67898b37b138a485c203389e56b65e6b31c23f769ef39ca' + '3792dfe80c69f51c0db98533e8fb16707b5dd2ee6933ea6098583af873ceb44a' + '56e7a988df39d2ec4befa265536ad8c30d3c8d18d136cebef64e8d6baac1abae') -build() { - cd "${srcdir}/gst-plugins-base-${pkgver}" - sed -i -e '/AC_PATH_XTRA/d' -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \ - configure.ac - autoreconf +prepare() { + cd gst-plugins-base + sed -i -e '/AC_PATH_XTRA/d' -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac + patch -Np1 -i ../fix-crash-0-byte-ogg.patch + patch -Np1 -i ../colorbalance-fix-abi.patch + patch -Np1 -i ../ayuv64-lanczos.patch + patch -Np1 -i ../videoscale-fix-negotiation.patch + patch -Np1 -i ../gstaudio-symbols.patch + patch -Np1 -R -i ../revert-decodebin-playbin-removal.patch } build() { - cd "${srcdir}/gst-plugins-base-${pkgver}" + cd gst-plugins-base + NOCONFIGURE=1 ./autogen.sh ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --enable-experimental --disable-gnome_vfs \ + --disable-static --enable-experimental --disable-gnome_vfs --enable-gtk-doc \ --with-package-name="GStreamer Base Plugins (Parabola)" \ --with-package-origin="https://parabolagnulinux.org/" - make sed -e 's/^SUBDIRS_EXT =.*/SUBDIRS_EXT =/' -i Makefile } check() { - cd "${srcdir}/gst-plugins-base-${pkgver}" + cd gst-plugins-base make check } package_gstreamer0.10-base() { pkgdesc="GStreamer Multimedia Framework Base plugin libraries" - depends=('gstreamer0.10>=0.10.35' 'orc' 'libxv') + depends=('gstreamer0.10>=0.10.36' 'orc' 'libxv') - cd "${srcdir}/gst-plugins-base-${pkgver}" + cd gst-plugins-base make DESTDIR="${pkgdir}" install } @@ -51,7 +67,7 @@ package_gstreamer0.10-base-plugins() { conflicts=('gstreamer0.10-alsa' 'gstreamer0.10-theora' 'gstreamer0.10-libvisual' 'gstreamer0.10-pango' 'gstreamer0.10-cdparanoia' 'gstreamer0.10-vorbis' 'gstreamer0.10-ogg') groups=('gstreamer0.10-plugins') - cd "${srcdir}/gst-plugins-base-${pkgver}" + cd gst-plugins-base make -C gst-libs DESTDIR="${pkgdir}" install make -C ext DESTDIR="${pkgdir}" install make -C gst-libs DESTDIR="${pkgdir}" uninstall diff --git a/extra/gstreamer0.10-base/ayuv64-lanczos.patch b/extra/gstreamer0.10-base/ayuv64-lanczos.patch new file mode 100644 index 000000000..64106e465 --- /dev/null +++ b/extra/gstreamer0.10-base/ayuv64-lanczos.patch @@ -0,0 +1,236 @@ +From e4f01106d08f3c2a65897bfe919bd65ce55545a8 Mon Sep 17 00:00:00 2001 +From: David Schleef <ds@schleef.org> +Date: Wed, 25 Jan 2012 23:49:00 +0000 +Subject: videoscale: Add AYUV64 path to Lanczos + +--- +diff --git a/gst/videoscale/gstvideoscale.c b/gst/videoscale/gstvideoscale.c +index 7b44647..6df4ba6 100644 +--- a/gst/videoscale/gstvideoscale.c ++++ b/gst/videoscale/gstvideoscale.c +@@ -1199,6 +1199,11 @@ gst_video_scale_transform (GstBaseTransform * trans, GstBuffer * in, + case GST_VIDEO_SCALE_4TAP: + vs_image_scale_4tap_AYUV64 (&dest, &src, videoscale->tmp_buf); + break; ++ case GST_VIDEO_SCALE_LANCZOS: ++ vs_image_scale_lanczos_AYUV64 (&dest, &src, videoscale->tmp_buf, ++ videoscale->sharpness, videoscale->dither, videoscale->submethod, ++ videoscale->envelope, videoscale->sharpen); ++ break; + default: + goto unknown_mode; + } +diff --git a/gst/videoscale/vs_image.h b/gst/videoscale/vs_image.h +index 2312acc..7b34991 100644 +--- a/gst/videoscale/vs_image.h ++++ b/gst/videoscale/vs_image.h +@@ -52,6 +52,9 @@ void vs_image_scale_linear_RGBA (const VSImage *dest, const VSImage *src, + void vs_image_scale_lanczos_AYUV (const VSImage * dest, const VSImage * src, + uint8_t * tmpbuf, double sharpness, gboolean dither, int submethod, + double a, double sharpen); ++void vs_image_scale_lanczos_AYUV64 (const VSImage * dest, const VSImage * src, ++ uint8_t * tmpbuf, double sharpness, gboolean dither, int submethod, ++ double a, double sharpen); + + void vs_image_scale_nearest_RGB (const VSImage *dest, const VSImage *src, + uint8_t *tmpbuf); +diff --git a/gst/videoscale/vs_lanczos.c b/gst/videoscale/vs_lanczos.c +index 1c87ba3..d141a01 100644 +--- a/gst/videoscale/vs_lanczos.c ++++ b/gst/videoscale/vs_lanczos.c +@@ -204,6 +204,9 @@ static void vs_image_scale_lanczos_AYUV_float (const VSImage * dest, + static void vs_image_scale_lanczos_AYUV_double (const VSImage * dest, + const VSImage * src, uint8_t * tmpbuf, double sharpness, gboolean dither, + double a, double sharpen); ++static void vs_image_scale_lanczos_AYUV64_double (const VSImage * dest, ++ const VSImage * src, uint8_t * tmpbuf, double sharpness, gboolean dither, ++ double a, double sharpen); + + static double + sinc (double x) +@@ -590,6 +593,15 @@ vs_image_scale_lanczos_AYUV (const VSImage * dest, const VSImage * src, + } + } + ++void ++vs_image_scale_lanczos_AYUV64 (const VSImage * dest, const VSImage * src, ++ uint8_t * tmpbuf, double sharpness, gboolean dither, int submethod, ++ double a, double sharpen) ++{ ++ vs_image_scale_lanczos_AYUV64_double (dest, src, tmpbuf, sharpness, dither, ++ a, sharpen); ++} ++ + + + #define RESAMPLE_HORIZ_FLOAT(function, dest_type, tap_type, src_type, _n_taps) \ +@@ -813,9 +825,9 @@ RESAMPLE_VERT_DITHER (resample_vert_dither_int16_generic, gint16, gint16, + n_taps, shift) + /* *INDENT-ON* */ + +-#define RESAMPLE_VERT_FLOAT(function, tap_type, src_type, _n_taps, _shift) \ ++#define RESAMPLE_VERT_FLOAT(function, dest_type, clamp, tap_type, src_type, _n_taps, _shift) \ + static void \ +-function (guint8 *dest, \ ++function (dest_type *dest, \ + const tap_type *taps, const src_type *src, int stride, int n_taps, \ + int shift, int n) \ + { \ +@@ -828,13 +840,13 @@ function (guint8 *dest, \ + const src_type *line = PTR_OFFSET(src, stride * l); \ + sum_y += line[i] * taps[l]; \ + } \ +- dest[i] = CLAMP (floor(0.5 + sum_y), 0, 255); \ ++ dest[i] = CLAMP (floor(0.5 + sum_y), 0, clamp); \ + } \ + } + +-#define RESAMPLE_VERT_FLOAT_DITHER(function, tap_type, src_type, _n_taps, _shift) \ ++#define RESAMPLE_VERT_FLOAT_DITHER(function, dest_type, clamp, tap_type, src_type, _n_taps, _shift) \ + static void \ +-function (guint8 *dest, \ ++function (dest_type *dest, \ + const tap_type *taps, const src_type *src, int stride, int n_taps, \ + int shift, int n) \ + { \ +@@ -849,19 +861,24 @@ function (guint8 *dest, \ + sum_y += line[i] * taps[l]; \ + } \ + err_y += sum_y; \ +- dest[i] = CLAMP (floor (err_y), 0, 255); \ ++ dest[i] = CLAMP (floor (err_y), 0, clamp); \ + err_y -= floor (err_y); \ + } \ + } + + /* *INDENT-OFF* */ +-RESAMPLE_VERT_FLOAT (resample_vert_double_generic, double, double, n_taps, ++RESAMPLE_VERT_FLOAT (resample_vert_double_generic, guint8, 255, double, double, n_taps, + shift) +-RESAMPLE_VERT_FLOAT_DITHER (resample_vert_dither_double_generic, double, double, ++RESAMPLE_VERT_FLOAT_DITHER (resample_vert_dither_double_generic, guint8, 255, double, double, + n_taps, shift) + +-RESAMPLE_VERT_FLOAT (resample_vert_float_generic, float, float, n_taps, shift) +-RESAMPLE_VERT_FLOAT_DITHER (resample_vert_dither_float_generic, float, float, ++RESAMPLE_VERT_FLOAT (resample_vert_double_generic_u16, guint16, 65535, double, double, n_taps, ++ shift) ++RESAMPLE_VERT_FLOAT_DITHER (resample_vert_dither_double_generic_u16, guint16, 65535, double, double, ++ n_taps, shift) ++ ++RESAMPLE_VERT_FLOAT (resample_vert_float_generic, guint8, 255, float, float, n_taps, shift) ++RESAMPLE_VERT_FLOAT_DITHER (resample_vert_dither_float_generic, guint8, 255, float, float, + n_taps, shift) + /* *INDENT-ON* */ + +@@ -1556,3 +1573,77 @@ vs_image_scale_lanczos_AYUV_float (const VSImage * dest, const VSImage * src, + scale1d_cleanup (&scale->y_scale1d); + g_free (scale->tmpdata); + } ++ ++static void ++vs_scale_lanczos_AYUV64_double (Scale * scale) ++{ ++ int j; ++ int yi; ++ int tmp_yi; ++ ++ tmp_yi = 0; ++ ++ for (j = 0; j < scale->dest->height; j++) { ++ guint16 *destline; ++ double *taps; ++ ++ destline = (guint16 *) (scale->dest->pixels + scale->dest->stride * j); ++ ++ yi = scale->y_scale1d.offsets[j]; ++ ++ while (tmp_yi < yi + scale->y_scale1d.n_taps) { ++ scale->horiz_resample_func (TMP_LINE_DOUBLE_AYUV (tmp_yi), ++ scale->x_scale1d.offsets, scale->x_scale1d.taps, SRC_LINE (tmp_yi), ++ scale->x_scale1d.n_taps, 0, scale->dest->width); ++ tmp_yi++; ++ } ++ ++ taps = (double *) scale->y_scale1d.taps + j * scale->y_scale1d.n_taps; ++ if (scale->dither) { ++ resample_vert_dither_double_generic_u16 (destline, ++ taps, TMP_LINE_DOUBLE_AYUV (scale->y_scale1d.offsets[j]), ++ sizeof (double) * 4 * scale->dest->width, ++ scale->y_scale1d.n_taps, 0, scale->dest->width * 4); ++ } else { ++ resample_vert_double_generic_u16 (destline, ++ taps, TMP_LINE_DOUBLE_AYUV (scale->y_scale1d.offsets[j]), ++ sizeof (double) * 4 * scale->dest->width, ++ scale->y_scale1d.n_taps, 0, scale->dest->width * 4); ++ } ++ } ++} ++ ++void ++vs_image_scale_lanczos_AYUV64_double (const VSImage * dest, const VSImage * src, ++ uint8_t * tmpbuf, double sharpness, gboolean dither, double a, ++ double sharpen) ++{ ++ Scale s = { 0 }; ++ Scale *scale = &s; ++ int n_taps; ++ ++ scale->dest = dest; ++ scale->src = src; ++ ++ n_taps = scale1d_get_n_taps (src->width, dest->width, a, sharpness); ++ scale1d_calculate_taps (&scale->x_scale1d, ++ src->width, dest->width, n_taps, a, sharpness, sharpen); ++ ++ n_taps = scale1d_get_n_taps (src->height, dest->height, a, sharpness); ++ scale1d_calculate_taps (&scale->y_scale1d, ++ src->height, dest->height, n_taps, a, sharpness, sharpen); ++ ++ scale->dither = dither; ++ ++ scale->horiz_resample_func = ++ (HorizResampleFunc) resample_horiz_double_ayuv_generic; ++ ++ scale->tmpdata = ++ g_malloc (sizeof (double) * scale->dest->width * scale->src->height * 4); ++ ++ vs_scale_lanczos_AYUV64_double (scale); ++ ++ scale1d_cleanup (&scale->x_scale1d); ++ scale1d_cleanup (&scale->y_scale1d); ++ g_free (scale->tmpdata); ++} +-- +cgit v0.9.0.2-2-gbebe +From f8dc679ca7e9542e6f410062df5e332fc8e0ba9d Mon Sep 17 00:00:00 2001 +From: David Schleef <ds@schleef.org> +Date: Sun, 19 Feb 2012 08:03:03 +0000 +Subject: videoscale: fix AYUV64 scaling + +--- +diff --git a/gst/videoscale/vs_lanczos.c b/gst/videoscale/vs_lanczos.c +index d141a01..67cd401 100644 +--- a/gst/videoscale/vs_lanczos.c ++++ b/gst/videoscale/vs_lanczos.c +@@ -728,6 +728,9 @@ RESAMPLE_HORIZ_AYUV_FLOAT (resample_horiz_double_ayuv_generic, double, double, + RESAMPLE_HORIZ_AYUV_FLOAT (resample_horiz_float_ayuv_generic, float, float, + guint8, n_taps) + ++RESAMPLE_HORIZ_AYUV_FLOAT (resample_horiz_double_ayuv_generic_s16, double, double, ++ guint16, n_taps) ++ + RESAMPLE_HORIZ (resample_horiz_int32_int32_u8_generic, gint32, gint32, + guint8, n_taps, shift) + RESAMPLE_HORIZ (resample_horiz_int16_int16_u8_generic, gint16, gint16, +@@ -1636,7 +1639,7 @@ vs_image_scale_lanczos_AYUV64_double (const VSImage * dest, const VSImage * src, + scale->dither = dither; + + scale->horiz_resample_func = +- (HorizResampleFunc) resample_horiz_double_ayuv_generic; ++ (HorizResampleFunc) resample_horiz_double_ayuv_generic_s16; + + scale->tmpdata = + g_malloc (sizeof (double) * scale->dest->width * scale->src->height * 4); +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/gstreamer0.10-base/colorbalance-fix-abi.patch b/extra/gstreamer0.10-base/colorbalance-fix-abi.patch new file mode 100644 index 000000000..1e7b8f2c1 --- /dev/null +++ b/extra/gstreamer0.10-base/colorbalance-fix-abi.patch @@ -0,0 +1,23 @@ +From 0cb4ccb1f09d39820682e052fc106f5fd7fa1309 Mon Sep 17 00:00:00 2001 +From: Stefan Sauer <ensonic@users.sf.net> +Date: Fri, 24 Feb 2012 20:37:00 +0000 +Subject: interfaces: fix ABI class padding after the recent changes + +--- +(limited to 'gst-libs/gst/interfaces/colorbalance.h') + +diff --git a/gst-libs/gst/interfaces/colorbalance.h b/gst-libs/gst/interfaces/colorbalance.h +index fd8ceaa..9f0a1cd 100644 +--- a/gst-libs/gst/interfaces/colorbalance.h ++++ b/gst-libs/gst/interfaces/colorbalance.h +@@ -102,7 +102,7 @@ struct _GstColorBalanceClass { + GstColorBalanceType (*get_balance_type) (GstColorBalance *balance); + + /*< private >*/ +- gpointer _gst_reserved[GST_PADDING]; ++ gpointer _gst_reserved[GST_PADDING-1]; + }; + + GType gst_color_balance_get_type (void); +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/gstreamer0.10-base/fix-crash-0-byte-ogg.patch b/extra/gstreamer0.10-base/fix-crash-0-byte-ogg.patch new file mode 100644 index 000000000..2c03e820b --- /dev/null +++ b/extra/gstreamer0.10-base/fix-crash-0-byte-ogg.patch @@ -0,0 +1,22 @@ +From 7f22e3ea7f713867e1fbf2ef71b6a6e36e1f0531 Mon Sep 17 00:00:00 2001 +From: Jonathan Liu <net147@gmail.com> +Date: Sun, 28 Oct 2012 10:07:16 +0000 +Subject: oggstream: fix crash with 0 byte ogg packets + +https://bugzilla.gnome.org/show_bug.cgi?id=687030 +--- +diff --git a/ext/ogg/gstoggstream.c b/ext/ogg/gstoggstream.c +index c79f088..fe28f2e 100644 +--- a/ext/ogg/gstoggstream.c ++++ b/ext/ogg/gstoggstream.c +@@ -790,7 +790,7 @@ setup_vorbis_mapper (GstOggStream * pad, ogg_packet * packet) + static gboolean + is_header_vorbis (GstOggStream * pad, ogg_packet * packet) + { +- if (packet->bytes > 0 && (packet->packet[0] & 0x01) == 0) ++ if (packet->bytes == 0 || (packet->packet[0] & 0x01) == 0) + return FALSE; + + if (packet->packet[0] == 5) { +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/gstreamer0.10-base/gstaudio-symbols.patch b/extra/gstreamer0.10-base/gstaudio-symbols.patch new file mode 100644 index 000000000..7e2ad0f47 --- /dev/null +++ b/extra/gstreamer0.10-base/gstaudio-symbols.patch @@ -0,0 +1,10 @@ +--- gst-plugins-base/win32/common/libgstaudio.def.orig 2013-12-10 12:09:41.280012610 +0000 ++++ gst-plugins-base/win32/common/libgstaudio.def 2013-12-10 12:10:12.253127720 +0000 +@@ -24,6 +24,7 @@ + gst_audio_decoder_get_plc_aware + gst_audio_decoder_get_tolerance + gst_audio_decoder_get_type ++ gst_audio_decoder_merge_tags + gst_audio_decoder_set_byte_time + gst_audio_decoder_set_drainable + gst_audio_decoder_set_latency diff --git a/extra/gstreamer0.10-base/revert-decodebin-playbin-removal.patch b/extra/gstreamer0.10-base/revert-decodebin-playbin-removal.patch new file mode 100644 index 000000000..2e5913930 --- /dev/null +++ b/extra/gstreamer0.10-base/revert-decodebin-playbin-removal.patch @@ -0,0 +1,122 @@ +From fece626254e3b250e4514d1c92ac8289421d9511 Mon Sep 17 00:00:00 2001 +From: Sebastian Dröge <sebastian.droege@collabora.co.uk> +Date: Thu, 15 Mar 2012 11:34:22 +0000 +Subject: Disable old playbin and decodebin + +--- +diff --git a/gst/playback/Makefile.am b/gst/playback/Makefile.am +index a0f1abc..700f581 100644 +--- a/gst/playback/Makefile.am ++++ b/gst/playback/Makefile.am +@@ -6,19 +6,15 @@ glib_gen_basename = gstplay + built_sources = gstplay-marshal.c + built_headers = gstplay-marshal.h + +-plugin_LTLIBRARIES = libgstplaybin.la libgstdecodebin.la libgstdecodebin2.la ++plugin_LTLIBRARIES = libgstplaybin.la libgstdecodebin2.la + + csp_cflags = -DCOLORSPACE=\"ffmpegcolorspace\" + + libgstplaybin_la_SOURCES = \ + gstplayback.c \ +- gstplaybin.c \ + gstplaybin2.c \ + gstplaysink.c \ +- gstplaybasebin.c \ + gstplay-enum.c \ +- gststreaminfo.c \ +- gststreamselector.c \ + gstsubtitleoverlay.c \ + gstplaysinkvideoconvert.c \ + gstplaysinkaudioconvert.c \ +@@ -37,17 +33,6 @@ if !GST_PLUGIN_BUILD_STATIC + libgstplaybin_la_LIBTOOLFLAGS = --tag=disable-static + endif + +-libgstdecodebin_la_SOURCES = gstdecodebin.c +-nodist_libgstdecodebin_la_SOURCES = $(built_sources) +-libgstdecodebin_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(csp_cflags) +-libgstdecodebin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +-libgstdecodebin_la_LIBADD = \ +- $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_MAJORMINOR@.la \ +- $(GST_LIBS) +-if !GST_PLUGIN_BUILD_STATIC +-libgstdecodebin_la_LIBTOOLFLAGS = --tag=disable-static +-endif +- + libgstdecodebin2_la_SOURCES = gstdecodebin2.c gsturidecodebin.c gstplay-enum.c + nodist_libgstdecodebin2_la_SOURCES = $(built_sources) + libgstdecodebin2_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(csp_cflags) +@@ -61,11 +46,8 @@ endif + + noinst_HEADERS = \ + gstplayback.h \ +- gstplaybasebin.h \ + gstplaysink.h \ +- gststreaminfo.h \ + gstplay-enum.h \ +- gststreamselector.h \ + gstrawcaps.h \ + gstsubtitleoverlay.h \ + gstplaysinkvideoconvert.h \ +@@ -83,18 +65,6 @@ include $(top_srcdir)/common/gst-glib-gen.mak + + Android.mk: Makefile.am $(BUILT_SOURCES) + androgenizer \ +- -:PROJECT libgstdecodebin -:SHARED libgstdecodebin \ +- -:TAGS eng debug \ +- -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ +- -:SOURCES $(libgstdecodebin_la_SOURCES) \ +- $(nodist_libgstdecodebin_la_SOURCES) \ +- -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstdecodebin_la_CFLAGS) $(csp_cflags) \ +- -:LDFLAGS $(libgstdecodebin_la_LDFLAGS) \ +- $(libgstdecodebin_la_LIBADD) \ +- -ldl \ +- -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ +- LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ +- \ + -:PROJECT libgstdecodebin2 -:SHARED libgstdecodebin2 \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ +diff --git a/gst/playback/gstplayback.c b/gst/playback/gstplayback.c +index 5b74786..f99df6e 100644 +--- a/gst/playback/gstplayback.c ++++ b/gst/playback/gstplayback.c +@@ -29,8 +29,6 @@ + + #include "gstplayback.h" + #include "gstplaysink.h" +-#include "gststreamselector.h" +-#include "gststreaminfo.h" + #include "gstsubtitleoverlay.h" + + static gboolean +@@ -47,13 +45,7 @@ plugin_init (GstPlugin * plugin) + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + #endif /* ENABLE_NLS */ + +- /* ref class from a thread-safe context to work around missing bit of +- * thread-safety in GObject */ +- g_type_class_ref (GST_TYPE_STREAM_INFO); +- g_type_class_ref (GST_TYPE_STREAM_SELECTOR); +- +- res = gst_play_bin_plugin_init (plugin); +- res &= gst_play_bin2_plugin_init (plugin); ++ res = gst_play_bin2_plugin_init (plugin); + res &= gst_play_sink_plugin_init (plugin); + res &= gst_subtitle_overlay_plugin_init (plugin); + +diff --git a/gst/playback/gstplayback.h b/gst/playback/gstplayback.h +index 4be121c..5981cdd 100644 +--- a/gst/playback/gstplayback.h ++++ b/gst/playback/gstplayback.h +@@ -24,7 +24,6 @@ + #include <gst/gst.h> + + gboolean gst_decode_bin_plugin_init (GstPlugin * plugin); +-gboolean gst_play_bin_plugin_init (GstPlugin * plugin); + gboolean gst_play_bin2_plugin_init (GstPlugin * plugin); + + +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/gstreamer0.10-base/videoscale-fix-negotiation.patch b/extra/gstreamer0.10-base/videoscale-fix-negotiation.patch new file mode 100644 index 000000000..6e34d41c5 --- /dev/null +++ b/extra/gstreamer0.10-base/videoscale-fix-negotiation.patch @@ -0,0 +1,171 @@ +From 63d1316c0fd4ce22cf4a53f4aa7cb1ca16a07aa8 Mon Sep 17 00:00:00 2001 +From: Tim-Philipp Müller <tim.muller@collabora.co.uk> +Date: Sun, 26 Feb 2012 18:19:57 +0000 +Subject: videoscale: fix negotiation after addition of new formats and methods + +Now that we no longer support all methods for all formats, we +need to cater for that in the transform function: we can't +transform formats not supported by the currently-selected +mehod. + +make check, folks. It's da bomb. +--- +diff --git a/gst/videoscale/gstvideoscale.c b/gst/videoscale/gstvideoscale.c +index 9f072a3..60dd5ff 100644 +--- a/gst/videoscale/gstvideoscale.c ++++ b/gst/videoscale/gstvideoscale.c +@@ -424,10 +424,118 @@ gst_video_scale_get_property (GObject * object, guint prop_id, GValue * value, + } + } + ++#define NEAREST (1 << GST_VIDEO_SCALE_NEAREST) ++#define BILINEAR (1 << GST_VIDEO_SCALE_BILINEAR) ++#define FOURTAP (1 << GST_VIDEO_SCALE_4TAP) ++#define LANCZOS (1 << GST_VIDEO_SCALE_LANCZOS) ++ ++/* or we could just do lookups via table[format] if we could be bothered.. */ ++static const struct ++{ ++ GstVideoFormat format; ++ guint8 methods; ++} formats_methods_table[] = { ++ { ++ GST_VIDEO_FORMAT_RGBx, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_xRGB, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_BGRx, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_xBGR, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_RGBA, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_ARGB, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_BGRA, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_ABGR, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_AYUV, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_ARGB64, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_AYUV64, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_RGB, NEAREST | BILINEAR | FOURTAP}, { ++ GST_VIDEO_FORMAT_BGR, NEAREST | BILINEAR | FOURTAP}, { ++ GST_VIDEO_FORMAT_v308, NEAREST | BILINEAR | FOURTAP}, { ++ GST_VIDEO_FORMAT_YUY2, NEAREST | BILINEAR | FOURTAP}, { ++ GST_VIDEO_FORMAT_YVYU, NEAREST | BILINEAR | FOURTAP}, { ++ GST_VIDEO_FORMAT_UYVY, NEAREST | BILINEAR | FOURTAP}, { ++ GST_VIDEO_FORMAT_Y800, NEAREST | BILINEAR | FOURTAP}, { ++ GST_VIDEO_FORMAT_GRAY8, NEAREST | BILINEAR | FOURTAP}, { ++ GST_VIDEO_FORMAT_GRAY16_LE, NEAREST | BILINEAR | FOURTAP}, { ++ GST_VIDEO_FORMAT_GRAY16_BE, NEAREST | BILINEAR | FOURTAP}, { ++ GST_VIDEO_FORMAT_Y16, NEAREST | BILINEAR | FOURTAP}, { ++ GST_VIDEO_FORMAT_I420, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_YV12, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_Y444, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_Y42B, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_Y41B, NEAREST | BILINEAR | FOURTAP | LANCZOS}, { ++ GST_VIDEO_FORMAT_NV12, NEAREST | BILINEAR}, { ++ GST_VIDEO_FORMAT_RGB16, NEAREST | BILINEAR | FOURTAP}, { ++ GST_VIDEO_FORMAT_RGB15, NEAREST | BILINEAR | FOURTAP} ++}; ++ ++static gboolean ++gst_video_scale_format_supported_for_method (GstVideoFormat format, ++ GstVideoScaleMethod method) ++{ ++ int i; ++ ++ for (i = 0; i < G_N_ELEMENTS (formats_methods_table); ++i) { ++ if (formats_methods_table[i].format == format) ++ return ((formats_methods_table[i].methods & (1 << method)) != 0); ++ } ++ return FALSE; ++} ++ ++static gboolean ++gst_video_scale_transform_supported (GstVideoScale * videoscale, ++ GstVideoScaleMethod method, GstStructure * structure) ++{ ++ const GValue *val; ++ GstVideoFormat fmt; ++ gboolean supported = TRUE; ++ GstStructure *s; ++ GstCaps *c; ++ ++ /* we support these methods for all formats */ ++ if (method == GST_VIDEO_SCALE_NEAREST || method == GST_VIDEO_SCALE_BILINEAR) ++ return TRUE; ++ ++ /* we need fixed caps if we want to use gst_video_parse_caps() */ ++ s = gst_structure_new (gst_structure_get_name (structure), ++ "width", G_TYPE_INT, 1, "height", G_TYPE_INT, 1, NULL); ++ ++ if ((val = gst_structure_get_value (structure, "format"))) { ++ gst_structure_set_value (s, "format", val); ++ } else { ++ if ((val = gst_structure_get_value (structure, "endianness"))) ++ gst_structure_set_value (s, "endianness", val); ++ if ((val = gst_structure_get_value (structure, "red_mask"))) ++ gst_structure_set_value (s, "red_mask", val); ++ if ((val = gst_structure_get_value (structure, "blue_mask"))) ++ gst_structure_set_value (s, "blue_mask", val); ++ if ((val = gst_structure_get_value (structure, "green_mask"))) ++ gst_structure_set_value (s, "green_mask", val); ++ if ((val = gst_structure_get_value (structure, "alpha_mask"))) ++ gst_structure_set_value (s, "alpha_mask", val); ++ if ((val = gst_structure_get_value (structure, "depth"))) ++ gst_structure_set_value (s, "depth", val); ++ if ((val = gst_structure_get_value (structure, "bpp"))) ++ gst_structure_set_value (s, "bpp", val); ++ } ++ c = gst_caps_new_full (s, NULL); ++ if (!gst_video_format_parse_caps (c, &fmt, NULL, NULL)) { ++ GST_ERROR_OBJECT (videoscale, "couldn't parse %" GST_PTR_FORMAT, c); ++ } else if (!gst_video_scale_format_supported_for_method (fmt, method)) { ++ supported = FALSE; ++ } ++ GST_LOG_OBJECT (videoscale, "method %d %ssupported for format %d", ++ method, (supported) ? "" : "not ", fmt); ++ gst_caps_unref (c); ++ ++ return supported; ++} ++ + static GstCaps * + gst_video_scale_transform_caps (GstBaseTransform * trans, + GstPadDirection direction, GstCaps * caps) + { ++ GstVideoScale *videoscale = GST_VIDEO_SCALE (trans); ++ GstVideoScaleMethod method; + GstCaps *ret; + GstStructure *structure; + +@@ -441,6 +549,13 @@ gst_video_scale_transform_caps (GstBaseTransform * trans, + ret = gst_caps_copy (caps); + structure = gst_structure_copy (gst_caps_get_structure (ret, 0)); + ++ GST_OBJECT_LOCK (videoscale); ++ method = videoscale->method; ++ GST_OBJECT_UNLOCK (videoscale); ++ ++ if (!gst_video_scale_transform_supported (videoscale, method, structure)) ++ goto format_not_supported; ++ + gst_structure_set (structure, + "width", GST_TYPE_INT_RANGE, 1, G_MAXINT, + "height", GST_TYPE_INT_RANGE, 1, G_MAXINT, NULL); +@@ -452,9 +567,19 @@ gst_video_scale_transform_caps (GstBaseTransform * trans, + } + gst_caps_append_structure (ret, structure); + ++done: ++ + GST_DEBUG_OBJECT (trans, "returning caps: %" GST_PTR_FORMAT, ret); + + return ret; ++ ++format_not_supported: ++ { ++ gst_structure_free (structure); ++ gst_caps_unref (ret); ++ ret = gst_caps_new_empty (); ++ goto done; ++ } + } + + static gboolean +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/gstreamer0.10-ffmpeg/PKGBUILD b/extra/gstreamer0.10-ffmpeg/PKGBUILD index fa183d3dc..0f3da5702 100644 --- a/extra/gstreamer0.10-ffmpeg/PKGBUILD +++ b/extra/gstreamer0.10-ffmpeg/PKGBUILD @@ -1,29 +1,32 @@ -# $Id: PKGBUILD 198064 2013-10-30 12:34:59Z allan $ +# $Id: PKGBUILD 201497 2013-12-12 23:22:05Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gstreamer0.10-ffmpeg pkgver=0.10.13 -pkgrel=1.1 +pkgrel=2 pkgdesc="Gstreamer FFMpeg Plugin" arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('gstreamer0.10-base' 'bzip2') -makedepends=('pkgconfig' 'yasm' 'sdl') +makedepends=('pkgconfig' 'yasm' 'sdl' 'git' 'gtk-doc') url="http://www.gstreamer.net" groups=('gstreamer0.10-plugins') -source=(http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-${pkgver}.tar.bz2) -sha256sums=('76fca05b08e00134e3cb92fa347507f42cbd48ddb08ed3343a912def187fbb62') +source=("git://anongit.freedesktop.org/gstreamer-sdk/gst-ffmpeg#commit=94e587b9182c6d2fde9a61c9def790c8047453c0") +sha256sums=('SKIP') build() { - cd "${srcdir}/gst-ffmpeg-${pkgver}" - unset CFLAGS - unset CXXFLAGS - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static --with-ffmpeg-extra-configure="--enable-runtime-cpudetect" + cd gst-ffmpeg + NOCONFIGURE=1 ./autogen.sh + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static --enable-gtk-doc --with-ffmpeg-extra-configure="--enable-runtime-cpudetect" make } -package() { - cd "${srcdir}/gst-ffmpeg-${pkgver}" +check() { + cd gst-ffmpeg + make check +} +package() { + cd gst-ffmpeg make DESTDIR="${pkgdir}" install } diff --git a/extra/gstreamer0.10-good/PKGBUILD b/extra/gstreamer0.10-good/PKGBUILD index 4831eb827..4721a06b2 100644 --- a/extra/gstreamer0.10-good/PKGBUILD +++ b/extra/gstreamer0.10-good/PKGBUILD @@ -1,36 +1,36 @@ -# $Id: PKGBUILD 198065 2013-10-30 12:35:19Z allan $ +# $Id: PKGBUILD 201392 2013-12-10 15:08:37Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gstreamer0.10-good pkgname=('gstreamer0.10-good' 'gstreamer0.10-good-plugins') pkgver=0.10.31 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') -makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack' 'udev' 'gtk-doc') +makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack' 'gtk-doc' 'git' 'cairo') url="http://gstreamer.freedesktop.org/" options=(!emptydirs) -source=(${url}/src/gst-plugins-good/gst-plugins-good-${pkgver}.tar.xz - linux-3.6.patch) -sha256sums=('77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64' - 'd14a9ebfdbff69a3dd27057d764ad0c68f62aa6ae9f20bb62a0d09b29c0c2cfe') +source=("git://anongit.freedesktop.org/gstreamer-sdk/gst-plugins-good#commit=e28fd8886f05bb51c147f871f3a1db2fc2b735a9" + test-rtp-payloading.patch) +sha256sums=('SKIP' + 'c2f7f07f9bf5ca3afddc81d0a44665d2d54b1e9aea0ef1b25d219cf34bf7bb29') prepare() { - cd "${srcdir}/gst-plugins-good-${pkgver}" - # https://bugzilla.gnome.org/show_bug.cgi?id=681491 - patch -Np1 -i "${srcdir}/linux-3.6.patch" + cd gst-plugins-good sed -i '/AC_PATH_XTRA/d' configure.ac sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac - ./autogen.sh + patch -Np1 -i ../test-rtp-payloading.patch } build() { - cd "${srcdir}/gst-plugins-good-${pkgver}" + cd gst-plugins-good + NOCONFIGURE=1 ./autogen.sh ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --enable-experimental \ --disable-schemas-install \ --disable-hal \ --disable-esd \ + --enable-gtk-doc \ --with-package-name="GStreamer Good Plugins (Parabola)" \ --with-package-origin="https://parabolagnulinux.org/" @@ -39,7 +39,7 @@ build() { } check() { - cd "${srcdir}/gst-plugins-good-${pkgver}" + cd gst-plugins-good make check } @@ -47,20 +47,20 @@ package_gstreamer0.10-good() { depends=('gstreamer0.10-base>=0.10.34' 'bzip2') pkgdesc="GStreamer Multimedia Framework Good plugin libraries" - cd "${srcdir}/gst-plugins-good-${pkgver}" + cd gst-plugins-good make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install rm -rf "${pkgdir}/etc/gconf" } package_gstreamer0.10-good-plugins() { - depends=("gstreamer0.10-good=${pkgver}" 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'libpng' 'libjpeg' 'jack' 'libpulse' 'udev') + depends=("gstreamer0.10-good=${pkgver}" 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'libpng' 'libjpeg' 'jack' 'libpulse' 'cairo' 'gdk-pixbuf2') pkgdesc="GStreamer Multimedia Framework Good Plugins (gst-plugins-good)" groups=('gstreamer0.10-plugins') replaces=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-soup' 'gstreamer0.10-pulse') conflicts=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-bad-plugins<0.10.7' 'gstreamer0.10-soup' 'gstreamer0.10-pulse') install=gstreamer0.10-good-plugins.install - cd "${srcdir}/gst-plugins-good-${pkgver}" + cd gst-plugins-good make -C sys DESTDIR="${pkgdir}" install make -C ext GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/gconf/schemas" diff --git a/extra/gstreamer0.10-good/linux-3.6.patch b/extra/gstreamer0.10-good/linux-3.6.patch deleted file mode 100644 index aad179198..000000000 --- a/extra/gstreamer0.10-good/linux-3.6.patch +++ /dev/null @@ -1,31 +0,0 @@ -From bfb1ac952b4c3caaba0297bbe7dc73ea92f9b292 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen <mclasen@redhat.com> -Date: Thu, 09 Aug 2012 07:35:23 +0000 -Subject: v4l2: fix build with recent kernels, the v4l2_buffer input field was removed - -This was unused apparently and removed in the kernel in commit: - - From 2b719d7baf490e24ce7d817c6337b7c87fda84c1 Mon Sep 17 00:00:00 2001 - From: Sakari Ailus <sakari.ailus@iki.fi> - Date: Wed, 2 May 2012 09:40:03 -0300 - Subject: [PATCH] [media] v4l: drop v4l2_buffer.input and V4L2_BUF_FLAG_INPUT - - Remove input field in struct v4l2_buffer and flag V4L2_BUF_FLAG_INPUT which - tells the former is valid. The flag is used by no driver currently. - -https://bugzilla.gnome.org/show_bug.cgi?id=681491 ---- -diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c -index 2e3a563..5aaed5a 100644 ---- a/sys/v4l2/gstv4l2bufferpool.c -+++ b/sys/v4l2/gstv4l2bufferpool.c -@@ -182,7 +182,6 @@ gst_v4l2_buffer_new (GstV4l2BufferPool * pool, guint index, GstCaps * caps) - GST_LOG_OBJECT (pool->v4l2elem, " MMAP offset: %u", - ret->vbuffer.m.offset); - GST_LOG_OBJECT (pool->v4l2elem, " length: %u", ret->vbuffer.length); -- GST_LOG_OBJECT (pool->v4l2elem, " input: %u", ret->vbuffer.input); - - ret->mmap_length = ret->vbuffer.length; - data = (guint8 *) v4l2_mmap (0, ret->vbuffer.length, --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/gstreamer0.10-good/test-rtp-payloading.patch b/extra/gstreamer0.10-good/test-rtp-payloading.patch new file mode 100644 index 000000000..e8a943136 --- /dev/null +++ b/extra/gstreamer0.10-good/test-rtp-payloading.patch @@ -0,0 +1,422 @@ +From dca42d4767adff3578e5d5990604766735ec1f9b Mon Sep 17 00:00:00 2001 +From: Tim-Philipp Müller <tim.muller@collabora.co.uk> +Date: Fri, 10 Feb 2012 13:44:43 +0000 +Subject: tests: clean up rtp-payloading test a little + +Feed data into the pipeline using appsrc instead of fdsrc and +a pipe. Store unsigned byte values in guint8 instead of char. +Getting rid of the capsfilter also helps to avoid 'format is +not fully specified' warnings when pushing "video/x-h264" data +into rtph264pay with fully specified h264 caps in the sink template. +--- +diff --git a/tests/check/elements/rtp-payloading.c b/tests/check/elements/rtp-payloading.c +index b2160f4..7b4985b 100644 +--- a/tests/check/elements/rtp-payloading.c ++++ b/tests/check/elements/rtp-payloading.c +@@ -31,13 +31,11 @@ + typedef struct + { + GstElement *pipeline; +- GstElement *fdsrc; +- GstElement *capsfilter; ++ GstElement *appsrc; + GstElement *rtppay; + GstElement *rtpdepay; + GstElement *fakesink; +- int fd[2]; +- const char *frame_data; ++ const guint8 *frame_data; + int frame_data_size; + int frame_count; + } rtp_pipeline; +@@ -140,13 +138,11 @@ rtp_bus_callback (GstBus * bus, GstMessage * message, gpointer data) + * The user must free the RTP pipeline when it's not used anymore. + */ + static rtp_pipeline * +-rtp_pipeline_create (const char *frame_data, int frame_data_size, ++rtp_pipeline_create (const guint8 * frame_data, int frame_data_size, + int frame_count, const char *filtercaps, const char *pay, const char *depay) + { + gchar *pipeline_name; +- + rtp_pipeline *p; +- + GstCaps *caps; + + /* Check parameters. */ +@@ -165,60 +161,39 @@ rtp_pipeline_create (const char *frame_data, int frame_data_size, + pipeline_name = g_strdup_printf ("%s-%s-pipeline", pay, depay); + p->pipeline = gst_pipeline_new (pipeline_name); + g_free (pipeline_name); +- p->fdsrc = gst_element_factory_make ("fdsrc", NULL); +- p->capsfilter = gst_element_factory_make ("capsfilter", NULL); ++ p->appsrc = gst_element_factory_make ("appsrc", NULL); + p->rtppay = gst_element_factory_make (pay, NULL); + p->rtpdepay = gst_element_factory_make (depay, NULL); + p->fakesink = gst_element_factory_make ("fakesink", NULL); + + /* One or more elements are not created successfully or failed to create p? */ +- if (!p->pipeline || !p->fdsrc || !p->capsfilter || !p->rtppay || !p->rtpdepay +- || !p->fakesink || pipe (p->fd) == -1) { ++ if (!p->pipeline || !p->appsrc || !p->rtppay || !p->rtpdepay || !p->fakesink) { + /* Release created elements. */ + RELEASE_ELEMENT (p->pipeline); +- RELEASE_ELEMENT (p->fdsrc); +- RELEASE_ELEMENT (p->capsfilter); ++ RELEASE_ELEMENT (p->appsrc); + RELEASE_ELEMENT (p->rtppay); + RELEASE_ELEMENT (p->rtpdepay); + RELEASE_ELEMENT (p->fakesink); + +- /* Close pipe. */ +- if (p->fd[0]) { +- close (p->fd[0]); +- } +- +- if (p->fd[1]) { +- close (p->fd[1]); +- } +- + /* Release allocated memory. */ + free (p); + + return NULL; + } + +- /* Set fdsrc properties. */ +- g_object_set (p->fdsrc, "fd", p->fd[0], NULL); +- g_object_set (p->fdsrc, "do-timestamp", TRUE, NULL); +- g_object_set (p->fdsrc, "blocksize", p->frame_data_size, NULL); +- g_object_set (p->fdsrc, "num-buffers", p->frame_count * LOOP_COUNT, NULL); +- +- /* Set caps filters. */ ++ /* Set src properties. */ + caps = gst_caps_from_string (filtercaps); +- +- g_object_set (p->capsfilter, "caps", caps, NULL); ++ g_object_set (p->appsrc, "do-timestamp", TRUE, "caps", caps, NULL); + gst_caps_unref (caps); + + /* Add elements to the pipeline. */ +- gst_bin_add (GST_BIN (p->pipeline), p->fdsrc); +- gst_bin_add (GST_BIN (p->pipeline), p->capsfilter); ++ gst_bin_add (GST_BIN (p->pipeline), p->appsrc); + gst_bin_add (GST_BIN (p->pipeline), p->rtppay); + gst_bin_add (GST_BIN (p->pipeline), p->rtpdepay); + gst_bin_add (GST_BIN (p->pipeline), p->fakesink); + + /* Link elements. */ +- gst_element_link (p->fdsrc, p->capsfilter); +- gst_element_link (p->capsfilter, p->rtppay); ++ gst_element_link (p->appsrc, p->rtppay); + gst_element_link (p->rtppay, p->rtpdepay); + gst_element_link (p->rtpdepay, p->fakesink); + +@@ -240,15 +215,6 @@ rtp_pipeline_destroy (rtp_pipeline * p) + /* Release pipeline. */ + RELEASE_ELEMENT (p->pipeline); + +- /* Close pipe. */ +- if (p->fd[0]) { +- close (p->fd[0]); +- } +- +- if (p->fd[1]) { +- close (p->fd[1]); +- } +- + /* Release allocated memory. */ + free (p); + } +@@ -260,11 +226,10 @@ rtp_pipeline_destroy (rtp_pipeline * p) + static void + rtp_pipeline_run (rtp_pipeline * p) + { ++ GstFlowReturn flow_ret; + GMainLoop *mainloop = NULL; +- + GstBus *bus; +- +- gint i; ++ gint i, j; + + /* Check parameters. */ + if (p == NULL) { +@@ -286,22 +251,28 @@ rtp_pipeline_run (rtp_pipeline * p) + /* Set pipeline to PLAYING. */ + gst_element_set_state (p->pipeline, GST_STATE_PLAYING); + +- /* TODO: Writing may need some changes... */ +- ++ /* Push data into the pipeline */ + for (i = 0; i < LOOP_COUNT; i++) { +- const char *frame_data_pointer = p->frame_data; +- int res; +- int frame_count = p->frame_count; +- +- /* Write in to the pipe. */ +- while (frame_count > 0) { +- res = write (p->fd[1], frame_data_pointer, p->frame_data_size); +- fail_unless_equals_int (res, p->frame_data_size); +- frame_data_pointer += p->frame_data_size; +- frame_count--; ++ const guint8 *data = p->frame_data; ++ ++ for (j = 0; j < p->frame_count; j++) { ++ GstBuffer *buf; ++ ++ buf = gst_buffer_new (); ++ GST_BUFFER_DATA (buf) = (guint8 *) data; ++ GST_BUFFER_SIZE (buf) = p->frame_data_size; ++ GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_READONLY); ++ ++ g_signal_emit_by_name (p->appsrc, "push-buffer", buf, &flow_ret); ++ fail_unless_equals_int (flow_ret, GST_FLOW_OK); ++ data += p->frame_data_size; ++ ++ gst_buffer_unref (buf); + } + } + ++ g_signal_emit_by_name (p->appsrc, "end-of-stream", &flow_ret); ++ + /* Run mainloop. */ + g_main_loop_run (mainloop); + +@@ -350,8 +321,8 @@ rtp_pipeline_enable_lists (rtp_pipeline * p, guint mtu_size) + * @use_lists enable buffer lists + */ + static void +-rtp_pipeline_test (const char *frame_data, int frame_data_size, int frame_count, +- const char *filtercaps, const char *pay, const char *depay, ++rtp_pipeline_test (const guint8 * frame_data, int frame_data_size, ++ int frame_count, const char *filtercaps, const char *pay, const char *depay, + guint bytes_sent, guint mtu_size, gboolean use_lists) + { + /* Create RTP pipeline. */ +@@ -380,7 +351,7 @@ rtp_pipeline_test (const char *frame_data, int frame_data_size, int frame_count, + } + } + +-static char rtp_ilbc_frame_data[] = ++static const guint8 rtp_ilbc_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -397,7 +368,7 @@ GST_START_TEST (rtp_ilbc) + } + + GST_END_TEST; +-static char rtp_gsm_frame_data[] = ++static const guint8 rtp_gsm_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -414,7 +385,7 @@ GST_START_TEST (rtp_gsm) + } + + GST_END_TEST; +-static char rtp_amr_frame_data[] = ++static const guint8 rtp_amr_frame_data[] = + { 0x3c, 0x24, 0x03, 0xb3, 0x48, 0x10, 0x68, 0x46, 0x6c, 0xec, 0x03, + 0x7a, 0x37, 0x16, 0x41, 0x41, 0xc0, 0x00, 0x0d, 0xcd, 0x12, 0xed, + 0xad, 0x80, 0x00, 0x00, 0x11, 0x31, 0x00, 0x00, 0x0d, 0xa0 +@@ -432,7 +403,7 @@ GST_START_TEST (rtp_amr) + } + + GST_END_TEST; +-static char rtp_pcma_frame_data[] = ++static const guint8 rtp_pcma_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -449,7 +420,7 @@ GST_START_TEST (rtp_pcma) + } + + GST_END_TEST; +-static char rtp_pcmu_frame_data[] = ++static const guint8 rtp_pcmu_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -466,7 +437,7 @@ GST_START_TEST (rtp_pcmu) + } + + GST_END_TEST; +-static char rtp_mpa_frame_data[] = ++static const guint8 rtp_mpa_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -483,7 +454,7 @@ GST_START_TEST (rtp_mpa) + } + + GST_END_TEST; +-static char rtp_h263_frame_data[] = ++static const guint8 rtp_h263_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -495,12 +466,12 @@ static int rtp_h263_frame_count = 1; + GST_START_TEST (rtp_h263) + { + rtp_pipeline_test (rtp_h263_frame_data, rtp_h263_frame_data_size, +- rtp_h263_frame_count, "video/x-h263,variant=itu,h263version=h263", ++ rtp_h263_frame_count, "video/x-h263,variant=(string)itu,h263version=h263", + "rtph263pay", "rtph263depay", 0, 0, FALSE); + } + + GST_END_TEST; +-static char rtp_h263p_frame_data[] = ++static const guint8 rtp_h263p_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -512,12 +483,12 @@ static int rtp_h263p_frame_count = 1; + GST_START_TEST (rtp_h263p) + { + rtp_pipeline_test (rtp_h263p_frame_data, rtp_h263p_frame_data_size, +- rtp_h263p_frame_count, "video/x-h263,variant=itu", "rtph263ppay", ++ rtp_h263p_frame_count, "video/x-h263,variant=(string)itu", "rtph263ppay", + "rtph263pdepay", 0, 0, FALSE); + } + + GST_END_TEST; +-static char rtp_h264_frame_data[] = ++static const guint8 rtp_h264_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -528,13 +499,14 @@ static int rtp_h264_frame_count = 1; + + GST_START_TEST (rtp_h264) + { ++ /* FIXME 0.11: fully specify h264 caps (and make payloader check) */ + rtp_pipeline_test (rtp_h264_frame_data, rtp_h264_frame_data_size, + rtp_h264_frame_count, "video/x-h264", "rtph264pay", "rtph264depay", + 0, 0, FALSE); + } + + GST_END_TEST; +-static char rtp_h264_list_lt_mtu_frame_data[] = ++static const guint8 rtp_h264_list_lt_mtu_frame_data[] = + /* not packetized, next NAL starts with 0001 */ + { 0x00, 0x00, 0x00, 0x01, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, +@@ -552,6 +524,7 @@ static int rtp_h264_list_lt_mtu_mtu_size = 1024; + + GST_START_TEST (rtp_h264_list_lt_mtu) + { ++ /* FIXME 0.11: fully specify h264 caps (and make payloader check) */ + rtp_pipeline_test (rtp_h264_list_lt_mtu_frame_data, + rtp_h264_list_lt_mtu_frame_data_size, rtp_h264_list_lt_mtu_frame_count, + "video/x-h264", "rtph264pay", "rtph264depay", +@@ -559,7 +532,7 @@ GST_START_TEST (rtp_h264_list_lt_mtu) + } + + GST_END_TEST; +-static char rtp_h264_list_gt_mtu_frame_data[] = ++static const guint8 rtp_h264_list_gt_mtu_frame_data[] = + /* not packetized, next NAL starts with 0001 */ + { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +@@ -580,6 +553,7 @@ static int rtp_h264_list_gt_mtu_mty_size = 28; + + GST_START_TEST (rtp_h264_list_gt_mtu) + { ++ /* FIXME 0.11: fully specify h264 caps (and make payloader check) */ + rtp_pipeline_test (rtp_h264_list_gt_mtu_frame_data, + rtp_h264_list_gt_mtu_frame_data_size, rtp_h264_list_gt_mtu_frame_count, + "video/x-h264", "rtph264pay", "rtph264depay", +@@ -587,7 +561,7 @@ GST_START_TEST (rtp_h264_list_gt_mtu) + } + + GST_END_TEST; +-static char rtp_L16_frame_data[] = ++static const guint8 rtp_L16_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -605,7 +579,7 @@ GST_START_TEST (rtp_L16) + } + + GST_END_TEST; +-static char rtp_mp2t_frame_data[] = ++static const guint8 rtp_mp2t_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -622,7 +596,7 @@ GST_START_TEST (rtp_mp2t) + } + + GST_END_TEST; +-static char rtp_mp4v_frame_data[] = ++static const guint8 rtp_mp4v_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -639,7 +613,7 @@ GST_START_TEST (rtp_mp4v) + } + + GST_END_TEST; +-static char rtp_mp4v_list_frame_data[] = ++static const guint8 rtp_mp4v_list_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -659,7 +633,7 @@ GST_START_TEST (rtp_mp4v_list) + } + + GST_END_TEST; +-static char rtp_mp4g_frame_data[] = ++static const guint8 rtp_mp4g_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -677,7 +651,7 @@ GST_START_TEST (rtp_mp4g) + } + + GST_END_TEST; +-static char rtp_theora_frame_data[] = ++static const guint8 rtp_theora_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -694,7 +668,7 @@ GST_START_TEST (rtp_theora) + } + + GST_END_TEST; +-static char rtp_vorbis_frame_data[] = ++static const guint8 rtp_vorbis_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +@@ -711,7 +685,7 @@ GST_START_TEST (rtp_vorbis) + } + + GST_END_TEST; +-static char rtp_jpeg_frame_data[] = ++static const guint8 rtp_jpeg_frame_data[] = + { /* SOF */ 0xFF, 0xC0, 0x00, 0x11, 0x08, 0x00, 0x08, 0x00, 0x08, + 0x03, 0x00, 0x21, 0x08, 0x01, 0x11, 0x08, 0x02, 0x11, 0x08, + /* DQT */ 0xFF, 0xDB, 0x00, 0x43, 0x08, +@@ -738,7 +712,7 @@ GST_START_TEST (rtp_jpeg) + } + + GST_END_TEST; +-static char rtp_jpeg_list_frame_data[] = ++static const guint8 rtp_jpeg_list_frame_data[] = + { /* SOF */ 0xFF, 0xC0, 0x00, 0x11, 0x08, 0x00, 0x08, 0x00, 0x08, + 0x03, 0x00, 0x21, 0x08, 0x01, 0x11, 0x08, 0x02, 0x11, 0x08, + /* DQT */ 0xFF, 0xDB, 0x00, 0x43, 0x08, +@@ -767,7 +741,7 @@ GST_START_TEST (rtp_jpeg_list) + } + + GST_END_TEST; +-static char rtp_g729_frame_data[] = ++static const guint8 rtp_g729_frame_data[] = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/gstreamer0.10-ugly/PKGBUILD b/extra/gstreamer0.10-ugly/PKGBUILD index 0ba48c793..583ca4c8f 100644 --- a/extra/gstreamer0.10-ugly/PKGBUILD +++ b/extra/gstreamer0.10-ugly/PKGBUILD @@ -1,27 +1,33 @@ -# $Id: PKGBUILD 198067 2013-10-30 12:36:02Z allan $ +# $Id: PKGBUILD 201394 2013-12-10 15:34:19Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gstreamer0.10-ugly pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins') pkgver=0.10.19 -pkgrel=6 +pkgrel=8 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') -makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') +makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr' 'gtk-doc' 'git') url="http://gstreamer.freedesktop.org/" -source=(${url}/src/gst-plugins-ugly/gst-plugins-ugly-${pkgver}.tar.xz +source=("git://anongit.freedesktop.org/gstreamer-sdk/gst-plugins-ugly#commit=d637756a8e569753e9869c2c0728288f5dbc5089" opencore-amr.patch cdio-cd-text-api.patch) -md5sums=('ba26045c8c8c91f0d48d327ccf53ac0c' +md5sums=('SKIP' 'd8feb6c99bfaff8be6b2c48ea4e98e47' '6c1c665f864387f3a77d32231fedeaab') +prepare() { + cd gst-plugins-ugly + patch -Np0 -i ../opencore-amr.patch + patch -Np1 -i ../cdio-cd-text-api.patch + sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.ac +} + build() { - cd "${srcdir}/gst-plugins-ugly-${pkgver}" - patch -Np0 -i "${srcdir}/opencore-amr.patch" - patch -Np1 -i "${srcdir}/cdio-cd-text-api.patch" + cd gst-plugins-ugly + NOCONFIGURE=1 ./autogen.sh ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --enable-experimental \ + --disable-static --enable-experimental --enable-gtk-doc \ --with-package-name="GStreamer Ugly Plugins (Parabola GNU/Linux-libre)" \ --with-package-origin="https://parabolagnulinux.org/" make @@ -29,7 +35,7 @@ build() { } check() { - cd "${srcdir}/gst-plugins-ugly-${pkgver}" + cd gst-plugins-ugly make check } @@ -37,7 +43,7 @@ package_gstreamer0.10-ugly() { pkgdesc="GStreamer Multimedia Framework Ugly plugin libraries" depends=('gstreamer0.10-base>=0.10.34') - cd "${srcdir}/gst-plugins-ugly-${pkgver}" + cd gst-plugins-ugly make DESTDIR="${pkgdir}" install } @@ -48,6 +54,6 @@ package_gstreamer0.10-ugly-plugins() { replaces=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec') conflicts=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec') - cd "${srcdir}/gst-plugins-ugly-${pkgver}" + cd gst-plugins-ugly make -C ext DESTDIR="${pkgdir}" install } diff --git a/extra/gstreamer0.10/PKGBUILD b/extra/gstreamer0.10/PKGBUILD index ddd359dc0..acaebc2fa 100644 --- a/extra/gstreamer0.10/PKGBUILD +++ b/extra/gstreamer0.10/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198061 2013-10-30 12:33:54Z allan $ +# $Id: PKGBUILD 201380 2013-12-10 10:18:42Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gstreamer0.10 pkgver=0.10.36 -pkgrel=2 +pkgrel=3 pkgdesc="GStreamer Multimedia Framework" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') @@ -11,15 +11,21 @@ url="http://gstreamer.com" depends=('libxml2' 'glib2') optdepends=('sh: feedback script') makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection' 'git') -source=("git://anongit.freedesktop.org/gstreamer-sdk/gstreamer#commit=ce96cff8e2bf1772dc330387fa98e94f187fc2ab" - tests-remove-silly-test_fail_abstract_new-check.patch) +source=("git://anongit.freedesktop.org/gstreamer-sdk/gstreamer#commit=3ddc31eaa18c3be1613e43430eca78a3e445639e" + tests-remove-silly-test_fail_abstract_new-check.patch + bison3.patch) sha256sums=('SKIP' - 'd3d3f4f04453831fdb4244bfe174a38c4e6f9f4da5c8c9050dcfa1a6097aad52') + 'd3d3f4f04453831fdb4244bfe174a38c4e6f9f4da5c8c9050dcfa1a6097aad52' + 'ed154e280abf59b24d98a8ab0fe868b449b26aa61f7ae3813fab8ac615fcaefa') -build() { - cd "${srcdir}/gstreamer" +prepare() { + cd gstreamer patch -Np1 -i ../tests-remove-silly-test_fail_abstract_new-check.patch + patch -Np1 -i ../bison3.patch sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.ac +} +build() { + cd gstreamer NOCONFIGURE=1 ./autogen.sh ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib \ --with-package-name="GStreamer (Parabola)" \ @@ -29,12 +35,12 @@ build() { } check() { - cd "${srcdir}/gstreamer" + cd gstreamer make check } package() { - cd "${srcdir}/gstreamer" + cd gstreamer make DESTDIR="${pkgdir}" install #Remove unversioned gst-* binaries to get rid of conflicts diff --git a/extra/gstreamer0.10/bison3.patch b/extra/gstreamer0.10/bison3.patch new file mode 100644 index 000000000..4f4f52111 --- /dev/null +++ b/extra/gstreamer0.10/bison3.patch @@ -0,0 +1,31 @@ +From bd2a01cfe222367493a71f3269f12250c8972db0 Mon Sep 17 00:00:00 2001 +From: Kerrick Staley <kerrick@kerrickstaley.com> +Date: Wed, 21 Aug 2013 06:59:29 +0000 +Subject: parse: make grammar.y work with Bison 3 + +YYLEX_PARAM is no longer supported in Bison 3. + +https://bugzilla.gnome.org/show_bug.cgi?id=706462 +--- +diff --git a/gst/parse/grammar.y b/gst/parse/grammar.y +index 8a9019c..f533389 100644 +--- a/gst/parse/grammar.y ++++ b/gst/parse/grammar.y +@@ -26,7 +26,6 @@ + */ + + #define YYERROR_VERBOSE 1 +-#define YYLEX_PARAM scanner + + #define YYENABLE_NLS 0 + +@@ -659,6 +658,7 @@ static int yyerror (void *scanner, graph_t *graph, const char *s); + %right '.' + %left '!' '=' + ++%lex-param { void *scanner } + %parse-param { void *scanner } + %parse-param { graph_t *graph } + %pure-parser +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/gthumb/PKGBUILD b/extra/gthumb/PKGBUILD index c22e4f301..1d4db805a 100644 --- a/extra/gthumb/PKGBUILD +++ b/extra/gthumb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198069 2013-10-30 12:36:47Z allan $ +# $Id: PKGBUILD 202999 2013-12-30 22:49:00Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=gthumb -pkgver=3.2.4 +pkgver=3.2.6 pkgrel=1 pkgdesc="Image browser and viewer for the GNOME Desktop" arch=(i686 x86_64 mips64el) @@ -22,7 +22,7 @@ optdepends=('libopenraw: read RAW files' options=('!emptydirs') install=gthumb.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('0b94e7317911334c80fce5116970186963419fd0c25eed4ecca2a4ddcc968177') +sha256sums=('6c7dbd574f720ec308f8a76354cdf254598b820b2ce8fe73209fb0aec17f757e') prepare() { cd $pkgname-$pkgver diff --git a/extra/gtk-vnc/PKGBUILD b/extra/gtk-vnc/PKGBUILD index f44c7b0d6..ed721437a 100644 --- a/extra/gtk-vnc/PKGBUILD +++ b/extra/gtk-vnc/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 198085 2013-10-30 12:42:46Z allan $ +# $Id: PKGBUILD 200822 2013-12-06 03:01:44Z eric $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Allan McRae <mcrae_allan@hotmail.com> # Contributor: lp76 <l.peduto@gmail.com> pkgname=gtk-vnc -pkgver=0.5.2 -pkgrel=2 +pkgver=0.5.3 +pkgrel=1 pkgdesc="A VNC viewer widget for GTK" arch=('i686' 'x86_64' 'mips64el') -url="http://live.gnome.org/gtk-vnc" +url="https://wiki.gnome.org/Projects/gtk-vnc" license=('LGPL') depends=('libgcrypt' 'gtk3') optdepends=('gtk2: GTK2 widget') makedepends=('intltool' 'pygtk' 'pygobject2-devel' 'gtk-doc' 'gtk2' 'vala' 'gobject-introspection') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('b51bda7edebb82ab142c292bd1b1493406bc8225a5c834d854bbafef9e9a471f') +sha256sums=('d490a6c8f40e550d43aef0043ce3bec498ec220d5eb3dc5cdcff8fd561149caf') build() { rm -rf gtk2-build gtk3-build diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD index 819910bd3..bc7c1f060 100644 --- a/extra/gtk3/PKGBUILD +++ b/extra/gtk3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198071 2013-10-30 12:37:29Z allan $ +# $Id: PKGBUILD 200800 2013-12-05 17:20:20Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gtk3 -pkgver=3.10.2 +pkgver=3.10.6 pkgrel=1 pkgdesc="GObject-based multi-platform GUI toolkit (v3)" arch=(i686 x86_64 mips64el) @@ -17,11 +17,14 @@ optdepends=('gnome-themes-standard: Default widget theme' license=(LGPL) source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz settings.ini) -sha256sums=('93af12d28e5f6ccc373ea59f31147e2884c9b3c15dc4841ce3b5cee45b13814c' +sha256sums=('3c24c57fc5cb7a5ea39d3a3ff7b12be63d7f21a52fd6f20f7b983e19b7b0268a' '14369dfd1d325c393e17c105d5d5cc5501663277bd4047ea04a50abb3cfbd119') prepare() { cd "gtk+-$pkgver" + + # protocols too new; made with a wayland from git, not 1.3.0 + rm gdk/wayland/gtk-shell-{client-protocol.h,protocol.c} } build() { diff --git a/extra/gtkglextmm/PKGBUILD b/extra/gtkglextmm/PKGBUILD deleted file mode 100644 index 2c7f02d66..000000000 --- a/extra/gtkglextmm/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 198074 2013-10-30 12:38:35Z allan $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Bastien Bouclet <bastien.bouclet@gmail.com> -# Contributor: SpepS <dreamspepser at yahoo dot it> - -pkgname=gtkglextmm -pkgver=1.2.0 -pkgrel=9 -pkgdesc="Cpp C++ bindings for gtkglext" -arch=('i686' 'x86_64' 'mips64el') -url="http://gtkglext.sourceforge.net/" -depends=('gtkmm' 'gtkglext') -makedepends=('mesa') -license=('GPL') -source=("http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2" - 'gdkspanfunc.patch') -md5sums=('27c05f4d45c5fd07b6fb0f044add3056' - 'd7c8ea33c748a6857ee629c16b2d9bff') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # FS#24706 - patch -Np1 -i "${srcdir}/gdkspanfunc.patch" - - # automake 1.8 fix - sed -i "s|\(AC_DEFUN(\)\(AC_.*_MULTIHEAD\)|\1[\2]|" m4macros/gtkglextmm.m4 - - ./configure --prefix=/usr \ - --disable-gtkglext-test \ - --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install -} diff --git a/extra/gtkglextmm/gdkspanfunc.patch b/extra/gtkglextmm/gdkspanfunc.patch deleted file mode 100644 index ae5672a8c..000000000 --- a/extra/gtkglextmm/gdkspanfunc.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/gtkglext/gtkmm/gl/widget.cc 2004-05-18 03:01:50.000000000 -0300 -+++ b/gtkglext/gtkmm/gl/widget.cc 2011-06-12 17:57:13.075541070 -0300 -@@ -17,9 +17,8 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - */ - --#include <gtk/gtkglwidget.h> -- - #include "widget.h" -+#include <gtk/gtkglwidget.h> - - namespace Gtk - { diff --git a/extra/gtkimageview/PKGBUILD b/extra/gtkimageview/PKGBUILD deleted file mode 100644 index f5752f333..000000000 --- a/extra/gtkimageview/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 198077 2013-10-30 12:39:44Z allan $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Jan Blazek <appolito@gmail.com> -# Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com> - -pkgname=gtkimageview -pkgver=1.6.4 -pkgrel=3.2 -pkgdesc="Simple image viewer widget for GTK2" -arch=('i686' 'x86_64' 'mips64el') -url="http://trac.bjourne.webfactional.com/" -license=('LGPL2.1') -depends=('gtk2') -makedepends=('pkgconfig') -source=("http://trac.bjourne.webfactional.com/attachment/wiki/WikiStart/${pkgname}-${pkgver}.tar.gz?format=raw") -md5sums=('501367b3f50e69a12208dc9c6ad00b18') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr \ - --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - rm -rf "${pkgdir}/usr/share" -} diff --git a/extra/gucharmap/PKGBUILD b/extra/gucharmap/PKGBUILD index 10d7a06c5..8918560d1 100644 --- a/extra/gucharmap/PKGBUILD +++ b/extra/gucharmap/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198088 2013-10-30 12:43:49Z allan $ +# $Id: PKGBUILD 199398 2013-11-11 22:33:46Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan De Groot <jgc@archlinux.org> pkgname=gucharmap -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc="Gnome Unicode Charmap" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ options=('!emptydirs') groups=(gnome) install=gucharmap.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('a0447b5dd13e3364c5ca9bacb1f7387043d664effd64980e400c5b3d7301b617') +sha256sums=('04e8606c65adb14d267b50b1cf9eb4fee92bd9c5ab512a346bd4c9c686403f78') build() { cd $pkgname-$pkgver diff --git a/extra/gupnp-av/PKGBUILD b/extra/gupnp-av/PKGBUILD index 703a85af0..1f59f948c 100644 --- a/extra/gupnp-av/PKGBUILD +++ b/extra/gupnp-av/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198092 2013-10-30 12:45:19Z allan $ +# $Id: PKGBUILD 199920 2013-11-19 00:13:08Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Thijs Vermeir <thijsvermeir@gmail.com> # Contributor: Denis Zawada <deno@rootnode.net> pkgname=gupnp-av -pkgver=0.12.3 +pkgver=0.12.4 pkgrel=1 pkgdesc="Library to ease handling and implementation of UPnP A/V profiles" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=(LGPL) depends=(gupnp) makedepends=(gobject-introspection gtk-doc vala) source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('fa37325ee8aa22909131eedff871b61ccd183b66c7770c147a0d4c34b83bbf02') +sha256sums=('548a9cef8ab3007734e20a4ce284c422ae299b7e024a4824299f6ae7e3dd7a5b') build() { cd $pkgname-$pkgver diff --git a/extra/gupnp/PKGBUILD b/extra/gupnp/PKGBUILD index 1c04627ee..3da64d2e7 100644 --- a/extra/gupnp/PKGBUILD +++ b/extra/gupnp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198637 2013-10-31 15:45:29Z heftig $ +# $Id: PKGBUILD 201545 2013-12-14 15:50:45Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: György Balló <ballogy@freestart.hu> pkgname=gupnp -pkgver=0.20.8 +pkgver=0.20.9 pkgrel=1 pkgdesc="An object-oriented UPNP framework" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=(gssdp util-linux) makedepends=(gobject-introspection gtk-doc vala) optdepends=('python2: gupnp-binding-tool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('f70da127e0d35a7b8aecaf6f58b740bbb56836451be33d7aeb7979a5c131eac8') +sha256sums=('61650a3be46979973b82c79eab5c3baf16a4ad3a051d8a710e5d1c376cf32c6e') build() { cd $pkgname-$pkgver diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD index 1eb1dd97a..2cb265268 100644 --- a/extra/gvfs/PKGBUILD +++ b/extra/gvfs/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 198095 2013-10-30 12:46:31Z allan $ +# $Id: PKGBUILD 199075 2013-11-08 14:49:13Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gvfs pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-goa' 'gvfs-mtp') -pkgver=1.18.2 +pkgver=1.18.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') makedepends=('avahi' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio-paranoia' 'libgphoto2' 'libimobiledevice' 'libsoup' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3' 'libmtp' 'gnome-online-accounts' 'libbluray') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) -sha256sums=('a24ce342a3369f7ec34f19deadc5da46bf51070d39d8733f0848d9ba4bb55da7') +sha256sums=('1d829716dcf1c5c016ee0c8aaff4cfd4fc4c719a4125f5c4f206f26c5bdc472c') build() { cd "$pkgbase-$pkgver" diff --git a/extra/harfbuzz/PKGBUILD b/extra/harfbuzz/PKGBUILD index 1fd370d1c..ee811c27e 100644 --- a/extra/harfbuzz/PKGBUILD +++ b/extra/harfbuzz/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198735 2013-11-02 15:15:10Z heftig $ +# $Id: PKGBUILD 200683 2013-12-02 11:18:15Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=(harfbuzz) pkgname=(harfbuzz harfbuzz-icu) -pkgver=0.9.23 +pkgver=0.9.24 pkgrel=1 pkgdesc="OpenType text shaping engine" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ url="http://www.freedesktop.org/wiki/Software/HarfBuzz" license=(MIT) makedepends=(glib2 freetype2 graphite cairo icu gobject-introspection) source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgbase}-${pkgver}.tar.bz2) -sha256sums=('171ab7f58e7243082a4582f4d1f21b3f44462931ea92a6909d303ad3614794c7') +sha256sums=('edf25dd8a318acdeacd2aeade2387db23c109fec0da626f2127f43917a372422') build() { cd $pkgbase-$pkgver diff --git a/extra/haskell-parsec/PKGBUILD b/extra/haskell-parsec/PKGBUILD index 2b8284f13..613897c4d 100644 --- a/extra/haskell-parsec/PKGBUILD +++ b/extra/haskell-parsec/PKGBUILD @@ -1,3 +1,4 @@ +# $Id: PKGBUILD 199158 2013-11-08 18:16:08Z eric $ # Maintainer: Thomas Dziedzic <gostrc@gmail.com> _hkgname=parsec @@ -11,7 +12,7 @@ arch=('i686' 'x86_64') depends=('ghc=7.6.3-1' 'sh' 'haskell-mtl=2.1.2-3' 'haskell-text=0.11.2.3-3') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install=${pkgname}.install -options('staticlibs') +options=('staticlibs') md5sums=('d72fc94b81153132c61125a1ec52a4a5') build() { diff --git a/extra/haveged/PKGBUILD b/extra/haveged/PKGBUILD new file mode 100644 index 000000000..55a8d59b4 --- /dev/null +++ b/extra/haveged/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 199016 2013-11-06 11:28:54Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> +# Contributor: kfgz <kfgz at interia dot pl> +# Contributor: pootzko <pootzko at gmail dot com> + +pkgname=haveged +pkgver=1.7.c +_pkgver=${pkgver/.c/c} +pkgrel=3 +pkgdesc='Entropy harvesting daemon using CPU timings' +arch=('i686' 'x86_64' 'mips64el') +url='http://www.issihosts.com/haveged' +license=('GPL') +depends=('glibc') +source=($url/$pkgname-$_pkgver.tar.gz + service cleanexit.patch) +sha256sums=('40397eded96fc0d624a6a81c8e888ab023e46f3114f1ee699994e645531bf121' + 'badf8ceb5484d45888a089fabdfba5f44f6ec2930bca203c50200051a4d83e12' + 'be896659dd96cb85915ac5a9c2bd8d81d1ff348508362d1b71d64b207f69fa5c') + +prepare() { + cd $pkgname-$_pkgver + patch -Np1 -i ../cleanexit.patch +} + +build() { + cd $pkgname-$_pkgver + ./configure --prefix=/usr --bindir=/usr/bin --sbindir=/usr/bin + make +} + +package() { + cd $pkgname-$_pkgver + make DESTDIR="$pkgdir" install + + rm -rf "$pkgdir"/etc/init.d + install -D -m644 "$srcdir"/service \ + "$pkgdir"/usr/lib/systemd/system/haveged.service +} diff --git a/extra/haveged/cleanexit.patch b/extra/haveged/cleanexit.patch new file mode 100644 index 000000000..01f8c7f94 --- /dev/null +++ b/extra/haveged/cleanexit.patch @@ -0,0 +1,21 @@ +diff -u -r haveged-1.7c/src/haveged.c haveged-1.7c-cleanexit/src/haveged.c +--- haveged-1.7c/src/haveged.c 2013-01-12 19:20:04.000000000 +0100 ++++ haveged-1.7c-cleanexit/src/haveged.c 2013-11-05 22:40:22.202935493 +0100 +@@ -642,7 +642,16 @@ + static void tidy_exit( /* OUT: nothing */ + int signum) /* IN: signal number */ + { +- error_exit("Stopping due to signal %d\n", signum); ++#ifndef NO_DAEMON ++ if (params->detached!=0) { ++ unlink(params->pid_file); ++ syslog(LOG_INFO, "%s Stopping due to signal %d", params->daemon, signum); ++ } ++ else ++#endif ++ fprintf(stderr, "%s Stopping due to signal %d\n", params->daemon, signum); ++ havege_destroy(handle); ++ exit(0); + } + /** + * send usage display to stderr diff --git a/extra/haveged/service b/extra/haveged/service new file mode 100644 index 000000000..676fb1893 --- /dev/null +++ b/extra/haveged/service @@ -0,0 +1,11 @@ +[Unit] +Description=Entropy Harvesting Daemon +Documentation=man:haveged(8) + +[Service] +Type=forking +ExecStart=/usr/bin/haveged -w 1024 -v 1 +PIDFile=/var/run/haveged.pid + +[Install] +WantedBy=multi-user.target diff --git a/extra/hexedit/PKGBUILD b/extra/hexedit/PKGBUILD deleted file mode 100644 index d585d744f..000000000 --- a/extra/hexedit/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 179485 2013-03-05 16:24:22Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Paul Mattal <pjmattal@elys.com> - -pkgname=hexedit -pkgver=1.2.13 -pkgrel=1 -pkgdesc="Hex Editor for Linux" -arch=('i686' 'x86_64' 'mips64el') -url="http://rigaux.org/hexedit.html" -license=('GPL') -depends=('ncurses') -source=("http://rigaux.org/${pkgname}-${pkgver}.src.tgz") -md5sums=('a5af1378d028512a9cad27a5ba3e15f9') - -build() { - cd "${srcdir}/${pkgname}" - CFLAGS="$CFLAGS -Wall" - - ./configure - make -} - -package() { - cd "${srcdir}/${pkgname}" - - make prefix="${pkgdir}/usr" install -} diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD index d632332e4..528d1f6f3 100644 --- a/extra/hugin/PKGBUILD +++ b/extra/hugin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 198592 2013-10-30 16:39:01Z bisson $ +# $Id: PKGBUILD 201259 2013-12-07 10:34:58Z bpiotrowski $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Tobias Kieslich <tobias@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -6,7 +6,7 @@ pkgname=hugin pkgver=2013.0.0 -pkgrel=2 +pkgrel=3 pkgdesc='Panorama photo stitcher' url='http://hugin.sourceforge.net/' license=('GPL') diff --git a/extra/hwloc/PKGBUILD b/extra/hwloc/PKGBUILD index 27767cc6c..cbb1b7822 100644 --- a/extra/hwloc/PKGBUILD +++ b/extra/hwloc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 197744 2013-10-29 02:18:00Z eric $ +# $Id: PKGBUILD 200289 2013-11-24 22:34:03Z eric $ # Maintainer : Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Sylvain HENRY <hsyl20@yahoo.fr> # Contributor: Hervé YVIQUEL <elldekaa@gmail.com> pkgname=hwloc -pkgver=1.7.2 +pkgver=1.8 pkgrel=1 pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures" arch=('i686' 'x86_64' 'mips64el') @@ -12,8 +12,8 @@ url="http://www.open-mpi.org/projects/hwloc/" license=('BSD') depends=('sh' 'pciutils' 'cairo' 'libxml2') options=('!docs') -source=(http://www.open-mpi.org/software/hwloc/v${pkgver%.*}/downloads/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('bcd7d71e038af6e1f06a233fdf1c00739033e128') +source=(http://www.open-mpi.org/software/hwloc/v${pkgver}/downloads/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('548a0d111775bceca9f1388d1d03e86a209ed6a8') build() { cd ${pkgname}-${pkgver} diff --git a/extra/icewm/PKGBUILD b/extra/icewm/PKGBUILD index 290f16ec2..4f8b7adc2 100644 --- a/extra/icewm/PKGBUILD +++ b/extra/icewm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160075 2012-05-29 22:01:31Z eric $ +# $Id: PKGBUILD 199904 2013-11-18 16:10:20Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=icewm -pkgver=1.3.7 -pkgrel=3.1 # only change when Arch updates +pkgver=1.3.8 +pkgrel=1 pkgdesc="A Window Manager designed for speed, usability, and consistency" arch=('i686' 'x86_64' 'mips64el') url="http://www.icewm.org/" @@ -11,28 +11,26 @@ license=('LGPL') depends=('libxrandr' 'libxft' 'libsm' 'libxinerama' 'gdk-pixbuf2') makedepends=('xorg-mkfontdir') source=(http://downloads.sourceforge.net/sourceforge/icewm/${pkgname}-${pkgver}.tar.gz - use_ICEWM_deprecated.patch ignore_workarea_hints.patch no_proc_acpi.patch - wmclient.patch icewm-cpustatus.patch) -sha1sums=('ce8d86190e275dc7db2d8c28472a579264120803' - 'ac8f352ba5ee33e19ce75fdeed890361550e125a' - '49ca37ae41290f17a71a177b1f774235f91d79f1' - 'a47fb4191f30b8f42a6bd90ca5d7941bb3d65338' - 'd16b4b3ab269a657e735e343833973d000c0b35b' + ignore_workarea_hints.patch icewm-cpustatus.patch) +sha1sums=('dc9155227129be14aced00c24c572356e0fa5cd8' + '88b4b198827d6590901c2c8bdba8826d928f6f1a' '0f4a02153496dadd26742f6bd3bdc166d7eafaed') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i "${srcdir}/use_ICEWM_deprecated.patch" +prepare() { + cd ${pkgname}-${pkgver} patch -p1 -i "${srcdir}/ignore_workarea_hints.patch" - patch -p1 -i "${srcdir}/no_proc_acpi.patch" - patch -p1 -i "${srcdir}/wmclient.patch" patch -p2 -i "${srcdir}/icewm-cpustatus.patch" - LIBS+="-lfontconfig" ./configure --build=$CHOST --prefix=/usr --sysconfdir=/etc \ +} + +build() { + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr --sysconfdir=/etc \ + --build=$CHOST \ --enable-shaped-decorations --enable-gradients make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install-man install-docs install-desktop } diff --git a/extra/icewm/ignore_workarea_hints.patch b/extra/icewm/ignore_workarea_hints.patch index 99ffa4a28..df0a2a502 100644 --- a/extra/icewm/ignore_workarea_hints.patch +++ b/extra/icewm/ignore_workarea_hints.patch @@ -3,9 +3,9 @@ Index: icewm-1.3.7/src/wmapp.cc --- icewm-1.3.7.orig/src/wmapp.cc 2010-10-31 15:09:36.000000000 +0100 +++ icewm-1.3.7/src/wmapp.cc 2012-01-15 17:01:47.284927292 +0100 @@ -187,7 +187,6 @@ - _XA_NET_ACTIVE_WINDOW, _XA_NET_CLOSE_WINDOW, _XA_NET_WM_STRUT, + _XA_NET_WM_STRUT_PARTIAL, - _XA_NET_WORKAREA, _XA_NET_WM_STATE, _XA_NET_WM_STATE_MAXIMIZED_VERT, diff --git a/extra/icewm/no_proc_acpi.patch b/extra/icewm/no_proc_acpi.patch deleted file mode 100644 index 4cd92360c..000000000 --- a/extra/icewm/no_proc_acpi.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Check for sysfs' acpi file, procfs may not contain acpi data with recent kernels -Author: Andrey Danin <danindrey@mail.ru>, Eduard Bloch <blade@debian.org> -Bug: http://sourceforge.net/mailarchive/forum.php?thread_name=E1SHwYx-00029t-1N.danindrey-mail-ru%40f232.mail.ru&forum_name=icewm-devel -Forwarded: Yes - -Index: icewm-1.3.7/src/wmtaskbar.cc -=================================================================== ---- icewm-1.3.7.orig/src/wmtaskbar.cc 2010-10-31 15:09:36.000000000 +0100 -+++ icewm-1.3.7/src/wmtaskbar.cc 2012-04-11 23:22:23.466564372 +0200 -@@ -467,6 +467,7 @@ - #endif - #ifdef CONFIG_APPLET_APM - if (taskBarShowApm && (access(APMDEV, 0) == 0 || -+ access("/sys/class/power_supply", 0) == 0 || - access("/proc/acpi", 0) == 0 || - access("/dev/acpi", 0) == 0 || - access("/proc/pmu", R_OK|X_OK) == 0)) diff --git a/extra/icewm/use_ICEWM_deprecated.patch b/extra/icewm/use_ICEWM_deprecated.patch deleted file mode 100644 index 3533d31e3..000000000 --- a/extra/icewm/use_ICEWM_deprecated.patch +++ /dev/null @@ -1,21 +0,0 @@ -Description: Don't use "deprecated" as identifier, will FTBFS if another - library defines functions as deprecated. -Author: Andreas Moog <amoog@ubuntu.com> -Bug: https://sourceforge.net/tracker/?func=detail&aid=3494034&group_id=31&atid=100031 -Bug-Ubuntu: https://bugs.launchpad.net/bugs/935179 -Forwarded: Yes - ---- icewm-1.3.7.orig/src/base.h -+++ icewm-1.3.7/src/base.h -@@ -2,9 +2,9 @@ - #define __BASE_H - - #if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3 --#define deprecated __attribute__((deprecated)) -+#define ICEWM_deprecated __attribute__((deprecated)) - #else --#define deprecated -+#define ICEWM_deprecated - #endif - - /*** Atomar Data Types ********************************************************/ diff --git a/extra/icewm/wmclient.patch b/extra/icewm/wmclient.patch deleted file mode 100644 index 95f00614d..000000000 --- a/extra/icewm/wmclient.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -uNr icewm-1.3.7.orig/src/wmclient.cc icewm-1.3.7/src/wmclient.cc ---- icewm-1.3.7.orig/src/wmclient.cc 2012-05-27 11:54:25.663101746 +0200 -+++ icewm-1.3.7/src/wmclient.cc 2012-05-27 12:17:40.236339580 +0200 -@@ -1044,20 +1044,11 @@ - while (XGetWindowProperty(display, handle, - propAtom, (itemCount * itemSize) / 32, 1024*32, False, AnyPropertyType, - &r_type, &r_format, &nitems, &bytes_remain, -- &prop) == Success && prop && bytes_remain == 0) -+ &prop) == Success && prop) - { - if (r_format == itemSize1 && nitems > 0) { - data = realloc(data, (itemCount + nitems) * itemSize / 8); - -- // access to memory beyound 256MiB causes crashes! But anyhow, size -- // >>2MiB looks suspicious. Detect this case ASAP. However, if -- // the usable icon is somewhere in the beginning, it's okay to -- // return truncated data. -- if (itemCount * itemSize / 8 >= 2097152) { -- XFree(prop); -- break; -- } -- - memcpy((char *)data + itemCount * itemSize / 8, prop, nitems * itemSize / 8); - itemCount += nitems; - XFree(prop); diff --git a/extra/id3/PKGBUILD b/extra/id3/PKGBUILD deleted file mode 100644 index 365eeb3b6..000000000 --- a/extra/id3/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 137772 2011-09-10 18:35:00Z eric $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Jochem Kossen <j.kossen@home.nl> - -pkgname=id3 -pkgver=0.78 -pkgrel=3.1 -pkgdesc="Utility to edit id3v1 and id3v2 tags" -arch=('i686' 'x86_64' 'mips64el') -url="http://freshmeat.net/projects/id3" -license=('BSD') -depends=('gcc-libs') -options=('!makeflags') -source=(http://linux-bsd-unix.strefa.pl/${pkgname}-${pkgver}.tar.gz - id3-0.78-gcc44.patch) -md5sums=('bbc2a5d8022006330e6bb51034fafb43' - '51370be8d2624efee3683efab608a7f1') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/id3-0.78-gcc44.patch - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make prefix="${pkgdir}/usr" mandir="${pkgdir}/usr/share/man" install - - #install license - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} - diff --git a/extra/id3/id3-0.78-gcc44.patch b/extra/id3/id3-0.78-gcc44.patch deleted file mode 100644 index 63c4d93b1..000000000 --- a/extra/id3/id3-0.78-gcc44.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/charconv.cpp 2006-02-14 16:44:58.000000000 -0500 -+++ b/charconv.cpp 2009-06-12 17:59:54.332486433 -0400 -@@ -5,6 +5,7 @@ - #include <cstdlib> - #include <clocale> - #include <climits> -+#include <cstring> - #if defined(__STDC_ISO_10646__) || defined(__WIN32__) - # include <wchar.h> - # define fallback(call) (0) ---- a/getid3v2.cpp 2006-02-10 22:23:14.000000000 -0500 -+++ b/getid3v2.cpp 2009-06-12 18:06:49.582446332 -0400 -@@ -1,5 +1,6 @@ - #include <vector> - #include <cstdio> -+#include <cstring> - #include "char_ucs.h" - #include "id3v2.h" - #include "getid3v2.h" ---- a/setfname.cpp 2006-03-19 06:13:36.000000000 -0500 -+++ b/setfname.cpp 2009-06-12 18:09:35.759097380 -0400 -@@ -1,6 +1,7 @@ - #include <cstdio> - #include <cctype> - #include <ctime> // borland needs this -+#include <cstring> - #include <sys/stat.h> - #include <utime.h> - #if defined(__WIN32__) diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index 1e30e166c..df6809ea9 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198752 2013-11-03 00:30:32Z eric $ +# $Id: PKGBUILD 201665 2013-12-17 20:27:22Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.8.7.4 -pkgrel=2 +pkgver=6.8.7.10 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.imagemagick.org/" license=('custom') @@ -14,7 +14,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ #source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc} \ source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc} \ perlmagick.rpath.patch) -sha1sums=('88e936a1738967d078a9500f430e9017400a05e9' +sha1sums=('a74ebac95fb592e98cbe33e25c05978590807c57' 'SKIP' 'e143cf9d530fabf3b58023899b5cc544ba93daec') @@ -37,18 +37,19 @@ build() { --with-perl --with-perl-options="INSTALLDIRS=vendor" --with-lqr --with-rsvg \ --enable-opencl --without-gvc --without-djvu --without-autotrace \ --without-jbig --without-fpx --without-dps --without-fftw $EXTRAOPTS - make + make } check() { cd ImageMagick-${pkgver%.*}-${pkgver##*.} -# make check + make check } package_imagemagick() { pkgdesc="An image viewing/manipulation program" - depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'liblqr') - optdepends=('ghostscript: for Ghostscript support' + depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'liblqr' 'libcl') + optdepends=('imagemagick-doc: for additional information' + 'ghostscript: for Ghostscript support' 'openexr: for OpenEXR support' 'libwmf: for WMF support' 'librsvg: for SVG support' diff --git a/extra/imake/PKGBUILD b/extra/imake/PKGBUILD index ed2f84bff..110f34ffd 100644 --- a/extra/imake/PKGBUILD +++ b/extra/imake/PKGBUILD @@ -1,41 +1,52 @@ -# $Id: PKGBUILD 191324 2013-07-23 16:42:27Z jgc $ +# $Id: PKGBUILD 201359 2013-12-09 12:44:37Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=imake pkgver=1.0.6 -pkgrel=1 +pkgrel=2 pkgdesc="X.Org imake program and related utilities" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('pkgconfig' 'xproto' 'perl') +makedepends=('pkgconfig' 'xproto' 'perl' 'xorg-util-macros' 'xorg-font-util') optdepends=('perl: for mkhtmlindex') -source=("http://xorg.freedesktop.org/releases/individual/util/imake-${pkgver}.tar.bz2" - 'http://xorg.freedesktop.org/releases/individual/util/gccmakedep-1.0.2.tar.bz2' - 'http://xorg.freedesktop.org/releases/individual/util/lndir-1.0.3.tar.bz2' - 'http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.5.tar.bz2' - 'http://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-1.0.5.tar.bz2' - 'linuxconfig.patch' - 'LICENSE') +source=(http://xorg.freedesktop.org/releases/individual/util/imake-${pkgver}.tar.bz2 + http://xorg.freedesktop.org/releases/individual/util/gccmakedep-1.0.2.tar.bz2 + http://xorg.freedesktop.org/releases/individual/util/lndir-1.0.3.tar.bz2 + http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.5.tar.bz2 + http://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-1.0.5.tar.bz2 + gccmakedep-cpp-4.8-compat.patch + imake-cpp-4.8-compat.patch + linuxconfig.patch + LICENSE) sha1sums=('a54c025d7ac9894b6bc919d13454c6adb12ae140' 'a3d971a507a460233afd8ed46e9f06135fed634d' 'fc71a6ff2cc0a1065cfb608796ffd6b4f0ce76fe' '2599afa039d2070bae9df6ce43da288b3a4adf97' 'ae22eb81d56d018f0b3b149f70965ebfef2385fd' + 'ef7bb90e30ce35131d049f45b650cd0cf6dc0a20' + '24f87a945307d4336ab2afd5cade683f0e94533c' '72f2d4cc4d4cc5f85ba6982718ae1bbb7e56e0d0' 'c5ecffb25ad079ba3858e3aec047d046df603a89') prepare() { cd xorg-cf-files-1.0.5 - patch -p1 -i "${srcdir}/linuxconfig.patch" + patch -p1 -i ../linuxconfig.patch + + cd ../imake-1.0.6 + patch -Np1 -i ../imake-cpp-4.8-compat.patch + + cd ../gccmakedep-1.0.2 + patch -Np1 -i ../gccmakedep-cpp-4.8-compat.patch } build() { for i in *; do if [ -d "${i}" ]; then pushd "${i}" + autoreconf -fi ./configure --prefix=/usr --mandir=/usr/share/man make popd diff --git a/extra/imake/gccmakedep-cpp-4.8-compat.patch b/extra/imake/gccmakedep-cpp-4.8-compat.patch new file mode 100644 index 000000000..0e5302a83 --- /dev/null +++ b/extra/imake/gccmakedep-cpp-4.8-compat.patch @@ -0,0 +1,8 @@ +--- gccmakedep-1.0.2/cpprules.in.orig 2013-12-09 12:24:06.246894574 +0000 ++++ gccmakedep-1.0.2/cpprules.in 2013-12-09 12:24:44.806641603 +0000 +@@ -23,4 +23,4 @@ + -e '/\@\@$$/s/\@\@$$/\\/' + + .cpp: +- $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ ++ $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) $< | $(CPP_SED_MAGIC) > $@ diff --git a/extra/imake/imake-cpp-4.8-compat.patch b/extra/imake/imake-cpp-4.8-compat.patch new file mode 100644 index 000000000..45e9ca305 --- /dev/null +++ b/extra/imake/imake-cpp-4.8-compat.patch @@ -0,0 +1,19 @@ +--- imake-1.0.6/Makefile.am.orig 2013-12-09 12:21:18.374675219 +0000 ++++ imake-1.0.6/Makefile.am 2013-12-09 12:21:53.367776337 +0000 +@@ -76,13 +76,13 @@ + $(MKHTMLINDEX) + + xmkmf: xmkmf.cpp +- $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DCONFIGDIRSPEC='"-I$(XCONFDIR)"' < $(srcdir)/xmkmf.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@ ++ $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DCONFIGDIRSPEC='"-I$(XCONFDIR)"' $(srcdir)/xmkmf.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@ + + ccmakedep: mdepend.cpp +- $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DPREPROC='"$(PREPROCESSCMD_MKDEPEND)"' < $(srcdir)/mdepend.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@ ++ $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DPREPROC='"$(PREPROCESSCMD_MKDEPEND)"' $(srcdir)/mdepend.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@ + + mergelib: mergelib.cpp +- $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DARCMD="$(ARCMD)" -DRANLIB="$(RANLIB)" < $(srcdir)/mergelib.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@ ++ $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DARCMD="$(ARCMD)" -DRANLIB="$(RANLIB)" $(srcdir)/mergelib.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@ + + if HAS_PERL + MKHTMLINDEX_SCRIPT = $(srcdir)/mkhtmlindex.pl diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD index 893fd7e0c..2d19ecc16 100644 --- a/extra/inkscape/PKGBUILD +++ b/extra/inkscape/PKGBUILD @@ -1,33 +1,37 @@ -# $Id: PKGBUILD 198681 2013-11-02 04:22:27Z bisson $ +# $Id: PKGBUILD 200656 2013-12-01 09:50:21Z andyrtr $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> # Contributor: tobias <tobias@archlinux.org> pkgname=inkscape pkgver=0.48.4 -pkgrel=12 +pkgrel=13 pkgdesc='Vector graphics editor using the SVG file format' url='http://inkscape.sourceforge.net/' license=('GPL' 'LGPL') arch=('i686' 'x86_64' 'mips64el') makedepends=('boost' 'intltool') -depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib>=0.22.3' 'popt' +depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib>=0.24.4' 'popt' 'python2' 'desktop-file-utils' 'hicolor-icon-theme') optdepends=('pstoedit: latex formulas' 'texlive-core: latex formulas' 'python2-numpy: some extensions' 'python2-lxml: some extensions and filters' 'uniconvertor: reading/writing to some proprietary formats') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2" - 'spuriouscomma.patch') +source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2 + spuriouscomma.patch + build_fix.diff) sha1sums=('5f26f6ad191d1e7c2a9fb69a438722beb172224c' - '7d1d5a6d1d2b0926721a994d5889c52890fc57c1') + '7d1d5a6d1d2b0926721a994d5889c52890fc57c1' + 'aba4d98bebae088c3401fd9259ea3cf70b96fbbf') install=install prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} patch -p0 -i ../spuriouscomma.patch + # fix build with freetype 2.5.1 + patch -Np0 -i ../build_fix.diff sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g' share/*/{test/,}*.py sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp @@ -37,7 +41,7 @@ prepare() { } build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure \ --prefix=/usr \ --with-python \ @@ -49,6 +53,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/inkscape/build_fix.diff b/extra/inkscape/build_fix.diff new file mode 100644 index 000000000..84cdc1ca6 --- /dev/null +++ b/extra/inkscape/build_fix.diff @@ -0,0 +1,15 @@ +=== modified file 'src/libnrtype/FontFactory.h' +--- src/libnrtype/FontFactory.h 2010-04-15 19:00:11 +0000 ++++ src/libnrtype/FontFactory.h 2013-11-28 05:54:34 +0000 +@@ -31,7 +31,8 @@ + #include <pango/pangowin32.h> + #else + #include <pango/pangoft2.h> +-#include <freetype/freetype.h> ++#include <ft2build.h> ++#include FT_FREETYPE_H + #endif + + namespace Glib + + diff --git a/extra/intel-tbb/PKGBUILD b/extra/intel-tbb/PKGBUILD index eb1b9748f..bbb1a2c89 100644 --- a/extra/intel-tbb/PKGBUILD +++ b/extra/intel-tbb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 194497 2013-09-16 20:37:59Z eric $ +# $Id: PKGBUILD 201331 2013-12-09 01:11:29Z eric $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Denis Martinez <deuns.martinez AT gmail.com> pkgname=intel-tbb -pkgver=4.2_20130725 +pkgver=4.2_20131118 pkgrel=1 pkgdesc='High level abstract threading library' arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ url='http://www.threadingbuildingblocks.org/' license=('GPL') depends=('gcc-libs') source=("http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb${pkgver/\./}oss_src.tgz") -sha1sums=('f354bd9b67295f65c43531b751e34f483ed8a024') +sha1sums=('46ab280c61b0e8cb953b3d9a75f93c858bcf8d05') build() { cd tbb${pkgver/\./}oss diff --git a/extra/irssi/PKGBUILD b/extra/irssi/PKGBUILD index 632c25308..069d5941c 100644 --- a/extra/irssi/PKGBUILD +++ b/extra/irssi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198115 2013-10-30 12:52:50Z allan $ +# $Id: PKGBUILD 200011 2013-11-21 01:40:28Z allan $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Dan McGee <dan@archlinux.org> pkgname=irssi pkgver=0.8.15 -pkgrel=7 +pkgrel=8 pkgdesc="Modular text mode IRC client with Perl scripting" arch=('i686' 'x86_64' 'mips64el') url="http://irssi.org/" diff --git a/extra/isapnptools/PKGBUILD b/extra/isapnptools/PKGBUILD deleted file mode 100644 index b5227742f..000000000 --- a/extra/isapnptools/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 188739 2013-06-19 02:11:11Z eric $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> - -pkgname=isapnptools -pkgver=1.27 -pkgrel=4 -pkgdesc="Allow ISA Plug-And-Play devices to be configured on a Linux machine" -url="http://www.roestock.demon.co.uk/isapnptools/" -depends=('glibc') -arch=('i686' 'x86_64') -license=('GPL') -#source=("ftp://metalab.unc.edu/pub/Linux/system/hardware/${pkgname}-${pkgver}.tgz") -source=("http://ibiblio.org/pub/Linux/system/hardware/${pkgname}-${pkgver}.tgz") -md5sums=('b997ba56583dc850fce9b93d658dfa0c') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr \ - --sbindir=/usr/bin - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install -} diff --git a/extra/jasper/PKGBUILD b/extra/jasper/PKGBUILD index 5e7751da1..fca5d5f1b 100644 --- a/extra/jasper/PKGBUILD +++ b/extra/jasper/PKGBUILD @@ -1,14 +1,16 @@ -# $Id: PKGBUILD 197251 2013-10-24 19:18:50Z eric $ +# $Id: PKGBUILD 201291 2013-12-08 01:10:40Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=jasper pkgver=1.900.1 -pkgrel=9 +pkgrel=10 pkgdesc="A software-based implementation of the codec specified in the emerging JPEG-2000 Part-1 standard" arch=('i686' 'x86_64' 'mips64el') url="http://www.ece.uvic.ca/~mdadams/jasper/" license=('custom:JasPer2.0') -depends=('libjpeg' 'freeglut' 'libxmu' 'glu') +depends=('libjpeg') +makedepends=('freeglut' 'libxmu' 'glu') +optdepends=('freeglut: for jiv support' 'glu: for jiv support') source=(http://www.ece.uvic.ca/~mdadams/${pkgname}/software/${pkgname}-${pkgver}.zip patch-libjasper-stepsizes-overflow.diff jasper-1.900.1-CVE-2008-3520.patch jpc_dec.c.patch jasper-1.900.1-CVE-2008-3522.patch) diff --git a/extra/joe/PKGBUILD b/extra/joe/PKGBUILD new file mode 100644 index 000000000..c3a691612 --- /dev/null +++ b/extra/joe/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 199794 2013-11-16 14:39:23Z thomas $ +# Maintainer: Thomas Bächler <thomas@archlinux.org> +pkgname=joe +pkgver=3.7 +pkgrel=4 +pkgdesc="Joe's own editor" +arch=('i686' 'x86_64') +url="http://sourceforge.net/projects/joe-editor" +license=('GPL') +depends=('ncurses') +optdepends=('gpm: console mouse support') +backup=('etc/joe/ftyperc' 'etc/joe/jicerc.ru' 'etc/joe/jmacsrc' + 'etc/joe/joerc' 'etc/joe/jpicorc' 'etc/joe/jstarrc' 'etc/joe/rjoerc') +source=("http://downloads.sourceforge.net/joe-editor/${pkgname}-${pkgver}.tar.gz") +md5sums=('66de1b073e869ba12abbfcde3885c577') +sha1sums=('54398578886d4a3d325aece52c308a939d31101d') + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + + ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man + make +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + + make DESTDIR="${pkgdir}/" install +} diff --git a/extra/js185/PKGBUILD b/extra/js185/PKGBUILD deleted file mode 100644 index 28b851668..000000000 --- a/extra/js185/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 183425 2013-04-21 22:11:08Z heftig $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=js185 -pkgver=1.0.0 -pkgrel=2 -pkgdesc="JavaScript interpreter and libraries (legacy)" -arch=(i686 x86_64 mips64el) -url="https://developer.mozilla.org/En/SpiderMonkey/1.8.5" -license=(MPL) -depends=(nspr gcc-libs) -makedepends=(python2 zip) -options=(!staticlibs) -source=(http://ftp.mozilla.org/pub/mozilla.org/js/$pkgname-$pkgver.tar.gz) -md5sums=('a4574365938222adca0a6bd33329cb32') - -build() { - cd js-1.8.5/js/src - - if [ "$CARCH" = "mips64el" ]; then - #Force disabling JIT. - sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \ - assembler/wtf/Platform.h - sed -ri 's/ENABLE_(JIT|ASSEMBLER)=1/ENABLE_\1=0/' Makefile.{in,ref} - extraconf="--disable-methodjit --disable-tracejit" - fi - - # _FORTIFY_SOURCE causes configure error - unset CPPFLAGS - - ./configure --prefix=/usr --with-system-nspr \ - --enable-threadsafe $extraconf - make -} - -package() { - cd js-1.8.5/js/src - make DESTDIR="$pkgdir" install - install -Dm755 shell/js "$pkgdir/usr/bin/js" - find "$pkgdir"/usr/{lib/pkgconfig,include} -type f -exec chmod -x {} + - - # Bad symlinks (absolute, including DESTDIR!) - cd "$pkgdir/usr/lib" - ln -sf libmozjs185.so.1.0.0 libmozjs185.so.1.0 - ln -sf libmozjs185.so.1.0 libmozjs185.so -} - -# vim:set ts=2 sw=2 et: diff --git a/extra/kactivities/PKGBUILD b/extra/kactivities/PKGBUILD index 7d522dcb7..e210caafd 100644 --- a/extra/kactivities/PKGBUILD +++ b/extra/kactivities/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198822 2013-11-05 19:43:12Z andrea $ +# $Id: PKGBUILD 202457 2013-12-22 12:46:37Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kactivities -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='API for using and interacting with the Activity Manager' @@ -11,7 +11,7 @@ license=('GPL' 'FDL') depends=('nepomuk-core') makedepends=('cmake' 'automoc4' 'mesa') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('74521e39e32e647b400e4495bc2dba2be0567ffa') +sha1sums=('966fa231942b24b510beafb4d3eb16226bde4ec0') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-jovie/PKGBUILD b/extra/kdeaccessibility-jovie/PKGBUILD index a1b81ae86..5c190c319 100644 --- a/extra/kdeaccessibility-jovie/PKGBUILD +++ b/extra/kdeaccessibility-jovie/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198849 2013-11-05 19:49:19Z andrea $ +# $Id: PKGBUILD 202484 2013-12-22 12:47:07Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-jovie -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='A text to speech application' @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdeaccessibility-kttsd') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/jovie-${pkgver}.tar.xz") -sha1sums=('9b2d3058b7ff0324015e80f6ef6f6a3d1ad63b53') +sha1sums=('c14c3afbc5f1290adc5d421330fd423b470542fe') build() { mkdir build diff --git a/extra/kdeaccessibility-kaccessible/PKGBUILD b/extra/kdeaccessibility-kaccessible/PKGBUILD index a697cd3d8..bdb354243 100644 --- a/extra/kdeaccessibility-kaccessible/PKGBUILD +++ b/extra/kdeaccessibility-kaccessible/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198850 2013-11-05 19:49:30Z andrea $ +# $Id: PKGBUILD 202485 2013-12-22 12:47:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kaccessible -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='Provides accessibility services like focus tracking and a screenreader' @@ -12,7 +12,7 @@ groups=('kde' 'kdeaccessibility') depends=('kdelibs' 'speech-dispatcher') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kaccessible-${pkgver}.tar.xz") -sha1sums=('3aedf1a924ab691551a349514a4f7e215f4a98e4') +sha1sums=('a1e850b14bbf08269557c2f1edea4ac5b0e2773f') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmag/PKGBUILD b/extra/kdeaccessibility-kmag/PKGBUILD index 119b1c8d5..be5f4624d 100644 --- a/extra/kdeaccessibility-kmag/PKGBUILD +++ b/extra/kdeaccessibility-kmag/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198851 2013-11-05 19:49:41Z andrea $ +# $Id: PKGBUILD 202486 2013-12-22 12:47:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmag -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='Screen Magnifier' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmag-${pkgver}.tar.xz") -sha1sums=('44bf5f6ee2eaa9b56c2cb90650170d8d53d5e6bd') +sha1sums=('b75992bfe53ab7e22e33d5746ed28ab9583be816') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmousetool/PKGBUILD b/extra/kdeaccessibility-kmousetool/PKGBUILD index a2c70d887..9fd2e6ab8 100644 --- a/extra/kdeaccessibility-kmousetool/PKGBUILD +++ b/extra/kdeaccessibility-kmousetool/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198852 2013-11-05 19:49:50Z andrea $ +# $Id: PKGBUILD 202487 2013-12-22 12:47:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmousetool -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='Clicks the mouse for you, reducing the effects of RSI' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmousetool-${pkgver}.tar.xz") -sha1sums=('4a45d54d6baeb4df2528ec8ce7cb93c1c6f60723') +sha1sums=('3c61d8a183c9e1fedb6eff6b0dd6937135a429f8') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmouth/PKGBUILD b/extra/kdeaccessibility-kmouth/PKGBUILD index ce56dd1a9..eafc248ab 100644 --- a/extra/kdeaccessibility-kmouth/PKGBUILD +++ b/extra/kdeaccessibility-kmouth/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198853 2013-11-05 19:50:00Z andrea $ +# $Id: PKGBUILD 202488 2013-12-22 12:47:12Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmouth -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='Speech Synthesizer Frontend' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmouth-${pkgver}.tar.xz") -sha1sums=('60f2417da21f5af70379a6186473b6e93973a5e8') +sha1sums=('a934e8b73a5a71293a63b45f038751318c04a1bf') build() { cd "${srcdir}" diff --git a/extra/kdeadmin-kcron/PKGBUILD b/extra/kdeadmin-kcron/PKGBUILD index 7c311c68d..e58c57731 100644 --- a/extra/kdeadmin-kcron/PKGBUILD +++ b/extra/kdeadmin-kcron/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198854 2013-11-05 19:50:10Z andrea $ +# $Id: PKGBUILD 202489 2013-12-22 12:47:13Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeadmin-kcron -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc='Configure and schedule tasks' url='http://userbase.kde.org/KCron' @@ -12,7 +12,7 @@ groups=('kde' 'kdeadmin') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kcron-${pkgver}.tar.xz") -sha1sums=('4c70b28a3830a5eb0db555366966f921eb8ee601') +sha1sums=('7f64eb62048360f5d14ce273e7eff2c48c9d0567') build() { mkdir build diff --git a/extra/kdeadmin-ksystemlog/PKGBUILD b/extra/kdeadmin-ksystemlog/PKGBUILD index 1597fa6bf..ece449f1f 100644 --- a/extra/kdeadmin-ksystemlog/PKGBUILD +++ b/extra/kdeadmin-ksystemlog/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198855 2013-11-05 19:50:20Z andrea $ +# $Id: PKGBUILD 202490 2013-12-22 12:47:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeadmin-ksystemlog -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc='System log viewer tool' url='http://kde.org/applications/system/ksystemlog/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/ksystemlog-${pkgver}.tar.xz" 'syslog-path.patch') -sha1sums=('31347f642b7735c477922b8dd8765b85c9ba5554' +sha1sums=('0e7b62342acf505d384328de2528cb22120ef639' '20095ce6e0f3e5b6800a7c6e52de6fddba62c031') prepare() { diff --git a/extra/kdeadmin-kuser/PKGBUILD b/extra/kdeadmin-kuser/PKGBUILD index 09a978f8f..76aa1fd4b 100644 --- a/extra/kdeadmin-kuser/PKGBUILD +++ b/extra/kdeadmin-kuser/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198856 2013-11-05 19:50:40Z andrea $ +# $Id: PKGBUILD 202491 2013-12-22 12:47:15Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeadmin-kuser -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc='User Manager' url='http://kde.org/applications/system/kuser/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'kdepimlibs') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kuser-${pkgver}.tar.xz") -sha1sums=('675b2dd1745cd6566bea724e8b641c5408dead50') +sha1sums=('36610297b6f41d075fc638fdab6910f3558cdcc2') build() { mkdir build diff --git a/extra/kdeartwork/PKGBUILD b/extra/kdeartwork/PKGBUILD index 44194b935..522c8574e 100644 --- a/extra/kdeartwork/PKGBUILD +++ b/extra/kdeartwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 198857 2013-11-05 19:50:55Z andrea $ +# $Id: PKGBUILD 202492 2013-12-22 12:47:17Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -8,11 +8,10 @@ pkgname=('kdeartwork-colorschemes' 'kdeartwork-emoticons' 'kdeartwork-iconthemes' 'kdeartwork-kscreensaver' - 'kdeartwork-sounds' 'kdeartwork-styles' 'kdeartwork-wallpapers' 'kdeartwork-weatherwallpapers') -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -20,7 +19,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdeartwork') makedepends=('cmake' 'automoc4' 'xscreensaver' 'eigen' 'kdebase-workspace' 'libkexiv2') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('c51a79c907f294bc559e181fe7c4ec733361fe2b') +sha1sums=('a5042ff6768a4857649a526199c9cda9c6976e6a') build() { cd $srcdir @@ -67,12 +66,6 @@ package_kdeartwork-kscreensaver() { make DESTDIR=$pkgdir install } -package_kdeartwork-sounds() { - pkgdesc='KDE sounds' - cd $srcdir/build/sounds - make DESTDIR=$pkgdir install -} - package_kdeartwork-styles() { pkgdesc='KDE styles' depends=('kdebase-workspace') diff --git a/extra/kdebase-konsole/PKGBUILD b/extra/kdebase-konsole/PKGBUILD index 4947c16e4..67397523a 100644 --- a/extra/kdebase-konsole/PKGBUILD +++ b/extra/kdebase-konsole/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198858 2013-11-05 19:51:42Z andrea $ +# $Id: PKGBUILD 202493 2013-12-22 12:47:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebase-konsole -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://kde.org/applications/system/konsole/' @@ -12,7 +12,7 @@ groups=('kde' 'kdebase') depends=('kdebase-runtime' 'kdebase-lib') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/konsole-${pkgver}.tar.xz") -sha1sums=('16b282bd0ec32e712631f4a2b5c32aa8439f15f4') +sha1sums=('3e4d16c6837c1ba83e8e8440124bd870eca1ba1c') build() { cd "${srcdir}" diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index 4fbaba776..b6d1cd6a3 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 198835 2013-11-05 19:46:28Z andrea $ +# $Id: PKGBUILD 202712 2013-12-25 21:25:47Z andyrtr $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-workspace _pkgname=kde-workspace -pkgver=4.11.3 -pkgrel=1 +pkgver=4.11.4 +pkgrel=2 pkgdesc="Provides the interface and basic tools for the KDE workspace" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kde-workspace' @@ -28,7 +28,7 @@ backup=('usr/share/config/kdm/kdmrc') source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate' 'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch') -sha1sums=('b806e54be72f31d8b2001bc953445e75b5b79da6' +sha1sums=('c1e2b669f5a1607bcce7e92d9213af1ee809d79e' '660eae40a707d2711d8d7f32a93214865506b795' '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' diff --git a/extra/kdebase/PKGBUILD b/extra/kdebase/PKGBUILD index 4b8b4aeb5..9a7a50bab 100644 --- a/extra/kdebase/PKGBUILD +++ b/extra/kdebase/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 198837 2013-11-05 19:47:04Z andrea $ +# $Id: PKGBUILD 202472 2013-12-22 12:46:54Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -11,7 +11,7 @@ pkgname=('kdebase-dolphin' 'kdebase-konq-plugins' 'kdebase-lib' 'kdebase-plasma') -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -19,7 +19,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdebase') makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'nepomuk-widgets') source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz") -sha1sums=('f2a6f4220efe395c124d8981edaaca0a462640b5') +sha1sums=('e85b5445380e44894efcaa21f4c95fad1ed4c4f6') prepare() { mkdir build diff --git a/extra/kdebindings-kimono/PKGBUILD b/extra/kdebindings-kimono/PKGBUILD index 759e535f8..4b73f21db 100644 --- a/extra/kdebindings-kimono/PKGBUILD +++ b/extra/kdebindings-kimono/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198859 2013-11-05 19:51:53Z andrea $ +# $Id: PKGBUILD 202494 2013-12-22 12:47:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-kimono -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc=".NET/Mono bindings for the KDE libraries" url="https://projects.kde.org/projects/kde/kdebindings/csharp/kimono" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs') optdepends=('kdepimlibs: akonadi bindings') conflicts=('kdebindings-csharp') source=("http://download.kde.org/stable/${pkgver}/src/kimono-${pkgver}.tar.xz") -sha1sums=('6e382ec674eaf19d865edf58f0c7d96824220cb8') +sha1sums=('f943de3f84ddb0ff6beec922ae9f4d890f83bb5c') build() { cd "${srcdir}" diff --git a/extra/kdebindings-korundum/PKGBUILD b/extra/kdebindings-korundum/PKGBUILD index af378260b..702a28e82 100644 --- a/extra/kdebindings-korundum/PKGBUILD +++ b/extra/kdebindings-korundum/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198860 2013-11-05 19:52:04Z andrea $ +# $Id: PKGBUILD 202495 2013-12-22 12:47:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-korundum -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="Ruby bindings for libraries created by the KDE community" url="https://projects.kde.org/projects/kde/kdebindings/ruby/korundum" @@ -16,7 +16,7 @@ optdepends=('kdegraphics-okular: okular bindings' 'kdepimlibs: akonadi bindings') conflicts=('kdebindings-ruby') source=("http://download.kde.org/stable/${pkgver}/src/korundum-${pkgver}.tar.xz") -sha1sums=('9622fd4a20a423b2fbc0de0b6258cb8de5262002') +sha1sums=('0b2a5f4453116a773ae446268efe697accc0d4c4') prepare() { mkdir build diff --git a/extra/kdebindings-kross/PKGBUILD b/extra/kdebindings-kross/PKGBUILD index 50e24db00..c4546ad49 100644 --- a/extra/kdebindings-kross/PKGBUILD +++ b/extra/kdebindings-kross/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 198861 2013-11-05 19:52:14Z andrea $ +# $Id: PKGBUILD 202496 2013-12-22 12:47:21Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdebindings-kross pkgname=('kdebindings-kross-python' # 'kdebindings-kross-ruby' 'kdebindings-kross-java') -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 url="https://projects.kde.org/projects/kde/kdebindings/kross-interpreters" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'java-environment') source=("http://download.kde.org/stable/${pkgver}/src/kross-interpreters-${pkgver}.tar.xz") -sha1sums=('1e3af7d4f43ff744e64c7dc24677feeddcb9384c') +sha1sums=('26663d13d13f001eaf359ac3af0aab133b0ed558') build() { cd "${srcdir}" diff --git a/extra/kdebindings-perlkde/PKGBUILD b/extra/kdebindings-perlkde/PKGBUILD index c7fe9045f..2201a0e87 100644 --- a/extra/kdebindings-perlkde/PKGBUILD +++ b/extra/kdebindings-perlkde/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198862 2013-11-05 19:52:24Z andrea $ +# $Id: PKGBUILD 202497 2013-12-22 12:47:22Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlkde -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="Perl bindings for the KDE libraries" url="https://projects.kde.org/projects/kde/kdebindings/perl/perlkde" @@ -13,7 +13,7 @@ depends=('kdebindings-perlqt' 'kdebindings-smokekde') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate') source=("http://download.kde.org/stable/${pkgver}/src/perlkde-${pkgver}.tar.xz") -sha1sums=('5b7aac1eab0577a0a95612535e7c0d0e02cb057d') +sha1sums=('a69983100fd2b66f478e7b39b6fe0ce49813db6d') build() { mkdir build diff --git a/extra/kdebindings-perlqt/PKGBUILD b/extra/kdebindings-perlqt/PKGBUILD index 845d4c168..7f1c356a2 100644 --- a/extra/kdebindings-perlqt/PKGBUILD +++ b/extra/kdebindings-perlqt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198831 2013-11-05 19:45:33Z andrea $ +# $Id: PKGBUILD 202467 2013-12-22 12:46:49Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlqt -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="Perl bindings for the Qt libraries" url="https://projects.kde.org/projects/kde/kdebindings/perl/perlqt" @@ -12,7 +12,7 @@ groups=('kdebindings') depends=('kdebindings-smokeqt' 'perl-list-moreutils') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.xz") -sha1sums=('fb81299b5148cf6f9060e0ba09d4651e51f86404') +sha1sums=('0b66d85af437dba188b9d9381dbd50114ff1c925') build() { mkdir build diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD index dee0d2b37..72676f06a 100644 --- a/extra/kdebindings-python/PKGBUILD +++ b/extra/kdebindings-python/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 198828 2013-11-05 19:44:52Z andrea $ +# $Id: PKGBUILD 202464 2013-12-22 12:46:46Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdebindings-python pkgname=('kdebindings-python' 'kdebindings-python2' 'kdebindings-python-common') -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 url='https://projects.kde.org/projects/kde/kdebindings/pykde4' arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ groups=('kdebindings') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt4' 'python-pyqt4' 'qscintilla' 'python2-sip' 'python-sip' 'mesa') source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz") -sha1sums=('3a42c70bc994a1e74e777bad2e54478ae1d1da0c') +sha1sums=('64661b5fcce6b45cddf1f6ddfc17862c939a18af') prepare() { mkdir build diff --git a/extra/kdebindings-qtruby/PKGBUILD b/extra/kdebindings-qtruby/PKGBUILD index 811148b87..acdc7ccee 100644 --- a/extra/kdebindings-qtruby/PKGBUILD +++ b/extra/kdebindings-qtruby/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198833 2013-11-05 19:45:56Z andrea $ +# $Id: PKGBUILD 202469 2013-12-22 12:46:52Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-qtruby -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="Ruby bindings for the Qt libraries" url="https://projects.kde.org/projects/kde/kdebindings/ruby/qtruby" @@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'ruby') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') conflicts=('kdebindings-ruby') source=("http://download.kde.org/stable/${pkgver}/src/qtruby-${pkgver}.tar.xz") -sha1sums=('b2c8c16744c314af2fd6cc7afabe48fdfd274266') +sha1sums=('a1ab8e5607bb8f2a046c06907592738652daf1dd') build() { mkdir build diff --git a/extra/kdebindings-qyoto/PKGBUILD b/extra/kdebindings-qyoto/PKGBUILD index 00223368d..a87fd0c64 100644 --- a/extra/kdebindings-qyoto/PKGBUILD +++ b/extra/kdebindings-qyoto/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198832 2013-11-05 19:45:45Z andrea $ +# $Id: PKGBUILD 202468 2013-12-22 12:46:50Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-qyoto -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc=".NET/Mono bindings for the Qt libraries" url="https://projects.kde.org/projects/kde/kdebindings/csharp/qyoto" @@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'mono') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') conflicts=('kdebindings-csharp') source=("http://download.kde.org/stable/${pkgver}/src/qyoto-${pkgver}.tar.xz") -sha1sums=('5eb6107665cdf9cdc6b53dd17656866c252110d9') +sha1sums=('581e1bf9eb0d056be21e32851919e9abf60c967e') build() { mkdir build diff --git a/extra/kdebindings-smokegen/PKGBUILD b/extra/kdebindings-smokegen/PKGBUILD index 44e2da37c..7c9798f44 100644 --- a/extra/kdebindings-smokegen/PKGBUILD +++ b/extra/kdebindings-smokegen/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198825 2013-11-05 19:44:15Z andrea $ +# $Id: PKGBUILD 202460 2013-12-22 12:46:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokegen -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="A general purpose C++ parser with a plugin infrastructure" url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokegen" @@ -12,7 +12,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokegen-${pkgver}.tar.xz") -sha1sums=('ceb0385627c199384351d5c649ae384e5c5dcc02') +sha1sums=('5385b2851d16d186be4cc4bc4d5af901d8f444bf') build() { cd "${srcdir}" diff --git a/extra/kdebindings-smokekde/PKGBUILD b/extra/kdebindings-smokekde/PKGBUILD index a053ad548..bc680f29c 100644 --- a/extra/kdebindings-smokekde/PKGBUILD +++ b/extra/kdebindings-smokekde/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198830 2013-11-05 19:45:21Z andrea $ +# $Id: PKGBUILD 202466 2013-12-22 12:46:48Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokekde -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="Language independent library for KDE bindings" url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokekde" @@ -18,7 +18,7 @@ optdepends=('kdesdk-kate: Kate bindings' 'kdepimlibs: akonadi bindings') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokekde-${pkgver}.tar.xz") -sha1sums=('6cd8c535a0f6b40dab4c96c45a0301a9c7abd507') +sha1sums=('9f1d249d3fcedefba49dc26afc1a1c5c0ad730d6') build() { mkdir build diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD index 4079403da..48a639632 100644 --- a/extra/kdebindings-smokeqt/PKGBUILD +++ b/extra/kdebindings-smokeqt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198826 2013-11-05 19:44:29Z andrea $ +# $Id: PKGBUILD 202461 2013-12-22 12:46:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokeqt -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="Language independent library for Qt bindings" url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokeqt" @@ -13,11 +13,13 @@ depends=('kdebindings-smokegen' 'qimageblitz' 'qscintilla') makedepends=('cmake' 'automoc4' 'mesa') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokeqt-${pkgver}.tar.xz") -sha1sums=('eaa6df3360174a34ff987622d024d09c2fce358c') +sha1sums=('d5b47c8a21f9856a7ea8729c0cb01dad4db2d13e') -build() { - cd "${srcdir}" +prepare() { mkdir build +} + +build() { cd build cmake ../smokeqt-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ @@ -28,6 +30,6 @@ build() { } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/kdeedu-analitza/PKGBUILD b/extra/kdeedu-analitza/PKGBUILD index b96597258..b55854559 100644 --- a/extra/kdeedu-analitza/PKGBUILD +++ b/extra/kdeedu-analitza/PKGBUILD @@ -1,22 +1,24 @@ -# $Id: PKGBUILD 198844 2013-11-05 19:48:24Z andrea $ +# $Id: PKGBUILD 202478 2013-12-22 12:47:02Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-analitza -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="A library to add mathematical features to your program" url="https://projects.kde.org/projects/kde/kdeedu/analitza" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdeedu') -depends=('kdebase-runtime') +depends=('kdebase-runtime' 'glu') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/analitza-${pkgver}.tar.xz") -sha1sums=('525844959de2c21888496eb5aaf5b7996ccf823e') +sha1sums=('a90c58d24c8cba048fc5303ef35e870536603119') -build() { - cd "${srcdir}" +prepare() { mkdir build +} + +build() { cd build cmake ../analitza-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ @@ -26,6 +28,6 @@ build() { } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/kdeedu-blinken/PKGBUILD b/extra/kdeedu-blinken/PKGBUILD index f420fe8ad..e984f8b4c 100644 --- a/extra/kdeedu-blinken/PKGBUILD +++ b/extra/kdeedu-blinken/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198863 2013-11-05 19:52:35Z andrea $ +# $Id: PKGBUILD 202498 2013-12-22 12:47:23Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-blinken -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="Memory Enhancement Game" url="http://kde.org/applications/education/blinken/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/blinken-${pkgver}.tar.xz") -sha1sums=('c556d8c35a93dd0a85c1a7508c0353dc1b6ef61e') +sha1sums=('eb081e53375559f67cec380833b1514de635f985') build() { cd "${srcdir}" diff --git a/extra/kdeedu-cantor/PKGBUILD b/extra/kdeedu-cantor/PKGBUILD index 7b6ed11d4..471e93f99 100644 --- a/extra/kdeedu-cantor/PKGBUILD +++ b/extra/kdeedu-cantor/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198864 2013-11-05 19:52:47Z andrea $ +# $Id: PKGBUILD 202499 2013-12-22 12:47:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-cantor -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="KDE Frontend to Mathematical Software" url="http://kde.org/applications/education/cantor/" @@ -16,7 +16,7 @@ optdepends=('maxima: Maxima backend' 'r: R backend') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.xz") -sha1sums=('fb0e450c0591db62ec9f71532a90c1ad15187c2e') +sha1sums=('9a7a27a375bfbb3ffacf0b9b762eaa9b3d4310f2') prepare() { mkdir build diff --git a/extra/kdeedu-kalgebra/PKGBUILD b/extra/kdeedu-kalgebra/PKGBUILD index 44e2a393e..75227703b 100644 --- a/extra/kdeedu-kalgebra/PKGBUILD +++ b/extra/kdeedu-kalgebra/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198865 2013-11-05 19:52:57Z andrea $ +# $Id: PKGBUILD 202500 2013-12-22 12:47:26Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kalgebra -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="Graph Calculator" url="http://kde.org/applications/education/kalgebra/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu' 'kdeedu-analitza') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kalgebra-${pkgver}.tar.xz") -sha1sums=('3852c19219164403c21ab4cab0ffa4e1599ddfa3') +sha1sums=('b4a76e4c06fc68a363727a712b1ca4673d6c816d') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kalzium/PKGBUILD b/extra/kdeedu-kalzium/PKGBUILD index b2a129968..d0c0d9b1a 100644 --- a/extra/kdeedu-kalzium/PKGBUILD +++ b/extra/kdeedu-kalzium/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198866 2013-11-05 19:53:06Z andrea $ +# $Id: PKGBUILD 202501 2013-12-22 12:47:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kalzium -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="Periodic Table of Elements" url="http://kde.org/applications/education/kalzium/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'avogadro' 'ocaml' 'facile' 'chemical-mime-data') makedepends=('cmake' 'automoc4' 'mesa') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kalzium-${pkgver}.tar.xz") -sha1sums=('5a83d5fd65b9486c982f68070ece63a3ce1e0b8d') +sha1sums=('8b21468f6149395b9fe0e5f38d7f8c359fa7375e') build() { mkdir build diff --git a/extra/kdeedu-kanagram/PKGBUILD b/extra/kdeedu-kanagram/PKGBUILD index 405951c4a..8a81b93e8 100644 --- a/extra/kdeedu-kanagram/PKGBUILD +++ b/extra/kdeedu-kanagram/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198867 2013-11-05 19:53:17Z andrea $ +# $Id: PKGBUILD 202502 2013-12-22 12:47:29Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kanagram -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="Letter Order Game" url="http://kde.org/applications/education/kanagram/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kanagram-${pkgver}.tar.xz") -sha1sums=('eb86e5b7abc48dffdd14d68143484db1b4906d95') +sha1sums=('13a836b56ea16693a56c320d8082e2153d1d0dcd') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kbruch/PKGBUILD b/extra/kdeedu-kbruch/PKGBUILD index 88c297f45..a7731eead 100644 --- a/extra/kdeedu-kbruch/PKGBUILD +++ b/extra/kdeedu-kbruch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198868 2013-11-05 19:53:27Z andrea $ +# $Id: PKGBUILD 202503 2013-12-22 12:47:30Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kbruch -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="Exercise Fractions" url="http://kde.org/applications/education/kbruch/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kbruch-${pkgver}.tar.xz") -sha1sums=('b9f693a95071e169e4593d090979e9263828a26a') +sha1sums=('a8611ddfa4b22c8d13128c3e120d2407b9bf3674') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kgeography/PKGBUILD b/extra/kdeedu-kgeography/PKGBUILD index ad01403b5..2c0cd59be 100644 --- a/extra/kdeedu-kgeography/PKGBUILD +++ b/extra/kdeedu-kgeography/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198869 2013-11-05 19:53:37Z andrea $ +# $Id: PKGBUILD 202504 2013-12-22 12:47:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kgeography -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="Geography Trainer" url="http://kde.org/applications/education/kgeography/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kgeography-${pkgver}.tar.xz") -sha1sums=('21fe59b502814181a604fbbd7546738294eba84e') +sha1sums=('6984a2d88dc488257be8d3471a6241ca0e456788') build() { cd "${srcdir}" diff --git a/extra/kdeedu-khangman/PKGBUILD b/extra/kdeedu-khangman/PKGBUILD index 69ccd260e..43a70ae70 100644 --- a/extra/kdeedu-khangman/PKGBUILD +++ b/extra/kdeedu-khangman/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198870 2013-11-05 19:53:47Z andrea $ +# $Id: PKGBUILD 202505 2013-12-22 12:47:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-khangman -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="Hangman Game" url="http://kde.org/applications/education/khangman/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/khangman-${pkgver}.tar.xz") -sha1sums=('0cef2c1bbe9bdeab182de5abba55a79f98cc0b08') +sha1sums=('a7e3883fd49843bb3e9addff24ebb748dd42b86a') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kig/PKGBUILD b/extra/kdeedu-kig/PKGBUILD index 2d2b80167..fd3d408e0 100644 --- a/extra/kdeedu-kig/PKGBUILD +++ b/extra/kdeedu-kig/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198871 2013-11-05 19:53:57Z andrea $ +# $Id: PKGBUILD 202506 2013-12-22 12:47:34Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kig -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="Interactive Geometry" url="http://kde.org/applications/education/kig/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4' 'boost') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.xz") -sha1sums=('02e485471a120ab2d39bfdc176cb136eaa1545c0') +sha1sums=('16ed1da7cb7d49a87d009791026590ac9db7b1e2') build() { mkdir build diff --git a/extra/kdeedu-kiten/PKGBUILD b/extra/kdeedu-kiten/PKGBUILD index 310e04121..98a1295ce 100644 --- a/extra/kdeedu-kiten/PKGBUILD +++ b/extra/kdeedu-kiten/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198872 2013-11-05 19:54:08Z andrea $ +# $Id: PKGBUILD 202507 2013-12-22 12:47:37Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kiten -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="Japanese Reference/Study Tool" url="http://kde.org/applications/education/kiten/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kiten-${pkgver}.tar.xz") -sha1sums=('b57043aa783b61fba706058c161c5ccd925e6d19') +sha1sums=('d5aa061642ff9e32722d4014ad0816d2fb70dbaa') build() { cd "${srcdir}" diff --git a/extra/kdeedu-klettres/PKGBUILD b/extra/kdeedu-klettres/PKGBUILD index 10710437b..cae25be11 100644 --- a/extra/kdeedu-klettres/PKGBUILD +++ b/extra/kdeedu-klettres/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198873 2013-11-05 19:54:19Z andrea $ +# $Id: PKGBUILD 202508 2013-12-22 12:47:39Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-klettres -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="Learn The Alphabet" url="http://kde.org/applications/education/klettres/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/klettres-${pkgver}.tar.xz") -sha1sums=('14500ed25d6837c9f822fd6b29f21152eebb82eb') +sha1sums=('47a8e13c94111b7cf3fbabf4e84f22e30ac10884') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kmplot/PKGBUILD b/extra/kdeedu-kmplot/PKGBUILD index eb73d2d87..e4f4f2bb1 100644 --- a/extra/kdeedu-kmplot/PKGBUILD +++ b/extra/kdeedu-kmplot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198874 2013-11-05 19:54:48Z andrea $ +# $Id: PKGBUILD 202509 2013-12-22 12:47:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kmplot -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="Mathematical Function Plotter" url="http://kde.org/applications/education/kmplot/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmplot-${pkgver}.tar.xz") -sha1sums=('d2a5c8f6b01fd88c7d5acc91494c157df869f8e7') +sha1sums=('6f6253c7cf2656777e1599747d36286bd75bf6f5') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kstars/PKGBUILD b/extra/kdeedu-kstars/PKGBUILD index 2213a45af..a8c1dd525 100644 --- a/extra/kdeedu-kstars/PKGBUILD +++ b/extra/kdeedu-kstars/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198875 2013-11-05 19:54:57Z andrea $ +# $Id: PKGBUILD 202510 2013-12-22 12:47:42Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kstars -pkgver=4.11.3 -pkgrel=1 +pkgver=4.12.0 +pkgrel=3 pkgdesc="Desktop Planetarium" url="http://kde.org/applications/education/kstars/" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'wcslib' 'libindi') makedepends=('cmake' 'automoc4' 'eigen') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kstars-${pkgver}.tar.xz") -sha1sums=('92a54609a43a65e81ff80b15d6fd1be20e123a60') +sha1sums=('b8e1b95b1b7b1c31ff628fb2b8779293c72a8d8a') build() { mkdir build diff --git a/extra/kdeedu-ktouch/PKGBUILD b/extra/kdeedu-ktouch/PKGBUILD index 12ab43f7c..83672a8bd 100644 --- a/extra/kdeedu-ktouch/PKGBUILD +++ b/extra/kdeedu-ktouch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198876 2013-11-05 19:55:09Z andrea $ +# $Id: PKGBUILD 202511 2013-12-22 12:47:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-ktouch -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="Touch Typing Tutor" url="http://kde.org/applications/education/ktouch/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4' 'mesa') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ktouch-${pkgver}.tar.xz") -sha1sums=('4996509f4aa8d896095dd116be56c8f36739a465') +sha1sums=('59f37ce92d918d3bce8520bc58c3651213d092e8') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kturtle/PKGBUILD b/extra/kdeedu-kturtle/PKGBUILD index 71ab780c6..04255af9a 100644 --- a/extra/kdeedu-kturtle/PKGBUILD +++ b/extra/kdeedu-kturtle/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198877 2013-11-05 19:55:19Z andrea $ +# $Id: PKGBUILD 202512 2013-12-22 12:47:45Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kturtle -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="Educational Programming Environment" url="http://kde.org/applications/education/kturtle/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kturtle-${pkgver}.tar.xz") -sha1sums=('3faaf8994a6bbb7c4b5459aa0ea060e49f3a0c4d') +sha1sums=('2623bf1647cc26706edcd4e0ed4b4fca0dfb3fb2') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kwordquiz/PKGBUILD b/extra/kdeedu-kwordquiz/PKGBUILD index 97a7c3818..a0bdf3e7b 100644 --- a/extra/kdeedu-kwordquiz/PKGBUILD +++ b/extra/kdeedu-kwordquiz/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198878 2013-11-05 19:55:28Z andrea $ +# $Id: PKGBUILD 202513 2013-12-22 12:47:47Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kwordquiz -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="Flash Card Trainer" url="http://kde.org/applications/education/kwordquiz/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kwordquiz-${pkgver}.tar.xz") -sha1sums=('f46e6b5919942d4b563bf1e867330550ec5594b7') +sha1sums=('522e3dd60630be1c97e740d3fc80db231859df86') build() { cd "${srcdir}" diff --git a/extra/kdeedu-marble/PKGBUILD b/extra/kdeedu-marble/PKGBUILD index 4e190687e..6c21e24b0 100644 --- a/extra/kdeedu-marble/PKGBUILD +++ b/extra/kdeedu-marble/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198839 2013-11-05 19:47:27Z andrea $ +# $Id: PKGBUILD 202474 2013-12-22 12:46:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-marble -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="Desktop Globe" url="http://kde.org/applications/education/marble/" @@ -11,13 +11,17 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdeedu') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4' 'gpsd') -optdepends=('gpsd: gps support') +optdepends=('gpsd: GPS support' + 'quazip: reading and displaying KMZ files') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz") -sha1sums=('b0b0cf06b4c60262861e748c6815d62513df13a7') +sha1sums=('65f4272a015b36b06d7aacf1a4dd6e757557e2b9') -build() { +prepare() { mkdir build +} + +build() { cd build cmake ../marble-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/extra/kdeedu-pairs/PKGBUILD b/extra/kdeedu-pairs/PKGBUILD index 6f8e7e2fb..1e0f6b287 100644 --- a/extra/kdeedu-pairs/PKGBUILD +++ b/extra/kdeedu-pairs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198879 2013-11-05 19:55:38Z andrea $ +# $Id: PKGBUILD 202514 2013-12-22 12:47:48Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-pairs -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="A memory and pairs game for KDE" url="https://projects.kde.org/projects/kde/kdeedu/pairs" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/pairs-${pkgver}.tar.xz") -sha1sums=('d4825df57d5526aea3dc4308aceee6c65f41efba') +sha1sums=('a153626127d757105473a1a0b174e4f67f87aa2e') build() { cd "${srcdir}" diff --git a/extra/kdeedu-parley/PKGBUILD b/extra/kdeedu-parley/PKGBUILD index fb0e9fef7..3d8d68dcf 100644 --- a/extra/kdeedu-parley/PKGBUILD +++ b/extra/kdeedu-parley/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198880 2013-11-05 19:55:48Z andrea $ +# $Id: PKGBUILD 202515 2013-12-22 12:47:49Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-parley -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="Vocabulary Trainer" url="http://kde.org/applications/education/parley/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kdebindings-kross-python: scripting support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/parley-${pkgver}.tar.xz") -sha1sums=('2a0065fcfdb48db3dcdae992a7f8094035f6e81d') +sha1sums=('6b5fac34f4f6c9cd9f43a1137574be0396d10768') build() { mkdir build diff --git a/extra/kdeedu-rocs/PKGBUILD b/extra/kdeedu-rocs/PKGBUILD index c2e8d5276..b27c52d27 100644 --- a/extra/kdeedu-rocs/PKGBUILD +++ b/extra/kdeedu-rocs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198881 2013-11-05 19:55:59Z andrea $ +# $Id: PKGBUILD 202516 2013-12-22 12:47:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-rocs -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="Rocs Graph Theory" url="http://kde.org/applications/education/rocs/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4' 'boost') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/rocs-${pkgver}.tar.xz") -sha1sums=('b1693d7bf589666334e08fa2258d7e4c90d44283') +sha1sums=('bec5211b4c1c384f515bfaa0a98a5c2684bbdab4') build() { cd "${srcdir}" diff --git a/extra/kdeedu-step/PKGBUILD b/extra/kdeedu-step/PKGBUILD index 47f85588a..948390579 100644 --- a/extra/kdeedu-step/PKGBUILD +++ b/extra/kdeedu-step/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198882 2013-11-05 19:56:08Z andrea $ +# $Id: PKGBUILD 202517 2013-12-22 12:47:52Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-step -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="Interactive Physical Simulator" url="http://kde.org/applications/education/step/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libqalculate' 'gsl') makedepends=('cmake' 'automoc4' 'eigen' 'mesa') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/step-${pkgver}.tar.xz") -sha1sums=('03058d4d3d228aa1a6e57483fb52d1c2cc66319b') +sha1sums=('0bc4592f7886abe1815de1290aff2efab230120b') build() { cd "${srcdir}" diff --git a/extra/kdegames-bomber/PKGBUILD b/extra/kdegames-bomber/PKGBUILD index 021cd24fe..1c0c1b241 100644 --- a/extra/kdegames-bomber/PKGBUILD +++ b/extra/kdegames-bomber/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198883 2013-11-05 19:56:17Z andrea $ +# $Id: PKGBUILD 202518 2013-12-22 12:47:53Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-bomber -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="A single player arcade game" url="http://kde.org/applications/games/bomber/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/bomber-${pkgver}.tar.xz") -sha1sums=('c97235036e6e921529c108517ca35dfb4ca468e5') +sha1sums=('6a52c44a3ac4c80cd5c60e417f13de2103a7c7ed') build() { mkdir build diff --git a/extra/kdegames-bovo/PKGBUILD b/extra/kdegames-bovo/PKGBUILD index 96c290cbb..738f7abcc 100644 --- a/extra/kdegames-bovo/PKGBUILD +++ b/extra/kdegames-bovo/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198884 2013-11-05 19:56:25Z andrea $ +# $Id: PKGBUILD 202519 2013-12-22 12:47:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-bovo -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="A Gomoku like game for two players" url="http://kde.org/applications/games/bovo/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/bovo-${pkgver}.tar.xz") -sha1sums=('5dac983929801c794eb4d60016991c5557f88dd8') +sha1sums=('f805eabb8f2a18ae5371bbdcaffb5fce1ac9c5e0') build() { mkdir build diff --git a/extra/kdegames-granatier/PKGBUILD b/extra/kdegames-granatier/PKGBUILD index dbf4a75c4..031aa41b6 100644 --- a/extra/kdegames-granatier/PKGBUILD +++ b/extra/kdegames-granatier/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198885 2013-11-05 19:56:46Z andrea $ +# $Id: PKGBUILD 202520 2013-12-22 12:47:56Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-granatier -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="A clone of the classic Bomberman game" url="http://kde.org/applications/games/granatier/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/granatier-${pkgver}.tar.xz") -sha1sums=('56069dbfa62e1da274c21d6e3fb41a30e3cc1460') +sha1sums=('73fa16ffbef5915793fef03e25c2a755cb83cead') build() { mkdir build diff --git a/extra/kdegames-kapman/PKGBUILD b/extra/kdegames-kapman/PKGBUILD index ca98177bb..3d4e440e5 100644 --- a/extra/kdegames-kapman/PKGBUILD +++ b/extra/kdegames-kapman/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198887 2013-11-05 19:57:01Z andrea $ +# $Id: PKGBUILD 202522 2013-12-22 12:47:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kapman -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="A clone of the well known game Pac-Man" url="http://kde.org/applications/games/kapman/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kapman-${pkgver}.tar.xz") -sha1sums=('3f064c087d477a896e86bf4d6b67d9c644cad60f') +sha1sums=('ff8789b6703c6a1ff6bf3187188ca6399c8ede78') build() { mkdir build diff --git a/extra/kdegames-katomic/PKGBUILD b/extra/kdegames-katomic/PKGBUILD index 7b8c9e556..b2f27fbc2 100644 --- a/extra/kdegames-katomic/PKGBUILD +++ b/extra/kdegames-katomic/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198888 2013-11-05 19:57:11Z andrea $ +# $Id: PKGBUILD 202523 2013-12-22 12:48:00Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-katomic -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="A fun and educational game built around molecular geometry" url="http://kde.org/applications/games/katomic/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/katomic-${pkgver}.tar.xz") -sha1sums=('9bd793a68f4ebfb468829eb89b951d6a5a36d917') +sha1sums=('5b0644db827b9cb1fd96c2072677758bf1dd1b87') build() { mkdir build diff --git a/extra/kdegames-kblackbox/PKGBUILD b/extra/kdegames-kblackbox/PKGBUILD index 940c6cdd3..06eba95c5 100644 --- a/extra/kdegames-kblackbox/PKGBUILD +++ b/extra/kdegames-kblackbox/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198889 2013-11-05 19:57:21Z andrea $ +# $Id: PKGBUILD 202524 2013-12-22 12:48:02Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kblackbox -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="A game of hide and seek played on a grid of boxes" url="http://kde.org/applications/games/kblackbox/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kblackbox-${pkgver}.tar.xz") -sha1sums=('30dfa88931acbf88fe24516d5003c96d638399c1') +sha1sums=('c70a8460147042abe3dd75109e15e67e960e4e61') build() { mkdir build diff --git a/extra/kdegames-kblocks/PKGBUILD b/extra/kdegames-kblocks/PKGBUILD index 855f67378..c58226d26 100644 --- a/extra/kdegames-kblocks/PKGBUILD +++ b/extra/kdegames-kblocks/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198890 2013-11-05 19:57:30Z andrea $ +# $Id: PKGBUILD 202525 2013-12-22 12:48:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kblocks -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="The classic falling blocks game" url="http://kde.org/applications/games/kblocks/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kblocks-${pkgver}.tar.xz") -sha1sums=('d2ac45452acf281b8faff36fbbfbd080a7af7dec') +sha1sums=('2cf67dce9caac87fe30ad2e8419b0ff15e2f2180') build() { mkdir build diff --git a/extra/kdegames-kbounce/PKGBUILD b/extra/kdegames-kbounce/PKGBUILD index 5e2e46d62..54f7b0d09 100644 --- a/extra/kdegames-kbounce/PKGBUILD +++ b/extra/kdegames-kbounce/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198891 2013-11-05 19:57:39Z andrea $ +# $Id: PKGBUILD 202526 2013-12-22 12:48:05Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kbounce -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="A single player arcade game with the elements of puzzle" url="http://kde.org/applications/games/kbounce/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kbounce-${pkgver}.tar.xz") -sha1sums=('afc1fca732886e67d99cdb33276621cf67d85592') +sha1sums=('4386ec1d2c770a8c2225755659245d28b8fc1ff6') build() { mkdir build diff --git a/extra/kdegames-kbreakout/PKGBUILD b/extra/kdegames-kbreakout/PKGBUILD index 37a3bb4a9..fbcdda58e 100644 --- a/extra/kdegames-kbreakout/PKGBUILD +++ b/extra/kdegames-kbreakout/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198892 2013-11-05 19:57:48Z andrea $ +# $Id: PKGBUILD 202527 2013-12-22 12:48:07Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kbreakout -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="A Breakout-like game" url="http://kde.org/applications/games/kbreakout/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kbreakout-${pkgver}.tar.xz") -sha1sums=('c62ce7ad423f5c6ff3593ff22a3e851b2ee34471') +sha1sums=('1752d83d4a8ea74bfc2f8f61bf2b93096dfdd24d') build() { mkdir build diff --git a/extra/kdegames-kdiamond/PKGBUILD b/extra/kdegames-kdiamond/PKGBUILD index a5cf3e6f7..a064f9820 100644 --- a/extra/kdegames-kdiamond/PKGBUILD +++ b/extra/kdegames-kdiamond/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198893 2013-11-05 19:57:57Z andrea $ +# $Id: PKGBUILD 202528 2013-12-22 12:48:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kdiamond -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="A single player puzzle game" url="http://kde.org/applications/games/kdiamond/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kdiamond-${pkgver}.tar.xz") -sha1sums=('bcb32208702219f3fbbb6f3693680e4f2b9bbe90') +sha1sums=('82c30d782087c41441f2b24dde2eb2c5c722807a') build() { mkdir build diff --git a/extra/kdegames-kfourinline/PKGBUILD b/extra/kdegames-kfourinline/PKGBUILD index 280c80600..c0caf35a3 100644 --- a/extra/kdegames-kfourinline/PKGBUILD +++ b/extra/kdegames-kfourinline/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198894 2013-11-05 19:58:06Z andrea $ +# $Id: PKGBUILD 202529 2013-12-22 12:48:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kfourinline -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="A four-in-a-row game" url="http://kde.org/applications/games/kfourinline/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kfourinline-${pkgver}.tar.xz") -sha1sums=('bbbd81e2e91b10b61e56a498121f64a460a8328c') +sha1sums=('226f7e8cf6da9517a2beeaa22caf51e35df123d9') build() { mkdir build diff --git a/extra/kdegames-kgoldrunner/PKGBUILD b/extra/kdegames-kgoldrunner/PKGBUILD index df09c2cf4..c9fdf8d26 100644 --- a/extra/kdegames-kgoldrunner/PKGBUILD +++ b/extra/kdegames-kgoldrunner/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198895 2013-11-05 19:58:15Z andrea $ +# $Id: PKGBUILD 202530 2013-12-22 12:48:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kgoldrunner -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="A game of action and puzzle solving" url="http://kde.org/applications/games/kgoldrunner/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kgoldrunner-${pkgver}.tar.xz") -sha1sums=('a977911bff2c8fb603e1befc1ec98ad1b14c8480') +sha1sums=('93b4b717fe92c3de68eea7d20cfc26fd6262e1d8') build() { mkdir build diff --git a/extra/kdegames-kigo/PKGBUILD b/extra/kdegames-kigo/PKGBUILD index cd98155a1..224383c34 100644 --- a/extra/kdegames-kigo/PKGBUILD +++ b/extra/kdegames-kigo/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198896 2013-11-05 19:58:25Z andrea $ +# $Id: PKGBUILD 202531 2013-12-22 12:48:12Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kigo -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="An open-source implementation of the popular Go game" url="http://kde.org/applications/games/kigo/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames' 'gnugo') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kigo-${pkgver}.tar.xz") -sha1sums=('8538ed582dc74bb2767fd73634a5c76d7dfd490d') +sha1sums=('d4a7f9fed23710237f18e1879d9128821e4f3f4a') build() { mkdir build diff --git a/extra/kdegames-killbots/PKGBUILD b/extra/kdegames-killbots/PKGBUILD index 5effbff68..11b3e70f5 100644 --- a/extra/kdegames-killbots/PKGBUILD +++ b/extra/kdegames-killbots/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198897 2013-11-05 20:00:15Z andrea $ +# $Id: PKGBUILD 202532 2013-12-22 12:48:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-killbots -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="A simple game of evading killer robots" url="http://kde.org/applications/games/killbots/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/killbots-${pkgver}.tar.xz") -sha1sums=('34005bd79b80a1b1e2e62c65a9f410cc92cceff4') +sha1sums=('2cbf37ae730340a9426c663291679969d4bfa336') build() { mkdir build diff --git a/extra/kdegames-kiriki/PKGBUILD b/extra/kdegames-kiriki/PKGBUILD index e860427f7..f785895f4 100644 --- a/extra/kdegames-kiriki/PKGBUILD +++ b/extra/kdegames-kiriki/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198898 2013-11-05 20:00:25Z andrea $ +# $Id: PKGBUILD 202533 2013-12-22 12:48:16Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kiriki -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="An addictive and fun dice game" url="http://kde.org/applications/games/kiriki/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kiriki-${pkgver}.tar.xz") -sha1sums=('d014ed9ca78ad3dff5c063f50e149a276c1ff70b') +sha1sums=('97cc308eb01ded2e39aff57f736e72d24604d37f') build() { mkdir build diff --git a/extra/kdegames-kjumpingcube/PKGBUILD b/extra/kdegames-kjumpingcube/PKGBUILD index 8a5c11ccd..b36e2f950 100644 --- a/extra/kdegames-kjumpingcube/PKGBUILD +++ b/extra/kdegames-kjumpingcube/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198899 2013-11-05 20:01:44Z andrea $ +# $Id: PKGBUILD 202534 2013-12-22 12:48:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kjumpingcube -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="A simple tactical game" url="http://kde.org/applications/games/kjumpingcube/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kjumpingcube-${pkgver}.tar.xz") -sha1sums=('80c138942b64911964dae05cceba7a948dcb8dd4') +sha1sums=('c54a04bb1bc1769018ca31731190038ba3624ce7') build() { mkdir build diff --git a/extra/kdegames-klickety/PKGBUILD b/extra/kdegames-klickety/PKGBUILD index b464cd554..96049c34b 100644 --- a/extra/kdegames-klickety/PKGBUILD +++ b/extra/kdegames-klickety/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198900 2013-11-05 20:01:53Z andrea $ +# $Id: PKGBUILD 202535 2013-12-22 12:48:21Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-klickety -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="An adaptation of the Clickomania game" url="http://kde.org/applications/games/klickety/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/klickety-${pkgver}.tar.xz") -sha1sums=('e4e935f345101e2f72763a45b7d94169c4a30b40') +sha1sums=('42cd4e8edbbd9bb60551ed7c4b45557ba71e52d2') build() { mkdir build diff --git a/extra/kdegames-klines/PKGBUILD b/extra/kdegames-klines/PKGBUILD index 11be1ce1c..f9d588746 100644 --- a/extra/kdegames-klines/PKGBUILD +++ b/extra/kdegames-klines/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198901 2013-11-05 20:02:02Z andrea $ +# $Id: PKGBUILD 202536 2013-12-22 12:48:22Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-klines -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="A simple but highly addictive, one player game" url="http://kde.org/applications/games/klines/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/klines-${pkgver}.tar.xz") -sha1sums=('bd6ffbe50dc8e6409c4fd4f4114a5dfdf98e0cc5') +sha1sums=('a07893d319d8d27cc27a87bf8ab7636ba3fbc416') build() { mkdir build diff --git a/extra/kdegames-kmahjongg/PKGBUILD b/extra/kdegames-kmahjongg/PKGBUILD index 6a52b9a62..ba3104001 100644 --- a/extra/kdegames-kmahjongg/PKGBUILD +++ b/extra/kdegames-kmahjongg/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198902 2013-11-05 20:02:10Z andrea $ +# $Id: PKGBUILD 202537 2013-12-22 12:48:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kmahjongg -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="A tile matching game for one or two players" url="http://kde.org/applications/games/kmahjongg/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkmahjongg' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmahjongg-${pkgver}.tar.xz") -sha1sums=('9c8ade62b91da960d194b5df0c0d87b994025a00') +sha1sums=('e6ece3ec2fdcd5d454464f7c8677382a6c79359f') build() { mkdir build diff --git a/extra/kdegames-kmines/PKGBUILD b/extra/kdegames-kmines/PKGBUILD index 2ae2f05ea..0ac6e1eac 100644 --- a/extra/kdegames-kmines/PKGBUILD +++ b/extra/kdegames-kmines/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198903 2013-11-05 20:02:19Z andrea $ +# $Id: PKGBUILD 202538 2013-12-22 12:48:25Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kmines -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="The classic Minesweeper game" url="http://kde.org/applications/games/kmines/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmines-${pkgver}.tar.xz") -sha1sums=('e22e62f54a4e259385bd8927b1d582d011acb807') +sha1sums=('05de6c7620247d4b221a0cae5905e9c3a553843f') build() { mkdir build diff --git a/extra/kdegames-knavalbattle/PKGBUILD b/extra/kdegames-knavalbattle/PKGBUILD index 4ba26e0fd..eb9b1d536 100644 --- a/extra/kdegames-knavalbattle/PKGBUILD +++ b/extra/kdegames-knavalbattle/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198904 2013-11-05 20:03:35Z andrea $ +# $Id: PKGBUILD 202539 2013-12-22 12:48:27Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-knavalbattle -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="A ship sinking game" url="http://kde.org/applications/games/knavalbattle/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/knavalbattle-${pkgver}.tar.xz") -sha1sums=('025c480ecea840efecbd20b41921ce56fe52d470') +sha1sums=('039b6590ae20cecbb24f5f7a17e45e3fef49d98f') build() { mkdir build diff --git a/extra/kdegames-knetwalk/PKGBUILD b/extra/kdegames-knetwalk/PKGBUILD index 605568d5a..55390e765 100644 --- a/extra/kdegames-knetwalk/PKGBUILD +++ b/extra/kdegames-knetwalk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198905 2013-11-05 20:03:45Z andrea $ +# $Id: PKGBUILD 202540 2013-12-22 12:48:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-knetwalk -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="Connect all the terminals to the server, in as few turns as possible" url="http://kde.org/applications/games/knetwalk/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/knetwalk-${pkgver}.tar.xz") -sha1sums=('ac66b169d7a7c3c42aa937efc2d6d1576b352d7e') +sha1sums=('2aa6b90be52f74c97531862ae1688f0433bd0f17') build() { mkdir build diff --git a/extra/kdegames-kolf/PKGBUILD b/extra/kdegames-kolf/PKGBUILD index 3f001c9a1..ea4269f3e 100644 --- a/extra/kdegames-kolf/PKGBUILD +++ b/extra/kdegames-kolf/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198906 2013-11-05 20:04:01Z andrea $ +# $Id: PKGBUILD 202541 2013-12-22 12:48:29Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kolf -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="A miniature golf game with 2d top-down view" url="http://kde.org/applications/games/kolf/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kolf-${pkgver}.tar.xz") -sha1sums=('5302fa38428e790d288687f6cfb6975e4b3ea6c6') +sha1sums=('e3a03d50676018934affe5a4c1a9b4f82dca79fc') build() { mkdir build diff --git a/extra/kdegames-kollision/PKGBUILD b/extra/kdegames-kollision/PKGBUILD index 9ac6b370a..171120580 100644 --- a/extra/kdegames-kollision/PKGBUILD +++ b/extra/kdegames-kollision/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198907 2013-11-05 20:04:47Z andrea $ +# $Id: PKGBUILD 202542 2013-12-22 12:48:30Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kollision -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="A simple ball dodging game" url="http://kde.org/applications/games/kollision/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kollision-${pkgver}.tar.xz") -sha1sums=('1531e19d1a295590d343e7507d57f42479041d40') +sha1sums=('434928e8cf6e37e4afcb91cee78201f3f79a243e') build() { mkdir build diff --git a/extra/kdegames-konquest/PKGBUILD b/extra/kdegames-konquest/PKGBUILD index d614f7c9a..a911c974f 100644 --- a/extra/kdegames-konquest/PKGBUILD +++ b/extra/kdegames-konquest/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198908 2013-11-05 20:04:59Z andrea $ +# $Id: PKGBUILD 202543 2013-12-22 12:48:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-konquest -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="The KDE version of Gnu-Lactic" url="http://kde.org/applications/games/konquest/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/konquest-${pkgver}.tar.xz") -sha1sums=('b0920dc829c4a06ca497d61c65db4e31df9a3297') +sha1sums=('8e4b8f4cd1463c5f10292a945f5d0af2173b0079') build() { mkdir build diff --git a/extra/kdegames-kpatience/PKGBUILD b/extra/kdegames-kpatience/PKGBUILD index becd68899..1a18814f9 100644 --- a/extra/kdegames-kpatience/PKGBUILD +++ b/extra/kdegames-kpatience/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198909 2013-11-05 20:05:08Z andrea $ +# $Id: PKGBUILD 202544 2013-12-22 12:48:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kpatience -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="Offers a selection of solitaire card games" url="http://kde.org/applications/games/kpat/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kpat-${pkgver}.tar.xz") -sha1sums=('17ec8411212a75b3a2fab2b85f9c88bfe2bfbdd7') +sha1sums=('698a82df3cd00949ba7049c6a0806320992a651d') build() { mkdir build diff --git a/extra/kdegames-kreversi/PKGBUILD b/extra/kdegames-kreversi/PKGBUILD index f34fd3546..bd2a06eeb 100644 --- a/extra/kdegames-kreversi/PKGBUILD +++ b/extra/kdegames-kreversi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198910 2013-11-05 20:05:17Z andrea $ +# $Id: PKGBUILD 202545 2013-12-22 12:48:35Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kreversi -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="A simple one player strategy game played against the computer" url="http://kde.org/applications/games/kreversi/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kreversi-${pkgver}.tar.xz") -sha1sums=('4bd4c5c96fc72ad6ea125f2ac5c4f3212d881763') +sha1sums=('6a02522dda4d501ba4268acd14b24d9174837fb6') build() { mkdir build diff --git a/extra/kdegames-kshisen/PKGBUILD b/extra/kdegames-kshisen/PKGBUILD index a103077ea..da306203f 100644 --- a/extra/kdegames-kshisen/PKGBUILD +++ b/extra/kdegames-kshisen/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198911 2013-11-05 20:05:26Z andrea $ +# $Id: PKGBUILD 202546 2013-12-22 12:48:36Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kshisen -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="A solitaire-like game played using the standard set of Mahjong tiles" url="http://kde.org/applications/games/kshisen/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames' 'libkmahjongg') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kshisen-${pkgver}.tar.xz") -sha1sums=('8388960ca6964807b2dc9f6f54465a5408011c6d') +sha1sums=('a027c93ff933ba5928fe539409b09cfcc50c9a6d') build() { mkdir build diff --git a/extra/kdegames-ksirk/PKGBUILD b/extra/kdegames-ksirk/PKGBUILD index f36b31a9b..5d3babd0b 100644 --- a/extra/kdegames-ksirk/PKGBUILD +++ b/extra/kdegames-ksirk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198912 2013-11-05 20:05:36Z andrea $ +# $Id: PKGBUILD 202547 2013-12-22 12:48:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-ksirk -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="A computerized version of a well known strategy game" url="http://kde.org/applications/games/ksirk/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ksirk-${pkgver}.tar.xz") -sha1sums=('bfb8f1cab0a6cc94618b612f6b24979a3cc52ed7') +sha1sums=('39fff63dca23268d83ba006bad733c1046d84beb') build() { mkdir build diff --git a/extra/kdegames-ksnakeduel/PKGBUILD b/extra/kdegames-ksnakeduel/PKGBUILD index be13c6e7e..7db9b83d8 100644 --- a/extra/kdegames-ksnakeduel/PKGBUILD +++ b/extra/kdegames-ksnakeduel/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198913 2013-11-05 20:05:45Z andrea $ +# $Id: PKGBUILD 202548 2013-12-22 12:48:39Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-ksnakeduel -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="A simple snake duel game" url="http://kde.org/applications/games/ksnakeduel/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ksnakeduel-${pkgver}.tar.xz") -sha1sums=('c64fbe0973582938ed8aa46b65e29e3a6e38fb80') +sha1sums=('dc0113638ea1eff7df3a8562431bcdc630ab896a') build() { mkdir build diff --git a/extra/kdegames-kspaceduel/PKGBUILD b/extra/kdegames-kspaceduel/PKGBUILD index 9580ecb03..06f467932 100644 --- a/extra/kdegames-kspaceduel/PKGBUILD +++ b/extra/kdegames-kspaceduel/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198914 2013-11-05 20:05:54Z andrea $ +# $Id: PKGBUILD 202549 2013-12-22 12:48:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kspaceduel -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="Each of two possible players controls a satellite spaceship orbiting the sun" url="http://kde.org/applications/games/kspaceduel/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kspaceduel-${pkgver}.tar.xz") -sha1sums=('5c1507de0b2d20eda890895b03cbcffe6c3f57c5') +sha1sums=('6b633e9e75119385b4aae8527645b6c3579f0af1') build() { mkdir build diff --git a/extra/kdegames-ksquares/PKGBUILD b/extra/kdegames-ksquares/PKGBUILD index e8bf721dc..38645f952 100644 --- a/extra/kdegames-ksquares/PKGBUILD +++ b/extra/kdegames-ksquares/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198915 2013-11-05 20:06:04Z andrea $ +# $Id: PKGBUILD 202550 2013-12-22 12:48:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-ksquares -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="A modeled after the well known pen and paper based game of Dots and Boxes" url="http://kde.org/applications/games/ksquares/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ksquares-${pkgver}.tar.xz") -sha1sums=('a1ea089ce5a0373f78801b605b7828b720f0aada') +sha1sums=('78ae226c767459b36ec69d806b2562e9341b94d4') build() { mkdir build diff --git a/extra/kdegames-ksudoku/PKGBUILD b/extra/kdegames-ksudoku/PKGBUILD index 89b91f7b6..510afff4f 100644 --- a/extra/kdegames-ksudoku/PKGBUILD +++ b/extra/kdegames-ksudoku/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198916 2013-11-05 20:06:13Z andrea $ +# $Id: PKGBUILD 202551 2013-12-22 12:48:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-ksudoku -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="A logic-based symbol placement puzzle" url="http://kde.org/applications/games/ksudoku/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ksudoku-${pkgver}.tar.xz") -sha1sums=('5f311bea8dffa71001f311317ff98b55e57c525d') +sha1sums=('a0e015d8377a450c7e309395c08568d484373fae') build() { mkdir build diff --git a/extra/kdegames-ktuberling/PKGBUILD b/extra/kdegames-ktuberling/PKGBUILD index 612b7f6d0..d4e124ac5 100644 --- a/extra/kdegames-ktuberling/PKGBUILD +++ b/extra/kdegames-ktuberling/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198917 2013-11-05 20:06:22Z andrea $ +# $Id: PKGBUILD 202552 2013-12-22 12:48:46Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-ktuberling -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="A simple constructor game suitable for children and adults alike" url="http://kde.org/applications/games/ktuberling/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ktuberling-${pkgver}.tar.xz") -sha1sums=('808820f30903cb34b578ad431e4c7b789cf8b04e') +sha1sums=('b3613320dc296bca59caab64d2c92fa1dcbbf589') build() { mkdir build diff --git a/extra/kdegames-kubrick/PKGBUILD b/extra/kdegames-kubrick/PKGBUILD index 5e67848bf..1a72eabe6 100644 --- a/extra/kdegames-kubrick/PKGBUILD +++ b/extra/kdegames-kubrick/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198918 2013-11-05 20:06:35Z andrea $ +# $Id: PKGBUILD 202553 2013-12-22 12:48:47Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kubrick -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="Based on the famous Rubik's Cube" url="http://kde.org/applications/games/kubrick/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kubrick-${pkgver}.tar.xz") -sha1sums=('38855de0bf35b3921632bb54e762b932e19e1a00') +sha1sums=('87d888772bfc7f73cdef5a4b1644de9ba7babd38') build() { mkdir build diff --git a/extra/kdegames-lskat/PKGBUILD b/extra/kdegames-lskat/PKGBUILD index e5df0606d..abd1df5cb 100644 --- a/extra/kdegames-lskat/PKGBUILD +++ b/extra/kdegames-lskat/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198919 2013-11-05 20:06:44Z andrea $ +# $Id: PKGBUILD 202554 2013-12-22 12:48:48Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-lskat -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="Lieutenant Skat is a fun and engaging card game for two players" url="http://kde.org/applications/games/lskat/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/lskat-${pkgver}.tar.xz") -sha1sums=('86046bcb33bbe85415fe0275964366236228ac3f') +sha1sums=('bd66a6506caa9418b653a6d675a28073d31c41d4') build() { mkdir build diff --git a/extra/kdegames-palapeli/PKGBUILD b/extra/kdegames-palapeli/PKGBUILD index 2aa47ea83..2b72ee3a5 100644 --- a/extra/kdegames-palapeli/PKGBUILD +++ b/extra/kdegames-palapeli/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198920 2013-11-05 20:06:53Z andrea $ +# $Id: PKGBUILD 202555 2013-12-22 12:48:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-palapeli -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="A single-player jigsaw puzzle game" url="http://kde.org/applications/games/palapeli/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames' 'qhull') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/palapeli-${pkgver}.tar.xz") -sha1sums=('ebd7ad175b79d821ef0c2dc7fac07ec5339a85a3') +sha1sums=('3c8b1eb087116316422a5c95798d1d7ad150254a') build() { mkdir build diff --git a/extra/kdegames-picmi/PKGBUILD b/extra/kdegames-picmi/PKGBUILD index 970749ecb..32426f32f 100644 --- a/extra/kdegames-picmi/PKGBUILD +++ b/extra/kdegames-picmi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198921 2013-11-05 20:07:02Z andrea $ +# $Id: PKGBUILD 202556 2013-12-22 12:48:52Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-picmi -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="A nonogram logic game for KDE" url="http://kde.org/applications/games/picmi/" @@ -15,7 +15,7 @@ replaces=('picmi') conflicts=('picmi') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/picmi-${pkgver}.tar.xz") -sha1sums=('f87583d20afcf0a5f2d714c8b6575b114e5360af') +sha1sums=('f7b3fa5e44b117ae44d173c14763896692e589d0') build() { mkdir build diff --git a/extra/kdegraphics-gwenview/PKGBUILD b/extra/kdegraphics-gwenview/PKGBUILD index d32d10b77..958c8cd4c 100644 --- a/extra/kdegraphics-gwenview/PKGBUILD +++ b/extra/kdegraphics-gwenview/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198922 2013-11-05 20:07:12Z andrea $ +# $Id: PKGBUILD 202557 2013-12-22 12:48:54Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-gwenview -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="A fast and easy to use image viewer for KDE" url="http://kde.org/applications/graphics/gwenview/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'mesa') optdepends=('kipi-plugins: extra plugins to share photos') install=$pkgname.install source=("http://download.kde.org/stable/${pkgver}/src/gwenview-${pkgver}.tar.xz") -sha1sums=('e4e6dcb883819fdc53e739d4d78d2b90c930f12e') +sha1sums=('f801c71dd94f77caacfc812b7bcadf6023e2a58b') build() { mkdir build diff --git a/extra/kdegraphics-kamera/PKGBUILD b/extra/kdegraphics-kamera/PKGBUILD index 12c7590ff..b5753788a 100644 --- a/extra/kdegraphics-kamera/PKGBUILD +++ b/extra/kdegraphics-kamera/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198923 2013-11-05 20:07:22Z andrea $ +# $Id: PKGBUILD 202558 2013-12-22 12:48:56Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kamera -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="Configure Kamera" url="http://kde.org/applications/graphics/kamera/" @@ -12,7 +12,7 @@ groups=('kde' 'kdegraphics') depends=('kdebase-runtime' 'libgphoto2') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kamera-${pkgver}.tar.xz") -sha1sums=('e412f5d7ec52257e13184c5b70ae97579d8d9455') +sha1sums=('4edc3add701c68a0327dcad772e69f2e23d697cf') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kcolorchooser/PKGBUILD b/extra/kdegraphics-kcolorchooser/PKGBUILD index 1a0aa03c9..1e0e01e30 100644 --- a/extra/kdegraphics-kcolorchooser/PKGBUILD +++ b/extra/kdegraphics-kcolorchooser/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198924 2013-11-05 20:07:32Z andrea $ +# $Id: PKGBUILD 202559 2013-12-22 12:48:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kcolorchooser -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="Color Chooser" url="http://kde.org/applications/graphics/kcolorchooser/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kcolorchooser-${pkgver}.tar.xz") -sha1sums=('5ea857f02fb153f20c29f2e055f4de38c52c2d10') +sha1sums=('46121f527af58b08738ce20623c1b25d00bf20e2') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kgamma/PKGBUILD b/extra/kdegraphics-kgamma/PKGBUILD index 39555de0a..d4f79cc64 100644 --- a/extra/kdegraphics-kgamma/PKGBUILD +++ b/extra/kdegraphics-kgamma/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198925 2013-11-05 20:07:41Z andrea $ +# $Id: PKGBUILD 202560 2013-12-22 12:48:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kgamma -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="A monitor calibration tool" url="http://kde.org/applications/graphics/kgamma/" @@ -15,7 +15,7 @@ groups=('kde' 'kdegraphics') depends=('kdebase-runtime' 'libxxf86vm') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kgamma-${pkgver}.tar.xz") -sha1sums=('54dbbf355bfed3b4d94fee10c30217443570926a') +sha1sums=('b0ebd6963b4438069b0a016bf122207c00ac7da9') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kolourpaint/PKGBUILD b/extra/kdegraphics-kolourpaint/PKGBUILD index 35cda4e18..1efb3bb1b 100644 --- a/extra/kdegraphics-kolourpaint/PKGBUILD +++ b/extra/kdegraphics-kolourpaint/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198926 2013-11-05 20:07:50Z andrea $ +# $Id: PKGBUILD 202561 2013-12-22 12:49:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kolourpaint -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="Paint Program" url="http://kde.org/applications/graphics/kolourpaint/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'qimageblitz') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kolourpaint-${pkgver}.tar.xz") -sha1sums=('fb9adff50e0edc1bf01183e70fdf1a6b9438b7f9') +sha1sums=('2bb9eb48b8dffe689c17d95ecb7e51d01ffc6cdc') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kruler/PKGBUILD b/extra/kdegraphics-kruler/PKGBUILD index 44adad058..df8db32ea 100644 --- a/extra/kdegraphics-kruler/PKGBUILD +++ b/extra/kdegraphics-kruler/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198927 2013-11-05 20:08:00Z andrea $ +# $Id: PKGBUILD 202562 2013-12-22 12:49:02Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kruler -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="Screen Ruler" url="http://kde.org/applications/graphics/kruler/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kruler-${pkgver}.tar.xz") -sha1sums=('be7a9cb78c8b2de25b6fbe22f2cce2dd885eafd5') +sha1sums=('1c3de59f559c8621f667351a9b66f4de00e7731c') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-ksaneplugin/PKGBUILD b/extra/kdegraphics-ksaneplugin/PKGBUILD index cbc6542ca..cb5dc127e 100644 --- a/extra/kdegraphics-ksaneplugin/PKGBUILD +++ b/extra/kdegraphics-ksaneplugin/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198928 2013-11-05 20:08:10Z andrea $ +# $Id: PKGBUILD 202563 2013-12-22 12:49:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-ksaneplugin -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="A scan plugin that implements the scanning" url="https://projects.kde.org/projects/kde/kdegraphics/ksaneplugin" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/ksaneplugin-${pkgver}.tar.xz") -sha1sums=('f6ec3a98fe99e38cfa6dbfd56837b344ca27b956') +sha1sums=('e04f67e75a2cd0e98a097674cdc1b93b17f8d77c') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-ksnapshot/PKGBUILD b/extra/kdegraphics-ksnapshot/PKGBUILD index d4214e897..703d1d2db 100644 --- a/extra/kdegraphics-ksnapshot/PKGBUILD +++ b/extra/kdegraphics-ksnapshot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198929 2013-11-05 20:08:18Z andrea $ +# $Id: PKGBUILD 202564 2013-12-22 12:49:05Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-ksnapshot -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="Screen Capture Program" url="http://kde.org/applications/graphics/ksnapshot/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kipi-plugins') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ksnapshot-${pkgver}.tar.xz") -sha1sums=('5e3837ef023ffa681417fbf7bc79e696e280cd1c') +sha1sums=('20ced4e4fe02f8af84c61b7ff915e8baadce4639') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-mobipocket/PKGBUILD b/extra/kdegraphics-mobipocket/PKGBUILD index 66afe8d39..3edf367e3 100644 --- a/extra/kdegraphics-mobipocket/PKGBUILD +++ b/extra/kdegraphics-mobipocket/PKGBUILD @@ -1,25 +1,27 @@ -# $Id: PKGBUILD 198930 2013-11-05 20:08:45Z andrea $ +# $Id: PKGBUILD 202453 2013-12-22 12:46:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-mobipocket -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="A collection of plugins to handle mobipocket files" url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-mobipocket" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') depends=('kdelibs') -makedepends=('cmake' 'automoc4' 'kdegraphics-okular') +makedepends=('cmake' 'automoc4') groups=('kde' 'kdegraphics') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('53d52b27ed1dd0149dacf2cd672ef52e762385d8') +sha1sums=('60fc877f9669d50ca77513b1de73b54140f6eddf') -build() { - cd "${srcdir}" +prepare() { mkdir build +} + +build() { cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ @@ -29,6 +31,6 @@ build() { } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/kdegraphics-okular/PKGBUILD b/extra/kdegraphics-okular/PKGBUILD index e840d5645..8fb927e60 100644 --- a/extra/kdegraphics-okular/PKGBUILD +++ b/extra/kdegraphics-okular/PKGBUILD @@ -1,25 +1,26 @@ -# $Id: PKGBUILD 198827 2013-11-05 19:44:40Z andrea $ +# $Id: PKGBUILD 202463 2013-12-22 12:46:45Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-okular -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc='Document Viewer' arch=('i686' 'x86_64' 'mips64el') url="http://kde.org/applications/graphics/okular/" license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdegraphics') -depends=('kdebase-runtime' 'qimageblitz' 'poppler-qt' 'chmlib' 'djvulibre' - 'ebook-tools' 'libspectre') +depends=('kdebase-runtime' 'qimageblitz' 'chmlib' 'djvulibre' 'libspectre' + 'libkexiv2') makedepends=('cmake' 'automoc4') -optdepends=('kdegraphics-mobipocket: mobipocket support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.xz") -sha1sums=('b65e4124aab93220302721d03db09469f4c3d7c7') +sha1sums=('1fde4dd5e271e541f0f4db525c2597c895f407d5') -build() { - cd "${srcdir}" +prepare() { mkdir build +} + +build() { cd build cmake ../okular-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ @@ -30,6 +31,6 @@ build() { } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/kdegraphics-strigi-analyzer/PKGBUILD b/extra/kdegraphics-strigi-analyzer/PKGBUILD index 0b19e77a8..75ba60fef 100644 --- a/extra/kdegraphics-strigi-analyzer/PKGBUILD +++ b/extra/kdegraphics-strigi-analyzer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198931 2013-11-05 20:09:22Z andrea $ +# $Id: PKGBUILD 202565 2013-12-22 12:49:07Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-strigi-analyzer -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="Strigi analyzers for various graphics file formats" url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-strigi-analyzer" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('eba5719133828a14c51d3f18f3ff079c1cb2b076') +sha1sums=('bb7fbcc4e644baee5fa298cd3b0cc11d267da80d') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-svgpart/PKGBUILD b/extra/kdegraphics-svgpart/PKGBUILD index 22be0b831..346b0f632 100644 --- a/extra/kdegraphics-svgpart/PKGBUILD +++ b/extra/kdegraphics-svgpart/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198932 2013-11-05 20:09:32Z andrea $ +# $Id: PKGBUILD 202566 2013-12-22 12:49:08Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-svgpart -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="A KPart for viewing SVGs" url="https://projects.kde.org/projects/kde/kdegraphics/svgpart" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/svgpart-${pkgver}.tar.xz") -sha1sums=('555da194e7909ec47d6ca5fd108dc9f327b79c8b') +sha1sums=('dd58aade7943c99904e753934986fdd901f960ff') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-thumbnailers/PKGBUILD b/extra/kdegraphics-thumbnailers/PKGBUILD index 4bd341b5d..516d7d3d3 100644 --- a/extra/kdegraphics-thumbnailers/PKGBUILD +++ b/extra/kdegraphics-thumbnailers/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198933 2013-11-05 20:09:42Z andrea $ +# $Id: PKGBUILD 202567 2013-12-22 12:49:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-thumbnailers -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="Thumbnailers for various graphics file formats" url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-thumbnailers" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('e23d895bcfd15584a3e405aaaae58c209ab70fa1') +sha1sums=('2a9f551c2271298ee16f8e12f9d18c84bceb9c09') build() { cd "${srcdir}" diff --git a/extra/kdelibs3/PKGBUILD b/extra/kdelibs3/PKGBUILD index 876edb059..e4b58b8f2 100644 --- a/extra/kdelibs3/PKGBUILD +++ b/extra/kdelibs3/PKGBUILD @@ -1,21 +1,20 @@ -# $Id: PKGBUILD 184257 2013-05-05 07:01:52Z eric $ +# $Id: PKGBUILD 200735 2013-12-03 18:03:09Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=kdelibs3 pkgver=3.5.10 -pkgrel=18 +pkgrel=19 pkgdesc='KDE3 Core Libraries' arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL') depends=('libxslt' 'libart-lgpl' 'alsa-lib' 'libcups' 'jasper' - 'libidn' 'openexr' 'aspell' 'qt3' 'ca-certificates') + 'libidn' 'openexr' 'aspell' 'qt3' 'ca-certificates' 'xorg-iceauth') makedepends=('cups' 'hspell' 'optipng') optdepends=('hspell: for Hebrew spell-checking support') -options=('libtool' '!makeflags') -install=kdelibs3.install +options=('libtool' 'staticlibs' '!makeflags') source=("ftp://ftp.kde.org/pub/kde/stable/${pkgver}/src/kdelibs-${pkgver}.tar.bz2" 'ftp://ftp.archlinux.org/other/kde/kde-3.5-1074156.patch.gz' 'acinclude.patch' diff --git a/extra/kdelibs3/kdelibs3.install b/extra/kdelibs3/kdelibs3.install deleted file mode 100644 index 7291ac0a2..000000000 --- a/extra/kdelibs3/kdelibs3.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - post_remove -} - -post_upgrade() { - post_remove -} - -post_remove() { - # this can be removed in future versions - sed -ie '/\/opt\/kde\/lib/d' etc/ld.so.conf -} diff --git a/extra/kdemultimedia-audiocd-kio/PKGBUILD b/extra/kdemultimedia-audiocd-kio/PKGBUILD index 0c4c6d841..774bf8b3b 100644 --- a/extra/kdemultimedia-audiocd-kio/PKGBUILD +++ b/extra/kdemultimedia-audiocd-kio/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198934 2013-11-05 20:09:53Z andrea $ +# $Id: PKGBUILD 202568 2013-12-22 12:49:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-audiocd-kio -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="Kioslave for accessing audio CDs" url='https://projects.kde.org/projects/kde/kdemultimedia/audiocd-kio' @@ -14,7 +14,7 @@ groups=('kde' 'kdemultimedia') replaces=('kdemultimedia-kioslave') conflicts=('kdemultimedia-kioslave') source=("http://download.kde.org/stable/${pkgver}/src/audiocd-kio-${pkgver}.tar.xz") -sha1sums=('9b23a28843b4d23fc1cbb947320a1dd66f2b0018') +sha1sums=('f9218418414099b9ca30adba95f9032aa86dafc6') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-dragonplayer/PKGBUILD b/extra/kdemultimedia-dragonplayer/PKGBUILD index 178b2372d..f26673c3c 100644 --- a/extra/kdemultimedia-dragonplayer/PKGBUILD +++ b/extra/kdemultimedia-dragonplayer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198935 2013-11-05 20:10:03Z andrea $ +# $Id: PKGBUILD 202569 2013-12-22 12:49:13Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-dragonplayer -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="A multimedia player where the focus is on simplicity, instead of features" @@ -14,7 +14,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/dragon-${pkgver}.tar.xz") -sha1sums=('d6682f0dd7a62b7576bc9778ff711abdcc9ba45b') +sha1sums=('22370adaedb5d689ccc1e36430936c5c2bad17db') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD index 5cdf2c160..6958a80e5 100644 --- a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD +++ b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198936 2013-11-05 20:10:13Z andrea $ +# $Id: PKGBUILD 202570 2013-12-22 12:49:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-ffmpegthumbs -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc='FFmpeg-based thumbnail creator for video files' url='https://projects.kde.org/projects/kde/kdemultimedia/ffmpegthumbs' @@ -12,7 +12,7 @@ groups=('kde' 'kdemultimedia') depends=('kdelibs' 'ffmpeg') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/ffmpegthumbs-${pkgver}.tar.xz") -sha1sums=('23d911d71dbcd6e5704b0ebec66d5ba0f91f9931') +sha1sums=('6546cf5cbaf3cb38cc79aa6dbc0f8187499cac55') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-juk/PKGBUILD b/extra/kdemultimedia-juk/PKGBUILD index 308ef0f6a..747c69849 100644 --- a/extra/kdemultimedia-juk/PKGBUILD +++ b/extra/kdemultimedia-juk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198937 2013-11-05 20:10:22Z andrea $ +# $Id: PKGBUILD 202571 2013-12-22 12:49:16Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-juk -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc='A jukebox, tagger and music collection manager' url='http://kde.org/applications/multimedia/juk/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'taglib') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/juk-${pkgver}.tar.xz") -sha1sums=('05b684897ba8f4eb4cce1d10aaf1f1f6afa358be') +sha1sums=('ea658f5e757baf850f7b3690da77d5754fe386ec') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-kmix/PKGBUILD b/extra/kdemultimedia-kmix/PKGBUILD index 61836c3b5..a44cb9ee5 100644 --- a/extra/kdemultimedia-kmix/PKGBUILD +++ b/extra/kdemultimedia-kmix/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198938 2013-11-05 20:11:56Z andrea $ +# $Id: PKGBUILD 202572 2013-12-22 12:49:21Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-kmix -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="KDE volume control program" url='http://kde.org/applications/multimedia/kmix/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kmix-${pkgver}.tar.xz") -sha1sums=('3d3813f66b034bbe603c0958d41b7b26cfa80e40') +sha1sums=('839d23f2f76e79eb20bde46472774a8c678221c9') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-kscd/PKGBUILD b/extra/kdemultimedia-kscd/PKGBUILD index 6bc6e9e53..5ba5ce2bc 100644 --- a/extra/kdemultimedia-kscd/PKGBUILD +++ b/extra/kdemultimedia-kscd/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198939 2013-11-05 20:12:04Z andrea $ +# $Id: PKGBUILD 202573 2013-12-22 12:49:23Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-kscd -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="KDE CD player" url='http://kde.org/applications/multimedia/kscd/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libmusicbrainz3') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kscd-${pkgver}.tar.xz") -sha1sums=('c2028b71516c6ca3708aac2170e9e146c51110ce') +sha1sums=('d43ee9e8fb00f368575c2f0e62f5efaa539b876e') build() { mkdir build diff --git a/extra/kdemultimedia-mplayerthumbs/PKGBUILD b/extra/kdemultimedia-mplayerthumbs/PKGBUILD index 3817fd6ad..bf2b6b887 100644 --- a/extra/kdemultimedia-mplayerthumbs/PKGBUILD +++ b/extra/kdemultimedia-mplayerthumbs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198940 2013-11-05 20:12:16Z andrea $ +# $Id: PKGBUILD 202574 2013-12-22 12:49:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-mplayerthumbs -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="MPlayer based thumbnail generator for video files" url='https://projects.kde.org/projects/kde/kdemultimedia/mplayerthumbs' @@ -12,7 +12,7 @@ license=('GPL' 'LGPL' 'FDL') depends=('kdebase-runtime' 'mplayer') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/mplayerthumbs-${pkgver}.tar.xz") -sha1sums=('6f61935359f2dfb1073884a8d48738663b5aa33a') +sha1sums=('1cc91d50e1747a640f951d13c2577d33679efaa2') build() { cd "${srcdir}" diff --git a/extra/kdenetwork-filesharing/PKGBUILD b/extra/kdenetwork-filesharing/PKGBUILD index fd7801fdb..dfbad589f 100644 --- a/extra/kdenetwork-filesharing/PKGBUILD +++ b/extra/kdenetwork-filesharing/PKGBUILD @@ -1,8 +1,8 @@ -# $Id$ +# $Id: PKGBUILD 202575 2013-12-22 12:49:25Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdenetwork-filesharing -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc='Properties dialog plugin to share a directory with the local network' url='https://projects.kde.org/projects/kde/kdenetwork/kdenetwork-filesharing' @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'smbclient') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kdenetwork-filesharing-${pkgver}.tar.xz") -sha1sums=('db93e4617230aebd377e415475e7ad5dd4e9b549') +sha1sums=('6ef2be648f6b4f64f9ff0542d9dceb79f4a9881f') build() { mkdir build diff --git a/extra/kdenetwork-kdnssd/PKGBUILD b/extra/kdenetwork-kdnssd/PKGBUILD index 26fb1a73e..bc97ce2c6 100644 --- a/extra/kdenetwork-kdnssd/PKGBUILD +++ b/extra/kdenetwork-kdnssd/PKGBUILD @@ -1,8 +1,8 @@ -# $Id$ +# $Id: PKGBUILD 202576 2013-12-22 12:49:27Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdenetwork-kdnssd -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc='Monitors the network for DNS-SD services' url='https://projects.kde.org/projects/kde/kdenetwork/kdnssd' @@ -12,7 +12,7 @@ groups=('kde' 'kdenetwork') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kdnssd-${pkgver}.tar.xz") -sha1sums=('4d26fda0e964c5baca68336a1c035252d6f1d4bb') +sha1sums=('4ebd5320344b02726652552536f28c468f9049ee') build() { mkdir build diff --git a/extra/kdenetwork-kget/PKGBUILD b/extra/kdenetwork-kget/PKGBUILD index 2382d20b8..5f5038376 100644 --- a/extra/kdenetwork-kget/PKGBUILD +++ b/extra/kdenetwork-kget/PKGBUILD @@ -1,8 +1,8 @@ -# $Id$ +# $Id: PKGBUILD 202577 2013-12-22 12:49:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdenetwork-kget -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc='Download Manager' url='http://kde.org/applications/internet/kget/' @@ -13,7 +13,7 @@ depends=('kdebase-workspace' 'kdebase-lib' 'libktorrent' 'libmms' 'gpgme' 'nepom makedepends=('cmake' 'automoc4' 'boost') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kget-${pkgver}.tar.xz") -sha1sums=('1f186e190d6f396eeeacbcb36fcfce414abb4365') +sha1sums=('5d327b26c68f0aaa7a088992de10136b1786aba9') build() { mkdir build diff --git a/extra/kdenetwork-kppp/PKGBUILD b/extra/kdenetwork-kppp/PKGBUILD index d34bd1c2f..e3b9426a0 100644 --- a/extra/kdenetwork-kppp/PKGBUILD +++ b/extra/kdenetwork-kppp/PKGBUILD @@ -1,8 +1,8 @@ -# $Id$ +# $Id: PKGBUILD 202579 2013-12-22 12:49:31Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdenetwork-kppp -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc='Internet Dial-Up Tool' url='http://kde.org/applications/internet/kppp/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'ppp') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kppp-${pkgver}.tar.xz") -sha1sums=('11608fce538eecb3496406e50c4d2e17f5f520b1') +sha1sums=('6c8059159d38517311a532e97e33b7cdf7d714e5') build() { mkdir build diff --git a/extra/kdenetwork-krdc/PKGBUILD b/extra/kdenetwork-krdc/PKGBUILD index a268117fb..484ee097a 100644 --- a/extra/kdenetwork-krdc/PKGBUILD +++ b/extra/kdenetwork-krdc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id$ +# $Id: PKGBUILD 202580 2013-12-22 12:49:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdenetwork-krdc -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc='Remote Desktop Client' url='http://kde.org/applications/internet/krdc/' @@ -15,7 +15,7 @@ optdepends=('libvncserver: VNC support' 'freerdp: RDP support' 'kdebase-keditbookmarks: to edit bookmarks') source=("http://download.kde.org/stable/${pkgver}/src/krdc-${pkgver}.tar.xz") -sha1sums=('17b7da4c9acfefcedb67d017323c66279aedc428') +sha1sums=('0f26191ada1fcbc2f785cd6f5d95df05dd1d37dd') build() { mkdir build diff --git a/extra/kdenetwork-krfb/PKGBUILD b/extra/kdenetwork-krfb/PKGBUILD index f5e209fdf..807bc44ce 100644 --- a/extra/kdenetwork-krfb/PKGBUILD +++ b/extra/kdenetwork-krfb/PKGBUILD @@ -1,8 +1,8 @@ -# $Id$ +# $Id: PKGBUILD 202581 2013-12-22 12:49:34Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdenetwork-krfb -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc='Desktop Sharing' url='http://www.kde.org/applications/system/krfb' @@ -15,7 +15,7 @@ groups=('kde' 'kdenetwork') depends=('kdebase-runtime' 'libvncserver' 'libxdamage' 'telepathy-qt') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/krfb-${pkgver}.tar.xz") -sha1sums=('391f0bbc115a6e874d8c16e76c9bc0d75ea2ab5f') +sha1sums=('b58f92ba9f1b98c5623bb4a0bc14ed9838f8280a') build() { mkdir build diff --git a/extra/kdenetwork-strigi-analyzers/PKGBUILD b/extra/kdenetwork-strigi-analyzers/PKGBUILD index c422a704f..c604a396f 100644 --- a/extra/kdenetwork-strigi-analyzers/PKGBUILD +++ b/extra/kdenetwork-strigi-analyzers/PKGBUILD @@ -1,8 +1,8 @@ -# $Id$ +# $Id: PKGBUILD 202582 2013-12-22 12:49:35Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdenetwork-strigi-analyzers -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc='Strigi analyzers for various network protocols' url='https://projects.kde.org/projects/kde/kdenetwork/kdenetwork-strigi-analyzers' @@ -12,7 +12,7 @@ groups=('kde' 'kdenetwork') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4' 'boost') source=("http://download.kde.org/stable/${pkgver}/src/kdenetwork-strigi-analyzers-${pkgver}.tar.xz") -sha1sums=('7b294cbf762ee5649df1a1f65d0613ee4b783641') +sha1sums=('f3c0b07765236d18a01865986cca134fce68a1d5') build() { mkdir build diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD index 2a8d033dc..f18ca1d45 100644 --- a/extra/kdepim-runtime/PKGBUILD +++ b/extra/kdepim-runtime/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198824 2013-11-05 19:44:04Z andrea $ +# $Id: PKGBUILD 202459 2013-12-22 12:46:39Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepim-runtime -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc='Extends the functionality of kdepim' arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkgapi' 'libkolab' 'libkfbapi') makedepends=('cmake' 'automoc4' 'boost') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('168455654655bd302c668ca91f18fab47fa6cd3c') +sha1sums=('fe988ea74cf83f1dae99f81bc02eefaa834c664c') prepare() { mkdir build diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD index 1bb258901..a1bfa5849 100644 --- a/extra/kdepim/PKGBUILD +++ b/extra/kdepim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 198949 2013-11-05 20:17:31Z andrea $ +# $Id: PKGBUILD 202583 2013-12-22 12:49:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -20,7 +20,7 @@ pkgname=('kdepim-akonadiconsole' 'kdepim-ktimetracker' 'kdepim-ktnef' 'kdepim-libkdepim') -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 arch=('i686' 'x86_64') url='http://pim.kde.org' @@ -29,7 +29,7 @@ groups=('kde' 'kdepim') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link' 'kde-agent' 'nepomuk-widgets' 'link-grammar') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('627b027bb276c41ac8a1face093e777bfafcabf0') +sha1sums=('1ca184dc89f8c8395ffe4ec62a3fdcd0a7397ac4') build() { mkdir build @@ -59,8 +59,6 @@ package_kdepim-akregator() { 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 } @@ -74,23 +72,17 @@ package_kdepim-blogilo() { 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() { pkgdesc='Command line tool for accessing calendar files' - depends=('kdepim-runtime') + depends=('kdepim-libkdepim') url='http://pim.kde.org' 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() { @@ -98,12 +90,11 @@ package_kdepim-kaddressbook() { depends=('kdepim-libkdepim') url="http://kde.org/applications/office/kaddressbook/" 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() { @@ -113,8 +104,6 @@ package_kdepim-kalarm() { install='kdepim.install' cd "${srcdir}"/build/kalarm make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/kalarm - make DESTDIR="${pkgdir}" install } package_kdepim-kjots() { @@ -124,8 +113,6 @@ package_kdepim-kjots() { 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 } @@ -137,10 +124,6 @@ package_kdepim-kleopatra() { url="http://kde.org/applications/utilities/kleopatra/" 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() { @@ -152,12 +135,12 @@ package_kdepim-kmail() { 'kdepim-mimelib' 'kdepim-plugins') replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' 'kdepim-mimelib' 'kdepim-plugins') - 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() { @@ -167,10 +150,6 @@ package_kdepim-knode() { 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 } @@ -182,8 +161,6 @@ package_kdepim-knotes() { 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 } @@ -195,8 +172,8 @@ package_kdepim-kontact() { install='kdepim.install' conflcits=('kdepim-kontactinterfaces') replaces=('kdepim-kontactinterfaces') - 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 @@ -207,9 +184,8 @@ package_kdepim-korganizer() { depends=('kdepim-libkdepim') url="http://kde.org/applications/office/korganizer" 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 } @@ -229,8 +205,6 @@ package_kdepim-ktimetracker() { install='kdepim.install' cd "${srcdir}"/build/ktimetracker make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/ktimetracker - make DESTDIR="${pkgdir}" install } package_kdepim-ktnef() { @@ -240,8 +214,6 @@ package_kdepim-ktnef() { install=kdepim-ktnef.install cd "${srcdir}"/build/ktnef make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/ktnef - make DESTDIR="${pkgdir}" install } package_kdepim-libkdepim() { @@ -253,11 +225,12 @@ package_kdepim-libkdepim() { 'kdepim-akonadi') replaces=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp' 'kdepim-akonadi') - 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/extra/kdepimlibs/PKGBUILD b/extra/kdepimlibs/PKGBUILD index 1c11bab4b..d89202b7c 100644 --- a/extra/kdepimlibs/PKGBUILD +++ b/extra/kdepimlibs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198820 2013-11-05 19:40:54Z andrea $ +# $Id: PKGBUILD 202455 2013-12-22 12:46:35Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepimlibs -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="KDE PIM Libraries" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('nepomuk-core' 'gpgme' 'akonadi' 'libical' 'prison' 'qjson') makedepends=('cmake' 'automoc4' 'boost' 'cyrus-sasl') install='kdepimlibs.install' source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('ca131d0e1d24dd2c03e40de8b7d482abe4eba755') +sha1sums=('60b7bea192c5914daf0a5258ac61b781aa257a4a') build() { mkdir build diff --git a/extra/kdeplasma-addons/PKGBUILD b/extra/kdeplasma-addons/PKGBUILD index 3485ab153..fccc1bf4e 100644 --- a/extra/kdeplasma-addons/PKGBUILD +++ b/extra/kdeplasma-addons/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 198950 2013-11-05 20:17:53Z andrea $ +# $Id: PKGBUILD 202584 2013-12-22 12:49:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -77,7 +77,7 @@ pkgname=('kdeplasma-addons-applets-bball' 'kdeplasma-addons-wallpapers-qmlwallpapers' 'kdeplasma-addons-wallpapers-virus' 'kdeplasma-addons-wallpapers-weather') -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdeplasma-addons' @@ -86,7 +86,7 @@ groups=('kde' 'kdeplasma-addons') makedepends=('cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen' 'scim' 'qwt' 'boost' 'libkexiv2' 'ibus' 'qoauth' 'mesa') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('8f2b219a3e3434ba67691ba642f6dc43419ce907') +sha1sums=('0e0df64b06c77285a0119832cadd548b6b223ff1') prepare() { mkdir build diff --git a/extra/kdeplasma-applets-plasma-nm/PKGBUILD b/extra/kdeplasma-applets-plasma-nm/PKGBUILD index 8b3f6260e..908cd5c05 100644 --- a/extra/kdeplasma-applets-plasma-nm/PKGBUILD +++ b/extra/kdeplasma-applets-plasma-nm/PKGBUILD @@ -1,29 +1,24 @@ -# $Id: PKGBUILD 197151 2013-10-23 12:04:45Z andrea $ +# $Id: PKGBUILD 200039 2013-11-22 00:08:52Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Antonio Rojas < nqn1976 @ gmail.com > pkgname=kdeplasma-applets-plasma-nm -pkgver=0.9.3.1 -pkgrel=3 +pkgver=0.9.3.2 +pkgrel=1 pkgdesc="Plasma applet written in QML for managing network connections" arch=('i686' 'x86_64') url="https://projects.kde.org/projects/playground/network/plasma-nm" license=('GPL') depends=('kdebase-workspace' 'libnm-qt') -makedepends=('cmake' 'automoc4' 'openconnect') +makedepends=('cmake' 'automoc4' 'openconnect' 'mobile-broadband-provider-info') optdepends=('mobile-broadband-provider-info: Database of mobile broadband service providers' 'openconnect: Cisco AnyConnect VPN plugin') conflicts=('kdeplasma-applets-networkmanagement') -source=("http://download.kde.org/unstable/plasma-nm/plasma-nm-${pkgver}.tar.xz" - 'plasma-nm-fixes.patch') -md5sums=('c6ce9cd8523ec0f99fe87dea8b76a02f' - 'e5825709f49ba6c4386e909b80f75066') +source=("http://download.kde.org/unstable/plasma-nm/plasma-nm-${pkgver}.tar.xz") +md5sums=('67dde011a859f2d72633cf3af5c9f847') prepare() { mkdir build - - cd plasma-nm-${pkgver} - patch -p1 -i "${srcdir}"/plasma-nm-fixes.patch } build() { diff --git a/extra/kdeplasma-applets-plasma-nm/plasma-nm-fixes.patch b/extra/kdeplasma-applets-plasma-nm/plasma-nm-fixes.patch deleted file mode 100644 index d98448d7a..000000000 --- a/extra/kdeplasma-applets-plasma-nm/plasma-nm-fixes.patch +++ /dev/null @@ -1,322 +0,0 @@ -diff --git a/applet/declarative/contents/ui/main.qml b/applet/declarative/contents/ui/main.qml -index 8ea88cc..aa81707 100644 ---- a/applet/declarative/contents/ui/main.qml -+++ b/applet/declarative/contents/ui/main.qml -@@ -19,6 +19,7 @@ - */ - - import QtQuick 1.1 -+import org.kde.plasma.extras 0.1 as PlasmaExtras - import org.kde.plasma.components 0.1 as PlasmaComponents - import org.kde.plasma.core 0.1 as PlasmaCore - import org.kde.networkmanagement 0.1 as PlasmaNM -@@ -77,16 +78,7 @@ Item { - anchors.fill: parent - } - -- ListView { -- id: connectionView; -- -- property bool expandedItem: false; -- property string previouslyExpandedItem: ""; -- -- property bool activeExpanded: true; -- property bool previousExpanded: true; -- property bool unknownExpanded: true; -- -+ PlasmaExtras.ScrollArea { - anchors { - left: parent.left; - right: parent.right; -@@ -95,50 +87,64 @@ Item { - topMargin: padding.margins.top; - bottomMargin: padding.margins.bottom - } -- clip: true -- model: connectionSortModel; -- currentIndex: -1; -- interactive: true; -- boundsBehavior: Flickable.StopAtBounds; -- section.property: "itemSection"; -- section.delegate: SectionHeader { -- onHideSection: { -- if (section == i18n("Active connections")) { -- connectionView.activeExpanded = false; -- } else if (section == i18n("Previous connections")) { -- connectionView.previousExpanded = false; -- } else { -- connectionView.unknownExpanded = false; -+ -+ ListView { -+ id: connectionView; -+ -+ property bool expandedItem: false; -+ property string previouslyExpandedItem: ""; -+ -+ property bool activeExpanded: true; -+ property bool previousExpanded: true; -+ property bool unknownExpanded: true; -+ -+ anchors.fill: parent; -+ -+ clip: true -+ model: connectionSortModel; -+ currentIndex: -1; -+ interactive: true; -+ boundsBehavior: Flickable.StopAtBounds; -+ section.property: "itemSection"; -+ section.delegate: SectionHeader { -+ onHideSection: { -+ if (section == i18n("Active connections")) { -+ connectionView.activeExpanded = false; -+ } else if (section == i18n("Previous connections")) { -+ connectionView.previousExpanded = false; -+ } else { -+ connectionView.unknownExpanded = false; -+ } - } -- } - -- onShowSection: { -- if (section == i18n("Active connections")) { -- connectionView.activeExpanded = true; -- } else if (section == i18n("Previous connections")) { -- connectionView.previousExpanded = true; -- } else { -- connectionView.unknownExpanded = true; -+ onShowSection: { -+ if (section == i18n("Active connections")) { -+ connectionView.activeExpanded = true; -+ } else if (section == i18n("Previous connections")) { -+ connectionView.previousExpanded = true; -+ } else { -+ connectionView.unknownExpanded = true; -+ } - } - } -- } - -- delegate: ConnectionItem { -- expanded: connectionView.expandedItem && connectionView.previouslyExpandedItem == itemUni; -- onItemExpanded: { -- if (itemExpanded) { -- connectionView.expandedItem = true; -- connectionView.previouslyExpandedItem = itemUni;; -- connectionView.currentIndex = index; -- } else { -- connectionView.expandedItem = false; -- connectionView.previouslyExpandedItem = ""; -+ delegate: ConnectionItem { -+ expanded: connectionView.expandedItem && connectionView.previouslyExpandedItem == itemUni; -+ onItemExpanded: { -+ if (itemExpanded) { -+ connectionView.expandedItem = true; -+ connectionView.previouslyExpandedItem = itemUni;; -+ connectionView.currentIndex = index; -+ } else { -+ connectionView.expandedItem = false; -+ connectionView.previouslyExpandedItem = ""; -+ } - } -- } - -- ListView.onRemove: { -- if (ListView.isCurrentItem) { -- connectionView.previouslyExpandedItem = ""; -+ ListView.onRemove: { -+ if (ListView.isCurrentItem) { -+ connectionView.previouslyExpandedItem = ""; -+ } - } - } - } -diff --git a/declarative-plugins/applet/connectionicon.cpp b/declarative-plugins/applet/connectionicon.cpp -index c3f8540..76bdca0 100644 ---- a/declarative-plugins/applet/connectionicon.cpp -+++ b/declarative-plugins/applet/connectionicon.cpp -@@ -166,12 +166,24 @@ void ConnectionIcon::setIcons() - - foreach (const NetworkManager::ActiveConnection::Ptr & active, actives) { - if (((active->default4() || active->default6()) && active->state() == NetworkManager::ActiveConnection::Activated) || !defaultRouteExists) { -+ NetworkManager::ActiveConnection::Ptr activeConnection; -+ if (active->vpn()) { -+ NetworkManager::ActiveConnection::Ptr activeTmp; -+ activeTmp = NetworkManager::findActiveConnection(active->specificObject()); -+ if (activeTmp) { -+ activeConnection = activeTmp; -+ } - -- if (active->vpn() || active->devices().isEmpty()) { -+ vpnFound = true; -+ NMAppletDebug() << "Emit signal setHoverIcon(object-locked)"; -+ Q_EMIT setHoverIcon("object-locked"); -+ } else { -+ activeConnection = active; -+ } -+ if (activeConnection->devices().isEmpty()) { - continue; - } -- -- NetworkManager::Device::Ptr device = NetworkManager::findNetworkInterface(active->devices().first()); -+ NetworkManager::Device::Ptr device = NetworkManager::findNetworkInterface(activeConnection->devices().first()); - if (device) { - NetworkManager::Device::Type type = device->type(); - -@@ -184,7 +196,7 @@ void ConnectionIcon::setIcons() - setWirelessIconForSignalStrength(100); - connectionFound = true; - } else { -- NetworkManager::AccessPoint::Ptr ap = wifiDevice->findAccessPoint(active->specificObject()); -+ NetworkManager::AccessPoint::Ptr ap = wifiDevice->findAccessPoint(activeConnection->specificObject()); - if (ap) { - setWirelessIcon(device, ap->ssid()); - connectionFound = true; -@@ -222,9 +234,7 @@ void ConnectionIcon::setIcons() - } - } - } -- } -- -- if (active->vpn() && active->state() == NetworkManager::ActiveConnection::Activated) { -+ } else if (active->vpn() && active->state() == NetworkManager::ActiveConnection::Activated) { - vpnFound = true; - NMAppletDebug() << "Emit signal setHoverIcon(object-locked)"; - Q_EMIT setHoverIcon("object-locked"); -diff --git a/declarative-plugins/applet/networkstatus.cpp b/declarative-plugins/applet/networkstatus.cpp -index d63066d..8149da9 100644 ---- a/declarative-plugins/applet/networkstatus.cpp -+++ b/declarative-plugins/applet/networkstatus.cpp -@@ -129,8 +129,8 @@ void NetworkStatus::changeTooltip() - } - - QString tooltip = "<qt>"; -- QString format = "<b>%1 - %2</b><br>%3<br><br>"; -- QString formatDefault = "<b>%1 - %2</b><br><b>%3</b><br><br>"; -+ const QString format = "<b>%1 - %2</b><br>%3<br><br>"; -+ const QString formatDefault = "<b>%1 - %2</b><br><b>%3</b><br><br>"; - - foreach (const NetworkManager::ActiveConnection::Ptr & active, NetworkManager::activeConnections()) { - if (!active->devices().isEmpty()) { -@@ -145,7 +145,6 @@ void NetworkStatus::changeTooltip() - } else { - devName = device->ipInterfaceName(); - } --// conType = NetworkManager::ConnectionSettings::typeAsString(active->connection()->settings()->connectionType()); - if (active->vpn()) { - conType = i18n("VPN Connection"); - } else { -diff --git a/declarative-plugins/model/model.cpp b/declarative-plugins/model/model.cpp -index 1b3f4c3..bb88362 100644 ---- a/declarative-plugins/model/model.cpp -+++ b/declarative-plugins/model/model.cpp -@@ -230,7 +230,7 @@ void Model::addConnection(const QString& connection, const QString& device) - { - NetworkManager::Connection::Ptr con = NetworkManager::findConnection(connection); - -- if (con->settings()->isSlave()) { -+ if (con->settings()->isSlave() || con->name().isEmpty() || con->uuid().isEmpty()) { - return; - } - -@@ -395,7 +395,11 @@ void Model::removeWirelessNetwork(const QString& ssid, const QString& device) - if (wirelessDevice) { - accessPoint = wirelessDevice->findAccessPoint(item->specificPath()); - } -- if (accessPoint && accessPoint->mode() == NetworkManager::AccessPoint::Adhoc && -+ -+ // When accesspoint in ad-hoc mode dissapears, we should remove the item only when there is no connection. Similar case is when -+ // a wireless device is in AP mode, but in this case there could be only one visible AP and this should always be associated with some connection. -+ if (accessPoint && ((accessPoint->mode() == NetworkManager::AccessPoint::Adhoc && !item->connectionPath().isEmpty()) || -+ wirelessDevice->mode() == NetworkManager::WirelessDevice::ApMode) && - NetworkManager::isWirelessEnabled() && NetworkManager::isWirelessHardwareEnabled()) { - item->setWirelessNetwork(QString()); - if (updateItem(item)) { -diff --git a/declarative-plugins/model/modelitem.cpp b/declarative-plugins/model/modelitem.cpp -index 9a5931f..58d5c42 100644 ---- a/declarative-plugins/model/modelitem.cpp -+++ b/declarative-plugins/model/modelitem.cpp -@@ -151,6 +151,17 @@ QString ModelItem::icon() const - break; - case NetworkManager::ConnectionSettings::Wireless: - if (m_signal == 0 ) { -+ if (!m_connectionPath.isEmpty()) { -+ NetworkManager::Connection::Ptr con = NetworkManager::findConnection(m_connectionPath); -+ if (con) { -+ NetworkManager::WirelessSetting::Ptr wirelessSetting; -+ wirelessSetting = con->settings()->setting(NetworkManager::Setting::Wireless).dynamicCast<NetworkManager::WirelessSetting>(); -+ if (wirelessSetting && (wirelessSetting->mode() == NetworkManager::WirelessSetting::Adhoc || -+ wirelessSetting->mode() == NetworkManager::WirelessSetting::Ap)) { -+ return "network-wireless-100"; -+ } -+ } -+ } - return "network-wireless-00"; - } else if (m_signal < 20) { - return "network-wireless-20"; -diff --git a/kded/bluetoothmonitor.cpp b/kded/bluetoothmonitor.cpp -index 2221d09..5d0218b 100644 ---- a/kded/bluetoothmonitor.cpp -+++ b/kded/bluetoothmonitor.cpp -@@ -220,6 +220,7 @@ void BluetoothMonitor::init() - - mDunDevice = reply.value(); - } -+ - #if WITH_MODEMMANAGER_SUPPORT - void BluetoothMonitor::modemAdded(const QString &udi) - { -diff --git a/lib/editor/bridgewidget.cpp b/lib/editor/bridgewidget.cpp -index 8815eb2..95344c4 100644 ---- a/lib/editor/bridgewidget.cpp -+++ b/lib/editor/bridgewidget.cpp -@@ -216,5 +216,5 @@ void BridgeWidget::populateBridges() - - bool BridgeWidget::isValid() const - { -- return !m_ui->ifaceName->text().isEmpty() && m_ui->bridges->count() > 0; -+ return !m_ui->ifaceName->text().isEmpty(); - } -diff --git a/vpn/vpnc/vpnc.cpp b/vpn/vpnc/vpnc.cpp -index d4a511d..645249d 100644 ---- a/vpn/vpnc/vpnc.cpp -+++ b/vpn/vpnc/vpnc.cpp -@@ -145,7 +145,6 @@ NMVariantMapMap VpncUiPlugin::importConnectionSettings(const QString &fileName) - KConfigGroup cg(config, "main"); // Keys&Values are stored under [main] - if (cg.exists()) { - // Setup cisco-decrypt binary to decrypt the passwords -- QStringList decrArgs; - const QString ciscoDecryptBinary = KStandardDirs::findExe("cisco-decrypt", QString::fromLocal8Bit(qgetenv("PATH")) + ":/usr/lib/vpnc"); - if (ciscoDecryptBinary.isEmpty()) { - mErrorMessage = i18n("Needed executable cisco-decrypt could not be found."); -@@ -174,11 +173,11 @@ NMVariantMapMap VpncUiPlugin::importConnectionSettings(const QString &fileName) - } - else if (!decrPlugin->readStringKeyValue(cg,"enc_UserPassword").isEmpty() && !ciscoDecryptBinary.isEmpty()) { - // Decrypt the password and insert into map -- decrArgs.clear(); -- decrArgs << decrPlugin->readStringKeyValue(cg,"enc_UserPassword"); -- decrPlugin->ciscoDecrypt->setProgram(ciscoDecryptBinary, decrArgs); -+ decrPlugin->ciscoDecrypt->setProgram(ciscoDecryptBinary); - decrPlugin->ciscoDecrypt->start(); -- if (decrPlugin->ciscoDecrypt->waitForStarted() && decrPlugin->ciscoDecrypt->waitForFinished()) { -+ decrPlugin->ciscoDecrypt->waitForStarted(); -+ decrPlugin->ciscoDecrypt->write(decrPlugin->readStringKeyValue(cg,"enc_UserPassword").toUtf8()); -+ if (decrPlugin->ciscoDecrypt->waitForFinished()) { - secretData.insert(NM_VPNC_KEY_XAUTH_PASSWORD, decrPlugin->decryptedPasswd); - } - } -@@ -203,11 +202,11 @@ NMVariantMapMap VpncUiPlugin::importConnectionSettings(const QString &fileName) - } - else if (!decrPlugin->readStringKeyValue(cg,"enc_GroupPwd").isEmpty() && !ciscoDecryptBinary.isEmpty()) { - //Decrypt the password and insert into map -- decrArgs.clear(); -- decrArgs << decrPlugin->readStringKeyValue(cg,"enc_GroupPwd"); -- decrPlugin->ciscoDecrypt->setProgram(ciscoDecryptBinary, decrArgs); -+ decrPlugin->ciscoDecrypt->setProgram(ciscoDecryptBinary); - decrPlugin->ciscoDecrypt->start(); -- if (decrPlugin->ciscoDecrypt->waitForStarted() && decrPlugin->ciscoDecrypt->waitForFinished()) { -+ decrPlugin->ciscoDecrypt->waitForStarted(); -+ decrPlugin->ciscoDecrypt->write(decrPlugin->readStringKeyValue(cg,"enc_GroupPwd").toUtf8()); -+ if (decrPlugin->ciscoDecrypt->waitForFinished()) { - secretData.insert(NM_VPNC_KEY_SECRET, decrPlugin->decryptedPasswd); - data.insert(NM_VPNC_KEY_SECRET"-flags", QString::number(NetworkManager::Setting::AgentOwned)); - } diff --git a/extra/kdesdk-cervisia/PKGBUILD b/extra/kdesdk-cervisia/PKGBUILD index aba451b1a..2f347e69f 100644 --- a/extra/kdesdk-cervisia/PKGBUILD +++ b/extra/kdesdk-cervisia/PKGBUILD @@ -1,8 +1,8 @@ -# $Id$ +# $Id: PKGBUILD 202585 2013-12-22 12:49:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdesdk-cervisia -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc='CVS Frontend' url='http://kde.org/applications/development/cervisia/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/cervisia-${pkgver}.tar.xz") -sha1sums=('5a15700bff3faf2dfddf440708edcb8e18163505') +sha1sums=('c4609985634c38d1533a68d3f905c785ff780942') build() { mkdir build diff --git a/extra/kdesdk-dev-scripts/PKGBUILD b/extra/kdesdk-dev-scripts/PKGBUILD index 5a77797e8..b6715b259 100644 --- a/extra/kdesdk-dev-scripts/PKGBUILD +++ b/extra/kdesdk-dev-scripts/PKGBUILD @@ -1,8 +1,8 @@ -# $Id$ +# $Id: PKGBUILD 202587 2013-12-22 12:49:47Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdesdk-dev-scripts -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc='Scripts and setting files useful during development of KDE software' url='https://projects.kde.org/projects/kde/kdesdk/kde-dev-scripts' @@ -12,7 +12,7 @@ groups=('kde' 'kdesdk') depends=('kdebase-runtime' 'python2') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kde-dev-scripts-${pkgver}.tar.xz") -sha1sums=('dc372da52cc14272974164aae8daa26a05e2e8c3') +sha1sums=('e5c677542c7cfa206a2723c7c68a8c71c3e9ea5d') build() { mkdir build diff --git a/extra/kdesdk-dev-utils/PKGBUILD b/extra/kdesdk-dev-utils/PKGBUILD index 9a5f8fc43..441bb5285 100644 --- a/extra/kdesdk-dev-utils/PKGBUILD +++ b/extra/kdesdk-dev-utils/PKGBUILD @@ -1,8 +1,8 @@ -# $Id$ +# $Id: PKGBUILD 202586 2013-12-22 12:49:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdesdk-dev-utils -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc='Small utilities for developers using KDE/Qt libs/frameworks' url='https://projects.kde.org/projects/kde/kdesdk/kde-dev-utils' @@ -17,7 +17,7 @@ replaces=('kdesdk-kmtrace' 'kdesdk-kpartloader' 'kdesdk-kprofilemethod' 'kdesdk-kstartperf' 'kdesdk-kuiviewer') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kde-dev-utils-${pkgver}.tar.xz") -sha1sums=('0c8a8130e8e50b6fef336482c382533d9ff0ef83') +sha1sums=('08a45595bae38d7d1833eb035c0a753421e4604c') build() { mkdir build diff --git a/extra/kdesdk-dolphin-plugins/PKGBUILD b/extra/kdesdk-dolphin-plugins/PKGBUILD index 8afead78f..cfe0f2a6b 100644 --- a/extra/kdesdk-dolphin-plugins/PKGBUILD +++ b/extra/kdesdk-dolphin-plugins/PKGBUILD @@ -1,8 +1,8 @@ -# $Id$ +# $Id: PKGBUILD 202588 2013-12-22 12:49:50Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdesdk-dolphin-plugins -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc='Extra Dolphin plugins' url='https://projects.kde.org/projects/kde/kdesdk/dolphin-plugins' @@ -17,7 +17,7 @@ optdepends=('bzr: bazaar support' 'subversion: svn support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/dolphin-plugins-${pkgver}.tar.xz") -sha1sums=('bea6d35772eb4de7db38ab77db56e397abf8c171') +sha1sums=('281fcd97e1abbcd54eca76d83b1ce760ff472c2e') build() { mkdir build diff --git a/extra/kdesdk-kapptemplate/PKGBUILD b/extra/kdesdk-kapptemplate/PKGBUILD index 8bb65eb98..ab8d87515 100644 --- a/extra/kdesdk-kapptemplate/PKGBUILD +++ b/extra/kdesdk-kapptemplate/PKGBUILD @@ -1,8 +1,8 @@ -# $Id$ +# $Id: PKGBUILD 202589 2013-12-22 12:49:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdesdk-kapptemplate -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc='KDE Template Generator' url='http://kde.org/applications/development/kapptemplate/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kapptemplate-${pkgver}.tar.xz") -sha1sums=('a0a8f04819b828c4bb0ccd85d77ac3861667ab72') +sha1sums=('4034a10ec3a4f55e1c43a12b1610804d664088e1') build() { mkdir build diff --git a/extra/kdesdk-kate/PKGBUILD b/extra/kdesdk-kate/PKGBUILD index 8c3cd1969..3293a046d 100644 --- a/extra/kdesdk-kate/PKGBUILD +++ b/extra/kdesdk-kate/PKGBUILD @@ -1,27 +1,28 @@ -# $Id: PKGBUILD 198829 2013-11-05 19:45:10Z andrea $ +# $Id: PKGBUILD 202465 2013-12-22 12:46:47Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdesdk-kate pkgname=('kdebase-katepart' 'kdebase-kwrite' 'kdesdk-kate') -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') makedepends=('kdelibs ''cmake' 'automoc4' 'kdebindings-python') source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.xz" 'pkgbuild-syntax-highlight.patch') -sha1sums=('c3e537ac9f47ba2c4b0d9ec7aef1c64c8060df79' +sha1sums=('67b4ae3b3bc6959d29b03eeb43b58be772831e95' '80c324c9db81c07a02374e7a092d75e0bdd6b4ea') prepare() { + mkdir build + cd kate-${pkgver} patch -p1 -i "${srcdir}"/pkgbuild-syntax-highlight.patch } build() { - mkdir build cd build cmake ../kate-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ @@ -38,9 +39,6 @@ package_kdebase-katepart() { cd build/part make DESTDIR="${pkgdir}" install - - cd ../../build/addons - make DESTDIR="${pkgdir}" install } package_kdebase-kwrite() { @@ -71,4 +69,7 @@ package_kdesdk-kate() { cd ../../build/doc/kate make DESTDIR="${pkgdir}" install + + cd ../../../build/addons + make DESTDIR="${pkgdir}" install } diff --git a/extra/kdesdk-kcachegrind/PKGBUILD b/extra/kdesdk-kcachegrind/PKGBUILD index 191bfa49f..6437f6a48 100644 --- a/extra/kdesdk-kcachegrind/PKGBUILD +++ b/extra/kdesdk-kcachegrind/PKGBUILD @@ -1,8 +1,8 @@ -# $Id$ +# $Id: PKGBUILD 202590 2013-12-22 12:49:53Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdesdk-kcachegrind -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc='Visualization of Performance Profiling Data' url='http://kde.org/applications/development/kcachegrind/' @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') optdepends=('php: PHP support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kcachegrind-${pkgver}.tar.xz") -sha1sums=('7924d775688f0ecdadbe15ed59b5a00464efa16d') +sha1sums=('8d1cdbceeca886c1a31af9fc3405b1d86917ed82') build() { mkdir build diff --git a/extra/kdesdk-kioslaves/PKGBUILD b/extra/kdesdk-kioslaves/PKGBUILD index 28e785f4f..2aac3df27 100644 --- a/extra/kdesdk-kioslaves/PKGBUILD +++ b/extra/kdesdk-kioslaves/PKGBUILD @@ -1,8 +1,8 @@ -# $Id$ +# $Id: PKGBUILD 202591 2013-12-22 12:49:54Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdesdk-kioslaves -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc='KIO-Slaves' url='https://projects.kde.org/projects/kde/kdesdk/kdesdk-kioslaves' @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'subversion') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kdesdk-kioslaves-${pkgver}.tar.xz") -sha1sums=('177d78db40c568a51c74d2c1e2e48d3838254e09') +sha1sums=('a7c04650a37c28a8ccf316500918f0cef8f6164c') build() { mkdir build diff --git a/extra/kdesdk-kompare/PKGBUILD b/extra/kdesdk-kompare/PKGBUILD index 4c857b1bc..622c82c16 100644 --- a/extra/kdesdk-kompare/PKGBUILD +++ b/extra/kdesdk-kompare/PKGBUILD @@ -1,22 +1,25 @@ -# $Id$ +# $Id: PKGBUILD 202592 2013-12-22 12:49:56Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdesdk-kompare -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc='Diff/Patch Frontend' url='http://kde.org/applications/development/kompare/' arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdesdk') -depends=('kdebase-runtime') +depends=('kdebase-runtime' 'libkomparediff2') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kompare-${pkgver}.tar.xz") -sha1sums=('7847720ac971d86a5b16309b024035db8e3bf3d3') +sha1sums=('957723c68c9206d98d0c6dd3f42b4cf8feb88288') -build() { +prepare() { mkdir build +} + +build() { cd build cmake ../kompare-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/extra/kdesdk-lokalize/PKGBUILD b/extra/kdesdk-lokalize/PKGBUILD index aac50809a..a3d36497f 100644 --- a/extra/kdesdk-lokalize/PKGBUILD +++ b/extra/kdesdk-lokalize/PKGBUILD @@ -1,8 +1,8 @@ -# $Id$ +# $Id: PKGBUILD 202593 2013-12-22 12:49:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdesdk-lokalize -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc='Computer-Aided Translation System' url='http://kde.org/applications/development/lokalize/' @@ -16,7 +16,7 @@ optdepends=('translate-toolkit: enable extra scripts' install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/lokalize-${pkgver}.tar.xz" 'fix-python2-path.patch') -sha1sums=('2a95316eae1045ed27ea2580d5530c5e9fa7d2f7' +sha1sums=('bfe6363dae420e2b6ce82c201b45a0e337199bc4' '07db42bbcae402c292eebf002e549b04162621c5') prepare() { diff --git a/extra/kdesdk-okteta/PKGBUILD b/extra/kdesdk-okteta/PKGBUILD index 3d62399ba..ea5b5e86e 100644 --- a/extra/kdesdk-okteta/PKGBUILD +++ b/extra/kdesdk-okteta/PKGBUILD @@ -1,8 +1,8 @@ -# $Id$ +# $Id: PKGBUILD 202594 2013-12-22 12:49:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdesdk-okteta -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc='Hex Editor' url='http://kde.org/applications/utilities/okteta/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/okteta-${pkgver}.tar.xz") -sha1sums=('1b6d7a8911e401def759ac562fd0205a1160fa9b') +sha1sums=('230e9715de29b16ff3aa542c5557021702cfe6dc') build() { mkdir build diff --git a/extra/kdesdk-poxml/PKGBUILD b/extra/kdesdk-poxml/PKGBUILD index a06233bc4..5cb62a12c 100644 --- a/extra/kdesdk-poxml/PKGBUILD +++ b/extra/kdesdk-poxml/PKGBUILD @@ -1,8 +1,8 @@ -# $Id$ +# $Id: PKGBUILD 202595 2013-12-22 12:50:00Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdesdk-poxml -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc='Translates DocBook XML files using gettext po files' url='https://projects.kde.org/projects/kde/kdesdk/poxml' @@ -13,7 +13,7 @@ depends=('kdelibs') makedepends=('cmake' 'automoc4' 'antlr2') optdepends=('antlr2: required for po2xml and swappo tool') source=("http://download.kde.org/stable/${pkgver}/src/poxml-${pkgver}.tar.xz") -sha1sums=('543bd37fdd8e876950aaaea254b53de0bdd122ae') +sha1sums=('30d8d0f06a47965f336fd5428326a1c92fcaa7be') build() { mkdir build diff --git a/extra/kdesdk-strigi-analyzers/PKGBUILD b/extra/kdesdk-strigi-analyzers/PKGBUILD index 1326dacfc..5a8891763 100644 --- a/extra/kdesdk-strigi-analyzers/PKGBUILD +++ b/extra/kdesdk-strigi-analyzers/PKGBUILD @@ -1,8 +1,8 @@ -# $Id$ +# $Id: PKGBUILD 202596 2013-12-22 12:50:05Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdesdk-strigi-analyzers -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc='Analyzer plugins for strigi' url='https://projects.kde.org/projects/kde/kdesdk/kdesdk-strigi-analyzers' @@ -12,7 +12,7 @@ groups=('kde' 'kdesdk') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kdesdk-strigi-analyzers-${pkgver}.tar.xz") -sha1sums=('c7672d1aaa6ecff3245c080252693536e7673461') +sha1sums=('efe05955070149c54c65621327196c94d1c82e41') build() { mkdir build diff --git a/extra/kdesdk-thumbnailers/PKGBUILD b/extra/kdesdk-thumbnailers/PKGBUILD index 871977f2c..611fa2d8e 100644 --- a/extra/kdesdk-thumbnailers/PKGBUILD +++ b/extra/kdesdk-thumbnailers/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198965 2013-11-05 20:21:59Z andrea $ +# $Id: PKGBUILD 202597 2013-12-22 12:50:07Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdesdk-thumbnailers -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc='Plugins for the thumbnailing system' url='https://projects.kde.org/projects/kde/kdesdk/kdesdk-thumbnailers' @@ -12,7 +12,7 @@ groups=('kde' 'kdesdk') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kdesdk-thumbnailers-${pkgver}.tar.xz") -sha1sums=('cd3aeee2dbb685ec5d6eaccc513ac3571c1a20bb') +sha1sums=('094dbd49b3565b9bee38f9d4390740b2b8d8df34') build() { mkdir build diff --git a/extra/kdesdk-umbrello/PKGBUILD b/extra/kdesdk-umbrello/PKGBUILD index 0e0603afd..007e73234 100644 --- a/extra/kdesdk-umbrello/PKGBUILD +++ b/extra/kdesdk-umbrello/PKGBUILD @@ -1,8 +1,8 @@ -# $Id$ +# $Id: PKGBUILD 202598 2013-12-22 12:50:08Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdesdk-umbrello -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc='UML Modeller' url='http://kde.org/applications/development/umbrello/' @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'boost') optdepends=('ruby') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/umbrello-${pkgver}.tar.xz") -sha1sums=('98274cfe91db7b56429a9de0d23ae490adee9ce0') +sha1sums=('307f2da8ea0a69e045c1013c20e0ffeb1690ad56') build() { mkdir build diff --git a/extra/kdetoys-amor/PKGBUILD b/extra/kdetoys-amor/PKGBUILD index 27b4196f1..19e9e2af0 100644 --- a/extra/kdetoys-amor/PKGBUILD +++ b/extra/kdetoys-amor/PKGBUILD @@ -1,8 +1,8 @@ -# $Id$ +# $Id: PKGBUILD 202599 2013-12-22 12:50:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdetoys-amor -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc='On-Screen Creature' url='https://projects.kde.org/projects/kde/kdetoys/amor' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/amor-${pkgver}.tar.xz") -sha1sums=('b118d2fbee168d5bfd386ea67994f9730e80c5dc') +sha1sums=('2cf0e4e8cfe069913c39e17aa59b2a6d013d0ad1') build() { mkdir build diff --git a/extra/kdetoys-kteatime/PKGBUILD b/extra/kdetoys-kteatime/PKGBUILD index c92f0c375..22ea04670 100644 --- a/extra/kdetoys-kteatime/PKGBUILD +++ b/extra/kdetoys-kteatime/PKGBUILD @@ -1,8 +1,8 @@ -# $Id$ +# $Id: PKGBUILD 202600 2013-12-22 12:50:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdetoys-kteatime -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc='Tea Cooker' url='http://kde.org/applications/games/kteatime/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kteatime-${pkgver}.tar.xz") -sha1sums=('5359a97a9a46ca75cd1ed7173182f838d929a4f5') +sha1sums=('fba17a0e97ab31094b714811f74dbccfc3f70841') build() { mkdir build diff --git a/extra/kdetoys-ktux/PKGBUILD b/extra/kdetoys-ktux/PKGBUILD index a03f5e915..631148bf1 100644 --- a/extra/kdetoys-ktux/PKGBUILD +++ b/extra/kdetoys-ktux/PKGBUILD @@ -1,8 +1,8 @@ -# $Id$ +# $Id: PKGBUILD 202601 2013-12-22 12:50:12Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdetoys-ktux -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc='A Tux-in-a-spaceship screen saver' url='https://projects.kde.org/projects/kde/kdetoys/ktux' @@ -13,7 +13,7 @@ depends=('kdebase-workspace') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ktux-${pkgver}.tar.xz") -sha1sums=('333b912e51ec5c57d3346d8b7c609cc284d41e08') +sha1sums=('acf49c182581c342abacedccabfe2daceec914e1') build() { mkdir build diff --git a/extra/kdeutils-filelight/PKGBUILD b/extra/kdeutils-filelight/PKGBUILD index de0f2147c..ece96fd37 100644 --- a/extra/kdeutils-filelight/PKGBUILD +++ b/extra/kdeutils-filelight/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198971 2013-11-05 20:24:57Z andrea $ +# $Id: PKGBUILD 202603 2013-12-22 12:50:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-filelight -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc='View disk usage information' url='http://kde.org/applications/utilities/filelight' @@ -15,7 +15,7 @@ replaces=('filelight') conflicts=('filelight') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/filelight-${pkgver}.tar.xz") -sha1sums=('70b950c66d3eb517b59aac5119150b14ef7cb467') +sha1sums=('5cec6ddbb501ee39be62b624c74258f6a8c8718a') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kcalc/PKGBUILD b/extra/kdeutils-kcalc/PKGBUILD index 1476d580e..644c3e67b 100644 --- a/extra/kdeutils-kcalc/PKGBUILD +++ b/extra/kdeutils-kcalc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198972 2013-11-05 20:25:05Z andrea $ +# $Id: PKGBUILD 202604 2013-12-22 12:50:16Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kcalc -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc='Scientific Calculator' url='http://kde.org/applications/utilities/kcalc/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kcalc-${pkgver}.tar.xz") -sha1sums=('a62a37a16a699fdba715cda33b9f75755d81cb76') +sha1sums=('a783b12395016d9cdec87e442a7591e7d61c3c6d') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kcharselect/PKGBUILD b/extra/kdeutils-kcharselect/PKGBUILD index 334730c67..ca02300d6 100644 --- a/extra/kdeutils-kcharselect/PKGBUILD +++ b/extra/kdeutils-kcharselect/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198973 2013-11-05 20:25:14Z andrea $ +# $Id: PKGBUILD 202605 2013-12-22 12:50:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kcharselect -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc='Character Selector' url="http://kde.org/applications/utilities/kcharselect/" @@ -12,7 +12,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') source=("http://download.kde.org/stable/${pkgver}/src/kcharselect-${pkgver}.tar.xz") -sha1sums=('7fd5c926fc4d3c94690d03c883e5efd5a97d5b89') +sha1sums=('f862a8d0299355146411f3f79943c6690a62c347') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kdf/PKGBUILD b/extra/kdeutils-kdf/PKGBUILD index 1240c41fe..563b68878 100644 --- a/extra/kdeutils-kdf/PKGBUILD +++ b/extra/kdeutils-kdf/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198974 2013-11-05 20:25:21Z andrea $ +# $Id: PKGBUILD 202606 2013-12-22 12:50:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kdf -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 url="http://kde.org/applications/system/kdiskfree/" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kdf-${pkgver}.tar.xz") -sha1sums=('acd04e1fff3d410e2e3766871cac7bb086091c49') +sha1sums=('2d56949fb0bc889403e3460d097e056bbce6ffd9') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kfloppy/PKGBUILD b/extra/kdeutils-kfloppy/PKGBUILD index d59673532..cfe57191f 100644 --- a/extra/kdeutils-kfloppy/PKGBUILD +++ b/extra/kdeutils-kfloppy/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198975 2013-11-05 20:25:29Z andrea $ +# $Id: PKGBUILD 202607 2013-12-22 12:50:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kfloppy -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc='Floppy Formatter' url='http://kde.org/applications/utilities/kfloppy/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kfloppy-${pkgver}.tar.xz") -sha1sums=('2e1588840cb5fd396c21d69ae3011efdcb6cf043') +sha1sums=('642aeb278dca7b769d01f37d67e065ff6003d68d') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kgpg/PKGBUILD b/extra/kdeutils-kgpg/PKGBUILD index 2390382d1..846f598df 100644 --- a/extra/kdeutils-kgpg/PKGBUILD +++ b/extra/kdeutils-kgpg/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198976 2013-11-05 20:25:37Z andrea $ +# $Id: PKGBUILD 202608 2013-12-22 12:50:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kgpg -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc='A GnuPG frontend' url='http://kde.org/applications/utilities/kgpg/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kgpg-${pkgver}.tar.xz") -sha1sums=('8b2172abb9ee002d1ac65d77363f29ece238aeb4') +sha1sums=('28d08d701d35ad71eb5772a6aa8580a5205ea618') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kremotecontrol/PKGBUILD b/extra/kdeutils-kremotecontrol/PKGBUILD index 1bb885a7c..4e4d16acc 100644 --- a/extra/kdeutils-kremotecontrol/PKGBUILD +++ b/extra/kdeutils-kremotecontrol/PKGBUILD @@ -1,8 +1,8 @@ -# $Id$ +# $Id: PKGBUILD 202609 2013-12-22 12:50:25Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kremotecontrol -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc='Configure your remote controls for use with applications' url='http://kde.org/applications/utilities/kremotecontrol/' @@ -15,7 +15,7 @@ replaces=('kdeutils-kdelirc') conflicts=('kdeutils-kdelirc') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kremotecontrol-${pkgver}.tar.xz") -sha1sums=('deddf6f8e2310d955902d49c8b6b73fae635fd77') +sha1sums=('27b8e567591723d29908c9ac85753c9a66d847ca') build() { cd "${srcdir}" diff --git a/extra/kdeutils-ktimer/PKGBUILD b/extra/kdeutils-ktimer/PKGBUILD index 634a66be4..5ce31b763 100644 --- a/extra/kdeutils-ktimer/PKGBUILD +++ b/extra/kdeutils-ktimer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198978 2013-11-05 20:25:54Z andrea $ +# $Id: PKGBUILD 202610 2013-12-22 12:50:26Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-ktimer -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc='Countdown Launcher' url='http://kde.org/applications/utilities/ktimer/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ktimer-${pkgver}.tar.xz") -sha1sums=('f6d8f80ecb79a4baf26ae54f681026a2c9363319') +sha1sums=('fb8f46dc90f41e62c0a4f4bdff46894659125938') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kwallet/PKGBUILD b/extra/kdeutils-kwallet/PKGBUILD index 78f71dc51..4756ef6b5 100644 --- a/extra/kdeutils-kwallet/PKGBUILD +++ b/extra/kdeutils-kwallet/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198979 2013-11-05 20:26:01Z andrea $ +# $Id: PKGBUILD 202611 2013-12-22 12:50:29Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kwallet -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc='Wallet Management Tool' url='http://kde.org/applications/system/kwalletmanager/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kwallet-${pkgver}.tar.xz") -sha1sums=('7d9a7cfdec09d7acf662aba75478bbd41b52e1ad') +sha1sums=('44c7e225989b77fd9be7e6804bf3f4702c62efa3') build() { cd "${srcdir}" diff --git a/extra/kdeutils-print-manager/PKGBUILD b/extra/kdeutils-print-manager/PKGBUILD index 39e061087..7483697e7 100644 --- a/extra/kdeutils-print-manager/PKGBUILD +++ b/extra/kdeutils-print-manager/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198980 2013-11-05 20:26:10Z andrea $ +# $Id: PKGBUILD 202612 2013-12-22 12:50:30Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-print-manager -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="A tool for managing print jobs and printers" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ replaces=('print-manager' 'kdeutils-printer-applet' 'kdeadmin-system-config-prin conflicts=('print-manager') groups=('kde' 'kdeutils') source=("http://download.kde.org/stable/${pkgver}/src/print-manager-${pkgver}.tar.xz") -sha1sums=('d477e8cf7ea96ba0b1c842e557ca2860cec37df5') +sha1sums=('9d16dabd15278d0fac6ad3b3aabe58c7bc26ac07') build() { mkdir build diff --git a/extra/kdeutils-superkaramba/PKGBUILD b/extra/kdeutils-superkaramba/PKGBUILD index b8cc0b1f3..b46884b96 100644 --- a/extra/kdeutils-superkaramba/PKGBUILD +++ b/extra/kdeutils-superkaramba/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198981 2013-11-05 20:26:18Z andrea $ +# $Id: PKGBUILD 202613 2013-12-22 12:50:31Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-superkaramba -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc='An engine for cool desktop eyecandy' url='http://kde.org/applications/utilities/superkaramba/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/superkaramba-${pkgver}.tar.xz") -sha1sums=('19211613d819f79fae23c726e123fd25d65f2ca6') +sha1sums=('d50d682fd1960ab50fdd2ec3c605d0599dc3e6de') build() { cd "${srcdir}" diff --git a/extra/kdeutils-sweeper/PKGBUILD b/extra/kdeutils-sweeper/PKGBUILD index de7b8b918..5567ca9f6 100644 --- a/extra/kdeutils-sweeper/PKGBUILD +++ b/extra/kdeutils-sweeper/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198982 2013-11-05 20:27:12Z andrea $ +# $Id: PKGBUILD 202614 2013-12-22 12:50:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-sweeper -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc='System Cleaner' url='http://kde.org/applications/utilities/sweeper' @@ -12,7 +12,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') source=("http://download.kde.org/stable/${pkgver}/src/sweeper-${pkgver}.tar.xz") -sha1sums=('f2badf883646ff5a12c4f4daf309a87dba0e8af9') +sha1sums=('2b117aa90b46ea0eeba9a07f8f0aa95744014d57') build() { cd "${srcdir}" diff --git a/extra/kdevelop-php/PKGBUILD b/extra/kdevelop-php/PKGBUILD index a7125d836..3654d030a 100644 --- a/extra/kdevelop-php/PKGBUILD +++ b/extra/kdevelop-php/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198620 2013-10-30 22:42:00Z andrea $ +# $Id: PKGBUILD 201355 2013-12-09 10:50:13Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdevelop-php -pkgver=1.5.2 -_pkgver=4.5.2 +pkgver=1.6.0 +_pkgver=4.6.0 pkgrel=1 pkgdesc="PHP language and documentation plugin for KDevelop" arch=('i686' 'x86_64' 'mips64el') @@ -14,8 +14,8 @@ makedepends=('cmake' 'automoc4' 'kdevelop-pg-qt') replaces=('kdevelop-php-docs') conflicts=('kdevelop-php-docs') source=(http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-{,docs-}${pkgver}.tar.xz) -sha1sums=('784f76dd12ee0ab443fa0f9d05d0e3062aafdb38' - '44e737743d0c9663912480508adac0ccbb826a56') +sha1sums=('705b1f36a6fbbac207e8ca78619827206b75b48e' + '98d7efe6f983c4b439c6cbdc40d427e14954298f') prepare() { mkdir build diff --git a/extra/kdevelop-python/PKGBUILD b/extra/kdevelop-python/PKGBUILD index 4dc31ff6f..fc48657db 100644 --- a/extra/kdevelop-python/PKGBUILD +++ b/extra/kdevelop-python/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 197794 2013-10-30 08:55:59Z andrea $ +# $Id: PKGBUILD 201382 2013-12-10 11:10:02Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdevelop-python -pkgver=1.5.2 +pkgver=1.6.0 +_pkgver=4.6.0 pkgrel=1 pkgdesc="Python language and documentation plugin for KDevelop" arch=('i686' 'x86_64' 'mips64el') @@ -10,8 +11,8 @@ url="http://www.kdevelop.org/" license=('GPL') depends=('kdevelop') makedepends=('cmake' 'automoc4' 'kdevelop-pg-qt') -source=("http://download.kde.org/stable/kdevelop/kdev-python/${pkgver}/src/kdev-python-v${pkgver}.tar.xz") -sha1sums=('aa08a4f164fabde363b1bc5141e1f673405949f3') +source=("http://download.kde.org/stable/kdevelop/${_pkgver}/src/kdev-python-${pkgver}.tar.xz") +sha1sums=('88618dbd3a80d5193f49f6c61a6ad02a5e9c0652') prepare() { mkdir build @@ -19,7 +20,7 @@ prepare() { build() { cd build - cmake ../kdev-python-v${pkgver} \ + cmake ../kdev-python-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release make diff --git a/extra/kdevelop/PKGBUILD b/extra/kdevelop/PKGBUILD index abdaad6a2..93d1c0e74 100644 --- a/extra/kdevelop/PKGBUILD +++ b/extra/kdevelop/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198618 2013-10-30 22:40:58Z andrea $ +# $Id: PKGBUILD 201353 2013-12-09 10:44:21Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=kdevelop -pkgver=4.5.2 +pkgver=4.6.0 pkgrel=1 pkgdesc="A C/C++ development environment for KDE" arch=('i686' 'x86_64' 'mips64el') @@ -21,7 +21,7 @@ optdepends=('kdesdk-okteta: hex editor integration' 'cmake: cmake integration') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('3bd354ca9ff8562c8099a41836ccd72456561409') +sha1sums=('2b723c3e16c41dbcd9817336893eff85712cb11d') prepare() { mkdir build diff --git a/extra/kdevplatform/PKGBUILD b/extra/kdevplatform/PKGBUILD index d7be656c0..75a08932f 100644 --- a/extra/kdevplatform/PKGBUILD +++ b/extra/kdevplatform/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198616 2013-10-30 22:25:51Z andrea $ +# $Id: PKGBUILD 201351 2013-12-09 10:43:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=kdevplatform -pkgver=1.5.2 -_pkgver=4.5.2 +pkgver=1.6.0 +_pkgver=4.6.0 pkgrel=1 pkgdesc="A C/C++ development platform for KDE" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ optdepends=("kdesdk-kompare: difference checking") makedepends=('cmake' 'automoc4' 'boost') install="${pkgname}.install" source=("http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('a2fa1f765e992739546fa04d0aaffc4f2200c520') +sha1sums=('8ed8ccb63b64a3675716f1ad14b4a73fcbf4133d') prepare() { mkdir build diff --git a/extra/kdewebdev/PKGBUILD b/extra/kdewebdev/PKGBUILD index a1725fd2b..0a6c6236f 100644 --- a/extra/kdewebdev/PKGBUILD +++ b/extra/kdewebdev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 198983 2013-11-05 20:28:42Z andrea $ +# $Id: PKGBUILD 202615 2013-12-22 12:50:34Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -7,7 +7,7 @@ pkgname=('kdewebdev-kfilereplace' 'kdewebdev-kimagemapeditor' 'kdewebdev-klinkstatus' 'kdewebdev-kommander') -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -15,7 +15,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdewebdev') makedepends=('cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepimlibs' 'boost') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('2178b219f0220592e039b337529a5962acf97db1') +sha1sums=('3ff61d129f428cffd4ddfed6d6007fe5625ca724') build() { cd $srcdir diff --git a/extra/kino/PKGBUILD b/extra/kino/PKGBUILD deleted file mode 100644 index b107e8a9d..000000000 --- a/extra/kino/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 198121 2013-10-30 12:54:59Z allan $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Robert Emil Berge <robert@rebi.no> - -pkgname=kino -pkgver=1.3.4 -pkgrel=5 -pkgdesc="A non-linear DV editor" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.kinodv.org/" -license=('GPL') -depends=('libavc1394' 'libiec61883' 'libdv' 'libglade' 'libxv' 'libsamplerate' 'libsm' 'desktop-file-utils') -makedepends=('intltool' 'v4l-utils') -install=kino.install -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'videodev-header.patch') -md5sums=('52f8ce690e45a089e3edc6c7af61a05c' - '940404c0eec3c9d954c289ceb52d15a6') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -p1 -i "${srcdir}"/videodev-header.patch - - ./configure --prefix=/usr \ - --with-udev-rules-dir=/usr/lib/udev/rules.d - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - # Fix permissions - chown -R root:root "${pkgdir}/usr/share/kino/help" -} diff --git a/extra/kino/kino.install b/extra/kino/kino.install deleted file mode 100644 index 83b78df92..000000000 --- a/extra/kino/kino.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - update-mime-database usr/share/mime 1> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - update-mime-database usr/share/mime 1> /dev/null - update-desktop-database -q -} diff --git a/extra/kino/videodev-header.patch b/extra/kino/videodev-header.patch deleted file mode 100644 index 01394fc47..000000000 --- a/extra/kino/videodev-header.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: kino-1.3.4/ffmpeg/libavdevice/v4l.c -=================================================================== ---- kino-1.3.4.orig/ffmpeg/libavdevice/v4l.c 2011-04-11 15:12:41.915593967 +0200 -+++ kino-1.3.4/ffmpeg/libavdevice/v4l.c 2011-04-11 15:13:05.825593979 +0200 -@@ -26,7 +26,7 @@ - #include <sys/mman.h> - #include <sys/time.h> - #define _LINUX_TIME_H 1 --#include <linux/videodev.h> -+#include <libv4l1-videodev.h> - #include <time.h> - - typedef struct { -Index: kino-1.3.4/src/v4l.h -=================================================================== ---- kino-1.3.4.orig/src/v4l.h 2011-04-11 15:12:41.895593967 +0200 -+++ kino-1.3.4/src/v4l.h 2011-04-11 15:12:57.555593975 +0200 -@@ -40,7 +40,7 @@ - - #define _DEVICE_H_ - #define _LINUX_TIME_H --#include <linux/videodev.h> -+#include <libv4l1-videodev.h> - - #include "displayer.h" - diff --git a/extra/kscreen/PKGBUILD b/extra/kscreen/PKGBUILD index d810f9794..8da9942fb 100644 --- a/extra/kscreen/PKGBUILD +++ b/extra/kscreen/PKGBUILD @@ -1,20 +1,19 @@ -# $Id: PKGBUILD 192014 2013-08-04 07:38:09Z lcarlier $ +# $Id: PKGBUILD 200209 2013-11-22 10:46:39Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: birdflesh <antkoul at gmail dot com> pkgname=kscreen -pkgver=1.0.1 +pkgver=1.0.2.1 pkgrel=1 pkgdesc="KDE's screen management software" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/kscreen' license=('GPL' 'LGPL') -depends=('kdebase-runtime' "libkscreen>=${pkgver}") +depends=('kdebase-runtime' 'libkscreen') makedepends=('cmake' 'automoc4') install=$pkgname.install -#source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('2d6bd56a2edcadb9ba80c00fbd330a60') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") +md5sums=('cd3d6ffdb0e44c418c2804fc72b8391b') prepare() { mkdir build diff --git a/extra/lbreakout2/PKGBUILD b/extra/lbreakout2/PKGBUILD deleted file mode 100644 index 03144c063..000000000 --- a/extra/lbreakout2/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 184401 2013-05-06 19:38:14Z foutrelis $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=lbreakout2 -pkgver=2.6.4 -pkgrel=2 -pkgdesc="A breakout game with nice effects, graphics, and sounds" -arch=('i686' 'x86_64' 'mips64el') -url="http://lgames.sourceforge.net" -license=('GPL') -depends=('sdl_mixer' 'libpng') -backup=('var/games/lbreakout2/lbreakout2.hscr') -source=("http://downloads.sourceforge.net/lgames/${pkgname}-${pkgver/_/-}.tar.gz" - 'lbreakout2.desktop' - 'lbreakout2.png') -md5sums=('4849af72225a304267eb71a9c100cd48' - '14cd34a72a8f4e3b8f385f9023625241' - '94e2fa393eb2a7d4494641dec580573b') - -build() { - cd ${srcdir}/${pkgname}-${pkgver/_/-} - - ./configure --prefix=/usr \ - --localstatedir=/var/games/lbreakout2 - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver/_/-} - - make DESTDIR=${pkgdir}/ doc_dir=/usr/share/doc install - - chmod -R 755 ${pkgdir}/usr - chown root:games ${pkgdir}/var/games - chmod 775 ${pkgdir}/var/games - chown root:games ${pkgdir}/var/games/lbreakout2 - chmod 755 ${pkgdir}/var/games/lbreakout2 - chown root:games ${pkgdir}/var/games/lbreakout2/lbreakout2.hscr - chmod 775 ${pkgdir}/var/games/lbreakout2/lbreakout2.hscr - - install -Dm644 ${srcdir}/lbreakout2.png ${pkgdir}/usr/share/pixmaps/lbreakout2.png - install -Dm644 ${srcdir}/lbreakout2.desktop ${pkgdir}/usr/share/applications/lbreakout2.desktop -} diff --git a/extra/lbreakout2/lbreakout2.desktop b/extra/lbreakout2/lbreakout2.desktop deleted file mode 100644 index c8ef945da..000000000 --- a/extra/lbreakout2/lbreakout2.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Type=Application -Encoding=UTF-8 -Name=Linux Breakout 2 -Comment=Breakout and Arkanoid style arcade game -Icon=/usr/share/pixmaps/lbreakout2.png -TryExec=lbreakout2 -Exec=lbreakout2 -Terminal=false -Categories=Application;Game; diff --git a/extra/lbreakout2/lbreakout2.png b/extra/lbreakout2/lbreakout2.png Binary files differdeleted file mode 100644 index f9541e184..000000000 --- a/extra/lbreakout2/lbreakout2.png +++ /dev/null diff --git a/extra/lcab/PKGBUILD b/extra/lcab/PKGBUILD deleted file mode 100644 index f3ead6e60..000000000 --- a/extra/lcab/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 154275 2012-03-25 09:39:03Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Damir Perisa <damir.perisa@bluewin.ch> - -pkgname=lcab -pkgver=1.0b12 -pkgrel=4.1 -pkgdesc="A program to make Microsoft cabinet files" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -url="http://ohnopub.net/~ohnobinki/lcab/" -depends=('glibc') -source=("ftp://ohnopublishing.net/mirror/${pkgname}-${pkgver}.tar.gz") -md5sums=('9403e08f53fcf262e25641a9b900d4de') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - install -D -m755 lcab "${pkgdir}/usr/bin/lcab" -} diff --git a/extra/lensfun/PKGBUILD b/extra/lensfun/PKGBUILD index 39c211128..f2c082d5c 100644 --- a/extra/lensfun/PKGBUILD +++ b/extra/lensfun/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 182923 2013-04-16 07:16:05Z tpowa $ +# $Id: PKGBUILD 201246 2013-12-06 16:02:09Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=lensfun -pkgver=0.2.7 +pkgver=0.2.8 pkgrel=1 pkgdesc="Database of photographic lenses and a library that allows advanced access to the database" arch=(i686 x86_64 'mips64el') @@ -10,7 +10,8 @@ url="http://lensfun.berlios.de/" license=('LGPL3') depends=('glibc' 'glib2') makedepends=('python2' 'libpng' 'doxygen') -source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + lensfun-0.2.8-make-4.0.patch) prepare() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -20,6 +21,8 @@ prepare() { confflags="" fi sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' configure + # fix configure script for make 4.0 + patch -Np0 -i "${srcdir}/lensfun-0.2.8-make-4.0.patch" } build() { @@ -34,4 +37,5 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make INSTALL_PREFIX="$pkgdir" install } -md5sums=('6061cc2d00a42d3e62512878426fc841') +md5sums=('db2988505e7432c6b331aa597789c639' + '9464d933a5e4ccefed7fc38656a9ec18') diff --git a/extra/lensfun/lensfun-0.2.3-as-needed.patch b/extra/lensfun/lensfun-0.2.3-as-needed.patch deleted file mode 100644 index 12287dba2..000000000 --- a/extra/lensfun/lensfun-0.2.3-as-needed.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ru lensfun-0.2.3.orig/build/mak/compiler/gcc.mak lensfun-0.2.3/build/mak/compiler/gcc.mak ---- lensfun-0.2.3.orig/build/mak/compiler/gcc.mak 2009-03-15 02:42:40.000000000 +0100 -+++ lensfun-0.2.3/build/mak/compiler/gcc.mak 2009-03-15 02:43:37.000000000 +0100 -@@ -71,7 +71,7 @@ - endef - - LINK.GCC.AR = $(GCC.AR) $(GCC.ARFLAGS) $@ $^ --LINK.GCC.EXEC = $(GCC.LD) -o $@ $(GCC.LDFLAGS) $(LDFLAGS) $1 $^ $(GCC.LDFLAGS.LIBS) $(LDFLAGS.LIBS) $2 -+LINK.GCC.EXEC = $(GCC.LD) $(LDFLAGS) $^ $2 $(GCC.LDFLAGS.LIBS) $(LDFLAGS.LIBS) $(GCC.LDFLAGS) $1 -o $@ - define LINK.GCC.SO - $(GCC.LD) -o $@.$(SHARED.$3) -Wl,"-soname=$(notdir $@).$(basename $(basename $(SHARED.$3)))" $(GCC.LDFLAGS.SHARED) $(GCC.LDFLAGS) $(LDFLAGS) $1 $^ $(GCC.LDFLAGS.LIBS) $(LDFLAGS.LIBS) $2 - ln -fs $(notdir $@.$(SHARED.$3)) $@.$(basename $(basename $(SHARED.$3))) -Only in lensfun-0.2.3/out/posix/release: deps diff --git a/extra/lensfun/lensfun-0.2.3-glibc-2.10.patch b/extra/lensfun/lensfun-0.2.3-glibc-2.10.patch deleted file mode 100644 index 41a29563a..000000000 --- a/extra/lensfun/lensfun-0.2.3-glibc-2.10.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lensfun-0.2.3.orig/tools/makedep/cppsetup.cpp 2009-07-04 21:20:49.000000000 +0200 -+++ lensfun-0.2.3/tools/makedep/cppsetup.cpp 2009-07-04 22:19:18.000000000 +0200 -@@ -195,7 +195,7 @@ - } - while (s); - -- eol = strchr (var, 0); -+ eol = (char *)strchr (var, 0); - - // Skip parentheses which Microsoft likes so much - if (*var == '(') diff --git a/extra/lensfun/lensfun-0.2.8-make-4.0.patch b/extra/lensfun/lensfun-0.2.8-make-4.0.patch new file mode 100644 index 000000000..c7694457d --- /dev/null +++ b/extra/lensfun/lensfun-0.2.8-make-4.0.patch @@ -0,0 +1,11 @@ +--- configure.old 2013-12-06 16:55:09.098654166 +0100 ++++ configure 2013-12-06 16:55:20.298676545 +0100 +@@ -45,7 +45,7 @@ + } + + # Check for tools +-tibs.check_program ("GNU Make", "make --version", ".*?([0-9\.]+).*", "3.81", True) ++tibs.check_program ("GNU Make", "make --version", ".*?([0-9\.]+).*", "4.0", True) + if tibs.check_program ("makedep", "makedep -V", ".*Version.*?([0-9\.]+).*", "0.1.0"): + tibs.add_config_mak ("MAKEDEP", "makedep") + makedep = "yes" diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD index 5271b475f..089421b33 100644 --- a/extra/lftp/PKGBUILD +++ b/extra/lftp/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 196341 2013-10-11 16:33:42Z andyrtr $ +# $Id: PKGBUILD 201537 2013-12-14 08:34:10Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=lftp -pkgver=4.4.10 +pkgver=4.4.14 pkgrel=1 pkgdesc="Sophisticated command line based FTP client" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') -depends=('gcc-libs' 'readline>=6.2' "gnutls" "expat>=2.0.1-4" 'sh') +depends=('gcc-libs' 'readline' 'gnutls' 'expat' 'sh') optdepends=('perl: needed for convert-netscape-cookies and verify-file') url="http://lftp.yar.ru/" backup=('etc/lftp.conf') source=(http://lftp.yar.ru/ftp/${pkgname}-${pkgver}.tar.xz{,.asc}) -md5sums=('1b8d77f1a5a9cfe4e48e45636b775101' +md5sums=('809544255f668a6d3af867f643cc321f' 'SKIP') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} ./configure --prefix=/usr \ --with-gnutls \ --without-openssl \ @@ -27,7 +27,7 @@ build() { } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} make DESTDIR=${pkgdir} install rm -rf ${pkgdir}/usr/lib } diff --git a/extra/libbluedevil/PKGBUILD b/extra/libbluedevil/PKGBUILD index da95a708c..defa33a5c 100644 --- a/extra/libbluedevil/PKGBUILD +++ b/extra/libbluedevil/PKGBUILD @@ -1,25 +1,31 @@ -# $Id: PKGBUILD 194548 2013-09-18 11:33:02Z tomegun $ +# $Id: PKGBUILD 202650 2013-12-23 08:20:14Z andrea $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=libbluedevil -pkgver=1.9.4 -pkgrel=1 +pkgver=2.0rc1 +_pkgver=2.0-rc1 +pkgrel=2 +epoch=1 pkgdesc='A Qt4 wrapper for bluez used in the new KDE bluetooth stack' arch=('i686' 'x86_64' 'mips64el') url="https://projects.kde.org/projects/playground/libs/libbluedevil" license=('GPL') -depends=('qt4' 'bluez4') +depends=('qt4' 'bluez') makedepends=('cmake') -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -md5sums=('25d114ba52218f4cf44c7b4525399835') +source=("http://download.kde.org/unstable/${pkgname}/${_pkgver}/src/${pkgname}-${_pkgver}.tar.xz") +md5sums=('3883a20334ed210fb46077ebea163c0a') -build() { +prepare() { mkdir build +} + +build() { cd build - cmake ../${pkgname}-v${pkgver} \ + cmake ../${pkgname}-${_pkgver} \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_INSTALL_PREFIX=/usr \ + -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt4 make } diff --git a/extra/libbluray/PKGBUILD b/extra/libbluray/PKGBUILD index 9a5788976..469d9a79d 100644 --- a/extra/libbluray/PKGBUILD +++ b/extra/libbluray/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198685 2013-11-02 07:22:33Z bpiotrowski $ +# $Id: PKGBUILD 202445 2013-12-22 07:44:29Z bpiotrowski $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Andrew Cook <ariscop@gmail.com> pkgname=libbluray -pkgver=0.4.0 +pkgver=0.5.0 pkgrel=1 pkgdesc='Library to access Blu-Ray disks for video playback' arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ url='http://www.videolan.org/developers/libbluray.html' license=('LGPL2.1') depends=('libxml2' 'freetype2') source=(ftp://ftp.videolan.org/pub/videolan/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) -sha256sums=('63a3218d69f179f4834ef3b48bfa95268ad62c302ff38bfc052e2fc6916ae3f8') +md5sums=('04cf15d0f3581a955d3a2ccb9dc06e9e') build() { cd $pkgname-$pkgver diff --git a/extra/libburn/PKGBUILD b/extra/libburn/PKGBUILD index 9e098c77b..daa26832e 100644 --- a/extra/libburn/PKGBUILD +++ b/extra/libburn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198131 2013-10-30 12:58:36Z allan $ +# $Id: PKGBUILD 201539 2013-12-14 08:38:34Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=libburn -pkgver=1.3.2 # .pl01 +pkgver=1.3.4 # .pl01 pkgrel=1 pkgdesc="Library for reading, mastering and writing optical discs" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('GPL') depends=('glibc') source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz{,.sig}) options=('!emptydirs') -md5sums=('3c6ee25f172ff28e7b5e5de4f9f26ba9' +md5sums=('6aaaf2cfb09584e69991250e619789b4' 'SKIP') build() { diff --git a/extra/libconfig/PKGBUILD b/extra/libconfig/PKGBUILD index 1ec4c0c54..6f20da5e1 100644 --- a/extra/libconfig/PKGBUILD +++ b/extra/libconfig/PKGBUILD @@ -5,7 +5,7 @@ pkgname=libconfig pkgver=1.4.9 -pkgrel=1 +pkgrel=2 pkgdesc="C/C++ Configuration File Library" arch=('i686' 'x86_64' 'mips64el') url="http://hyperrealm.com/libconfig/libconfig.html" diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD index fb01cb3f6..ef9b363f2 100644 --- a/extra/libdrm/PKGBUILD +++ b/extra/libdrm/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 198149 2013-10-30 13:05:35Z allan $ +# $Id: PKGBUILD 200740 2013-12-03 19:25:26Z lcarlier $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libdrm -pkgver=2.4.47 +pkgver=2.4.50 pkgrel=1 pkgdesc="Userspace interface to kernel DRM services" arch=(i686 x86_64 'mips64el') license=('custom') depends=('glibc' 'libpciaccess') +[ "$CARCH" != "mips64el" ] && makedepends=('valgrind') checkdepends=('cairo') -[ "$CARCH" != "mips64el" ] && makedepends+=('clang' 'valgrind') replaces=('libdrm-new' 'libdrm-nouveau') url="http://dri.freedesktop.org/" source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2 COPYING) -sha256sums=('c2dac2250adbcea23efb18fa8cf484c0f43c8ffbf5064ec82678bc410084f8e7' +sha256sums=('3823d24cda800c2cd36995e01830b890edb8fb1bebf97d5ea4318b8c3933b045' '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93') build() { @@ -24,11 +24,6 @@ build() { sed -i "/pthread-stubs/d" configure.ac autoreconf --force --install - # gcc 4.8 introduces graphic corruption and X crashes with nouveau cards (nv44) - # http://gcc.gnu.org/ml/gcc-help/2013-07/msg00103.html - # we use clang compiler meanwhile - [ "$CARCH" != "mips64el" ] && export CC=clang - ./configure --prefix=/usr --enable-udev make } diff --git a/extra/libdvbpsi/PKGBUILD b/extra/libdvbpsi/PKGBUILD index 0d9e690d3..7f7e39917 100644 --- a/extra/libdvbpsi/PKGBUILD +++ b/extra/libdvbpsi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198150 2013-10-30 13:05:56Z allan $ +# $Id: PKGBUILD 199858 2013-11-17 11:33:45Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=libdvbpsi -pkgver=1.1.1 +pkgver=1.1.2 pkgrel=1 epoch=1 pkgdesc="A library designed for decoding and generation of MPEG TS and DVB PSI tables" @@ -14,7 +14,7 @@ replaces=('libdvbpsi4' 'libdvbpsi5') conflicts=('libdvbpsi4' 'libdvbpsi5') url="http://developers.videolan.org/libdvbpsi/" source=("http://download.videolan.org/pub/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('0c7c355201f325ea99c522d8ec97bf86') +md5sums=('0d8ffb38d0ebfeb55c40ce6fe232f5d3') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libftdi-compat/PKGBUILD b/extra/libftdi-compat/PKGBUILD new file mode 100644 index 000000000..9be6032cf --- /dev/null +++ b/extra/libftdi-compat/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 200728 2013-12-03 16:50:08Z eric $ +# Maintainer: + +pkgname=libftdi-compat +pkgver=0.20 +pkgrel=1 +pkgdesc="A library to talk to FTDI chips" +arch=('i686' 'x86_64') +url="http://www.intra2net.com/en/developer/libftdi/download.php" +license=('GPL2' 'LGPL2.1') +depends=('libusb-compat' 'gcc-libs') +makedepends=('boost') +source=(http://www.intra2net.com/en/developer/libftdi/download/libftdi-$pkgver.tar.gz{,.sig}) +sha1sums=('4bc6ce70c98a170ada303fbd00b8428d8a2c1aa2' + '807d145147c9bee08b4cea4d7ca82ccaf1330f02') + +build() { + cd libftdi-$pkgver + ./configure --prefix=/usr --without-examples + make +} + +package() { + cd libftdi-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/extra/libftdi/PKGBUILD b/extra/libftdi/PKGBUILD index 33529c424..164883361 100644 --- a/extra/libftdi/PKGBUILD +++ b/extra/libftdi/PKGBUILD @@ -1,27 +1,36 @@ -# $Id: PKGBUILD 197346 2013-10-25 02:47:00Z allan $ -# Contributor: Tobias Powalowski <tpowa@archlinux.org> +# $Id: PKGBUILD 200729 2013-12-03 16:51:00Z eric $ +# Maintainer: pkgname=libftdi -pkgver=0.20 +pkgver=1.0 pkgrel=2 pkgdesc="A library to talk to FTDI chips" arch=('i686' 'x86_64' 'mips64el') url="http://www.intra2net.com/en/developer/libftdi/download.php" license=('GPL2' 'LGPL2.1') -depends=('libusb-compat' 'gcc-libs') -makedepends=('boost') -source=(http://www.intra2net.com/en/developer/libftdi/download/$pkgname-$pkgver.tar.gz{,.sig}) -sha1sums=('4bc6ce70c98a170ada303fbd00b8428d8a2c1aa2' - '807d145147c9bee08b4cea4d7ca82ccaf1330f02') +depends=('libusbx') +makedepends=('boost' 'cmake') +source=(http://www.intra2net.com/en/developer/libftdi/download/${pkgname}1-$pkgver.tar.bz2{,.sig}) +sha1sums=('5be76cfd7cd36c5291054638f7caf4137303386f' + 'SKIP') + +prepare() { + cd ${pkgname}1-$pkgver + sed -i 's|LIB_SUFFIX 64|LIB_SUFFIX ""|' CMakeLists.txt +} build() { - cd "$srcdir/$pkgname-$pkgver" - sed -i '/no-install/d' examples/Makefile.in - ./configure --prefix=/usr + cd ${pkgname}1-$pkgver + mkdir build + cd build + cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_BUILD_RPATH=ON -DCMAKE_BUILD_TYPE=Release make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd ${pkgname}1-$pkgver/build make DESTDIR="$pkgdir" install + find examples -type f -perm -755 -exec install {} "$pkgdir/usr/bin" \; + # Remove eepreom (conflict with i2c-tools FS#37925) + rm "$pkgdir/usr/bin/eeprom" } diff --git a/extra/libgda/PKGBUILD b/extra/libgda/PKGBUILD index 356f93787..678256ec8 100644 --- a/extra/libgda/PKGBUILD +++ b/extra/libgda/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198160 2013-10-30 13:09:39Z allan $ +# $Id: PKGBUILD 199873 2013-11-17 20:47:22Z heftig $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=libgda -pkgver=5.1.2 -pkgrel=2 +pkgver=5.2.1 +pkgrel=1 pkgdesc="Data abstraction layer with mysql, pgsql, xml, sqlite providers" arch=(i686 x86_64 'mips64el') license=('GPL') @@ -12,11 +12,11 @@ depends=('gtksourceview3' 'libxslt' 'json-glib' 'db' 'ncurses' 'libsoup' 'libmariadbclient' 'postgresql-libs' 'python2' 'libsecret' 'hicolor-icon-theme' 'desktop-file-utils' 'graphviz' 'gdk-pixbuf2' 'iso-codes' 'openssl' 'libgcrypt' 'libldap') -makedepends=('intltool' 'gobject-introspection' 'gtk-doc' 'vala') +makedepends=('intltool' 'gobject-introspection' 'gtk-doc' 'vala' 'itstool') url="http://www.gnome-db.org" install=libgda.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('59c4416a151297a406091fcfe7af781ea88af3381d10b365ba73b1eb8e23b6c5') +sha256sums=('c29aa77e9a2f22cacf2d2af0429e0828feece7386fb07709b519642dcdb3f041') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libgdata/PKGBUILD b/extra/libgdata/PKGBUILD index e4c19b657..d450ec29a 100644 --- a/extra/libgdata/PKGBUILD +++ b/extra/libgdata/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 198161 2013-10-30 13:09:59Z allan $ +# $Id: PKGBUILD 202189 2013-12-19 01:51:33Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libgdata -pkgver=0.13.4 +pkgver=0.14.1 pkgrel=1 pkgdesc="GLib-based library for accessing online service APIs using the GData protocol" arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('libsoup' 'liboauth' 'gcr' 'gnome-online-accounts') -makedepends=('intltool' 'gobject-introspection') +makedepends=('intltool' 'gobject-introspection' 'vala') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('ae405145bb6a2109488b7123206b469b141f17317066471dd485b4ea50499c83') +sha256sums=('68bbb2cb70028d79edfaec17184389275044fd58bf881e36df2663e7e191ff1a') build() { cd "$pkgname-$pkgver" diff --git a/extra/libgdiplus/PKGBUILD b/extra/libgdiplus/PKGBUILD index aadb73f5f..f3410e472 100644 --- a/extra/libgdiplus/PKGBUILD +++ b/extra/libgdiplus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198162 2013-10-30 13:10:21Z allan $ +# $Id: PKGBUILD 200003 2013-11-21 01:30:41Z allan $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=libgdiplus pkgver=2.10.9 -pkgrel=2 +pkgrel=3 pkgdesc="An Open Source Implementation of the GDI+ API" arch=(i686 x86_64 'mips64el') license=('MPL' 'LGPL') @@ -26,6 +26,7 @@ prepare() { sed -i -e 's/-L\${libjpeg_prefix}\/lib -ljpeg/-ljpeg/' configure } + build() { cd ${pkgname}-${pkgver} ./configure --prefix=/usr --with-cairo=system diff --git a/extra/libgpod/PKGBUILD b/extra/libgpod/PKGBUILD index 993eee3c0..6670538a4 100644 --- a/extra/libgpod/PKGBUILD +++ b/extra/libgpod/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198175 2013-10-30 13:15:45Z allan $ +# $Id: PKGBUILD 200005 2013-11-21 01:32:03Z allan $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=libgpod pkgver=0.8.2 -pkgrel=7 +pkgrel=8 pkgdesc="A shared library to access the contents of an iPod" arch=(i686 x86_64 'mips64el') license=('LGPL') diff --git a/extra/libiec61883/PKGBUILD b/extra/libiec61883/PKGBUILD index 6c086997e..e71d39c4b 100644 --- a/extra/libiec61883/PKGBUILD +++ b/extra/libiec61883/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 198184 2013-10-30 13:19:06Z allan $ +# $Id: PKGBUILD 200001 2013-11-21 01:26:16Z allan $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> # Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com> @@ -6,14 +6,14 @@ pkgname=libiec61883 pkgver=1.2.0 -pkgrel=3.1 +pkgrel=4 pkgdesc="A higher level API for streaming DV, MPEG-2 and audio over Linux IEEE 1394" arch=('i686' 'x86_64' 'mips64el') url="http://www.kernel.org/pub/linux/libs/ieee1394/" license=('LGPL') depends=('libraw1394') -source=("http://ftp.osuosl.org/pub/linux/libs/ieee1394/${pkgname}-${pkgver}.tar.gz") -md5sums=('8af39fff74988073c3ad53fbab147da9') +source=("https://www.kernel.org/pub/linux/libs/ieee1394/${pkgname}-${pkgver}.tar.xz") +md5sums=('ed91bc1727fac8e019402fc3724a283d') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libindi/PKGBUILD b/extra/libindi/PKGBUILD index b0e8a4d22..b5d898f87 100644 --- a/extra/libindi/PKGBUILD +++ b/extra/libindi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198755 2013-11-03 09:14:05Z andrea $ +# $Id: PKGBUILD 202208 2013-12-19 13:43:24Z fyan $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=libindi pkgver=0.9.6 -pkgrel=5 +pkgrel=7 pkgdesc="A distributed control protocol designed to operate astronomical instrumentation" url="http://www.indilib.org/index.php?title=Main_Page" license=('GPL2') diff --git a/extra/libisoburn/PKGBUILD b/extra/libisoburn/PKGBUILD index 839a5ad5a..3f171a9f3 100644 --- a/extra/libisoburn/PKGBUILD +++ b/extra/libisoburn/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 197415 2013-10-25 18:23:05Z andyrtr $ +# $Id: PKGBUILD 201543 2013-12-14 08:42:49Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Gour <Gour <gour@mail.inet.hr> pkgname=libisoburn -pkgver=1.3.2 -pkgrel=3 +pkgver=1.3.4 +pkgrel=1 pkgdesc="frontend for libraries libburn and libisofs" url="http://libburnia-project.org" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') -depends=('libburn>=1.3.2' 'libisofs>=1.3.2' 'readline') +depends=('libburn>=1.3.4' 'libisofs>=1.3.4' 'readline') optdepends=('tk: for xorriso-tcltk frontend' 'bwidget: for xorriso-tcltk frontend') provides=('xorriso' 'xorriso-tcltk') install=${pkgname}.install source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz{,.sig}) -md5sums=('7ebee7c1d4e09565daddca15467035af' +md5sums=('d8ebfe9407aca0d6b799706647703692' 'SKIP') build() { diff --git a/extra/libisofs/PKGBUILD b/extra/libisofs/PKGBUILD index 335b4d930..5147d5a57 100644 --- a/extra/libisofs/PKGBUILD +++ b/extra/libisofs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198189 2013-10-30 13:20:51Z allan $ +# $Id: PKGBUILD 201541 2013-12-14 08:40:10Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Hugo Doria <hugodoria@gmail.com> # Contributor: Bjorn Martensen pkgname=libisofs -pkgver=1.3.2 +pkgver=1.3.4 pkgrel=1 pkgdesc="Library to pack up hard disk files and directories into a ISO 9660 disk image" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ url="http://libburnia-project.org" license=('GPL') depends=('acl' 'zlib') source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz{,.sig}) -md5sums=('3dfdaaf964ed7a779bc23de50c5f2175' +md5sums=('dcd2cb0485579b4973e4ce7291fda647' 'SKIP') build() { diff --git a/extra/libjpeg-turbo/PKGBUILD b/extra/libjpeg-turbo/PKGBUILD index 4690791fb..75c606a81 100644 --- a/extra/libjpeg-turbo/PKGBUILD +++ b/extra/libjpeg-turbo/PKGBUILD @@ -1,23 +1,30 @@ -# $Id: PKGBUILD 198190 2013-10-30 13:21:13Z allan $ +# $Id: PKGBUILD 201420 2013-12-11 04:56:37Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Simone Sclavi 'Ito' <darkhado@gmail.com> pkgname=libjpeg-turbo pkgver=1.3.0 -pkgrel=3 +pkgrel=4 pkgdesc='JPEG image codec with accelerated baseline compression and decompression' url='http://libjpeg-turbo.virtualgl.org/' license=('GPL' 'custom') arch=('i686' 'x86_64' 'mips64el') makedepends=('nasm') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") -sha1sums=('1792c964b35604cebd3a8846f1ca6de5976e9c28') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" + 'cve-2013-6629.patch') +sha1sums=('1792c964b35604cebd3a8846f1ca6de5976e9c28' + '10f2cf2276244d2b94d35bfca24639bc83ce1185') provides=('libjpeg=8.0.2' 'turbojpeg') conflicts=('libjpeg' 'turbojpeg') replaces=('libjpeg' 'turbojpeg') +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -i ../cve-2013-6629.patch # FS#38094 +} + build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --with-jpeg8 --mandir=/usr/share/man diff --git a/extra/libjpeg-turbo/cve-2013-6629.patch b/extra/libjpeg-turbo/cve-2013-6629.patch new file mode 100644 index 000000000..7fb02730f --- /dev/null +++ b/extra/libjpeg-turbo/cve-2013-6629.patch @@ -0,0 +1,36 @@ +Index: jdmarker.c +=================================================================== +--- jdmarker.c (revision 1088) ++++ jdmarker.c (revision 1089) +@@ -304,7 +304,7 @@ + /* Process a SOS marker */ + { + INT32 length; +- int i, ci, n, c, cc; ++ int i, ci, n, c, cc, pi; + jpeg_component_info * compptr; + INPUT_VARS(cinfo); + +@@ -348,6 +348,13 @@ + + TRACEMS3(cinfo, 1, JTRC_SOS_COMPONENT, cc, + compptr->dc_tbl_no, compptr->ac_tbl_no); ++ ++ /* This CSi (cc) should differ from the previous CSi */ ++ for (pi = 0; pi < i; pi++) { ++ if (cinfo->cur_comp_info[pi] == compptr) { ++ ERREXIT1(cinfo, JERR_BAD_COMPONENT_ID, cc); ++ } ++ } + } + + /* Collect the additional scan parameters Ss, Se, Ah/Al. */ +@@ -465,6 +472,8 @@ + for (i = 0; i < count; i++) + INPUT_BYTE(cinfo, huffval[i], return FALSE); + ++ MEMZERO(&huffval[count], (256 - count) * SIZEOF(UINT8)); ++ + length -= count; + + if (index & 0x10) { /* AC table definition */ diff --git a/extra/libkcddb/PKGBUILD b/extra/libkcddb/PKGBUILD index fa4a8f5b3..86a52b06f 100644 --- a/extra/libkcddb/PKGBUILD +++ b/extra/libkcddb/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198845 2013-11-05 19:48:35Z andrea $ +# $Id: PKGBUILD 202479 2013-12-22 12:47:03Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkcddb -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="KDE CDDB library" url='https://projects.kde.org/projects/kde/kdemultimedia/libkcddb' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdemultimedia-kioslave') conflicts=('kdemultimedia-kioslave') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('2e1b5381d704445d08a87353c2b1528349dfcbd0') +sha1sums=('e0a195f145719defb1ad52493b41118a3b31c58e') build() { cd "${srcdir}" diff --git a/extra/libkcompactdisc/PKGBUILD b/extra/libkcompactdisc/PKGBUILD index b4ba341f0..cda9af6cf 100644 --- a/extra/libkcompactdisc/PKGBUILD +++ b/extra/libkcompactdisc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198846 2013-11-05 19:48:45Z andrea $ +# $Id: PKGBUILD 202480 2013-12-22 12:47:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkcompactdisc -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="A library for interfacing with CDs" url='https://projects.kde.org/projects/kde/kdemultimedia/libkcompactdisc' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdemultimedia-kioslave') conflicts=('kdemultimedia-kioslave') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('e8c3e8efe5454538a7e7538355d099ebdbf6ac2b') +sha1sums=('dc8b0bc7839942eb5e22ea6a3faf1d9960a99b98') build() { cd "${srcdir}" diff --git a/extra/libkdcraw/PKGBUILD b/extra/libkdcraw/PKGBUILD index 99ed4d169..f9a7ec339 100644 --- a/extra/libkdcraw/PKGBUILD +++ b/extra/libkdcraw/PKGBUILD @@ -1,29 +1,31 @@ -# $Id: PKGBUILD 198840 2013-11-05 19:47:41Z andrea $ +# $Id: PKGBUILD 202475 2013-12-22 12:46:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdcraw -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="A C++ interface used to decode RAW picture" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkdcraw" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') -depends=('kdelibs' 'lcms2') +depends=('kdelibs' 'libraw') makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('c6eb63d1675aa028b1217b79958e1c63c245ca77') +sha1sums=('7f2aae2f91edc4de668dee8138305148242ef34b') -build() { +prepare() { mkdir build +} + +build() { cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DKDE4_BUILD_TESTS=OFF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DENABLE_LCMS2=ON + -DCMAKE_INSTALL_PREFIX=/usr make } diff --git a/extra/libkdeedu/PKGBUILD b/extra/libkdeedu/PKGBUILD index dd725401e..55fd8ebf0 100644 --- a/extra/libkdeedu/PKGBUILD +++ b/extra/libkdeedu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198838 2013-11-05 19:47:18Z andrea $ +# $Id: PKGBUILD 202473 2013-12-22 12:46:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdeedu -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="Libraries used by KDE Education applications" url="https://projects.kde.org/projects/kde/kdeedu/libkdeedu" @@ -14,7 +14,7 @@ install=${pkgname}.install replaces=('kdeedu-libkdeedu' 'kdeedu-data') options=('staticlibs') # libqtmmlwidget.a needed by KAlgebra source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('5db8e436ac5a77c3dacaf8279988e0121df10cd8') +sha1sums=('b974648cc561d02eb999d2a5d197a93125142b39') build() { cd "${srcdir}" diff --git a/extra/libkdegames/PKGBUILD b/extra/libkdegames/PKGBUILD index aff0e9f59..477da05d3 100644 --- a/extra/libkdegames/PKGBUILD +++ b/extra/libkdegames/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198847 2013-11-05 19:48:57Z andrea $ +# $Id: PKGBUILD 202481 2013-12-22 12:47:05Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdegames -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="Common code and data for many KDE games" url="https://projects.kde.org/projects/kde/kdegames/libkdegames" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegames-libkdegames') conflicts=('kdegames-libkdegames') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('df08248949aa8e0df3ec6cba3ca228078abe980d') +sha1sums=('7c67c6ed68adc09937b20a5d46b7dde330e47400') build() { mkdir build diff --git a/extra/libkexiv2/PKGBUILD b/extra/libkexiv2/PKGBUILD index 3ae406dd8..431c00afe 100644 --- a/extra/libkexiv2/PKGBUILD +++ b/extra/libkexiv2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198841 2013-11-05 19:47:52Z andrea $ +# $Id: PKGBUILD 202462 2013-12-22 12:46:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkexiv2 -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="A library to manipulate pictures metadata" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkexiv2" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('7095a438080173a2c5bd77fe57f59580056d1a4c') +sha1sums=('554839aa4ea94f2ed55aa48c10c41d65c266da37') build() { cd "${srcdir}" diff --git a/extra/libkgapi/PKGBUILD b/extra/libkgapi/PKGBUILD index d21ade318..c190312bb 100644 --- a/extra/libkgapi/PKGBUILD +++ b/extra/libkgapi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 186926 2013-06-01 08:09:09Z andrea $ +# $Id: PKGBUILD 200783 2013-12-05 06:48:36Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkgapi -pkgver=2.0.1 +pkgver=2.0.2 pkgrel=1 pkgdesc="A KDE-based library for accessing various Google services via their public API" url='https://projects.kde.org/projects/extragear/libs/libkgapi' @@ -12,15 +12,19 @@ depends=('kdepimlibs') makedepends=('cmake' 'automoc4' 'boost') replaces=('akonadi-google' 'libkgoogle') conflicts=('akonadi-google' 'libkgoogle') -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('a421c6b5e0b262136121e3734b29fcce') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") +md5sums=('27c406bb32b8cf0199cd44952bb8680e') -build() { +prepare() { mkdir build +} + +build() { cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_INSTALL_PREFIX=/usr \ + -DKDE4_BUILD_TESTS=OFF make } diff --git a/extra/libkipi/PKGBUILD b/extra/libkipi/PKGBUILD index 2cd942a48..87e9a07c8 100644 --- a/extra/libkipi/PKGBUILD +++ b/extra/libkipi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 145371 2011-12-22 07:58:59Z andrea $ +# $Id # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkipi -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="An interface to use kipi-plugins from a KDE application" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkipi" @@ -14,11 +14,13 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('8fa8453b4314521e41d51972cec628c3ebd4294d') +sha1sums=('bb0f8708071a07246e0ac553568102c743c3b13f') -build() { - cd "${srcdir}" +prepare() { mkdir build +} + +build() { cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ @@ -28,6 +30,6 @@ build() { } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/libkmahjongg/PKGBUILD b/extra/libkmahjongg/PKGBUILD index e93dc88e0..48c9c3862 100644 --- a/extra/libkmahjongg/PKGBUILD +++ b/extra/libkmahjongg/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198848 2013-11-05 19:49:09Z andrea $ +# $Id: PKGBUILD 202482 2013-12-22 12:47:06Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkmahjongg -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="Common code, backgrounds and tile sets for games using Mahjongg tiles" url="https://projects.kde.org/projects/kde/kdegames/libmahjongg" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegames-libkmahjongg') conflicts=('kdegames-libkmahjongg') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('d0018922e1b7b05847b544fd4f365da196f0f812') +sha1sums=('be38eb549b5502181bad65cfeb45b832d711bc7e') build() { mkdir build diff --git a/extra/libkolabxml/PKGBUILD b/extra/libkolabxml/PKGBUILD index 85d66d4ea..c2ab05da6 100644 --- a/extra/libkolabxml/PKGBUILD +++ b/extra/libkolabxml/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 190041 2013-07-13 12:41:18Z svenstaro $ +# $Id: PKGBUILD 201260 2013-12-07 10:34:59Z bpiotrowski $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkolabxml pkgver=0.8.4 -pkgrel=2 +pkgrel=3 pkgdesc="Kolab XML Format Schema Definitions Library" url='http://git.kolab.org/libkolabxml/' arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('xerces-c' 'boost-libs') -makedepends=('cmake' 'boost' 'xsd' 'qt4') +makedepends=('cmake' 'boost' 'xsd' 'qt4' 'swig') source=("http://mirror.kolabsys.com/pub/releases/${pkgname}-${pkgver}.tar.gz"{,.gpg}) md5sums=('64887f52c6629bbd8e2390d591ef5892' '55fcdaff82818c4a0eac50570db31e53') diff --git a/extra/libkomparediff2/PKGBUILD b/extra/libkomparediff2/PKGBUILD new file mode 100644 index 000000000..9ce18d38c --- /dev/null +++ b/extra/libkomparediff2/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 202483 2013-12-22 12:47:06Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=libkomparediff2 +pkgver=4.12.0 +pkgrel=1 +pkgdesc="Library to compare files and strings" +url='https://projects.kde.org/projects/kde/kdesdk/libkomparediff2' +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdelibs') +makedepends=('cmake' 'automoc4') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") +sha1sums=('ba6dcfd8da41d5f441d6f2a8352eb28e3b504e08') + +prepare() { + mkdir build +} + +build() { + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DKDE4_BUILD_TESTS=OFF \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd build + make DESTDIR="${pkgdir}" install +} diff --git a/extra/libksane/PKGBUILD b/extra/libksane/PKGBUILD index 348b95332..cbca8e99c 100644 --- a/extra/libksane/PKGBUILD +++ b/extra/libksane/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198843 2013-11-05 19:48:13Z andrea $ +# $Id: PKGBUILD 202477 2013-12-22 12:47:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libksane -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="An image scanning library" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libksane" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('e52dd9db0c5222ba6febe96dec9362b46f7453f4') +sha1sums=('c3473dbe3b5e68d85828fbcd585a957781e73cde') build() { cd "${srcdir}" diff --git a/extra/libkscreen/PKGBUILD b/extra/libkscreen/PKGBUILD index 5a374b892..9ee91db84 100644 --- a/extra/libkscreen/PKGBUILD +++ b/extra/libkscreen/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 194203 2013-09-10 14:07:21Z andrea $ +# $Id: PKGBUILD 199946 2013-11-20 08:45:12Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: birdflesh <antkoul at gmail dot com> pkgname=libkscreen -pkgver=1.0.1 -pkgrel=3 +pkgver=1.0.2 +pkgrel=1 pkgdesc="KDE's screen management library" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/libkscreen' license=('GPL') depends=('kdelibs' 'qjson') makedepends=('cmake' 'automoc4') -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('52aeaf2d987bffd05b111e89b445bd00') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") +md5sums=('39f5316ef4f9203dd7a42180edbab122') prepare() { mkdir build diff --git a/extra/libmikmod/PKGBUILD b/extra/libmikmod/PKGBUILD index 18fbfe4d5..174fb9d9c 100644 --- a/extra/libmikmod/PKGBUILD +++ b/extra/libmikmod/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 198197 2013-10-30 13:23:49Z allan $ +# $Id: PKGBUILD 201341 2013-12-09 07:42:41Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=libmikmod -pkgver=3.3.3 +pkgver=3.3.4 pkgrel=1 pkgdesc="A portable sound library" license=(GPL LGPL) -url="http://mikmod.shlomifish.org/" +url="http://mikmod.sourceforge.net" arch=('i686' 'x86_64' 'mips64el') depends=(openal sh) makedepends=(alsa-lib) install=$pkgname.install -source=($url/files/$pkgname-$pkgver.tar.gz) -sha256sums=('79f02478c5abd8b2af73df4cc5f9d52625aa044327c01563168e270cf79b2437') +source=(http://downloads.sourceforge.net/mikmod/$pkgname-$pkgver.tar.gz) +sha256sums=('2e8ca1d945ff7330741d085548a6d4e8b2f6a9d41edda773607905d8905683ae') prepare() { mkdir build diff --git a/extra/libmm-qt/PKGBUILD b/extra/libmm-qt/PKGBUILD index d6a6c6c22..8a92de4fb 100644 --- a/extra/libmm-qt/PKGBUILD +++ b/extra/libmm-qt/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 196394 2013-10-12 17:04:01Z andrea $ +# $Id: PKGBUILD 200035 2013-11-21 23:29:06Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libmm-qt -pkgver=0.5.1 +pkgver=1.0.0 pkgrel=1 pkgdesc='Qt-only wrapper for ModemManager DBus API' arch=('i686' 'x86_64') url='https://projects.kde.org/projects/extragear/libs/libmm-qt' license=('LGPL') -depends=('qt4') -makedepends=('cmake') +depends=('qt4' 'modemmanager') +makedepends=('cmake' 'doxygen') source=("http://download.kde.org/unstable/modemmanager-qt/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -md5sums=('97a61c398426ea596564d1c876025d93') +md5sums=('421dc7ebe8439fabc9d24da46ca0cfa7') prepare() { mkdir -p build diff --git a/extra/libmp4v2/PKGBUILD b/extra/libmp4v2/PKGBUILD index df8c470df..dc1aaa20d 100644 --- a/extra/libmp4v2/PKGBUILD +++ b/extra/libmp4v2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 198201 2013-10-30 13:25:21Z allan $ +# $Id: PKGBUILD 199979 2013-11-20 12:29:54Z allan $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=libmp4v2 pkgver=2.0.0 -pkgrel=2.1 +pkgrel=3 pkgdesc="MPEG-4 library" arch=('i686' 'x86_64' 'mips64el') license=('MPL') diff --git a/extra/libmtp/PKGBUILD b/extra/libmtp/PKGBUILD index 5c1dec838..b56ae93b0 100644 --- a/extra/libmtp/PKGBUILD +++ b/extra/libmtp/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 198802 2013-11-04 17:57:04Z andyrtr $ +# $Id: PKGBUILD 202983 2013-12-30 08:41:18Z foutrelis $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: damir <damir@archlinux.org> # Contributor: Kevin Edmonds <edmondskevin@hotmail.com> pkgname=libmtp pkgver=1.1.6 -pkgrel=3 +pkgrel=5 pkgdesc="Library implementation of the Media Transfer Protocol" arch=("i686" "x86_64" "mips64el") url="http://libmtp.sourceforge.net" diff --git a/extra/libnet/PKGBUILD b/extra/libnet/PKGBUILD index 1d8c4c0e8..d86db5bc6 100644 --- a/extra/libnet/PKGBUILD +++ b/extra/libnet/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198207 2013-10-30 13:27:29Z allan $ +# $Id: PKGBUILD 199977 2013-11-20 12:23:09Z allan $ # Maintainer: # Contributor: damir <damir@archlinux.org> pkgname=libnet pkgver=1.1.6 -pkgrel=1.1 +pkgrel=2 pkgdesc="A library which provides API for commonly used low-level net functions" arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/libnet-dev/" diff --git a/extra/libnm-qt/PKGBUILD b/extra/libnm-qt/PKGBUILD index 65855e02c..d5e9ccd9a 100644 --- a/extra/libnm-qt/PKGBUILD +++ b/extra/libnm-qt/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 196551 2013-10-15 09:59:45Z andrea $ +# $Id: PKGBUILD 200037 2013-11-21 23:30:26Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libnm-qt -pkgver=0.9.0.1 +pkgver=0.9.8.0 pkgrel=1 pkgdesc='Qt-only wrapper for NetworkManager DBus API' arch=('i686' 'x86_64') url='https://projects.kde.org/projects/extragear/libs/libnm-qt' license=('LGPL') depends=('libmm-qt' 'networkmanager') -makedepends=('cmake') +makedepends=('cmake' 'doxygen') source=("http://download.kde.org/unstable/networkmanager-qt/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha256sums=('88239444df7fb7bbbadbe4bff50f68bcb7debe5efb101300aeb1b1e3cbb192cf') +sha256sums=('02242d49958ac88e056f093cff08f9e94ff888d14a6765180ddc991caceb5db8') prepare() { mkdir -p build diff --git a/extra/libnova/PKGBUILD b/extra/libnova/PKGBUILD index 89992d5f4..f0ac20ffa 100644 --- a/extra/libnova/PKGBUILD +++ b/extra/libnova/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 198210 2013-10-30 13:28:34Z allan $ +# $Id: PKGBUILD 199819 2013-11-17 07:04:35Z allan $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=libnova -pkgver=0.14.0 +pkgver=0.15.0 pkgrel=1 pkgdesc="A general purpose, double precision, celestial mechanics, astrometry and astrodynamics library." url="http://libnova.sourceforge.net/" license=('GPL2') arch=('i686' 'x86_64' 'mips64el') depends=('glibc') -makedepends=('pkgconfig') source=(http://downloads.sourceforge.net/sourceforge/libnova/$pkgname-$pkgver.tar.gz) -sha1sums=('4ea7034a907d0578646b0d12fc4a095de8b23f51') +sha1sums=('4b8d04cfca0be8d49c1ef7c3607d405a7a8b167d') build() { cd ${srcdir}/${pkgname}-${pkgver} + autoreconf -i ./configure --prefix=/usr make } diff --git a/extra/libpng/PKGBUILD b/extra/libpng/PKGBUILD index 506212bfd..86949c097 100644 --- a/extra/libpng/PKGBUILD +++ b/extra/libpng/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 198221 2013-10-30 13:32:47Z allan $ +# $Id: PKGBUILD 200277 2013-11-24 16:59:45Z bpiotrowski $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Travis Willard <travis@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=libpng -pkgver=1.6.6 -_apngver=1.6.6 +pkgver=1.6.7 +_apngver=1.6.7 pkgrel=1 pkgdesc="A collection of routines used to create PNG format graphics files" arch=('i686' 'x86_64' 'mips64el') @@ -15,9 +15,9 @@ license=('custom') depends=('zlib' 'sh') source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz{,.asc} http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz) -md5sums=('3a41dcd58bcac7cc191c2ec80c7fb2ac' +md5sums=('7023a9eacd7b6a3eb95761a2f574d456' 'SKIP' - '8af242769611daf62a8a17349b6059f7') + 'aad92ea0cc3e29415b90c78f1d267799') prepare() { cd $pkgname-$pkgver diff --git a/extra/libpst/PKGBUILD b/extra/libpst/PKGBUILD index 73abae98e..293a198fd 100644 --- a/extra/libpst/PKGBUILD +++ b/extra/libpst/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198223 2013-10-30 13:33:34Z allan $ +# $Id: PKGBUILD 201261 2013-12-07 10:35:00Z bpiotrowski $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=libpst pkgname=('libpst' 'libpst-docs') pkgver=0.6.58 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://www.five-ten-sg.com/libpst/" license=('GPL') diff --git a/extra/libqmi/PKGBUILD b/extra/libqmi/PKGBUILD index fe83c4cb8..58bf84b2f 100644 --- a/extra/libqmi/PKGBUILD +++ b/extra/libqmi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198225 2013-10-30 13:34:34Z allan $ +# $Id: PKGBUILD 202885 2013-12-28 22:44:05Z bpiotrowski $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=libqmi -pkgver=1.4.0 -pkgrel=2 +pkgver=1.8.0 +pkgrel=1 pkgdesc="QMI modem protocol helper library" arch=(i686 x86_64 mips64el) url="http://www.freedesktop.org/wiki/Software/libqmi/" @@ -11,12 +11,12 @@ license=(GPL2) depends=(glib2 bash) makedepends=(gtk-doc python) source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('812515c36fd77c5f7eb9d52804e9666c4341e8c7dd3d932ca1e607b467831af3') +sha256sums=('fadd8070dd6f95eb00d04058c616ade57966d8e54d894da8ddbf31e98310ee0d') build() { cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --with-tests + --disable-static --with-tests --libexecdir=/usr/lib make } diff --git a/extra/libquvi/PKGBUILD b/extra/libquvi/PKGBUILD index 7a309d73c..7195e4f13 100644 --- a/extra/libquvi/PKGBUILD +++ b/extra/libquvi/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 198226 2013-10-30 13:34:55Z allan $ +# $Id: PKGBUILD 199434 2013-11-12 17:02:09Z heftig $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> pkgname=libquvi -pkgver=0.9.3 +pkgver=0.9.4 pkgrel=1 pkgdesc='Library for parsing video download links.' arch=('i686' 'x86_64' 'mips64el') url='http://quvi.sourceforge.net/' license=('AGPL3') -depends=('libquvi-scripts' 'curl' 'lua51' 'libproxy' 'libgcrypt' 'glib2') +depends=('libquvi-scripts' 'curl' 'lua' 'libproxy' 'libgcrypt' 'glib2') conflicts=('quvi<0.9.0') source=("http://downloads.sourceforge.net/sourceforge/quvi/${pkgname}-${pkgver}.tar.xz"{,.sig}) -md5sums=('12a62c4fcde9b6109193191b7bd3d685' +md5sums=('8e3f2134a6b3376934bd884b07dcdac5' 'SKIP') build() { diff --git a/extra/libraw/PKGBUILD b/extra/libraw/PKGBUILD new file mode 100644 index 000000000..99edbbae0 --- /dev/null +++ b/extra/libraw/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 199050 2013-11-07 23:03:25Z andrea $ +# Maintainer: Andre Scarpino <andrea@archlinux.org> +# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Ionut Biru <ibiru@archlinux.org> +# Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> +# Contributor: Brad Fanella <bradfanella@archlinux.us> + +pkgname=libraw +pkgver=0.15.4 +pkgrel=3 +pkgdesc="A library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)" +arch=('i686' 'x86_64' 'mips64el') +url="http://www.libraw.org/" +license=('CDDL' 'LGPL' 'custom') +depends=('lcms2' 'jasper') +source=("http://www.libraw.org/data/LibRaw-${pkgver}.tar.gz") +sha256sums=('b3fcfee33bc34ae5869a9741880e28a62f029f196cb1d1a007ab156f4a110f79') + +build() { + cd LibRaw-${pkgver} + + ./configure --prefix=/usr \ + --disable-static + make +} + +package() { + cd LibRaw-${pkgver} + + make DESTDIR=${pkgdir} install + + install -d "${pkgdir}"/usr/share/licenses/${pkgname} + install -D -m644 LICENSE.LibRaw.pdf \ + "${pkgdir}"/usr/share/licenses/${pkgname} +} diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index d1c61c515..966132226 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 198659 2013-11-01 15:09:06Z andyrtr $ +# $Id: PKGBUILD 202184 2013-12-18 22:51:10Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> @@ -19,8 +19,8 @@ pkgname=('libreoffice-common' 'libreoffice-extension-presentation-minimizer' 'libreoffice-extension-wiki-publisher' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) -_LOver=4.1.3.2 -pkgver=4.1.3 +_LOver=4.1.4.2 +pkgver=4.1.4 pkgrel=1 arch=('i686' 'x86_64') license=('LGPL3') @@ -34,7 +34,7 @@ makedepends=( # makedepends # the runtime dependencies "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.3" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=52.1" - 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' 'poppler>=0.24.0' + 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' 'poppler>=0.24.4' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' 'ttf-dejavu') # to satisfy regression tests # there's only one single static library in libreoffice-sdk, @@ -120,9 +120,9 @@ noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 libmspub-0.0.6.tar.bz2 libmwaw-0.1.11.tar.bz2 libvisio-0.0.31.tar.bz2 ) -md5sums=('7c5248b9141df6c4844c81515a41942f' - 'c5a692983c429a142b1c109fd28425fa' - 'f5131da6395034246eb26aa94c7de8b2' +md5sums=('2e7880600b26387f342f277c5d198bfa' + '1235bb27ff2a060cc666752143dfbf6b' + '083f211866fe1f77fd2712b822a56f5c' 'f02578f5218f217a9f20e9c30e119c6a' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' @@ -288,7 +288,7 @@ package_libreoffice-common() { pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" install=libreoffice-common.install depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" 'dbus-glib' 'librsvg' 'libcups' - 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=52.1" 'clucene' 'lcms2' "poppler>=0.24.0" + 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=52.1" 'clucene' 'lcms2' "poppler>=0.24.4" 'harfbuzz-icu' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils') optdepends=('libreoffice-langpack: additional language support' 'java-runtime: adds java support' diff --git a/extra/libreoffice/PKGBUILD.42 b/extra/libreoffice/PKGBUILD.42 new file mode 100644 index 000000000..22a082ba7 --- /dev/null +++ b/extra/libreoffice/PKGBUILD.42 @@ -0,0 +1,672 @@ +# $Id: PKGBUILD 198658 2013-11-01 15:08:02Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> + +pkgbase="libreoffice" +pkgname=('libreoffice-common' + 'libreoffice-base' + 'libreoffice-calc' + 'libreoffice-draw' + 'libreoffice-gnome' + 'libreoffice-impress' + 'libreoffice-kde4' + 'libreoffice-math' + 'libreoffice-sdk' + 'libreoffice-sdk-doc' + 'libreoffice-writer' + 'libreoffice-en-US' + 'libreoffice-postgresql-connector' + 'libreoffice-extension-wiki-publisher' + 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) +_LOver=4.2.0.0.beta1 +pkgver=4.2.0 +pkgrel=0.1 +arch=('i686' 'x86_64') +license=('LGPL3') +url="http://www.libreoffice.org/" +makedepends=( # makedepends + 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' #'boost' + 'apache-ant' 'gperf' 'kdelibs' 'gconf' 'gtk3' 'cppunit' + 'beanshell' 'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' + 'glu' 'mesa' 'gst-plugins-base-libs' 'java-environment' 'postgresql-libs' 'doxygen' + 'clucene' 'bluez-libs' 'harfbuzz-icu' 'gdb' + # the runtime dependencies + "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.3" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" + 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=52.1" + 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' 'poppler>=0.24.0' + 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' + 'ttf-liberation' # to satisfy regression tests + 'git') +# there's only one single static library in libreoffice-sdk, +# the next build that removes it may lead to trouble if people may use it +# -rw-r--r-- 1 root root 5,1K 12. Okt 23:34 /usr/lib/libreoffice/sdk/lib/libsalcpprt.a +# options=('staticlibs') + +# http://download.documentfoundation.org/mirrors/all.html +# http://wiki.documentfoundation.org/Mirrors + +#_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}" +_mirror="http://dev-builds.libreoffice.org/pre-releases/src" +_additional_source_url="http://dev-www.libreoffice.org/src" +_additional_source_url2="http://dev-www.libreoffice.org/extern" +source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz + ${_additional_source_url}/15cb8c0803064faef0c4ddf5bc5ca279-boost_1_54_0.tar.bz2 + ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz + ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip + ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip + ${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip + ${_additional_source_url}/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz + ${_additional_source_url}/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz + ${_additional_source_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz + ${_additional_source_url}/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz + ${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip + ${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip + ${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip + ${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip + ${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip + ${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip + ${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip + ${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip + ${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip + ${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip + ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip + ${_additional_source_url}/8c853024fbcff39113d9285250dafc66-mdds_0.9.1.tar.bz2 + ${_additional_source_url}/ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2 + ${_additional_source_url}/22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz + ${_additional_source_url}/ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2 + ${_additional_source_url}/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 + ${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz + ${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip + ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll + ${_additional_source_url}/libcdr-0.0.14.tar.bz2 + ${_additional_source_url}/libmspub-0.0.6.tar.bz2 + ${_additional_source_url}/libmwaw-0.2.0.tar.bz2 + ${_additional_source_url}/libvisio-0.0.31.tar.bz2 + ${_additional_source_url}/libetonyek-0.0.1.tar.bz2 + ${_additional_source_url}/libfreehand-0.0.0.tar.bz2 + ${_additional_source_url}/libodfgen-0.0.3.tar.bz2 + ${_additional_source_url}/Firebird-2.5.2.26540-0.tar.bz2 + ${_additional_source_url}/libatomic_ops-7_2d.zip + ${_additional_source_url}/libe-book-0.0.2.tar.bz2 + make-pyuno-work-with-system-wide-module-install.diff + libreoffice-common.sh libreoffice-common.csh) +noextract=(15cb8c0803064faef0c4ddf5bc5ca279-boost_1_54_0.tar.bz2 + 185d60944ea767075d27247c3162b3bc-unowinreg.dll + 8c853024fbcff39113d9285250dafc66-mdds_0.9.1.tar.bz2 + 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip + 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz + ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2 + 22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz + 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip + a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip + 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz + 625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz + 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz + 2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz + eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip + 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip + 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip + 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip + f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip + 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip + d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip + 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip + ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip + db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip + ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip + ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2 + 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 + 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz + 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip + libcdr-0.0.14.tar.bz2 + libmspub-0.0.6.tar.bz2 + libmwaw-0.2.0.tar.bz2 + libvisio-0.0.31.tar.bz2 + libetonyek-0.0.1.tar.bz2 + libfreehand-0.0.0.tar.bz2 + libodfgen-0.0.3.tar.bz2 + Firebird-2.5.2.26540-0.tar.bz2 + libatomic_ops-7_2d.zip + libe-book-0.0.2.tar.bz2) +md5sums=('dbb8b7f5f64a407b6aef66f98b8163ff' + '48481fd38699c598b19d637ead29d34a' + 'ec4982d81fac7c068095c7877273ca34' + '15cb8c0803064faef0c4ddf5bc5ca279' + '1f24ab1d39f4a51faf22244c94a6203f' + '35c94d2df8893241173de1d16b6034c0' + '798b2ffdc8bcfe7bca2cf92b62caf685' + 'a7983f859eafb2677d7ff386a023bc40' + '3c219630e4302863a9a83d0efde889db' + '625ff5f2f968dd908bca43c9469d6e6b' + '2c9b0f83ed5890af02c0df1c1776f39b' + '2e482c7567908d334785ce7d69ddfff7' + 'eeb2c7ddf0d302fba4bfc6e97eac9624' + '39bb3fcea1514f1369fcfc87542390fd' + '3404ab6b1792ae5f16bbd603bd1e1d03' + '97b2d4dba862397f446b217e2b623e71' + 'f94d9870737518e3b597f9265f4e9803' + '8ce2fcd72becf06c41f7201d15373ed9' + 'd8bd5eed178db6e2b18eeed243f85aa8' + '3bdf40c0d199af31923e900d082ca2dd' + 'ace6ab49184e329db254e454a010f56d' + 'db60e4fde8dd6d6807523deb71ee34dc' + 'ba2930200c9f019c2d93a8c88c651a0f' + '8c853024fbcff39113d9285250dafc66' + 'ae330b9493bd4503ac390106ff6060d7' + '22f8a85daf4a012180322e1f52a7563b' + 'ea2acaf140ae40a87a952caa75184f4d' + '36271d3fa0d9dec1632029b6d7aac925' + '0168229624cfac409e766913506961a8' + '17410483b5b5f267aa18b7e00b65e6e0' + '185d60944ea767075d27247c3162b3bc' + 'd88f9b94df880d2c05be943b000ca112' + '1120705cd0f0d9bd5506360bf57b6c2e' + 'd794625f156a9fb1c53b3f8a8aa13b5e' + '82628333418f101a20cd21f980cf9f40' + '040e0d7ce0cc0eb3a016964699d54a6c' + '496dd00028afcc19f896b01394769043' + '9cafe7f50a3b2c5ebd2dc9c6c509d2b4' + '21154d2004e025c8a3666625b0357bb5' + 'c0b86562d5aa40761a87134f83e6adcf' + '3a62e10c57270718cabfdfc4b7b4e095' + '07d2bf5ad839a394cca008b3ec6e7bb1' + '4195735a80876ae812fca5736b50192a' + 'e7e4b3e70e99e5cba8f8dfcacf3b0d87') + +prepare() { + + cd libreoffice-$_LOver +#return 1 + # fix exttextcat build error + # /usr/include/features.h:330:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp] + unset CPPFLAGS + + # move external sources into place + mkdir ${srcdir}/ext_sources && pushd ${srcdir}/ext_sources + for source in "${noextract[@]}"; do + ln -s ${srcdir}/$source . + done + popd + + # unowinreg.dll must be a file not a symlink or the result will become a broken symlink + # /usr/share/libreoffice/sdk/classes/win/unowinreg.dll -> /build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll + rm ${srcdir}/ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll + cp -f ${srcdir}/185d60944ea767075d27247c3162b3bc-unowinreg.dll ${srcdir}/ext_sources + + # fix not upstreamable pyuno paths - patch taken from Debian + patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff + + #use the CFLAGS but remove the LibO overridden ones + for i in $CFLAGS; do + case "$i" in + -O?|-pipe|-Wall|-g|-fexceptions) continue;; + esac + ARCH_FLAGS="$ARCH_FLAGS $i" + done + + + # qt4 fix + sed -i "s:qmake:qmake-qt4:g" configure.ac +} + +build() { + cd libreoffice-$_LOver + + #autoconf -f + + # non-SMP test build + #export MAKEFLAGS="-j1" + #./configure --with-build-version="${_LOver} Arch Linux build-${pkgrel}" --with-vendor="Arch Linux" \ + + ./autogen.sh --with-build-version="${_LOver} Arch Linux build-${pkgrel}" --with-vendor="Arch Linux" \ + --enable-split-app-modules \ + --with-parallelism=${MAKEFLAGS/-j/} \ + --with-external-tar="${srcdir}/ext_sources" \ + --disable-fetch-external \ + --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \ + --libdir=/usr/lib --mandir=/usr/share/man \ + --with-lang="" \ + --enable-crashdump \ + --enable-dbus \ + --enable-evolution2\ + --enable-gio\ + --disable-gnome-vfs\ + --disable-kde\ + --enable-kde4\ + --enable-gtk3 \ + --enable-gstreamer \ + --enable-lockdown\ + --enable-opengl \ + --enable-odk\ + --enable-python=system \ + --enable-scripting-beanshell \ + --enable-scripting-javascript \ + --enable-ext-wiki-publisher \ + --enable-ext-nlpsolver \ + --without-fonts\ + --without-afms\ + --without-system-libwps\ + --without-system-libcdr \ + --without-system-mdds\ + --without-myspell-dicts \ + --without-system-libvisio \ + --without-system-libcmis \ + --without-system-libmspub \ + --without-system-libexttextcat \ + --without-system-orcus \ + --without-system-liblangtag \ + --without-system-jfreereport \ + --without-system-apache-commons \ + --without-system-libodfgen \ + --without-system-libmwaw \ + --without-system-libetonyek \ + --without-system-libfreehand \ + --without-system-firebird \ + --without-system-libatomic-ops \ + --without-system-libebook \ + --with-system-dicts \ + --with-external-dict-dir=/usr/share/hunspell \ + --with-external-hyph-dir=/usr/share/hyphen \ + --with-external-thes-dir=/usr/share/mythes \ + --with-system-beanshell \ + --with-system-cppunit\ + --with-system-graphite\ + --with-system-libwpg \ + --with-system-libwps \ + --with-system-redland\ + --without-system-npapi-headers \ + --with-ant-home="/usr/share/apache-ant"\ + --without-system-boost\ + --with-system-cairo\ + --with-system-libs\ + --with-system-mythes\ + --with-system-headers\ + --without-system-hsqldb \ + --with-alloc=system\ + --with-system-clucene \ + --disable-dependency-tracking + +# --enable-mergelibs \ # https://bugs.archlinux.org/task/34414 + +# --without-ppds\ # breaks spadmin permission + +#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool + + touch src.downloaded + #./download + make + # fake installation to create split file lists + mkdir $srcdir/fakeinstall + make DESTDIR=${srcdir}/fakeinstall distro-pack-install # -o build -o check +} + +#check() { +# cd ${srcdir}/build +# make check +#} + +package_libreoffice-common() { + + pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" + install=libreoffice-common.install + depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" 'dbus-glib' 'librsvg' 'libcups' + 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=52.1" 'clucene' 'lcms2' "poppler>=0.24.0" + 'harfbuzz-icu' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils') + optdepends=('libreoffice-langpack: additional language support' + 'java-runtime: adds java support' + 'pstoedit: translates PostScript and PDF graphics into other vector formats' + 'libmythes: for use in thesaurus' + 'beanshell: interactive java -- good for prototyping /macros' + 'vigra: C++ computer vision library, usable in Basebmp' + 'libmspack: library for Microsoft compression formats for use in FontOOo' + 'libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images and for MS visual import' + 'sane: for scanner access' + 'unixodbc: adds ODBC database support' + 'gst-plugins-base-libs: + some gstr-plugins to support multimedia content, e.g. in impress' + 'gtk2: for browser plugin') + backup=(etc/libreoffice/sofficerc + etc/libreoffice/bootstraprc + etc/libreoffice/psprint.conf + etc/profile.d/libreoffice-common.sh + etc/profile.d/libreoffice-common.csh) + groups=('libreoffice') + provides=('go-openoffice' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen' + 'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript' 'libreoffice-extension-scripting-python' + 'libreoffice-extension-report-builder') + conflicts=('go-openoffice') + replaces=('go-openoffice' 'openoffice-base' 'libreoffice' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen' + 'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript' 'libreoffice-extension-scripting-python' + 'libreoffice-extension-report-builder' 'libreoffice-extension-presentation-minimizer' 'libreoffice-extension-presentation-minimizer') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/common_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/common_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done + + # put configuration files into place + install -dm755 ${pkgdir}/etc/libreoffice + install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/ + install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/ + # install dummy links to make them found by LibO + cd ${pkgdir}/usr/lib/libreoffice/program/ + ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} . + cd ${pkgdir}/usr/lib/libreoffice/share/psprint/ + ln -vsf /etc/libreoffice/psprint.conf . + + # allow to preset desired VLC + install -dm755 ${pkgdir}/etc/profile.d + install -m755 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/ + + # move bash-completion files to its new place + install -dm755 ${pkgdir}/usr/share/bash-completion/completions + mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh + rm -rf ${pkgdir}/etc/bash_completion.d + + # some files would conflict + rm -vf ${pkgdir}/usr/lib/libreoffice/program/classes/ScriptProviderForJavaScript.jar + rm -vf ${pkgdir}/usr/lib/libreoffice/program/classes/js.jar + rm -vf ${pkgdir}/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb + + # make pyuno find its modules + install -dm755 ${pkgdir}/usr/lib/python3.3/site-packages + ln -svf /usr/lib/libreoffice/program/uno.py ${pkgdir}/usr/lib/python3.3/site-packages/uno.py + ln -svf /usr/lib/libreoffice/program/unohelper.py ${pkgdir}/usr/lib/python3.3/site-packages/unohelper.py + + # workaround all packages now depend on that file + cp ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/writer.xcd ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd +} + +package_libreoffice-base() { + pkgdesc="GUI database front-end for LibreOffice. Allows creation and management of databases through a GUI." + install=libreoffice-base.install + depends=('libreoffice-common') + optdepends=('libreoffice-postgresql-connector') + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/base_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/base_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-postgresql-connector() { + pkgdesc="A PostgreSQL connector for the database front-end for LibreOffice" + depends=('libreoffice-base' 'postgresql-libs') + groups=('libreoffice') + replaces=('libreoffice') + + # workaround double entries in the file list + mv ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt.orig + sort ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt.orig | uniq 1>& ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/postgresql_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-calc() { + pkgdesc="Spreadsheet application for LibreOffice." + install=libreoffice-calc.install + depends=('libreoffice-common' 'lpsolve' ) + #depends=('libreoffice-writer' 'lpsolve' ) # some hidden uno linking to parts of the writer pkg - https://bugs.archlinux.org/task/34332 + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/calc_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/calc_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-draw() { + pkgdesc="Drawing Application for LibreOffice." + install=libreoffice-draw.install + depends=('libreoffice-common') + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/draw_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/draw_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-gnome() { + pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment." + depends=('libreoffice-common' 'gconf') + optdepends=('gtk3: for gtk3 Gnome integration' + 'gtk2: for older gtk2 desktop integration') + groups=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/gnome_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/gnome_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-impress() { + pkgdesc="Presentation Application for LibreOffice." + install=libreoffice-impress.install + depends=('libreoffice-common') + optdepends=('glu: for the OGLTrans extension') + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/impress_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/impress_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-kde4() { + pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment." + depends=('libreoffice-common' 'kdelibs') + optdepends=() + backup=() + groups=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/kde4_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/kde4_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-math() { + pkgdesc="Equation Editor Application for LibreOffice." + depends=('libreoffice-common') + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/math_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/math_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-sdk() { + pkgdesc="Software Development Kit for LibreOffice." + depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment') + groups=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/sdk_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/sdk_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done + + # fix environment path to keep compatibility with other java-environments +# sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh} + sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.sh +} + +package_libreoffice-sdk-doc() { + pkgdesc="Software Development Kit documentation for LibreOffice" + depends=('libreoffice-common' 'libreoffice-sdk') + groups=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/sdk_doc_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/sdk_doc_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done + + #fix permissions + find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} \; +} + +package_libreoffice-writer() { + pkgdesc="Word Processor Application for LibreOffice." + install=libreoffice-writer.install + depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2') + optdepends=('libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images') + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/writer_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/writer_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done + + # for workaround this file belongs now to common + rm ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd +} + +package_libreoffice-en-US() { + pkgdesc="English (US) language pack for LibreOffice" + #arch=('any') + provides=('openoffice-en-US' 'libreoffice-langpack') + replaces=(openoffice-en-US) + conflicts=(openoffice-en-US) + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/lang_en_US_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/lang_en_US_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-extension-wiki-publisher() { + + pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language" + #arch=('any') + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + #unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher + unzip -q ${srcdir}/libreoffice-$_LOver/workdir/unxlng*/Extension/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher +} + +package_libreoffice-extension-nlpsolver() { + + pkgdesc="This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models" + #arch=('any') + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/libreoffice-$_LOver/workdir/unxlng*/Extension/nlpsolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver +} diff --git a/extra/libreoffice/fix_install.diff b/extra/libreoffice/fix_install.diff deleted file mode 100644 index b16320a22..000000000 --- a/extra/libreoffice/fix_install.diff +++ /dev/null @@ -1,82 +0,0 @@ -From 8ce82f83fb8146b684bec5d903d76f034ba37d4a Mon Sep 17 00:00:00 2001 -From: Petr Mladek <pmladek@suse.cz> -Date: Fri, 07 Jun 2013 12:13:24 +0000 -Subject: distro-install-file-lists: handle new filelists created for 4.1 - -Change-Id: I2d7a52b396a46f1f6546b92eb5612958a2cb7397 ---- -diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists -index d83855b..bbd462b 100755 ---- a/bin/distro-install-file-lists -+++ b/bin/distro-install-file-lists -@@ -80,6 +80,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; then - gid_Module_Root_Files_[0-9] \ - gid_Module_Root_Hack \ - gid_Module_Oo_Linguistic \ -+ gid_Module_Root_Extension_Dictionary_* \ - gid_Module_Root_Ure_Hidden ; do - merge_flists $module $FILELISTSDIR/common_list.txt - done -@@ -100,6 +101,9 @@ if test "z$OOO_VENDOR" != "zDebian" ; then - merge_flists gid_Module_Brand_Prg_Math $FILELISTSDIR/math_list.txt - merge_flists gid_Module_Brand_Prg_Impress $FILELISTSDIR/impress_list.txt - merge_flists gid_Module_Brand_Prg_Wrt $FILELISTSDIR/writer_list.txt -+ merge_flists gid_Module_Reportbuilder $FILELISTSDIR/base_list.txt -+ merge_flists gid_Module_Pdfimport $FILELISTSDIR/draw_list.txt -+ - # FIXME: small; low dependencies; why optional module? - merge_flists gid_Module_Optional_OGLTrans $FILELISTSDIR/impress_list.txt - else -@@ -115,6 +119,8 @@ if test "z$OOO_VENDOR" != "zDebian" ; then - merge_flists gid_Module_Brand_Prg_Math $FILELISTSDIR/common_list.txt - merge_flists gid_Module_Brand_Prg_Impress $FILELISTSDIR/common_list.txt - merge_flists gid_Module_Brand_Prg_Wrt $FILELISTSDIR/common_list.txt -+ merge_flists gid_Module_Reportbuilder $FILELISTSDIR/common_list.txt -+ merge_flists gid_Module_Pdfimport $FILELISTSDIR/common_list.txt - # FIXME: small; low dependencies; why optional module? - merge_flists gid_Module_Optional_OGLTrans $FILELISTSDIR/common_list.txt - fi -@@ -133,26 +139,26 @@ if test "z$OOO_VENDOR" != "zDebian" ; then - merge_flists gid_Module_Optional_Grfflt $FILELISTSDIR/draw_list.txt - merge_flists gid_Module_Optional_Headless $FILELISTSDIR/common_list.txt - merge_flists gid_Module_Optional_Pymailmerge $FILELISTSDIR/pyuno_list.txt -- merge_flists gid_Module_Optional_Pyuno $FILELISTSDIR/pyuno_list.txt -- merge_flists gid_Module_Optional_Extensions_Script_Provider_For_Python $FILELISTSDIR/pyuno_list.txt -+ merge_flists gid_Module_Pyuno $FILELISTSDIR/pyuno_list.txt -+ merge_flists gid_Module_Script_Provider_For_Python $FILELISTSDIR/pyuno_list.txt - merge_flists gid_Module_Optional_Pyuno_LibreLogo $FILELISTSDIR/pyuno_list.txt - merge_flists gid_Module_Optional_Xsltfiltersamples $FILELISTSDIR/common_list.txt - else - merge_flists gid_Module_Optional_Grfflt $FILELISTSDIR/common_list.txt - merge_flists gid_Module_Optional_Headless $FILELISTSDIR/common_list.txt - merge_flists gid_Module_Optional_Pymailmerge $FILELISTSDIR/mailmerge_list.txt -- merge_flists gid_Module_Optional_Pyuno $FILELISTSDIR/pyuno_list.txt -+ merge_flists gid_Module_Pyuno $FILELISTSDIR/pyuno_list.txt - merge_flists gid_Module_Optional_Pyuno_LibreLogo $FILELISTSDIR/pyuno_list.txt -- merge_flists gid_Module_Optional_Extensions_Script_Provider_For_Python $FILELISTSDIR/pyuno_list.txt -+ merge_flists gid_Module_Script_Provider_For_Python $FILELISTSDIR/pyuno_list.txt - merge_flists gid_Module_Optional_Xsltfiltersamples $FILELISTSDIR/filters_list.txt - fi - else - merge_flists gid_Module_Optional_Grfflt $FILELISTSDIR/common_list.txt - merge_flists gid_Module_Optional_Headless $FILELISTSDIR/common_list.txt - merge_flists gid_Module_Optional_Pymailmerge $FILELISTSDIR/common_list.txt -- merge_flists gid_Module_Optional_Pyuno $FILELISTSDIR/common_list.txt -+ merge_flists gid_Module_Pyuno $FILELISTSDIR/common_list.txt - merge_flists gid_Module_Optional_Pyuno_LibreLogo $FILELISTSDIR/common_list.txt -- merge_flists gid_Module_Optional_Extensions_Script_Provider_For_Python $FILELISTSDIR/common_list.txt -+ merge_flists gid_Module_Script_Provider_For_Python $FILELISTSDIR/common_list.txt - merge_flists gid_Module_Optional_Xsltfiltersamples $FILELISTSDIR/common_list.txt - fi - -@@ -413,7 +419,7 @@ else - create_package_directory gid_Module_Brand_Prg_Wrt pkg/libreoffice-writer - create_package_directory gid_Module_Brand_Prg_Impress pkg/libreoffice-impress - create_package_directory gid_Module_Brand_Prg_Base pkg/libreoffice-base -- create_package_directory gid_Module_Optional_Pyuno pkg/python-uno -+ create_package_directory gid_Module_Pyuno pkg/python-uno - create_package_directory gid_Module_Optional_Gnome pkg/libreoffice-gnome - create_package_directory gid_Module_Optional_Tde pkg/libreoffice-tde - create_package_directory gid_Module_Optional_Kde pkg/libreoffice-kde --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/librsvg/PKGBUILD b/extra/librsvg/PKGBUILD index deb28ce24..be27ac174 100644 --- a/extra/librsvg/PKGBUILD +++ b/extra/librsvg/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198229 2013-10-30 13:35:58Z allan $ +# $Id: PKGBUILD 199931 2013-11-19 18:03:47Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=librsvg -pkgver=2.40.0 +pkgver=2.40.1 pkgrel=1 epoch=1 pkgdesc="A SVG viewing library" @@ -15,7 +15,7 @@ options=('!emptydirs') url="https://live.gnome.org/LibRsvg" install=librsvg.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) -sha256sums=('8f7db31df235813dbd035888035cf862d682e7cc5706c4e7ec05750d3f64a2f9') +sha256sums=('8813b4fe776d5e7acbce28bacbaed30ccb0cec3734eb3632c711a16ebe2961d7') build() { cd $pkgname-$pkgver diff --git a/extra/libseccomp/PKGBUILD b/extra/libseccomp/PKGBUILD index c28bbc0b9..a8c4d5488 100644 --- a/extra/libseccomp/PKGBUILD +++ b/extra/libseccomp/PKGBUILD @@ -2,14 +2,14 @@ # Contributor: Patryk Kowalczyk < patryk at kowalczyk dot ws> pkgname=libseccomp -pkgver=2.1.0 +pkgver=2.1.1 pkgrel=1 pkgdesc='Enhanced seccomp library' arch=('i686' 'x86_64' 'mips64el') license=('LGPL2.1') url="http://sourceforge.net/projects/libseccomp/" depends=('glibc') -source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.gz") +source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz") build() { cd $pkgname-$pkgver @@ -21,4 +21,4 @@ package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } -md5sums=('3961103c1234c13a810f6a12e60c797f') +md5sums=('1f41207b29e66a7e5e375dd48a64de85') diff --git a/extra/libsidplay/PKGBUILD b/extra/libsidplay/PKGBUILD index 774482c0d..8c9e4a9a7 100644 --- a/extra/libsidplay/PKGBUILD +++ b/extra/libsidplay/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198233 2013-10-30 13:37:26Z allan $ +# $Id: PKGBUILD 199975 2013-11-20 12:18:31Z allan $ # Maintainer: # Contributor: Kritoke <kritoke@gamebox.net> pkgname=libsidplay pkgver=1.36.59 -pkgrel=5.2 +pkgrel=6 pkgdesc="A library for playing SID music files." arch=('i686' 'x86_64' 'mips64el') url="http://critical.ch/distfiles/" @@ -12,9 +12,13 @@ license=('GPL') source=(http://critical.ch/distfiles/${pkgname}-${pkgver}.tgz libsidplay-1.36.59-gcc43.patch) md5sums=('37c51ba4bd57164b1b0bb7b43b9adece' 'c24d7bca2639f4fee03c40c7dcaadfee') -build() { +prepare() { cd ${srcdir}/${pkgname}-${pkgver} patch -Np1 -i $srcdir/libsidplay-1.36.59-gcc43.patch +} + +build() { + cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr make } diff --git a/extra/libsigsegv/PKGBUILD b/extra/libsigsegv/PKGBUILD index 4ba90b054..6cfba18b3 100644 --- a/extra/libsigsegv/PKGBUILD +++ b/extra/libsigsegv/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198236 2013-10-30 13:38:33Z allan $ +# $Id: PKGBUILD 199822 2013-11-17 07:46:24Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Johannes Weiner <hannes@saeurebad.de> pkgname=libsigsegv pkgver=2.10 -pkgrel=1.1 +pkgrel=2 arch=('x86_64' 'i686' 'mips64el') pkgdesc="Page fault detection library" url="http://www.gnu.org/software/libsigsegv/" diff --git a/extra/libsoup/PKGBUILD b/extra/libsoup/PKGBUILD index 93f77e6d2..2afe38f43 100644 --- a/extra/libsoup/PKGBUILD +++ b/extra/libsoup/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198239 2013-10-30 13:39:34Z allan $ +# $Id: PKGBUILD 199410 2013-11-11 23:23:16Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libsoup -pkgver=2.44.1 +pkgver=2.44.2 pkgrel=1 pkgdesc="GNOME HTTP Library" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ conflicts=(libsoup-gnome) replaces=(libsoup-gnome) options=('!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('c532c331dd5f7eb78438867302ed6897a847c82b287ed9347bea8d1937974c1d') +sha256sums=('e7e4b5ab74a6c00fc267c9f5963852d28759ad3154dab6388e2d6e1962d598f3') build() { cd $pkgname-$pkgver diff --git a/extra/libtasn1/PKGBUILD b/extra/libtasn1/PKGBUILD index de8317c64..8e1eff3fc 100644 --- a/extra/libtasn1/PKGBUILD +++ b/extra/libtasn1/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 197093 2013-10-21 18:40:47Z andyrtr $ +# $Id: PKGBUILD 200598 2013-11-29 16:35:20Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=libtasn1 -pkgver=3.3 -pkgrel=2 +pkgver=3.4 +pkgrel=1 pkgdesc="The ASN.1 library used in GNUTLS" arch=('i686' 'x86_64' 'mips64el') license=('GPL3' 'LGPL') @@ -12,7 +12,7 @@ url="http://www.gnu.org/software/libtasn1/" depends=('glibc' 'texinfo') install=libtasn1.install source=(http://ftp.gnu.org/gnu/libtasn1/${pkgname}-${pkgver}.tar.gz{,.sig}) -md5sums=('2bdd687f487c50a0382b99553866a6e0' +md5sums=('21ec021c534b0f30b2834ce233c70f15' 'SKIP') build() { diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD index aff383828..627e0b739 100644 --- a/extra/libtorrent-rasterbar/PKGBUILD +++ b/extra/libtorrent-rasterbar/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198715 2013-11-02 08:58:54Z ioni $ +# $Id: PKGBUILD 201262 2013-12-07 10:35:01Z bpiotrowski $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=libtorrent-rasterbar pkgver=0.16.12 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around" url="http://www.rasterbar.com/products/libtorrent/" diff --git a/extra/libupnp/PKGBUILD b/extra/libupnp/PKGBUILD index 83dcc39d4..ebf8ff252 100644 --- a/extra/libupnp/PKGBUILD +++ b/extra/libupnp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198254 2013-10-30 13:45:10Z allan $ +# $Id: PKGBUILD 199852 2013-11-17 10:36:13Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: kastor <kastor@fobos.org.ar> pkgname=libupnp -pkgver=1.6.18 +pkgver=1.6.19 pkgrel=1 pkgdesc="Portable Open Source UPnP Development Kit" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('glibc') makedepends=('pkgconfig') source=("http://downloads.sourceforge.net/sourceforge/pupnp/${pkgname}-${pkgver}.tar.bz2") -md5sums=('11c6484fd2e2927bf3b8d8108407ca56') +md5sums=('ee16e5d33a3ea7506f38d71facc057dd') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libva-intel-driver/PKGBUILD b/extra/libva-intel-driver/PKGBUILD index 1402cd45d..e0766f72d 100644 --- a/extra/libva-intel-driver/PKGBUILD +++ b/extra/libva-intel-driver/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198687 2013-11-02 07:27:16Z bpiotrowski $ +# $Id: PKGBUILD 202383 2013-12-21 14:15:26Z bpiotrowski $ # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgname=libva-intel-driver -pkgver=1.2.1 +pkgver=1.2.2 pkgrel=1 pkgdesc='VA-API implementation for Intel G45 and HD Graphics family' arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('MIT') depends=('libva') replaces=('libva-driver-intel') source=(http://www.freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('f65de5edf69162f0731b0ffb7f8d6c17499ae8e3') +sha1sums=('ece479b51926764edd2be6599f9c067cae2a3942') build() { cd $pkgname-$pkgver diff --git a/extra/libvpx/PKGBUILD b/extra/libvpx/PKGBUILD index d784e7086..9995e36e5 100644 --- a/extra/libvpx/PKGBUILD +++ b/extra/libvpx/PKGBUILD @@ -1,29 +1,36 @@ -# $Id: PKGBUILD 197350 2013-10-25 02:49:53Z bisson $ +# $Id: PKGBUILD 201279 2013-12-07 18:33:32Z bpiotrowski $ # Maintainer: Ionut Biru <ibiru@archlinux.org> + pkgname=libvpx -pkgver=1.2.0 -pkgrel=2 -pkgdesc="The VP8 Codec SDK" +pkgver=1.3.0 +pkgrel=1 +pkgdesc='The VP8 Codec SDK' arch=('i686' 'x86_64' 'mips64el') -url="http://www.webmproject.org/" +url='http://www.webmproject.org/' license=('BSD') depends=('glibc') -[ "$CARCH" != "mips64el" ] && makedepends=('yasm') -source=(ftp://ftp.archlinux.org/other/libvpx/libvpx-$pkgver.tar.xz{,.sig} +makedepends=('git') +[ "$CARCH" != "mips64el" ] && makedepends+=('yasm') +source=($pkgname::git+http://code.google.com/p/webm.libvpx#tag=v$pkgver mips64el.patch) -sha1sums=('75cd953cf2db694412569272803fbdc73f2b599f' - 'SKIP' - '78ea367dc417f64ad3ce8e33fda210e56a083f4b') +md5sums=('SKIP' + '78ea367dc417f64ad3ce8e33fda210e56a083f4b') -build() { - cd "$pkgname-$pkgver" +prepare() { + if [ "$CARCH" = "mips64el" ]; then + patch -Np1 -i ${srcdir}/mips64el.patch + fi +} +build() { if [ "$CARCH" = "mips64el" ]; then extra="--target=mips64el-linux-gcc" - patch -Np1 -i ${srcdir}/mips64el.patch fi - ./configure --prefix=/usr --enable-vp8 \ + cd $pkgname + ./configure --prefix=/usr \ + --enable-vp8 \ + --enable-vp9 \ --enable-runtime-cpu-detect \ --enable-shared \ --enable-postproc \ @@ -34,7 +41,7 @@ build() { } package() { - cd "$pkgname-$pkgver" + cd $pkgname make DIST_DIR="$pkgdir/usr" install - install -D -m 0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/extra/libxcb/PKGBUILD b/extra/libxcb/PKGBUILD index 6869b57ce..9d0e216c1 100644 --- a/extra/libxcb/PKGBUILD +++ b/extra/libxcb/PKGBUILD @@ -1,29 +1,26 @@ -# $Id: PKGBUILD 198271 2013-10-30 13:51:13Z allan $ +# $Id: PKGBUILD 202710 2013-12-25 21:25:44Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libxcb -pkgver=1.9.1 -pkgrel=2 +pkgver=1.10 +pkgrel=1 pkgdesc="X11 client-side library" arch=('i686' 'x86_64' 'mips64el') url="http://xcb.freedesktop.org/" -depends=('xcb-proto>=1.8-2' 'libxdmcp' 'libxau') +depends=('xcb-proto>=1.10' 'libxdmcp' 'libxau') makedepends=('pkgconfig' 'libxslt' 'python') license=('custom') source=($url/dist/$pkgname-$pkgver.tar.bz2 - libxcb-1.1-no-pthread-stubs.patch - reorder-configure.patch) -sha256sums=('d44a5ff4eb0b9569e6f7183b51fdaf6f58da90e7d6bfc36b612d7263f83e362f' - '1ec7a6e7dc8639baa6c3fbc61ca8556108fb824598bd6ab5ef1fa50d48d6d310' - '3e1adc51246e1f48545c1ab9703219c987685d241f1eab5d912b0840ce8a122a') + libxcb-1.1-no-pthread-stubs.patch) +sha256sums=('98d9ab05b636dd088603b64229dd1ab2d2cc02ab807892e107d674f9c3f2d5b5' + '748ed83af60468a0eb6785222e4a5ca589d28f20b9bfc60d5936ec93b8eef356') prepare() { cd "$pkgname-$pkgver" patch -Np1 -i ../libxcb-1.1-no-pthread-stubs.patch - # https://bugs.freedesktop.org/show_bug.cgi?id=66413 - patch -Np1 -i ../reorder-configure.patch - NOCONFIGURE=1 ./autogen.sh + autoreconf -vfi } build() { @@ -35,6 +32,11 @@ build() { make } +check() { + cd $pkgname-$pkgver + make -k check +} + package() { cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install diff --git a/extra/libxcb/libxcb-1.1-no-pthread-stubs.patch b/extra/libxcb/libxcb-1.1-no-pthread-stubs.patch index 8e8162f0a..52c22ab7e 100644 --- a/extra/libxcb/libxcb-1.1-no-pthread-stubs.patch +++ b/extra/libxcb/libxcb-1.1-no-pthread-stubs.patch @@ -1,9 +1,9 @@ --- libxcb-1.8.1/configure.ac 2012-03-09 15:38:38.000000000 +0100 +++ libxcb-1.8.1/configure.ac.new 2012-03-09 16:50:40.107109896 +0100 -@@ -35,7 +35,7 @@ +@@ -43,7 +43,7 @@ # Checks for pkg-config packages - PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.7) + PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.10) -NEEDED="pthread-stubs xau >= 0.99.2" +NEEDED="xau >= 0.99.2" PKG_CHECK_MODULES(NEEDED, $NEEDED) diff --git a/extra/libxcb/reorder-configure.patch b/extra/libxcb/reorder-configure.patch deleted file mode 100644 index afeeffe7e..000000000 --- a/extra/libxcb/reorder-configure.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- libxcb-1.9.1/configure.ac 2013-05-30 17:38:01.000000000 +0200 -+++ libxcb-1.9.1/configure.ac.new 2013-06-30 21:01:30.134153288 +0200 -@@ -2,20 +2,21 @@ - # Process this file with autoconf to produce a configure script. - - # Initialize Autoconf --AC_PREREQ(2.57) - AC_INIT([libxcb], - 1.9.1, - [xcb@lists.freedesktop.org]) -+AC_PREREQ(2.57) -+ -+# Initialize Automake -+AM_INIT_AUTOMAKE([foreign dist-bzip2]) -+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -+ - AC_CONFIG_SRCDIR([xcb.pc.in]) - # Set common system defines for POSIX extensions, such as _GNU_SOURCE - # Must be called before any macros that run the compiler (like AC_PROG_LIBTOOL) - # to avoid autoconf errors. - AC_USE_SYSTEM_EXTENSIONS - --# Initialize Automake --AM_INIT_AUTOMAKE([foreign dist-bzip2]) --m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -- - AM_PATH_PYTHON([2.6]) - - PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=yes], [HAVE_CHECK=no]) diff --git a/extra/libxft/PKGBUILD b/extra/libxft/PKGBUILD index 2c1be43f5..4322484f0 100644 --- a/extra/libxft/PKGBUILD +++ b/extra/libxft/PKGBUILD @@ -1,20 +1,24 @@ -# $Id: PKGBUILD 198283 2013-10-30 13:55:28Z allan $ +# $Id: PKGBUILD 202705 2013-12-25 17:35:47Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxft pkgver=2.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="FreeType-based font drawing library for X" arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://xorg.freedesktop.org/" depends=('fontconfig' 'libxrender') makedepends=('pkgconfig') -source=("${url}/releases/individual/lib/libXft-${pkgver}.tar.bz2") -sha256sums=('7fce32b92dcb7b2869bed567af2abc7bbad0d5d6fcf471b8a3e137964a31bbbd') +source=("${url}/releases/individual/lib/libXft-${pkgver}.tar.bz2" + freetype_header.patch) +sha256sums=('7fce32b92dcb7b2869bed567af2abc7bbad0d5d6fcf471b8a3e137964a31bbbd' + '991c91998e61e83061c6c08218a2e6ac5643f16183750f73ee74f29fdd440be9') build() { cd "${srcdir}/libXft-${pkgver}" + # fix build for freetype header moved - http://cgit.freedesktop.org/xorg/lib/libXft/patch/?id=4acfdaf95adb0a05c2a25550bdde036c865902f4 + patch -Np1 -i ${srcdir}/freetype_header.patch ./configure --prefix=/usr --sysconfdir=/etc --disable-static make } diff --git a/extra/libxft/freetype_header.patch b/extra/libxft/freetype_header.patch new file mode 100644 index 000000000..9aba8ee29 --- /dev/null +++ b/extra/libxft/freetype_header.patch @@ -0,0 +1,30 @@ +From 4acfdaf95adb0a05c2a25550bdde036c865902f4 Mon Sep 17 00:00:00 2001 +From: Julien Cristau <jcristau@debian.org> +Date: Mon, 02 Dec 2013 15:26:24 +0000 +Subject: Use FT_*_H macros instead of including <freetype/*.h> + +freetype moved its headers around in 2.5.1. + +Signed-off-by: Julien Cristau <jcristau@debian.org> +--- +diff --git a/src/xftglyphs.c b/src/xftglyphs.c +index 2f3dc5a..4b5fb82 100644 +--- a/src/xftglyphs.c ++++ b/src/xftglyphs.c +@@ -21,10 +21,10 @@ + */ + + #include "xftint.h" +-#include <freetype/ftoutln.h> +-#include <freetype/ftlcdfil.h> ++#include FT_OUTLINE_H ++#include FT_LCD_FILTER_H + +-#include <freetype/ftsynth.h> ++#include FT_SYNTHESIS_H + + /* + * Validate the memory info for a font +-- +cgit v0.9.0.2-2-gbebe + diff --git a/extra/libxkbcommon/PKGBUILD b/extra/libxkbcommon/PKGBUILD index c6f5655c2..0e90dbb98 100644 --- a/extra/libxkbcommon/PKGBUILD +++ b/extra/libxkbcommon/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 198285 2013-10-30 13:56:09Z allan $ +# $Id: PKGBUILD 200283 2013-11-24 18:55:11Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Daniel Micay <danielmicay@gmail.com> # Contributor: Mladen Pejakovic <pejakm@gmail.com> pkgname=libxkbcommon -pkgver=0.3.1 +pkgver=0.3.2 pkgrel=1 pkgdesc="Keyboard handling library using XKB data" arch=(i686 x86_64 mips64el) url="http://xkbcommon.org/" license=(custom) -depends=(xkeyboard-config) +depends=(xkeyboard-config glibc) makedepends=(doxygen xorg-util-macros) source=("http://xkbcommon.org/download/$pkgname-$pkgver.tar.xz") #source=("$pkgname-$pkgver::git://github.com/xkbcommon/$pkgname.git") -md5sums=('7287ea51df79c0f80e92b970a30b95e9') +md5sums=('935cf416354bf05210de2e389484f7e8') build() { cd $pkgname-$pkgver diff --git a/extra/libxmi/PKGBUILD b/extra/libxmi/PKGBUILD index 0fc134016..a1f0a01a2 100644 --- a/extra/libxmi/PKGBUILD +++ b/extra/libxmi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198288 2013-10-30 13:57:15Z allan $ +# $Id: PKGBUILD 199824 2013-11-17 07:48:18Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Tobias Kieslich [tobias.justdreams.de] pkgname=libxmi pkgver=1.2 -pkgrel=5.1 +pkgrel=6 pkgdesc="A library for rasterizing 2-D vector graphics" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libxmi/libxmi.html" diff --git a/extra/libxshmfence/COPYING b/extra/libxshmfence/COPYING deleted file mode 100644 index 313c8f18e..000000000 --- a/extra/libxshmfence/COPYING +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright © 2013 Keith Packard - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that copyright - * notice and this permission notice appear in supporting documentation, and - * that the name of the copyright holders not be used in advertising or - * publicity pertaining to distribution of the software without specific, - * written prior permission. The copyright holders make no representations - * about the suitability of this software for any purpose. It is provided "as - * is" without express or implied warranty. - * - * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE - * OF THIS SOFTWARE. - */ diff --git a/extra/libxshmfence/PKGBUILD b/extra/libxshmfence/PKGBUILD index 162aac75d..f12f9e2f0 100644 --- a/extra/libxshmfence/PKGBUILD +++ b/extra/libxshmfence/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198729 2013-11-02 10:02:59Z andyrtr $ +# $Id: PKGBUILD 200612 2013-11-29 20:50:42Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgname=libxshmfence -pkgver=1.0 +pkgver=1.1 pkgrel=1 pkgdesc="a library that exposes a event API on top of Linux futexes" arch=('i686' 'x86_64') @@ -10,17 +10,15 @@ url="http://xorg.freedesktop.org/" license=('GPL') #groups=() depends=('glibc') -makedepends=('xorg-util-macros') -source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2 - COPYING) -sha256sums=('625089553939baa20e665873a6c8f3d694cfde78fb3110aa59da92fd2b14f14f' - '5e46864ede2fda46c3cb7cfe3a7b9f9e4bd36d8d21d8010a284caa64b81d465a') +makedepends=('xorg-util-macros' 'xproto') +source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('dbc2db2925ca9f216fd1e9c63d0974db9f4d49aaf5877ffb606d2d8d7e58cebe') build() { cd $pkgname-$pkgver # fix some libtools errors - autoreconf -vfi + #autoreconf -vfi ./configure --prefix=/usr make @@ -34,10 +32,6 @@ check() { package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir/" install - - # license is still missing - # COPYING is taken from top of /usr/include/X11/xshmfence.h - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 ${srcdir}/COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" - + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/extra/libzip/PKGBUILD b/extra/libzip/PKGBUILD index 17b60e395..17451905a 100644 --- a/extra/libzip/PKGBUILD +++ b/extra/libzip/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198305 2013-10-30 14:03:27Z allan $ +# $Id: PKGBUILD 199973 2013-11-20 12:11:27Z allan $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=libzip pkgver=0.11.1 -pkgrel=1 +pkgrel=2 pkgdesc="A C library for reading, creating, and modifying zip archives" url="http://www.nih.at/libzip/index.html" license=('BSD') diff --git a/extra/licq/PKGBUILD b/extra/licq/PKGBUILD index abfe2ab94..252244505 100644 --- a/extra/licq/PKGBUILD +++ b/extra/licq/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198307 2013-10-30 14:04:09Z allan $ +# $Id: PKGBUILD 201263 2013-12-07 10:35:02Z bpiotrowski $ # Maintainer: Juergen Hoetzel <juergen@archlinux.org> pkgname=licq pkgver=1.7.1 -pkgrel=5 +pkgrel=6 pkgdesc="Advanced graphical ICQ clone and more for Unix" arch=('i686' 'x86_64' 'mips64el') url="http://www.licq.org" diff --git a/extra/lighttpd/PKGBUILD b/extra/lighttpd/PKGBUILD index 7c2619757..878bac376 100644 --- a/extra/lighttpd/PKGBUILD +++ b/extra/lighttpd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198746 2013-11-02 22:40:11Z pierre $ +# $Id: PKGBUILD 199543 2013-11-15 09:39:54Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=lighttpd pkgver=1.4.33 -pkgrel=2 +pkgrel=3 pkgdesc='A secure, fast, compliant and very flexible web-server' license=('custom') arch=('i686' 'x86_64' 'mips64el') @@ -19,14 +19,37 @@ options=('emptydirs') install='lighttpd.install' source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz" "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz.asc" + "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_setuid.patch" + "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_setuid.patch.asc" + "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_fam_use_after_free.patch" + "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_fam_use_after_free.patch.asc" + "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_ssl_sni.patch" + "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_ssl_sni.patch.asc" 'lighttpd.logrotate.d' 'lighttpd.conf' 'lighttpd.tmpfiles' 'lighttpd.service') sha256sums=('2886aedc23857ca44df91b8fe6f36059ec82a859ae0eb230220e42abc331610c' 'SKIP' + '87792bcf62a554ac094263b931a8ae369d975b7e6bf83778f8f0a6c0ff31b979' + 'SKIP' + '1772cae2a0678c93dd5fa54f2622a563c3eb0a0047ba2a6648a5680d50d3bfde' + 'SKIP' + 'babf177f2e88a1444550825ce8e8ad1a95dbc78cfaa59c2c3f121ccbb37799d2' + 'SKIP' '41f6c0042bb61021553779f861910e335834f6c15e4411756cdc6233b31076fe' 'fece4581bebf39768571962dedce176b2b5f487c0abb5c1cfb35395de216c01f' 'd8a185145a7c08b4fd8c8e6c12dae3e176389dd9b1c66e239757b2ba5108c871' '503fd8557297f4fb814d74effcb59633135b3c2407a87f5abe97467f0822c147') +prepare() { + cd $srcdir/$pkgname-$pkgver + + # http://download.lighttpd.net/lighttpd/security/lighttpd_sa_2013_02.txt + patch -p1 -i $srcdir/lighttpd-1.4.33_fix_setuid.patch + # http://download.lighttpd.net/lighttpd/security/lighttpd_sa_2013_03.txt + patch -p1 -i $srcdir/lighttpd-1.4.33_fix_fam_use_after_free.patch + # http://download.lighttpd.net/lighttpd/security/lighttpd_sa_2013_01.txt + patch -p1 -i $srcdir/lighttpd-1.4.33_fix_ssl_sni.patch +} + build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/link-grammar/PKGBUILD b/extra/link-grammar/PKGBUILD index f7b51428e..d3eb47cbf 100644 --- a/extra/link-grammar/PKGBUILD +++ b/extra/link-grammar/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198311 2013-10-30 14:05:41Z allan $ +# $Id: PKGBUILD 200788 2013-12-05 08:49:59Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=link-grammar -pkgver=4.8.0 +pkgver=4.8.2 pkgrel=1 pkgdesc="A Grammar Checking library" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('aspell') options=('!makeflags') source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('218a2ee5ffed258bc52a0718811ca66e') +md5sums=('57eb0738c57a177e2e76f0b398af811d') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 1f4025a67..da1130f5e 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 197637 2013-10-27 15:07:22Z giovanni $ +# $Id: PKGBUILD 200849 2013-12-06 11:57:53Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2013.10.25 +pkgver=2013.12.05 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ url="http://live555.com/liveMedia" depends=('gcc-libs') options=('staticlibs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('43a8d3a622db8a4582174fa2ddc7461b') +md5sums=('7f3d0e17b6d894a3140c35f9091a8a70') build() { cd ${srcdir}/live diff --git a/extra/lua/PKGBUILD b/extra/lua/PKGBUILD index 58ad58b9f..2255b35b1 100644 --- a/extra/lua/PKGBUILD +++ b/extra/lua/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 181843 2013-04-04 12:42:25Z bpiotrowski $ +# $Id: PKGBUILD 201274 2013-12-07 13:31:55Z bpiotrowski $ # Maintainer: Sébastien Luttringer <seblu@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=lua -pkgver=5.2.2 +pkgver=5.2.3 pkgrel=1 pkgdesc='Powerful light-weight programming language designed for extending applications' arch=('i686' 'x86_64' 'mips64el') @@ -12,34 +12,42 @@ url='http://www.lua.org/' depends=('readline') license=('MIT') options=('!makeflags' '!emptydirs') -source=("http://www.lua.org/ftp/$pkgname-$pkgver.tar.gz" - 'liblua.so.patch' 'lua.pc' 'LICENSE') -md5sums=('efbb645e897eae37cad4344ce8b0a614' +source=(http://www.lua.org/ftp/$pkgname-$pkgver.tar.gz + liblua.so.patch + lua.pc + LICENSE) +md5sums=('dc7f94ec6ff15c985d2d6ad0f1b35654' 'bdc663c7b82ffc0b5df67611621fb625' 'e7ba6c2b695b0b84a5ea0cbff5fc9067' '0e2bd67b909b9ff673da844ca3480df2') +prepare() { + cd $pkgname-$pkgver + patch -p1 -i ../liblua.so.patch +} + build() { cd $pkgname-$pkgver - patch -p1 -i "$srcdir/liblua.so.patch" + export CFLAGS="$CFLAGS -fPIC" make MYCFLAGS="$CFLAGS" MYLDFLAGS="$LDFLAGS" linux + sed "s/%VER%/${pkgver%.*}/g;s/%REL%/$pkgver/g" ../lua.pc > lua.pc } package() { cd $pkgname-$pkgver + make \ - TO_LIB="liblua.a liblua.so liblua.so.5.2 liblua.so.5.2.1" \ - INSTALL_DATA="cp -d" \ - INSTALL_TOP="$pkgdir/usr" \ - INSTALL_MAN="$pkgdir/usr/share/man/man1" \ + TO_LIB='liblua.a liblua.so liblua.so.5.2 liblua.so.5.2.3' \ + INSTALL_DATA='cp -d' \ + INSTALL_TOP="$pkgdir"/usr \ + INSTALL_MAN="$pkgdir"/usr/share/man/man1 \ install - install -Dm644 lua.pc "$pkgdir/usr/lib/pkgconfig/lua.pc" + install -Dm644 lua.pc "$pkgdir"/usr/lib/pkgconfig/lua.pc + # Install the documentation - install -d "$pkgdir/usr/share/doc/lua" - install -m644 doc/*.{gif,png,css,html} "$pkgdir/usr/share/doc/lua" - install -D -m644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -d "$pkgdir"/usr/share/doc/lua + install -m644 doc/*.{gif,png,css,html} "$pkgdir"/usr/share/doc/lua + install -Dm644 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } - -# vim:set ts=4 sw=4 et: diff --git a/extra/lua51/PKGBUILD b/extra/lua51/PKGBUILD index 435788e88..f5a8ca11d 100644 --- a/extra/lua51/PKGBUILD +++ b/extra/lua51/PKGBUILD @@ -1,56 +1,61 @@ -# $Id $ +# $Id: PKGBUILD 201273 2013-12-07 10:54:38Z bpiotrowski $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=lua51 pkgver=5.1.5 -pkgrel=3.1 -pkgdesc='A powerful light-weight programming language designed for extending applications' +pkgrel=4 +pkgdesc='Powerful lightweight programming language designed for extending applications' arch=('i686' 'x86_64' 'mips64el') url='http://www.lua.org/' depends=('readline') license=('MIT') options=('!makeflags' '!emptydirs') -source=("http://www.lua.org/ftp/lua-$pkgver.tar.gz" - 'lua-arch.patch' - 'lua-5.1-cflags.diff') +source=(http://www.lua.org/ftp/lua-$pkgver.tar.gz + lua-arch.patch + lua-5.1-cflags.diff) md5sums=('2e115fe26e435e33b0d5c022e4490567' 'fa25feb70ef9fec975b1c20da5098b3c' '249582bf1fd861ccf492d2c35a9fe732') +prepare() { + cd lua-$pkgver + patch -p1 -i ../lua-arch.patch + patch -p1 -i ../lua-5.1-cflags.diff +} + build() { - cd lua-$pkgver - patch -p1 -i "$srcdir/lua-arch.patch" - patch -p1 -i "$srcdir/lua-5.1-cflags.diff" - [[ $CARCH != i686 ]] && export CFLAGS="$CFLAGS -fPIC" - sed -e 's:llua:llua5.1:' -e 's:/include:/include/lua5.1:' -i etc/lua.pc - sed -r -e '/^LUA_(SO|A|T)=/ s/lua/lua5.1/' -e '/^LUAC_T=/ s/luac/luac5.1/' -i src/Makefile - make MYCFLAGS="$CFLAGS" MYLDFLAGS="$LDFLAGS" linux + cd lua-$pkgver + + [[ $CARCH == x86_64 ]] && export CFLAGS="$CFLAGS -fPIC" + sed -e 's:llua:llua5.1:' -e 's:/include:/include/lua5.1:' -i etc/lua.pc + sed -r -e '/^LUA_(SO|A|T)=/ s/lua/lua5.1/' -e '/^LUAC_T=/ s/luac/luac5.1/' \ + -i src/Makefile + make MYCFLAGS="$CFLAGS" MYLDFLAGS="$LDFLAGS" linux } package() { - cd lua-$pkgver - make \ - TO_BIN="lua5.1 luac5.1" \ - TO_LIB="liblua5.1.a liblua5.1.so liblua5.1.so.5.1 liblua5.1.so.$pkgver" \ - INSTALL_DATA='cp -d' \ - INSTALL_TOP="$pkgdir/usr" \ - INSTALL_INC="$pkgdir/usr/include/lua5.1" \ - INSTALL_MAN="$pkgdir/usr/share/man/man1" \ - install - install -D -m644 etc/lua.pc "$pkgdir/usr/lib/pkgconfig/lua5.1.pc" - # Install the documentation - install -d "$pkgdir/usr/share/doc/$pkgname" - install -m644 doc/*.{gif,png,css,html} "$pkgdir/usr/share/doc/$pkgname" - # Install copyrigth file - install -D -m644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/COPYRIGHT" - # fixups - ln -s liblua5.1.so "$pkgdir/usr/lib/liblua.so.5.1" - ln -s liblua5.1.so "$pkgdir/usr/lib/liblua.so.$pkgver" - cd "$pkgdir/usr/share/man/man1" - mv lua.1 lua5.1.1 - mv luac.1 luac5.1.1 -} + cd lua-$pkgver -# vim:set ts=4 sw=4 et: + make \ + TO_BIN='lua5.1 luac5.1' \ + TO_LIB="liblua5.1.a liblua5.1.so liblua5.1.so.5.1 liblua5.1.so.$pkgver" \ + INSTALL_DATA='cp -d' \ + INSTALL_TOP="$pkgdir"/usr \ + INSTALL_INC="$pkgdir"/usr/include/lua5.1 \ + INSTALL_MAN="$pkgdir"/usr/share/man/man1 \ + install + + install -Dm644 etc/lua.pc "$pkgdir"/usr/lib/pkgconfig/lua5.1.pc + install -d "$pkgdir/usr/share/doc/$pkgname" + install -m644 doc/*.{gif,png,css,html} "$pkgdir"/usr/share/doc/$pkgname + install -Dm644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT + + ln -s liblua5.1.so "$pkgdir"/usr/lib/liblua.so.5.1 + ln -s liblua5.1.so "$pkgdir"/usr/lib/liblua.so.$pkgver + + cd "$pkgdir"/usr/share/man/man1 + mv lua.1 lua5.1.1 + mv luac.1 luac5.1.1 +} diff --git a/extra/lyx/PKGBUILD b/extra/lyx/PKGBUILD index 4a2246fa2..495de1fee 100644 --- a/extra/lyx/PKGBUILD +++ b/extra/lyx/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 190045 2013-07-13 12:41:55Z svenstaro $ +# $Id: PKGBUILD 201264 2013-12-07 10:35:03Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=lyx pkgver=2.0.6 -pkgrel=3 +pkgrel=4 pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end" arch=('i686' 'x86_64' 'mips64el') url="http://www.lyx.org" diff --git a/extra/manedit/PKGBUILD b/extra/manedit/PKGBUILD deleted file mode 100644 index d620506a4..000000000 --- a/extra/manedit/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# $Id: PKGBUILD 143901 2011-11-30 20:13:10Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=manedit -pkgver=1.2.1 -pkgrel=4.2 -pkgdesc="An editor specifically tailored for UNIX manual pages" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -url="http://freecode.com/projects/manedit" -depends=('gcc-libs' 'bzip2' 'zlib' 'gtk') -source=("http://wolfsinger.com/~wolfpack/packages/${pkgname}-${pkgver}.tar.bz2" - 'manedit-1.2.1-fix-man-page.patch' - 'manedit.desktop') -md5sums=('a7ee1835e32ed3c9279412af7caf13ef' - '60cb0c224a6659f8a8183006608f368b' - 'bac6986fc25dda6f0e27e3673eef4600') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # Patch to fix generate man page - patch -Np1 -i ${srcdir}/manedit-1.2.1-fix-man-page.patch - - env CFLAGS="${CFLAGS}" \ - ./configure Linux \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --datadir=/usr/share \ - --enable=bzip2 \ - --enable=zlib \ - --disable="arch-i486" \ - --disable="arch-i586" \ - --disable="arch-i686" \ - --disable="arch-pentiumpro" - - make all -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # Fix strip error (tries to strip a shell script) - cp manedit/Makefile.install.UNIX{,.orig} - sed -e '/INST.*FLAGS.*-s$/s:-s::' \ - manedit/Makefile.install.UNIX.orig > manedit/Makefile.install.UNIX - - # Set man dir too or FHS is violated - make PREFIX="${pkgdir}/usr" \ - MAN_DIR="${pkgdir}/usr/share/man/man1" \ - ICONS_DIR="${pkgdir}/usr/share/pixmaps" install - - # Install desktop file - install -Dm644 ${srcdir}/manedit.desktop "${pkgdir}/usr/share/applications/manedit.desktop" -} diff --git a/extra/manedit/manedit-1.2.1-fix-man-page.patch b/extra/manedit/manedit-1.2.1-fix-man-page.patch deleted file mode 100644 index 77aad9a79..000000000 --- a/extra/manedit/manedit-1.2.1-fix-man-page.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/manedit/makefile_append.ini 2008-10-11 16:00:00.000000000 -0700 -+++ b/manedit/makefile_append.ini 2009-11-20 15:33:47.000000000 -0800 -@@ -39,9 +39,9 @@ - - manpage: - @echo "Generating manual page $(BIN).1.bz2" -- @-$(SED) 's|%%PREFIX%%|$(PREFIX)|g ; \ -- s|%%LOCALBASE%%|${LOCALBASE}|g ; \ -- s|%%X11BASE%%|${X11BASE}|g' $(BIN).1 > $(BIN).1.out -+ @-$(SED) -e 's|%%PREFIX%%|$(PREFIX)|g ;' \ -+ -e 's|%%LOCALBASE%%|${LOCALBASE}|g ;' \ -+ -e 's|%%X11BASE%%|${X11BASE}|g' $(BIN).1 > $(BIN).1.out - @-$(BZIP2) $(BIN).1.out --stdout > $(BIN).1.bz2 - - modules: $(OBJ_C) $(OBJ_CPP) diff --git a/extra/manedit/manedit.desktop b/extra/manedit/manedit.desktop deleted file mode 100644 index 030fb0ccf..000000000 --- a/extra/manedit/manedit.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Manpage Editor -Comment=Create and edit UNIX manual pages -Icon=/usr/share/pixmaps/manedit.xpm -Exec=manedit -Terminal=false -Type=Application -Categories=GNOME;Application;Development; -StartupNotify=true
\ No newline at end of file diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD index 0910aaf7c..92322d3aa 100644 --- a/extra/mariadb/PKGBUILD +++ b/extra/mariadb/PKGBUILD @@ -1,35 +1,30 @@ -# $Id: PKGBUILD 198814 2013-11-05 17:28:31Z bpiotrowski $ +# $Id: PKGBUILD 200716 2013-12-03 07:22:47Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> pkgbase=mariadb pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb') -pkgver=5.5.33.a +pkgver=5.5.34 _pkgver=${pkgver/.a/a} -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url='http://mariadb.org/' -makedepends=('cmake' 'openssl' 'zlib') +makedepends=('cmake' 'openssl' 'zlib' 'libaio') source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$_pkgver/kvm-tarbake-jaunty-x86/$pkgbase-$_pkgver.tar.gz mariadb.service mariadb-post.sh mariadb-tmpfile.conf) -sha256sums=('adf4d04087177fde6568082c3fee77e52e84dc3ae4eb5b994d5defaaa8c83d5b' +sha256sums=('a4d8b54be0f5784924629a1e87dbbccc4c0aaf537c76951e265625deda322f89' 'a6cf5446159fff16598d0d787dd3a3c30a53a656a5f876ddb608bc60e234d334' '368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd' '2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd') -prepare() { - cd $pkgbase-$_pkgver - sed -i '63d' storage/tokudb/ft-index/cmake_modules/TokuSetupCTest.cmake -} - build() { mkdir build cd build cmake ../$pkgbase-$_pkgver \ - -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_CONFIG=mysql_release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DSYSCONFDIR=/etc/mysql \ -DMYSQL_DATADIR=/var/lib/mysql \ @@ -72,9 +67,10 @@ build() { package_libmariadbclient() { pkgdesc='MariaDB client libraries' - depends=('openssl') + depends=('openssl' 'libaio') conflicts=('libmysqlclient') provides=("libmysqlclient=$pkgver") + options=('staticlibs') cd build for dir in include libmysql libmysqld libservices; do @@ -120,7 +116,7 @@ package_mariadb() { pkgdesc='Fast SQL database server, drop-in replacement for MySQL' backup=('etc/mysql/my.cnf') install=mariadb.install - depends=('mariadb-clients' 'inetutils') + depends=('mariadb-clients' 'inetutils' 'libaio') conflicts=('mysql') provides=("mysql=$pkgver") options=('emptydirs') diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD index 275cbd3a2..1e9de43bf 100644 --- a/extra/maxima/PKGBUILD +++ b/extra/maxima/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 196297 2013-10-11 08:53:38Z juergen $ +# $Id: PKGBUILD 202771 2013-12-27 14:33:26Z juergen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir@archlinux.org> pkgname=maxima -pkgver=5.30.0 -pkgrel=4 -pkgdesc="Maxima - a sophisticated computer algebra system" +pkgver=5.31.0 +pkgrel=2 +pkgdesc="A sophisticated computer algebra system" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://maxima.sourceforge.net" if [ "${CARCH}" == "mips64el" ] ; then depends=('clisp' 'texinfo' 'sh') else - depends=('sbcl=1.1.12' 'texinfo' 'sh') + depends=('sbcl=1.1.14' 'texinfo' 'sh') fi makedepends=('python2') optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface') @@ -21,7 +21,7 @@ optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/ options=('!makeflags' '!zipman') # don't zip info pages or they won't work inside maxima install=maxima.install source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" "$pkgname.desktop") -sha1sums=('ae009d71524f55264b346b03dac8e504e3b18ac0' +sha1sums=('07623644b2962d68388cfd3f507e3d381e33ce02' '4398ebb1ec85ccfa12f37516a56d60c26f74b18b') build() { diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index 6607a487c..75cc48987 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198757 2013-11-03 10:27:39Z giovanni $ +# $Id: PKGBUILD 200687 2013-12-02 16:02:10Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=mercurial -pkgver=2.8 +pkgver=2.8.1 pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI') backup=('etc/mercurial/hgrc') source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz" 'mercurial.profile') -md5sums=('76b565f48000e9f331356ab107a5bcbb' +md5sums=('bede5869f9b5d09ab3269bac472495e7' '43e1d36564d4c7fbe9a091d3ea370a44') package() { diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index eba327774..b7f449906 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198319 2013-10-30 14:08:41Z allan $ +# $Id: PKGBUILD 201668 2013-12-17 21:04:31Z lcarlier $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=mesa pkgname=('mesa' 'mesa-libgl') -pkgver=9.2.2 +pkgver=10.0.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage' @@ -17,7 +17,7 @@ url="http://mesa3d.sourceforge.net" license=('custom') source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2 LICENSE) -md5sums=('20887f8020db7d1736a01ae9cd5d8c38' +md5sums=('0a72ca5b36046a658bf6038326ff32ed' '5c65a0fe315dd347e09b1f2826a1df5a') build() { @@ -64,12 +64,12 @@ build() { package_ati-dri() { pkgdesc="Mesa drivers for AMD/ATI Radeon" - depends=("mesa-libgl=${pkgver}") + depends=('mesa-libgl' "mesa=${pkgver}") optdepends=('libtxc_dxtn: S3 Texture Compressed support') conflicts=('xf86-video-ati<6.9.0-6') install -m755 -d ${pkgdir}/usr/lib/vdpau/ - mv -v ${srcdir}/fakeinstall/usr/lib/vdpau/libvdpau_{r300,r600,radeonsi}.* ${pkgdir}/usr/lib/vdpau/ + mv -v ${srcdir}/fakeinstall/usr/lib/vdpau/libvdpau_{r600,radeonsi}.* ${pkgdir}/usr/lib/vdpau/ install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/{r200,r300,r600,radeon,radeonsi}_dri.so ${pkgdir}/usr/lib/xorg/modules/dri/ @@ -84,7 +84,7 @@ package_ati-dri() { package_intel-dri() { pkgdesc="Mesa drivers for Intel" optdepends=('libtxc_dxtn: S3 Texture Compressed support') - depends=("mesa-libgl=${pkgver}") + depends=('mesa-libgl' "mesa=${pkgver}") install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/{i915,i965}_dri.so ${pkgdir}/usr/lib/xorg/modules/dri/ @@ -96,7 +96,7 @@ package_intel-dri() { package_nouveau-dri() { pkgdesc="Mesa drivers for Nouveau" optdepends=('libtxc_dxtn: S3 Texture Compressed support') - depends=("mesa-libgl=${pkgver}") + depends=('mesa-libgl' "mesa=${pkgver}") install -m755 -d ${pkgdir}/usr/lib/vdpau/ mv -v ${srcdir}/fakeinstall/usr/lib/vdpau/libvdpau_nouveau.* ${pkgdir}/usr/lib/vdpau/ @@ -107,9 +107,6 @@ package_nouveau-dri() { install -m755 -d ${pkgdir}/usr/lib/gallium-pipe mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_nouveau* ${pkgdir}/usr/lib/gallium-pipe/ - # vdpau drivers are still buggy with nouveau, so remove them (FS#36754) - rm -rf ${pkgdir}/usr/lib/vdpau/ - install -m755 -d "${pkgdir}/usr/share/licenses/nouveau-dri" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/nouveau-dri/" } @@ -140,6 +137,7 @@ package_mesa() { mv -v ${srcdir}/fakeinstall/* ${pkgdir} # rename libgl.so to not conflict with blobs - may break gl.pc ? mv ${pkgdir}/usr/lib/libGL.so.1.2.0 ${pkgdir}/usr/lib/mesa-libGL.so.1.2.0 + ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib/mesa-libGL.so.1 rm ${pkgdir}/usr/lib/libGL.so{,.1} install -m755 -d "${pkgdir}/usr/share/licenses/mesa" diff --git a/extra/minicom/PKGBUILD b/extra/minicom/PKGBUILD deleted file mode 100644 index 425852d48..000000000 --- a/extra/minicom/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 179491 2013-03-05 16:42:11Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: dorphell <dorphell@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> -# Contributor: Denis Tikhomirov <dvtikhomirov@gmail.com> - -pkgname=minicom -pkgver=2.6.2 -pkgrel=1 -pkgdesc="A serial communication program" -arch=('i686' 'x86_64' 'mips64el') -url="http://alioth.debian.org/projects/minicom/" -license=('GPL') -depends=('bash') -optdepends=('lrzsz: for xmodem, ymodem and zmodem file transfer protocols') -backup=('etc/minirc.dfl') -source=("http://alioth.debian.org/frs/download.php/3869/${pkgname}-${pkgver}.tar.gz") -md5sums=('203c56c4b447f45e2301b0cc4e83da3c') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr \ - --sysconfdir=/etc - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}/" install - install -Dm644 doc/minirc.dfl ${pkgdir}/etc/minirc.dfl -} diff --git a/extra/mjpegtools/PKGBUILD b/extra/mjpegtools/PKGBUILD index 48a5577e3..762555038 100644 --- a/extra/mjpegtools/PKGBUILD +++ b/extra/mjpegtools/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 198321 2013-10-30 14:09:25Z allan $ +# $Id: PKGBUILD 199969 2013-11-20 11:33:02Z allan $ # Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Maintainer: Roberto Carvajal <roberto@archlinux.org> pkgname=mjpegtools pkgver=2.0.0 -pkgrel=3 +pkgrel=4 pkgdesc="Set of tools that can do recording of videos and playback, simple cut-and-paste editing and the MPEG compression of audio and video" -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://mjpeg.sourceforge.net/" depends=('libjpeg' 'libpng' 'sdl' 'gcc-libs' 'libdv') diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD index e99537856..50adf382d 100644 --- a/extra/mkvtoolnix/PKGBUILD +++ b/extra/mkvtoolnix/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 197567 2013-10-27 00:07:32Z giovanni $ +# $Id: PKGBUILD 201265 2013-12-07 10:35:05Z bpiotrowski $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: xduugu <xduugu@gmx.com> pkgbase=mkvtoolnix pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk') -pkgver=6.5.0 -pkgrel=1 +pkgver=6.6.0 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.bunkus.org/videotools/mkvtoolnix/index.html" makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk' 'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby') source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.xz") -md5sums=('e2d8d539b8cb9249b6c398690bc61c78') +md5sums=('1e952a3196b0c43150801eeaecba68ed') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/modemmanager/PKGBUILD b/extra/modemmanager/PKGBUILD index 75fe89169..9f6d204bd 100644 --- a/extra/modemmanager/PKGBUILD +++ b/extra/modemmanager/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 198323 2013-10-30 14:10:06Z allan $ +# $Id: PKGBUILD 202884 2013-12-28 22:44:05Z bpiotrowski $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=modemmanager _realname=ModemManager pkgver=1.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Mobile broadband modem management service" arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/ModemManager/" diff --git a/extra/mpc/PKGBUILD b/extra/mpc/PKGBUILD index 0367e36a3..489f8a4fc 100644 --- a/extra/mpc/PKGBUILD +++ b/extra/mpc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 198598 2013-10-30 16:56:48Z bisson $ +# $Id: PKGBUILD 199304 2013-11-09 22:09:32Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,15 +6,15 @@ # Contributor: Link Dupont <link@subpop.net> pkgname=mpc -pkgver=0.24 +pkgver=0.25 pkgrel=1 pkgdesc='Minimalist command line interface to MPD' url='http://www.musicpd.org/clients/mpc/' license=('GPL2') arch=('i686' 'x86_64' 'mips64el') depends=('libmpdclient') -source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz") -sha1sums=('d98d9d431e7bcdf9123f18f213b3a1f9a03835f7') +source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig}) +sha1sums=('c649cd19e4195749ca7da309c10acd53ac139b49' 'SKIP') options=('!emptydirs') diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD index f180e6361..d9260882a 100644 --- a/extra/mpd/PKGBUILD +++ b/extra/mpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 198643 2013-10-31 16:50:38Z bisson $ +# $Id: PKGBUILD 202687 2013-12-24 18:48:56Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,35 +6,31 @@ # Contributor: Ben <ben@benmazer.net> pkgname=mpd -pkgver=0.18 +pkgver=0.18.6 pkgrel=1 pkgdesc='Flexible, powerful, server-side application for playing music' url='http://www.musicpd.org/' license=('GPL') arch=('i686' 'x86_64' 'mips64el') depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'faad2' - 'sqlite' 'jack' 'libmms' 'wavpack' 'avahi' 'libid3tag' 'yajl') + 'sqlite' 'jack' 'libmms' 'wavpack' 'avahi' 'libid3tag' 'yajl' 'libmpdclient') makedepends=('doxygen') -source=("http://www.musicpd.org/download/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz" +source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig} 'tmpfiles.d' 'conf') -sha1sums=('e3cc99de0c2c595ca576cdb455c6aaedd4f7726a' +sha1sums=('06951d043a57ce460b728402768a235d8b18ba93' 'SKIP' 'f4d5922abb69abb739542d8e93f4dfd748acdad7' '67c145c046cddd885630d72ce8ebe71f8321ff3b') backup=('etc/mpd.conf') install=install -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:g' -i src/input/CdioParanoiaInputPlugin.cxx -} - build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ --prefix=/usr \ --sysconfdir=/etc \ + --enable-libmpdclient \ --enable-jack \ --enable-soundcloud \ --enable-pipe-output \ @@ -50,6 +46,7 @@ package() { install -Dm644 ../conf "${pkgdir}"/etc/mpd.conf install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/mpd.conf install -d -g 45 -o 45 "${pkgdir}"/var/lib/mpd/playlists - install -d "${pkgdir}"/usr/lib/systemd/user - ln -s ../system/mpd.service "${pkgdir}"/usr/lib/systemd/user/mpd.service + + install -Dm644 "${pkgdir}"/usr/lib/systemd/{system,user}/mpd.service + sed '/WantedBy=/c WantedBy=default.target' -i "${pkgdir}"/usr/lib/systemd/user/mpd.service } diff --git a/extra/musicbrainz/PKGBUILD b/extra/musicbrainz/PKGBUILD index a367e09e7..a8c740023 100644 --- a/extra/musicbrainz/PKGBUILD +++ b/extra/musicbrainz/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 198331 2013-10-30 14:13:00Z allan $ +# $Id: PKGBUILD 201368 2013-12-09 18:27:42Z eric $ # Maintainer: # Contributor: Alexander Baldeck <alexander@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> @@ -14,7 +14,7 @@ url="http://www.musicbrainz.org" license=('LGPL') depends=('expat>=2.0' 'gcc-libs') makedepends=('python2') -source=(ftp://ftp.musicbrainz.org/pub/$pkgname/libmusicbrainz-${pkgver}.tar.gz +source=(ftp://ftp.musicbrainz.org/pub/$pkgname/historical/libmusicbrainz-${pkgver}.tar.gz 'gcc4.3.patch') build() { diff --git a/extra/mutter-wayland/0001-monitor-expose-min-backlight-step.patch b/extra/mutter-wayland/0001-monitor-expose-min-backlight-step.patch new file mode 100644 index 000000000..0d6d7424f --- /dev/null +++ b/extra/mutter-wayland/0001-monitor-expose-min-backlight-step.patch @@ -0,0 +1,29 @@ +From 6b150b3e9f1d16e6c374e178107ab490a18346dd Mon Sep 17 00:00:00 2001 +From: Asad Mehmood <asad78611@googlemail.com> +Date: Thu, 17 Oct 2013 16:05:59 +0100 +Subject: [PATCH] monitor: expose min-backlight-step + +Expose min-backlight-step so that gnome-settings-daemon can +support backlights with less than 10 steps without mutter +normalizing the brightness back to its original value +--- + src/core/monitor.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/core/monitor.c b/src/core/monitor.c +index 9ec0c2a..6d65f9e 100644 +--- a/src/core/monitor.c ++++ b/src/core/monitor.c +@@ -806,6 +806,9 @@ meta_monitor_manager_handle_get_resources (MetaDBusDisplayConfig *skeleton, + g_variant_new_take_string (make_display_name (manager, output))); + g_variant_builder_add (&properties, "{sv}", "backlight", + g_variant_new_int32 (output->backlight)); ++ g_variant_builder_add (&properties, "{sv}", "min-backlight-step", ++ g_variant_new_int32 ((output->backlight_max - output->backlight_min) ? ++ 100 / (output->backlight_max - output->backlight_min) : -1)); + g_variant_builder_add (&properties, "{sv}", "primary", + g_variant_new_boolean (output->is_primary)); + g_variant_builder_add (&properties, "{sv}", "presentation", +-- +1.8.4.1 + diff --git a/extra/mutter-wayland/PKGBUILD b/extra/mutter-wayland/PKGBUILD index 1547fc910..cb61970d4 100644 --- a/extra/mutter-wayland/PKGBUILD +++ b/extra/mutter-wayland/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198333 2013-10-30 14:13:43Z allan $ +# $Id: PKGBUILD 199788 2013-11-16 12:17:37Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=mutter-wayland pkgver=3.10.1 -pkgrel=1 +pkgrel=2 pkgdesc="A Wayland compositor for GNOME" arch=(i686 x86_64) license=(GPL) @@ -13,9 +13,11 @@ url="http://www.gnome.org" options=('!emptydirs') install=mutter-wayland.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz - mutter-wayland-3.10.0.1-logfile.patch) + mutter-wayland-3.10.0.1-logfile.patch + 0001-monitor-expose-min-backlight-step.patch) sha256sums=('bdb6bcc25791309256b09ec9aa7e0be311ef311778450aafccb86caf2753b6b4' - 'b79866b6b3fa6029b35ef2b5c5d0cb92886ec2ed0173f780c4d46a5b8d9a1644') + 'b79866b6b3fa6029b35ef2b5c5d0cb92886ec2ed0173f780c4d46a5b8d9a1644' + 'f1ef173d96ac27abdcf765972d2ac434f63bf4629b8bd51c177e8963d07f5eb7') prepare() { @@ -23,6 +25,9 @@ prepare() { # From Fedora: Don't try to redirect the logfile. It won't work. patch -Np1 -i ../mutter-wayland-3.10.0.1-logfile.patch + + # FS#37224 + patch -Np1 -i ../0001-monitor-expose-min-backlight-step.patch } build() { diff --git a/extra/mutter/0001-monitor-expose-min-backlight-step.patch b/extra/mutter/0001-monitor-expose-min-backlight-step.patch new file mode 100644 index 000000000..0d6d7424f --- /dev/null +++ b/extra/mutter/0001-monitor-expose-min-backlight-step.patch @@ -0,0 +1,29 @@ +From 6b150b3e9f1d16e6c374e178107ab490a18346dd Mon Sep 17 00:00:00 2001 +From: Asad Mehmood <asad78611@googlemail.com> +Date: Thu, 17 Oct 2013 16:05:59 +0100 +Subject: [PATCH] monitor: expose min-backlight-step + +Expose min-backlight-step so that gnome-settings-daemon can +support backlights with less than 10 steps without mutter +normalizing the brightness back to its original value +--- + src/core/monitor.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/core/monitor.c b/src/core/monitor.c +index 9ec0c2a..6d65f9e 100644 +--- a/src/core/monitor.c ++++ b/src/core/monitor.c +@@ -806,6 +806,9 @@ meta_monitor_manager_handle_get_resources (MetaDBusDisplayConfig *skeleton, + g_variant_new_take_string (make_display_name (manager, output))); + g_variant_builder_add (&properties, "{sv}", "backlight", + g_variant_new_int32 (output->backlight)); ++ g_variant_builder_add (&properties, "{sv}", "min-backlight-step", ++ g_variant_new_int32 ((output->backlight_max - output->backlight_min) ? ++ 100 / (output->backlight_max - output->backlight_min) : -1)); + g_variant_builder_add (&properties, "{sv}", "primary", + g_variant_new_boolean (output->is_primary)); + g_variant_builder_add (&properties, "{sv}", "presentation", +-- +1.8.4.1 + diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD index 27b5d4955..fe4153570 100644 --- a/extra/mutter/PKGBUILD +++ b/extra/mutter/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 198332 2013-10-30 14:13:20Z allan $ +# $Id: PKGBUILD 199787 2013-11-16 12:16:33Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Michael Kanis <mkanis_at_gmx_dot_de> pkgname=mutter -pkgver=3.10.1.1 -pkgrel=1 +pkgver=3.10.2 +pkgrel=2 pkgdesc="A window manager for GNOME" arch=(i686 x86_64 mips64el) license=('GPL') @@ -15,8 +15,17 @@ url="http://www.gnome.org" groups=('gnome') options=('!emptydirs') install=mutter.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) -sha256sums=('fa05200a367cd72dbba8c023f6828f79db24b8922e51b71f55148d3e35701c00') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz + 0001-monitor-expose-min-backlight-step.patch) +sha256sums=('438163bc7fbab88366b589cab895a1df79eeac389e012c6e26ec559316651100' + 'f1ef173d96ac27abdcf765972d2ac434f63bf4629b8bd51c177e8963d07f5eb7') + +prepare() { + cd "$pkgname-$pkgver" + + # FS#37224 + patch -Np1 -i ../0001-monitor-expose-min-backlight-step.patch +} build() { cd "$pkgname-$pkgver" diff --git a/extra/nepomuk-core/PKGBUILD b/extra/nepomuk-core/PKGBUILD index 9ff6922fb..4e7f7cacb 100644 --- a/extra/nepomuk-core/PKGBUILD +++ b/extra/nepomuk-core/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 198819 2013-11-05 19:40:45Z andrea $ +# $Id: PKGBUILD 202454 2013-12-22 12:46:34Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=nepomuk-core -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="Contains the central Nepomuk services like file indexing, file system monitoring, query, storage, client libraries" url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-core" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') -depends=('kdelibs' 'poppler-qt' 'taglib' 'ffmpeg' 'ebook-tools') +depends=('kdelibs' 'poppler-qt' 'taglib' 'ffmpeg' 'ebook-tools' 'kdegraphics-mobipocket') makedepends=('cmake' 'automoc4' 'doxygen') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('9d97cb731728a43037eb208e2322b6e0b4e8b7e5') +sha1sums=('2b4ec16c5e664ae7dcd4035229000b8d7712181d') prepare() { mkdir build diff --git a/extra/nepomuk-widgets/PKGBUILD b/extra/nepomuk-widgets/PKGBUILD index 463bbfabb..1763b3ad5 100644 --- a/extra/nepomuk-widgets/PKGBUILD +++ b/extra/nepomuk-widgets/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198836 2013-11-05 19:46:51Z andrea $ +# $Id: PKGBUILD 202471 2013-12-22 12:46:53Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=nepomuk-widgets -pkgver=4.11.3 +pkgver=4.12.0 pkgrel=1 pkgdesc="The Library containing the Nepomuk Widgets" url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-widgets" @@ -11,7 +11,7 @@ license=('GPL' 'LGPL' 'FDL') depends=('nepomuk-core') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('d43a410fd9ed02b52e8d4076e080a66a4b2c435a') +sha1sums=('2edb8e026f35574167026838e9d5b382a5f8148b') build() { mkdir build diff --git a/extra/netcdf-cxx/PKGBUILD b/extra/netcdf-cxx/PKGBUILD index d4fa61d24..e98d925b6 100644 --- a/extra/netcdf-cxx/PKGBUILD +++ b/extra/netcdf-cxx/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198338 2013-10-30 14:15:40Z allan $ +# $Id: PKGBUILD 199828 2013-11-17 07:52:48Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=netcdf-cxx pkgver=4.2 -pkgrel=1 +pkgrel=2 pkgdesc="NetCDF c++ bindings" arch=("i686" "x86_64" "mips64el") url="http://www.unidata.ucar.edu/downloads/netcdf/netcdf-cxx/index.jsp" diff --git a/extra/netcdf/PKGBUILD b/extra/netcdf/PKGBUILD index 6454ab5d6..bc935104c 100644 --- a/extra/netcdf/PKGBUILD +++ b/extra/netcdf/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198337 2013-10-30 14:15:18Z allan $ +# $Id: PKGBUILD 199827 2013-11-17 07:52:15Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=netcdf pkgver=4.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="network Common Data Form interface for array-oriented data access and corresponding library" arch=("i686" "x86_64" 'mips64el') url="http://www.unidata.ucar.edu/downloads/netcdf/index.jsp" diff --git a/extra/network-manager-applet/PKGBUILD b/extra/network-manager-applet/PKGBUILD index 12a464bb6..2308ea051 100644 --- a/extra/network-manager-applet/PKGBUILD +++ b/extra/network-manager-applet/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 198342 2013-10-30 14:17:08Z allan $ +# $Id: PKGBUILD 199354 2013-11-11 16:09:20Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Arjan Timmerman <arjan@archlinux.org> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> @@ -6,8 +6,8 @@ # Contributor: Will Rea <sillywilly@gmail.com> pkgname=network-manager-applet -pkgver=0.9.8.4 -pkgrel=2 +pkgver=0.9.8.8 +pkgrel=1 pkgdesc="GNOME frontends to NetWorkmanager" arch=('i686' 'x86_64' 'mips64el') license=(GPL) @@ -19,7 +19,7 @@ optdepends=('gnome-bluetooth: for PAN/DUN support') options=('!emptydirs') install=network-manager-applet.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz) -sha256sums=('f68849291047c94487279aab4a6cb90945ad351df02da621a73b413e6c6c198c') +sha256sums=('581ebf9ead919e33d7e910322c2f64919f98716d8636f1a640b72c9b2e3ba9eb') build() { cd ${pkgname}-${pkgver} diff --git a/extra/nspr/PKGBUILD b/extra/nspr/PKGBUILD index f9db70957..de23ae7f8 100644 --- a/extra/nspr/PKGBUILD +++ b/extra/nspr/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 197714 2013-10-28 19:33:38Z jgc $ +# $Id: PKGBUILD 199496 2013-11-13 14:59:50Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=nspr -pkgver=4.10.1 -pkgrel=2 +pkgver=4.10.2 +pkgrel=1 pkgdesc="Netscape Portable Runtime" arch=(i686 x86_64 'mips64el') url="http://www.mozilla.org/projects/nspr/" @@ -13,8 +13,8 @@ depends=('glibc') makedepends=('zip') options=('!emptydirs') source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz) -sha1sums=('bd1cdf5e7e107846ffe431c5c62b81a560e8c3f7') -md5sums=('2e354084ca2bc5fbbb820762597f3890') +sha1sums=('650e4aa35d58624bc1083ed585c81c4af09cf23c') +md5sums=('f0d254da0b2b870d9a5fa094e879d4b8') build() { cd $pkgname-$pkgver diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD index cac42649f..a803f5101 100644 --- a/extra/nss/PKGBUILD +++ b/extra/nss/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 197720 2013-10-28 23:19:38Z jgc $ +# $Id: PKGBUILD 201408 2013-12-10 17:56:17Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=nss -pkgver=3.15.2 +pkgver=3.15.3.1 pkgrel=1 pkgdesc="Mozilla Network Security Services" arch=(i686 x86_64 'mips64el') url="http://www.mozilla.org/projects/security/pki/nss/" license=('MPL' 'GPL') -_nsprver=4.10 +_nsprver=4.10.2 depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh') makedepends=('perl') options=('!strip' '!makeflags' 'staticlibs') @@ -17,7 +17,7 @@ source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/s nss-config.in ssl-renegotiate-transitional.patch add_spi+cacert_ca_certs.patch) -sha1sums=('2d900c296bf11deabbf833ebd6ecdea549c97a5f' +sha1sums=('4e0f81a1f770447dc5440201a579151b601463e2' 'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd' 'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c' '8a964a744ba098711b80c0d279a2993524e8eb92' diff --git a/extra/numactl/PKGBUILD b/extra/numactl/PKGBUILD index 79086d802..68560df5c 100644 --- a/extra/numactl/PKGBUILD +++ b/extra/numactl/PKGBUILD @@ -3,7 +3,7 @@ pkgname=numactl pkgver=2.0.9 -pkgrel=1 +pkgrel=2 pkgdesc="Simple NUMA policy support" arch=('i686' 'x86_64' 'mips64el') url="http://oss.sgi.com/projects/libnuma/" diff --git a/extra/obexd/PKGBUILD b/extra/obexd/PKGBUILD deleted file mode 100644 index 083752d7c..000000000 --- a/extra/obexd/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 187865 2013-06-07 09:25:01Z tomegun $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Geoffroy Carrier <geoffroy@archlinux.org> - -pkgbase=obexd -pkgname=('obexd-client' 'obexd-server') -epoch=1 -pkgver=0.46 -pkgrel=2 -url="http://www.bluez.org/" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL2') -makedepends=('bluez4' 'bluez-libs' 'libical' 'glib2') -source=("http://www.kernel.org/pub/linux/bluetooth/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('625f0417d119437429c9cce29479cfa4') - -build() { - cd ${pkgbase}-${pkgver} - sed -i 's/#include <string.h>/&\n#include <stdio.h>/' plugins/mas.c - ./configure --prefix=/usr \ - --libexecdir=/usr/lib/obexd - make -} - -package_obexd-client() { - pkgdesc="D-Bus service providing high-level OBEX client side functionality" - depends=('bluez4' 'bluez-libs' 'glib2') - provides=("obexd=${pkgver}") - replaces=('obexd') - conflicts=('obexd') - - cd ${pkgbase}-${pkgver}/client - install -m755 -d "${pkgdir}/usr/lib/obexd" - install -m755 -d "${pkgdir}/usr/share/dbus-1/services" - install -m755 obex-client "${pkgdir}/usr/lib/obexd/" - install -m644 obex-client.service "${pkgdir}/usr/share/dbus-1/services/" -} - -package_obexd-server() { - pkgdesc="D-Bus service providing high-level OBEX server side functionality" - depends=('bluez4' 'bluez-libs' 'libical' 'glib2') - conflicts=('obex-data-server') - - cd ${pkgbase}-${pkgver}/src - install -m755 -d "${pkgdir}/usr/lib/obexd" - install -m755 -d "${pkgdir}/usr/share/dbus-1/services" - install -m755 obexd "${pkgdir}/usr/lib/obexd/" - install -m644 obexd.service "${pkgdir}/usr/share/dbus-1/services/" -} diff --git a/extra/obexftp/PKGBUILD b/extra/obexftp/PKGBUILD deleted file mode 100644 index 43a9b8842..000000000 --- a/extra/obexftp/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 198348 2013-10-30 14:19:17Z allan $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> - -pkgname=obexftp -pkgver=0.24 -pkgrel=1 -pkgdesc="A tool for transfer files to/from any OBEX enabled device" -arch=('i686' 'x86_64' 'mips64el') -url="http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp" -license=('GPL') -depends=('openobex') -makedepends=('cmake' 'asciidoc' 'xmlto' 'fuse' 'swig' 'ruby' 'tk') -optdepends=('ruby: ruby bindings' - 'tk: TCL/Tk bindings') -options=('!makeflags' '!docs') -source=("http://downloads.sourceforge.net/openobex/${pkgname}-${pkgver}-Source.tar.gz") -md5sums=('31a50dbbd09c63cbb5399772aaff7936') - -build() { - cd "${srcdir}/" - - mkdir build - cd build - cmake ../${pkgname}-${pkgver}-Source \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DCMAKE_INSTALL_SBINDIR=bin \ - -DENABLE_PERL=YES \ - -DENABLE_PYTHON=YES \ - -DENABLE_RUBY=YES \ - -DENABLE_TCL=YES - make doc -} - -package() { - cd "${srcdir}/build" - - make DESTDIR="${pkgdir}" install -} diff --git a/extra/ocrad/PKGBUILD b/extra/ocrad/PKGBUILD deleted file mode 100644 index 9bf2bef38..000000000 --- a/extra/ocrad/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 190021 2013-07-12 22:00:10Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> - -pkgname=ocrad -pkgver=0.22 -pkgrel=1 -pkgdesc="An Optical Character Recognition program" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.gnu.org/software/ocrad/ocrad.html" -license=('GPL3') -depends=('gcc-libs' 'texinfo') -install=ocrad.install -source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.lz") -md5sums=('e84f0fb0dcd9b7b067201f9a3b89e06c') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr \ - CXXFLAGS="${CXXFLAGS}" \ - LDFLAGS="${LDFLAGS}" - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install install-man - rm $pkgdir/usr/share/info/dir - gzip $pkgdir/usr/share/info/* -} diff --git a/extra/ocrad/ocrad.install b/extra/ocrad/ocrad.install deleted file mode 100644 index eb599d04e..000000000 --- a/extra/ocrad/ocrad.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=/usr/share/info -filelist=(ocrad.info.gz) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} diff --git a/extra/octave/PKGBUILD b/extra/octave/PKGBUILD index b1ca44a0d..5fc6d0120 100644 --- a/extra/octave/PKGBUILD +++ b/extra/octave/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 196805 2013-10-19 13:44:27Z bpiotrowski $ +# $Id: PKGBUILD 202666 2013-12-23 21:05:04Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor : shining <shiningxc.at.gmail.com> # Contributor : cyberdune <cyberdune@gmail.com> pkgname=octave pkgver=3.6.4 -pkgrel=4 +pkgrel=5 pkgdesc="A high-level language, primarily intended for numerical computations." arch=('i686' 'x86_64' 'mips64el') url="http://www.octave.org" license=('GPL') -depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'fltk' 'suitesparse' 'arpack') -makedepends=('gcc-fortran' 'texlive-core') +depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'fltk' 'arpack' 'glu') +makedepends=('gcc-fortran' 'texlive-core' 'suitesparse') optdepends=('texinfo: for help-support in octave' 'gnuplot: alternative plotting') source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2{,.sig} @@ -22,16 +22,21 @@ sha1sums=('3cc9366b6dbbd336eaf90fe70ad16e63705d82c4' 'SKIP' '0608af9b7ccce8455f534d2fc4acf2f4c8f83a60') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" # https://savannah.gnu.org/bugs/?38746 patch -Np1 -i "${srcdir}/mex-gcc-4.8.patch" +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" autoreconf -vfi ./configure --prefix=/usr --libexecdir=/usr/lib \ --enable-shared --disable-static \ + --with-quantum-depth=32 \ --with-umfpack="-lumfpack -lsuitesparseconfig" # https://mailman.cae.wisc.edu/pipermail/help-octave/2012-September/053991.html LANG=C make diff --git a/extra/ode/PKGBUILD b/extra/ode/PKGBUILD deleted file mode 100644 index ed1abb91b..000000000 --- a/extra/ode/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 198349 2013-10-30 14:19:37Z allan $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Adam Griffiths <adam_griffithsAATTdart.net.au> - -pkgname=ode -pkgver=0.12 -pkgrel=4 -pkgdesc="An open source, high performance library for simulating rigid body dynamics" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.ode.org" -license=('LGPL' 'BSD') -depends=('gcc-libs' 'bash') -source=("http://downloads.sourceforge.net/sourceforge/opende/${pkgname}-${pkgver}.tar.bz2") -md5sums=('48fdd41fae1a7e7831feeded09826599') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr \ - --enable-shared \ - --enable-libccd \ - --enable-double-precision - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR=${pkgdir}/ install - - install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/ou/LICENSE-BSD.TXT \ - ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-BSD.TXT - install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/GIMPACT/GIMPACT-LICENSE-BSD.TXT \ - ${pkgdir}/usr/share/licenses/${pkgname}/GIMPACT-LICENSE-BSD.TXT - install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/libccd/BSD-LICENSE \ - ${pkgdir}/usr/share/licenses/${pkgname}/BSD-LICENSE -} diff --git a/extra/ogmtools/PKGBUILD b/extra/ogmtools/PKGBUILD deleted file mode 100644 index 447447cb8..000000000 --- a/extra/ogmtools/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 137699 2011-09-10 12:46:29Z pierre $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> - -pkgname=ogmtools -pkgver=1.5 -pkgrel=4.1 -pkgdesc="Information, extraction or creation for OGG media streams" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.bunkus.org/videotools/ogmtools" -license=('GPL') -depends=('libvorbis' 'libdvdread' 'gcc-libs') -source=("http://www.bunkus.org/videotools/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('02d356e3d21d53b1d9715bab223d8996') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr \ - --mandir=/usr/share/man - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/extra/opal/PKGBUILD b/extra/opal/PKGBUILD index c990b95df..49d97bb11 100644 --- a/extra/opal/PKGBUILD +++ b/extra/opal/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 197009 2013-10-21 12:41:49Z jgc $ +# $Id: PKGBUILD 199861 2013-11-17 12:53:54Z bpiotrowski $ # Maintainer: Jan de Groot <jan@archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=opal pkgver=3.10.11 -pkgrel=1 +pkgrel=2 pkgdesc="Open Phone Abstraction Library" arch=(i686 x86_64 'mips64el') url="http://www.opalvoip.org" diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index ac07b0dcf..5ffcc6cc4 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 196269 2013-10-10 11:00:54Z schiv $ +# $Id: PKGBUILD 199540 2013-11-15 08:46:07Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgbase=opencv pkgname=('opencv' 'opencv-samples') _realname=OpenCV -pkgver=2.4.6.1 -pkgrel=3 +pkgver=2.4.7 +pkgrel=2 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64' 'mips64el') license=('BSD') url="http://opencv.org/" -depends=('jasper' 'gstreamer0.10-base' - 'xine-lib' 'libdc1394' 'openexr' 'gtkglext') -makedepends=('cmake' 'python2-numpy' 'mesa' - 'eigen2') +depends=('gstreamer0.10-base' 'intel-tbb' 'openexr' + 'xine-lib' 'libdc1394' 'gtkglext') +makedepends=('cmake' 'python2-numpy' 'mesa' 'eigen2') optdepends=('opencv-samples' 'eigen2' + 'libcl: For coding with OpenCL' 'python2-numpy: Python 2.x interface') if [ "$CARCH" != "mips64el" ]; then depends+=('intel-tbb' 'libcl') @@ -24,12 +24,10 @@ if [ "$CARCH" != "mips64el" ]; then fi source=("http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.tar.gz" 'pkgconfig.patch' - 'fsh.patch' - 'cldetect.patch') -md5sums=('d756bfa460891697571d5c90050e1cfe' - 'cb916260b5ec594fe7a0cc2e54fc569f' - '35256e3ccace373feba8131d1540a0de' - '0dd6572405adc2387ded4c95be0f189c') + 'fsh.patch') +md5sums=('33a12a8bba6e6dc32c97298c99b083b2' + 'c7cea48ed7d4f729ebdb9673bac41bd3' + 'c597598d142dd34d0eb4af7d6e9779d8') if [ "$CARCH" != "mips64el" ]; then _cmakeopts=('-D WITH_OPENCL=ON' @@ -62,18 +60,14 @@ _cmakeopts+=( prepare() { cd "$srcdir/$pkgname-$pkgver" - # fix missing opencl module - # see https://bugs.archlinux.org/task/36076 - # and http://code.opencv.org/issues/3140 - patch -Np1 -i "$srcdir/cldetect.patch" - - # fix pkg-config mess + # hack-fix pkg-config mess # see https://bugs.archlinux.org/task/32430 # and http://code.opencv.org/issues/1925 patch -Np1 -i "$srcdir/pkgconfig.patch" - # fix another upstream mess that they won't fix + # hack-fix folder naming inconsistency that they won't fix # see http://code.opencv.org/issues/2512 + # and https://bugs.archlinux.org/task/32342 patch -Np1 -i "$srcdir/fsh.patch" # no longer including docs, see https://bugs.archlinux.org/task/34185 @@ -90,6 +84,8 @@ build() { } package_opencv() { + options=('staticlibs') + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install @@ -101,14 +97,17 @@ package_opencv() { cd "$pkgdir/usr/share" # separate samples package; also be -R friendly - [[ -d $pkgname/samples ]] && mv $pkgname/samples "$srcdir/opencv-samples" + if [[ -d $pkgname/samples ]]; then + mv $pkgname/samples "$srcdir/opencv-samples" + elif [[ -d $_realname ]]; then + warn "Directory naming issue; samples package may not be built!" + fi } package_opencv-samples() { pkgdesc+=" (samples)" - depends=('bash') + depends=("opencv=$pkgver") # sample codes change with lib/API unset optdepends - unset options mkdir -p "$pkgdir/usr/share/opencv" cp -r "$srcdir/opencv-samples" "$pkgdir/usr/share/opencv/samples" diff --git a/extra/opencv/cldetect.patch b/extra/opencv/cldetect.patch deleted file mode 100644 index 6dbe1608c..000000000 --- a/extra/opencv/cldetect.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -ur opencv-2.4.6.orig/cmake/OpenCVDetectOpenCL.cmake opencv-2.4.6/cmake/OpenCVDetectOpenCL.cmake ---- opencv-2.4.6.orig/cmake/OpenCVDetectOpenCL.cmake 2013-07-11 18:57:27.363199736 +0000 -+++ opencv-2.4.6/cmake/OpenCVDetectOpenCL.cmake 2013-07-11 19:04:00.577069207 +0000 -@@ -17,8 +17,7 @@ - NAMES OpenCL/cl.h CL/cl.h - HINTS ${OPENCL_ROOT_DIR} - PATH_SUFFIXES include include/nvidia-current -- DOC "OpenCL include directory" -- NO_DEFAULT_PATH) -+ DOC "OpenCL include directory") - - if (X86_64) - set(OPENCL_POSSIBLE_LIB_SUFFIXES lib/Win64 lib/x86_64 lib/x64) -@@ -30,8 +29,7 @@ - NAMES OpenCL - HINTS ${OPENCL_ROOT_DIR} - PATH_SUFFIXES ${OPENCL_POSSIBLE_LIB_SUFFIXES} -- DOC "OpenCL library" -- NO_DEFAULT_PATH) -+ DOC "OpenCL library") - - mark_as_advanced(OPENCL_INCLUDE_DIR OPENCL_LIBRARY) - include(FindPackageHandleStandardArgs) diff --git a/extra/opencv/fsh.patch b/extra/opencv/fsh.patch index fc6fb4b2a..650d46a70 100644 --- a/extra/opencv/fsh.patch +++ b/extra/opencv/fsh.patch @@ -1,7 +1,7 @@ -diff -Nbaur OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake OpenCV-2.4.3/cmake/OpenCVGenPkgconfig.cmake ---- OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake 2012-11-05 18:42:32.460958392 +0000 -+++ OpenCV-2.4.3/cmake/OpenCVGenPkgconfig.cmake 2012-11-05 18:52:43.766689315 +0000 -@@ -47,7 +47,7 @@ +diff -baur opencv-2.4.7.orig/cmake/OpenCVGenPkgconfig.cmake opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake +--- opencv-2.4.7.orig/cmake/OpenCVGenPkgconfig.cmake 2013-11-12 20:31:27.253763202 +0000 ++++ opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake 2013-11-12 20:31:54.923577113 +0000 +@@ -46,7 +46,7 @@ #need better solution.... if(libpath MATCHES "3rdparty") @@ -10,10 +10,22 @@ diff -Nbaur OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake OpenCV-2.4.3/cmake/ else() set(installDir "${OPENCV_LIB_INSTALL_PATH}") endif() -diff -Nbaur OpenCV-2.4.3.orig/CMakeLists.txt OpenCV-2.4.3/CMakeLists.txt ---- OpenCV-2.4.3.orig/CMakeLists.txt 2012-11-05 18:42:32.700956757 +0000 -+++ OpenCV-2.4.3/CMakeLists.txt 2012-11-05 18:55:42.358787848 +0000 -@@ -221,9 +221,9 @@ +diff -baur opencv-2.4.7.orig/cmake/OpenCVModule.cmake opencv-2.4.7/cmake/OpenCVModule.cmake +--- opencv-2.4.7.orig/cmake/OpenCVModule.cmake 2013-11-12 20:31:27.253763202 +0000 ++++ opencv-2.4.7/cmake/OpenCVModule.cmake 2013-11-12 20:35:37.805415871 +0000 +@@ -807,7 +807,7 @@ + if(INSTALL_C_EXAMPLES AND NOT WIN32 AND EXISTS "${samples_path}") + file(GLOB sample_files "${samples_path}/*") + install(FILES ${sample_files} +- DESTINATION share/OpenCV/samples/${module_id} ++ DESTINATION share/opencv/samples/${module_id} + PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) + endif() + endfunction() +diff -baur opencv-2.4.7.orig/CMakeLists.txt opencv-2.4.7/CMakeLists.txt +--- opencv-2.4.7.orig/CMakeLists.txt 2013-11-12 20:31:27.437095684 +0000 ++++ opencv-2.4.7/CMakeLists.txt 2013-11-12 20:40:21.160171499 +0000 +@@ -243,9 +243,9 @@ if(ANDROID OR WIN32) set(OPENCV_DOC_INSTALL_PATH doc) elseif(INSTALL_TO_MANGLED_PATHS) @@ -24,16 +36,17 @@ diff -Nbaur OpenCV-2.4.3.orig/CMakeLists.txt OpenCV-2.4.3/CMakeLists.txt + set(OPENCV_DOC_INSTALL_PATH share/doc/opencv) endif() - if(ANDROID) -@@ -237,14 +237,14 @@ - set(LIBRARY_OUTPUT_PATH "${OpenCV_BINARY_DIR}/lib") - set(3P_LIBRARY_OUTPUT_PATH "${OpenCV_BINARY_DIR}/3rdparty/lib${LIB_SUFFIX}") - set(OPENCV_LIB_INSTALL_PATH lib${LIB_SUFFIX}) -- set(OPENCV_3P_LIB_INSTALL_PATH share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH}) -+ set(OPENCV_3P_LIB_INSTALL_PATH share/opencv/3rdparty/${OPENCV_LIB_INSTALL_PATH}) - set(OPENCV_INCLUDE_INSTALL_PATH include) + if(WIN32) +@@ -282,7 +282,7 @@ + set(OPENCV_3P_LIB_INSTALL_PATH "${OpenCV_INSTALL_BINARIES_PREFIX}staticlib${LIB_SUFFIX}") + else() + set(OPENCV_LIB_INSTALL_PATH lib${LIB_SUFFIX}) +- set(OPENCV_3P_LIB_INSTALL_PATH share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH}) ++ set(OPENCV_3P_LIB_INSTALL_PATH share/opencv/3rdparty/${OPENCV_LIB_INSTALL_PATH}) + endif() + set(OPENCV_INCLUDE_INSTALL_PATH "include") - math(EXPR SIZEOF_VOID_P_BITS "8 * ${CMAKE_SIZEOF_VOID_P}") +@@ -290,7 +290,7 @@ if(LIB_SUFFIX AND NOT SIZEOF_VOID_P_BITS EQUAL LIB_SUFFIX) set(OPENCV_CONFIG_INSTALL_PATH lib${LIB_SUFFIX}/cmake/opencv) else() @@ -42,9 +55,9 @@ diff -Nbaur OpenCV-2.4.3.orig/CMakeLists.txt OpenCV-2.4.3/CMakeLists.txt endif() endif() -diff -Nbaur OpenCV-2.4.3.orig/data/CMakeLists.txt OpenCV-2.4.3/data/CMakeLists.txt ---- OpenCV-2.4.3.orig/data/CMakeLists.txt 2012-11-05 18:42:32.460958392 +0000 -+++ OpenCV-2.4.3/data/CMakeLists.txt 2012-11-05 18:52:43.816688977 +0000 +diff -baur opencv-2.4.7.orig/data/CMakeLists.txt opencv-2.4.7/data/CMakeLists.txt +--- opencv-2.4.7.orig/data/CMakeLists.txt 2013-11-12 20:31:27.280430213 +0000 ++++ opencv-2.4.7/data/CMakeLists.txt 2013-11-12 20:31:54.923577113 +0000 @@ -5,6 +5,6 @@ install(FILES ${HAAR_CASCADES} DESTINATION sdk/etc/haarcascades COMPONENT main) install(FILES ${LBP_CASCADES} DESTINATION sdk/etc/lbpcascades COMPONENT main) @@ -54,10 +67,22 @@ diff -Nbaur OpenCV-2.4.3.orig/data/CMakeLists.txt OpenCV-2.4.3/data/CMakeLists.t + install(FILES ${HAAR_CASCADES} DESTINATION share/opencv/haarcascades COMPONENT main) + install(FILES ${LBP_CASCADES} DESTINATION share/opencv/lbpcascades COMPONENT main) endif() -diff -Nbaur OpenCV-2.4.3.orig/samples/c/CMakeLists.txt OpenCV-2.4.3/samples/c/CMakeLists.txt ---- OpenCV-2.4.3.orig/samples/c/CMakeLists.txt 2012-11-05 18:42:32.697623446 +0000 -+++ OpenCV-2.4.3/samples/c/CMakeLists.txt 2012-11-05 18:52:43.826688906 +0000 -@@ -54,7 +54,7 @@ +diff -baur opencv-2.4.7.orig/modules/java/CMakeLists.txt opencv-2.4.7/modules/java/CMakeLists.txt +--- opencv-2.4.7.orig/modules/java/CMakeLists.txt 2013-11-12 20:31:27.360429532 +0000 ++++ opencv-2.4.7/modules/java/CMakeLists.txt 2013-11-12 20:36:41.984985273 +0000 +@@ -279,7 +279,7 @@ + if(WIN32) + set(JAR_INSTALL_DIR java) + else(WIN32) +- set(JAR_INSTALL_DIR share/OpenCV/java) ++ set(JAR_INSTALL_DIR share/opencv/java) + endif(WIN32) + install(FILES ${JAR_FILE} DESTINATION ${JAR_INSTALL_DIR} COMPONENT main) + endif(ANDROID) +diff -baur opencv-2.4.7.orig/samples/c/CMakeLists.txt opencv-2.4.7/samples/c/CMakeLists.txt +--- opencv-2.4.7.orig/samples/c/CMakeLists.txt 2013-11-12 20:31:27.433762373 +0000 ++++ opencv-2.4.7/samples/c/CMakeLists.txt 2013-11-12 20:31:54.923577113 +0000 +@@ -54,6 +54,6 @@ if (INSTALL_C_EXAMPLES AND NOT WIN32) file(GLOB C_SAMPLES *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd ) install(FILES ${C_SAMPLES} @@ -65,11 +90,10 @@ diff -Nbaur OpenCV-2.4.3.orig/samples/c/CMakeLists.txt OpenCV-2.4.3/samples/c/CM + DESTINATION share/opencv/samples/c PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) endif () - -diff -Nbaur OpenCV-2.4.3.orig/samples/cpp/CMakeLists.txt OpenCV-2.4.3/samples/cpp/CMakeLists.txt ---- OpenCV-2.4.3.orig/samples/cpp/CMakeLists.txt 2012-11-05 18:42:32.677623583 +0000 -+++ OpenCV-2.4.3/samples/cpp/CMakeLists.txt 2012-11-05 18:52:43.823355598 +0000 -@@ -64,7 +64,7 @@ +diff -baur opencv-2.4.7.orig/samples/cpp/CMakeLists.txt opencv-2.4.7/samples/cpp/CMakeLists.txt +--- opencv-2.4.7.orig/samples/cpp/CMakeLists.txt 2013-11-12 20:31:27.417095818 +0000 ++++ opencv-2.4.7/samples/cpp/CMakeLists.txt 2013-11-12 20:31:55.110242982 +0000 +@@ -83,6 +83,6 @@ if (INSTALL_C_EXAMPLES AND NOT WIN32) file(GLOB C_SAMPLES *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd ) install(FILES ${C_SAMPLES} @@ -77,11 +101,10 @@ diff -Nbaur OpenCV-2.4.3.orig/samples/cpp/CMakeLists.txt OpenCV-2.4.3/samples/cp + DESTINATION share/opencv/samples/cpp PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) endif() - -diff -Nbaur OpenCV-2.4.3.orig/samples/gpu/CMakeLists.txt OpenCV-2.4.3/samples/gpu/CMakeLists.txt ---- OpenCV-2.4.3.orig/samples/gpu/CMakeLists.txt 2012-11-05 18:42:32.670956962 +0000 -+++ OpenCV-2.4.3/samples/gpu/CMakeLists.txt 2012-11-05 18:52:43.820022288 +0000 -@@ -64,7 +64,7 @@ +diff -baur opencv-2.4.7.orig/samples/gpu/CMakeLists.txt opencv-2.4.7/samples/gpu/CMakeLists.txt +--- opencv-2.4.7.orig/samples/gpu/CMakeLists.txt 2013-11-12 20:31:27.407095885 +0000 ++++ opencv-2.4.7/samples/gpu/CMakeLists.txt 2013-11-12 20:31:55.110242982 +0000 +@@ -83,6 +83,6 @@ if (INSTALL_C_EXAMPLES AND NOT WIN32) file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd ) install(FILES ${install_list} @@ -89,11 +112,10 @@ diff -Nbaur OpenCV-2.4.3.orig/samples/gpu/CMakeLists.txt OpenCV-2.4.3/samples/gp + DESTINATION share/opencv/samples/${project} PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) endif() - -diff -Nbaur OpenCV-2.4.3.orig/samples/gpu/performance/CMakeLists.txt OpenCV-2.4.3/samples/gpu/performance/CMakeLists.txt ---- OpenCV-2.4.3.orig/samples/gpu/performance/CMakeLists.txt 2012-11-05 18:42:32.674290272 +0000 -+++ OpenCV-2.4.3/samples/gpu/performance/CMakeLists.txt 2012-11-05 18:52:43.823355598 +0000 -@@ -21,6 +21,6 @@ +diff -baur opencv-2.4.7.orig/samples/gpu/performance/CMakeLists.txt opencv-2.4.7/samples/gpu/performance/CMakeLists.txt +--- opencv-2.4.7.orig/samples/gpu/performance/CMakeLists.txt 2013-11-12 20:31:27.407095885 +0000 ++++ opencv-2.4.7/samples/gpu/performance/CMakeLists.txt 2013-11-12 20:31:55.110242982 +0000 +@@ -29,6 +29,6 @@ if(INSTALL_C_EXAMPLES AND NOT WIN32) file(GLOB GPU_FILES performance/*.cpp performance/*.h) install(FILES ${GPU_FILES} @@ -101,3 +123,14 @@ diff -Nbaur OpenCV-2.4.3.orig/samples/gpu/performance/CMakeLists.txt OpenCV-2.4. + DESTINATION share/opencv/samples/gpu/performance PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) endif() +diff -baur opencv-2.4.7.orig/samples/ocl/CMakeLists.txt opencv-2.4.7/samples/ocl/CMakeLists.txt +--- opencv-2.4.7.orig/samples/ocl/CMakeLists.txt 2013-11-12 20:31:27.397095952 +0000 ++++ opencv-2.4.7/samples/ocl/CMakeLists.txt 2013-11-12 20:39:29.227200043 +0000 +@@ -54,6 +54,6 @@ + if (INSTALL_C_EXAMPLES AND NOT WIN32) + file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd ) + install(FILES ${install_list} +- DESTINATION share/OpenCV/samples/${project} ++ DESTINATION share/opencv/samples/${project} + PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) + endif() diff --git a/extra/opencv/pkgconfig.patch b/extra/opencv/pkgconfig.patch index 84d268e61..5626eb6e0 100644 --- a/extra/opencv/pkgconfig.patch +++ b/extra/opencv/pkgconfig.patch @@ -1,6 +1,6 @@ -diff -Nbaur OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake OpenCV-2.4.3/cmake/OpenCVGenPkgconfig.cmake ---- OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake 2012-11-04 08:40:14.243505926 +0000 -+++ OpenCV-2.4.3/cmake/OpenCVGenPkgconfig.cmake 2012-11-04 08:40:42.286649120 +0000 +diff -baur opencv-2.4.7.orig/cmake/OpenCVGenPkgconfig.cmake opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake +--- opencv-2.4.7.orig/cmake/OpenCVGenPkgconfig.cmake 2013-11-12 20:31:27.253763202 +0000 ++++ opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake 2013-11-12 20:41:48.936262732 +0000 @@ -10,7 +10,7 @@ # ------------------------------------------------------------------------------------------- set(prefix "${CMAKE_INSTALL_PREFIX}") @@ -8,9 +8,9 @@ diff -Nbaur OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake OpenCV-2.4.3/cmake/ -set(libdir "") #TODO: need link paths for OpenCV_EXTRA_COMPONENTS +set(libdir "\${prefix}/${OPENCV_LIB_INSTALL_PATH}") set(includedir "\${prefix}/${OPENCV_INCLUDE_INSTALL_PATH}") - set(VERSION ${OPENCV_VERSION}) -@@ -36,10 +36,11 @@ + if(CMAKE_BUILD_TYPE MATCHES "Release") +@@ -35,10 +35,11 @@ ocv_list_reverse(OpenCV_EXTRA_COMPONENTS) #build the list of components @@ -23,7 +23,7 @@ diff -Nbaur OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake OpenCV-2.4.3/cmake/ if(INSTALL_TO_MANGLED_PATHS) set(libname "${libname}.${OPENCV_VERSION}") -@@ -52,7 +53,8 @@ +@@ -51,7 +52,8 @@ set(installDir "${OPENCV_LIB_INSTALL_PATH}") endif() diff --git a/extra/openobex/PKGBUILD b/extra/openobex/PKGBUILD index 5d153c9bc..9d2c6fd98 100644 --- a/extra/openobex/PKGBUILD +++ b/extra/openobex/PKGBUILD @@ -1,27 +1,28 @@ -# $Id: PKGBUILD 187866 2013-06-07 09:25:02Z tomegun $ +# $Id: PKGBUILD 199321 2013-11-10 20:21:49Z eric $ # Maintainer: # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=openobex -pkgver=1.7 -pkgrel=6 +pkgver=1.7.1 +pkgrel=1 pkgdesc="Implementation of the OBject EXchange (OBEX) protocol" url="http://dev.zuckschwerdt.org/openobex/" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL') depends=('libusbx' 'bluez-libs') -makedepends=('cmake') -options=('!makeflags') +makedepends=('cmake' 'libxslt') +options=('staticlibs' '!makeflags') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}-Source.tar.gz) -md5sums=('11031f6f0b876bb6259bd27106491528') +md5sums=('3181bfed9cb7db591605391068cb0085') prepare() { - mkdir build + sed -i 's|MODE="660", GROUP="plugdev"|TAG+="uaccess"|' ${pkgname}-${pkgver}-Source/udev/openobex.rules.in } build() { + mkdir build cd build cmake ../${pkgname}-${pkgver}-Source \ -DCMAKE_BUILD_TYPE=Release \ @@ -37,9 +38,4 @@ package() { make DESTDIR="${pkgdir}" install cp ../${pkgname}-${pkgver}-Source/apps/lib/*.h "${pkgdir}/usr/include/openobex/" install -m644 apps/lib/libopenobex-apps-common.a "${pkgdir}/usr/lib/libopenobex-apps-common.a" - - # usrmove - cd "$pkgdir" - mv lib/udev usr/lib/ - rmdir lib } diff --git a/extra/opus/PKGBUILD b/extra/opus/PKGBUILD index 66dd97e39..91068b1ad 100644 --- a/extra/opus/PKGBUILD +++ b/extra/opus/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 198357 2013-10-30 14:22:43Z allan $ +# $Id: PKGBUILD 200804 2013-12-05 18:41:22Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: DrZaius <lou[at]fakeoutdoorsman[dot]com> # Contributor: pumbur pkgname=opus -pkgver=1.0.3 -pkgrel=2 +pkgver=1.1 +pkgrel=1 pkgdesc="Codec designed for interactive speech and audio transmission over the Internet" arch=(i686 x86_64 mips64el) url="http://www.opus-codec.org/" license=(BSD) depends=(glibc) source=(http://downloads.us.xiph.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('86eedbd3c5a0171d2437850435e6edff') +md5sums=('c5a8cf7c0b066759542bc4ca46817ac6') build() { cd $pkgname-$pkgver diff --git a/extra/orage/PKGBUILD b/extra/orage/PKGBUILD index 3934c60a3..f62ad6189 100644 --- a/extra/orage/PKGBUILD +++ b/extra/orage/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 198358 2013-10-30 14:23:04Z allan $ +# $Id: PKGBUILD 201376 2013-12-10 01:11:45Z eric $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Tobias Kieslich <tobias (at) archlinux.org> pkgname=orage -pkgver=4.8.4 -pkgrel=2 +pkgver=4.10.0 +pkgrel=1 pkgdesc="A simple calendar application with reminders for Xfce" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') -url="http://www.xfce.org/projects/orage/" +url="http://www.xfce.org/projects/" groups=('xfce4-goodies') -depends=('xfce4-panel' 'libical' 'popt' 'libnotify>=0.7.1' 'hicolor-icon-theme' 'desktop-file-utils') -makedepends=('intltool' 'xfce4-dev-tools' 'popt') +depends=('xfce4-panel' 'libical' 'popt' 'libnotify') +makedepends=('intltool') replaces=('xfcalendar') install=${pkgname}.install source=(http://archive.xfce.org/src/apps/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('8b9facb0393385e4d639dd6a886c216729672958') +sha1sums=('1d19e097958b710005789973d385ca13338b26f9') build() { cd ${pkgname}-${pkgver} @@ -24,7 +24,6 @@ build() { --libexecdir=/usr/lib \ --localstatedir=/var \ --enable-libical \ - --disable-static \ --disable-debug make } diff --git a/extra/oxygen-gtk2/PKGBUILD b/extra/oxygen-gtk2/PKGBUILD index f7d334747..731189fda 100644 --- a/extra/oxygen-gtk2/PKGBUILD +++ b/extra/oxygen-gtk2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 193727 2013-08-29 13:10:55Z andrea $ +# $Id: PKGBUILD 201423 2013-12-11 13:48:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: birdflesh <antkoul at gmail dot com> pkgname=oxygen-gtk2 -pkgver=1.4.0 +pkgver=1.4.1 pkgrel=1 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK2" arch=('i686' 'x86_64' 'mips64el') @@ -14,10 +14,13 @@ conflicts=('oxygen-gtk') replaces=('oxygen-gtk') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('ccc9e468a5ea04159ca2040ee3f434e1') +md5sums=('27bb5826d936fe2bddab35057739908f') -build() { +prepare() { mkdir build +} + +build() { cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/extra/oxygen-gtk3/PKGBUILD b/extra/oxygen-gtk3/PKGBUILD index 63609d242..1d99341f8 100644 --- a/extra/oxygen-gtk3/PKGBUILD +++ b/extra/oxygen-gtk3/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193729 2013-08-29 13:11:38Z andrea $ +# $Id: PKGBUILD 201533 2013-12-14 07:15:21Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=oxygen-gtk3 -pkgver=1.2.0 +pkgver=1.3.1 pkgrel=1 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK3" arch=('i686' 'x86_64' 'mips64el') @@ -11,10 +11,13 @@ license=('LGPL') depends=('gtk3') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('c89352459fa41bd35e64072e6bc89593') +md5sums=('a8ca81ea29a93c5859f179266f07c66e') -build() { +prepare() { mkdir build +} + +build() { cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/extra/pango/PKGBUILD b/extra/pango/PKGBUILD index 269ed6e70..dad4b9de6 100644 --- a/extra/pango/PKGBUILD +++ b/extra/pango/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198364 2013-10-30 14:25:12Z allan $ +# $Id: PKGBUILD 199375 2013-11-11 18:06:12Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=pango -pkgver=1.36.0 +pkgver=1.36.1 pkgrel=1 pkgdesc="A library for layout and rendering of text" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ makedepends=('harfbuzz' 'fontconfig' 'cairo' 'libxft' 'libthai' 'gobject-introsp install=pango.install source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz) url="http://www.pango.org/" -sha256sums=('bb41d1b26ee7450e5430a7d2765f38c51ebe72db9fce616a9ee52611b55906a0') +sha256sums=('42e4b51cdc99e6878a9ea2a5ef2b31b79c1033f8518726df738a3c54c90e59f8') build() { cd ${pkgname}-${pkgver} diff --git a/extra/parted/PKGBUILD b/extra/parted/PKGBUILD index 1bb21237c..9827d6612 100644 --- a/extra/parted/PKGBUILD +++ b/extra/parted/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198367 2013-10-30 14:26:16Z allan $ +# $Id: PKGBUILD 199967 2013-11-20 11:26:39Z allan $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=parted pkgver=3.1 -pkgrel=2 +pkgrel=3 pkgdesc="A program for creating, destroying, resizing, checking and copying partitions" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') diff --git a/extra/perl-dbd-mysql/PKGBUILD b/extra/perl-dbd-mysql/PKGBUILD index c753576ec..8528d032d 100644 --- a/extra/perl-dbd-mysql/PKGBUILD +++ b/extra/perl-dbd-mysql/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 197755 2013-10-29 18:05:53Z bpiotrowski $ +# $Id: PKGBUILD 199869 2013-11-17 12:58:57Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: kevin <kevin@archlinux.org> # Contributor: Eric Johnson <eric@coding-zone.com> pkgname=perl-dbd-mysql _realname=DBD-mysql -pkgver=4.024 +pkgver=4.025 pkgrel=1 -pkgdesc="Perl/CPAN DBD::mysql module for interacting with MySQL via DBD" +pkgdesc='Perl/CPAN DBD::mysql module for interacting with MySQL via DBD' arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" @@ -15,7 +15,7 @@ depends=('libmariadbclient' 'perl-dbi') makedepends=('mariadb') options=('!emptydirs') source=(http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/${_realname}-${pkgver}.tar.gz) -md5sums=('280922d577aa95bf3f9ae21bd75e08c4') +md5sums=('093ed74c3bd327d4e0d0bc70d1035ac3') build() { cd $_realname-$pkgver diff --git a/extra/perl-net-dns/PKGBUILD b/extra/perl-net-dns/PKGBUILD index acee27788..b9a5f6540 100644 --- a/extra/perl-net-dns/PKGBUILD +++ b/extra/perl-net-dns/PKGBUILD @@ -1,34 +1,32 @@ -# $Id: PKGBUILD 186412 2013-05-26 09:25:29Z bluewind $ +# $Id: PKGBUILD 201329 2013-12-09 00:20:22Z eric $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-net-dns -_realname=Net-DNS -pkgver=0.72 -pkgrel=2 +pkgver=0.73 +pkgrel=1 pkgdesc="Perl Module: Interface to the DNS resolver." arch=('i686' 'x86_64' 'mips64el') license=('PerlArtistic') -url="http://search.cpan.org/dist/${_realname}/" +url="http://search.cpan.org/dist/Net-DNS/" depends=('perl-digest-hmac' 'perl-net-ip' 'perl') +checkdepends=('perl-test-pod') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/N/NL/NLNETLABS/${_realname}-$pkgver.tar.gz) -md5sums=('393e48ec6f28abe5ed30204276e02775') +source=(http://www.cpan.org/authors/id/N/NL/NLNETLABS/Net-DNS-$pkgver.tar.gz) +sha1sums=('03c02d04c4346e4a3f52e28885d870b6be96feda') build() { - cd "$srcdir/${_realname}-${pkgver}" - # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + cd Net-DNS-${pkgver} + perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$srcdir/${_realname}-${pkgver}" + cd Net-DNS-${pkgver} make test } package() { - cd "$srcdir/${_realname}-${pkgver}" - make install DESTDIR="${pkgdir}" + cd Net-DNS-${pkgver} + make DESTDIR="${pkgdir}" install } -# vim: ts=2 sw=2 et ft=sh diff --git a/extra/perl-sdl/PKGBUILD b/extra/perl-sdl/PKGBUILD index 1e38d7bb1..310c7fa1d 100644 --- a/extra/perl-sdl/PKGBUILD +++ b/extra/perl-sdl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 186414 2013-05-26 09:25:36Z bluewind $ +# $Id: PKGBUILD 199485 2013-11-13 12:47:51Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> pkgname=perl-sdl pkgver=2.540 -pkgrel=4 +pkgrel=5 pkgdesc="Simple DirectMedia Layer for Perl" arch=(i686 x86_64 'mips64el') license=(LGPL) diff --git a/extra/phonon-gstreamer/PKGBUILD b/extra/phonon-gstreamer/PKGBUILD index 715f54cd5..61259bbb6 100644 --- a/extra/phonon-gstreamer/PKGBUILD +++ b/extra/phonon-gstreamer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198817 2013-11-05 19:40:13Z andrea $ +# $Id: PKGBUILD 201235 2013-12-06 13:45:03Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=phonon-gstreamer -pkgver=4.7.0 +pkgver=4.7.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://phonon.kde.org/' @@ -12,8 +12,8 @@ depends=('gstreamer0.10-base-plugins') makedepends=('cmake' 'automoc4' 'phonon-qt4') provides=('phonon-backend') install="${pkgname}.install" -source=("http://download.kde.org/stable/phonon/phonon-backend-gstreamer/${pkgver}/src/phonon-backend-gstreamer-${pkgver}.tar.xz") -md5sums=('f00a1529d43158ce9faea516814562d3') +source=("http://download.kde.org/stable/phonon/phonon-backend-gstreamer/${pkgver}/phonon-backend-gstreamer-${pkgver}.tar.xz") +md5sums=('7c0cfab4ec0bbe1f201503e6ccc7290a') prepare() { mkdir build diff --git a/extra/phonon-vlc/PKGBUILD b/extra/phonon-vlc/PKGBUILD index bb52cf251..06f5807ce 100644 --- a/extra/phonon-vlc/PKGBUILD +++ b/extra/phonon-vlc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198816 2013-11-05 19:40:02Z andrea $ +# $Id: PKGBUILD 202703 2013-12-25 15:37:00Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=phonon-vlc -pkgver=0.7.0 -pkgrel=1 +pkgver=0.7.1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://phonon.kde.org/' pkgdesc="Phonon VLC backend" @@ -11,8 +11,8 @@ license=('LGPL') depends=('vlc') makedepends=('cmake' 'automoc4' 'phonon-qt4') provides=('phonon-backend') -source=("http://download.kde.org/stable/phonon/phonon-backend-vlc/${pkgver}/src/phonon-backend-vlc-${pkgver}.tar.xz") -md5sums=('1a172744eb0fd9cb0dbe0ea8b69e50f1') +source=("http://download.kde.org/stable/phonon/phonon-backend-vlc/${pkgver}/phonon-backend-vlc-${pkgver}.tar.xz") +md5sums=('3c41a3d141d40cedd2819676cdca5ea4') prepare() { mkdir build @@ -23,7 +23,8 @@ build() { cmake ../phonon-backend-vlc-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_SKIP_RPATH=ON + -DCMAKE_SKIP_RPATH=ON \ + -DPLUGIN_INSTALL_DIR=/usr/lib/kde4 make } diff --git a/extra/phonon/PKGBUILD b/extra/phonon/PKGBUILD new file mode 100644 index 000000000..98a064784 --- /dev/null +++ b/extra/phonon/PKGBUILD @@ -0,0 +1,69 @@ +# $Id: PKGBUILD 201231 2013-12-06 13:43:35Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgbase=phonon +pkgname=('phonon-qt4' 'phonon-qt5') +pkgver=4.7.1 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://phonon.kde.org/' +license=('LGPL') +makedepends=('cmake' 'automoc4' 'libpulse' 'libqzeitgeist' 'qt5-base' 'qt5-tools' 'qt5-quick1') +options=('!emptydirs') +source=("http://download.kde.org/stable/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.xz") +md5sums=('0935e1c00440a03e3032860030398665') + +prepare() { + mkdir build + mkdir build-qt5 +} + +build() { + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON \ + -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt4 \ + -DCMAKE_INSTALL_LIBDIR=lib + make + + cd ../build-qt5 + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON \ + -DPHONON_BUILD_PHONON4QT5=ON \ + -DCMAKE_INSTALL_LIBDIR=lib + make +} + +package_phonon-qt4(){ + pkgdesc="The multimedia framework for KDE4" + depends=('phonon-backend' 'libpulse' 'libqzeitgeist') + optdepends=('pulseaudio: PulseAudio support') + replaces=('phonon') + provides=('phonon') + conflicts=('phonon') + + cd build + make DESTDIR="${pkgdir}" install + + # Install headers into the Qt4 dir + install -d "${pkgdir}"/usr/include/qt4 + mv "${pkgdir}"/usr/include/{phonon,KDE} "${pkgdir}"/usr/include/qt4/ + + sed -i 's#includedir=/usr/include#includedir=/usr/include/qt4#' \ + "${pkgdir}/usr/lib/pkgconfig/phonon.pc" +} + +package_phonon-qt5(){ + pkgdesc="The multimedia framework for KF5" + depends=('phonon-backend' 'libpulse' 'qt5-base') + optdepends=('pulseaudio: PulseAudio support') + + cd build-qt5 + make DESTDIR="${pkgdir}" install +} diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index 9d23df37f..d03b72284 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 196746 2013-10-17 14:02:52Z andyrtr $ +# $Id: PKGBUILD 201484 2013-12-12 18:14:36Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -21,7 +21,7 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=5.5.5 +pkgver=5.5.7 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('PHP') @@ -33,10 +33,10 @@ makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx' source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.xz" 'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch' 'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles') -md5sums=('a4788118fdb0c4d8cef08be72025e983' - 'f9ee638591aaf1526767db7976d95847' +md5sums=('0c02437f661105221e99a301a5275a41' + '799cd5f91f5253f4b47ec4fd7fccf4f1' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' - '880afea327bb00c47082d22c507e6bfc' + '9f8263996836e27f5be1483e86ac2e33' 'e036c721e5ad927cd1613c7475a58b3a' 'cc2940f5312ba42e7aa1ddfab74b84c4' 'c60343df74f8e1afb13b084d5c0e47ed') @@ -46,6 +46,9 @@ prepare() { patch -p0 -i ${srcdir}/php.ini.patch patch -p0 -i ${srcdir}/php-fpm.conf.in.patch + # freetype2 headers moved + # see README at http://sourceforge.net/projects/freetype/files/freetype2/2.5.1/ + sed 's#/include/freetype2/freetype/freetype.h#/include/freetype2/freetype.h#g' -i configure } build() { diff --git a/extra/php/php-fpm.conf.in.patch b/extra/php/php-fpm.conf.in.patch index 317c2024f..4bcdb73d5 100644 --- a/extra/php/php-fpm.conf.in.patch +++ b/extra/php/php-fpm.conf.in.patch @@ -1,5 +1,5 @@ ---- sapi/fpm/php-fpm.conf.in 2013-06-19 22:03:18.000000000 +0200 -+++ sapi/fpm/php-fpm.conf.in 2013-06-20 17:03:03.728835784 +0200 +--- sapi/fpm/php-fpm.conf.in 2013-11-12 15:17:27.000000000 +0100 ++++ sapi/fpm/php-fpm.conf.in 2013-11-12 17:27:21.283279538 +0100 @@ -12,7 +12,7 @@ ; Relative path can also be used. They will be prefixed by: ; - the global prefix if it's been set (-p argument) @@ -27,7 +27,7 @@ +listen = /run/php-fpm/php-fpm.sock ; Set listen(2) backlog. - ; Default Value: 128 (-1 on FreeBSD and OpenBSD) + ; Default Value: 65535 (-1 on FreeBSD and OpenBSD) @@ -167,9 +168,9 @@ ; BSD-derived systems allow connections regardless of permissions. ; Default Values: user and group are set as the running user diff --git a/extra/php/php.ini.patch b/extra/php/php.ini.patch index b2e7d8f87..aa8100ecc 100644 --- a/extra/php/php.ini.patch +++ b/extra/php/php.ini.patch @@ -1,6 +1,6 @@ ---- php.ini-production 2013-08-15 22:42:04.000000000 +0200 -+++ php.ini-production 2013-08-16 08:03:36.178726858 +0200 -@@ -305,7 +305,7 @@ +--- php.ini-production 2013-11-12 15:17:27.000000000 +0100 ++++ php.ini-production 2013-11-12 17:28:12.715321014 +0100 +@@ -306,7 +306,7 @@ ; or per-virtualhost web server configuration file. This directive is ; *NOT* affected by whether Safe Mode is turned On or Off. ; http://php.net/open-basedir @@ -9,7 +9,7 @@ ; This directive allows you to disable certain functions for security reasons. ; It receives a comma-delimited list of function names. This directive is -@@ -702,7 +702,7 @@ +@@ -703,7 +703,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;; ; UNIX: "/path1:/path2" @@ -18,7 +18,7 @@ ; ; Windows: "\path1;\path2" ;include_path = ".;c:\php\includes" -@@ -725,7 +725,7 @@ +@@ -726,7 +726,7 @@ ; Directory in which the loadable extensions (modules) reside. ; http://php.net/extension-dir @@ -27,7 +27,7 @@ ; On windows: ; extension_dir = "ext" -@@ -863,50 +863,48 @@ +@@ -864,50 +864,48 @@ ; If you only provide the name of the extension, PHP will look for it in its ; default extension directory. ; diff --git a/extra/pigeonhole/PKGBUILD b/extra/pigeonhole/PKGBUILD index 569909f7f..0a6759911 100644 --- a/extra/pigeonhole/PKGBUILD +++ b/extra/pigeonhole/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 198784 2013-11-04 13:57:55Z andyrtr $ +# $Id: PKGBUILD 202250 2013-12-20 22:01:35Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributorr: Peter Lewis <plewis@aur.archlinux.org> @@ -7,12 +7,12 @@ # This must be built against the version of dovecot being used, # else mail delivery will fail. # Specify the version of dovecot to be used here: -_dcpkgver=2.2.7 +_dcpkgver=2.2.10 # Make sure to bump pkgrel if changing this. pkgname=pigeonhole pkgver=0.4.2 -pkgrel=2 +pkgrel=5 pkgdesc="Sieve implementation for Dovecot" arch=('i686' 'x86_64' 'mips64el') url="http://pigeonhole.dovecot.org/" diff --git a/extra/pixman/PKGBUILD b/extra/pixman/PKGBUILD index 4938f1525..73eb5758f 100644 --- a/extra/pixman/PKGBUILD +++ b/extra/pixman/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198371 2013-10-30 14:27:45Z allan $ +# $Id: PKGBUILD 199934 2013-11-19 19:10:39Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=pixman -pkgver=0.30.2 +pkgver=0.32.4 pkgrel=1 pkgdesc="The pixel-manipulation library for X and cairo" arch=(i686 x86_64 'mips64el') @@ -12,21 +12,21 @@ url="http://xorg.freedesktop.org" license=('custom') depends=('glibc') source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('4ea0832932fd5447a1d5768e0d5403b6c7c4dbaf') +sha1sums=('e2708db16595412e5aaf21a66b6f18b7223eb6c3') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver ./configure --prefix=/usr --disable-static make } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/extra/pkgfile/PKGBUILD b/extra/pkgfile/PKGBUILD index b64159482..4b1244e25 100644 --- a/extra/pkgfile/PKGBUILD +++ b/extra/pkgfile/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 194358 2013-09-14 14:21:19Z dreisner $ +# $Id: PKGBUILD 199801 2013-11-16 17:11:51Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=pkgfile -pkgver=10 +pkgver=11 pkgrel=1 pkgdesc="a pacman .files metadata explorer" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('libarchive' 'curl' 'pcre' 'pacman') conflicts=('pkgtools<24-2') source=("http://code.falconindy.com/archive/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}) install=pkgfile.install -md5sums=('262d7359423dedbf1f7323cc14d4a1e3' +md5sums=('55402bf0e7c8ad729601b9f20f8326aa' 'SKIP') options=(!strip) diff --git a/extra/plotutils/PKGBUILD b/extra/plotutils/PKGBUILD index a1665cd14..f80754a11 100644 --- a/extra/plotutils/PKGBUILD +++ b/extra/plotutils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198372 2013-10-30 14:28:06Z allan $ +# $Id: PKGBUILD 199834 2013-11-17 08:03:32Z allan $ # Maintainer: damir <damir@archlinux.org> # Packager: Maksim Sipos (maxsipos at gmail dot com) pkgname=plotutils pkgver=2.6 -pkgrel=5 +pkgrel=6 arch=('x86_64' 'i686' 'mips64el') pkgdesc="Set of utilities and libraries for plotting." url="http://directory.fsf.org/graphics/plotutils.html" diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index 7016eca39..eca8f6385 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198662 2013-11-01 16:03:58Z andyrtr $ +# $Id: PKGBUILD 200652 2013-12-01 09:50:16Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt4' 'poppler-qt5') -pkgver=0.24.3 +pkgver=0.24.4 pkgrel=1 arch=(i686 x86_64 mips64el) license=('GPL') @@ -13,7 +13,7 @@ url="http://poppler.freedesktop.org/" _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.xz http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2) -md5sums=('31299f26a998029c85295dbbf4c30beb' +md5sums=('2da22b966cf7a2f8da5bf021e68188ce' '9dc64c254a31e570507bdd4ad4ba629a') prepare() { @@ -40,14 +40,7 @@ build() { check() { cd "${srcdir}/${pkgbase}-${pkgver}" - # qt related errors are now reported: - # FAIL: check_password - # Makefile:1146: recipe for target 'test-suite.log' failed - # make[4]: *** [test-suite.log] Error 1 - # make[4]: Leaving directory '/build/poppler/src/poppler-0.24.3/qt4/tests' - # Makefile:1252: recipe for target 'check-TESTS' failed - - LANG=en_US.UTF8 make check || /bin/true + LANG=en_US.UTF8 make check } package_poppler() { diff --git a/extra/postgresql-old-upgrade/PKGBUILD b/extra/postgresql-old-upgrade/PKGBUILD index ca2ff9e0f..5be9ccaa9 100644 --- a/extra/postgresql-old-upgrade/PKGBUILD +++ b/extra/postgresql-old-upgrade/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 196303 2013-10-11 09:53:41Z dan $ +# $Id: PKGBUILD 201242 2013-12-06 15:41:36Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=postgresql-old-upgrade -pkgver=9.2.5 +pkgver=9.2.6 _majorver=${pkgver%.*} pkgrel=1 pkgdesc="PostgreSQL build for migrating between major versions with pg_upgrade" @@ -47,5 +47,5 @@ package() { rm -rf "${pkgdir}/opt/pgsql-${_majorver}/include/" } -md5sums=('e8438e0ed5e6371741be7697886e7340') -sha256sums=('22c1edfd6a404bb15fba655863e94f09a10716ded1910a8bc98ee85f413007a4') +md5sums=('3e68c0c7468c56f73060a88a377dbde8') +sha256sums=('4ba98053a66e5678af93dbc2956e8b04623f759e174f48940c41f4251cf0f886') diff --git a/extra/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD index beca39e8f..e5e74a440 100644 --- a/extra/postgresql/PKGBUILD +++ b/extra/postgresql/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 196301 2013-10-11 09:52:27Z dan $ +# $Id: PKGBUILD 201244 2013-12-06 16:00:26Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgbase=postgresql pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql') -pkgver=9.3.1 +pkgver=9.3.2 _majorver=${pkgver%.*} -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') url="http://www.postgresql.org/" license=('custom:PostgreSQL') @@ -14,14 +14,14 @@ source=(http://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar postgresql-run-socket.patch postgresql.pam postgresql.logrotate postgresql.service postgresql.tmpfiles.conf postgresql-check-db-dir) -md5sums=('c003d871f712d4d3895956b028a96e74' +md5sums=('8c905155e3e9f9367b4299a9acb41d2a' '75c579eed03ffb2312631f0b649175b4' '96f82c38f3f540b53f3e5144900acf17' 'd28e443f9f65a5712c52018b84e27137' '89b48774b0dae7c37fbb0e907c3c1db8' '1c5a1f99e8e93776c593c468e2612985' 'ea7f9f914900e60835d20cb95010e63c') -sha256sums=('8ea4a7a92a6f5a79359b02e683ace335c5eb45dffe7f8a681a9ce82470a8a0b8' +sha256sums=('700da51a71857e092f6af1c85fcd86b46d7d5cd2f2ba343cafb1f206c20232d7' '8538619cb8bea51078b605ad64fe22abd6050373c7ae3ad6595178da52f6a7d9' '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5' '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e' @@ -95,7 +95,7 @@ package_postgresql-libs() { package_postgresql-docs() { pkgdesc="HTML documentation for PostgreSQL" - options=(docs) + options=('docs') cd "${srcdir}/postgresql-${pkgver}" @@ -118,6 +118,7 @@ package_postgresql() { 'perl: for PL/Perl support' 'tcl: for PL/Tcl support' 'postgresql-old-upgrade: upgrade from previous major version using pg_upgrade') + options=('staticlibs') install=postgresql.install cd "${srcdir}/postgresql-${pkgver}" diff --git a/extra/postgresql/postgresql.install b/extra/postgresql/postgresql.install index 6dbbb6da8..699efe692 100644 --- a/extra/postgresql/postgresql.install +++ b/extra/postgresql/postgresql.install @@ -10,6 +10,10 @@ post_install() { passwd -l postgres >/dev/null fi systemd-tmpfiles --create postgresql.conf + if [ ! -d '/var/lib/postgres/data' ]; then + mkdir -p '/var/lib/postgres/data' + chown postgres:postgres '/var/lib/postgres/data' + fi } post_upgrade() { diff --git a/extra/psiconv/PKGBUILD b/extra/psiconv/PKGBUILD index de1a0606e..d1da89910 100644 --- a/extra/psiconv/PKGBUILD +++ b/extra/psiconv/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198377 2013-10-30 14:30:08Z allan $ +# $Id: PKGBUILD 199959 2013-11-20 11:08:50Z allan $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=psiconv pkgver=0.9.8 -pkgrel=13 +pkgrel=14 pkgdesc="Converts Psion 5(MX) files to more commonly used file formats" arch=('i686' 'x86_64' 'mips64el') url="http://software.frodo.looijaard.name/psiconv/" diff --git a/extra/pycrypto/PKGBUILD b/extra/pycrypto/PKGBUILD index 17f58e616..0bb6ad0d1 100644 --- a/extra/pycrypto/PKGBUILD +++ b/extra/pycrypto/PKGBUILD @@ -1,28 +1,31 @@ -# $Id: PKGBUILD 169001 2012-10-17 10:19:44Z allan $ +# $Id: PKGBUILD 199045 2013-11-07 22:03:21Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Kritoke <kritoke@gamebox.net> pkgbase=pycrypto pkgname=('python2-crypto' 'python-crypto') -pkgver=2.6 -pkgrel=3 +pkgver=2.6.1 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') makedepends=('python2' 'python') url="http://www.dlitz.net/software/pycrypto/" license=('custom') -source=("http://ftp.dlitz.net/pub/dlitz/crypto/${pkgbase}/${pkgbase}-${pkgver}.tar.gz") -sha256sums=('7293c9d7e8af2e44a82f86eb9c3b058880f4bcc884bf3ad6c8a34b64986edde8') +source=(http://ftp.dlitz.net/pub/dlitz/crypto/${pkgbase}/${pkgbase}-${pkgver}.tar.gz{,.asc}) +sha256sums=('f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c' + 'c2ab0516cc55321e6543ae75e2aa6f6e56e97432870f32a7799f3b89f467dc1b') -build() { - cd "${srcdir}" +prepare() { find ${pkgbase}-${pkgver}/LEGAL -type f -exec chmod 644 {} \; find ${pkgbase}-${pkgver}/LEGAL -type d -exec chmod 755 {} \; cp -r ${pkgbase}-${pkgver} ${pkgbase}-${pkgver}-py3 - cd "${srcdir}/${pkgbase}-${pkgver}" +} + +build() { + cd ${pkgbase}-${pkgver} python2 setup.py build - cd "${srcdir}/${pkgbase}-${pkgver}-py3" + cd ../${pkgbase}-${pkgver}-py3 python setup.py build } @@ -33,7 +36,7 @@ package_python2-crypto() { conflicts=('pycrypto') provides=("pycrypto=${pkgver}") - cd "${srcdir}/${pkgbase}-${pkgver}" + cd ${pkgbase}-${pkgver} python2 setup.py install --root="${pkgdir}" --optimize=1 install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/" @@ -44,9 +47,17 @@ package_python-crypto() { pkgdesc="Collection of cryptographic algorithms and protocols, implemented for use from Python 3." depends=('python') - cd "${srcdir}/${pkgbase}-${pkgver}-py3" + cd ${pkgbase}-${pkgver}-py3 python setup.py install --root="${pkgdir}" --optimize=1 install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/" cp -r LEGAL "${pkgdir}/usr/share/licenses/${pkgname}/" } + +check() { + cd ${pkgbase}-${pkgver} + python2 setup.py test + + cd ../${pkgbase}-${pkgver}-py3 + python setup.py test +} diff --git a/extra/pygobject/PKGBUILD b/extra/pygobject/PKGBUILD index 27bd1dd9c..f27a8031f 100644 --- a/extra/pygobject/PKGBUILD +++ b/extra/pygobject/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 198381 2013-10-30 14:31:36Z allan $ +# $Id: PKGBUILD 199350 2013-11-11 16:08:18Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=pygobject pkgname=(python-gobject python2-gobject pygobject-devel) -pkgver=3.10.1 +pkgver=3.10.2 pkgrel=1 arch=(i686 x86_64 mips64el) url="https://live.gnome.org/PyGObject" license=(LGPL) makedepends=(python python2 python-cairo python2-cairo gobject-introspection) source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver:0:4}/$pkgbase-$pkgver.tar.xz) -sha256sums=('87a4d3de4b8ea30a1290229f62092aeb0b77e6b21ca6588bb4704e05fd750837') +sha256sums=('75608f2c4052f0277508fc79debef026d9e84cb9261de2b922387c093d32c326') prepare() { mkdir build-py2 build-py3 devel diff --git a/extra/python-geoip/PKGBUILD b/extra/python-geoip/PKGBUILD index 7643e2d15..19a40a2c8 100644 --- a/extra/python-geoip/PKGBUILD +++ b/extra/python-geoip/PKGBUILD @@ -1,12 +1,11 @@ -# $Id: PKGBUILD 195467 2013-09-30 13:27:17Z jgc $ -# Maintainer: +# $Id: PKGBUILD 199014 2013-11-06 11:10:37Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> -# Contributor: Jan de Groot <jgc@archlinux.org> pkgname=('python2-geoip') pkgbase=python-geoip pkgver=1.2.8 -pkgrel=2 +pkgrel=3 pkgdesc="Python bindings for the GeoIP IP-to-country resolver library" arch=('i686' 'x86_64' 'mips64el') url="http://dev.maxmind.com/geoip/legacy/downloadable#Python-10" @@ -21,6 +20,8 @@ build() { } package_python2-geoip() { + conflicts=('python-geoip<1.2.8') + cd "GeoIP-Python-$pkgver" python2 setup.py install --root="$pkgdir" -O1 } diff --git a/extra/python-lxml/PKGBUILD b/extra/python-lxml/PKGBUILD index 70b51dbc5..496e84da1 100644 --- a/extra/python-lxml/PKGBUILD +++ b/extra/python-lxml/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 192296 2013-08-09 23:05:32Z angvp $ +# $Id: PKGBUILD 200744 2013-12-03 23:01:49Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> pkgbase=python-lxml pkgname=('python-lxml' 'python2-lxml' 'python-lxml-docs') -pkgver=3.2.3 +pkgver=3.2.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('BSD' 'custom') url="http://lxml.de/" makedepends=('python2' 'python' 'libxslt' 'python-cssselect' 'python2-cssselect') source=(http://pypi.python.org/packages/source/l/lxml/lxml-${pkgver}.tar.gz{,.asc}) -md5sums=('fef47bb4ac72ac38ce778518dac42236' +md5sums=('cc363499060f615aca1ec8dcc04df331' 'SKIP') # Temporary commented due a conflict with devtools and lxml diff --git a/extra/python-numpy/PKGBUILD b/extra/python-numpy/PKGBUILD index 27c1fe3e4..6cf982f31 100755 --- a/extra/python-numpy/PKGBUILD +++ b/extra/python-numpy/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 197708 2013-10-28 18:10:31Z jgc $ +# $Id: PKGBUILD 200823 2013-12-06 08:09:29Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> pkgbase=python-numpy pkgname=('python2-numpy' 'python-numpy') -pkgver=1.7.1 -pkgrel=3 +pkgver=1.8.0 +pkgrel=1 pkgdesc="Scientific tools for Python" arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -14,21 +14,28 @@ url="http://www.numpy.org/" makedepends=('lapack' 'python' 'python2' 'python-setuptools' 'python2-setuptools' 'gcc-fortran' 'python-nose' 'python2-nose') options=('staticlibs') source=(http://downloads.sourceforge.net/numpy/numpy-${pkgver}.tar.gz) -md5sums=('0ab72b3b83528a7ae79c6df9042d61c6') +md5sums=('2a4b0423a758706d592abb6721ec8dcd') -build() { - cd "${srcdir}" - cp -a numpy-${pkgver} numpy-py2-${pkgver} +prepare() { + cp -a numpy-$pkgver numpy-py2-$pkgver + cd numpy-py2-$pkgver + + sed -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ + -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ + -e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \ + -i $(find . -name '*.py') +} +build() { export ATLAS=None export LDFLAGS="$LDFLAGS -shared" echo "Building Python2" - cd "${srcdir}/numpy-py2-${pkgver}" + cd numpy-py2-$pkgver python2 setup.py config_fc --fcompiler=gnu95 build echo "Building Python3" - cd "${srcdir}/numpy-${pkgver}" + cd ../numpy-$pkgver python setup.py config_fc --fcompiler=gnu95 build } @@ -41,17 +48,12 @@ package_python2-numpy() { export ATLAS=None export LDFLAGS="$LDFLAGS -shared" - cd "${srcdir}/numpy-py2-${pkgver}" + cd numpy-py2-$pkgver python2 setup.py config_fc --fcompiler=gnu95 install --prefix=/usr --root="${pkgdir}" --optimize=1 install -m755 -d "${pkgdir}/usr/share/licenses/python2-numpy" install -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/python2-numpy/" - sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ - -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ - -e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \ - $(find ${pkgdir} -name '*.py') - install -m755 -d "${pkgdir}/usr/include/python${_pyver}" ln -sf /usr/lib/python${_pyver}/site-packages/numpy/core/include/numpy "${pkgdir}/usr/include/python${_pyver}/numpy" } @@ -69,7 +71,7 @@ package_python-numpy() { export ATLAS=None export LDFLAGS="$LDFLAGS -shared" - cd "${srcdir}/numpy-${pkgver}" + cd numpy-$pkgver python setup.py config_fc --fcompiler=gnu95 install --prefix=/usr --root="${pkgdir}" --optimize=1 install -m755 -d "${pkgdir}/usr/share/licenses/python-numpy" diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD index 8733625fe..93ef74a26 100644 --- a/extra/python/PKGBUILD +++ b/extra/python/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 193927 2013-09-06 07:53:42Z bpiotrowski $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# $Id: PKGBUILD 200587 2013-11-29 15:17:24Z angvp $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=python -pkgver=3.3.2 -pkgrel=2 +pkgver=3.3.3 +pkgrel=1 _pybasever=3.3 pkgdesc="Next generation of the python high-level scripting language" arch=('i686' 'x86_64' 'mips64el') @@ -15,15 +16,11 @@ depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib') makedepends=('tk>=8.6.0' 'sqlite' 'bluez-libs') [ "$CARCH" != "mips64el" ] && makedepends+=('valgrind') optdepends=('tk: for tkinter' 'sqlite') +options=('!makeflags') provides=('python3') replaces=('python3') -options=('!makeflags') -source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz - python-3.3.2-CVE-2013-2099.patch - python-3.3.2-CVE-2013-4238.patch) -sha1sums=('87009d0c156c6e1354dfec5c98c328cae93950ad' - 'bfe07759daacd4ffa0e682e65f0c9fb84f715c73' - 'c30297201ef5cd803b685085ca6defb7ca66d2cd') +source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz) +sha1sums=('af4e75a34bd538c79b9871227c2e7f56569ac107') prepare() { cd "${srcdir}/Python-${pkgver}" @@ -36,6 +33,10 @@ prepare() { rm -r Modules/expat rm -r Modules/zlib rm -r Modules/_ctypes/{darwin,libffi}* +} + +build() { + cd "${srcdir}/Python-${pkgver}" if [ "$CARCH" != "mips64el" ]; then extraconf=--with-valgrind @@ -43,13 +44,6 @@ prepare() { extraconf="" fi - patch -Np1 -i ../python-3.3.2-CVE-2013-2099.patch - patch -Np1 -i ../python-3.3.2-CVE-2013-4238.patch -} - -build() { - cd "${srcdir}/Python-${pkgver}" - ./configure --prefix=/usr \ --enable-shared \ --with-threads \ @@ -66,7 +60,7 @@ build() { check() { cd "${srcdir}/Python-${pkgver}" LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \ - "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_posixpath test_logging + "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_posixpath test_logging test_uuid } package() { diff --git a/extra/python/python-3.3.2-CVE-2013-2099.patch b/extra/python/python-3.3.2-CVE-2013-2099.patch deleted file mode 100644 index 888b43b00..000000000 --- a/extra/python/python-3.3.2-CVE-2013-2099.patch +++ /dev/null @@ -1,49 +0,0 @@ -# HG changeset patch -# User Antoine Pitrou <solipsis@pitrou.net> -# Date 1368892602 -7200 -# Node ID c627638753e2d25a98950585b259104a025937a9 -# Parent 9682241dc8fcb4b1aef083bd30860efa070c3d6d -Issue #17980: Fix possible abuse of ssl.match_hostname() for denial of service using certificates with many wildcards (CVE-2013-2099). - -diff --git a/Lib/ssl.py b/Lib/ssl.py ---- a/Lib/ssl.py -+++ b/Lib/ssl.py -@@ -129,9 +129,16 @@ class CertificateError(ValueError): - pass - - --def _dnsname_to_pat(dn): -+def _dnsname_to_pat(dn, max_wildcards=1): - pats = [] - for frag in dn.split(r'.'): -+ if frag.count('*') > max_wildcards: -+ # Issue #17980: avoid denials of service by refusing more -+ # than one wildcard per fragment. A survery of established -+ # policy among SSL implementations showed it to be a -+ # reasonable choice. -+ raise CertificateError( -+ "too many wildcards in certificate DNS name: " + repr(dn)) - if frag == '*': - # When '*' is a fragment by itself, it matches a non-empty dotless - # fragment. -diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py ---- a/Lib/test/test_ssl.py -+++ b/Lib/test/test_ssl.py -@@ -349,6 +349,17 @@ class BasicSocketTests(unittest.TestCase - self.assertRaises(ValueError, ssl.match_hostname, None, 'example.com') - self.assertRaises(ValueError, ssl.match_hostname, {}, 'example.com') - -+ # Issue #17980: avoid denials of service by refusing more than one -+ # wildcard per fragment. -+ cert = {'subject': ((('commonName', 'a*b.com'),),)} -+ ok(cert, 'axxb.com') -+ cert = {'subject': ((('commonName', 'a*b.co*'),),)} -+ ok(cert, 'axxb.com') -+ cert = {'subject': ((('commonName', 'a*b*.com'),),)} -+ with self.assertRaises(ssl.CertificateError) as cm: -+ ssl.match_hostname(cert, 'axxbxxc.com') -+ self.assertIn("too many wildcards", str(cm.exception)) -+ - def test_server_side(self): - # server_hostname doesn't work for server sockets - ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23) diff --git a/extra/python/python-3.3.2-CVE-2013-4238.patch b/extra/python/python-3.3.2-CVE-2013-4238.patch deleted file mode 100644 index 2de2ed47f..000000000 --- a/extra/python/python-3.3.2-CVE-2013-4238.patch +++ /dev/null @@ -1,255 +0,0 @@ - -# HG changeset patch -# User Christian Heimes <christian@cheimes.de> -# Date 1376693687 -7200 -# Node ID c9f073e593b037e8a29e386326859537691bcf62 -# Parent 3105b78d34346ea36c52a3b7e635954f4b444120 -Issue #18709: Fix CVE-2013-4238. The SSL module now handles NULL bytes -inside subjectAltName correctly. Formerly the module has used OpenSSL's -GENERAL_NAME_print() function to get the string represention of ASN.1 -strings for rfc822Name (email), dNSName (DNS) and -uniformResourceIdentifier (URI). - -diff --git a/Lib/test/nullbytecert.pem b/Lib/test/nullbytecert.pem -new file mode 100644 ---- /dev/null -+++ b/Lib/test/nullbytecert.pem -@@ -0,0 +1,90 @@ -+Certificate: -+ Data: -+ Version: 3 (0x2) -+ Serial Number: 0 (0x0) -+ Signature Algorithm: sha1WithRSAEncryption -+ Issuer: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/emailAddress=python-dev@python.org -+ Validity -+ Not Before: Aug 7 13:11:52 2013 GMT -+ Not After : Aug 7 13:12:52 2013 GMT -+ Subject: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/emailAddress=python-dev@python.org -+ Subject Public Key Info: -+ Public Key Algorithm: rsaEncryption -+ Public-Key: (2048 bit) -+ Modulus: -+ 00:b5:ea:ed:c9:fb:46:7d:6f:3b:76:80:dd:3a:f3: -+ 03:94:0b:a7:a6:db:ec:1d:df:ff:23:74:08:9d:97: -+ 16:3f:a3:a4:7b:3e:1b:0e:96:59:25:03:a7:26:e2: -+ 88:a9:cf:79:cd:f7:04:56:b0:ab:79:32:6e:59:c1: -+ 32:30:54:eb:58:a8:cb:91:f0:42:a5:64:27:cb:d4: -+ 56:31:88:52:ad:cf:bd:7f:f0:06:64:1f:cc:27:b8: -+ a3:8b:8c:f3:d8:29:1f:25:0b:f5:46:06:1b:ca:02: -+ 45:ad:7b:76:0a:9c:bf:bb:b9:ae:0d:16:ab:60:75: -+ ae:06:3e:9c:7c:31:dc:92:2f:29:1a:e0:4b:0c:91: -+ 90:6c:e9:37:c5:90:d7:2a:d7:97:15:a3:80:8f:5d: -+ 7b:49:8f:54:30:d4:97:2c:1c:5b:37:b5:ab:69:30: -+ 68:43:d3:33:78:4b:02:60:f5:3c:44:80:a1:8f:e7: -+ f0:0f:d1:5e:87:9e:46:cf:62:fc:f9:bf:0c:65:12: -+ f1:93:c8:35:79:3f:c8:ec:ec:47:f5:ef:be:44:d5: -+ ae:82:1e:2d:9a:9f:98:5a:67:65:e1:74:70:7c:cb: -+ d3:c2:ce:0e:45:49:27:dc:e3:2d:d4:fb:48:0e:2f: -+ 9e:77:b8:14:46:c0:c4:36:ca:02:ae:6a:91:8c:da: -+ 2f:85 -+ Exponent: 65537 (0x10001) -+ X509v3 extensions: -+ X509v3 Basic Constraints: critical -+ CA:FALSE -+ X509v3 Subject Key Identifier: -+ 88:5A:55:C0:52:FF:61:CD:52:A3:35:0F:EA:5A:9C:24:38:22:F7:5C -+ X509v3 Key Usage: -+ Digital Signature, Non Repudiation, Key Encipherment -+ X509v3 Subject Alternative Name: -+ ************************************************************* -+ WARNING: The values for DNS, email and URI are WRONG. OpenSSL -+ doesn't print the text after a NULL byte. -+ ************************************************************* -+ DNS:altnull.python.org, email:null@python.org, URI:http://null.python.org, IP Address:192.0.2.1, IP Address:2001:DB8:0:0:0:0:0:1 -+ Signature Algorithm: sha1WithRSAEncryption -+ ac:4f:45:ef:7d:49:a8:21:70:8e:88:59:3e:d4:36:42:70:f5: -+ a3:bd:8b:d7:a8:d0:58:f6:31:4a:b1:a4:a6:dd:6f:d9:e8:44: -+ 3c:b6:0a:71:d6:7f:b1:08:61:9d:60:ce:75:cf:77:0c:d2:37: -+ 86:02:8d:5e:5d:f9:0f:71:b4:16:a8:c1:3d:23:1c:f1:11:b3: -+ 56:6e:ca:d0:8d:34:94:e6:87:2a:99:f2:ae:ae:cc:c2:e8:86: -+ de:08:a8:7f:c5:05:fa:6f:81:a7:82:e6:d0:53:9d:34:f4:ac: -+ 3e:40:fe:89:57:7a:29:a4:91:7e:0b:c6:51:31:e5:10:2f:a4: -+ 60:76:cd:95:51:1a:be:8b:a1:b0:fd:ad:52:bd:d7:1b:87:60: -+ d2:31:c7:17:c4:18:4f:2d:08:25:a3:a7:4f:b7:92:ca:e2:f5: -+ 25:f1:54:75:81:9d:b3:3d:61:a2:f7:da:ed:e1:c6:6f:2c:60: -+ 1f:d8:6f:c5:92:05:ab:c9:09:62:49:a9:14:ad:55:11:cc:d6: -+ 4a:19:94:99:97:37:1d:81:5f:8b:cf:a3:a8:96:44:51:08:3d: -+ 0b:05:65:12:eb:b6:70:80:88:48:72:4f:c6:c2:da:cf:cd:8e: -+ 5b:ba:97:2f:60:b4:96:56:49:5e:3a:43:76:63:04:be:2a:f6: -+ c1:ca:a9:94 -+-----BEGIN CERTIFICATE----- -+MIIE2DCCA8CgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBxTELMAkGA1UEBhMCVVMx -+DzANBgNVBAgMBk9yZWdvbjESMBAGA1UEBwwJQmVhdmVydG9uMSMwIQYDVQQKDBpQ -+eXRob24gU29mdHdhcmUgRm91bmRhdGlvbjEgMB4GA1UECwwXUHl0aG9uIENvcmUg -+RGV2ZWxvcG1lbnQxJDAiBgNVBAMMG251bGwucHl0aG9uLm9yZwBleGFtcGxlLm9y -+ZzEkMCIGCSqGSIb3DQEJARYVcHl0aG9uLWRldkBweXRob24ub3JnMB4XDTEzMDgw -+NzEzMTE1MloXDTEzMDgwNzEzMTI1MlowgcUxCzAJBgNVBAYTAlVTMQ8wDQYDVQQI -+DAZPcmVnb24xEjAQBgNVBAcMCUJlYXZlcnRvbjEjMCEGA1UECgwaUHl0aG9uIFNv -+ZnR3YXJlIEZvdW5kYXRpb24xIDAeBgNVBAsMF1B5dGhvbiBDb3JlIERldmVsb3Bt -+ZW50MSQwIgYDVQQDDBtudWxsLnB5dGhvbi5vcmcAZXhhbXBsZS5vcmcxJDAiBgkq -+hkiG9w0BCQEWFXB5dGhvbi1kZXZAcHl0aG9uLm9yZzCCASIwDQYJKoZIhvcNAQEB -+BQADggEPADCCAQoCggEBALXq7cn7Rn1vO3aA3TrzA5QLp6bb7B3f/yN0CJ2XFj+j -+pHs+Gw6WWSUDpybiiKnPec33BFawq3kyblnBMjBU61ioy5HwQqVkJ8vUVjGIUq3P -+vX/wBmQfzCe4o4uM89gpHyUL9UYGG8oCRa17dgqcv7u5rg0Wq2B1rgY+nHwx3JIv -+KRrgSwyRkGzpN8WQ1yrXlxWjgI9de0mPVDDUlywcWze1q2kwaEPTM3hLAmD1PESA -+oY/n8A/RXoeeRs9i/Pm/DGUS8ZPINXk/yOzsR/XvvkTVroIeLZqfmFpnZeF0cHzL -+08LODkVJJ9zjLdT7SA4vnne4FEbAxDbKAq5qkYzaL4UCAwEAAaOB0DCBzTAMBgNV -+HRMBAf8EAjAAMB0GA1UdDgQWBBSIWlXAUv9hzVKjNQ/qWpwkOCL3XDALBgNVHQ8E -+BAMCBeAwgZAGA1UdEQSBiDCBhYIeYWx0bnVsbC5weXRob24ub3JnAGV4YW1wbGUu -+Y29tgSBudWxsQHB5dGhvbi5vcmcAdXNlckBleGFtcGxlLm9yZ4YpaHR0cDovL251 -+bGwucHl0aG9uLm9yZwBodHRwOi8vZXhhbXBsZS5vcmeHBMAAAgGHECABDbgAAAAA -+AAAAAAAAAAEwDQYJKoZIhvcNAQEFBQADggEBAKxPRe99SaghcI6IWT7UNkJw9aO9 -+i9eo0Fj2MUqxpKbdb9noRDy2CnHWf7EIYZ1gznXPdwzSN4YCjV5d+Q9xtBaowT0j -+HPERs1ZuytCNNJTmhyqZ8q6uzMLoht4IqH/FBfpvgaeC5tBTnTT0rD5A/olXeimk -+kX4LxlEx5RAvpGB2zZVRGr6LobD9rVK91xuHYNIxxxfEGE8tCCWjp0+3ksri9SXx -+VHWBnbM9YaL32u3hxm8sYB/Yb8WSBavJCWJJqRStVRHM1koZlJmXNx2BX4vPo6iW -+RFEIPQsFZRLrtnCAiEhyT8bC2s/Njlu6ly9gtJZWSV46Q3ZjBL4q9sHKqZQ= -+-----END CERTIFICATE----- -diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py ---- a/Lib/test/test_ssl.py -+++ b/Lib/test/test_ssl.py -@@ -55,6 +55,7 @@ BADCERT = data_file("badcert.pem") - WRONGCERT = data_file("XXXnonexisting.pem") - BADKEY = data_file("badkey.pem") - NOKIACERT = data_file("nokia.pem") -+NULLBYTECERT = data_file("nullbytecert.pem") - - DHFILE = data_file("dh512.pem") - BYTES_DHFILE = os.fsencode(DHFILE) -@@ -162,6 +163,27 @@ class BasicSocketTests(unittest.TestCase - ('DNS', 'projects.forum.nokia.com')) - ) - -+ def test_parse_cert_CVE_2013_4238(self): -+ p = ssl._ssl._test_decode_cert(NULLBYTECERT) -+ if support.verbose: -+ sys.stdout.write("\n" + pprint.pformat(p) + "\n") -+ subject = ((('countryName', 'US'),), -+ (('stateOrProvinceName', 'Oregon'),), -+ (('localityName', 'Beaverton'),), -+ (('organizationName', 'Python Software Foundation'),), -+ (('organizationalUnitName', 'Python Core Development'),), -+ (('commonName', 'null.python.org\x00example.org'),), -+ (('emailAddress', 'python-dev@python.org'),)) -+ self.assertEqual(p['subject'], subject) -+ self.assertEqual(p['issuer'], subject) -+ self.assertEqual(p['subjectAltName'], -+ (('DNS', 'altnull.python.org\x00example.com'), -+ ('email', 'null@python.org\x00user@example.org'), -+ ('URI', 'http://null.python.org\x00http://example.org'), -+ ('IP Address', '192.0.2.1'), -+ ('IP Address', '2001:DB8:0:0:0:0:0:1\n')) -+ ) -+ - def test_DER_to_PEM(self): - with open(SVN_PYTHON_ORG_ROOT_CERT, 'r') as f: - pem = f.read() -@@ -294,6 +316,13 @@ class BasicSocketTests(unittest.TestCase - fail(cert, 'foo.a.com') - fail(cert, 'bar.foo.com') - -+ # NULL bytes are bad, CVE-2013-4073 -+ cert = {'subject': ((('commonName', -+ 'null.python.org\x00example.org'),),)} -+ ok(cert, 'null.python.org\x00example.org') # or raise an error? -+ fail(cert, 'example.org') -+ fail(cert, 'null.python.org') -+ - # Slightly fake real-world example - cert = {'notAfter': 'Jun 26 21:41:46 2011 GMT', - 'subject': ((('commonName', 'linuxfrz.org'),),), -diff --git a/Modules/_ssl.c b/Modules/_ssl.c ---- a/Modules/_ssl.c -+++ b/Modules/_ssl.c -@@ -771,12 +771,14 @@ static PyObject * - ext->value->length)); - - for(j = 0; j < sk_GENERAL_NAME_num(names); j++) { -- - /* get a rendering of each name in the set of names */ -+ int gntype; -+ ASN1_STRING *as = NULL; - - name = sk_GENERAL_NAME_value(names, j); -- if (name->type == GEN_DIRNAME) { -- -+ gntype = name-> type; -+ switch (gntype) { -+ case GEN_DIRNAME: - /* we special-case DirName as a tuple of - tuples of attributes */ - -@@ -798,11 +800,62 @@ static PyObject * - goto fail; - } - PyTuple_SET_ITEM(t, 1, v); -+ break; - -- } else { -+ case GEN_EMAIL: -+ case GEN_DNS: -+ case GEN_URI: -+ /* GENERAL_NAME_print() doesn't handle NULL bytes in ASN1_string -+ correctly, CVE-2013-4238 */ -+ t = PyTuple_New(2); -+ if (t == NULL) -+ goto fail; -+ switch (gntype) { -+ case GEN_EMAIL: -+ v = PyUnicode_FromString("email"); -+ as = name->d.rfc822Name; -+ break; -+ case GEN_DNS: -+ v = PyUnicode_FromString("DNS"); -+ as = name->d.dNSName; -+ break; -+ case GEN_URI: -+ v = PyUnicode_FromString("URI"); -+ as = name->d.uniformResourceIdentifier; -+ break; -+ } -+ if (v == NULL) { -+ Py_DECREF(t); -+ goto fail; -+ } -+ PyTuple_SET_ITEM(t, 0, v); -+ v = PyUnicode_FromStringAndSize((char *)ASN1_STRING_data(as), -+ ASN1_STRING_length(as)); -+ if (v == NULL) { -+ Py_DECREF(t); -+ goto fail; -+ } -+ PyTuple_SET_ITEM(t, 1, v); -+ break; - -+ default: - /* for everything else, we use the OpenSSL print form */ -- -+ switch (gntype) { -+ /* check for new general name type */ -+ case GEN_OTHERNAME: -+ case GEN_X400: -+ case GEN_EDIPARTY: -+ case GEN_IPADD: -+ case GEN_RID: -+ break; -+ default: -+ if (PyErr_WarnFormat(PyExc_RuntimeWarning, 1, -+ "Unknown general name type %d", -+ gntype) == -1) { -+ goto fail; -+ } -+ break; -+ } - (void) BIO_reset(biobuf); - GENERAL_NAME_print(biobuf, name); - len = BIO_gets(biobuf, buf, sizeof(buf)-1); -@@ -829,6 +882,7 @@ static PyObject * - goto fail; - } - PyTuple_SET_ITEM(t, 1, v); -+ break; - } - - /* and add that rendering to the list */ - diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD index 15770f376..b6bd4cd78 100644 --- a/extra/python2/PKGBUILD +++ b/extra/python2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 193929 2013-09-06 08:06:17Z bpiotrowski $ +# $Id: PKGBUILD 200588 2013-11-29 15:17:25Z angvp $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributer: Allan McRae <allan@archlinux.org> # Contributer: Jason Chu <jason@archlinux.org> pkgname=python2 -pkgver=2.7.5 -pkgrel=2 +pkgver=2.7.6 +pkgrel=1 _pybasever=2.7 pkgdesc="A high-level scripting language" arch=('i686' 'x86_64' 'mips64el') @@ -16,17 +16,12 @@ makedepends=('tk>=8.6.0' 'bluez-libs') optdepends=('tk: for IDLE') conflicts=('python<3') options=('!makeflags') -source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz - python-2.7.5-CVE-2013-4238.patch) -sha1sums=('b7389791f789625c2ba9d897aa324008ff482daf' - 'fb1f95ca21d9c00eaaea5a58236d1d97300482d7') +source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz) +sha1sums=('8321636af2acbeaa68fc635d7dda7369ed446a80') prepare() { cd "${srcdir}/Python-${pkgver}" - # http://bugs.python.org/issue18709 - patch -Np1 -i ../python-2.7.5-CVE-2013-4238.patch - # Temporary workaround for FS#22322 # See http://bugs.python.org/issue10835 for upstream report sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c @@ -86,9 +81,12 @@ package() { mv "${pkgdir}"/usr/bin/2to3{,-2.7} # clean up #!s - find "${pkgdir}"/usr/lib/python${_pybasever}/ -name '*.py' | \ + find . -name '*.py' | \ xargs sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" + # Workaround asdl_c.py error + touch Include/Python-ast.h Python/Python-ast.c + # clean-up reference to build directory sed -i "s#${srcdir}/Python-${pkgver}:##" "${pkgdir}"/usr/lib/python${_pybasever}/config/Makefile diff --git a/extra/python2/python-2.7.5-CVE-2013-4238.patch b/extra/python2/python-2.7.5-CVE-2013-4238.patch deleted file mode 100644 index c37190182..000000000 --- a/extra/python2/python-2.7.5-CVE-2013-4238.patch +++ /dev/null @@ -1,267 +0,0 @@ - -# HG changeset patch -# User Christian Heimes <christian@cheimes.de> -# Date 1376693687 -7200 -# Node ID bd2360476bdbb1477b81b0e18b8d86b3452ba77b -# Parent 87fcc13ade91874971ad577efaa2254c744a2b07 -Issue #18709: Fix CVE-2013-4238. The SSL module now handles NULL bytes -inside subjectAltName correctly. Formerly the module has used OpenSSL's -GENERAL_NAME_print() function to get the string represention of ASN.1 -strings for rfc822Name (email), dNSName (DNS) and -uniformResourceIdentifier (URI). - -diff --git a/Lib/test/nullbytecert.pem b/Lib/test/nullbytecert.pem -new file mode 100644 ---- /dev/null -+++ b/Lib/test/nullbytecert.pem -@@ -0,0 +1,90 @@ -+Certificate: -+ Data: -+ Version: 3 (0x2) -+ Serial Number: 0 (0x0) -+ Signature Algorithm: sha1WithRSAEncryption -+ Issuer: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/emailAddress=python-dev@python.org -+ Validity -+ Not Before: Aug 7 13:11:52 2013 GMT -+ Not After : Aug 7 13:12:52 2013 GMT -+ Subject: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/emailAddress=python-dev@python.org -+ Subject Public Key Info: -+ Public Key Algorithm: rsaEncryption -+ Public-Key: (2048 bit) -+ Modulus: -+ 00:b5:ea:ed:c9:fb:46:7d:6f:3b:76:80:dd:3a:f3: -+ 03:94:0b:a7:a6:db:ec:1d:df:ff:23:74:08:9d:97: -+ 16:3f:a3:a4:7b:3e:1b:0e:96:59:25:03:a7:26:e2: -+ 88:a9:cf:79:cd:f7:04:56:b0:ab:79:32:6e:59:c1: -+ 32:30:54:eb:58:a8:cb:91:f0:42:a5:64:27:cb:d4: -+ 56:31:88:52:ad:cf:bd:7f:f0:06:64:1f:cc:27:b8: -+ a3:8b:8c:f3:d8:29:1f:25:0b:f5:46:06:1b:ca:02: -+ 45:ad:7b:76:0a:9c:bf:bb:b9:ae:0d:16:ab:60:75: -+ ae:06:3e:9c:7c:31:dc:92:2f:29:1a:e0:4b:0c:91: -+ 90:6c:e9:37:c5:90:d7:2a:d7:97:15:a3:80:8f:5d: -+ 7b:49:8f:54:30:d4:97:2c:1c:5b:37:b5:ab:69:30: -+ 68:43:d3:33:78:4b:02:60:f5:3c:44:80:a1:8f:e7: -+ f0:0f:d1:5e:87:9e:46:cf:62:fc:f9:bf:0c:65:12: -+ f1:93:c8:35:79:3f:c8:ec:ec:47:f5:ef:be:44:d5: -+ ae:82:1e:2d:9a:9f:98:5a:67:65:e1:74:70:7c:cb: -+ d3:c2:ce:0e:45:49:27:dc:e3:2d:d4:fb:48:0e:2f: -+ 9e:77:b8:14:46:c0:c4:36:ca:02:ae:6a:91:8c:da: -+ 2f:85 -+ Exponent: 65537 (0x10001) -+ X509v3 extensions: -+ X509v3 Basic Constraints: critical -+ CA:FALSE -+ X509v3 Subject Key Identifier: -+ 88:5A:55:C0:52:FF:61:CD:52:A3:35:0F:EA:5A:9C:24:38:22:F7:5C -+ X509v3 Key Usage: -+ Digital Signature, Non Repudiation, Key Encipherment -+ X509v3 Subject Alternative Name: -+ ************************************************************* -+ WARNING: The values for DNS, email and URI are WRONG. OpenSSL -+ doesn't print the text after a NULL byte. -+ ************************************************************* -+ DNS:altnull.python.org, email:null@python.org, URI:http://null.python.org, IP Address:192.0.2.1, IP Address:2001:DB8:0:0:0:0:0:1 -+ Signature Algorithm: sha1WithRSAEncryption -+ ac:4f:45:ef:7d:49:a8:21:70:8e:88:59:3e:d4:36:42:70:f5: -+ a3:bd:8b:d7:a8:d0:58:f6:31:4a:b1:a4:a6:dd:6f:d9:e8:44: -+ 3c:b6:0a:71:d6:7f:b1:08:61:9d:60:ce:75:cf:77:0c:d2:37: -+ 86:02:8d:5e:5d:f9:0f:71:b4:16:a8:c1:3d:23:1c:f1:11:b3: -+ 56:6e:ca:d0:8d:34:94:e6:87:2a:99:f2:ae:ae:cc:c2:e8:86: -+ de:08:a8:7f:c5:05:fa:6f:81:a7:82:e6:d0:53:9d:34:f4:ac: -+ 3e:40:fe:89:57:7a:29:a4:91:7e:0b:c6:51:31:e5:10:2f:a4: -+ 60:76:cd:95:51:1a:be:8b:a1:b0:fd:ad:52:bd:d7:1b:87:60: -+ d2:31:c7:17:c4:18:4f:2d:08:25:a3:a7:4f:b7:92:ca:e2:f5: -+ 25:f1:54:75:81:9d:b3:3d:61:a2:f7:da:ed:e1:c6:6f:2c:60: -+ 1f:d8:6f:c5:92:05:ab:c9:09:62:49:a9:14:ad:55:11:cc:d6: -+ 4a:19:94:99:97:37:1d:81:5f:8b:cf:a3:a8:96:44:51:08:3d: -+ 0b:05:65:12:eb:b6:70:80:88:48:72:4f:c6:c2:da:cf:cd:8e: -+ 5b:ba:97:2f:60:b4:96:56:49:5e:3a:43:76:63:04:be:2a:f6: -+ c1:ca:a9:94 -+-----BEGIN CERTIFICATE----- -+MIIE2DCCA8CgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBxTELMAkGA1UEBhMCVVMx -+DzANBgNVBAgMBk9yZWdvbjESMBAGA1UEBwwJQmVhdmVydG9uMSMwIQYDVQQKDBpQ -+eXRob24gU29mdHdhcmUgRm91bmRhdGlvbjEgMB4GA1UECwwXUHl0aG9uIENvcmUg -+RGV2ZWxvcG1lbnQxJDAiBgNVBAMMG251bGwucHl0aG9uLm9yZwBleGFtcGxlLm9y -+ZzEkMCIGCSqGSIb3DQEJARYVcHl0aG9uLWRldkBweXRob24ub3JnMB4XDTEzMDgw -+NzEzMTE1MloXDTEzMDgwNzEzMTI1MlowgcUxCzAJBgNVBAYTAlVTMQ8wDQYDVQQI -+DAZPcmVnb24xEjAQBgNVBAcMCUJlYXZlcnRvbjEjMCEGA1UECgwaUHl0aG9uIFNv -+ZnR3YXJlIEZvdW5kYXRpb24xIDAeBgNVBAsMF1B5dGhvbiBDb3JlIERldmVsb3Bt -+ZW50MSQwIgYDVQQDDBtudWxsLnB5dGhvbi5vcmcAZXhhbXBsZS5vcmcxJDAiBgkq -+hkiG9w0BCQEWFXB5dGhvbi1kZXZAcHl0aG9uLm9yZzCCASIwDQYJKoZIhvcNAQEB -+BQADggEPADCCAQoCggEBALXq7cn7Rn1vO3aA3TrzA5QLp6bb7B3f/yN0CJ2XFj+j -+pHs+Gw6WWSUDpybiiKnPec33BFawq3kyblnBMjBU61ioy5HwQqVkJ8vUVjGIUq3P -+vX/wBmQfzCe4o4uM89gpHyUL9UYGG8oCRa17dgqcv7u5rg0Wq2B1rgY+nHwx3JIv -+KRrgSwyRkGzpN8WQ1yrXlxWjgI9de0mPVDDUlywcWze1q2kwaEPTM3hLAmD1PESA -+oY/n8A/RXoeeRs9i/Pm/DGUS8ZPINXk/yOzsR/XvvkTVroIeLZqfmFpnZeF0cHzL -+08LODkVJJ9zjLdT7SA4vnne4FEbAxDbKAq5qkYzaL4UCAwEAAaOB0DCBzTAMBgNV -+HRMBAf8EAjAAMB0GA1UdDgQWBBSIWlXAUv9hzVKjNQ/qWpwkOCL3XDALBgNVHQ8E -+BAMCBeAwgZAGA1UdEQSBiDCBhYIeYWx0bnVsbC5weXRob24ub3JnAGV4YW1wbGUu -+Y29tgSBudWxsQHB5dGhvbi5vcmcAdXNlckBleGFtcGxlLm9yZ4YpaHR0cDovL251 -+bGwucHl0aG9uLm9yZwBodHRwOi8vZXhhbXBsZS5vcmeHBMAAAgGHECABDbgAAAAA -+AAAAAAAAAAEwDQYJKoZIhvcNAQEFBQADggEBAKxPRe99SaghcI6IWT7UNkJw9aO9 -+i9eo0Fj2MUqxpKbdb9noRDy2CnHWf7EIYZ1gznXPdwzSN4YCjV5d+Q9xtBaowT0j -+HPERs1ZuytCNNJTmhyqZ8q6uzMLoht4IqH/FBfpvgaeC5tBTnTT0rD5A/olXeimk -+kX4LxlEx5RAvpGB2zZVRGr6LobD9rVK91xuHYNIxxxfEGE8tCCWjp0+3ksri9SXx -+VHWBnbM9YaL32u3hxm8sYB/Yb8WSBavJCWJJqRStVRHM1koZlJmXNx2BX4vPo6iW -+RFEIPQsFZRLrtnCAiEhyT8bC2s/Njlu6ly9gtJZWSV46Q3ZjBL4q9sHKqZQ= -+-----END CERTIFICATE----- -diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py ---- a/Lib/test/test_ssl.py -+++ b/Lib/test/test_ssl.py -@@ -25,6 +25,7 @@ ssl = test_support.import_module("ssl") - HOST = test_support.HOST - CERTFILE = None - SVN_PYTHON_ORG_ROOT_CERT = None -+NULLBYTECERT = None - - def handle_error(prefix): - exc_format = ' '.join(traceback.format_exception(*sys.exc_info())) -@@ -123,6 +124,27 @@ class BasicSocketTests(unittest.TestCase - ('DNS', 'projects.forum.nokia.com')) - ) - -+ def test_parse_cert_CVE_2013_4238(self): -+ p = ssl._ssl._test_decode_cert(NULLBYTECERT) -+ if test_support.verbose: -+ sys.stdout.write("\n" + pprint.pformat(p) + "\n") -+ subject = ((('countryName', 'US'),), -+ (('stateOrProvinceName', 'Oregon'),), -+ (('localityName', 'Beaverton'),), -+ (('organizationName', 'Python Software Foundation'),), -+ (('organizationalUnitName', 'Python Core Development'),), -+ (('commonName', 'null.python.org\x00example.org'),), -+ (('emailAddress', 'python-dev@python.org'),)) -+ self.assertEqual(p['subject'], subject) -+ self.assertEqual(p['issuer'], subject) -+ self.assertEqual(p['subjectAltName'], -+ (('DNS', 'altnull.python.org\x00example.com'), -+ ('email', 'null@python.org\x00user@example.org'), -+ ('URI', 'http://null.python.org\x00http://example.org'), -+ ('IP Address', '192.0.2.1'), -+ ('IP Address', '2001:DB8:0:0:0:0:0:1\n')) -+ ) -+ - def test_DER_to_PEM(self): - with open(SVN_PYTHON_ORG_ROOT_CERT, 'r') as f: - pem = f.read() -@@ -1360,7 +1382,7 @@ else: - - - def test_main(verbose=False): -- global CERTFILE, SVN_PYTHON_ORG_ROOT_CERT, NOKIACERT -+ global CERTFILE, SVN_PYTHON_ORG_ROOT_CERT, NOKIACERT, NULLBYTECERT - CERTFILE = os.path.join(os.path.dirname(__file__) or os.curdir, - "keycert.pem") - SVN_PYTHON_ORG_ROOT_CERT = os.path.join( -@@ -1368,10 +1390,13 @@ def test_main(verbose=False): - "https_svn_python_org_root.pem") - NOKIACERT = os.path.join(os.path.dirname(__file__) or os.curdir, - "nokia.pem") -+ NULLBYTECERT = os.path.join(os.path.dirname(__file__) or os.curdir, -+ "nullbytecert.pem") - - if (not os.path.exists(CERTFILE) or - not os.path.exists(SVN_PYTHON_ORG_ROOT_CERT) or -- not os.path.exists(NOKIACERT)): -+ not os.path.exists(NOKIACERT) or -+ not os.path.exists(NULLBYTECERT)): - raise test_support.TestFailed("Can't read certificate files!") - - tests = [BasicTests, BasicSocketTests] -diff --git a/Modules/_ssl.c b/Modules/_ssl.c ---- a/Modules/_ssl.c -+++ b/Modules/_ssl.c -@@ -738,13 +738,16 @@ static PyObject * - ext->value->length)); - - for(j = 0; j < sk_GENERAL_NAME_num(names); j++) { -- - /* get a rendering of each name in the set of names */ -+ int gntype; -+ ASN1_STRING *as = NULL; - - name = sk_GENERAL_NAME_value(names, j); -- if (name->type == GEN_DIRNAME) { -- -- /* we special-case DirName as a tuple of tuples of attributes */ -+ gntype = name-> type; -+ switch (gntype) { -+ case GEN_DIRNAME: -+ /* we special-case DirName as a tuple of -+ tuples of attributes */ - - t = PyTuple_New(2); - if (t == NULL) { -@@ -764,11 +767,61 @@ static PyObject * - goto fail; - } - PyTuple_SET_ITEM(t, 1, v); -+ break; - -- } else { -+ case GEN_EMAIL: -+ case GEN_DNS: -+ case GEN_URI: -+ /* GENERAL_NAME_print() doesn't handle NULL bytes in ASN1_string -+ correctly, CVE-2013-4238 */ -+ t = PyTuple_New(2); -+ if (t == NULL) -+ goto fail; -+ switch (gntype) { -+ case GEN_EMAIL: -+ v = PyString_FromString("email"); -+ as = name->d.rfc822Name; -+ break; -+ case GEN_DNS: -+ v = PyString_FromString("DNS"); -+ as = name->d.dNSName; -+ break; -+ case GEN_URI: -+ v = PyString_FromString("URI"); -+ as = name->d.uniformResourceIdentifier; -+ break; -+ } -+ if (v == NULL) { -+ Py_DECREF(t); -+ goto fail; -+ } -+ PyTuple_SET_ITEM(t, 0, v); -+ v = PyString_FromStringAndSize((char *)ASN1_STRING_data(as), -+ ASN1_STRING_length(as)); -+ if (v == NULL) { -+ Py_DECREF(t); -+ goto fail; -+ } -+ PyTuple_SET_ITEM(t, 1, v); -+ break; - -+ default: - /* for everything else, we use the OpenSSL print form */ -- -+ switch (gntype) { -+ /* check for new general name type */ -+ case GEN_OTHERNAME: -+ case GEN_X400: -+ case GEN_EDIPARTY: -+ case GEN_IPADD: -+ case GEN_RID: -+ break; -+ default: -+ if (PyErr_Warn(PyExc_RuntimeWarning, -+ "Unknown general name type") == -1) { -+ goto fail; -+ } -+ break; -+ } - (void) BIO_reset(biobuf); - GENERAL_NAME_print(biobuf, name); - len = BIO_gets(biobuf, buf, sizeof(buf)-1); -@@ -794,6 +847,7 @@ static PyObject * - goto fail; - } - PyTuple_SET_ITEM(t, 1, v); -+ break; - } - - /* and add that rendering to the list */ - diff --git a/extra/qca-ossl/PKGBUILD b/extra/qca-ossl/PKGBUILD index a804ec832..1270b7f1b 100644 --- a/extra/qca-ossl/PKGBUILD +++ b/extra/qca-ossl/PKGBUILD @@ -4,7 +4,7 @@ pkgname=qca-ossl pkgver=2.0.0 _pkgver=2.0.0-beta3 -pkgrel=6 +pkgrel=7 pkgdesc="Qt Cryptographic Architecture" arch=('i686' 'x86_64' 'mips64el') url="http://delta.affinix.com/qca/" @@ -12,13 +12,18 @@ license=('LGPL') depends=('qca') makedepends=('icu') source=("http://delta.affinix.com/download/qca/2.0/plugins/${pkgname}-${_pkgver}.tar.bz2" - 'no-whirlpool.patch') + 'qca-ossl-openssl-1.0.0.patch') md5sums=('bdc62c01321385c7da8d27b3902910ce' - '1be7ee2e5f32733b90452fb46b9c69f9') + '3b443b8e0347cf3cdf8f6c70e519a18f') + +prepare() { + cd $srcdir/${pkgname}-${_pkgver} + # Patch by Gentoo + patch -p1 -i $srcdir/qca-ossl-openssl-1.0.0.patch +} build() { cd $srcdir/${pkgname}-${_pkgver} - patch -p1 -i $srcdir/no-whirlpool.patch ./configure \ --release \ --no-separate-debug-info diff --git a/extra/qca-ossl/no-whirlpool.patch b/extra/qca-ossl/no-whirlpool.patch deleted file mode 100644 index 609ea61f2..000000000 --- a/extra/qca-ossl/no-whirlpool.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up qca-ossl-2.0.0-beta3/qca-ossl.cpp.no-whirlpool qca-ossl-2.0.0-beta3/qca-ossl.cpp ---- qca-ossl-2.0.0-beta3/qca-ossl.cpp.no-whirlpool 2007-12-11 07:34:57.000000000 +0100 -+++ qca-ossl-2.0.0-beta3/qca-ossl.cpp 2009-01-26 14:59:42.000000000 +0100 -@@ -6597,7 +6597,7 @@ static QStringList all_hash_types() - #ifdef SHA512_DIGEST_LENGTH - list += "sha512"; - #endif --#ifdef OBJ_whirlpool -+#ifdef WHIRLPOOL_DIGEST_LENGTH - list += "whirlpool"; - #endif - return list; -@@ -6810,7 +6810,7 @@ public: - else if ( type == "sha512" ) - return new opensslHashContext( EVP_sha512(), this, type); - #endif --#ifdef OBJ_whirlpool -+#ifdef WHIRLPOOL_DIGEST_LENGTH - else if ( type == "whirlpool" ) - return new opensslHashContext( EVP_whirlpool(), this, type); - #endif diff --git a/extra/qca-ossl/qca-ossl-openssl-1.0.0.patch b/extra/qca-ossl/qca-ossl-openssl-1.0.0.patch new file mode 100644 index 000000000..c7d6e47b1 --- /dev/null +++ b/extra/qca-ossl/qca-ossl-openssl-1.0.0.patch @@ -0,0 +1,155 @@ +diff -ru a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2007-06-29 23:10:53.000000000 +0200 ++++ b/CMakeLists.txt 2010-04-18 04:05:09.000000000 +0200 +@@ -1,5 +1,12 @@ + # QCA OSSL + ++INCLUDE(CheckFunctionExists) ++SET(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_LIBRARIES}) ++CHECK_FUNCTION_EXISTS(EVP_md2 HAVE_OPENSSL_MD2) ++IF (HAVE_OPENSSL_MD2) ++ ADD_DEFINITIONS(-DHAVE_OPENSSL_MD2) ++ENDIF (HAVE_OPENSSL_MD2) ++ + SET(QCA_OSSL_SOURCES qca-ossl.cpp) + + MY_AUTOMOC( QCA_OSSL_SOURCES ) +diff -ru a/qca-ossl.cpp b/qca-ossl.cpp +--- a/qca-ossl.cpp 2007-12-11 07:34:57.000000000 +0100 ++++ b/qca-ossl.cpp 2010-04-18 04:08:46.000000000 +0200 +@@ -42,6 +42,15 @@ + #define OSSL_097 + #endif + ++#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L ++// OpenSSL 1.0.0 makes a few changes that aren't very C++ friendly... ++// Among other things, CHECKED_PTR_OF returns a void*, but is used in ++// contexts requiring STACK pointers. ++#undef CHECKED_PTR_OF ++#define CHECKED_PTR_OF(type, p) \ ++ ((_STACK*) (1 ? p : (type*)0)) ++#endif ++ + using namespace QCA; + + namespace opensslQCAPlugin { +@@ -1771,8 +1780,10 @@ + md = EVP_sha1(); + else if(alg == EMSA3_MD5) + md = EVP_md5(); ++#ifdef HAVE_OPENSSL_MD2 + else if(alg == EMSA3_MD2) + md = EVP_md2(); ++#endif + else if(alg == EMSA3_RIPEMD160) + md = EVP_ripemd160(); + else if(alg == EMSA3_Raw) +@@ -1789,8 +1800,10 @@ + md = EVP_sha1(); + else if(alg == EMSA3_MD5) + md = EVP_md5(); ++#ifdef HAVE_OPENSSL_MD2 + else if(alg == EMSA3_MD2) + md = EVP_md2(); ++#endif + else if(alg == EMSA3_RIPEMD160) + md = EVP_ripemd160(); + else if(alg == EMSA3_Raw) +@@ -3385,9 +3398,11 @@ + case NID_md5WithRSAEncryption: + p.sigalgo = QCA::EMSA3_MD5; + break; ++#ifdef HAVE_OPENSSL_MD2 + case NID_md2WithRSAEncryption: + p.sigalgo = QCA::EMSA3_MD2; + break; ++#endif + case NID_ripemd160WithRSA: + p.sigalgo = QCA::EMSA3_RIPEMD160; + break; +@@ -3871,9 +3886,11 @@ + case NID_md5WithRSAEncryption: + p.sigalgo = QCA::EMSA3_MD5; + break; ++#ifdef HAVE_OPENSSL_MD2 + case NID_md2WithRSAEncryption: + p.sigalgo = QCA::EMSA3_MD2; + break; ++#endif + case NID_ripemd160WithRSA: + p.sigalgo = QCA::EMSA3_RIPEMD160; + break; +@@ -4061,9 +4078,11 @@ + case NID_md5WithRSAEncryption: + p.sigalgo = QCA::EMSA3_MD5; + break; ++#ifdef HAVE_OPENSSL_MD2 + case NID_md2WithRSAEncryption: + p.sigalgo = QCA::EMSA3_MD2; + break; ++#endif + case NID_ripemd160WithRSA: + p.sigalgo = QCA::EMSA3_RIPEMD160; + break; +@@ -6582,7 +6601,9 @@ + list += "sha1"; + list += "sha0"; + list += "ripemd160"; ++#ifdef HAVE_OPENSSL_MD2 + list += "md2"; ++#endif + list += "md4"; + list += "md5"; + #ifdef SHA224_DIGEST_LENGTH +@@ -6597,9 +6618,11 @@ + #ifdef SHA512_DIGEST_LENGTH + list += "sha512"; + #endif ++/* + #ifdef OBJ_whirlpool + list += "whirlpool"; + #endif ++*/ + return list; + } + +@@ -6757,7 +6780,9 @@ + list += all_hash_types(); + list += all_mac_types(); + list += all_cipher_types(); ++#ifdef HAVE_OPENSSL_MD2 + list += "pbkdf1(md2)"; ++#endif + list += "pbkdf1(sha1)"; + list += "pbkdf2(sha1)"; + list += "pkey"; +@@ -6788,8 +6813,10 @@ + return new opensslHashContext( EVP_sha(), this, type); + else if ( type == "ripemd160" ) + return new opensslHashContext( EVP_ripemd160(), this, type); ++#ifdef HAVE_OPENSSL_MD2 + else if ( type == "md2" ) + return new opensslHashContext( EVP_md2(), this, type); ++#endif + else if ( type == "md4" ) + return new opensslHashContext( EVP_md4(), this, type); + else if ( type == "md5" ) +@@ -6810,14 +6837,18 @@ + else if ( type == "sha512" ) + return new opensslHashContext( EVP_sha512(), this, type); + #endif ++/* + #ifdef OBJ_whirlpool + else if ( type == "whirlpool" ) + return new opensslHashContext( EVP_whirlpool(), this, type); + #endif ++*/ + else if ( type == "pbkdf1(sha1)" ) + return new opensslPbkdf1Context( EVP_sha1(), this, type ); ++#ifdef HAVE_OPENSSL_MD2 + else if ( type == "pbkdf1(md2)" ) + return new opensslPbkdf1Context( EVP_md2(), this, type ); ++#endif + else if ( type == "pbkdf2(sha1)" ) + return new opensslPbkdf2Context( this, type ); + else if ( type == "hmac(md5)" ) diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD index 127fb2afc..6c086ad03 100644 --- a/extra/qemu/PKGBUILD +++ b/extra/qemu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198649 2013-11-01 08:14:43Z thomas $ +# $Id: PKGBUILD 201269 2013-12-07 10:40:12Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=('qemu' 'libcacard') -pkgver=1.6.1 -pkgrel=2 +pkgver=1.7.0 +pkgrel=1 arch=('i686' 'x86_64') license=('GPL2' 'LGPL2.1') url="http://wiki.qemu.org/Index.html" @@ -16,8 +16,6 @@ makedepends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'libiscsi' 'libcacard' 'spice' 'spice-protocol' 'python2') replaces=('qemu-kvm') options=(!strip) -md5sums=('3a897d722457c5a895cd6ac79a28fda0' - '33ab286a20242dda7743a900f369d68a') build () { @@ -28,7 +26,7 @@ build () # gtk gui breaks keymappings at the moment ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list='pa alsa sdl' \ --python=/usr/bin/python2 --smbd=/usr/bin/smbd \ - --enable-docs --enable-mixemu --libexecdir=/usr/lib/qemu \ + --enable-docs --libexecdir=/usr/lib/qemu \ --disable-gtk --enable-linux-aio --enable-seccomp \ --enable-spice --localstatedir=/var make V=99 @@ -82,3 +80,5 @@ package_libcacard() { cp -a ${srcdir}/qemu-${pkgver}/libcacard.pc ${pkgdir}/usr/lib/pkgconfig/ cp -a ${srcdir}/qemu-${pkgver}/.libs/vscclient ${pkgdir}/usr/bin/ } +md5sums=('32893941d40d052a5e649efcf06aca06' + '33ab286a20242dda7743a900f369d68a') diff --git a/extra/qpdf/PKGBUILD b/extra/qpdf/PKGBUILD index 9d9682af7..9a0664d63 100644 --- a/extra/qpdf/PKGBUILD +++ b/extra/qpdf/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 198391 2013-10-30 14:35:14Z allan $ +# $Id: PKGBUILD 202244 2013-12-20 19:54:40Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Miguel Revilla <yo at miguelrevilla.com> # Contributor: David Sotelo <dvsotelo at gmail.com> # Contributor: Nuno Araujo <nuno.araujo@russo79.com> pkgname=qpdf -pkgver=5.0.1 +pkgver=5.1.0 pkgrel=1 pkgdesc="QPDF: A Content-Preserving PDF Transformation System" arch=('i686' 'x86_64' 'mips64el') @@ -14,21 +14,21 @@ license=('custom:Artistic-2.0') depends=('pcre' 'perl') makedepends=('make') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('6efd89c18461cb73f77bb60cb2da4bce') +md5sums=('7c614bdb5f8610427c5dc0b494cabc0e') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr --disable-static make } check() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make -k check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}/" install mkdir -m755 -p ${pkgdir}/usr/share/licenses/${pkgname} diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD index 99e8cfb6d..30703ad59 100644 --- a/extra/qscintilla/PKGBUILD +++ b/extra/qscintilla/PKGBUILD @@ -1,29 +1,31 @@ -# $Id: PKGBUILD 193634 2013-08-26 13:32:44Z andrea $ +# $Id: PKGBUILD 199276 2013-11-09 07:16:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> pkgbase=qscintilla pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla' 'python-qscintilla-common') -pkgver=2.7.2 -pkgrel=3 +pkgver=2.8 +pkgrel=1 license=('GPL') arch=('i686' 'x86_64' 'mips64el') url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro" makedepends=('python2-pyqt4' 'python-pyqt4' 'chrpath') source=("http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz" 'configure.py-objdir-support.diff') -md5sums=('0fbfb06078f206a241a62c94861cce21' +md5sums=('02c406d8cd5db661f127303e91775c0b' 'eae1bd23117c5f1f7f172a1c1e11f600') -build() { - cd "${srcdir}/QScintilla-gpl-${pkgver}" +prepare() { + cd QScintilla-gpl-${pkgver} patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff" +} - cd Qt4Qt5 +build() { + cd QScintilla-gpl-${pkgver}/Qt4Qt5 qmake-qt4 qscintilla.pro make - + cd ../designer-Qt4Qt5 qmake-qt4 designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 make @@ -36,17 +38,17 @@ build() { cd ../Python2 python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4 - make + make } package_qscintilla() { pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class" depends=('qt4') - cd "${srcdir}/QScintilla-gpl-${pkgver}/Qt4Qt5" + cd QScintilla-gpl-${pkgver}/Qt4Qt5 make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install - cd "${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4Qt5" + cd ../designer-Qt4Qt5 make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install } @@ -54,27 +56,27 @@ package_python-qscintilla-common() { pkgdesc="Common python qscintilla bindings files shared between python-qscintilla and python2-qscintilla" depends=('qscintilla') - cd "${srcdir}/QScintilla-gpl-${pkgver}"/Python + cd QScintilla-gpl-${pkgver}/Python make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install - + # Provided by python-qscintilla - rm "${pkgdir}/usr/lib/python3.3/site-packages/PyQt4/Qsci.so" + rm "${pkgdir}"/usr/lib/python3.3/site-packages/PyQt4/Qsci.so } package_python-qscintilla() { pkgdesc="Python 3.x bindings for QScintilla2" depends=('python-qscintilla-common' 'python-pyqt4') - cd "${srcdir}/QScintilla-gpl-${pkgver}/Python" + cd QScintilla-gpl-${pkgver}/Python install -Dm755 Qsci.so \ - "${pkgdir}/usr/lib/python3.3/site-packages/PyQt4/Qsci.so" + "${pkgdir}"/usr/lib/python3.3/site-packages/PyQt4/Qsci.so } package_python2-qscintilla() { pkgdesc="Python 2.x bindings for QScintilla2" depends=('python-qscintilla-common' 'python2-pyqt4') - cd "${srcdir}/QScintilla-gpl-${pkgver}/Python2" + cd QScintilla-gpl-${pkgver}/Python2 install -Dm755 Qsci.so \ - "${pkgdir}/usr/lib/python2.7/site-packages/PyQt4/Qsci.so" + "${pkgdir}"/usr/lib/python2.7/site-packages/PyQt4/Qsci.so } diff --git a/extra/qt4/CVE-2013-4549.patch b/extra/qt4/CVE-2013-4549.patch new file mode 100644 index 000000000..8084f4a41 --- /dev/null +++ b/extra/qt4/CVE-2013-4549.patch @@ -0,0 +1,233 @@ +From 512a1ce0698d370c313bb561bbf078935fa0342e Mon Sep 17 00:00:00 2001 +From: Mitch Curtis <mitch.curtis@digia.com> +Date: Thu, 7 Nov 2013 09:36:29 +0100 +Subject: [PATCH] Disallow deep or widely nested entity references. + +Nested references with a depth of 2 or greater will fail. References +that partially expand to greater than 1024 characters will also fail. + +This is a backport of 46a8885ae486e238a39efa5119c2714f328b08e4. + +Change-Id: I0c2e1fa13d6ccb5f88641dae2ed3f28bfdeaf609 +Reviewed-by: Richard J. Moore <rich@kde.org> +Reviewed-by: Lars Knoll <lars.knoll@digia.com> + +From cecceb0cdd87482124a73ecf537f3445d68be13e Mon Sep 17 00:00:00 2001 +From: Mitch Curtis <mitch.curtis@digia.com> +Date: Tue, 12 Nov 2013 13:44:56 +0100 +Subject: [PATCH] Fully expand entities to ensure deep or widely nested ones fail parsing + +With 512a1ce0698d370c313bb561bbf078935fa0342e, we failed when parsing +entities whose partially expanded size was greater than 1024 +characters. That was not enough, so now we fully expand all entities. + +This is a backport of f1053d94f59f053ce4acad9320df14f1fbe4faac. + +Change-Id: I41dd6f4525c63e82fd320a22d19248169627f7e0 +Reviewed-by: Richard J. Moore <rich@kde.org> + +diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp +index a1777c5..3904632 100644 +--- a/src/xml/sax/qxml.cpp ++++ b/src/xml/sax/qxml.cpp +@@ -424,6 +424,10 @@ private: + int stringValueLen; + QString emptyStr; + ++ // The limit to the amount of times the DTD parsing functions can be called ++ // for the DTD currently being parsed. ++ int dtdRecursionLimit; ++ + const QString &string(); + void stringClear(); + void stringAddC(QChar); +@@ -492,6 +496,7 @@ private: + void unexpectedEof(ParseFunction where, int state); + void parseFailed(ParseFunction where, int state); + void pushParseState(ParseFunction function, int state); ++ bool isPartiallyExpandedEntityValueTooLarge(QString *errorMessage); + + Q_DECLARE_PUBLIC(QXmlSimpleReader) + QXmlSimpleReader *q_ptr; +@@ -2759,6 +2764,7 @@ QXmlSimpleReaderPrivate::QXmlSimpleReaderPrivate(QXmlSimpleReader *reader) + useNamespacePrefixes = false; + reportWhitespaceCharData = true; + reportEntities = false; ++ dtdRecursionLimit = 2; + } + + QXmlSimpleReaderPrivate::~QXmlSimpleReaderPrivate() +@@ -5018,6 +5024,11 @@ bool QXmlSimpleReaderPrivate::parseDoctype() + } + break; + case Mup: ++ if (dtdRecursionLimit > 0 && parameterEntities.size() > dtdRecursionLimit) { ++ reportParseError(QString::fromLatin1( ++ "DTD parsing exceeded recursion limit of %1.").arg(dtdRecursionLimit)); ++ return false; ++ } + if (!parseMarkupdecl()) { + parseFailed(&QXmlSimpleReaderPrivate::parseDoctype, state); + return false; +@@ -6627,6 +6638,37 @@ bool QXmlSimpleReaderPrivate::parseChoiceSeq() + return false; + } + ++bool QXmlSimpleReaderPrivate::isPartiallyExpandedEntityValueTooLarge(QString *errorMessage) ++{ ++ const QString value = string(); ++ QMap<QString, int> referencedEntityCounts; ++ foreach (QString entityName, entities.keys()) { ++ for (int i = 0; i < value.size() && i != -1; ) { ++ i = value.indexOf(entityName, i); ++ if (i != -1) { ++ // The entityName we're currently trying to find ++ // was matched in this string; increase our count. ++ ++referencedEntityCounts[entityName]; ++ i += entityName.size(); ++ } ++ } ++ } ++ ++ foreach (QString entityName, referencedEntityCounts.keys()) { ++ const int timesReferenced = referencedEntityCounts[entityName]; ++ const QString entityValue = entities[entityName]; ++ if (entityValue.size() * timesReferenced > 1024) { ++ if (errorMessage) { ++ *errorMessage = QString::fromLatin1("The XML entity \"%1\"" ++ "expands too a string that is too large to process when " ++ "referencing \"%2\" %3 times.").arg(entityName).arg(entityName).arg(timesReferenced); ++ } ++ return true; ++ } ++ } ++ return false; ++} ++ + /* + Parse a EntityDecl [70]. + +@@ -6721,6 +6763,15 @@ bool QXmlSimpleReaderPrivate::parseEntityDecl() + switch (state) { + case EValue: + if ( !entityExist(name())) { ++ QString errorMessage; ++ if (isPartiallyExpandedEntityValueTooLarge(&errorMessage)) { ++ // The entity at entityName is entityValue.size() characters ++ // long in its unexpanded form, and was mentioned timesReferenced times, ++ // resulting in a string that would be greater than 1024 characters. ++ reportParseError(errorMessage); ++ return false; ++ } ++ + entities.insert(name(), string()); + if (declHnd) { + if (!declHnd->internalEntityDecl(name(), string())) { +diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp +index 3904632..befa801 100644 +--- a/src/xml/sax/qxml.cpp ++++ b/src/xml/sax/qxml.cpp +@@ -426,7 +426,9 @@ private: + + // The limit to the amount of times the DTD parsing functions can be called + // for the DTD currently being parsed. +- int dtdRecursionLimit; ++ static const int dtdRecursionLimit = 2; ++ // The maximum amount of characters an entity value may contain, after expansion. ++ static const int entityCharacterLimit = 1024; + + const QString &string(); + void stringClear(); +@@ -496,7 +498,7 @@ private: + void unexpectedEof(ParseFunction where, int state); + void parseFailed(ParseFunction where, int state); + void pushParseState(ParseFunction function, int state); +- bool isPartiallyExpandedEntityValueTooLarge(QString *errorMessage); ++ bool isExpandedEntityValueTooLarge(QString *errorMessage); + + Q_DECLARE_PUBLIC(QXmlSimpleReader) + QXmlSimpleReader *q_ptr; +@@ -2764,7 +2766,6 @@ QXmlSimpleReaderPrivate::QXmlSimpleReaderPrivate(QXmlSimpleReader *reader) + useNamespacePrefixes = false; + reportWhitespaceCharData = true; + reportEntities = false; +- dtdRecursionLimit = 2; + } + + QXmlSimpleReaderPrivate::~QXmlSimpleReaderPrivate() +@@ -6638,30 +6639,43 @@ bool QXmlSimpleReaderPrivate::parseChoiceSeq() + return false; + } + +-bool QXmlSimpleReaderPrivate::isPartiallyExpandedEntityValueTooLarge(QString *errorMessage) ++bool QXmlSimpleReaderPrivate::isExpandedEntityValueTooLarge(QString *errorMessage) + { +- const QString value = string(); +- QMap<QString, int> referencedEntityCounts; +- foreach (QString entityName, entities.keys()) { +- for (int i = 0; i < value.size() && i != -1; ) { +- i = value.indexOf(entityName, i); +- if (i != -1) { +- // The entityName we're currently trying to find +- // was matched in this string; increase our count. +- ++referencedEntityCounts[entityName]; +- i += entityName.size(); ++ QMap<QString, int> literalEntitySizes; ++ // The entity at (QMap<QString,) referenced the entities at (QMap<QString,) (int>) times. ++ QMap<QString, QMap<QString, int> > referencesToOtherEntities; ++ QMap<QString, int> expandedSizes; ++ ++ // For every entity, check how many times all entity names were referenced in its value. ++ foreach (QString toSearch, entities.keys()) { ++ // The amount of characters that weren't entity names, but literals, like 'X'. ++ QString leftOvers = entities.value(toSearch); ++ // How many times was entityName referenced by toSearch? ++ foreach (QString entityName, entities.keys()) { ++ for (int i = 0; i < leftOvers.size() && i != -1; ) { ++ i = leftOvers.indexOf(QString::fromLatin1("&%1;").arg(entityName), i); ++ if (i != -1) { ++ leftOvers.remove(i, entityName.size() + 2); ++ // The entityName we're currently trying to find was matched in this string; increase our count. ++ ++referencesToOtherEntities[toSearch][entityName]; ++ } + } + } ++ literalEntitySizes[toSearch] = leftOvers.size(); + } + +- foreach (QString entityName, referencedEntityCounts.keys()) { +- const int timesReferenced = referencedEntityCounts[entityName]; +- const QString entityValue = entities[entityName]; +- if (entityValue.size() * timesReferenced > 1024) { ++ foreach (QString entity, referencesToOtherEntities.keys()) { ++ expandedSizes[entity] = literalEntitySizes[entity]; ++ foreach (QString referenceTo, referencesToOtherEntities.value(entity).keys()) { ++ const int references = referencesToOtherEntities.value(entity).value(referenceTo); ++ // The total size of an entity's value is the expanded size of all of its referenced entities, plus its literal size. ++ expandedSizes[entity] += expandedSizes[referenceTo] * references + literalEntitySizes[referenceTo] * references; ++ } ++ ++ if (expandedSizes[entity] > entityCharacterLimit) { + if (errorMessage) { +- *errorMessage = QString::fromLatin1("The XML entity \"%1\"" +- "expands too a string that is too large to process when " +- "referencing \"%2\" %3 times.").arg(entityName).arg(entityName).arg(timesReferenced); ++ *errorMessage = QString::fromLatin1("The XML entity \"%1\" expands too a string that is too large to process (%2 characters > %3)."); ++ *errorMessage = (*errorMessage).arg(entity).arg(expandedSizes[entity]).arg(entityCharacterLimit); + } + return true; + } +@@ -6764,10 +6778,7 @@ bool QXmlSimpleReaderPrivate::parseEntityDecl() + case EValue: + if ( !entityExist(name())) { + QString errorMessage; +- if (isPartiallyExpandedEntityValueTooLarge(&errorMessage)) { +- // The entity at entityName is entityValue.size() characters +- // long in its unexpanded form, and was mentioned timesReferenced times, +- // resulting in a string that would be greater than 1024 characters. ++ if (isExpandedEntityValueTooLarge(&errorMessage)) { + reportParseError(errorMessage); + return false; + } +-- +1.7.1 diff --git a/extra/qt4/PKGBUILD b/extra/qt4/PKGBUILD index 7aeae075b..a35a577f3 100644 --- a/extra/qt4/PKGBUILD +++ b/extra/qt4/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 197232 2013-10-24 13:09:09Z andrea $ +# $Id: PKGBUILD 201436 2013-12-11 15:31:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=qt4 pkgver=4.8.5 -pkgrel=6 +pkgrel=7 arch=('i686' 'x86_64' 'mips64el') url='http://qt-project.org/' license=('GPL3' 'LGPL' 'FDL' 'custom') pkgdesc='A cross-platform application and UI framework' depends=('libtiff' 'libpng' 'sqlite' 'ca-certificates' 'dbus' 'fontconfig' 'libgl' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' - 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils') + 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'libmng') makedepends=('postgresql-libs' 'mariadb' 'unixodbc' 'cups' 'gtk2' 'libfbclient' 'mesa') optdepends=('qtchooser: set the default Qt toolkit' @@ -36,7 +36,8 @@ source=("http://download.qt-project.org/official_releases/qt/4.8/${pkgver}/${_pk 'linguist-qt4.desktop' 'qdbusviewer-qt4.desktop' 'improve-cups-support.patch' 'declarative-fix-sigbus.patch' - 'qtbug-31579.patch' 'qtbug-32534.patch' 'qtbug-32908.patch') + 'qtbug-31579.patch' 'qtbug-32534.patch' 'qtbug-32908.patch' + 'libmng2.patch' 'CVE-2013-4549.patch') md5sums=('1864987bdbb2f58f8ae8b350dfdbe133' 'a16638f4781e56e7887ff8212a322ecc' '8a28b3f52dbeb685d4b69440b520a3e1' @@ -47,7 +48,9 @@ md5sums=('1864987bdbb2f58f8ae8b350dfdbe133' 'aac963d05a9d5733e2bfce9e26607f51' '6ed8d26a8e4a9bba1f6c08fb99cc8357' 'bb0e0fa6ba953fa590d81ac612374e11' - 'db343dcae522bc90d802ad1e83b7f5dd') + 'db343dcae522bc90d802ad1e83b7f5dd' + '0ba4ffc9ff1acb9bf8a5f592ba956d48' + '8701bd7445426c1ad5da3ddbd72df6b4') prepare() { cd ${_pkgfqn} @@ -65,6 +68,11 @@ prepare() { # (FS#36947) (QTBUG#32908) patch -p1 -i "${srcdir}"/qtbug-32908.patch + # (FS#38081) + patch -p1 -i "${srcdir}"/CVE-2013-4549.patch + # (QTBUG#34894) + patch -p1 -i "${srcdir}"/libmng2.patch + sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,gcc}-base.conf sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf @@ -80,8 +88,6 @@ build() { if [ "${CARCH}" = "mips64el" ]; then export CXXFLAGS="${CXXFLAGS} -fpermissive" - else - extra="-plugin-sql-ibase" fi cd ${_pkgfqn} @@ -113,8 +119,7 @@ build() { -optimized-qmake \ -reduce-relocations \ -dbus-linked \ - -no-openvg \ - $extra + -no-openvg make } diff --git a/extra/qt4/libmng2.patch b/extra/qt4/libmng2.patch new file mode 100644 index 000000000..b6000fc0b --- /dev/null +++ b/extra/qt4/libmng2.patch @@ -0,0 +1,35 @@ +From 515617e55be9a7bfa738a9c32ef8b19065de37d4 Mon Sep 17 00:00:00 2001 +From: aavit <eirik.aavitsland@digia.com> +Date: Fri, 22 Nov 2013 15:49:44 +0100 +Subject: [PATCH] Recognize newer libmng versions in config test + +libmng 2.0.x has been released and is compatible and usable, but since +it no longer provides a VERSION_MAJOR macro, the config test would fail. + +Task-number: QTBUG-34894 +Change-Id: I36f6ed9d69dbae88feb1b88ce099bf36c9283133 +Reviewed-by: Liang Qi <liang.qi@digia.com> +(cherry picked from qtimageformats/9ae386653c321c8ddc10fad5ea88f32ebb3d3ffe) +--- + config.tests/unix/libmng/libmng.cpp | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/config.tests/unix/libmng/libmng.cpp b/config.tests/unix/libmng/libmng.cpp +index 0fbe554..9db10ff 100644 +--- a/config.tests/unix/libmng/libmng.cpp ++++ b/config.tests/unix/libmng/libmng.cpp +@@ -46,9 +46,11 @@ int main(int, char **) + mng_handle hMNG; + mng_cleanup(&hMNG); + ++#if defined(MNG_VERSION_MAJOR) + #if MNG_VERSION_MAJOR < 1 || (MNG_VERSION_MAJOR == 1 && MNG_VERSION_MINOR == 0 && MNG_VERSION_RELEASE < 9) + #error System libmng version is less than 1.0.9; using built-in version instead. + #endif ++#endif + + return 0; + } +-- +1.7.1 + diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD index 7c197b293..0adac69d7 100644 --- a/extra/qt5/PKGBUILD +++ b/extra/qt5/PKGBUILD @@ -1,18 +1,14 @@ -# $Id: PKGBUILD 197149 2013-10-23 11:49:27Z andrea $ +# $Id: PKGBUILD 202711 2013-12-25 21:25:46Z andyrtr $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=qt5 pkgname=('qt5-base' - 'qt5-imageformats' - 'qt5-script' - 'qt5-svg' - 'qt5-xmlpatterns') -# V8 is not ported yet to mips64el, don't build jsbackend and its reverse dependencies there. -[ "$CARCH" != "mips64el" ] && pkgname+=( + 'qt5-connectivity' 'qt5-declarative' 'qt5-doc' 'qt5-graphicaleffects' - 'qt5-jsbackend' + 'qt5-imageformats' + 'qt5-location' 'qt5-multimedia' 'qt5-quick1' 'qt5-quickcontrols' @@ -25,32 +21,30 @@ pkgname=('qt5-base' 'qt5-webkit' 'qt5-x11extras' 'qt5-xmlpatterns') -pkgver=5.1.1 -pkgrel=5 +pkgver=5.2.0 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://qt-project.org/' license=('GPL3' 'LGPL' 'FDL' 'custom') makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb-util-keysyms' - 'mesa' 'at-spi2-core' 'alsa-lib' 'gstreamer0.10-base-plugins' + 'mesa' 'at-spi2-core' 'alsa-lib' 'gstreamer0.10-base-plugins' 'libmng' 'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme' 'desktop-file-utils' 'postgresql-libs' 'libmariadbclient' 'sqlite' 'unixodbc' 'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig' - 'openal' 'gtk2' 'libxkbcommon') + 'openal' 'gtk2' 'libxkbcommon' 'python') [ "$CARCH" != "mips64el" ] && makedepends+=('libfbclient') groups=('qt' 'qt5') _pkgfqn="qt-everywhere-opensource-src-${pkgver}" -source=("http://download.qt-project.org/official_releases/qt/5.1/${pkgver}/single/${_pkgfqn}.tar.xz" +source=("http://download.qt-project.org/official_releases/qt/5.2/${pkgver}/single/${_pkgfqn}.tar.xz" 'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qdbusviewer.desktop' - 'use-python2.patch' 'qatomic-before-mips32.patch' - 'bison3.patch') -md5sums=('697b7b8768ef8895e168366ab6b44760' + 'use-python2.patch' 'qatomic-before-mips32.patch') +md5sums=('8f60b47ca9461831d940f579ee90517e' 'b2897dd6a2967bccf8f10e397aafee55' '9638a78e502719ef8fe5f8d10d0361a9' '188da8f4c87316e730ebf1c6217bf5a0' '322b419b16c75d4de0ee7ad0a246caa1' - '92831f79144d5cb8121915423ba47575' - '84d7fcc2b5f270f482d5522ae01c29e2' - '6b162cd2bc104f0ae83ca039401be7bf') + 'a378deccf363bd6079da459c89aff7b9' + '84d7fcc2b5f270f482d5522ae01c29e2') prepare() { cd ${_pkgfqn} @@ -67,10 +61,6 @@ prepare() { # Fix build without -march=mips32, mips64 or its superset. patch -p1 -i "$srcdir/qatomic-before-mips32.patch" - - # Fix build with bison 3.x - cd qtwebkit - patch -p1 -i "${srcdir}"/bison3.patch } build() { @@ -121,20 +111,20 @@ fi package_qt5-base() { pkgdesc='A cross-platform application and UI framework' depends=('libjpeg-turbo' 'xcb-util-keysyms' 'libgl' 'dbus' 'fontconfig' 'systemd' - 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'libpng' 'xcb-util-image' - 'icu' 'qtchooser' 'libxkbcommon') + 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu' + 'qtchooser' 'libxkbcommon') optdepends=('postgresql-libs: PostgreSQL driver' 'libmariadbclient: MariaDB driver' 'unixodbc: ODBC driver') [ "$CARCH" != "mips64el" ] && optdepends+=('libfbclient: Firebird/iBase driver') conflicts=('qt') + options=('staticlibs') #libQt5PlatformSupport builds static only cd ${_pkgfqn}/qtbase make INSTALL_ROOT="${pkgdir}" install - cd "${srcdir}" - install -D -m644 ${_pkgfqn}/qtbase/LGPL_EXCEPTION.txt \ - ${pkgdir}/usr/share/licenses/${pkgbase}/LGPL_EXCEPTION.txt + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt # Fix wrong path in prl files find "${pkgdir}/usr/lib" -type f -name '*.prl' \ @@ -142,7 +132,7 @@ package_qt5-base() { # Fix wrong qmake path in pri file sed -i "s|${srcdir}/${_pkgfqn}/qtbase|/usr|" \ - "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap.pri + "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri # Useful symlinks install -d "${pkgdir}"/usr/bin @@ -151,9 +141,24 @@ package_qt5-base() { done } +package_qt5-connectivity() { + pkgdesc='A cross-platform application and UI framework (QtBluetooth, QtNfc)' + depends=('qt5-declarative') + + cd ${_pkgfqn}/qtconnectivity + make INSTALL_ROOT="${pkgdir}" install + + # Fix wrong path in prl files + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; + + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt +} + package_qt5-declarative() { pkgdesc='A cross-platform application and UI framework (QtQml, QtQuick)' - depends=('qt5-jsbackend' 'qt5-xmlpatterns') + depends=('qt5-xmlpatterns') conflicts=('qt') cd ${_pkgfqn}/qtdeclarative @@ -168,6 +173,9 @@ package_qt5-declarative() { for b in "${pkgdir}"/usr/lib/qt/bin/*; do ln -s /usr/lib/qt/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5 done + + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt } package_qt5-doc() { @@ -177,23 +185,14 @@ package_qt5-doc() { conflicts=('qt-doc') replaces=('qt-doc') provides=('qt-doc') - options=('docs') + options=('docs' '!emptydirs') groups=() cd ${_pkgfqn} make INSTALL_ROOT="${pkgdir}" install_docs -} -package_qt5-jsbackend() { - pkgdesc='A cross-platform application and UI framework (QtV8)' - depends=('qt5-base') - - cd ${_pkgfqn}/qtjsbackend - make INSTALL_ROOT="${pkgdir}" install - - # Fix wrong path in prl files - find "${pkgdir}/usr/lib" -type f -name '*.prl' \ - -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt } package_qt5-xmlpatterns() { @@ -213,6 +212,9 @@ package_qt5-xmlpatterns() { for b in "${pkgdir}"/usr/lib/qt/bin/*; do ln -s /usr/lib/qt/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5 done + + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt } package_qt5-translations() { @@ -222,6 +224,9 @@ package_qt5-translations() { cd ${_pkgfqn}/qttranslations make INSTALL_ROOT="${pkgdir}" install + + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt } package_qt5-multimedia() { @@ -235,6 +240,9 @@ package_qt5-multimedia() { # Fix wrong path in prl files find "${pkgdir}/usr/lib" -type f -name '*.prl' \ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; + + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt } package_qt5-graphicaleffects() { @@ -243,6 +251,9 @@ package_qt5-graphicaleffects() { cd ${_pkgfqn}/qtgraphicaleffects make INSTALL_ROOT="${pkgdir}" install + + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt } package_qt5-imageformats() { @@ -252,6 +263,24 @@ package_qt5-imageformats() { cd ${_pkgfqn}/qtimageformats make INSTALL_ROOT="${pkgdir}" install + + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt +} + +package_qt5-location() { + pkgdesc='A cross-platform application and UI framework (QtLocation, QtPositioning)' + depends=('qt5-declarative') + + cd ${_pkgfqn}/qtlocation + make INSTALL_ROOT="${pkgdir}" install + + # Fix wrong path in prl files + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; + + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt } package_qt5-quick1() { @@ -271,6 +300,9 @@ package_qt5-quick1() { for b in "${pkgdir}"/usr/lib/qt/bin/*; do ln -s /usr/lib/qt/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5 done + + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt } package_qt5-quickcontrols() { @@ -279,6 +311,9 @@ package_qt5-quickcontrols() { cd ${_pkgfqn}/qtquickcontrols make INSTALL_ROOT="${pkgdir}" install + + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt } package_qt5-script() { @@ -292,6 +327,9 @@ package_qt5-script() { # Fix wrong path in prl files find "${pkgdir}/usr/lib" -type f -name '*.prl' \ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; + + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt } package_qt5-sensors() { @@ -304,6 +342,9 @@ package_qt5-sensors() { # Fix wrong path in prl files find "${pkgdir}/usr/lib" -type f -name '*.prl' \ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; + + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt } package_qt5-serialport() { @@ -316,6 +357,9 @@ package_qt5-serialport() { # Fix wrong path in prl files find "${pkgdir}/usr/lib" -type f -name '*.prl' \ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; + + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt } package_qt5-svg() { @@ -329,6 +373,9 @@ package_qt5-svg() { # Fix wrong path in prl files find "${pkgdir}/usr/lib" -type f -name '*.prl' \ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; + + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt } package_qt5-tools() { @@ -338,7 +385,7 @@ package_qt5-tools() { optdepends=('qt5-doc: documentation') install='qt5-tools.install' conflicts=('qt') - options=('staticlibs') # libQtUiTools builds as static only$ + options=('staticlibs') # libQt5UiTools builds as static only$ cd ${_pkgfqn}/qttools make INSTALL_ROOT="${pkgdir}" install @@ -373,11 +420,15 @@ package_qt5-tools() { for b in "${pkgdir}"/usr/lib/qt/bin/*; do ln -s /usr/lib/qt/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5 done + + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt } package_qt5-webkit() { pkgdesc='A cross-platform application and UI framework (QtWebKit)' - depends=('qt5-declarative' 'gstreamer0.10-base' 'libxslt' 'libxcomposite' 'qt5-sensors') + depends=('qt5-sensors' 'qt5-location' 'gstreamer0.10-base' 'libxslt' 'libxcomposite') + license=('GPL3' 'LGPL' 'FDL') cd ${_pkgfqn}/qtwebkit make INSTALL_ROOT="${pkgdir}" install @@ -400,4 +451,7 @@ package_qt5-x11extras() { # Fix wrong path in prl files find "${pkgdir}/usr/lib" -type f -name '*.prl' \ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; + + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt } diff --git a/extra/qt5/bison3.patch b/extra/qt5/bison3.patch deleted file mode 100644 index 4070c88e8..000000000 --- a/extra/qt5/bison3.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 60ba8bd5b3575d0c7740571fbb4e681b21a49a82 Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen <allan.jensen@digia.com> -Date: Fri, 16 Aug 2013 18:27:07 +0200 -Subject: [PATCH] ANGLE doesn't build with bison 3.0 - -https://bugs.webkit.org/show_bug.cgi?id=119798 - -Reviewed by Antti Koivisto. - -Make glslang.y compatible with bison 3.0 -by using %lex-param to set YYLEX_PARAM. - -* src/compiler/glslang.y: - -git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154109 268f45cc-cd09-0410-ab3c-d52691b4dbfc - -Task-number: QTBUG-32913 -Change-Id: I15505d31f0588c4d558b73befdb9d2358e29c1a3 -Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> ---- - Source/ThirdParty/ANGLE/src/compiler/glslang.y | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/Source/ThirdParty/ANGLE/src/compiler/glslang.y b/Source/ThirdParty/ANGLE/src/compiler/glslang.y -index 3cad335..b41e95a 100644 ---- a/Source/ThirdParty/ANGLE/src/compiler/glslang.y -+++ b/Source/ThirdParty/ANGLE/src/compiler/glslang.y -@@ -47,6 +47,7 @@ WHICH GENERATES THE GLSL ES PARSER (glslang_tab.cpp AND glslang_tab.h). - %expect 1 /* One shift reduce conflict because of if | else */ - %pure-parser - %parse-param {TParseContext* context} -+%lex-param {YYLEX_PARAM} - - %union { - struct { --- -1.7.1 - diff --git a/extra/qt5/use-python2.patch b/extra/qt5/use-python2.patch index 57487b996..3433766db 100644 --- a/extra/qt5/use-python2.patch +++ b/extra/qt5/use-python2.patch @@ -1,54 +1,6 @@ ---- qt-everywhere-opensource-src-5.0.0/qtjsbackend/src/v8/v8.pri~ 2013-01-11 06:50:55.241495644 +0000 -+++ qt-everywhere-opensource-src-5.0.0/qtjsbackend/src/v8/v8.pri 2013-01-11 06:51:29.987894356 +0000 -@@ -303,7 +303,7 @@ - V8_EXPERIMENTAL_LIBRARY_FILES = \ - $$V8SRC/proxy.js \ - --v8_js2c.commands = python $$V8DIR/tools/js2c.py $$V8_GENERATED_SOURCES_DIR/libraries.cpp CORE off -+v8_js2c.commands = python2 $$V8DIR/tools/js2c.py $$V8_GENERATED_SOURCES_DIR/libraries.cpp CORE off - v8_js2c.commands += $$V8SRC/macros.py ${QMAKE_FILE_IN} - v8_js2c.output = $$V8_GENERATED_SOURCES_DIR/libraries.cpp - v8_js2c.input = V8_LIBRARY_FILES -@@ -314,7 +314,7 @@ - v8_js2c.name = generating[v8] ${QMAKE_FILE_IN} - silent:v8_js2c.commands = @echo generating[v8] ${QMAKE_FILE_IN} && $$v8_js2c.commands - --v8_js2c_experimental.commands = python $$V8DIR/tools/js2c.py $$V8_GENERATED_SOURCES_DIR/experimental-libraries.cpp EXPERIMENTAL off -+v8_js2c_experimental.commands = python2 $$V8DIR/tools/js2c.py $$V8_GENERATED_SOURCES_DIR/experimental-libraries.cpp EXPERIMENTAL off - v8_js2c_experimental.commands += $$V8SRC/macros.py ${QMAKE_FILE_IN} - v8_js2c_experimental.output = $$V8_GENERATED_SOURCES_DIR/experimental-libraries.cpp - v8_js2c_experimental.input = V8_EXPERIMENTAL_LIBRARY_FILES ---- qt-everywhere-opensource-src-5.0.0/qtwebkit/Source/JavaScriptCore/DerivedSources.pri~ 2013-01-09 11:29:16.452266719 +0000 -+++ qt-everywhere-opensource-src-5.0.0/qtwebkit/Source/JavaScriptCore/DerivedSources.pri 2013-01-09 11:30:18.188538725 +0000 -@@ -85,14 +85,14 @@ - retgen.output = RegExpJitTables.h - retgen.script = $$PWD/create_regex_tables - retgen.input = retgen.script --retgen.commands = python $$retgen.script > ${QMAKE_FILE_OUT} -+retgen.commands = python2 $$retgen.script > ${QMAKE_FILE_OUT} - GENERATORS += retgen - - #GENERATOR: "KeywordLookup.h": decision tree used by the lexer - klgen.output = KeywordLookup.h - klgen.script = $$PWD/KeywordLookupGenerator.py - klgen.input = KEYWORDLUT_FILES --klgen.commands = python $$klgen.script ${QMAKE_FILE_NAME} > ${QMAKE_FILE_OUT} -+klgen.commands = python2 $$klgen.script ${QMAKE_FILE_NAME} > ${QMAKE_FILE_OUT} - GENERATORS += klgen - - EXTRACTOR_BINARY = LLIntOffsetsExtractor$$BIN_EXTENSION -@@ -117,7 +117,7 @@ - disassembler.input = DISASSEMBLER_FILES - disassembler.script = $$PWD/disassembler/udis86/itab.py - disassembler.depends = $$DISASSEMBLER_DEPENDENCY -- disassembler.commands = python $$disassembler.script ${QMAKE_FILE_NAME} --outputDir ${QMAKE_FUNC_FILE_OUT_PATH} -+ disassembler.commands = python2 $$disassembler.script ${QMAKE_FILE_NAME} --outputDir ${QMAKE_FUNC_FILE_OUT_PATH} - disassembler.CONFIG += no_link - GENERATORS += disassembler - } ---- qt-everywhere-opensource-src-5.0.0/qtwebkit/Source/WebCore/DerivedSources.pri~ 2013-01-09 11:46:01.165612894 +0000 -+++ qt-everywhere-opensource-src-5.0.0/qtwebkit/Source/WebCore/DerivedSources.pri 2013-01-09 11:46:27.465404725 +0000 -@@ -779,7 +779,7 @@ +--- qt-everywhere-opensource-src-5.2.0-rc1/qtwebkit/Source/WebCore/DerivedSources.pri~ 2013-11-29 16:57:47.573721157 +0000 ++++ qt-everywhere-opensource-src-5.2.0-rc1/qtwebkit/Source/WebCore/DerivedSources.pri 2013-11-29 16:58:22.270157823 +0000 +@@ -819,7 +819,7 @@ inspectorValidate.output = InspectorProtocolVersion.h inspectorValidate.input = INSPECTOR_JSON inspectorValidate.script = $$PWD/inspector/generate-inspector-protocol-version @@ -57,7 +9,7 @@ inspectorValidate.depends = $$PWD/inspector/generate-inspector-protocol-version inspectorValidate.add_output_to_sources = false GENERATORS += inspectorValidate -@@ -787,7 +787,7 @@ +@@ -827,7 +827,7 @@ inspectorJSON.output = InspectorFrontend.cpp InspectorBackendDispatcher.cpp InspectorTypeBuilder.cpp inspectorJSON.input = INSPECTOR_JSON inspectorJSON.script = $$PWD/inspector/CodeGeneratorInspector.py @@ -66,7 +18,7 @@ inspectorJSON.depends = $$inspectorJSON.script GENERATORS += inspectorJSON -@@ -908,7 +908,7 @@ +@@ -927,7 +927,7 @@ entities.output = HTMLEntityTable.cpp entities.input = HTML_ENTITIES entities.script = $$PWD/html/parser/create-html-entity-table @@ -75,44 +27,62 @@ entities.clean = ${QMAKE_FILE_OUT} entities.depends = $$PWD/html/parser/create-html-entity-table GENERATORS += entities ---- qt-everywhere-opensource-src-5.0.1/qtwebkit/Source/WebKit2/DerivedSources.pri~ 2013-02-10 13:48:49.800319915 +0000 -+++ qt-everywhere-opensource-src-5.0.1/qtwebkit/Source/WebKit2/DerivedSources.pri 2013-02-10 13:49:09.966867900 +0000 -@@ -120,14 +120,14 @@ - $$PWD/Scripts/webkit2/model.py \ - $$PWD/Scripts/webkit2/parser.py +--- qt-everywhere-opensource-src-5.2.0-rc1/qtwebkit/Source/JavaScriptCore/DerivedSources.pri~ 2013-11-29 16:58:05.470269189 +0000 ++++ qt-everywhere-opensource-src-5.2.0-rc1/qtwebkit/Source/JavaScriptCore/DerivedSources.pri 2013-11-29 16:58:44.276678608 +0000 +@@ -83,14 +83,14 @@ + retgen.output = RegExpJitTables.h + retgen.script = $$PWD/create_regex_tables + retgen.input = retgen.script +-retgen.commands = python $$retgen.script > ${QMAKE_FILE_OUT} ++retgen.commands = python2 $$retgen.script > ${QMAKE_FILE_OUT} + GENERATORS += retgen --message_header_generator.commands = $${PYTHON} $${SOURCE_DIR}/WebKit2/Scripts/generate-messages-header.py ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} -+message_header_generator.commands = python2 $${SOURCE_DIR}/WebKit2/Scripts/generate-messages-header.py ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} - message_header_generator.input = MESSAGE_RECEIVERS - message_header_generator.depends = $$SCRIPTS - message_header_generator.output_function = message_header_generator_output - message_header_generator.add_output_to_sources = false - GENERATORS += message_header_generator + #GENERATOR: "KeywordLookup.h": decision tree used by the lexer + klgen.output = KeywordLookup.h + klgen.script = $$PWD/KeywordLookupGenerator.py + klgen.input = KEYWORDLUT_FILES +-klgen.commands = python $$klgen.script ${QMAKE_FILE_NAME} > ${QMAKE_FILE_OUT} ++klgen.commands = python2 $$klgen.script ${QMAKE_FILE_NAME} > ${QMAKE_FILE_OUT} + GENERATORS += klgen --message_receiver_generator.commands = $${PYTHON} $${SOURCE_DIR}/WebKit2/Scripts/generate-message-receiver.py ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} -+message_receiver_generator.commands = python2 $${SOURCE_DIR}/WebKit2/Scripts/generate-message-receiver.py ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} - message_receiver_generator.input = MESSAGE_RECEIVERS - message_receiver_generator.depends = $$SCRIPTS - message_receiver_generator.output_function = message_receiver_generator_output ---- qt-everywhere-opensource-src-5.0.2/qtwebkit/Tools/qmake/mkspecs/features/configure.prf~ 2013-04-11 08:05:15.149214600 +0000 -+++ qt-everywhere-opensource-src-5.0.2/qtwebkit/Tools/qmake/mkspecs/features/configure.prf 2013-04-11 08:05:28.829105110 +0000 + EXTRACTOR_BINARY = LLIntOffsetsExtractor$$BIN_EXTENSION +@@ -114,7 +114,7 @@ + disassembler.input = DISASSEMBLER_FILES + disassembler.script = $$PWD/disassembler/udis86/itab.py + disassembler.depends = $$DISASSEMBLER_DEPENDENCY +- disassembler.commands = python $$disassembler.script ${QMAKE_FILE_NAME} --outputDir ${QMAKE_FUNC_FILE_OUT_PATH} ++ disassembler.commands = python2 $$disassembler.script ${QMAKE_FILE_NAME} --outputDir ${QMAKE_FUNC_FILE_OUT_PATH} + disassembler.CONFIG += no_link + GENERATORS += disassembler + } +--- qt-everywhere-opensource-src-5.2.0-rc1/qtwebkit/Tools/qmake/mkspecs/features/configure.prf~ 2013-11-29 16:59:04.859875494 +0000 ++++ qt-everywhere-opensource-src-5.2.0-rc1/qtwebkit/Tools/qmake/mkspecs/features/configure.prf 2013-11-29 16:59:40.539638968 +0000 @@ -116,7 +116,7 @@ - production_build:blackberry { - addReasonForSkippingBuild("Build not supported on BB10 yet.") + production_build:blackberry|qnx { + addReasonForSkippingBuild("Build not supported on BB10/QNX yet.") } - requiredPrograms = gperf python perl bison ruby flex + requiredPrograms = gperf python2 perl bison ruby flex for(program, requiredPrograms): \ !programExistsInPath($$program): \ addReasonForSkippingBuild("Missing $$program from PATH") ---- qt-everywhere-opensource-src-5.1.0/qtjsbackend/src/3rdparty/v8/src/d8.gyp.old 2013-07-03 19:22:34.536705691 +0000 -+++ qt-everywhere-opensource-src-5.1.0/qtjsbackend/src/3rdparty/v8/src/d8.gyp 2013-07-03 19:22:25.606770334 +0000 -@@ -99,7 +99,7 @@ - '<(SHARED_INTERMEDIATE_DIR)/d8-js.cc', - ], - 'action': [ -- 'python', -+ 'python2', - '../tools/js2c.py', - '<@(_outputs)', - 'D8', +--- qt-everywhere-opensource-src-5.2.0-rc1/qtdeclarative/src/3rdparty/masm/masm.pri~ 2013-11-29 17:03:43.228028589 +0000 ++++ qt-everywhere-opensource-src-5.2.0-rc1/qtdeclarative/src/3rdparty/masm/masm.pri 2013-11-29 17:03:57.537933557 +0000 +@@ -47,7 +47,7 @@ + udis86.output = udis86_itab.h + udis86.input = ITAB + udis86.CONFIG += no_link +- udis86.commands = python $$PWD/disassembler/udis86/itab.py ${QMAKE_FILE_IN} ++ udis86.commands = python2 $$PWD/disassembler/udis86/itab.py ${QMAKE_FILE_IN} + QMAKE_EXTRA_COMPILERS += udis86 + + udis86_tab_cfile.target = $$OUT_PWD/udis86_itab.c +@@ -67,7 +67,7 @@ + retgen.script = $$PWD/create_regex_tables + retgen.input = retgen.script + retgen.CONFIG += no_link +-retgen.commands = python $$retgen.script > ${QMAKE_FILE_OUT} ++retgen.commands = python2 $$retgen.script > ${QMAKE_FILE_OUT} + QMAKE_EXTRA_COMPILERS += retgen + + # Taken from WebKit/Tools/qmake/mkspecs/features/unix/default_post.prf diff --git a/extra/qtchooser/PKGBUILD b/extra/qtchooser/PKGBUILD index 41a01e509..e3b8090bc 100644 --- a/extra/qtchooser/PKGBUILD +++ b/extra/qtchooser/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188894 2013-06-24 14:42:11Z andrea $ +# $Id: PKGBUILD 201641 2013-12-17 11:16:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=qtchooser -pkgver=31 +pkgver=39 pkgrel=1 pkgdesc='Wrap the other Qt tools by searching for different instances of Qt on the system' arch=('i686' 'x86_64' 'mips64el') @@ -10,26 +10,26 @@ url='http://qt.gitorious.org/qt/qtchooser' license=('GPL') backup=('etc/xdg/qtchooser/default.conf') depends=('gcc-libs') -source=("http://macieira.org/${pkgname}/${pkgname}-${pkgver}-g980c64c.tar.gz" +source=("http://macieira.org/${pkgname}/${pkgname}-${pkgver}-g4717841.tar.gz" {3,4,5}.conf) -md5sums=('36497558a0266dcbe4cccb6477bfc158' +md5sums=('fcf1b5e8373147e48ce72b9c1ffe3d10' '7c5da2b7911d1c4fabc63d6ef00f0020' 'aa4d49b269e1b806f5eea170801f0aa6' 'cf83f09a9a5a44d898b93f624d74dd11') build() { - cd ${pkgname}-${pkgver}-g980c64c + cd ${pkgname}-${pkgver}-g4717841 make } package() { - cd ${pkgname}-${pkgver}-g980c64c + cd ${pkgname}-${pkgver}-g4717841 make INSTALL_ROOT="${pkgdir}" install install -d "${pkgdir}"/etc/xdg/qtchooser install -m644 "${srcdir}"/{3,4,5}.conf \ "${pkgdir}"/etc/xdg/qtchooser/ - + # Set the default Qt ln -s /etc/xdg/qtchooser/5.conf \ "${pkgdir}"/etc/xdg/qtchooser/default.conf diff --git a/extra/qtcreator/PKGBUILD b/extra/qtcreator/PKGBUILD new file mode 100644 index 000000000..0097a14a0 --- /dev/null +++ b/extra/qtcreator/PKGBUILD @@ -0,0 +1,60 @@ +# $Id: PKGBUILD 101820 2013-12-02 00:06:01Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org> +# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> +# Contributor: Dan Vratil <progdan@progdansoft.com> +# Contributor: thotypous <matiasΘarchlinux-br·org> +# Contributor: delor <bartekpiech gmail com> + +pkgname=qtcreator +pkgver=3.0.0 +_pkgver=3.0.0 +pkgrel=2 +pkgdesc='Lightweight, cross-platform integrated development environment' +arch=('i686' 'x86_64') +url='http://qt-project.org' +license=('LGPL') +depends=('qt5-quick1' 'qt5-tools' 'qt5-quickcontrols') +makedepends=('git' 'mesa') +options=('docs') +optdepends=('qt5-doc: for the integrated Qt documentation' + 'gdb: for the debugger' + 'cmake: for cmake project support' + 'openssh-askpass: for ssh support' + 'git: for git support' + 'mercurial: for mercurial support' + 'bzr: for bazaar support' + 'valgrind: for analyze support') +install=qtcreator.install +source=("git://gitorious.org/qt-creator/qt-creator.git#tag=v${_pkgver}" + "git://gitorious.org/qt-labs/qbs.git" + 'qtcreator.desktop') +md5sums=('SKIP' + 'SKIP' + '82888d4be900e7833d768050a135cd37') + +prepare() { + cd qt-creator + git submodule init + git config submodule.qbs.url $srcdir/qbs + git submodule update +} + +build() { + [[ -d build ]] && rm -r build + mkdir build && cd build + + qmake ../qt-creator/qtcreator.pro + make + make docs -j1 +} + +package() { + cd build + + make INSTALL_ROOT="${pkgdir}/usr/" install + make INSTALL_ROOT="${pkgdir}/usr/" install_docs + + install -Dm644 ${srcdir}/qtcreator.desktop ${pkgdir}/usr/share/applications/qtcreator.desktop + install -Dm644 ${srcdir}/qt-creator/LGPL_EXCEPTION.TXT ${pkgdir}/usr/share/licenses/qtcreator/LGPL_EXCEPTION.TXT +} diff --git a/extra/qtcreator/qtcreator.desktop b/extra/qtcreator/qtcreator.desktop new file mode 100644 index 000000000..0e8f73e64 --- /dev/null +++ b/extra/qtcreator/qtcreator.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Exec=/usr/bin/qtcreator +Name=Qt Creator +GenericName=C++ IDE +X-KDE-StartupNotify=true +Icon=/usr/share/icons/hicolor/512x512/apps/QtProject-qtcreator.png +Terminal=false +Type=Application +Categories=Qt;Development; diff --git a/extra/qtcreator/qtcreator.install b/extra/qtcreator/qtcreator.install new file mode 100644 index 000000000..4d4a283db --- /dev/null +++ b/extra/qtcreator/qtcreator.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/extra/quadrapassel/PKGBUILD b/extra/quadrapassel/PKGBUILD index bcb594e50..bcbe599f7 100644 --- a/extra/quadrapassel/PKGBUILD +++ b/extra/quadrapassel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198393 2013-10-30 14:35:57Z allan $ +# $Id: PKGBUILD 199337 2013-11-11 11:09:38Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=quadrapassel -pkgver=3.10.0 +pkgver=3.10.2 pkgrel=1 pkgdesc="Fit falling blocks together (Tetris-like game for GNOME)" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ install=quadrapassel.install url="https://live.gnome.org/Quadrapassel" groups=('gnome-extra') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) -sha256sums=('02e035d5486f023b2fee410dc909034163fd61369ee77cdfb0f07ac3069c46fa') +sha256sums=('c944acc9d13e82ecef68456f4d8d9ddab15970e605f439d84860f7d57018183c') build() { cd $pkgname-$pkgver diff --git a/extra/quazip/PKGBUILD b/extra/quazip/PKGBUILD new file mode 100644 index 000000000..78e0282a2 --- /dev/null +++ b/extra/quazip/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 199053 2013-11-07 23:52:10Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: trya <tryagainprod@gmail.com> + +pkgname=quazip +pkgver=0.5.1 +pkgrel=3 +pkgdesc="C++ wrapper for the Gilles Vollant's ZIP/UNZIP C package" +url="http://sourceforge.net/projects/quazip/" +license=('LGPL') +arch=('i686' 'x86_64') +depends=('qt4') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('eec6b9b6f19654230dfcd158f29ea9d0') + +build() { + cd ${pkgname}-${pkgver}/${pkgname} + qmake-qt4 PREFIX=/usr + make +} + +package() { + cd ${pkgname}-${pkgver}/${pkgname} + make INSTALL_ROOT="${pkgdir}" install + + install -d "${pkgdir}"/usr/share/apps/cmake-2.8/Modules + install -m644 ../FindQuaZip.cmake\ + "${pkgdir}"/usr/share/apps/cmake-2.8/Modules +} diff --git a/extra/qwt/PKGBUILD b/extra/qwt/PKGBUILD index 5e5ec46eb..38ffedc13 100644 --- a/extra/qwt/PKGBUILD +++ b/extra/qwt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179293 2013-03-04 21:34:48Z andrea $ +# $Id: PKGBUILD 201366 2013-12-09 17:09:35Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald.archlinux.org> pkgname=qwt -pkgver=6.0.2 -pkgrel=2 +pkgver=6.1.0 +pkgrel=1 pkgdesc="Qt Widgets for Technical Applications" arch=('i686' 'x86_64' 'mips64el') url="http://qwt.sourceforge.net/" @@ -11,7 +11,7 @@ depends=('qt4') license=("custom:$pkgname") source=("http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.bz2" \ "qwtconfig-archlinux.pri") -sha1sums=('cbdd00b29521987c9e7bc6aa51092f0474b9428d' +sha1sums=('48a967038f7aa9a9c87c64bcb2eb07c5df375565' 'aba0fc75f6d450237028b7b143bdcf05a79cabb3') build() { diff --git a/extra/raptor/PKGBUILD b/extra/raptor/PKGBUILD index 6492837fd..be7400cdf 100644 --- a/extra/raptor/PKGBUILD +++ b/extra/raptor/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 198394 2013-10-30 14:36:18Z allan $ +# $Id: PKGBUILD 202202 2013-12-19 10:41:19Z bpiotrowski $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: eric <eric@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=raptor -pkgver=2.0.10 -pkgrel=3 +pkgver=2.0.12 +pkgrel=1 pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples" arch=('i686' 'x86_64' 'mips64el') url="http://librdf.org/raptor" @@ -32,4 +32,4 @@ package() { cd "${srcdir}"/raptor2-${pkgver} make prefix="${pkgdir}"/usr install } -md5sums=('d9b0314eb835551adb48af037dcfd46e') +md5sums=('a015a7fcc2cbdd38ee1450a5eb526ab5') diff --git a/extra/rasqal/PKGBUILD b/extra/rasqal/PKGBUILD index a0f1ed7b4..1e9f54dec 100644 --- a/extra/rasqal/PKGBUILD +++ b/extra/rasqal/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 198396 2013-10-30 14:37:02Z allan $ +# $Id: PKGBUILD 202985 2013-12-30 08:44:05Z foutrelis $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: AndyRTR <andyrtr@archlinux.org> # Contributor: Lawrence Lee <valheru@facticius.net> @@ -6,13 +6,14 @@ pkgname=rasqal epoch=1 pkgver=0.9.30 -pkgrel=1 +pkgrel=3 pkgdesc="A free C library that handles Resource Description Framework (RDF) query syntaxes, query construction and query execution returning result bindings" url="http://librdf.org/rasqal" license=('GPL' 'LGPL') arch=('i686' 'x86_64' 'mips64el') depends=('raptor' 'mpfr' 'util-linux') source=(http://download.librdf.org/source/${pkgname}-${pkgver}.tar.gz) +md5sums=('b12c5f9cfdb6b04efce5a4a186b8416b') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -31,4 +32,3 @@ package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install } -md5sums=('b12c5f9cfdb6b04efce5a4a186b8416b') diff --git a/extra/rcs/PKGBUILD b/extra/rcs/PKGBUILD index b3331b406..363c3677d 100644 --- a/extra/rcs/PKGBUILD +++ b/extra/rcs/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 181864 2013-04-05 00:36:01Z bisson $ -# Contributor: dorphell <dorphell@archlinux.org> +# $Id: PKGBUILD 200617 2013-11-29 21:23:04Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: dorphell <dorphell@archlinux.org> pkgname=rcs -pkgver=5.8.2 +pkgver=5.9.2 pkgrel=1 pkgdesc='Revision Control System: manages multiple revisions of files' url='http://www.gnu.org/software/rcs/' license=('GPL3') arch=('i686' 'x86_64' 'mips64el') -source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") -sha1sums=('5972a7f97ab307e775083144cdf6b425c4aba7fe') +depends=('ed') +source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig}) +sha1sums=('cb053f6ba87ab6ea03306d6241e1cde67182100b' 'SKIP') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/rdesktop/PKGBUILD b/extra/rdesktop/PKGBUILD deleted file mode 100644 index 9b3b81803..000000000 --- a/extra/rdesktop/PKGBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# $Id: PKGBUILD 193090 2013-08-15 23:15:47Z eric $ -# Maintainer: -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Dan McGee <dan@archlinux.org> - -pkgname=rdesktop -pkgver=1.8.0 -pkgrel=3 -pkgdesc="An open source client for Windows Remote Desktop Services" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.rdesktop.org/" -license=('GPL3') -depends=('libao' 'libsamplerate' 'xorg-xrandr' 'pcsclite') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'rdesktop-send_physical_buttons.diff' 'rdesktop-libao.patch' 'rdesktop-tcp.patch' - rdesktop-r1729.patch rdesktop-r1731.patch rdesktop-r1732.patch) -sha1sums=('2d39a41d29ad1ad2509d1e343a2817a3c7d666de' - '809a9dc11ad4f704f79fc4bc2a70b76a4f42596d' - '68a48061e5ed76150c1444891a192f7884fd056e' - 'a14793c72194bed74725bcf75fdb8b93c7577399' - '972d6ec59cf140383880464e3ef43e03969f3bfe' - '9a417aba27ded0ab595cbb07fccd452bdc0af20c' - '1bc92e04058a2f5c02f42a5c97da7ee672a71698') - -prepare() { - cd ${pkgname}-${pkgver} - - # FS#15113 - patch -i "${srcdir}/rdesktop-send_physical_buttons.diff" - - # Fix libao segfault, from Fedora - patch -i "${srcdir}/rdesktop-libao.patch" - - # FS#36488 - patch -i "${srcdir}/rdesktop-tcp.patch" - patch -i "${srcdir}/rdesktop-r1731.patch" - patch -i "${srcdir}/rdesktop-r1732.patch" - - # FS#36505 - patch -i "${srcdir}/rdesktop-r1729.patch" -} - -build() { - cd ${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --enable-smartcard \ - --with-ipv6 - make -} - -package() { - cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install -} diff --git a/extra/rdesktop/rdesktop-libao.patch b/extra/rdesktop/rdesktop-libao.patch deleted file mode 100644 index 9def24443..000000000 --- a/extra/rdesktop/rdesktop-libao.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: rdpsnd_libao.c -=================================================================== ---- rdpsnd_libao.c (revision 1729) -+++ rdpsnd_libao.c (revision 1730) -@@ -111,6 +111,7 @@ - { - ao_sample_format format; - -+ memset(&format, 0, sizeof(format)); - format.bits = pwfx->wBitsPerSample; - format.channels = pwfx->nChannels; - format.rate = 44100; diff --git a/extra/rdesktop/rdesktop-r1729.patch b/extra/rdesktop/rdesktop-r1729.patch deleted file mode 100644 index 3f38a692c..000000000 --- a/extra/rdesktop/rdesktop-r1729.patch +++ /dev/null @@ -1,33 +0,0 @@ -Index: scard.c -=================================================================== ---- scard.c (revision 1728) -+++ scard.c (revision 1729) -@@ -2,8 +2,8 @@ - rdesktop: A Remote Desktop Protocol client. - Smart Card support - Copyright (C) Alexi Volkov <alexi@myrealbox.com> 2006 -- Copyright 2010 Pierre Ossman <ossman@cendio.se> for Cendio AB -- Copyright 2011 Henrik Andersson <hean01@cendio.se> for Cendio AB -+ Copyright 2010-2013 Pierre Ossman <ossman@cendio.se> for Cendio AB -+ Copyright 2011-2013 Henrik Andersson <hean01@cendio.se> for Cendio AB - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by -@@ -1109,6 +1109,7 @@ - MYPCSC_SCARDCONTEXT myHContext; - SERVER_DWORD dwTimeout; - SERVER_DWORD dwCount; -+ SERVER_DWORD dwPointerId; - SERVER_LPSCARD_READERSTATE_A rsArray, cur; - MYPCSC_LPSCARD_READERSTATE_A myRsArray; - long i; -@@ -1133,7 +1134,8 @@ - memset(rsArray, 0, dwCount * sizeof(SERVER_SCARD_READERSTATE_A)); - for (i = 0, cur = rsArray; i < dwCount; i++, cur++) - { -- in_uint32_le(in, cur->szReader); -+ in_uint32_le(in, dwPointerId); -+ cur->szReader = (char *)(intptr_t)dwPointerId; - in_uint32_le(in, cur->dwCurrentState); - in_uint32_le(in, cur->dwEventState); - in_uint32_le(in, cur->cbAtr); diff --git a/extra/rdesktop/rdesktop-r1731.patch b/extra/rdesktop/rdesktop-r1731.patch deleted file mode 100644 index f72728191..000000000 --- a/extra/rdesktop/rdesktop-r1731.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: rdesktop.c -=================================================================== ---- rdesktop.c (revision 1730) -+++ rdesktop.c (revision 1731) -@@ -87,7 +87,7 @@ - RD_BOOL g_sendmotion = True; - RD_BOOL g_bitmap_cache = True; - RD_BOOL g_bitmap_cache_persist_enable = False; --RD_BOOL g_bitmap_cache_precache = True; -+RD_BOOL g_bitmap_cache_precache = False; - RD_BOOL g_use_ctrl = True; - RD_BOOL g_encryption = True; - RD_BOOL g_encryption_initial = True; diff --git a/extra/rdesktop/rdesktop-r1732.patch b/extra/rdesktop/rdesktop-r1732.patch deleted file mode 100644 index a4260d0d0..000000000 --- a/extra/rdesktop/rdesktop-r1732.patch +++ /dev/null @@ -1,73 +0,0 @@ -Index: proto.h -=================================================================== ---- proto.h (revision 1731) -+++ proto.h (revision 1732) -@@ -144,6 +144,7 @@ - char *l_to_a(long N, int base); - int load_licence(unsigned char **data); - void save_licence(unsigned char *data, int length); -+void rd_create_ui(void); - RD_BOOL rd_pstcache_mkdir(void); - int rd_open_file(char *filename); - void rd_close_file(int fd); -Index: rdp.c -=================================================================== ---- rdp.c (revision 1731) -+++ rdp.c (revision 1732) -@@ -1044,6 +1044,9 @@ - uint8 type; - uint16 len_src_descriptor, len_combined_caps; - -+ /* at this point we need to ensure that we have ui created */ -+ rd_create_ui(); -+ - in_uint32_le(s, g_rdp_shareid); - in_uint16_le(s, len_src_descriptor); - in_uint16_le(s, len_combined_caps); -Index: rdesktop.c -=================================================================== ---- rdesktop.c (revision 1731) -+++ rdesktop.c (revision 1732) -@@ -87,7 +87,7 @@ - RD_BOOL g_sendmotion = True; - RD_BOOL g_bitmap_cache = True; - RD_BOOL g_bitmap_cache_persist_enable = False; --RD_BOOL g_bitmap_cache_precache = False; -+RD_BOOL g_bitmap_cache_precache = True; - RD_BOOL g_use_ctrl = True; - RD_BOOL g_encryption = True; - RD_BOOL g_encryption_initial = True; -@@ -1132,13 +1132,7 @@ - DEBUG(("Connection successful.\n")); - memset(password, 0, sizeof(password)); - -- /* only create a window if we dont have one intialized */ -- if (!ui_have_window()) -- { -- if (!ui_create_window()) -- return EX_OSERR; -- } -- -+ rd_create_ui(); - tcp_run_ui(True); - - g_redirect = False; -@@ -1732,6 +1726,18 @@ - close(fd); - } - -+/* create rdesktop ui */ -+void -+rd_create_ui() -+{ -+ /* only create a window if we dont have one intialized */ -+ if (!ui_have_window()) -+ { -+ if (!ui_create_window()) -+ return EX_OSERR; -+ } -+} -+ - /* Create the bitmap cache directory */ - RD_BOOL - rd_pstcache_mkdir(void) diff --git a/extra/rdesktop/rdesktop-send_physical_buttons.diff b/extra/rdesktop/rdesktop-send_physical_buttons.diff deleted file mode 100644 index 69620988f..000000000 --- a/extra/rdesktop/rdesktop-send_physical_buttons.diff +++ /dev/null @@ -1,70 +0,0 @@ -? aclocal.m4 -Index: rdesktop.c -=================================================================== -RCS file: /cvsroot/rdesktop/rdesktop/rdesktop.c,v -retrieving revision 1.163 -diff -u -r1.163 rdesktop.c ---- rdesktop.c 5 Apr 2008 06:15:45 -0000 1.163 -+++ rdesktop.c 5 Aug 2008 11:46:04 -0000 -@@ -73,6 +73,7 @@ - int g_win_button_size = 0; /* If zero, disable single app mode */ - RD_BOOL g_bitmap_compression = True; - RD_BOOL g_sendmotion = True; -+RD_BOOL g_send_physical_buttons = True; - RD_BOOL g_bitmap_cache = True; - RD_BOOL g_bitmap_cache_persist_enable = False; - RD_BOOL g_bitmap_cache_precache = True; -@@ -152,6 +153,7 @@ - fprintf(stderr, " -B: use BackingStore of X-server (if available)\n"); - fprintf(stderr, " -e: disable encryption (French TS)\n"); - fprintf(stderr, " -E: disable encryption from client to server\n"); -+ fprintf(stderr, " -M: do not map logical mouse buttons to physical\n"); - fprintf(stderr, " -m: do not send motion events\n"); - fprintf(stderr, " -C: use private colour map\n"); - fprintf(stderr, " -D: hide window manager decorations\n"); -@@ -450,7 +452,7 @@ - #endif - - while ((c = getopt(argc, argv, -- VNCOPT "A:u:L:d:s:c:p:n:k:g:o:fbBeEitmzCDKS:T:NX:a:x:Pr:045h?")) != -1) -+ VNCOPT "A:u:L:d:s:c:p:n:k:g:o:fbBeEitMmzCDKS:T:NX:a:x:Pr:045h?")) != -1) - { - switch (c) - { -@@ -584,6 +586,9 @@ - case 'E': - g_packet_encryption = False; - break; -+ case 'M': -+ g_send_physical_buttons = False; -+ break; - case 'm': - g_sendmotion = False; - break; -Index: xwin.c -=================================================================== -RCS file: /cvsroot/rdesktop/rdesktop/xwin.c,v -retrieving revision 1.235 -diff -u -r1.235 xwin.c ---- xwin.c 11 Jul 2008 03:51:23 -0000 1.235 -+++ xwin.c 5 Aug 2008 11:46:06 -0000 -@@ -36,6 +36,7 @@ - extern int g_ypos; - extern int g_pos; - extern RD_BOOL g_sendmotion; -+extern RD_BOOL g_send_physical_buttons; - extern RD_BOOL g_fullscreen; - extern RD_BOOL g_grab_keyboard; - extern RD_BOOL g_hide_decorations; -@@ -2190,7 +2191,8 @@ - receive physical buttons (true in mstsc as well) and - logical button behavior depends on the remote desktop's own - mouse settings */ -- xevent.xbutton.button = g_pointer_log_to_phys_map[xevent.xbutton.button - 1]; -+ if (g_send_physical_buttons) -+ xevent.xbutton.button = g_pointer_log_to_phys_map[xevent.xbutton.button - 1]; - button = xkeymap_translate_button(xevent.xbutton.button); - if (button == 0) - return; - - diff --git a/extra/rdesktop/rdesktop-tcp.patch b/extra/rdesktop/rdesktop-tcp.patch deleted file mode 100644 index f20182978..000000000 --- a/extra/rdesktop/rdesktop-tcp.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/rdesktop/trunk/tcp.c -+++ b/rdesktop/trunk/tcp.c -@@ -193,7 +193,7 @@ - int rcvd = 0, ssl_err; - - if (g_network_error == True) -- return; -+ return NULL; - - if (s == NULL) - { diff --git a/extra/refind-efi/PKGBUILD b/extra/refind-efi/PKGBUILD index aef4fa34c..1206cb882 100644 --- a/extra/refind-efi/PKGBUILD +++ b/extra/refind-efi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 194269 2013-09-12 15:17:40Z tpowa $ +# $Id: PKGBUILD 201584 2013-12-16 08:10:23Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Keshav Padram Amburay <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> @@ -17,7 +17,7 @@ _COMPILER="GCC47" ####### pkgname="refind-efi" -pkgver="0.7.4" +pkgver="0.7.6" pkgrel="1" pkgdesc="Rod Smith's fork of rEFIt UEFI Boot Manager - built with Tianocore UDK libs" url="http://www.rodsbooks.com/refind/index.html" @@ -40,7 +40,7 @@ for _DIR_ in BaseTools MdePkg MdeModulePkg IntelFrameworkPkg IntelFrameworkModul source+=("${_TIANO_DIR_}_${_DIR_}::svn+${_TIANOCORE_SVN_URL}/${_DIR_}#revision=${_TIANO_SVN_REV_}") done -sha1sums=('410d2694c5005a5312d48414df8acf8291da42a9' +sha1sums=('431423452190c9840335f2dd9af887aded52a787' '3d53eb615c3363d45feb95b9bfbf1d5491bf1c24' 'SKIP' 'SKIP' diff --git a/extra/rosegarden/PKGBUILD b/extra/rosegarden/PKGBUILD index d83c509b6..066f751b0 100644 --- a/extra/rosegarden/PKGBUILD +++ b/extra/rosegarden/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 191263 2013-07-22 13:50:52Z schiv $ +# $Id: PKGBUILD 199804 2013-11-16 21:20:01Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Robert Emil Berge <robert@rebi.no> pkgname=rosegarden -pkgver=13.06 +pkgver=13.10 pkgrel=1 pkgdesc="MIDI/audio sequencer and notation editor" arch=('i686' 'x86_64' 'mips64el') @@ -23,7 +23,7 @@ optdepends=('lilypond: notation display' [ "$CARCH" = "i686" ] && optdepends+=('dssi-vst: win32 VST support') install=$pkgname.install source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2") -md5sums=('67b110277718b6ef2ec098a8fc452340') +md5sums=('730a830da4d3b60fa8b15716d8dcd8a4') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/rtmpdump/PKGBUILD b/extra/rtmpdump/PKGBUILD index d194d2baf..44306886d 100644 --- a/extra/rtmpdump/PKGBUILD +++ b/extra/rtmpdump/PKGBUILD @@ -1,27 +1,29 @@ -# $Id: PKGBUILD 197306 2013-10-25 02:06:12Z bisson $ -# Maintainer: +# $Id: PKGBUILD 202973 2013-12-29 17:17:31Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor: xduugu # Contributor: Elis Hughes <elishughes@googlemail.com> pkgname=rtmpdump -pkgver=20121230 -pkgrel=3 -pkgdesc="A tool to download rtmp streams" +pkgver=20131205 +pkgrel=1 +pkgdesc='Tool to download rtmp streams' arch=('i686' 'x86_64' 'mips64el') -url="http://rtmpdump.mplayerhq.hu/" +url='http://rtmpdump.mplayerhq.hu/' license=('GPL2' 'LGPL2.1') depends=('openssl') +makedepends=('git') options=('!makeflags') -#git://git.ffmpeg.org/rtmpdump -source=(ftp://ftp.archlinux.org/other/packages/$pkgname/$pkgname-git-$pkgver.tar.xz) -sha256sums=('2612ccbc041281c90d1fa59d20aec783fa3ef29de952323d8d89699fc3d5c4d2') +source=(git://git.ffmpeg.org/rtmpdump#commit=dc76f0a8) +md5sums=('SKIP') build() { - cd $pkgname-$pkgver + cd $pkgname make } package() { - cd $pkgname-$pkgver - make prefix=/usr sbindir=/usr/bin mandir=/usr/share/man DESTDIR="$pkgdir" install + cd $pkgname + make prefix=/usr sbindir=/usr/bin \ + mandir=/usr/share/man DESTDIR="$pkgdir" \ + install } diff --git a/extra/rubberband/PKGBUILD b/extra/rubberband/PKGBUILD index 4d15ff815..61d6516d2 100644 --- a/extra/rubberband/PKGBUILD +++ b/extra/rubberband/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 176992 2013-02-03 15:07:34Z schiv $ +# $Id: PKGBUILD 199957 2013-11-20 11:04:01Z allan $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Felipe Machado aka arch_audio <machado.felipe@gmail.com> pkgname=rubberband pkgver=1.8.1 -pkgrel=1 +pkgrel=2 pkgdesc="Time-stretching and pitch-shifting audio library and utility" arch=('i686' 'x86_64' 'mips64el') url="http://www.breakfastquay.com/rubberband/" diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD index 5795f61a6..6170e75d9 100644 --- a/extra/ruby/PKGBUILD +++ b/extra/ruby/PKGBUILD @@ -4,8 +4,8 @@ # Contributor: Jeramy Rutley <jrutley@gmail.com> pkgname=('ruby' 'ruby-docs') -pkgver=2.0.0_p247 -pkgrel=3 +pkgver=2.0.0_p353 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.ruby-lang.org/en/' license=('BSD' 'custom') @@ -13,7 +13,7 @@ makedepends=('gdbm' 'openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml') options=('!emptydirs' '!makeflags' 'staticlibs') source=("http://cache.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2" 'gemrc') -md5sums=('60913f3eec0c4071f44df42600be2604' +md5sums=('20eb8f067d20f6b76b7e16cce2a85a55' '6fb8e7a09955e0f64be3158fb4a27e7a') build() { diff --git a/extra/rygel/PKGBUILD b/extra/rygel/PKGBUILD index ebf73026a..cda87a7c5 100644 --- a/extra/rygel/PKGBUILD +++ b/extra/rygel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198400 2013-10-30 14:38:24Z allan $ +# $Id: PKGBUILD 202451 2013-12-22 12:20:10Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Balló György <ballogyor+arch at gmail dot com> pkgname=rygel -pkgver=0.20.1 +pkgver=0.20.3 pkgrel=1 pkgdesc="UPnP AV MediaServer and MediaRenderer that allows you to easily share audio, video and pictures, and control of media player on your home network" arch=('i686' 'x86_64' 'mips64el') @@ -21,7 +21,7 @@ backup=(etc/rygel.conf) install=rygel.install groups=('gnome-extra') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('00792c8db8f5ca0cb655ab00d90bec6f90e2a4b505f10faf03924800285a7ec3') +sha256sums=('4e7e3105a1d27d126938b7530f60bd7867121188651cee806f36694fbd7dd349') build() { cd $pkgname-$pkgver diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD index f34be2154..ebada4fbd 100644 --- a/extra/samba/PKGBUILD +++ b/extra/samba/PKGBUILD @@ -10,11 +10,11 @@ pkgbase=samba pkgname=('libwbclient' 'smbclient' 'samba') -pkgver=4.1.0 +pkgver=4.1.3 # We use the 'A' to fake out pacman's version comparators. Samba chooses # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! -_realver=4.1.0 +_realver=4.1.3 pkgrel=1 arch=(i686 x86_64 mips64el) url="http://www.samba.org" @@ -240,7 +240,7 @@ sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \ # copy ldap example install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema } -md5sums=('f448d18ae678c72afb72e0510cd69710' +md5sums=('a5dbfe87f4cb3d9d91e15e5df99a59a1' '5697da77590ec092cc8a883bae06093c' '96f82c38f3f540b53f3e5144900acf17' 'ee4763a656cf00d92bfda31b6bb2c5cb' diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD index 0c4e1146f..cf0de9ce2 100644 --- a/extra/sbcl/PKGBUILD +++ b/extra/sbcl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 196298 2013-10-11 08:53:55Z juergen $ +# $Id: PKGBUILD 202769 2013-12-27 14:21:30Z juergen $ # Contributor: John Proctor <jproctor@prium.net> # Contributor: Daniel White <daniel@whitehouse.id.au> # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Leslie Polzer (skypher) pkgname=sbcl -pkgver=1.1.12 +pkgver=1.1.14 pkgrel=1 pkgdesc="Steel Bank Common Lisp" url="http://www.sbcl.org/" @@ -19,7 +19,7 @@ makedepends=('clisp') install=sbcl.install source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2" "arch-fixes.lisp") -md5sums=('817e0606e4615e758c0bf3d381197711' +md5sums=('e3f933f7cb0053c3438d86e90f5bd73b' '7ac0c1936547f4278198b8bf7725204d') diff --git a/extra/sdl2/PKGBUILD b/extra/sdl2/PKGBUILD index 76aa6c8c0..49d13c490 100644 --- a/extra/sdl2/PKGBUILD +++ b/extra/sdl2/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=sdl2 pkgver=2.0.1 -pkgrel=2 +pkgrel=3 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard (Version 2)" arch=('i686' 'x86_64') url="http://www.libsdl.org" license=('MIT') -depends=('glibc' 'libxext' 'libxrender' 'libx11' 'libgl') +depends=('glibc' 'libxext' 'libxrender' 'libx11' 'libgl' 'libxcursor') makedepends=('alsa-lib' 'mesa' 'libpulse' 'libxrandr' 'libxinerama') optdepends=('alsa-lib: ALSA audio driver' 'libpulse: PulseAudio audio driver') diff --git a/extra/sdl2_gfx/PKGBUILD b/extra/sdl2_gfx/PKGBUILD index 2f73cb43c..465751dc9 100644 --- a/extra/sdl2_gfx/PKGBUILD +++ b/extra/sdl2_gfx/PKGBUILD @@ -2,7 +2,8 @@ # Contributor: Jameson Pugh <imntreal@gmail.com> pkgname=sdl2_gfx -pkgver=7 +epoch=1 +pkgver=1.0.0 pkgrel=1 pkgdesc="SDL Graphic Primitives (Version 2)" arch=('i686' 'x86_64') @@ -10,11 +11,11 @@ url="http://www.ferzkopp.net/joomla/software-mainmenu-14/4-ferzkopps-linux-softw license=('zlib') depends=('sdl2') makedepends=('svn') -source=("sdl2-gfx::svn://svn.code.sf.net/p/sdl2gfx/code/trunk#revision=$pkgver") -md5sums=('SKIP') +source=("http://www.ferzkopp.net/Software/SDL2_gfx/SDL2_gfx-${pkgver}.tar.gz") +md5sums=('f008cc117cb901aec6bf5c2f0b11f7ea') build() { - cd "${srcdir}/sdl2-gfx" + cd "${srcdir}/SDL2_gfx-${pkgver}" ./autogen.sh ./configure --disable-static --prefix=/usr @@ -22,7 +23,7 @@ build() { } package() { - cd "${srcdir}/sdl2-gfx" + cd "${srcdir}/SDL2_gfx-${pkgver}" make DESTDIR="${pkgdir}/" install install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" diff --git a/extra/sdl_gfx/PKGBUILD b/extra/sdl_gfx/PKGBUILD index 4c20a897b..977657e01 100644 --- a/extra/sdl_gfx/PKGBUILD +++ b/extra/sdl_gfx/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 198418 2013-10-30 14:45:20Z allan $ +# $Id: PKGBUILD 199486 2013-11-13 12:47:52Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=sdl_gfx -pkgver=2.0.24 -pkgrel=2 +pkgver=2.0.25 +pkgrel=1 pkgdesc="SDL Graphic Primitives" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') url="http://www.ferzkopp.net/joomla/software-mainmenu-14/4-ferzkopps-linux-software/19-sdlgfx" source=(http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-${pkgver}.tar.gz) depends=('sdl') -md5sums=('838514185ff9a3b6377760aaa52fef8a') +md5sums=('ea24ed4b82ff1304809c363494fa8e16') build() { cd SDL_gfx-${pkgver} diff --git a/extra/serf/PKGBUILD b/extra/serf/PKGBUILD index 33e18236a..36f7856c7 100644 --- a/extra/serf/PKGBUILD +++ b/extra/serf/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198428 2013-10-30 14:48:58Z allan $ +# $Id: PKGBUILD 200589 2013-11-29 15:17:26Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> pkgname=serf -pkgver=1.3.1 -pkgrel=2 +pkgver=1.3.2 +pkgrel=1 pkgdesc="High-performance asynchronous HTTP client library" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/serf/" @@ -12,15 +12,8 @@ license=('Apache') depends=('apr-util') makedepends=('scons') options=('!staticlibs') -source=(http://serf.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 'serf-ssl-allocator-v2.patch') -md5sums=('da5aca0cad19fd9c19129c3f8f7393dd' - 'a0ff486ee26f86cb2825decfd1dc8355') - -prepare() { - mv serf-ssl-allocator-v2.patch ${pkgname}-${pkgver} - cd ${pkgname}-${pkgver} - patch -Np0 -i serf-ssl-allocator-v2.patch -} +source=(http://serf.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2) +md5sums=('43ce30fccf39ab0186a7590e2733e3ec') build() { cd ${pkgname}-${pkgver} diff --git a/extra/serf/serf-ssl-allocator-v2.patch b/extra/serf/serf-ssl-allocator-v2.patch new file mode 100644 index 000000000..09ad42477 --- /dev/null +++ b/extra/serf/serf-ssl-allocator-v2.patch @@ -0,0 +1,57 @@ +Index: buckets/ssl_buckets.c +=================================================================== +--- buckets/ssl_buckets.c (revision 2130) ++++ buckets/ssl_buckets.c (working copy) +@@ -1192,21 +1192,16 @@ + context->server_cert_userdata = data; + } + +-static serf_ssl_context_t *ssl_init_context(void) ++static serf_ssl_context_t *ssl_init_context(serf_bucket_alloc_t *allocator) + { + serf_ssl_context_t *ssl_ctx; +- apr_pool_t *pool; +- serf_bucket_alloc_t *allocator; + + init_ssl_libraries(); + +- apr_pool_create(&pool, NULL); +- allocator = serf_bucket_allocator_create(pool, NULL, NULL); +- + ssl_ctx = serf_bucket_mem_alloc(allocator, sizeof(*ssl_ctx)); + + ssl_ctx->refcount = 0; +- ssl_ctx->pool = pool; ++ ssl_ctx->pool = serf_bucket_allocator_get_pool(allocator); + ssl_ctx->allocator = allocator; + + ssl_ctx->ctx = SSL_CTX_new(SSLv23_client_method()); +@@ -1263,8 +1258,6 @@ + static apr_status_t ssl_free_context( + serf_ssl_context_t *ssl_ctx) + { +- apr_pool_t *p; +- + /* If never had the pending buckets, don't try to free them. */ + if (ssl_ctx->decrypt.pending != NULL) { + serf_bucket_destroy(ssl_ctx->decrypt.pending); +@@ -1277,10 +1270,7 @@ + SSL_free(ssl_ctx->ssl); + SSL_CTX_free(ssl_ctx->ctx); + +- p = ssl_ctx->pool; +- + serf_bucket_mem_free(ssl_ctx->allocator, ssl_ctx); +- apr_pool_destroy(p); + + return APR_SUCCESS; + } +@@ -1294,7 +1284,7 @@ + + ctx = serf_bucket_mem_alloc(allocator, sizeof(*ctx)); + if (!ssl_ctx) { +- ctx->ssl_ctx = ssl_init_context(); ++ ctx->ssl_ctx = ssl_init_context(allocator); + } + else { + ctx->ssl_ctx = ssl_ctx; diff --git a/extra/setserial/PKGBUILD b/extra/setserial/PKGBUILD deleted file mode 100644 index d5a876d9a..000000000 --- a/extra/setserial/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 137681 2011-09-10 12:01:21Z pierre $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Aurelien Foret <orelien@chez.com> - -pkgname=setserial -pkgver=2.17 -pkgrel=4 -pkgdesc="Allows to change various attributes of a serial device" -arch=('i686' 'x86_64' 'mips64el') -url="http://setserial.sourceforge.net/" -license=('GPL') -depends=('glibc') -source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz" - "$pkgname.patch") -md5sums=('c4867d72c41564318e0107745eb7a0f2' - '99919d3be7c1550721494070a7ace66a') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -Np1 -i ../$pkgname.patch - ./configure --prefix=/usr \ - --mandir=/usr/share/man - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - install -d ${pkgdir}/usr/{bin,share/man/man8} - make DESTDIR="${pkgdir}" install -} diff --git a/extra/setserial/setserial.patch b/extra/setserial/setserial.patch deleted file mode 100644 index 3cce1f07d..000000000 --- a/extra/setserial/setserial.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -ur setserial-2.17/Makefile.in setserial-2.17-new/Makefile.in ---- setserial-2.17/Makefile.in 2000-01-27 16:39:07.000000000 +0100 -+++ setserial-2.17-new/Makefile.in 2005-03-09 20:53:31.000000000 +0100 -@@ -17,6 +17,11 @@ - INCS = -I. - TAR = tar - -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+bindir=@bindir@ -+mandir=@mandir@ -+ - all: setserial setserial.cat - - setserial: setserial.c -@@ -26,9 +31,9 @@ - nroff -man setserial.8 > setserial.cat - - install: setserial setserial.8 -- $(INSTALL_PROGRAM) setserial $(DESTDIR)/bin -- $(STRIP) $(DESTDIR)/bin/setserial -- $(INSTALL_DATA) setserial.8 $(DESTDIR)/usr/man/man8 -+ $(INSTALL_PROGRAM) setserial $(DESTDIR)$(bindir) -+ $(STRIP) $(DESTDIR)$(bindir)/setserial -+ $(INSTALL_DATA) setserial.8 $(DESTDIR)$(mandir)/man8 - - clean: - $(RM) setserial setserial.o setserial.cat *~ diff --git a/extra/signon/PKGBUILD b/extra/signon/PKGBUILD index 51d85f4e7..cf6eaf4f5 100644 --- a/extra/signon/PKGBUILD +++ b/extra/signon/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 197629 2013-10-27 14:39:15Z andrea $ -#Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 202670 2013-12-24 08:58:48Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Balló György <ballogyor+arch at gmail dot com> pkgbase=signon pkgname=('signon' 'signon-doc') -pkgver=8.54 -pkgrel=2 +pkgver=8.55 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/accounts-sso/" license=('LGPL') @@ -13,15 +13,15 @@ makedepends=('qt4' 'libproxy' 'doxygen' 'graphviz' 'ttf-font') options=('!emptydirs') source=("http://accounts-sso.googlecode.com/files/$pkgbase-$pkgver.tar.bz2" 'use_keyring.patch') -sha1sums=('a29a12d6fe3747930e94932f6e1b1339b471d108' +sha1sums=('e71bfe54bdd4ad50705eb7071c3a426293370b2a' 'cfdd48b494ad267654ceba23f1b81bcb8f56b9a1') prepare() { cd $pkgbase-$pkgver - + # Use gnome-keyring secrets storage if signon-keyring-extension is available patch -Np1 -i "$srcdir/use_keyring.patch" - + # qt4 fix sed -i 's/qdbusxml2cpp/qdbusxml2cpp-qt4/' src/signond/signond.pro } diff --git a/extra/slim/PKGBUILD b/extra/slim/PKGBUILD index 8fcf5c524..0610cba7d 100644 --- a/extra/slim/PKGBUILD +++ b/extra/slim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 195944 2013-10-06 06:46:09Z foutrelis $ +# $Id: PKGBUILD 202652 2013-12-23 08:42:02Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Gaetan Bisson <bisson@archlinux.org> # Contributor: Thayer Williams <thayer@archlinux.org> @@ -7,14 +7,15 @@ pkgname=slim pkgver=1.3.6 -pkgrel=2 +pkgrel=3 pkgdesc="Desktop-independent graphical login manager for X11" arch=('i686' 'x86_64' 'mips64el') url="http://slim.berlios.de/" license=('GPL2') depends=('pam' 'libxmu' 'libpng' 'libjpeg' 'libxft' 'libxrandr' 'xorg-xauth') makedepends=('cmake' 'freeglut') -backup=('etc/slim.conf' 'etc/logrotate.d/slim' 'etc/pam.d/slim') +backup=('etc/slim.conf' 'etc/logrotate.d/slim' 'etc/pam.d/slim' + 'etc/slimlock.conf') source=(http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz slim-1.3.6-fix-libslim-libraries.patch slim-1.3.6-add-sessiondir.patch @@ -55,6 +56,7 @@ package() { install -Dm644 "$srcdir/slim.pam" "$pkgdir/etc/pam.d/slim" install -Dm644 "$srcdir/slim.logrotate" "$pkgdir/etc/logrotate.d/slim" + install -Dm644 slimlock.conf "$pkgdir/etc/slimlock.conf" # Provide sane defaults sed -i -e 's|#xserver_arguments.*|xserver_arguments -nolisten tcp vt07|' \ diff --git a/extra/smb4k/PKGBUILD b/extra/smb4k/PKGBUILD index db21950eb..07e372757 100644 --- a/extra/smb4k/PKGBUILD +++ b/extra/smb4k/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 197642 2013-10-27 16:28:17Z giovanni $ +# $Id: PKGBUILD 199073 2013-11-08 10:00:05Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Emanuele Rampichini <emanuele.rampichini@gmail.com> pkgname=smb4k -pkgver=1.0.8 +pkgver=1.0.9 pkgrel=1 pkgdesc="A KDE program that browses samba shares" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=smb4k.install source=("http://downloads.sourceforge.net/project/${pkgname}/Smb4K%20%28stable%20releases%29/${pkgver}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('8dac25845830cee18b72776d0f90d62c') +md5sums=('7a27698842663c6197228ff3c282a079') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/snappy/PKGBUILD b/extra/snappy/PKGBUILD index 85e15cd87..b94dd1c44 100644 --- a/extra/snappy/PKGBUILD +++ b/extra/snappy/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198433 2013-10-30 14:50:42Z allan $ +# $Id: PKGBUILD 199910 2013-11-18 18:54:19Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Antony Male <antony dot male at geemail dot com>> pkgname=snappy -pkgver=1.1.0 -pkgrel=2 +pkgver=1.1.1 +pkgrel=1 pkgdesc='A fast compressor/decompressor library' arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/snappy/" @@ -12,7 +12,7 @@ license=('BSD') depends=('glibc' 'gcc-libs') checkdepends=('zlib') source=("http://snappy.googlecode.com/files/$pkgname-$pkgver.tar.gz") -md5sums=('c8f3ef29b5281e78f4946b2d739cea4f') +md5sums=('8887e3b7253b22a31f5486bca3cbc1c2') build() { cd "$pkgname-$pkgver" diff --git a/extra/snd/PKGBUILD b/extra/snd/PKGBUILD index 2a23dc657..aa68286a9 100644 --- a/extra/snd/PKGBUILD +++ b/extra/snd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 197656 2013-10-27 21:04:41Z schiv $ +# $Id: PKGBUILD 199037 2013-11-07 17:11:41Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: see .contrib pkgname=snd pkgver=14.1 -pkgrel=1 +pkgrel=2 pkgdesc="An advanced sound editor" arch=('i686' 'x86_64') url="http://ccrma.stanford.edu/software/snd/" @@ -15,16 +15,16 @@ makedepends=('ladspa' 'wavpack' 'flac' 'speex' 'gmp' 'timidity++' 'mpg123' 'vorbis-tools') optdepends=('wavpack' 'flac' 'speex' 'mpg123' 'timidity++' 'vorbis-tools') -install=$pkgname.install source=("ftp://ccrma-ftp.stanford.edu/pub/Lisp/$pkgname-$pkgver.tar.gz" 'type_error.patch') md5sums=('955ca19ca70ac0e4d03cd710516c0174' - '6e96d59346b53a1c73060857f688dbd0') + '9bfea0dccdfb5da1ba81e721672b11cc') prepare() { cd "$srcdir/$pkgname-$pkgver" - # work around incomplete type error + # fix incomplete type error + # see http://www.mail-archive.com/cmdist@ccrma.stanford.edu/msg04241.html patch -Np1 -i "$srcdir/type_error.patch" } diff --git a/extra/snd/snd.install b/extra/snd/snd.install deleted file mode 100644 index 57b42ddff..000000000 --- a/extra/snd/snd.install +++ /dev/null @@ -1,3 +0,0 @@ -post_upgrade() { - echo " > snd GUI is now GTK+ due to lesstif/libxpm build issues" -} diff --git a/extra/snd/type_error.patch b/extra/snd/type_error.patch index e7bf9ab91..1232c6e36 100644 --- a/extra/snd/type_error.patch +++ b/extra/snd/type_error.patch @@ -1,20 +1,12 @@ -diff -ur snd-14.1.orig/vct.h snd-14.1/vct.h ---- snd-14.1.orig/vct.h 2013-10-28 02:22:35.073798054 +0800 -+++ snd-14.1/vct.h 2013-10-28 02:45:27.166364791 +0800 -@@ -1,11 +1,11 @@ - #ifndef VCT_H - #define VCT_H - --#if HAVE_SCHEME -- typedef struct s7_cell vct; --#else --typedef struct vct vct; --#endif -+typedef struct { -+ mus_long_t length; -+ mus_float_t *data; -+ bool dont_free; -+} vct; - - #ifdef __cplusplus - extern "C" { +diff -bur snd-14.1.orig/snd-ladspa.c snd-14.1/snd-ladspa.c +--- snd-14.1.orig/snd-ladspa.c 2013-10-28 16:07:53.260612114 +0800 ++++ snd-14.1/snd-ladspa.c 2013-10-28 16:11:18.792831983 +0800 +@@ -1191,7 +1191,7 @@ + if (descriptor->connect_port) + descriptor->connect_port(XEN_TO_C_Ladspa_Handle(ptr), + XEN_TO_C_ULONG(port), +- double_to_float(samples->data, samples->length) ++ double_to_float(mus_vct_data(samples), mus_vct_length(samples)) + ); + return(XEN_FALSE); + } diff --git a/extra/source-highlight/PKGBUILD b/extra/source-highlight/PKGBUILD index 86b6509e0..c223c4fef 100644 --- a/extra/source-highlight/PKGBUILD +++ b/extra/source-highlight/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198436 2013-10-30 14:51:45Z allan $ +# $Id: PKGBUILD 201266 2013-12-07 10:35:06Z bpiotrowski $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=source-highlight pkgver=3.1.7 -pkgrel=6 +pkgrel=9 pkgdesc="Convert source code to syntax highlighted document" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/src-highlite/" @@ -16,7 +16,7 @@ source=("ftp://ftp.gnu.org/gnu/src-highlite/${pkgname}-${pkgver}.tar.gz") md5sums=('0ff81588d3536b4c4e571122ba940595') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -25,7 +25,10 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make prefix="${pkgdir}/usr" bash_completiondir="${pkgdir}/usr/share/bash-completion/completions" install + + # PKGBUILD syntax highlighting + echo -e "\npkgbuild = sh.lang" >> "${pkgdir}"/usr/share/${pkgname}/lang.map } diff --git a/extra/spice/CVE-2013-4282.patch b/extra/spice/CVE-2013-4282.patch new file mode 100644 index 000000000..3dfa1c8f2 --- /dev/null +++ b/extra/spice/CVE-2013-4282.patch @@ -0,0 +1,104 @@ +From 8af619009660b24e0b41ad26b30289eea288fcc2 Mon Sep 17 00:00:00 2001 +From: Christophe Fergeau <cfergeau@redhat.com> +Date: Fri, 23 Aug 2013 09:29:44 +0000 +Subject: Fix buffer overflow when decrypting client SPICE ticket + +reds_handle_ticket uses a fixed size 'password' buffer for the decrypted +password whose size is SPICE_MAX_PASSWORD_LENGTH. However, +RSA_private_decrypt which we call for the decryption expects the +destination buffer to be at least RSA_size(link->tiTicketing.rsa) +bytes long. On my spice-server build, SPICE_MAX_PASSWORD_LENGTH +is 60 while RSA_size() is 128, so we end up overflowing 'password' +when using long passwords (this was reproduced using the string: +'fullscreen=1proxy=#enter proxy here; e.g spice_proxy = http://[proxy]:[port]' +as a password). + +When the overflow occurs, QEMU dies with: +*** stack smashing detected ***: qemu-system-x86_64 terminated + +This commit ensures we use a corectly sized 'password' buffer, +and that it's correctly nul-terminated so that we can use strcmp +instead of strncmp. To keep using strncmp, we'd need to figure out +which one of 'password' and 'taTicket.password' is the smaller buffer, +and use that size. + +This fixes rhbz#999839 +--- +diff --git a/server/reds.c b/server/reds.c +index 892d247..2a0002b 100644 +--- a/server/reds.c ++++ b/server/reds.c +@@ -1926,39 +1926,59 @@ static void reds_handle_link(RedLinkInfo *link) + static void reds_handle_ticket(void *opaque) + { + RedLinkInfo *link = (RedLinkInfo *)opaque; +- char password[SPICE_MAX_PASSWORD_LENGTH]; ++ char *password; + time_t ltime; ++ int password_size; + + //todo: use monotonic time + time(<ime); +- RSA_private_decrypt(link->tiTicketing.rsa_size, +- link->tiTicketing.encrypted_ticket.encrypted_data, +- (unsigned char *)password, link->tiTicketing.rsa, RSA_PKCS1_OAEP_PADDING); ++ if (RSA_size(link->tiTicketing.rsa) < SPICE_MAX_PASSWORD_LENGTH) { ++ spice_warning("RSA modulus size is smaller than SPICE_MAX_PASSWORD_LENGTH (%d < %d), " ++ "SPICE ticket sent from client may be truncated", ++ RSA_size(link->tiTicketing.rsa), SPICE_MAX_PASSWORD_LENGTH); ++ } ++ ++ password = g_malloc0(RSA_size(link->tiTicketing.rsa) + 1); ++ password_size = RSA_private_decrypt(link->tiTicketing.rsa_size, ++ link->tiTicketing.encrypted_ticket.encrypted_data, ++ (unsigned char *)password, ++ link->tiTicketing.rsa, ++ RSA_PKCS1_OAEP_PADDING); ++ if (password_size == -1) { ++ spice_warning("failed to decrypt RSA encrypted password: %s", ++ ERR_error_string(ERR_get_error(), NULL)); ++ goto error; ++ } ++ password[password_size] = '\0'; + + if (ticketing_enabled && !link->skip_auth) { + int expired = taTicket.expiration_time < ltime; + + if (strlen(taTicket.password) == 0) { +- reds_send_link_result(link, SPICE_LINK_ERR_PERMISSION_DENIED); + spice_warning("Ticketing is enabled, but no password is set. " +- "please set a ticket first"); +- reds_link_free(link); +- return; ++ "please set a ticket first"); ++ goto error; + } + +- if (expired || strncmp(password, taTicket.password, SPICE_MAX_PASSWORD_LENGTH) != 0) { ++ if (expired || strcmp(password, taTicket.password) != 0) { + if (expired) { + spice_warning("Ticket has expired"); + } else { + spice_warning("Invalid password"); + } +- reds_send_link_result(link, SPICE_LINK_ERR_PERMISSION_DENIED); +- reds_link_free(link); +- return; ++ goto error; + } + } + + reds_handle_link(link); ++ goto end; ++ ++error: ++ reds_send_link_result(link, SPICE_LINK_ERR_PERMISSION_DENIED); ++ reds_link_free(link); ++ ++end: ++ g_free(password); + } + + static inline void async_read_clear_handlers(AsyncRead *obj) +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/spice/PKGBUILD b/extra/spice/PKGBUILD index 0e209a9e1..65f55a0a2 100644 --- a/extra/spice/PKGBUILD +++ b/extra/spice/PKGBUILD @@ -1,18 +1,23 @@ -# $Id: PKGBUILD 198438 2013-10-30 14:52:32Z allan $ +# $Id: PKGBUILD 199889 2013-11-18 07:36:22Z tpowa $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Patryk Kowalczyk < patryk at kowalczyk dot ws> pkgname=spice pkgver=0.12.4 -pkgrel=2 +pkgrel=3 pkgdesc="SPICE client and server" arch=('i686' 'x86_64') url="http://spice-space.org" license=('LGPL2.1') depends=(alsa-lib celt0.5.1 libcacard libjpeg-turbo libsasl libxinerama libxfixes libxrandr pixman) makedepends=(python2-pyparsing qemu spice-protocol) -source=(http://spice-space.org/download/releases/$pkgname-$pkgver.tar.bz2) -md5sums=('325b1c42ce24e75de45a75876b73a8bd') +source=(http://spice-space.org/download/releases/$pkgname-$pkgver.tar.bz2 + CVE-2013-4282.patch) + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i ../CVE-2013-4282.patch +} build() { cd "$srcdir/$pkgname-$pkgver" @@ -24,3 +29,5 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir/" install } +md5sums=('325b1c42ce24e75de45a75876b73a8bd' + '24a1648e7c684b4444d7921b5534767e') diff --git a/extra/sqlite/PKGBUILD b/extra/sqlite/PKGBUILD index 6cef631d0..46315af84 100644 --- a/extra/sqlite/PKGBUILD +++ b/extra/sqlite/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 198439 2013-10-30 14:52:53Z allan $ +# $Id: PKGBUILD 201374 2013-12-09 21:50:07Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase="sqlite" pkgname=('sqlite' 'sqlite-tcl') -_amalgamationver=3080100 +_amalgamationver=3080200 _docver=${_amalgamationver} #_docver=3080001 -pkgver=3.8.1 -pkgrel=2 +pkgver=3.8.2 +pkgrel=1 pkgdesc="A C library that implements an SQL database engine" arch=('i686' 'x86_64' 'mips64el') license=('custom:Public Domain') @@ -17,12 +17,10 @@ makedepends=('tcl' 'readline') source=( # tarball containing the amalgamation for SQLite >= 3.7.5 together with a configure script and makefile for building it; includes now also the Tcl Extension Architecture (TEA) http://www.sqlite.org/2013/sqlite-autoconf-$_amalgamationver.tar.gz http://www.sqlite.org/2013/sqlite-doc-${_docver}.zip - xbmc.patch license.txt) options=('!emptydirs') -sha1sums=('42464b07df2d6f8aa28f73ce4cc6d48b47be810e' - 'd7cb698f32318fbf5dce9f10c9cd7b84c3d70105' - '01bcbffc422b354a4ad6737e472f06b321ce52ef' +sha1sums=('6033ef603ce221d367c665477514d972ef1dc90e' + 'b9cbd42d08b8c1ce96656a6b111e918bb515b605' 'f34f6daa4ab3073d74e774aad21d66878cf26853') build() { @@ -31,10 +29,6 @@ build() { # build sqlite cd "$srcdir"/sqlite-autoconf-$_amalgamationver - # fix http://www.sqlite.org/src/info/9aac4e588c?sbs=0 - # https://bugs.archlinux.org/task/37417 - patch -Np1 -i $srcdir/xbmc.patch - ./configure --prefix=/usr \ --disable-static make diff --git a/extra/sqlite/xbmc.patch b/extra/sqlite/xbmc.patch deleted file mode 100644 index 3a58dd242..000000000 --- a/extra/sqlite/xbmc.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: src/where.c -================================================================== ---- src/sqlite3.c -+++ src/sqlite3.c -@@ -876,11 +876,14 @@ - while( pScan->iEquiv<=pScan->nEquiv ){ - iCur = pScan->aEquiv[pScan->iEquiv-2]; - iColumn = pScan->aEquiv[pScan->iEquiv-1]; - while( (pWC = pScan->pWC)!=0 ){ - for(pTerm=pWC->a+k; k<pWC->nTerm; k++, pTerm++){ -- if( pTerm->leftCursor==iCur && pTerm->u.leftColumn==iColumn ){ -+ if( pTerm->leftCursor==iCur -+ && pTerm->u.leftColumn==iColumn -+ && (pScan->iEquiv<=2 || !ExprHasProperty(pTerm->pExpr, EP_FromJoin)) -+ ){ - if( (pTerm->eOperator & WO_EQUIV)!=0 - && pScan->nEquiv<ArraySize(pScan->aEquiv) - ){ - int j; - pX = sqlite3ExprSkipCollate(pTerm->pExpr->pRight); - - diff --git a/extra/srm/PKGBUILD b/extra/srm/PKGBUILD deleted file mode 100644 index 1ca84e154..000000000 --- a/extra/srm/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 143982 2011-12-01 15:00:19Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=srm -pkgver=1.2.11 -pkgrel=2 -pkgdesc="A secure replacement for rm(1) that overwrites data before unlinking" -arch=('i686' 'x86_64' 'mips64el') -url="http://srm.sourceforge.net/" -license=('custom') -depends=('glibc') -source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('ee8269be18de6bbd3f74252d6e3039fe') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make prefix="${pkgdir}/usr" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/srm/LICENSE" -} diff --git a/extra/sshfs/PKGBUILD b/extra/sshfs/PKGBUILD deleted file mode 100644 index bd10b2413..000000000 --- a/extra/sshfs/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 154283 2012-03-25 10:23:17Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> - -pkgname=sshfs -pkgver=2.4 -pkgrel=1.1 -pkgdesc="FUSE client based on the SSH File Transfer Protocol" -arch=('i686' 'x86_64' 'mips64el') -url="http://fuse.sourceforge.net/sshfs.html" -license=('GPL') -depends=('fuse' 'glib2' 'openssh') -makedepends=('pkg-config') -source=("http://downloads.sourceforge.net/sourceforge/fuse/${pkgname}-fuse-${pkgver}.tar.gz") -md5sums=('3c7c3647c52ce84d09486f1da3a3ce24') - -build() { - cd "${srcdir}/${pkgname}-fuse-${pkgver}" - - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-fuse-${pkgver}" - - make DESTDIR="${pkgdir}" install -} diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD index d0bc12d08..a0e3cd17e 100644 --- a/extra/subversion/PKGBUILD +++ b/extra/subversion/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 198442 2013-10-30 14:53:59Z allan $ +# $Id: PKGBUILD 200590 2013-11-29 15:17:27Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=subversion -pkgver=1.8.3 +pkgver=1.8.5 pkgrel=1 pkgdesc="A Modern Concurrent Version Control System" arch=('i686' 'x86_64' 'mips64el') @@ -31,7 +31,7 @@ source=(http://www.apache.org/dist/subversion/subversion-${pkgver}.tar.bz2{,.asc svnserve.tmpfiles svnserve.service subversion.rpath.fix.patch) -md5sums=('7d7bd97347a4491e1ffb529563ce2e9e' +md5sums=('77349caf0ef5a612c9718c53516a9934' 'SKIP' 'a0db6dd43af33952739b6ec089852630' 'c459e299192552f61578f3438abf0664' @@ -103,3 +103,4 @@ package() { ln -sf subversion "${pkgdir}"/usr/share/bash-completion/completions/${i} done } + diff --git a/extra/suitesparse/PKGBUILD b/extra/suitesparse/PKGBUILD index 81bc936a3..399dd7c78 100644 --- a/extra/suitesparse/PKGBUILD +++ b/extra/suitesparse/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185110 2013-05-11 08:04:24Z ronald $ +# $Id: PKGBUILD 199830 2013-11-17 07:57:13Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> pkgname=suitesparse @@ -13,6 +13,7 @@ replaces=('umfpack') depends=('blas' 'lapack') makedepends=('gcc-fortran') license=('GPL') +options=('staticlibs') source=(http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-$pkgver.tar.gz) sha1sums=('ea6688bd6f6adf81e2e5aacdc71d7dcf9a5d208d') diff --git a/extra/syslog-ng/PKGBUILD b/extra/syslog-ng/PKGBUILD index 585357deb..3bf81bf20 100644 --- a/extra/syslog-ng/PKGBUILD +++ b/extra/syslog-ng/PKGBUILD @@ -1,54 +1,47 @@ -# $Id: PKGBUILD 198445 2013-10-30 14:55:06Z allan $ -# Maintainer: Dave Reisner <dreisner@archlinux.org> -# Contributor: Eric Bélanger <eric@archlinux.org> -# Contributor: Aaron Griffin <aaron@archlinux.org> +# $Id: PKGBUILD 201450 2013-12-11 20:06:25Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=syslog-ng -pkgver=3.4.3 +pkgver=3.5.2 pkgrel=1 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities" arch=('i686' 'x86_64') -license=('GPL2') url="http://www.balabit.com/network-security/syslog-ng/" -depends=('awk' 'eventlog' 'glib2' 'libcap' 'openssl' 'systemd') -makedepends=('flex' 'pkg-config' 'python2') +license=('GPL2' 'LGPL2.1') +depends=('awk' 'eventlog' 'openssl' 'systemd') +makedepends=('python2' 'libxslt') optdepends=('logrotate: for rotating log files') backup=('etc/syslog-ng/scl.conf' 'etc/syslog-ng/syslog-ng.conf' 'etc/logrotate.d/syslog-ng') -install=$pkgname.install -source=("http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source/${pkgname}_$pkgver.tar.gz" - syslog-ng.conf - syslog-ng.logrotate) -sha1sums=('70433d041b2e48c598ee7595d89ddb2e1f6450b4' - '0aaf695ea6756b59198ff2e4af237b4a6186525d' +source=(http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source/${pkgname}_$pkgver.tar.gz + syslog-ng.conf syslog-ng.logrotate) +sha1sums=('f0c91e14ee1f691cf680daf942d84ed87e5469c0' + 'b5b0d54ec295c6f8a62f68238c36fe62da01ef6e' '949128fe3d7f77a7aab99048061f885bc758000c') -build() { +prepare() { cd "$pkgname-$pkgver" + sed -i -e 's,/bin/,/usr/bin/,' -e 's,/sbin/,/bin/,' contrib/systemd/syslog-ng.service +} - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc/syslog-ng \ - --libexecdir=/usr/lib \ - --sbindir=/usr/bin \ - --localstatedir=/var/lib/syslog-ng \ - --datadir=/usr/share/syslog-ng \ - --with-pidfile-dir=/run \ - --disable-spoof-source \ - --enable-ipv6 \ - --enable-systemd \ - --with-systemdsystemunitdir=/usr/lib/systemd/system - +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc/syslog-ng --libexecdir=/usr/lib \ + --sbindir=/usr/bin --localstatedir=/var/lib/syslog-ng --datadir=/usr/share/syslog-ng \ + --with-pidfile-dir=/run --disable-spoof-source --enable-ipv6 \ + --enable-systemd --with-systemdsystemunitdir=/usr/lib/systemd/system make } +check() { + cd "$pkgname-$pkgver" + make check +} + package() { make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install - install -dm755 "$pkgdir/var/lib/syslog-ng" "$pkgdir/etc/syslog-ng/patterndb.d" install -Dm644 "$srcdir/syslog-ng.conf" "$pkgdir/etc/syslog-ng/syslog-ng.conf" install -Dm644 "$srcdir/syslog-ng.logrotate" "$pkgdir/etc/logrotate.d/syslog-ng" - - sed -i 's,/sbin/,/bin/,' "$pkgdir/usr/lib/systemd/system/syslog-ng.service" } diff --git a/extra/syslog-ng/syslog-ng.conf b/extra/syslog-ng/syslog-ng.conf index 969798e6d..bb89a82f3 100644 --- a/extra/syslog-ng/syslog-ng.conf +++ b/extra/syslog-ng/syslog-ng.conf @@ -1,4 +1,4 @@ -@version: 3.4 +@version: 3.5 # # /etc/syslog-ng/syslog-ng.conf # diff --git a/extra/syslog-ng/syslog-ng.install b/extra/syslog-ng/syslog-ng.install deleted file mode 100644 index a9365d6fe..000000000 --- a/extra/syslog-ng/syslog-ng.install +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -post_upgrade() { - if [ "$(vercmp 3.3.6-3 "$2")" -eq 1 ]; then - printf '==> syslog-ng now reads from /run/systemd/journal/syslog in the\n' - printf ' default config. If you still use sysvinit/initscripts, this\n' - printf ' must be /dev/log in /etc/syslog-ng/syslog-ng.conf\n' - fi -} diff --git a/extra/system-config-printer/40_scp-dbus-service-fix-dbus-signature-typo.patch b/extra/system-config-printer/40_scp-dbus-service-fix-dbus-signature-typo.patch new file mode 100644 index 000000000..0d08a3da8 --- /dev/null +++ b/extra/system-config-printer/40_scp-dbus-service-fix-dbus-signature-typo.patch @@ -0,0 +1,12 @@ +diff -Nur -x '*.orig' -x '*~' system-config-printer-1.4.2+20130920/scp-dbus-service.py system-config-printer-1.4.2+20130920.new/scp-dbus-service.py +--- system-config-printer-1.4.2+20130920/scp-dbus-service.py 2013-09-20 22:26:27.000000000 +0200 ++++ system-config-printer-1.4.2+20130920.new/scp-dbus-service.py 2013-10-24 13:12:44.998717234 +0200 +@@ -367,7 +367,7 @@ + pass + + @dbus.service.signal(dbus_interface=CONFIG_NEWPRINTERDIALOG_IFACE, +- signature='a{s}') ++ signature='a(s)') + def DriverDownloadChecked(self, installed_files): + pass + diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD index a798f6ed6..d7864141f 100644 --- a/extra/system-config-printer/PKGBUILD +++ b/extra/system-config-printer/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 195976 2013-10-06 19:13:25Z eric $ +# $Id: PKGBUILD 200771 2013-12-04 20:14:29Z jgc $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=system-config-printer -pkgver=1.4.2 -pkgrel=1 +pkgver=1.4.3 +pkgrel=2 pkgdesc="A CUPS printer configuration tool and status applet" url="http://cyberelk.net/tim/software/system-config-printer/" arch=('i686' 'x86_64' 'mips64el') @@ -15,12 +15,16 @@ makedepends=('intltool' 'xmlto' 'docbook-xsl' 'desktop-file-utils') optdepends=('gnome-keyring: password management') replaces=('system-config-printer-common' 'system-config-printer-gnome') conflicts=('system-config-printer-common' 'system-config-printer-gnome') -source=(http://cyberelk.net/tim/data/${pkgname}/${pkgver%*.*}/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('7f6462d84056be13aadeb6e3030aad5e' - 'SKIP') +source=(http://cyberelk.net/tim/data/${pkgname}/${pkgver%*.*}/${pkgname}-${pkgver}.tar.xz{,.sig} + 40_scp-dbus-service-fix-dbus-signature-typo.patch) +md5sums=('99e251bfd281526fb6ea109b3e2bace3' + 'SKIP' + 'a616371aff9fae27b99d036c4143bf37') prepare() { cd ${pkgname}-${pkgver} + patch -Np1 -i ../40_scp-dbus-service-fix-dbus-signature-typo.patch + sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ $(find . -name '*.py') diff --git a/extra/tali/PKGBUILD b/extra/tali/PKGBUILD index ddeb7113c..d5994380d 100644 --- a/extra/tali/PKGBUILD +++ b/extra/tali/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 168943 2012-10-16 16:31:44Z heftig $ +# $Id: PKGBUILD 199338 2013-11-11 11:09:59Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=tali -pkgver=3.10.0 +pkgver=3.10.2 pkgrel=1 pkgdesc="Beat the odds in a poker-style dice game" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ install=tali.install url="https://live.gnome.org/Tali" groups=('gnome-extra') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) -sha256sums=('2e276e6965057fe3136fe831809b2cedab3e8f59346b0fbe37f3f383a25c68c6') +sha256sums=('6a1c1f1dfe8591d3f74f2d46edae9172606581efbb6bbe04f43b2b908a24383b') build() { cd $pkgname-$pkgver diff --git a/extra/tamu-anova/PKGBUILD b/extra/tamu-anova/PKGBUILD index d6a14160f..5153853ee 100644 --- a/extra/tamu-anova/PKGBUILD +++ b/extra/tamu-anova/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 151550 2012-02-27 16:38:42Z giovanni $ +# $Id: PKGBUILD 199832 2013-11-17 07:59:39Z allan $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gergely Imreh <imrehg(at)gmail(dot)com> @@ -12,6 +12,7 @@ license=('GPL') depends=('gsl') makedepends=('gcc') install=tamu-anova.install +options=('staticlibs') source=(http://www.mirrorservice.org/sites/www.ibiblio.org/gentoo/distfiles/tamu_anova-0.2.1.tar.gz) sha1sums=('8c7ffae14ebe92f27d20ff1f0e325875fa6ced53') diff --git a/extra/tcpdump/PKGBUILD b/extra/tcpdump/PKGBUILD index c7a65c864..9811fa83e 100644 --- a/extra/tcpdump/PKGBUILD +++ b/extra/tcpdump/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185812 2013-05-19 11:54:46Z giovanni $ +# $Id: PKGBUILD 200343 2013-11-26 17:54:59Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=tcpdump -pkgver=4.4.0 -pkgrel=2 +pkgver=4.5.1 +pkgrel=1 pkgdesc="A tool for network monitoring and data acquisition" arch=('i686' 'x86_64' 'mips64el') url="http://www.tcpdump.org" @@ -12,14 +12,18 @@ license=('BSD') depends=('libpcap' 'openssl') source=("http://www.tcpdump.org/release/${pkgname}-${pkgver}.tar.gz" 'tcpdump_duplicate_executable.patch') -md5sums=('6f75aabcffd012f73bd7c331bb5d8232' +md5sums=('973a2513d0076e34aa9da7e15ed98e1b' '01379e4a12a208ce951c6c2abe80300f') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" # do not install tcpdump-4.1.1 executable (FS#23346) patch -Np1 -i "${srcdir}/tcpdump_duplicate_executable.patch" +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ --sbindir=/usr/bin \ diff --git a/extra/tevent/PKGBUILD b/extra/tevent/PKGBUILD index 82c199ad0..6ecf5e917 100644 --- a/extra/tevent/PKGBUILD +++ b/extra/tevent/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182652 2013-04-12 07:10:43Z tpowa $ +# $Id: PKGBUILD 200377 2013-11-27 08:49:58Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Christian Hesse <mail@eworm.de> # Contributor: Marco A Rojas <marquicus at gmail dot com> @@ -6,7 +6,7 @@ # Contributor: Thomas Burdick <thomas.burdick@gmail.com> pkgname=tevent -pkgver=0.9.18 +pkgver=0.9.19 pkgrel=1 pkgdesc="An event system based on the talloc memory management library" arch=('i686' 'x86_64' 'mips64el') @@ -33,4 +33,4 @@ package() { make make DESTDIR=${pkgdir}/ install } -md5sums=('952535f0bcf002eee5a8db68deb6374b') +md5sums=('f9ecb7e344bd20fb40f05e97116523f2') diff --git a/extra/thinkfinger/PKGBUILD b/extra/thinkfinger/PKGBUILD index 5e82da674..7760f310b 100644 --- a/extra/thinkfinger/PKGBUILD +++ b/extra/thinkfinger/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 198456 2013-10-30 14:59:04Z allan $ +# $Id: PKGBUILD 199955 2013-11-20 10:57:59Z allan $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: François Charette <francois.archlinux.org> # Contributor: Damir Perisa <damir.archlinux.org> @@ -6,7 +6,7 @@ pkgname=thinkfinger pkgver=0.3 -pkgrel=7 +pkgrel=8 pkgdesc="A driver for the SGS Thomson Microelectronics fingerprint reader found in most IBM/Lenovo ThinkPads" url="http://thinkfinger.sourceforge.net/" arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/totem-plparser/PKGBUILD b/extra/totem-plparser/PKGBUILD index 7dea33a64..0554a7d3f 100644 --- a/extra/totem-plparser/PKGBUILD +++ b/extra/totem-plparser/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198463 2013-10-30 15:01:39Z allan $ +# $Id: PKGBUILD 199437 2013-11-12 18:17:30Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=totem-plparser pkgver=3.10.0 -pkgrel=2 +pkgrel=3 url="http://www.gnome.org" pkgdesc="Totem playlist parser library" license=('LGPL') diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD index 7cc1868a5..fb4e6ede9 100644 --- a/extra/tracker/PKGBUILD +++ b/extra/tracker/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 198661 2013-11-01 15:51:58Z heftig $ +# $Id: PKGBUILD 200225 2013-11-23 08:02:48Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Alexander Fehr <pizzapunk gmail com> pkgbase=tracker pkgname=(tracker libtracker-sparql) -pkgver=0.16.3 +pkgver=0.16.4 _tver=${pkgver%.*} pkgrel=1 pkgdesc="All-in-one indexer, search tool and metadata database" @@ -19,7 +19,7 @@ makedepends=(libgee libsecret upower libexif exempi url="http://www.gnome.org" options=('!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz) -sha256sums=('c5299cbfb2b33f62f06afeb2ebca5b7095b77438fc6c8db6a24dc2ef649537ba') +sha256sums=('9c2f50839c2b8b352ab9a022597ef985c1900e6286c0c3bcb7a64da39dbb3580') build() { cd $pkgbase-$pkgver diff --git a/extra/twisted/PKGBUILD b/extra/twisted/PKGBUILD index 9dc4e570f..e5fd06a78 100644 --- a/extra/twisted/PKGBUILD +++ b/extra/twisted/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 191375 2013-07-24 21:41:22Z eric $ +# $Id: PKGBUILD 199383 2013-11-11 21:37:43Z eric $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=twisted -pkgver=13.1.0 +pkgver=13.2.0 pkgrel=1 pkgdesc="Asynchronous networking framework written in Python" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ optdepends=('python2-pyopenssl' 'tk: for using tkconch') install=twisted.install source=(http://twistedmatrix.com/Releases/Twisted/${pkgver%.*}/Twisted-$pkgver.tar.bz2) -sha1sums=('7f6e07b8098b248157ac26378fafa9e018f279a7') +sha1sums=('e1d43645fd3d84dc2867f36b60d2e469a71eb01d') prepare() { cd "Twisted-$pkgver" diff --git a/extra/vala/PKGBUILD b/extra/vala/PKGBUILD index f1a689a05..5625554de 100644 --- a/extra/vala/PKGBUILD +++ b/extra/vala/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198473 2013-10-30 15:04:37Z allan $ +# $Id: PKGBUILD 199492 2013-11-13 13:49:20Z heftig $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Timm Preetz <timm@preetz.us> pkgname=vala -pkgver=0.22.0 +pkgver=0.22.1 pkgrel=1 pkgdesc="Compiler for the GObject type system" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('LGPL') depends=('glib2') makedepends=('libxslt') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('2f60a7ff887fcb16ed70fa84bb5872c2c54099a0732ce3f9e2c56e51a9208037') +sha256sums=('92c61b94a427f281ba2537b69135a3be23248b153268057d7195003dd6aba28c') build() { cd $pkgname-$pkgver diff --git a/extra/valgrind/PKGBUILD b/extra/valgrind/PKGBUILD index 6123b6b6f..2a0fc272e 100644 --- a/extra/valgrind/PKGBUILD +++ b/extra/valgrind/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 196839 2013-10-20 12:23:36Z allan $ +# $Id: PKGBUILD 199307 2013-11-10 08:38:12Z allan $ # Maintainer: Dan McGee <dan@archlinux.org> # Maintainer: Allan McRae <allan@archlinux.org> pkgname=valgrind -pkgver=3.8.1 -pkgrel=4 +pkgver=3.9.0 +pkgrel=1 pkgdesc="A tool to help find memory-management problems in programs" arch=('i686' 'x86_64') license=('GPL') @@ -12,28 +12,9 @@ url="http://valgrind.org/" depends=('glibc>=2.18' 'glibc<2.19' 'perl') makedepends=('gdb') options=('staticlibs' '!emptydirs') -source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2 - valgrind-3.8.1-glibc-2.18.patch - valgrind-3.8.1-ptrace-build-fix.patch - valgrind-3.8.1-xaddb.patch) -md5sums=('288758010b271119a0ffc0183f1d6e38' - 'f3f911e6f5b0ab9d176d40b47d6cae24' - '9d429e62255621a0c190a8180d8ab1a4' - 'aad7751a3e4ee899093dcfa9f70a449b') +source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2) +md5sums=('0947de8112f946b9ce64764af7be6df2') -prepare() { - cd ${srcdir}/${pkgname}-${pkgver} - - patch -p1 -i $srcdir/valgrind-3.8.1-glibc-2.18.patch - - # based on svn commits 13471 & 13482 - patch -p0 -i $srcdir/valgrind-3.8.1-ptrace-build-fix.patch - - # https://bugs.kde.org/show_bug.cgi?id=307106 - patch -p0 -i $srcdir/valgrind-3.8.1-xaddb.patch - - ./autogen.sh -} build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/vamp-plugin-sdk/PKGBUILD b/extra/vamp-plugin-sdk/PKGBUILD index bc6751e26..e0cc501ea 100644 --- a/extra/vamp-plugin-sdk/PKGBUILD +++ b/extra/vamp-plugin-sdk/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 198474 2013-10-30 15:05:08Z allan $ +# $Id: PKGBUILD 199953 2013-11-20 10:54:48Z allan $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Orivej Desh <smpuj@bk.ru> pkgname=vamp-plugin-sdk pkgver=2.5 _dir=690 -pkgrel=1 +pkgrel=2 pkgdesc="The Vamp audio analysis plug-in system" arch=('i686' 'x86_64' 'mips64el') url="http://www.vamp-plugins.org/" diff --git a/extra/varnish/PKGBUILD b/extra/varnish/PKGBUILD index 537dae473..49bb04f81 100644 --- a/extra/varnish/PKGBUILD +++ b/extra/varnish/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 198475 2013-10-30 15:05:30Z allan $ +# $Id: PKGBUILD 200724 2013-12-03 14:59:11Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Douglas Soares de Andrade # Contributor: Roberto Alsina <ralsina@kde.org> pkgname=varnish -pkgver=3.0.4 -pkgrel=2 +pkgver=3.0.5 +pkgrel=1 pkgdesc="High-performance HTTP accelerator" arch=('i686' 'x86_64' 'mips64el') url="http://www.varnish-cache.org/" @@ -17,9 +17,9 @@ install=$pkgname.install source=("http://repo.varnish-cache.org/source/$pkgname-$pkgver.tar.gz" varnish-vcl-reload varnish.service) -md5sums=('a130ce9c3504b9603a46542635e18701' +md5sums=('674d44775cc927aee4601edb37f60198' '03196dee7fc68e75069393d52c370762' - 'a59b17d8e3066abcf3dd7755a2212dd4') + '276f1761b3c7c6a83688038659194bbb') build() { cd "$pkgname-$pkgver" diff --git a/extra/varnish/varnish.service b/extra/varnish/varnish.service index 851e32140..01fda89c2 100644 --- a/extra/varnish/varnish.service +++ b/extra/varnish/varnish.service @@ -3,7 +3,7 @@ Description=Web Application Accelerator After=network.target [Service] -ExecStart=/usr/bin/varnishd -a 0.0.0.0:80 -f /etc/varnish/default.vcl -T localhost:6082 -s malloc,64M -u nobody -g nobody -F +ExecStart=/usr/bin/varnishd -a 0.0.0.0:80,[::]:80 -f /etc/varnish/default.vcl -T localhost:6082 -s malloc,64M -u nobody -g nobody -F ExecReload=/usr/bin/varnish-vcl-reload [Install] diff --git a/extra/vigra/PKGBUILD b/extra/vigra/PKGBUILD index 3f1c3e15b..b2fb1429e 100644 --- a/extra/vigra/PKGBUILD +++ b/extra/vigra/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 197516 2013-10-26 12:19:28Z andyrtr $ +# $Id: PKGBUILD 201267 2013-12-07 10:35:07Z bpiotrowski $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgbase=vigra pkgname=('vigra' 'vigra-doc') pkgver=1.9.0 -pkgrel=7 +pkgrel=8 arch=('i686' 'x86_64' 'mips64el') url="http://hci.iwr.uni-heidelberg.de/vigra/" license=('custom:MIT') diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index a2fba37ca..1f59b65e5 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -6,11 +6,11 @@ pkgbase=vim pkgname=('vim' 'gvim' 'vim-runtime') _topver=7.4 -_patchlevel=16 -__hgrev=d17ef148ada4 +_patchlevel=86 +__hgrev=f6940759212d _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('custom:vim') url="http://www.vim.org" @@ -20,7 +20,7 @@ source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz" 'vimrc' 'archlinux.vim' 'gvim.desktop') -md5sums=('733cce44a08ea953ad0e1f9d574670e0' +md5sums=('436d4d3c6402ce20309bf2cdedce63c0' 'SKIP' 'b9d4dcb9d3ee2e151dc4be1e94934f6a' '10353a61aadc3f276692d0e17db1478e' diff --git a/extra/vinagre/PKGBUILD b/extra/vinagre/PKGBUILD index 474e69271..a29e6644e 100644 --- a/extra/vinagre/PKGBUILD +++ b/extra/vinagre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 198477 2013-10-30 15:06:10Z allan $ +# $Id: PKGBUILD 199391 2013-11-11 22:11:24Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Allan McRae <mcrae_allan@hotmail.com> # Contributor: lp76 <l.peduto@gmail.com> pkgname=vinagre -pkgver=3.10.1 +pkgver=3.10.2 pkgrel=1 pkgdesc="A VNC Client for the GNOME Desktop" arch=('i686' 'x86_64' 'mips64el') @@ -20,7 +20,7 @@ makedepends=(docbook-xsl intltool freerdp openssh itstool spice-protocol) groups=(gnome-extra) options=('!emptydirs') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('ea8cc79e227148359d3582ff121dab864913eb1dfcba6458e11da32d4dfec503') +sha256sums=('72907079da70dcda63870a790db956bebee241a920daa99c4a80766c177ead87') build() { cd $pkgname-$pkgver diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index d091bb6e8..7b00b5e82 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 198478 2013-10-30 15:06:33Z allan $ +# $Id: PKGBUILD 201400 2013-12-10 17:02:18Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc -pkgver=2.1.0 -pkgrel=5 +pkgver=2.1.2 +pkgrel=1 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64' 'mips64el') url="http://www.videolan.org/vlc/" @@ -13,12 +13,13 @@ license=('LGPL2.1' 'GPL2') depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt4' 'libproxy' 'sdl_image' 'libdvdnav' 'libtiger' 'lua' 'libmatroska' 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' - 'libshout' 'libmad' 'libmpeg2' 'xcb-util-keysyms') + 'libshout' 'libmad' 'libmpeg2' 'xcb-util-keysyms' 'libtar' + 'libxinerama') makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs' 'libdc1394' 'libavc1394' 'libcaca' 'librsvg' 'portaudio' 'libgme' 'xosd' 'twolame' 'aalib' 'libmtp' 'libdvdcss' 'gnome-vfs' - 'libgoom2' 'libtar' 'vcdimager' 'opus' 'libssh2' 'mesa') + 'libgoom2' 'vcdimager' 'opus' 'libssh2' 'mesa') [ "$CARCH" = "mips64el" ] || makedepends+=('lirc-utils' 'projectm') optdepends=('avahi: for service discovery using bonjour protocol' 'libnotify: for notification plugin' @@ -42,7 +43,6 @@ optdepends+=('libcaca: for colored ASCII art video output' 'gnome-vfs: for GNOME Virtual File System support' 'libgoom2: for libgoom plugin' 'vcdimager: navigate VCD with libvcdinfo' - 'xosd: for xosd support' 'aalib: for ASCII art plugin' 'libmtp: for MTP devices support' 'smbclient: for SMB access plugin' @@ -50,29 +50,30 @@ optdepends+=('libcaca: for colored ASCII art video output' 'ttf-freefont: for subtitle font ' 'ttf-dejavu: for subtitle font' 'opus: for opus support' - 'libssh2: for sftp support') + 'libssh2: for sftp support' + 'lua-socket: for http interface') conflicts=('vlc-plugin') replaces=('vlc-plugin') backup=('usr/share/vlc/lua/http/.hosts' 'usr/share/vlc/lua/http/dialogs/.hosts') options=('!emptydirs') install=vlc.install -source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver/.a}/${pkgname}-${pkgver/.a/a}.tar.xz" -vlc-2.0.7-vaapi-compat.patch) -md5sums=('8c77bda671821f5b9ede96b6816e2ade' +source=("http://download.videolan.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz" + 'vlc-2.0.7-vaapi-compat.patch') +md5sums=('fb6787ad749aadcfaeab3471939b3426' '6df10774bb7acf20e09d6139e5c7839e') prepare() { - cd "${srcdir}/${pkgname}-${pkgver/.a}" + cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ../vlc-2.0.7-vaapi-compat.patch + patch -Np1 -i "${srcdir}/vlc-2.0.7-vaapi-compat.patch" sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c sed -i -e 's:truetype/ttf-dejavu:TTF:g' modules/visualization/projectm.cpp } build() { - cd "${srcdir}/${pkgname}-${pkgver/.a}" + cd "${srcdir}/${pkgname}-${pkgver}" [ "$CARCH" = "mips64el" ] && extraconf="--disable-lirc" CFLAGS+="-I/usr/include/samba-4.0" CPPFLAGS+="-I/usr/include/samba-4.0" \ @@ -82,29 +83,27 @@ build() { --enable-faad \ --enable-nls \ --enable-lirc \ - --enable-pvr \ --enable-ncurses \ --enable-realrtsp \ - --enable-xosd \ --enable-aa \ --enable-vcdx \ --enable-upnp \ --enable-opus \ --enable-sftp \ $extraconf \ - LUAC=luac5.1 \ + LUAC=/usr/bin/luac LUA_LIBS="`pkg-config --libs lua`" \ RCC=/usr/bin/rcc-qt4 make } package() { - cd "${srcdir}/${pkgname}-${pkgver/.a}" + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install for res in 16 32 48 128; do - install -D -m644 "${srcdir}/vlc-${pkgver/.a}/share/icons/${res}x${res}/vlc.png" \ - "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png" + install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \ + "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png" done } diff --git a/extra/w3m/PKGBUILD b/extra/w3m/PKGBUILD index 8f522c943..68462be22 100644 --- a/extra/w3m/PKGBUILD +++ b/extra/w3m/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 175136 2013-01-15 01:58:54Z bisson $ -# Contributor: dorphell <dorphell@archlinux.org> +# $Id: PKGBUILD 199274 2013-11-09 05:21:55Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: dorphell <dorphell@archlinux.org> pkgname=w3m pkgver=0.5.3 -pkgrel=4.1 +pkgrel=5 pkgdesc='Text-based Web browser, as well as pager' url='http://w3m.sourceforge.net/' license=('custom') @@ -12,22 +12,24 @@ arch=('i686' 'x86_64' 'mips64el') makedepends=('imlib2') optdepends=('imlib2: for graphics support') depends=('openssl' 'gc' 'ncurses') -source=("http://downloads.sourceforge.net/sourceforge/w3m/${pkgname}-${pkgver}.tar.gz" +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz" + 'form_unknown.patch' 'file_handle.patch' 'https.patch' 'gc72.patch') sha1sums=('444b6c8cf7094ee95f8e9de96b37f814b9d83237' + '23d648033ad77f3c67d370c62cf7b7ed86b5c6f2' '457de43be7eabc652614461a7ab25e3ba76b2aff' '66affb2f695fe0bdde25cf774642bfd6a9404e88' '7baa06ca684fd140503a2adc65e2d606970c4662') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" + ls ../*.patch | xargs -i patch -p1 -i {} +} - patch -p1 -i ../file_handle.patch - patch -p1 -i ../https.patch - patch -p1 -i ../gc72.patch - +build() { + cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ --prefix=/usr \ --libexecdir=/usr/lib \ diff --git a/extra/w3m/form_unknown.patch b/extra/w3m/form_unknown.patch new file mode 100644 index 000000000..b22b176ac --- /dev/null +++ b/extra/w3m/form_unknown.patch @@ -0,0 +1,15 @@ +See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=615843 + +Index: w3m-git/form.c +=================================================================== +--- w3m-git.orig/form.c 2011-02-28 15:03:36.000000000 +0100 ++++ w3m-git/form.c 2011-02-28 15:32:33.000000000 +0100 +@@ -196,7 +196,7 @@ + if (!strcasecmp(typestr, _formtypetbl[i])) + return i; + } +- return FORM_UNKNOWN; ++ return FORM_INPUT_TEXT; + } + + void diff --git a/extra/wcslib/PKGBUILD b/extra/wcslib/PKGBUILD index 142469968..dce642c4c 100644 --- a/extra/wcslib/PKGBUILD +++ b/extra/wcslib/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 197080 2013-10-21 16:11:19Z andrea $ +# $Id: PKGBUILD 202210 2013-12-19 13:51:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=wcslib -pkgver=4.19 +pkgver=4.20 pkgrel=1 pkgdesc="A C library that implements the 'World Coordinate System' (WCS) standard in FITS" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('GPL3') depends=('cfitsio') makedepends=('gcc-fortran') source=("ftp://ftp.atnf.csiro.au/pub/software/${pkgname}/${pkgname}.tar.bz2") -md5sums=('79d47ab10dfde08d91c0e6184cf73bda') +md5sums=('3513e20f236274fbc2fa22251fd0726f') build() { cd $pkgname-$pkgver @@ -28,12 +28,9 @@ build() { #} package() { - # Fix install on i686 - install -d "${pkgdir}"/usr/include/${pkgname}-${pkgver} - cd $pkgname-$pkgver - make -j1 DESTDIR="$pkgdir/" install - + make DESTDIR="$pkgdir/" install + # Fix wrong permissions chmod g=rx,-s "${pkgdir}"/usr/{bin/,/lib/{,pkgconfig},share/man/man1/} chmod -s "${pkgdir}"/usr/{include/wcslib-${pkgver}/,share/doc/wcslib-${pkgver}/{,html/}} diff --git a/extra/webkitgtk/PKGBUILD b/extra/webkitgtk/PKGBUILD index e5e2a4eb0..8da5919dd 100644 --- a/extra/webkitgtk/PKGBUILD +++ b/extra/webkitgtk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198482 2013-10-30 15:07:59Z allan $ +# $Id: PKGBUILD 200757 2013-12-04 18:15:50Z heftig $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=webkitgtk -pkgver=2.2.0 -pkgrel=2 +pkgver=2.2.3 +pkgrel=1 pkgdesc="GTK+ Web content engine library" arch=(i686 x86_64 mips64el) url="http://webkitgtk.org/" @@ -17,7 +17,7 @@ conflicts=(webkitgtk3 libwebkit3) replaces=(webkitgtk3 libwebkit3) options=(!emptydirs) source=(http://webkitgtk.org/releases/$pkgname-${pkgver}.tar.xz) -sha256sums=('84902e3255dcc6efa1298c8a1f2d2a49674126dcacea383f309aeed9e734d538') +sha256sums=('94bcb3303aadce8454b572ab0e5d178eca3b7238f34bd3e7177b0daec04e4605') prepare() { cd $pkgbase-$pkgver diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD index d831a5712..74a7bede6 100644 --- a/extra/weechat/PKGBUILD +++ b/extra/weechat/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 198485 2013-10-30 15:09:03Z allan $ +# $Id: PKGBUILD 200241 2013-11-23 18:13:47Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: lucke <lucke at o2 dot pl> pkgname=weechat pkgver=0.4.2 -pkgrel=1 +pkgrel=2 pkgdesc="Fast, light and extensible IRC client (curses UI)" arch=('i686' 'x86_64' 'mips64el') url="http://www.weechat.org/" license=('GPL') depends=('gnutls' 'curl' 'libgcrypt') -makedepends=('cmake' 'pkg-config' 'perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell' 'guile') +makedepends=('asciidoc' 'source-highlight' 'cmake' 'pkg-config' 'perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell' 'guile') optdepends=('perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell' 'guile') source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2") md5sums=('fbbb4c319474d4a3b123fea7e8402fa2') @@ -23,7 +23,9 @@ build() { cd build cmake ../${pkgname}-${pkgver} -DPREFIX=/usr \ -DPYTHON_EXECUTABLE=/usr/bin/python2 \ - -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so + -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \ + -DENABLE_MAN=ON \ + -DENABLE_DOC=ON } package() { diff --git a/extra/whois/PKGBUILD b/extra/whois/PKGBUILD index 6564b180f..50e76ef90 100644 --- a/extra/whois/PKGBUILD +++ b/extra/whois/PKGBUILD @@ -1,27 +1,33 @@ -# $Id: PKGBUILD 191778 2013-07-30 17:02:46Z giovanni $ +# $Id: PKGBUILD 199908 2013-11-18 18:15:18Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=whois pkgver=5.0.26 -pkgrel=1 +pkgrel=2 pkgdesc="The whois client by Marco d'Itri" arch=('i686' 'x86_64' 'mips64el') url="http://www.linux.it/~md/software/" license=('GPL') depends=('libidn') makedepends=('perl') +backup=('etc/whois.conf') source=("http://ftp.debian.org/debian/pool/main/w/whois/${pkgname}_${pkgver}.tar.xz") md5sums=('236829eea77e85df2443a54815a1b41d') build() { cd "${srcdir}/${pkgname}-${pkgver}" - make prefix=/usr CFLAGS="$CFLAGS" HAVE_LIBIDN=1 HAVE_ICONV=1 + make prefix=/usr \ + CFLAGS="$CFLAGS $CPPFLAGS" \ + CONFIG_FILE=/etc/whois.conf \ + HAVE_LIBIDN=1 \ + HAVE_ICONV=1 } package() { cd "${srcdir}/${pkgname}-${pkgver}" make prefix=/usr BASEDIR="${pkgdir}" install-whois + install -D -m644 whois.conf "${pkgdir}/etc/whois.conf" } diff --git a/extra/windowmaker/PKGBUILD b/extra/windowmaker/PKGBUILD index 2a17fdd5b..a8c56ff10 100644 --- a/extra/windowmaker/PKGBUILD +++ b/extra/windowmaker/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 198487 2013-10-30 15:09:48Z allan $ +# $Id: PKGBUILD 199951 2013-11-20 10:48:41Z allan $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> + pkgname=windowmaker pkgver=0.95.5 -pkgrel=1 +pkgrel=2 pkgdesc="An X11 window manager with a NEXTSTEP look and feel" -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') url="http://www.windowmaker.org/" license=('GPL' 'custom') depends=('libxinerama' 'libxrandr' 'libxmu' 'libpng' 'libxpm' 'libxft' 'libtiff' 'giflib') @@ -21,6 +22,7 @@ prepare() { patch -Np0 -i ../wm-giflib.patch autoreconf -fi } + build() { cd WindowMaker-$pkgver [ -z "$LINGUAS" ] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" diff --git a/extra/wxmaxima/PKGBUILD b/extra/wxmaxima/PKGBUILD index 0e3a76672..133aedbcb 100644 --- a/extra/wxmaxima/PKGBUILD +++ b/extra/wxmaxima/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Vinay S Shastry <vinayshastry@gmail.com> pkgname=wxmaxima -pkgver=13.04.1 +pkgver=13.04.2 pkgrel=1 pkgdesc="A wxWidgets GUI for the computer algebra system Maxima" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('GPL2') depends=('maxima' 'libxml2' 'wxgtk' 'shared-mime-info' 'desktop-file-utils') source=(http://downloads.sourceforge.net/$pkgname/wxMaxima-$pkgver.tar.gz) install=wxmaxima.install -sha1sums=('c1d8be28f92820d0e447d186271a48a72545c887') +sha1sums=('9508d3badb6c339f34e73e01c5065f679329a17c') build() { cd "${srcdir}/wxMaxima-${pkgver}" diff --git a/extra/x11vnc/PKGBUILD b/extra/x11vnc/PKGBUILD index eb9471cdf..5a723ce00 100644 --- a/extra/x11vnc/PKGBUILD +++ b/extra/x11vnc/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 191363 2013-07-24 02:13:55Z bisson $ +# $Id: PKGBUILD 202637 2013-12-23 05:41:09Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=x11vnc pkgver=0.9.13 -pkgrel=4 +pkgrel=5 pkgdesc='VNC server for real X displays' url='http://www.karlrunge.com/x11vnc/' arch=('i686' 'x86_64' 'mips64el') license=('GPL2') -optdepends=('tk: for GUI support') +optdepends=('tk: for GUI support' + 'net-tools: for -auth guess') depends=('openssl' 'libjpeg' 'libxtst' 'libxinerama' 'libxdamage' 'libxrandr' 'avahi') source=("http://downloads.sourceforge.net/project/libvncserver/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" 'service') diff --git a/extra/x264/PKGBUILD b/extra/x264/PKGBUILD index 4a06db7df..f630a3891 100644 --- a/extra/x264/PKGBUILD +++ b/extra/x264/PKGBUILD @@ -1,41 +1,32 @@ -# $Id: PKGBUILD 191968 2013-08-02 08:00:53Z bpiotrowski $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> +# $Id: PKGBUILD 201499 2013-12-13 07:56:25Z bpiotrowski $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: damir <damir@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=x264 -pkgver=20130702 +pkgver=20131030 pkgrel=2 -pkgdesc="free library for encoding H264/AVC video streams" +pkgdesc='Library for encoding H264/AVC video streams' arch=('i686' 'x86_64' 'mips64el') -url="http://www.videolan.org/developers/x264.html" +url='http://www.videolan.org/developers/x264.html' license=('GPL') depends=('glibc') makedepends=('yasm' 'git') -source=(git://git.videolan.org/x264.git#commit=585324fee3) +source=(git://git.videolan.org/x264.git#commit=c628e3bac) md5sums=('SKIP') -pkgver() { - cd $pkgname - git log -1 --format="%cd" --date=short | sed 's|-||g' -} - build() { cd $pkgname - ./configure --enable-shared \ + ./configure --prefix=/usr \ + --enable-shared \ --enable-pic + make } package() { cd $pkgname - - make DESTDIR="$pkgdir" \ - bindir=/usr/bin \ - libdir=/usr/lib \ - includedir=/usr/include \ - install + make DESTDIR="$pkgdir" install } - -# vim:set ts=2 sw=2 et: diff --git a/extra/x2goclient/PKGBUILD b/extra/x2goclient/PKGBUILD index 5ac5eb002..e9c5e1e55 100644 --- a/extra/x2goclient/PKGBUILD +++ b/extra/x2goclient/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 194273 2013-09-12 19:24:14Z andyrtr $ +# $Id: PKGBUILD 201675 2013-12-17 22:03:50Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Gerhard Brauer <gerbra@archlinux.de> # Contributor: Richard Murri <admin@richardmurri.com> pkgname=x2goclient -pkgver=4.0.1.1 +pkgver=4.0.1.2 pkgrel=1 pkgdesc="x2go qt4 client" arch=('i686' 'x86_64' 'mips64el') @@ -14,13 +14,16 @@ depends=('qt4' 'libldap' 'libcups' 'nxproxy' 'libssh' 'libxpm' 'hicolor-icon-the makedepends=('man2html') install=x2goclient.install source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('13b6729acfd5c6a00441430ef6ab69d6') +md5sums=('500c94ce4c8a63ecabde347d526f1356') build() { cd ${pkgname}-${pkgver} sed -i "s:-o root -g root ::" Makefile - sed -i "s:lrelease:lrelease-qt4:g" Makefile - make PREFIX=/usr + #make PREFIX=/usr + #make PREFIX=/usr build_man # target broken and making the build hang + make PREFIX=/usr build_pluginprovider + make PREFIX=/usr build_client + make PREFIX=/usr build_plugin } package() { diff --git a/extra/x2goserver/PKGBUILD b/extra/x2goserver/PKGBUILD index dba40a0bf..a3669d2b8 100644 --- a/extra/x2goserver/PKGBUILD +++ b/extra/x2goserver/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 191716 2013-07-29 13:47:21Z andyrtr $ +# $Id: PKGBUILD 200258 2013-11-23 21:59:15Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Gerhard Brauer <gerbra@archlinux.de> @@ -7,7 +7,7 @@ # Contributor: Milan Knížek <knizek@volny.cz> pkgname=x2goserver -pkgver=4.0.1.6 +pkgver=4.0.1.8 pkgrel=1 pkgdesc="Open source terminal server" arch=('i686' 'x86_64' 'mips64el') @@ -21,7 +21,7 @@ install=x2goserver.install backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql') source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz x2goserver.service) -md5sums=('61f2248fb16bc035f92b9588ab19c35e' +md5sums=('754ee94f2b4b57fc08973027a174cf81' 'f76081c01e40b6206895d194dc949707') build() { @@ -60,4 +60,7 @@ package() { install -dm 755 "${pkgdir}/usr/share/doc/${pkgname}" install -m 644 "debian/changelog" "${pkgdir}/usr/share/doc/${pkgname}/changelog.DEBIAN" install -m 644 "debian/copyright" "${pkgdir}/usr/share/doc/${pkgname}/copyright.DEBIAN" + + # fix permission + chmod 750 ${pkgdir}/etc/sudoers.d } diff --git a/extra/xaos/PKGBUILD b/extra/xaos/PKGBUILD index f964132bf..81638c8cf 100644 --- a/extra/xaos/PKGBUILD +++ b/extra/xaos/PKGBUILD @@ -1,25 +1,23 @@ -# $Id: PKGBUILD 184451 2013-05-06 19:40:17Z foutrelis $ +# $Id: PKGBUILD 199875 2013-11-17 22:02:34Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xaos -pkgver=3.5 -pkgrel=6 +pkgver=3.6 +pkgrel=1 pkgdesc="A fast portable real-time interactive fractal zoomer" arch=('i686' 'x86_64' 'mips64el') -url="http://sourceforge.net/projects/xaos/" +url="http://matek.hu/xaos/" license=('GPL') depends=('gsl' 'libpng' 'aalib') options=('!makeflags') install=xaos.install -source=(http://downloads.sourceforge.net/sourceforge/xaos/${pkgname}-${pkgver}.tar.gz \ - xaos-3.5-libpng15.patch xaos-3.5-build-fix-i686.patch) -sha1sums=('6d16a58187fba7276e6bd0547cc2fd6bb073b801' - '6c51cb2ee1c5f28973680ffc3a040c2cea65fd33' +source=(http://downloads.sourceforge.net/sourceforge/xaos/${pkgname}-${pkgver}.tar.gz + xaos-3.5-build-fix-i686.patch) +sha1sums=('0c68d25c4f9c8eaf557e37d9e4586a04ab56d7a0' 'd2ea8f0460c79c47fb289a4c2f87fe5c44057f9d') prepare() { cd ${pkgname}-${pkgver} - patch -p0 -i ../xaos-3.5-libpng15.patch if [[ $CARCH == "i686" ]]; then patch -p1 -i ../xaos-3.5-build-fix-i686.patch fi diff --git a/extra/xaos/xaos-3.5-libpng15.patch b/extra/xaos/xaos-3.5-libpng15.patch deleted file mode 100644 index beece8339..000000000 --- a/extra/xaos/xaos-3.5-libpng15.patch +++ /dev/null @@ -1,131 +0,0 @@ -http://code.google.com/p/gnuxaos/issues/detail?id=55 - ---- src/util/png.c -+++ src/util/png.c -@@ -3,6 +3,7 @@ - #include <aconfig.h> - #ifdef USE_PNG - #include <png.h> -+#include <zlib.h> - #endif - #include <stdlib.h> - #include <stdio.h> -@@ -31,6 +32,9 @@ - png_structp png_ptr; - png_infop info_ptr; - png_color palette[256]; -+ png_color_8 sig_bit; -+ int color_type; -+ int bit_depth; - volatile unsigned short a = 255; - volatile unsigned char *b = (volatile unsigned char *) &a; - #ifdef _undefined_ -@@ -59,7 +63,7 @@ - png_destroy_write_struct(&png_ptr, (png_infopp) NULL); - return "No memory to create png info structure"; - } -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_write_struct(&png_ptr, &info_ptr); - fclose(file); - return strerror(errno); -@@ -78,57 +82,70 @@ - png_set_compression_window_bits(png_ptr, 15); - png_set_compression_method(png_ptr, 8); - -- info_ptr->width = image->width; -- info_ptr->height = image->height; -- /*info_ptr->gamma=1.0; */ -- info_ptr->gamma = 0.5; -- info_ptr->valid |= PNG_INFO_gAMA | PNG_INFO_pHYs; -- info_ptr->x_pixels_per_unit = (png_uint_32) (100 / image->pixelwidth); -- info_ptr->y_pixels_per_unit = (png_uint_32) (100 / image->pixelheight); -+ switch (image->palette->type) -+ { -+ case C256: -+ color_type = PNG_COLOR_TYPE_PALETTE; -+ bit_depth = image->bytesperpixel * 8; -+ break; -+ case SMALLITER: -+ case LARGEITER: -+ case GRAYSCALE: -+ color_type = PNG_COLOR_TYPE_GRAY; -+ bit_depth = image->bytesperpixel * 8; -+ break; -+ case TRUECOLOR: -+ case TRUECOLOR24: -+ case TRUECOLOR16: -+ color_type = PNG_COLOR_TYPE_RGB; -+ bit_depth = 8; -+ break; -+ } - -+ png_set_IHDR (png_ptr, info_ptr, image->width, image->height, bit_depth, -+ color_type, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, -+ PNG_FILTER_TYPE_BASE); - - switch (image->palette->type) { - case C256: - { - int i; -- info_ptr->color_type = PNG_COLOR_TYPE_PALETTE; -- info_ptr->bit_depth = image->bytesperpixel * 8; -- info_ptr->palette = palette; -- info_ptr->valid |= PNG_INFO_PLTE; -+ png_color png_palette[257]; -+ int png_num_palette; - for (i = 0; i < image->palette->end; i++) -- info_ptr->palette[i].red = image->palette->rgb[i][0], -- info_ptr->palette[i].green = image->palette->rgb[i][1], -- info_ptr->palette[i].blue = image->palette->rgb[i][2], -- info_ptr->num_palette = image->palette->end; -+ png_palette[i].red = image->palette->rgb[i][0], -+ png_palette[i].green = image->palette->rgb[i][1], -+ png_palette[i].blue = image->palette->rgb[i][2], -+ png_num_palette = image->palette->end; -+ png_set_PLTE(png_ptr, info_ptr, png_palette, png_num_palette); - } - break; -- case SMALLITER: -- case LARGEITER: -- case GRAYSCALE: -- info_ptr->color_type = PNG_COLOR_TYPE_GRAY; -- info_ptr->bit_depth = image->bytesperpixel * 8; -- break; - case TRUECOLOR: - case TRUECOLOR24: - case TRUECOLOR16: -- info_ptr->color_type = PNG_COLOR_TYPE_RGB; -- info_ptr->bit_depth = 8; -- info_ptr->sig_bit.red = 8 - image->palette->info.truec.rprec; -- info_ptr->sig_bit.green = 8 - image->palette->info.truec.gprec; -- info_ptr->sig_bit.blue = 8 - image->palette->info.truec.bprec; -+ sig_bit.red = 8 - image->palette->info.truec.rprec; -+ sig_bit.green = 8 - image->palette->info.truec.gprec; -+ sig_bit.blue = 8 - image->palette->info.truec.bprec; -+ png_set_sBIT(png_ptr, info_ptr, &sig_bit); - break; - } -- info_ptr->interlace_type = 0; -+ -+ png_write_info (png_ptr, info_ptr); -+ - #ifdef _undefined_ - png_set_text(png_ptr, info_ptr, comments, - sizeof(comments) / sizeof(png_text)); - #endif - -- png_write_info(png_ptr, info_ptr); -+ png_set_gAMA(png_ptr, info_ptr, 0.5 /* 1.0 */); -+ png_set_pHYs(png_ptr, info_ptr, (png_uint_32) (100 / image->pixelwidth), -+ (png_uint_32) (100 / image->pixelheight), -+ PNG_RESOLUTION_UNKNOWN); -+ - /*png_set_filler(png_ptr,0,PNG_FILLER_AFTER); */ - png_set_packing(png_ptr); - if (image->palette->type & (TRUECOLOR | TRUECOLOR24 | TRUECOLOR16)) -- png_set_shift(png_ptr, &(info_ptr->sig_bit)); -+ png_set_shift (png_ptr, &sig_bit); - if (*b == 255) - png_set_swap(png_ptr); - png_set_bgr(png_ptr); diff --git a/extra/xchm/PKGBUILD b/extra/xchm/PKGBUILD deleted file mode 100644 index a339f9e1b..000000000 --- a/extra/xchm/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 193831 2013-09-02 17:00:04Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> - -pkgname=xchm -pkgver=1.23 -pkgrel=1 -pkgdesc="A cross-platform GUI front-end to chmlib" -arch=('i686' 'x86_64' 'mips64el') -url="http://xchm.sourceforge.net/" -license=('GPL') -depends=('chmlib' 'wxgtk' 'desktop-file-utils') -install=xchm.install -source=("http://downloads.sourceforge.net/sourceforge/xchm/${pkgname}-${pkgver}.tar.gz" - 'xchm.desktop' - 'xchm.xml') -md5sums=('486d029bd81071a2d04e7181909b1602' - '31fb9692b9ee9f2a205f58b9ff4bc4fe' - '4102b0a393f5c60236143cc034664dd0') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - export CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing" - ./configure --prefix=/usr \ - --build=$CHOST \ - --host=$CHOST - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR=${pkgdir} install - install -D -m644 ${srcdir}/xchm.desktop "${pkgdir}/usr/share/applications/xchm.desktop" - install -D -m644 ${srcdir}/xchm.xml "${pkgdir}/usr/share/mime/packages/xchm.xml" -} diff --git a/extra/xchm/xchm.desktop b/extra/xchm/xchm.desktop deleted file mode 100644 index ca20876b2..000000000 --- a/extra/xchm/xchm.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=Xchm -Comment=Views CHM files -Exec=xchm %f -Terminal=false -Type=Application -Icon=xchm-48 -Categories=Viewer;Utility; -MimeType=application/x-chm; -StartupNotify=true diff --git a/extra/xchm/xchm.install b/extra/xchm/xchm.install deleted file mode 100644 index df90cb5ac..000000000 --- a/extra/xchm/xchm.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - #gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q - update-mime-database usr/share/mime > /dev/null -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - #gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q - update-mime-database usr/share/mime > /dev/null -} diff --git a/extra/xchm/xchm.xml b/extra/xchm/xchm.xml deleted file mode 100644 index 08cb9ca3f..000000000 --- a/extra/xchm/xchm.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"> - <mime-type type="application/x-chm"> - <comment>Compiled HTML Help Format</comment> - <glob pattern="*.chm"/> - </mime-type> -</mime-info> diff --git a/extra/xf86-input-synaptics/PKGBUILD b/extra/xf86-input-synaptics/PKGBUILD index b235d50a3..aea961639 100644 --- a/extra/xf86-input-synaptics/PKGBUILD +++ b/extra/xf86-input-synaptics/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 198505 2013-10-30 15:16:55Z allan $ +# $Id: PKGBUILD 201440 2013-12-11 17:08:28Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Bächler <thomas@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xf86-input-synaptics -pkgver=1.7.1 +pkgver=1.7.2 pkgrel=1 pkgdesc="Synaptics driver for notebook touchpads" arch=('i686' 'x86_64' 'mips64el') @@ -21,7 +21,7 @@ groups=('xorg-drivers' 'xorg') backup=('etc/X11/xorg.conf.d/50-synaptics.conf') source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 add_tapbuttons.diff) -sha256sums=('db5825660e1fb23190697f609bf75d4450fe707344a14298e1c9b47039bbb58e' +sha256sums=('63957fa55f0d8662ef8c57f6325155c9884a854554d33921f0738e097f2a7dcd' '5298d3e871db3768b34cf8516d3f53f9291202e2ea5de3300256e1cd9119a1ec') build() { diff --git a/extra/xf86-video-mga/PKGBUILD b/extra/xf86-video-mga/PKGBUILD index 3da23a305..cc6389ae9 100644 --- a/extra/xf86-video-mga/PKGBUILD +++ b/extra/xf86-video-mga/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198523 2013-10-30 15:22:57Z allan $ +# $Id: PKGBUILD 200806 2013-12-05 19:33:54Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-mga -pkgver=1.6.2 -pkgrel=3 +pkgver=1.6.3 +pkgrel=1 pkgdesc="X.org mga video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -14,16 +14,16 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERS optdepends=('mga-dri: DRI1 support from community repo') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('3f89ce250eea93f0de890954687790e06c0bab9e3e303df393e8759a187eca6c') +sha256sums=('7704b1ea35098769787a9c93e903b827be97a99facfb1696aa5236a58ff1c7d7') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" diff --git a/extra/xf86-video-modesetting/PKGBUILD b/extra/xf86-video-modesetting/PKGBUILD index fa9b0e673..8aafb538c 100644 --- a/extra/xf86-video-modesetting/PKGBUILD +++ b/extra/xf86-video-modesetting/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198524 2013-10-30 15:23:19Z allan $ +# $Id: PKGBUILD 200763 2013-12-04 19:37:59Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> pkgname=xf86-video-modesetting -pkgver=0.8.0 +pkgver=0.8.1 pkgrel=1 pkgdesc="X.org generic modesetting video driver" arch=('i686' 'x86_64' 'mips64el') @@ -15,16 +15,16 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERS groups=('xorg-drivers' 'xorg') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('13dc349e9aa50987ab2479d27d6879cda2c1f9ad8c8d3a1422a2f53c36f047f8') +sha256sums=('3ba8d8d7cb679497abc6486e2e843f8ea1582d830a27448ed4c90413e58312ca') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/extra/xf86-video-nouveau/PKGBUILD b/extra/xf86-video-nouveau/PKGBUILD index 09b5d3c4d..9db8e5154 100644 --- a/extra/xf86-video-nouveau/PKGBUILD +++ b/extra/xf86-video-nouveau/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198527 2013-10-30 15:24:00Z allan $ +# $Id: PKGBUILD 199041 2013-11-07 17:46:41Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: buddabrod <buddabrod@gmail.com> pkgname=xf86-video-nouveau -pkgver=1.0.9 +pkgver=1.0.10 pkgrel=1 pkgdesc="Open Source 2D acceleration driver for nVidia cards" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERS groups=('xorg-drivers' 'xorg') install=$pkgname.install source=(http://xorg.freedesktop.org/archive/individual/driver/$pkgname-$pkgver.tar.bz2) -sha256sums=('b247c800e532fad1c80a5666d8ca0d4e5712064b6d7a3b030b32206a8de04482') +sha256sums=('c1bab3160bae96d485fc93a048d19775398aa85b407bac53020675f7e995db9d') build() { cd $pkgname-$pkgver diff --git a/extra/xf86-video-vmware/PKGBUILD b/extra/xf86-video-vmware/PKGBUILD index a9b857ec0..9b3247d92 100644 --- a/extra/xf86-video-vmware/PKGBUILD +++ b/extra/xf86-video-vmware/PKGBUILD @@ -1,20 +1,28 @@ -# $Id: PKGBUILD 198544 2013-10-30 15:30:51Z allan $ +# $Id: PKGBUILD 201669 2013-12-17 21:04:57Z lcarlier $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-vmware pkgver=13.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="X.org vmware video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') -depends=('libdrm' 'svga-dri' 'mesa') +depends=('libdrm' 'svga-dri' 'mesa>=10.0') makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto') conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15') groups=('xorg-drivers' 'xorg') options=('!emptydirs') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('802dda415c22412edad6c3df44fe18a06e91d0f8456d9a58bac0d340fdf8fe3d') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 + xatracker-v2-fixes.patch) +sha256sums=('802dda415c22412edad6c3df44fe18a06e91d0f8456d9a58bac0d340fdf8fe3d' + '7ab392cbc6258dc36df14ef60072c655d850bcfb6885111b41bcfe25dc1faacc') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + # grab from upstream git repo, needed for mesa>10.0 + patch -Np1 -i ../xatracker-v2-fixes.patch +} build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-vmware/xatracker-v2-fixes.patch b/extra/xf86-video-vmware/xatracker-v2-fixes.patch new file mode 100644 index 000000000..9b8ed54a5 --- /dev/null +++ b/extra/xf86-video-vmware/xatracker-v2-fixes.patch @@ -0,0 +1,1583 @@ +From 0945bea5fc32eacb7bf42639efbd45dcd43e7ab5 Mon Sep 17 00:00:00 2001 +From: Rob Clark <robdclark@gmail.com> +Date: Mon, 10 Jun 2013 13:31:31 -0400 +Subject: [PATCH 01/11] vmwgfx: update for XA API changes + +Signed-off-by: Rob Clark <robdclark@gmail.com> +Signed-off-by: Jakob Bornecrantz <jakob@vmware.com> +Reviewed-by: Jakob Bornecrantz <jakob@vmware.com> +Tested-by: Jakob Bornecrantz <jakob@vmware.com> +--- + configure.ac | 2 +- + vmwgfx/vmwgfx_dri2.c | 5 +++-- + vmwgfx/vmwgfx_driver.c | 3 ++- + vmwgfx/vmwgfx_saa.c | 20 ++++++++++++++------ + vmwgfx/vmwgfx_tex_video.c | 5 +++-- + 5 files changed, 23 insertions(+), 12 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 0631bcc..dccfb27 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -118,7 +118,7 @@ if test x$BUILD_VMWGFX = xyes; then + PKG_CHECK_MODULES([LIBDRM], [libdrm],[],[BUILD_VMWGFX=no]) + fi + if test x$BUILD_VMWGFX = xyes; then +- PKG_CHECK_MODULES([XATRACKER], [xatracker >= 0.4.0],[],[BUILD_VMWGFX=no]) ++ PKG_CHECK_MODULES([XATRACKER], [xatracker >= 2.0.0],[],[BUILD_VMWGFX=no]) + fi + + DRIVER_NAME=vmware +diff --git a/vmwgfx/vmwgfx_dri2.c b/vmwgfx/vmwgfx_dri2.c +index 7de0772..2f007f0 100644 +--- a/vmwgfx/vmwgfx_dri2.c ++++ b/vmwgfx/vmwgfx_dri2.c +@@ -201,7 +201,8 @@ dri2_do_create_buffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer, unsigned int for + } + + private->srf = srf; +- if (xa_surface_handle(srf, &buffer->name, &buffer->pitch) != 0) ++ if (xa_surface_handle(srf, xa_handle_type_shared, ++ &buffer->name, &buffer->pitch) != 0) + return FALSE; + + buffer->cpp = xa_format_depth(xa_surface_format(srf)) / 8; +@@ -222,7 +223,7 @@ dri2_do_destroy_buffer(DrawablePtr pDraw, DRI2BufferPtr buffer) + struct vmwgfx_saa_pixmap *vpix = vmwgfx_saa_pixmap(private->pPixmap); + + if (--private->refcount == 0 && srf) { +- xa_surface_destroy(srf); ++ xa_surface_unref(srf); + } + + /* +diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c +index 7863ba2..3002285 100644 +--- a/vmwgfx/vmwgfx_driver.c ++++ b/vmwgfx/vmwgfx_driver.c +@@ -617,7 +617,8 @@ vmwgfx_scanout_present(ScreenPtr pScreen, int drm_fd, + return FALSE; + } + +- if (xa_surface_handle(vpix->hw, &handle, &dummy) != 0) { ++ if (xa_surface_handle(vpix->hw, xa_handle_type_shared, ++ &handle, &dummy) != 0) { + LogMessage(X_ERROR, "Could not get present surface handle.\n"); + return FALSE; + } +diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c +index 63df3a1..ed3c1ee 100644 +--- a/vmwgfx/vmwgfx_saa.c ++++ b/vmwgfx/vmwgfx_saa.c +@@ -140,7 +140,7 @@ vmwgfx_pixmap_free_storage(struct vmwgfx_saa_pixmap *vpix) + vpix->malloc = NULL; + } + if (!(vpix->backing & VMWGFX_PIX_SURFACE) && vpix->hw) { +- xa_surface_destroy(vpix->hw); ++ xa_surface_unref(vpix->hw); + vpix->hw = NULL; + } + if (!(vpix->backing & VMWGFX_PIX_GMR) && vpix->gmr) { +@@ -286,7 +286,8 @@ vmwgfx_saa_dma(struct vmwgfx_saa *vsaa, + if (vpix->gmr && vsaa->can_optimize_dma) { + uint32_t handle, dummy; + +- if (xa_surface_handle(vpix->hw, &handle, &dummy) != 0) ++ if (xa_surface_handle(vpix->hw, xa_handle_type_shared, ++ &handle, &dummy) != 0) + goto out_err; + if (vmwgfx_dma(0, 0, reg, vpix->gmr, pixmap->devKind, handle, + to_hw) != 0) +@@ -305,6 +306,8 @@ vmwgfx_saa_dma(struct vmwgfx_saa *vsaa, + (int) to_hw, + (struct xa_box *) REGION_RECTS(reg), + REGION_NUM_RECTS(reg)); ++ if (to_hw) ++ xa_context_flush(vsaa->xa_ctx); + if (vpix->gmr) + vmwgfx_dmabuf_unmap(vpix->gmr); + if (ret) +@@ -441,7 +444,7 @@ vmwgfx_hw_kill(struct vmwgfx_saa *vsaa, + &spix->dirty_hw)) + return FALSE; + +- xa_surface_destroy(vpix->hw); ++ xa_surface_unref(vpix->hw); + vpix->hw = NULL; + + /* +@@ -683,7 +686,8 @@ vmwgfx_present_prepare(struct vmwgfx_saa *vsaa, + + (void) pScreen; + if (src_vpix == dst_vpix || !src_vpix->hw || +- xa_surface_handle(src_vpix->hw, &vsaa->src_handle, &dummy) != 0) ++ xa_surface_handle(src_vpix->hw, xa_handle_type_shared, ++ &vsaa->src_handle, &dummy) != 0) + return FALSE; + + REGION_NULL(pScreen, &vsaa->present_region); +@@ -784,7 +788,7 @@ vmwgfx_create_hw(struct vmwgfx_saa *vsaa, + return TRUE; + + out_no_damage: +- xa_surface_destroy(hw); ++ xa_surface_unref(hw); + return FALSE; + } + +@@ -929,6 +933,7 @@ vmwgfx_copy_prepare(struct saa_driver *driver, + + if (!vmwgfx_hw_validate(src_pixmap, src_reg)) { + xa_copy_done(vsaa->xa_ctx); ++ xa_context_flush(vsaa->xa_ctx); + return FALSE; + } + +@@ -1029,6 +1034,7 @@ vmwgfx_copy_done(struct saa_driver *driver) + return; + } + xa_copy_done(vsaa->xa_ctx); ++ xa_context_flush(vsaa->xa_ctx); + } + + static Bool +@@ -1175,6 +1181,7 @@ vmwgfx_composite_done(struct saa_driver *driver) + struct vmwgfx_saa *vsaa = to_vmwgfx_saa(driver); + + xa_composite_done(vsaa->xa_ctx); ++ xa_context_flush(vsaa->xa_ctx); + } + + static void +@@ -1436,7 +1443,8 @@ vmwgfx_scanout_ref(struct vmwgfx_screen_entry *entry) + */ + if (!vmwgfx_hw_accel_validate(pixmap, 0, XA_FLAG_SCANOUT, 0, NULL)) + goto out_err; +- if (xa_surface_handle(vpix->hw, &handle, &dummy) != 0) ++ if (xa_surface_handle(vpix->hw, xa_handle_type_shared, ++ &handle, &dummy) != 0) + goto out_err; + depth = xa_format_depth(xa_surface_format(vpix->hw)); + +diff --git a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c +index 449266b..2971ed7 100644 +--- a/vmwgfx/vmwgfx_tex_video.c ++++ b/vmwgfx/vmwgfx_tex_video.c +@@ -199,7 +199,7 @@ stop_video(ScrnInfoPtr pScrn, pointer data, Bool shutdown) + + for (i=0; i<3; ++i) { + if (priv->yuv[i]) { +- xa_surface_destroy(priv->yuv[i]); ++ xa_surface_unref(priv->yuv[i]); + priv->yuv[i] = NULL; + } + for (j=0; j<2; ++j) { +@@ -539,7 +539,8 @@ copy_packed_data(ScrnInfoPtr pScrn, + REGION_RESET(pScrn->pScreen, ®, &box); + } + +- if (xa_surface_handle(srf, &handle, &stride) != 0) { ++ if (xa_surface_handle(srf, xa_handle_type_shared, ++ &handle, &stride) != 0) { + ret = BadAlloc; + break; + } +-- +1.8.5.1 + + +From 835ce4698f916ba080f4132988fd4caf898e0b1e Mon Sep 17 00:00:00 2001 +From: Thomas Hellstrom <thellstrom@vmware.com> +Date: Thu, 26 Sep 2013 01:25:33 -0700 +Subject: [PATCH 02/11] vmwgfx: Avoid HW operations when not master + +Note that for DRI2, a dri2_copy_region becomes a NOP when not master. +Additionally, all dri2 operations that lead to a potential kernel +access will return FALSE. + +Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> +Reviewed-by: Jakob Bornecrantz <jakob@vmware.com> +--- + vmwgfx/vmwgfx_dri2.c | 13 +++++++++++++ + vmwgfx/vmwgfx_driver.c | 3 +++ + vmwgfx/vmwgfx_saa.c | 44 +++++++++++++++++++++++++++++++++++++++++++- + vmwgfx/vmwgfx_saa.h | 8 ++++++++ + vmwgfx/vmwgfx_saa_priv.h | 2 ++ + vmwgfx/vmwgfx_xa_surface.c | 6 ++++++ + 6 files changed, 75 insertions(+), 1 deletion(-) + +diff --git a/vmwgfx/vmwgfx_dri2.c b/vmwgfx/vmwgfx_dri2.c +index 2f007f0..57f2d9d 100644 +--- a/vmwgfx/vmwgfx_dri2.c ++++ b/vmwgfx/vmwgfx_dri2.c +@@ -138,6 +138,8 @@ dri2_do_create_buffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer, unsigned int for + return TRUE; + case DRI2BufferStencil: + case DRI2BufferDepthStencil: ++ if (!pScrn->vtSema) ++ return FALSE; + + depth = (format) ? vmwgfx_zs_format_to_depth(format) : 32; + +@@ -155,6 +157,9 @@ dri2_do_create_buffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer, unsigned int for + + break; + case DRI2BufferDepth: ++ if (!pScrn->vtSema) ++ return FALSE; ++ + depth = (format) ? vmwgfx_z_format_to_depth(format) : + pDraw->bitsPerPixel; + +@@ -291,6 +296,14 @@ dri2_copy_region(DrawablePtr pDraw, RegionPtr pRegion, + DrawablePtr dst_draw; + RegionPtr myClip; + GCPtr gc; ++ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); ++ ++ /* ++ * This is a fragile protection against HW operations when not master. ++ * Needs to be blocked higher up in the dri2 code. ++ */ ++ if (!pScrn->vtSema) ++ return; + + /* + * In driCreateBuffers we dewrap windows into the +diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c +index 3002285..eeaea4b 100644 +--- a/vmwgfx/vmwgfx_driver.c ++++ b/vmwgfx/vmwgfx_driver.c +@@ -1116,6 +1116,7 @@ drv_leave_vt(VT_FUNC_ARGS_DECL) + + vmwgfx_cursor_bypass(ms->fd, 0, 0); + vmwgfx_disable_scanout(pScrn); ++ vmwgfx_saa_drop_master(pScrn->pScreen); + + if (drmDropMaster(ms->fd)) + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, +@@ -1136,6 +1137,8 @@ drv_enter_vt(VT_FUNC_ARGS_DECL) + if (!drv_set_master(pScrn)) + return FALSE; + ++ vmwgfx_saa_set_master(pScrn->pScreen); ++ + if (!xf86SetDesiredModes(pScrn)) + return FALSE; + +diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c +index ed3c1ee..5534ca3 100644 +--- a/vmwgfx/vmwgfx_saa.c ++++ b/vmwgfx/vmwgfx_saa.c +@@ -423,6 +423,7 @@ vmwgfx_create_pixmap(struct saa_driver *driver, struct saa_pixmap *spix, + + WSBMINITLISTHEAD(&vpix->sync_x_head); + WSBMINITLISTHEAD(&vpix->scanout_list); ++ WSBMINITLISTHEAD(&vpix->pixmap_list); + + return TRUE; + } +@@ -499,6 +500,7 @@ vmwgfx_destroy_pixmap(struct saa_driver *driver, PixmapPtr pixmap) + */ + + vmwgfx_pixmap_remove_present(vpix); ++ WSBMLISTDELINIT(&vpix->pixmap_list); + WSBMLISTDELINIT(&vpix->sync_x_head); + + if (vpix->hw_is_dri2_fronts) +@@ -627,6 +629,8 @@ vmwgfx_modify_pixmap_header (PixmapPtr pixmap, int w, int h, int depth, + int bpp, int devkind, void *pixdata) + { + struct vmwgfx_saa_pixmap *vpix = vmwgfx_saa_pixmap(pixmap); ++ ScreenPtr pScreen = pixmap->drawable.pScreen; ++ struct vmwgfx_saa *vsaa = to_vmwgfx_saa(saa_get_driver(pScreen)); + unsigned int old_height; + unsigned int old_width; + unsigned int old_pitch; +@@ -670,6 +674,8 @@ vmwgfx_modify_pixmap_header (PixmapPtr pixmap, int w, int h, int depth, + + vmwgfx_pix_resize(pixmap, old_pitch, old_height, old_width); + vmwgfx_pixmap_free_storage(vpix); ++ WSBMLISTADDTAIL(&vpix->pixmap_list, &vsaa->pixmaps); ++ + return TRUE; + + out_no_modify: +@@ -860,7 +866,7 @@ vmwgfx_copy_prepare(struct saa_driver *driver, + Bool has_valid_hw; + + if (!vsaa->xat || !SAA_PM_IS_SOLID(&dst_pixmap->drawable, plane_mask) || +- alu != GXcopy) ++ alu != GXcopy || !vsaa->is_master) + return FALSE; + + src_vpix = vmwgfx_saa_pixmap(src_pixmap); +@@ -1057,6 +1063,9 @@ vmwgfx_composite_prepare(struct saa_driver *driver, CARD8 op, + RegionRec empty; + struct xa_composite *xa_comp; + ++ if (!vsaa->is_master) ++ return FALSE; ++ + REGION_NULL(pScreen, &empty); + + /* +@@ -1367,7 +1376,9 @@ vmwgfx_saa_init(ScreenPtr pScreen, int drm_fd, struct xa_tracker *xat, + vsaa->use_present_opt = direct_presents; + vsaa->only_hw_presents = only_hw_presents; + vsaa->rendercheck = rendercheck; ++ vsaa->is_master = TRUE; + WSBMINITLISTHEAD(&vsaa->sync_x_list); ++ WSBMINITLISTHEAD(&vsaa->pixmaps); + + vsaa->driver = vmwgfx_saa_driver; + vsaa->vcomp = vmwgfx_alloc_composite(); +@@ -1518,3 +1529,34 @@ vmwgfx_scanout_unref(struct vmwgfx_screen_entry *entry) + entry->pixmap = NULL; + pixmap->drawable.pScreen->DestroyPixmap(pixmap); + } ++ ++void ++vmwgfx_saa_set_master(ScreenPtr pScreen) ++{ ++ struct vmwgfx_saa *vsaa = to_vmwgfx_saa(saa_get_driver(pScreen)); ++ ++ vsaa->is_master = TRUE; ++} ++ ++void ++vmwgfx_saa_drop_master(ScreenPtr pScreen) ++{ ++ struct vmwgfx_saa *vsaa = to_vmwgfx_saa(saa_get_driver(pScreen)); ++ struct _WsbmListHead *list; ++ struct vmwgfx_saa_pixmap *vpix; ++ struct saa_pixmap *spix; ++ ++ WSBMLISTFOREACH(list, &vsaa->pixmaps) { ++ vpix = WSBMLISTENTRY(list, struct vmwgfx_saa_pixmap, pixmap_list); ++ spix = &vpix->base; ++ ++ if (!vpix->hw) ++ continue; ++ ++ (void) vmwgfx_download_from_hw(&vsaa->driver, spix->pixmap, ++ &spix->dirty_hw); ++ REGION_EMPTY(draw->pScreen, &spix->dirty_hw); ++ } ++ ++ vsaa->is_master = FALSE; ++} +diff --git a/vmwgfx/vmwgfx_saa.h b/vmwgfx/vmwgfx_saa.h +index bb8ec96..d8aa3d3 100644 +--- a/vmwgfx/vmwgfx_saa.h ++++ b/vmwgfx/vmwgfx_saa.h +@@ -54,6 +54,7 @@ struct vmwgfx_saa_pixmap { + int hw_is_dri2_fronts; + struct _WsbmListHead sync_x_head; + struct _WsbmListHead scanout_list; ++ struct _WsbmListHead pixmap_list; + + uint32_t xa_flags; + uint32_t staging_add_flags; +@@ -107,4 +108,11 @@ Bool + vmwgfx_hw_accel_validate(PixmapPtr pixmap, unsigned int depth, + uint32_t add_flags, uint32_t remove_flags, + RegionPtr region); ++ ++void ++vmwgfx_saa_set_master(ScreenPtr pScreen); ++ ++void ++vmwgfx_saa_drop_master(ScreenPtr pScreen); ++ + #endif +diff --git a/vmwgfx/vmwgfx_saa_priv.h b/vmwgfx/vmwgfx_saa_priv.h +index 5f46dee..16583b0 100644 +--- a/vmwgfx/vmwgfx_saa_priv.h ++++ b/vmwgfx/vmwgfx_saa_priv.h +@@ -54,8 +54,10 @@ struct vmwgfx_saa { + Bool use_present_opt; + Bool only_hw_presents; + Bool rendercheck; ++ Bool is_master; + void (*present_flush) (ScreenPtr pScreen); + struct _WsbmListHead sync_x_list; ++ struct _WsbmListHead pixmaps; + struct vmwgfx_composite *vcomp; + }; + +diff --git a/vmwgfx/vmwgfx_xa_surface.c b/vmwgfx/vmwgfx_xa_surface.c +index 8b30e45..2f23c57 100644 +--- a/vmwgfx/vmwgfx_xa_surface.c ++++ b/vmwgfx/vmwgfx_xa_surface.c +@@ -362,6 +362,12 @@ vmwgfx_hw_accel_validate(PixmapPtr pixmap, unsigned int depth, + Bool + vmwgfx_hw_dri2_validate(PixmapPtr pixmap, unsigned int depth) + { ++ struct vmwgfx_saa *vsaa = ++ to_vmwgfx_saa(saa_get_driver(pixmap->drawable.pScreen)); ++ ++ if (!vsaa->is_master) ++ return FALSE; ++ + return (vmwgfx_hw_dri2_stage(pixmap, depth) && + vmwgfx_hw_commit(pixmap) && + vmwgfx_hw_validate(pixmap, NULL)); +-- +1.8.5.1 + + +From 7192acf9f0bf8e7176ab0b803b861a858623f709 Mon Sep 17 00:00:00 2001 +From: Thomas Hellstrom <thellstrom@vmware.com> +Date: Wed, 19 Sep 2012 20:36:57 +0200 +Subject: [PATCH 03/11] vmwgfx: Implement textured video completely on top of + XA. + +Remove device-specific hacks. This may increase resource usage a little +on old hardware revisions, but we don't need separate code paths on +different hardware revisions. + +Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> +Reviewed-by: Zack Rusin <zackr@vmware.com> +--- + vmwgfx/vmwgfx_tex_video.c | 109 ++++++---------------------------------------- + 1 file changed, 14 insertions(+), 95 deletions(-) + +diff --git a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c +index 2971ed7..a0a4f4a 100644 +--- a/vmwgfx/vmwgfx_tex_video.c ++++ b/vmwgfx/vmwgfx_tex_video.c +@@ -111,8 +111,7 @@ struct xorg_xv_port_priv { + int hue; + + int current_set; +- struct vmwgfx_dmabuf *bounce[2][3]; +- struct xa_surface *yuv[3]; ++ struct xa_surface *yuv[2][3]; + + int drm_fd; + +@@ -198,14 +197,10 @@ stop_video(ScrnInfoPtr pScrn, pointer data, Bool shutdown) + priv->fence = NULL; + + for (i=0; i<3; ++i) { +- if (priv->yuv[i]) { +- xa_surface_unref(priv->yuv[i]); +- priv->yuv[i] = NULL; +- } + for (j=0; j<2; ++j) { +- if (priv->bounce[j][i]) { +- vmwgfx_dmabuf_destroy(priv->bounce[j][i]); +- priv->bounce[0][i] = NULL; ++ if (priv->yuv[i]) { ++ xa_surface_unref(priv->yuv[j][i]); ++ priv->yuv[j][i] = NULL; + } + } + } +@@ -297,11 +292,9 @@ static int + check_yuv_surfaces(struct xorg_xv_port_priv *priv, int id, + int width, int height) + { +- struct xa_surface **yuv = priv->yuv; +- struct vmwgfx_dmabuf **bounce = priv->bounce[priv->current_set]; ++ struct xa_surface **yuv = priv->yuv[priv->current_set]; + int ret = 0; + int i; +- size_t size; + + for (i=0; i<3; ++i) { + +@@ -334,19 +327,6 @@ check_yuv_surfaces(struct xorg_xv_port_priv *priv, int id, + if (ret || !yuv[i]) + return BadAlloc; + +- size = width * height; +- +- if (bounce[i] && (bounce[i]->size < size || +- bounce[i]->size > 2*size)) { +- vmwgfx_dmabuf_destroy(bounce[i]); +- bounce[i] = NULL; +- } +- +- if (!bounce[i]) { +- bounce[i] = vmwgfx_dmabuf_alloc(priv->drm_fd, size); +- if (!bounce[i]) +- return BadAlloc; +- } + } + return Success; + } +@@ -413,28 +393,20 @@ copy_packed_data(ScrnInfoPtr pScrn, + unsigned short w, unsigned short h) + { + int i; +- struct vmwgfx_dmabuf **bounce = port->bounce[port->current_set]; ++ struct xa_surface **yuv = port->yuv[port->current_set]; + char *ymap, *vmap, *umap; + unsigned char y1, y2, u, v; + int yidx, uidx, vidx; + int y_array_size = w * h; + int ret = BadAlloc; + +- /* +- * Here, we could use xa_surface_[map|unmap], but given the size of +- * the yuv textures, that could stress the xa tracker dma buffer pool, +- * particularaly with multiple videos rendering simultaneously. +- * +- * Instead, cheat and allocate vmwgfx dma buffers directly. +- */ +- +- ymap = (char *)vmwgfx_dmabuf_map(bounce[0]); ++ ymap = xa_surface_map(port->r, yuv[0], XA_MAP_WRITE); + if (!ymap) + return BadAlloc; +- umap = (char *)vmwgfx_dmabuf_map(bounce[1]); ++ umap = xa_surface_map(port->r, yuv[1], XA_MAP_WRITE); + if (!umap) + goto out_no_umap; +- vmap = (char *)vmwgfx_dmabuf_map(bounce[2]); ++ vmap = xa_surface_map(port->r, yuv[2], XA_MAP_WRITE); + if (!vmap) + goto out_no_vmap; + +@@ -493,65 +465,11 @@ copy_packed_data(ScrnInfoPtr pScrn, + } + + ret = Success; +- vmwgfx_dmabuf_unmap(bounce[2]); ++ xa_surface_unmap(yuv[2]); + out_no_vmap: +- vmwgfx_dmabuf_unmap(bounce[1]); ++ xa_surface_unmap(yuv[1]); + out_no_umap: +- vmwgfx_dmabuf_unmap(bounce[0]); +- +- if (ret == Success) { +- struct xa_surface *srf; +- struct vmwgfx_dmabuf *buf; +- uint32_t handle; +- unsigned int stride; +- BoxRec box; +- RegionRec reg; +- +- box.x1 = 0; +- box.x2 = w; +- box.y1 = 0; +- box.y2 = h; +- +- REGION_INIT(pScrn->pScreen, ®, &box, 1); +- +- for (i=0; i<3; ++i) { +- srf = port->yuv[i]; +- buf = bounce[i]; +- +- if (i == 1) { +- switch(id) { +- case FOURCC_YV12: +- h /= 2; +- /* Fall through */ +- case FOURCC_YUY2: +- case FOURCC_UYVY: +- w /= 2; +- break; +- default: +- break; +- } +- +- box.x1 = 0; +- box.x2 = w; +- box.y1 = 0; +- box.y2 = h; +- +- REGION_RESET(pScrn->pScreen, ®, &box); +- } +- +- if (xa_surface_handle(srf, xa_handle_type_shared, +- &handle, &stride) != 0) { +- ret = BadAlloc; +- break; +- } +- +- if (vmwgfx_dma(0, 0, ®, buf, w, handle, 1) != 0) { +- ret = BadAlloc; +- break; +- } +- } +- REGION_UNINIT(pScrn->pScreen, ®); +- } ++ xa_surface_unmap(yuv[0]); + + return ret; + } +@@ -610,7 +528,8 @@ display_video(ScreenPtr pScreen, struct xorg_xv_port_priv *pPriv, int id, + (struct xa_box *)REGION_RECTS(dstRegion), + REGION_NUM_RECTS(dstRegion), + pPriv->cm, +- vpix->hw, pPriv->yuv); ++ vpix->hw, ++ pPriv->yuv[pPriv->current_set ]); + + saa_pixmap_dirty(pPixmap, TRUE, dstRegion); + DamageRegionProcessPending(&pPixmap->drawable); +-- +1.8.5.1 + + +From 45b2457516a9db4bd1d60fbb24a1efbe2d9dd932 Mon Sep 17 00:00:00 2001 +From: Thomas Hellstrom <thellstrom@vmware.com> +Date: Wed, 19 Sep 2012 21:50:40 +0200 +Subject: [PATCH 04/11] vmwgfx: Get rid of device-specific DMA code + +It's rarely used and things seem to work well enough on top of XA. + +Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> +Reviewed-by: Zack Rusin <zackr@vmware.com> +--- + vmwgfx/vmwgfx_drmi.c | 103 ----------------------------------------------- + vmwgfx/vmwgfx_drmi.h | 5 --- + vmwgfx/vmwgfx_saa.c | 53 ++++++++++++------------ + vmwgfx/vmwgfx_saa_priv.h | 1 - + 4 files changed, 26 insertions(+), 136 deletions(-) + +diff --git a/vmwgfx/vmwgfx_drmi.c b/vmwgfx/vmwgfx_drmi.c +index 496a16b..1e23f4a 100644 +--- a/vmwgfx/vmwgfx_drmi.c ++++ b/vmwgfx/vmwgfx_drmi.c +@@ -284,109 +284,6 @@ vmwgfx_dmabuf_destroy(struct vmwgfx_dmabuf *buf) + } + + int +-vmwgfx_dma(unsigned int host_x, unsigned int host_y, +- RegionPtr region, struct vmwgfx_dmabuf *buf, +- uint32_t buf_pitch, uint32_t surface_handle, int to_surface) +-{ +- BoxPtr clips = REGION_RECTS(region); +- unsigned int num_clips = REGION_NUM_RECTS(region); +- struct drm_vmw_execbuf_arg arg; +- struct drm_vmw_fence_rep rep; +- int ret; +- unsigned int size; +- unsigned i; +- SVGA3dCopyBox *cb; +- SVGA3dCmdSurfaceDMASuffix *suffix; +- SVGA3dCmdSurfaceDMA *body; +- struct vmwgfx_int_dmabuf *ibuf = vmwgfx_int_dmabuf(buf); +- +- struct { +- SVGA3dCmdHeader header; +- SVGA3dCmdSurfaceDMA body; +- SVGA3dCopyBox cb; +- } *cmd; +- +- if (num_clips == 0) +- return 0; +- +- size = sizeof(*cmd) + (num_clips - 1) * sizeof(cmd->cb) + +- sizeof(*suffix); +- cmd = malloc(size); +- if (!cmd) +- return -1; +- +- cmd->header.id = SVGA_3D_CMD_SURFACE_DMA; +- cmd->header.size = sizeof(cmd->body) + num_clips * sizeof(cmd->cb) + +- sizeof(*suffix); +- cb = &cmd->cb; +- +- suffix = (SVGA3dCmdSurfaceDMASuffix *) &cb[num_clips]; +- suffix->suffixSize = sizeof(*suffix); +- suffix->maximumOffset = (uint32_t) -1; +- suffix->flags.discard = 0; +- suffix->flags.unsynchronized = 0; +- suffix->flags.reserved = 0; +- +- body = &cmd->body; +- body->guest.ptr.gmrId = buf->gmr_id; +- body->guest.ptr.offset = buf->gmr_offset; +- body->guest.pitch = buf_pitch; +- body->host.sid = surface_handle; +- body->host.face = 0; +- body->host.mipmap = 0; +- +- body->transfer = (to_surface ? SVGA3D_WRITE_HOST_VRAM : +- SVGA3D_READ_HOST_VRAM); +- +- +- for (i=0; i < num_clips; i++, cb++, clips++) { +- cb->x = (uint16_t) clips->x1 + host_x; +- cb->y = (uint16_t) clips->y1 + host_y; +- cb->z = 0; +- cb->srcx = (uint16_t) clips->x1; +- cb->srcy = (uint16_t) clips->y1; +- cb->srcz = 0; +- cb->w = (uint16_t) (clips->x2 - clips->x1); +- cb->h = (uint16_t) (clips->y2 - clips->y1); +- cb->d = 1; +-#if 0 +- LogMessage(X_INFO, "DMA! x: %u y: %u srcx: %u srcy: %u w: %u h: %u %s\n", +- cb->x, cb->y, cb->srcx, cb->srcy, cb->w, cb->h, +- to_surface ? "to" : "from"); +-#endif +- +- } +- +- memset(&arg, 0, sizeof(arg)); +- memset(&rep, 0, sizeof(rep)); +- +- rep.error = -EFAULT; +- arg.fence_rep = ((to_surface) ? 0UL : (unsigned long)&rep); +- arg.commands = (unsigned long)cmd; +- arg.command_size = size; +- arg.throttle_us = 0; +- arg.version = DRM_VMW_EXECBUF_VERSION; +- +- ret = drmCommandWrite(ibuf->drm_fd, DRM_VMW_EXECBUF, &arg, sizeof(arg)); +- if (ret) { +- LogMessage(X_ERROR, "DMA error %s.\n", strerror(-ret)); +- } +- +- free(cmd); +- +- if (rep.error == 0) { +- ret = vmwgfx_fence_wait(ibuf->drm_fd, rep.handle, TRUE); +- if (ret) { +- LogMessage(X_ERROR, "DMA from host fence wait error %s.\n", +- strerror(-ret)); +- vmwgfx_fence_unref(ibuf->drm_fd, rep.handle); +- } +- } +- +- return 0; +-} +- +-int + vmwgfx_get_param(int drm_fd, uint32_t param, uint64_t *out) + { + struct drm_vmw_getparam_arg gp_arg; +diff --git a/vmwgfx/vmwgfx_drmi.h b/vmwgfx/vmwgfx_drmi.h +index 2435009..fff728a 100644 +--- a/vmwgfx/vmwgfx_drmi.h ++++ b/vmwgfx/vmwgfx_drmi.h +@@ -60,11 +60,6 @@ extern void + vmwgfx_dmabuf_unmap(struct vmwgfx_dmabuf *buf); + + extern int +-vmwgfx_dma(unsigned int host_x, unsigned int host_y, +- RegionPtr region, struct vmwgfx_dmabuf *buf, +- uint32_t buf_pitch, uint32_t surface_handle, int to_surface); +- +-extern int + vmwgfx_num_streams(int drm_fd, uint32_t *ntot, uint32_t *nfree); + + extern int +diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c +index 5534ca3..fd80682 100644 +--- a/vmwgfx/vmwgfx_saa.c ++++ b/vmwgfx/vmwgfx_saa.c +@@ -279,40 +279,40 @@ vmwgfx_saa_dma(struct vmwgfx_saa *vsaa, + Bool to_hw) + { + struct vmwgfx_saa_pixmap *vpix = vmwgfx_saa_pixmap(pixmap); ++ void *data = vpix->malloc; ++ int ret; + + if (!vpix->hw || (!vpix->gmr && !vpix->malloc)) + return TRUE; + +- if (vpix->gmr && vsaa->can_optimize_dma) { +- uint32_t handle, dummy; + +- if (xa_surface_handle(vpix->hw, xa_handle_type_shared, +- &handle, &dummy) != 0) +- goto out_err; +- if (vmwgfx_dma(0, 0, reg, vpix->gmr, pixmap->devKind, handle, +- to_hw) != 0) ++ if (vpix->gmr) { ++ data = vmwgfx_dmabuf_map(vpix->gmr); ++ if (!data) + goto out_err; +- } else { +- void *data = vpix->malloc; +- int ret; ++ } + +- if (vpix->gmr) { +- data = vmwgfx_dmabuf_map(vpix->gmr); +- if (!data) +- goto out_err; +- } ++ ret = xa_surface_dma(vsaa->xa_ctx, vpix->hw, data, pixmap->devKind, ++ (int) to_hw, ++ (struct xa_box *) REGION_RECTS(reg), ++ REGION_NUM_RECTS(reg)); ++ if (vpix->gmr) ++ vmwgfx_dmabuf_unmap(vpix->gmr); ++ ++ if (ret) ++ goto out_err; ++ ++ ret = xa_surface_dma(vsaa->xa_ctx, vpix->hw, data, pixmap->devKind, ++ (int) to_hw, ++ (struct xa_box *) REGION_RECTS(reg), ++ REGION_NUM_RECTS(reg)); ++ if (to_hw) ++ xa_context_flush(vsaa->xa_ctx); ++ if (vpix->gmr) ++ vmwgfx_dmabuf_unmap(vpix->gmr); ++ if (ret) ++ goto out_err; + +- ret = xa_surface_dma(vsaa->xa_ctx, vpix->hw, data, pixmap->devKind, +- (int) to_hw, +- (struct xa_box *) REGION_RECTS(reg), +- REGION_NUM_RECTS(reg)); +- if (to_hw) +- xa_context_flush(vsaa->xa_ctx); +- if (vpix->gmr) +- vmwgfx_dmabuf_unmap(vpix->gmr); +- if (ret) +- goto out_err; +- } + return TRUE; + out_err: + LogMessage(X_ERROR, "DMA %s surface failed.\n", +@@ -1372,7 +1372,6 @@ vmwgfx_saa_init(ScreenPtr pScreen, int drm_fd, struct xa_tracker *xat, + vsaa->xa_ctx = xa_context_default(xat); + vsaa->drm_fd = drm_fd; + vsaa->present_flush = present_flush; +- vsaa->can_optimize_dma = FALSE; + vsaa->use_present_opt = direct_presents; + vsaa->only_hw_presents = only_hw_presents; + vsaa->rendercheck = rendercheck; +diff --git a/vmwgfx/vmwgfx_saa_priv.h b/vmwgfx/vmwgfx_saa_priv.h +index 16583b0..f5f45ba 100644 +--- a/vmwgfx/vmwgfx_saa_priv.h ++++ b/vmwgfx/vmwgfx_saa_priv.h +@@ -50,7 +50,6 @@ struct vmwgfx_saa { + int ydiff; + RegionRec present_region; + uint32_t src_handle; +- Bool can_optimize_dma; + Bool use_present_opt; + Bool only_hw_presents; + Bool rendercheck; +-- +1.8.5.1 + + +From e26dec8f5278df74a102493bf6d2d8444dab5d6d Mon Sep 17 00:00:00 2001 +From: Gaetan Nadon <memsize@videotron.ca> +Date: Mon, 28 Oct 2013 18:21:29 -0400 +Subject: [PATCH 05/11] vmwgfx: handle changes of DamageUnregister API in + 1.14.99.2 + +Fix is inspired from the intel driver. + +Reviewed-by: Jakob Bornecrantz <jakob@vmware.com> +Signed-off-by: Gaetan Nadon <memsize@videotron.ca> +Signed-off-by: Jakob Bornecrantz <jakob@vmware.com> +--- + vmwgfx/vmwgfx_saa.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c +index fd80682..346e7f4 100644 +--- a/vmwgfx/vmwgfx_saa.c ++++ b/vmwgfx/vmwgfx_saa.c +@@ -26,6 +26,7 @@ + */ + + #include <xorg-server.h> ++#include <xorgVersion.h> + #include <mi.h> + #include <fb.h> + #include <xf86drmMode.h> +@@ -76,7 +77,12 @@ vmwgfx_pixmap_remove_damage(PixmapPtr pixmap) + if (!spix->damage || vpix->hw || vpix->gmr || vpix->malloc) + return; + ++#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,14,99,2,0) ++ DamageUnregister(spix->damage); ++#else + DamageUnregister(&pixmap->drawable, spix->damage); ++#endif ++ + DamageDestroy(spix->damage); + spix->damage = NULL; + } +-- +1.8.5.1 + + +From 7ac45326eccbf3bea9a4a8f95b9662a36ab58eb0 Mon Sep 17 00:00:00 2001 +From: Thomas Hellstrom <thellstrom@vmware.com> +Date: Thu, 28 Nov 2013 02:02:20 -0800 +Subject: [PATCH 06/11] vmwgfx: Fix some compilation warnings and indentations + +Most of the compilation warnings we're seeing are due to bad xorg headers, +but fix the ones we can fix in the driver. Some indentation fixes as well. + +Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> +Reviewed-by: Jakob Bornecrantz <jakob@vmware.com> +--- + src/vmware_bootstrap.c | 2 -- + src/vmwarevideo.c | 4 ++-- + vmwgfx/vmwgfx_driver.c | 1 - + vmwgfx/vmwgfx_output.c | 2 +- + vmwgfx/vmwgfx_overlay.c | 4 ++-- + vmwgfx/vmwgfx_tex_video.c | 26 +++++++++++++------------- + 6 files changed, 18 insertions(+), 21 deletions(-) + +diff --git a/src/vmware_bootstrap.c b/src/vmware_bootstrap.c +index ea5be19..bb58325 100644 +--- a/src/vmware_bootstrap.c ++++ b/src/vmware_bootstrap.c +@@ -256,7 +256,6 @@ VMwarePciProbe (DriverPtr drv, + intptr_t match_data) + { + ScrnInfoPtr scrn = NULL; +- EntityInfoPtr entity; + + scrn = xf86ConfigPciEntity(scrn, 0, entity_num, VMWAREPciChipsets, + NULL, NULL, NULL, NULL, NULL); +@@ -267,7 +266,6 @@ VMwarePciProbe (DriverPtr drv, + scrn->Probe = NULL; + } + +- entity = xf86GetEntityInfo(entity_num); + switch (DEVICE_ID(device)) { + case PCI_DEVICE_ID_VMWARE_SVGA2: + case PCI_DEVICE_ID_VMWARE_SVGA: +diff --git a/src/vmwarevideo.c b/src/vmwarevideo.c +index 745c71f..8d7d171 100644 +--- a/src/vmwarevideo.c ++++ b/src/vmwarevideo.c +@@ -82,7 +82,7 @@ + #define VMWARE_VID_MAX_HEIGHT 2048 + + #define VMWARE_VID_NUM_ENCODINGS 1 +-static XF86VideoEncodingRec vmwareVideoEncodings[] = ++static const XF86VideoEncodingRec vmwareVideoEncodings[] = + { + { + 0, +@@ -108,7 +108,7 @@ static XF86ImageRec vmwareVideoImages[] = + }; + + #define VMWARE_VID_NUM_ATTRIBUTES 2 +-static XF86AttributeRec vmwareVideoAttributes[] = ++static const XF86AttributeRec vmwareVideoAttributes[] = + { + { + XvGettable | XvSettable, +diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c +index eeaea4b..bfc07f8 100644 +--- a/vmwgfx/vmwgfx_driver.c ++++ b/vmwgfx/vmwgfx_driver.c +@@ -658,7 +658,6 @@ void xorg_flush(ScreenPtr pScreen) + if (crtc->enabled) { + pixmap = crtc_get_scanout(crtc); + if (pixmap) { +- unsigned int j; + + /* + * Remove duplicates. +diff --git a/vmwgfx/vmwgfx_output.c b/vmwgfx/vmwgfx_output.c +index 4f52f1d..f9e4263 100644 +--- a/vmwgfx/vmwgfx_output.c ++++ b/vmwgfx/vmwgfx_output.c +@@ -60,7 +60,7 @@ struct output_private + Bool is_implicit; + }; + +-static char *output_enum_list[] = { ++static const char *output_enum_list[] = { + "Unknown", + "VGA", + "DVI", +diff --git a/vmwgfx/vmwgfx_overlay.c b/vmwgfx/vmwgfx_overlay.c +index 6624a10..986dd06 100644 +--- a/vmwgfx/vmwgfx_overlay.c ++++ b/vmwgfx/vmwgfx_overlay.c +@@ -84,7 +84,7 @@ typedef uint8_t uint8; + #define VMWARE_VID_MAX_HEIGHT 2048 + + #define VMWARE_VID_NUM_ENCODINGS 1 +-static XF86VideoEncodingRec vmwareVideoEncodings[] = ++static const XF86VideoEncodingRec vmwareVideoEncodings[] = + { + { + 0, +@@ -110,7 +110,7 @@ static XF86ImageRec vmwareVideoImages[] = + }; + + #define VMWARE_VID_NUM_ATTRIBUTES 2 +-static XF86AttributeRec vmwareVideoAttributes[] = ++static const XF86AttributeRec vmwareVideoAttributes[] = + { + { + XvGettable | XvSettable, +diff --git a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c +index a0a4f4a..3ba40ef 100644 +--- a/vmwgfx/vmwgfx_tex_video.c ++++ b/vmwgfx/vmwgfx_tex_video.c +@@ -70,11 +70,11 @@ static const float bt_709[] = { + static Atom xvBrightness, xvContrast, xvSaturation, xvHue; + + #define NUM_TEXTURED_ATTRIBUTES 4 +-static XF86AttributeRec TexturedAttributes[NUM_TEXTURED_ATTRIBUTES] = { +- {XvSettable | XvGettable, -1000, 1000, "XV_BRIGHTNESS"}, +- {XvSettable | XvGettable, -1000, 1000, "XV_CONTRAST"}, +- {XvSettable | XvGettable, -1000, 1000, "XV_SATURATION"}, +- {XvSettable | XvGettable, -1000, 1000, "XV_HUE"} ++static const XF86AttributeRec TexturedAttributes[NUM_TEXTURED_ATTRIBUTES] = { ++ {XvSettable | XvGettable, -1000, 1000, "XV_BRIGHTNESS"}, ++ {XvSettable | XvGettable, -1000, 1000, "XV_CONTRAST"}, ++ {XvSettable | XvGettable, -1000, 1000, "XV_SATURATION"}, ++ {XvSettable | XvGettable, -1000, 1000, "XV_HUE"} + }; + + #define NUM_FORMATS 3 +@@ -82,7 +82,7 @@ static XF86VideoFormatRec Formats[NUM_FORMATS] = { + {15, TrueColor}, {16, TrueColor}, {24, TrueColor} + }; + +-static XF86VideoEncodingRec DummyEncoding[1] = { ++static const XF86VideoEncodingRec DummyEncoding[1] = { + { + 0, + "XV_IMAGE", +@@ -416,16 +416,16 @@ copy_packed_data(ScrnInfoPtr pScrn, + switch (id) { + case FOURCC_YV12: { + int pitches[3], offsets[3]; +- unsigned char *y, *u, *v; ++ unsigned char *yp, *up, *vp; + query_image_attributes(pScrn, FOURCC_YV12, + &w, &h, pitches, offsets); + +- y = buf + offsets[0]; +- v = buf + offsets[1]; +- u = buf + offsets[2]; +- memcpy(ymap, y, w*h); +- memcpy(vmap, v, w*h/4); +- memcpy(umap, u, w*h/4); ++ yp = buf + offsets[0]; ++ vp = buf + offsets[1]; ++ up = buf + offsets[2]; ++ memcpy(ymap, yp, w*h); ++ memcpy(vmap, vp, w*h/4); ++ memcpy(umap, up, w*h/4); + break; + } + case FOURCC_UYVY: +-- +1.8.5.1 + + +From a40cbd7b4fa19219849b4b0a48f07538772c3e22 Mon Sep 17 00:00:00 2001 +From: Thomas Hellstrom <thellstrom@vmware.com> +Date: Thu, 5 Dec 2013 02:58:47 -0800 +Subject: [PATCH 07/11] vmwgfx: Support also XA version 1 v2 + +We need to support also XA version 1, since we want to be backwards +compatible with older mesa releases. +Unfortunately, the intended way of detecting XA major version at +compile-time was broken on mesa 10 so we need a workaround that tests +for XA version 2 at config time. + +v2: Update the test for XA version 2. + +Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> +Reviewed-by: Jakob Bornecrantz <jakob@vmware.com> +--- + configure.ac | 10 +++++++++- + vmwgfx/vmwgfx_dri2.c | 5 ++--- + vmwgfx/vmwgfx_driver.c | 3 +-- + vmwgfx/vmwgfx_saa.c | 12 +++++------- + vmwgfx/vmwgfx_saa.h | 12 ++++++++++++ + vmwgfx/vmwgfx_tex_video.c | 2 +- + 6 files changed, 30 insertions(+), 14 deletions(-) + +diff --git a/configure.ac b/configure.ac +index dccfb27..123356c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -118,7 +118,15 @@ if test x$BUILD_VMWGFX = xyes; then + PKG_CHECK_MODULES([LIBDRM], [libdrm],[],[BUILD_VMWGFX=no]) + fi + if test x$BUILD_VMWGFX = xyes; then +- PKG_CHECK_MODULES([XATRACKER], [xatracker >= 2.0.0],[],[BUILD_VMWGFX=no]) ++# ++# Early versions of mesa 10 forgot to bump the XA major version number in ++# the xa_tracker.h header ++# ++ PKG_CHECK_MODULES([XATRACKER], [xatracker >= 0.4.0], ++ [PKG_CHECK_EXISTS([xatracker = 2.0.0], ++ [AC_DEFINE([HAVE_XA_2], 1, ++ [Has version 2 of XA])])], ++ [],[BUILD_VMWGFX=no]) + fi + + DRIVER_NAME=vmware +diff --git a/vmwgfx/vmwgfx_dri2.c b/vmwgfx/vmwgfx_dri2.c +index 57f2d9d..4c74a6b 100644 +--- a/vmwgfx/vmwgfx_dri2.c ++++ b/vmwgfx/vmwgfx_dri2.c +@@ -206,8 +206,7 @@ dri2_do_create_buffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer, unsigned int for + } + + private->srf = srf; +- if (xa_surface_handle(srf, xa_handle_type_shared, +- &buffer->name, &buffer->pitch) != 0) ++ if (_xa_surface_handle(srf, &buffer->name, &buffer->pitch) != 0) + return FALSE; + + buffer->cpp = xa_format_depth(xa_surface_format(srf)) / 8; +@@ -228,7 +227,7 @@ dri2_do_destroy_buffer(DrawablePtr pDraw, DRI2BufferPtr buffer) + struct vmwgfx_saa_pixmap *vpix = vmwgfx_saa_pixmap(private->pPixmap); + + if (--private->refcount == 0 && srf) { +- xa_surface_unref(srf); ++ xa_surface_destroy(srf); + } + + /* +diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c +index bfc07f8..6301c29 100644 +--- a/vmwgfx/vmwgfx_driver.c ++++ b/vmwgfx/vmwgfx_driver.c +@@ -617,8 +617,7 @@ vmwgfx_scanout_present(ScreenPtr pScreen, int drm_fd, + return FALSE; + } + +- if (xa_surface_handle(vpix->hw, xa_handle_type_shared, +- &handle, &dummy) != 0) { ++ if (_xa_surface_handle(vpix->hw, &handle, &dummy) != 0) { + LogMessage(X_ERROR, "Could not get present surface handle.\n"); + return FALSE; + } +diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c +index 346e7f4..1459933 100644 +--- a/vmwgfx/vmwgfx_saa.c ++++ b/vmwgfx/vmwgfx_saa.c +@@ -146,7 +146,7 @@ vmwgfx_pixmap_free_storage(struct vmwgfx_saa_pixmap *vpix) + vpix->malloc = NULL; + } + if (!(vpix->backing & VMWGFX_PIX_SURFACE) && vpix->hw) { +- xa_surface_unref(vpix->hw); ++ xa_surface_destroy(vpix->hw); + vpix->hw = NULL; + } + if (!(vpix->backing & VMWGFX_PIX_GMR) && vpix->gmr) { +@@ -451,7 +451,7 @@ vmwgfx_hw_kill(struct vmwgfx_saa *vsaa, + &spix->dirty_hw)) + return FALSE; + +- xa_surface_unref(vpix->hw); ++ xa_surface_destroy(vpix->hw); + vpix->hw = NULL; + + /* +@@ -698,8 +698,7 @@ vmwgfx_present_prepare(struct vmwgfx_saa *vsaa, + + (void) pScreen; + if (src_vpix == dst_vpix || !src_vpix->hw || +- xa_surface_handle(src_vpix->hw, xa_handle_type_shared, +- &vsaa->src_handle, &dummy) != 0) ++ _xa_surface_handle(src_vpix->hw, &vsaa->src_handle, &dummy) != 0) + return FALSE; + + REGION_NULL(pScreen, &vsaa->present_region); +@@ -800,7 +799,7 @@ vmwgfx_create_hw(struct vmwgfx_saa *vsaa, + return TRUE; + + out_no_damage: +- xa_surface_unref(hw); ++ xa_surface_destroy(hw); + return FALSE; + } + +@@ -1459,8 +1458,7 @@ vmwgfx_scanout_ref(struct vmwgfx_screen_entry *entry) + */ + if (!vmwgfx_hw_accel_validate(pixmap, 0, XA_FLAG_SCANOUT, 0, NULL)) + goto out_err; +- if (xa_surface_handle(vpix->hw, xa_handle_type_shared, +- &handle, &dummy) != 0) ++ if (_xa_surface_handle(vpix->hw, &handle, &dummy) != 0) + goto out_err; + depth = xa_format_depth(xa_surface_format(vpix->hw)); + +diff --git a/vmwgfx/vmwgfx_saa.h b/vmwgfx/vmwgfx_saa.h +index d8aa3d3..5e1f40c 100644 +--- a/vmwgfx/vmwgfx_saa.h ++++ b/vmwgfx/vmwgfx_saa.h +@@ -115,4 +115,16 @@ vmwgfx_saa_set_master(ScreenPtr pScreen); + void + vmwgfx_saa_drop_master(ScreenPtr pScreen); + ++#if (XA_TRACKER_VERSION_MAJOR <= 1) && !defined(HAVE_XA_2) ++ ++#define _xa_surface_handle(_a, _b, _c) xa_surface_handle(_a, _b, _c) ++#define xa_context_flush(_a) ++ ++#else ++ ++#define xa_surface_destroy(_a) xa_surface_unref(_a) ++#define _xa_surface_handle(_a, _b, _c) \ ++ xa_surface_handle(_a, xa_handle_type_shared, _b, _c) ++ ++#endif /* (XA_TRACKER_VERSION_MAJOR <= 1) */ + #endif +diff --git a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c +index 3ba40ef..9fd8f22 100644 +--- a/vmwgfx/vmwgfx_tex_video.c ++++ b/vmwgfx/vmwgfx_tex_video.c +@@ -199,7 +199,7 @@ stop_video(ScrnInfoPtr pScrn, pointer data, Bool shutdown) + for (i=0; i<3; ++i) { + for (j=0; j<2; ++j) { + if (priv->yuv[i]) { +- xa_surface_unref(priv->yuv[j][i]); ++ xa_surface_destroy(priv->yuv[j][i]); + priv->yuv[j][i] = NULL; + } + } +-- +1.8.5.1 + + +From c36cbcefb8526944141eb431e1e736dc4485a36e Mon Sep 17 00:00:00 2001 +From: Thomas Hellstrom <thellstrom@vmware.com> +Date: Mon, 9 Dec 2013 00:19:55 -0800 +Subject: [PATCH 08/11] vmwgfx: Remove stray 1 + +Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> +Reviewed-by: Jakob Bornecrantz <jakob@vmware.com> +--- + vmwgfx/vmwgfx_saa.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c +index 1459933..28819c1 100644 +--- a/vmwgfx/vmwgfx_saa.c ++++ b/vmwgfx/vmwgfx_saa.c +@@ -1230,7 +1230,7 @@ vmwgfx_operation_complete(struct saa_driver *driver, + */ + + if (vpix->hw && vpix->hw_is_dri2_fronts) { +- if (1 && pScrn->vtSema && ++ if (pScrn->vtSema && + vmwgfx_upload_to_hw(driver, pixmap, &spix->dirty_shadow)) { + + REGION_EMPTY(vsaa->pScreen, &spix->dirty_shadow); +-- +1.8.5.1 + + +From 4af6062ce281a7f4aaa50985fe757e9569208ee1 Mon Sep 17 00:00:00 2001 +From: Thomas Hellstrom <thellstrom@vmware.com> +Date: Wed, 11 Dec 2013 04:59:49 -0800 +Subject: [PATCH 09/11] Revert "vmwgfx: Get rid of device-specific DMA code" + +This reverts commit 45b2457516a9db4bd1d60fbb24a1efbe2d9dd932. + +Reverting this because using direct DMA for shared pixmaps should +boost performance. It should be usable both in a composited environment +and when running hosted. Need to retest the DMA flaws I saw before disabling +this code. + +Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> +Reviewed-by: Jakob Bornecrantz <jakob@vmware.com> +--- + vmwgfx/vmwgfx_drmi.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++ + vmwgfx/vmwgfx_drmi.h | 5 +++ + vmwgfx/vmwgfx_saa.c | 53 ++++++++++++------------ + vmwgfx/vmwgfx_saa_priv.h | 1 + + 4 files changed, 136 insertions(+), 26 deletions(-) + +diff --git a/vmwgfx/vmwgfx_drmi.c b/vmwgfx/vmwgfx_drmi.c +index 1e23f4a..496a16b 100644 +--- a/vmwgfx/vmwgfx_drmi.c ++++ b/vmwgfx/vmwgfx_drmi.c +@@ -284,6 +284,109 @@ vmwgfx_dmabuf_destroy(struct vmwgfx_dmabuf *buf) + } + + int ++vmwgfx_dma(unsigned int host_x, unsigned int host_y, ++ RegionPtr region, struct vmwgfx_dmabuf *buf, ++ uint32_t buf_pitch, uint32_t surface_handle, int to_surface) ++{ ++ BoxPtr clips = REGION_RECTS(region); ++ unsigned int num_clips = REGION_NUM_RECTS(region); ++ struct drm_vmw_execbuf_arg arg; ++ struct drm_vmw_fence_rep rep; ++ int ret; ++ unsigned int size; ++ unsigned i; ++ SVGA3dCopyBox *cb; ++ SVGA3dCmdSurfaceDMASuffix *suffix; ++ SVGA3dCmdSurfaceDMA *body; ++ struct vmwgfx_int_dmabuf *ibuf = vmwgfx_int_dmabuf(buf); ++ ++ struct { ++ SVGA3dCmdHeader header; ++ SVGA3dCmdSurfaceDMA body; ++ SVGA3dCopyBox cb; ++ } *cmd; ++ ++ if (num_clips == 0) ++ return 0; ++ ++ size = sizeof(*cmd) + (num_clips - 1) * sizeof(cmd->cb) + ++ sizeof(*suffix); ++ cmd = malloc(size); ++ if (!cmd) ++ return -1; ++ ++ cmd->header.id = SVGA_3D_CMD_SURFACE_DMA; ++ cmd->header.size = sizeof(cmd->body) + num_clips * sizeof(cmd->cb) + ++ sizeof(*suffix); ++ cb = &cmd->cb; ++ ++ suffix = (SVGA3dCmdSurfaceDMASuffix *) &cb[num_clips]; ++ suffix->suffixSize = sizeof(*suffix); ++ suffix->maximumOffset = (uint32_t) -1; ++ suffix->flags.discard = 0; ++ suffix->flags.unsynchronized = 0; ++ suffix->flags.reserved = 0; ++ ++ body = &cmd->body; ++ body->guest.ptr.gmrId = buf->gmr_id; ++ body->guest.ptr.offset = buf->gmr_offset; ++ body->guest.pitch = buf_pitch; ++ body->host.sid = surface_handle; ++ body->host.face = 0; ++ body->host.mipmap = 0; ++ ++ body->transfer = (to_surface ? SVGA3D_WRITE_HOST_VRAM : ++ SVGA3D_READ_HOST_VRAM); ++ ++ ++ for (i=0; i < num_clips; i++, cb++, clips++) { ++ cb->x = (uint16_t) clips->x1 + host_x; ++ cb->y = (uint16_t) clips->y1 + host_y; ++ cb->z = 0; ++ cb->srcx = (uint16_t) clips->x1; ++ cb->srcy = (uint16_t) clips->y1; ++ cb->srcz = 0; ++ cb->w = (uint16_t) (clips->x2 - clips->x1); ++ cb->h = (uint16_t) (clips->y2 - clips->y1); ++ cb->d = 1; ++#if 0 ++ LogMessage(X_INFO, "DMA! x: %u y: %u srcx: %u srcy: %u w: %u h: %u %s\n", ++ cb->x, cb->y, cb->srcx, cb->srcy, cb->w, cb->h, ++ to_surface ? "to" : "from"); ++#endif ++ ++ } ++ ++ memset(&arg, 0, sizeof(arg)); ++ memset(&rep, 0, sizeof(rep)); ++ ++ rep.error = -EFAULT; ++ arg.fence_rep = ((to_surface) ? 0UL : (unsigned long)&rep); ++ arg.commands = (unsigned long)cmd; ++ arg.command_size = size; ++ arg.throttle_us = 0; ++ arg.version = DRM_VMW_EXECBUF_VERSION; ++ ++ ret = drmCommandWrite(ibuf->drm_fd, DRM_VMW_EXECBUF, &arg, sizeof(arg)); ++ if (ret) { ++ LogMessage(X_ERROR, "DMA error %s.\n", strerror(-ret)); ++ } ++ ++ free(cmd); ++ ++ if (rep.error == 0) { ++ ret = vmwgfx_fence_wait(ibuf->drm_fd, rep.handle, TRUE); ++ if (ret) { ++ LogMessage(X_ERROR, "DMA from host fence wait error %s.\n", ++ strerror(-ret)); ++ vmwgfx_fence_unref(ibuf->drm_fd, rep.handle); ++ } ++ } ++ ++ return 0; ++} ++ ++int + vmwgfx_get_param(int drm_fd, uint32_t param, uint64_t *out) + { + struct drm_vmw_getparam_arg gp_arg; +diff --git a/vmwgfx/vmwgfx_drmi.h b/vmwgfx/vmwgfx_drmi.h +index fff728a..2435009 100644 +--- a/vmwgfx/vmwgfx_drmi.h ++++ b/vmwgfx/vmwgfx_drmi.h +@@ -60,6 +60,11 @@ extern void + vmwgfx_dmabuf_unmap(struct vmwgfx_dmabuf *buf); + + extern int ++vmwgfx_dma(unsigned int host_x, unsigned int host_y, ++ RegionPtr region, struct vmwgfx_dmabuf *buf, ++ uint32_t buf_pitch, uint32_t surface_handle, int to_surface); ++ ++extern int + vmwgfx_num_streams(int drm_fd, uint32_t *ntot, uint32_t *nfree); + + extern int +diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c +index 28819c1..96275a5 100644 +--- a/vmwgfx/vmwgfx_saa.c ++++ b/vmwgfx/vmwgfx_saa.c +@@ -285,40 +285,40 @@ vmwgfx_saa_dma(struct vmwgfx_saa *vsaa, + Bool to_hw) + { + struct vmwgfx_saa_pixmap *vpix = vmwgfx_saa_pixmap(pixmap); +- void *data = vpix->malloc; +- int ret; + + if (!vpix->hw || (!vpix->gmr && !vpix->malloc)) + return TRUE; + ++ if (vpix->gmr && vsaa->can_optimize_dma) { ++ uint32_t handle, dummy; + +- if (vpix->gmr) { +- data = vmwgfx_dmabuf_map(vpix->gmr); +- if (!data) ++ if (xa_surface_handle(vpix->hw, xa_handle_type_shared, ++ &handle, &dummy) != 0) + goto out_err; +- } +- +- ret = xa_surface_dma(vsaa->xa_ctx, vpix->hw, data, pixmap->devKind, +- (int) to_hw, +- (struct xa_box *) REGION_RECTS(reg), +- REGION_NUM_RECTS(reg)); +- if (vpix->gmr) +- vmwgfx_dmabuf_unmap(vpix->gmr); +- +- if (ret) +- goto out_err; ++ if (vmwgfx_dma(0, 0, reg, vpix->gmr, pixmap->devKind, handle, ++ to_hw) != 0) ++ goto out_err; ++ } else { ++ void *data = vpix->malloc; ++ int ret; + +- ret = xa_surface_dma(vsaa->xa_ctx, vpix->hw, data, pixmap->devKind, +- (int) to_hw, +- (struct xa_box *) REGION_RECTS(reg), +- REGION_NUM_RECTS(reg)); +- if (to_hw) +- xa_context_flush(vsaa->xa_ctx); +- if (vpix->gmr) +- vmwgfx_dmabuf_unmap(vpix->gmr); +- if (ret) +- goto out_err; ++ if (vpix->gmr) { ++ data = vmwgfx_dmabuf_map(vpix->gmr); ++ if (!data) ++ goto out_err; ++ } + ++ ret = xa_surface_dma(vsaa->xa_ctx, vpix->hw, data, pixmap->devKind, ++ (int) to_hw, ++ (struct xa_box *) REGION_RECTS(reg), ++ REGION_NUM_RECTS(reg)); ++ if (to_hw) ++ xa_context_flush(vsaa->xa_ctx); ++ if (vpix->gmr) ++ vmwgfx_dmabuf_unmap(vpix->gmr); ++ if (ret) ++ goto out_err; ++ } + return TRUE; + out_err: + LogMessage(X_ERROR, "DMA %s surface failed.\n", +@@ -1377,6 +1377,7 @@ vmwgfx_saa_init(ScreenPtr pScreen, int drm_fd, struct xa_tracker *xat, + vsaa->xa_ctx = xa_context_default(xat); + vsaa->drm_fd = drm_fd; + vsaa->present_flush = present_flush; ++ vsaa->can_optimize_dma = FALSE; + vsaa->use_present_opt = direct_presents; + vsaa->only_hw_presents = only_hw_presents; + vsaa->rendercheck = rendercheck; +diff --git a/vmwgfx/vmwgfx_saa_priv.h b/vmwgfx/vmwgfx_saa_priv.h +index f5f45ba..16583b0 100644 +--- a/vmwgfx/vmwgfx_saa_priv.h ++++ b/vmwgfx/vmwgfx_saa_priv.h +@@ -50,6 +50,7 @@ struct vmwgfx_saa { + int ydiff; + RegionRec present_region; + uint32_t src_handle; ++ Bool can_optimize_dma; + Bool use_present_opt; + Bool only_hw_presents; + Bool rendercheck; +-- +1.8.5.1 + + +From 93228f3dd3355a25583d22dbb96791678b93be3e Mon Sep 17 00:00:00 2001 +From: Thomas Hellstrom <thellstrom@vmware.com> +Date: Wed, 11 Dec 2013 06:54:02 -0800 +Subject: [PATCH 10/11] vmwgfx: Really allow XA version 2. + +When XA starts to correctly advertise version 2, we didn't allow it. +Fix this. + +Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> +Reviewed-by: Jakob Bornecrantz <jakob@vmware.com> +--- + vmwgfx/vmwgfx_driver.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c +index 6301c29..4e28097 100644 +--- a/vmwgfx/vmwgfx_driver.c ++++ b/vmwgfx/vmwgfx_driver.c +@@ -79,7 +79,7 @@ typedef uint8_t uint8; + + #define XA_VERSION_MINOR_REQUIRED 0 + #define XA_VERSION_MAJOR_REQUIRED 1 +-#define XA_VERSION_MAJOR_COMPAT 1 ++#define XA_VERSION_MAJOR_COMPAT 2 + + #define DRM_VERSION_MAJOR_REQUIRED 2 + #define DRM_VERSION_MINOR_REQUIRED 3 +-- +1.8.5.1 + + +From f45a551e9b70ccec8f92df02747d4e2af299cf8c Mon Sep 17 00:00:00 2001 +From: Thomas Hellstrom <thellstrom@vmware.com> +Date: Mon, 16 Dec 2013 10:38:21 +0100 +Subject: [PATCH 11/11] vmwgfx: Fix compile breakage on XA version 1. + +A recent revert brought back code that assumed XA version 2. + +Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> +Reviewed-by: trivial +--- + vmwgfx/vmwgfx_saa.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c +index 96275a5..e76bd09 100644 +--- a/vmwgfx/vmwgfx_saa.c ++++ b/vmwgfx/vmwgfx_saa.c +@@ -292,8 +292,7 @@ vmwgfx_saa_dma(struct vmwgfx_saa *vsaa, + if (vpix->gmr && vsaa->can_optimize_dma) { + uint32_t handle, dummy; + +- if (xa_surface_handle(vpix->hw, xa_handle_type_shared, +- &handle, &dummy) != 0) ++ if (_xa_surface_handle(vpix->hw, &handle, &dummy) != 0) + goto out_err; + if (vmwgfx_dma(0, 0, reg, vpix->gmr, pixmap->devKind, handle, + to_hw) != 0) +-- +1.8.5.1 + diff --git a/extra/xfce4-terminal/PKGBUILD b/extra/xfce4-terminal/PKGBUILD index 413d20ee9..fbde79f9f 100644 --- a/extra/xfce4-terminal/PKGBUILD +++ b/extra/xfce4-terminal/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198571 2013-10-30 15:41:02Z allan $ +# $Id: PKGBUILD 202765 2013-12-27 11:06:12Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: tobias <tobias funnychar archlinux.org> # Contributor: Aurelien Foret <orelien@chez.com> pkgname=xfce4-terminal -pkgver=0.6.2 +pkgver=0.6.3 pkgrel=1 pkgdesc="A modern terminal emulator primarly for the Xfce desktop environment" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ conflicts=('terminal') replaces=('terminal') install=$pkgname.install source=(http://archive.xfce.org/src/apps/$pkgname/0.6/$pkgname-$pkgver.tar.bz2) -sha256sums=('3d92422288d26311880af694bb4e02c9235997ca307a5e85001bf6bef65c3b35') +sha256sums=('912f4716c2395a14a80620ef982b4af1e2a67a8df9a1ef0b802ecae826057e08') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/xfce4-terminal/xfce4-terminal-0.6.2-fix-up-the-encoding-menu-creation.patch b/extra/xfce4-terminal/xfce4-terminal-0.6.2-fix-up-the-encoding-menu-creation.patch new file mode 100644 index 000000000..dba52d294 --- /dev/null +++ b/extra/xfce4-terminal/xfce4-terminal-0.6.2-fix-up-the-encoding-menu-creation.patch @@ -0,0 +1,50 @@ +From 71bd87a532f250d6bc98d52a5d546d43056bbd99 Mon Sep 17 00:00:00 2001 +From: Alistair Buxton <a.j.buxton@gmail.com> +Date: Sun, 13 Oct 2013 23:41:45 +0000 +Subject: Fix up the encoding menu creation. + +Don't add non-radio items to the radio item group. +Don't leak list nodes by prepending twice to the same list. +Fixes BUG #10395. +--- +diff --git a/terminal/terminal-encoding-action.c b/terminal/terminal-encoding-action.c +index 83242e9..77c916c 100644 +--- a/terminal/terminal-encoding-action.c ++++ b/terminal/terminal-encoding-action.c +@@ -253,7 +253,7 @@ terminal_encoding_action_menu_shown (GtkWidget *menu, + /* action to reset to the default */ + default_label = g_strdup_printf (_("Default (%s)"), default_charset); + item = gtk_radio_menu_item_new_with_label (groups, default_label); +- groups = g_slist_prepend (groups, item); ++ groups = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item)); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), found); + g_signal_connect (G_OBJECT (item), "activate", +@@ -267,7 +267,6 @@ terminal_encoding_action_menu_shown (GtkWidget *menu, + /* category item */ + item = gtk_menu_item_new_with_label (_(terminal_encodings_names[n])); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); +- groups = g_slist_prepend (groups, item); + gtk_widget_show (item); + + submenu = gtk_menu_new (); +@@ -281,7 +280,7 @@ terminal_encoding_action_menu_shown (GtkWidget *menu, + break; + + item2 = gtk_radio_menu_item_new_with_label (groups, charset); +- groups = g_slist_prepend (groups, item2); ++ groups = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item2)); + gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item2); + g_object_set_qdata (G_OBJECT (item2), encoding_action_quark, (gchar *) charset); + gtk_widget_show (item2); +@@ -304,7 +303,7 @@ terminal_encoding_action_menu_shown (GtkWidget *menu, + { + /* add an action with the unknown charset */ + item2 = gtk_radio_menu_item_new_with_label (groups, action->current); +- groups = g_slist_prepend (groups, item2); ++ groups = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item2)); + g_object_set_qdata_full (G_OBJECT (item2), encoding_action_quark, + g_strdup (action->current), g_free); + gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item2); +-- +cgit v0.9.2 diff --git a/extra/xmlto/PKGBUILD b/extra/xmlto/PKGBUILD index 2b719ac92..299f5ac51 100644 --- a/extra/xmlto/PKGBUILD +++ b/extra/xmlto/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 149980 2012-02-11 23:31:41Z allan $ +# $Id: PKGBUILD 201307 2013-12-08 11:06:49Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Sergej Pupykin <sergej@aur.archlinux.org> @@ -6,12 +6,12 @@ pkgname=xmlto pkgver=0.0.25 -pkgrel=2.1 +pkgrel=3 pkgdesc="Convert xml to many other formats" arch=('i686' 'x86_64' 'mips64el') url="http://cyberelk.net/tim/software/xmlto/" license=('GPL') -depends=('libxslt' 'perl-yaml-syck' 'perl-test-pod') +depends=('libxslt') makedepends=('docbook-xsl') source=("https://fedorahosted.org/releases/x/m/${pkgname}/${pkgname}-${pkgver}.tar.bz2") md5sums=('6b6267b1470f8571fe5f63a128970364') diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index ff5a25796..da0871cc8 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198667 2013-11-01 16:16:16Z andyrtr $ +# $Id: PKGBUILD 201503 2013-12-13 14:16:21Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') -pkgver=1.14.4 +pkgver=1.14.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -24,7 +24,7 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 10-quirks.conf loongson.patch fb-rename-wfbDestroyGlyphCache.patch) -sha256sums=('608ccfaafb845f6e559884a30f946d365209172416710d687b190e9e1ff65dc3' +sha256sums=('8d0f06bf1416487a5170318477088826a8d737d4a201e996b2dc1ecff47461d1' '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162' 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84' 'e033f9bcc21980f7f0428e6ed6c362a3d55ad293b05fd6e6c6c1933b86f9e63a' diff --git a/extra/xorg-xinit/PKGBUILD b/extra/xorg-xinit/PKGBUILD index 38ccfeb49..ac6ae855a 100644 --- a/extra/xorg-xinit/PKGBUILD +++ b/extra/xorg-xinit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 197640 2013-10-27 15:15:12Z andyrtr $ +# $Id: PKGBUILD 201357 2013-12-09 12:20:22Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xorg-xinit pkgver=1.3.3 -pkgrel=2 +pkgrel=3 pkgdesc="X.Org initialisation program " arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -21,24 +21,31 @@ source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2 fs25361.patch xinitrc xsession - xserverrc) + xserverrc + cpp-4.8-compat.patch + fix-globals-shadowing.patch) options=(!emptydirs) sha256sums=('74b2878de6e3d5b5948f1562a77e7f53b4e10621e505ddb278050c7f3cae00af' 'a5c6ced5822bbb3145e0f30a4b12995782ca6d80ff2d927851ec91b5e41212cb' '431335ceb84f75aaa96fba285a596f61a63629f94756f8063e4f621ae143629b' '38a23848b49de8a5c635a128a8b32a6cd0a08a9ee153ad97cb25abd82cfda1bc' '2b94a42f2521cb5662fb9a5765a7507456dc0352ac9d0f44c56b359dcdb38898' - '5e87bff928c143d9db9966048f6530e83e9e9a1cac09ce4c25f8aabc08611b6f') + '5e87bff928c143d9db9966048f6530e83e9e9a1cac09ce4c25f8aabc08611b6f' + '194104efba9bcbf8ec0bd9ac1b145017d459b734afbc8bbfc37e361efd467a96' + '6491c96dd0e98b6f5a45c4f0183eabcf2fb54728c81e793910c19d4107606bb1') prepare() { cd xinit-${pkgver} - patch -Np1 -i "${srcdir}/06_move_serverauthfile_into_tmp.diff" - patch -Np1 -i "${srcdir}/fs25361.patch" + patch -Np1 -i ../06_move_serverauthfile_into_tmp.diff + patch -Np1 -i ../fs25361.patch + patch -Np1 -i ../cpp-4.8-compat.patch + patch -Np1 -i ../fix-globals-shadowing.patch sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp } build() { cd xinit-${pkgver} + autoreconf -fi ./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit make } @@ -53,9 +60,4 @@ package() { install -m644 "${srcdir}/xserverrc" "${pkgdir}/etc/X11/xinit/xserverrc" install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" - - # a workaround for https://bugs.archlinux.org/task/36959 - sed -i '/^\s*$/d' $pkgdir/usr/bin/startx - sed -i '/^\s*$/d' $pkgdir/etc/X11/xinit/xinitrc - } diff --git a/extra/xorg-xinit/cpp-4.8-compat.patch b/extra/xorg-xinit/cpp-4.8-compat.patch new file mode 100644 index 000000000..b19f53eee --- /dev/null +++ b/extra/xorg-xinit/cpp-4.8-compat.patch @@ -0,0 +1,22 @@ +From 463b85fcf51d8ff5886ebe1f3481e5cb4d603436 Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sat, 23 Nov 2013 07:03:39 +0000 +Subject: Pass files to cpp via CLI arg instead of stdin to workaround gcc 4.8 change + +Fixes Bug 69439 - Empty lines before #!/bin/sh in startx +https://bugs.freedesktop.org/show_bug.cgi?id=69439 + +Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> +--- +diff --git a/cpprules.in b/cpprules.in +index eaea428..0931bee 100644 +--- a/cpprules.in ++++ b/cpprules.in +@@ -15,4 +15,4 @@ CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \ + SUFFIXES = .cpp + + .cpp: +- $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ ++ $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) $< | $(CPP_SED_MAGIC) > $@ +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/xorg-xinit/fix-globals-shadowing.patch b/extra/xorg-xinit/fix-globals-shadowing.patch new file mode 100644 index 000000000..d9e0a18f9 --- /dev/null +++ b/extra/xorg-xinit/fix-globals-shadowing.patch @@ -0,0 +1,58 @@ +From 182920f156c87715d91b2f64b8781a0072af996e Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun, 08 Sep 2013 16:48:50 +0000 +Subject: Fix warnings about parameters to startServer & startClient shadowing globals + +Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> +--- +diff --git a/xinit.c b/xinit.c +index 18e3e10..1b04911 100644 +--- a/xinit.c ++++ b/xinit.c +@@ -390,7 +390,7 @@ processTimeout(int timeout, const char *string) + } + + static pid_t +-startServer(char *server[]) ++startServer(char *server_argv[]) + { + sigset_t mask, old; + const char * const *cpp; +@@ -422,12 +422,12 @@ startServer(char *server[]) + * if client is xterm -L + */ + setpgid(0,getpid()); +- Execute(server); ++ Execute(server_argv); + +- Error("unable to run server \"%s\"", server[0]); ++ Error("unable to run server \"%s\"", server_argv[0]); + + fprintf(stderr, "Use the -- option, or make sure that %s is in your path and\n", bindir); +- fprintf(stderr, "that \"%s\" is a program or a link to the right type of server\n", server[0]); ++ fprintf(stderr, "that \"%s\" is a program or a link to the right type of server\n", server_argv[0]); + fprintf(stderr, "for your display. Possible server names include:\n\n"); + for (cpp = server_names; *cpp; cpp++) + fprintf(stderr, " %s\n", *cpp); +@@ -556,7 +556,7 @@ setWindowPath(void) + } + + static pid_t +-startClient(char *client[]) ++startClient(char *client_argv[]) + { + clientpid = fork(); + if (clientpid == 0) { +@@ -568,8 +568,8 @@ startClient(char *client[]) + _exit(EXIT_FAILURE); + } + setpgid(0, getpid()); +- Execute(client); +- Error("Unable to run program \"%s\"", client[0]); ++ Execute(client_argv); ++ Error("Unable to run program \"%s\"", client_argv[0]); + + fprintf(stderr, "Specify a program on the command line or make sure that %s\n", bindir); + fprintf(stderr, "is in your path.\n\n"); +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/xsd/PKGBUILD b/extra/xsd/PKGBUILD index 8309fe961..59484aca6 100644 --- a/extra/xsd/PKGBUILD +++ b/extra/xsd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 190051 2013-07-13 12:43:05Z svenstaro $ +# $Id: PKGBUILD 201407 2013-12-10 17:55:39Z bpiotrowski $ # Maintainer: # Contributor: kevku <kevku@gmx.com> pkgname=xsd pkgver=3.3.0 _pkgver=3.3.0-2+dep -pkgrel=9 +pkgrel=10 pkgdesc="An open-source, cross-platform W3C XML Schema to C++ data binding compiler" arch=('i686' 'x86_64' 'mips64el') url="http://www.codesynthesis.com/products/xsd" diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD index 048e57d2b..0c503436a 100644 --- a/extra/xterm/PKGBUILD +++ b/extra/xterm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 194316 2013-09-13 08:17:42Z andyrtr $ +# $Id: PKGBUILD 200773 2013-12-04 20:25:36Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xterm -pkgver=297 +pkgver=300 pkgrel=1 pkgdesc="X Terminal Emulator" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('custom') depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps' 'libutempter') source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz LICENSE) -md5sums=('45610ae6fe90cf086fcd75b9cb97bbaf' +md5sums=('6adc7c7f39ab2a71fd83747049d60358' '10ecc3f8ee91e3189863a172f68282d2') build() { diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD deleted file mode 100644 index b9ab3f225..000000000 --- a/extra/xulrunner/PKGBUILD +++ /dev/null @@ -1,68 +0,0 @@ -# $Id: PKGBUILD 194430 2013-09-16 10:39:31Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> - -pkgname=xulrunner -pkgver=23.0.1 -pkgrel=1 -pkgdesc="Mozilla Runtime Environment" -arch=('i686' 'x86_64') -license=('MPL' 'GPL' 'LGPL') -depends=('gtk2' 'mozilla-common' 'nss>=3.14.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite>=3.7.4' 'libvpx' 'python2') -makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'yasm' 'mesa' 'autoconf2.13') -url="http://wiki.mozilla.org/XUL:Xul_Runner" -source=(ftp://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$pkgver/source/xulrunner-$pkgver.source.tar.bz2 - mozconfig - mozilla-pkgconfig.patch - shared-libs.patch) -options=('!emptydirs') -replaces=('xulrunner-oss') -sha256sums=('50d70813cee1c966a6037957206626bb62dc047b011d2e4fab11c559008f9336' - '3fba82b327f8825ebe93ceaeaea4968d57cf7d700f40bf4457b06d263bcc2e8f' - '23485d937035648add27a7657f6934dc5b295e886cdb0506eebd02a43d07f269' - 'e2b4a00d14f4ba69c62b3f9ef9908263fbab179ba8004197cbc67edbd916fdf1') - -prepare() { - cd "$srcdir/mozilla-release" - cp "$srcdir/mozconfig" .mozconfig - - #fix libdir/sdkdir - fedora - patch -Np1 -i ../mozilla-pkgconfig.patch - patch -Np1 -i ../shared-libs.patch - - # WebRTC build tries to execute "python" and expects Python 2 - # Workaround taken from chromium PKGBUILD - mkdir "$srcdir/python2-path" - ln -s /usr/bin/python2 "$srcdir/python2-path/python" - - # configure script misdetects the preprocessor without an optimization level - # https://bugs.archlinux.org/task/34644 - sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure -} - -build() { - cd "$srcdir/mozilla-release" - - export PATH="$srcdir/python2-path:$PATH" - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-$pkgver" - export PYTHON="/usr/bin/python2" - - make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" -} - -package() { - cd "$srcdir/mozilla-release" - make -j1 -f client.mk DESTDIR="$pkgdir" install - - rm -rf "$pkgdir"/usr/lib/xulrunner-$pkgver/{dictionaries,hyphenation} - ln -sf /usr/share/hunspell "$pkgdir/usr/lib/xulrunner-$pkgver/dictionaries" - ln -sf /usr/share/hyphen "$pkgdir/usr/lib/xulrunner-$pkgver/hyphenation" - - # add xulrunner library path to ld.so.conf - install -d $pkgdir/etc/ld.so.conf.d - echo "/usr/lib/xulrunner-$pkgver" > $pkgdir/etc/ld.so.conf.d/xulrunner.conf - - chmod +x "${pkgdir}/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py" - sed -i 's|!/usr/bin/env python$|!/usr/bin/env python2|' \ - "$pkgdir"/usr/lib/xulrunner-devel-$pkgver/sdk/bin/{xpt,header,typelib,xpidl}.py -} diff --git a/extra/xulrunner/mozconfig b/extra/xulrunner/mozconfig deleted file mode 100644 index 6679dac21..000000000 --- a/extra/xulrunner/mozconfig +++ /dev/null @@ -1,29 +0,0 @@ -. $topsrcdir/xulrunner/config/mozconfig - -ac_add_options --prefix=/usr -ac_add_options --libdir=/usr/lib - -# 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-gstreamer - -ac_add_options --disable-crashreporter -ac_add_options --disable-updater -ac_add_options --disable-tests -ac_add_options --disable-installer diff --git a/extra/xulrunner/mozilla-pkgconfig.patch b/extra/xulrunner/mozilla-pkgconfig.patch deleted file mode 100644 index 037d4aee0..000000000 --- a/extra/xulrunner/mozilla-pkgconfig.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -Nur mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in mozilla-release/xulrunner/installer/libxul-embedding.pc.in ---- mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in 2011-12-19 22:11:38.100005674 +0000 -+++ mozilla-release/xulrunner/installer/libxul-embedding.pc.in 2011-12-19 22:14:35.095147521 +0000 -@@ -6,5 +6,6 @@ - Name: libxul-embedding - Description: Static library for version-independent embedding of the Mozilla runtime - Version: %MOZILLA_VERSION% -+Requires: %NSPR_NAME% >= %NSPR_VERSION% - Libs: -L${sdkdir}/lib -lxpcomglue -ldl - Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS% -diff -Nur mozilla-release.orig/xulrunner/installer/libxul.pc.in mozilla-release/xulrunner/installer/libxul.pc.in ---- mozilla-release.orig/xulrunner/installer/libxul.pc.in 2011-12-19 22:11:38.126672110 +0000 -+++ mozilla-release/xulrunner/installer/libxul.pc.in 2011-12-19 22:14:04.375412141 +0000 -@@ -1,5 +1,6 @@ - prefix=%prefix% - sdkdir=%sdkdir% -+libdir=%libdir% - includedir=%includedir% - idldir=%idldir% - -diff -Nur mozilla-release.orig/xulrunner/installer/Makefile.in mozilla-release/xulrunner/installer/Makefile.in ---- mozilla-release.orig/xulrunner/installer/Makefile.in 2011-12-19 22:11:38.126672110 +0000 -+++ mozilla-release/xulrunner/installer/Makefile.in 2011-12-19 22:18:28.743135321 +0000 -@@ -108,6 +108,7 @@ - -e "s|%includedir%|$(includedir)|" \ - -e "s|%idldir%|$(idldir)|" \ - -e "s|%sdkdir%|$(sdkdir)|" \ -+ -e "s|%libdir%|$(installdir)|" \ - -e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \ - -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \ - -e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \ -diff -Nur mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in mozilla-release/xulrunner/installer/mozilla-js.pc.in ---- mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in 2011-12-19 22:11:38.126672110 +0000 -+++ mozilla-release/xulrunner/installer/mozilla-js.pc.in 2011-12-19 22:18:55.569571004 +0000 -@@ -7,4 +7,4 @@ - Version: %MOZILLA_VERSION% - Requires: %NSPR_NAME% >= %NSPR_VERSION% - Libs: -L${sdkdir}/lib %MOZ_JS_LINK% --Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE -+Cflags: -I${includedir} -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE diff --git a/extra/xulrunner/shared-libs.patch b/extra/xulrunner/shared-libs.patch deleted file mode 100644 index 1f22b2b0d..000000000 --- a/extra/xulrunner/shared-libs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur mozilla-release.orig/browser/installer/Makefile.in mozilla-release/browser/installer/Makefile.in ---- mozilla-release.orig/browser/installer/Makefile.in 2012-07-17 16:19:29.480356991 +0000 -+++ mozilla-release/browser/installer/Makefile.in 2012-07-17 17:32:41.250937293 +0000 -@@ -50,7 +50,7 @@ - MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in - # Some files have been already bundled with xulrunner - ifndef SYSTEM_LIBXUL --MOZ_PKG_FATAL_WARNINGS = 1 -+MOZ_PKG_FATAL_WARNINGS = 0 - endif - - MOZ_NONLOCALIZED_PKG_LIST = \ diff --git a/extra/zenity/PKGBUILD b/extra/zenity/PKGBUILD index 442193471..7c0c12406 100644 --- a/extra/zenity/PKGBUILD +++ b/extra/zenity/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 197413 2013-10-25 15:49:33Z heftig $ +# $Id: PKGBUILD 201378 2013-12-10 10:09:05Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=zenity -pkgver=3.10.0 +pkgver=3.10.2 pkgrel=1 pkgdesc="Display graphical dialog boxes from shell scripts" arch=(i686 x86_64 mips64el) @@ -10,7 +10,7 @@ license=(LGPL) depends=(gtk3 libnotify) makedepends=(intltool gtk-doc itstool docbook-xsl git gnome-common yelp-tools) url="http://www.gnome.org" -source=(git://git.gnome.org/zenity#tag=ZENITY_3_10_0) +source=(git://git.gnome.org/zenity#tag=ZENITY_${pkgver//./_}) sha256sums=('SKIP') prepare() { |
