diff options
Diffstat (limited to 'extra')
40 files changed, 221 insertions, 734 deletions
diff --git a/extra/bind/PKGBUILD b/extra/bind/PKGBUILD index c6a6adabe..e9243bbad 100644 --- a/extra/bind/PKGBUILD +++ b/extra/bind/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 136713 2011-08-31 16:36:47Z bisson $ +# $Id: PKGBUILD 137100 2011-09-06 08:10:20Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> # Contributor: Mario Vazquez <mario_vazq@hotmail.com> @@ -6,9 +6,9 @@ pkgname=bind # Use a period and not a hyphen before the patch level for proper versioning. -pkgver=9.8.0.P4 -_pkgver=9.8.0-P4 -pkgrel=2 +pkgver=9.8.1 +_pkgver=9.8.1 +pkgrel=1 pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the DNS protocols' url='http://www.isc.org/software/bind/' @@ -26,7 +26,7 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" 'named.logrotate' 'localhost.zone' '127.0.0.zone') -sha1sums=('969864200c1516a8bea54266de60f316d79182b4' +sha1sums=('7e6ed6ebc896b1de33a9f440233066c60539de4c' 'cbdecd1ea8e7b612b33b63d66bc57273795d1f54' 'b433ba99f23e3db305f8ce293fe4ce6d1b8d4cfb' '18f477f510df31e6c6f547ee2d5fc46e973479bf' @@ -57,10 +57,11 @@ build() { --disable-static \ --disable-linux-caps \ --with-openssl \ - --with-gssapi \ --with-libxml2 \ --with-libtool \ - --with-dlz-dlopen \ + + # temporary fix for issue reported upstream + ln -s .libs/driver.o bin/tests/system/dlzexternal/ make } diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD index 2ff1dbce0..b83dc429e 100644 --- a/extra/boost/PKGBUILD +++ b/extra/boost/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 132748 2011-07-25 19:08:12Z ibiru $ +# $Id: PKGBUILD 137203 2011-09-06 17:17:14Z andrea $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Kritoke <kritoke@gamebox.net> @@ -8,13 +8,15 @@ pkgbase=boost pkgname=('boost-libs' 'boost') pkgver=1.47.0 _boostver=${pkgver//./_} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://www.boost.org/" makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi') -source=(http://downloads.sourceforge.net/sourceforge/${pkgbase}/${pkgbase}_${_boostver}.tar.gz) +source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz + exceptions.patch) license=('custom') -md5sums=('ff180a5276bec773a7625cac7e2288e8') +md5sums=('ff180a5276bec773a7625cac7e2288e8' + '9b44c28b36303152050c8c82469569c5') _stagedir="${srcdir}/stagedir" @@ -25,6 +27,10 @@ build() { echo "using python : 3.2 : /usr/bin/python : /usr/include/python3.2mu : /usr/lib ;" >> build/v2/user-config.jam echo "using mpi ;" >> build/v2/user-config.jam + # http://web.archiveorange.com/archive/v/Q0J4VE5bwsy3zxRXqUgd + cd "${srcdir}"/${pkgbase}_${_boostver} + patch -p0 -i "${srcdir}"/exceptions.patch + # build bjam cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine" ./build.sh cc diff --git a/extra/boost/exceptions.patch b/extra/boost/exceptions.patch new file mode 100644 index 000000000..9faa71526 --- /dev/null +++ b/extra/boost/exceptions.patch @@ -0,0 +1,25 @@ +diff -up boost/numeric/conversion/converter_policies.hpp\~ boost/numeric/conversion/converter_policies.hpp +--- boost/numeric/conversion/converter_policies.hpp~ 2008-10-13 11:00:03.000000000 +0200 ++++ boost/numeric/conversion/converter_policies.hpp 2011-07-22 11:46:40.961876274 +0200 +@@ -20,6 +20,7 @@ + + #include "boost/mpl/if.hpp" + #include "boost/mpl/integral_c.hpp" ++#include "boost/throw_exception.hpp" + + namespace boost { namespace numeric + { +@@ -159,9 +160,9 @@ struct def_overflow_handler + void operator() ( range_check_result r ) // throw(negative_overflow,positive_overflow) + { + if ( r == cNegOverflow ) +- throw negative_overflow() ; ++ boost::throw_exception( negative_overflow() ) ; + else if ( r == cPosOverflow ) +- throw positive_overflow() ; ++ boost::throw_exception( positive_overflow() ) ; + } + } ; + + +Diff finished. Fri Jul 22 11:46:49 2011 diff --git a/extra/cdrkit/PKGBUILD b/extra/cdrkit/PKGBUILD deleted file mode 100644 index 0d9c50016..000000000 --- a/extra/cdrkit/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 103376 2010-12-18 15:46:10Z andyrtr $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Alexander Fehr <pizzapunk gmail com> - -pkgname=cdrkit -pkgver=1.1.11 -pkgrel=1 -pkgdesc="Suite of programs for CD/DVD recording, ISO image creation, and audio CD extraction" -arch=('i686' 'x86_64' 'mips64el') -url="http://cdrkit.org/" -license=('GPL2') -depends=('file' 'bzip2' 'perl') -makedepends=('cmake') -provides=('cdrtools') -conflicts=('cdrtools') -source=(http://cdrkit.org/releases/$pkgname-$pkgver.tar.gz) -md5sums=('efe08e2f3ca478486037b053acd512e9') - -build() { - cd "$srcdir/$pkgname-$pkgver" - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make PREFIX="$pkgdir/usr" install - - # Make symlinks for cdrtools compatibility - cd "$pkgdir/usr/bin" - ln -s wodim cdrecord - ln -s readom readcd - ln -s genisoimage mkisofs - ln -s genisoimage mkhybrid - ln -s icedax cdda2wav - - cd "$pkgdir/usr/share/man/man1" - ln -s wodim.1 cdrecord.1 - ln -s readom.1 readcd.1 - ln -s genisoimage.1 mkisofs.1 - ln -s genisoimage.1 mkhybrid.1 - ln -s icedax.1 cdda2wav.1 -} diff --git a/extra/ettercap/01_pointers_and_ints_dont_mix.diff b/extra/ettercap/01_pointers_and_ints_dont_mix.diff deleted file mode 100644 index 65571309c..000000000 --- a/extra/ettercap/01_pointers_and_ints_dont_mix.diff +++ /dev/null @@ -1,13 +0,0 @@ -See debian bug #521857, patch from Timothy Redaelli <timothy@redaelli.eu> -Revised by Robert Edmonds <edmonds@debian.org> - ---- a/src/protocols/ec_tcp.c -+++ b/src/protocols/ec_tcp.c -@@ -116,7 +116,7 @@ - tcp = (struct tcp_header *)DECODE_DATA; - - opt_start = (u_char *)(tcp + 1); -- opt_end = (u_char *)((int)tcp + tcp->off * 4); -+ opt_end = (u_char *)(((u_char *)tcp) + tcp->off * 4); - - DECODED_LEN = (u_int32)(tcp->off * 4); diff --git a/extra/ettercap/PKGBUILD b/extra/ettercap/PKGBUILD index 34d86d7e1..f5490c2c4 100644 --- a/extra/ettercap/PKGBUILD +++ b/extra/ettercap/PKGBUILD @@ -1,38 +1,28 @@ -# $Id: PKGBUILD 135334 2011-08-12 21:28:33Z giovanni $ +# $Id: PKGBUILD 137221 2011-09-06 20:08:46Z andrea $ # Maintainer: # Contributor: Tom Newsom <Jeepster@gmx.co.uk> -pkgname=ettercap -pkgver=NG_0.7.3 -_origver=NG-0.7.3 -pkgrel=18 -pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - console" +pkgbase=ettercap +pkgname=('ettercap' 'ettercap-gtk') +pkgver=NG_0.7.4.1 +_origver=${pkgver/_/-} +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://ettercap.sourceforge.net/" license=('GPL') -depends=('ncurses' 'openssl' 'libpcap' 'zlib' 'pcre' 'libtool' 'libnet') -makedepends=('libnet' 'pkgconfig') -backup=('etc/etter.conf') -options=(!libtool) -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_origver}.tar.gz" - 01_pointers_and_ints_dont_mix.diff - ettercap-NG-0.7.3_dns_support_on_x86_64.patch) -md5sums=('28fb15cd024162c55249888fe1b97820' - 'c8f2b004f69ac3522ffebb530478b324' - 'd44f80292afcefdc13cba9a30c6391d6') +depends=('ncurses' 'openssl' 'libpcap' 'zlib' 'pcre' 'libtool' 'libnet' + 'pkgconfig' 'gtk2') +source=("http://drizztbsd.github.com/${pkgbase}/dist/${pkgbase}-${_origver}.tar.gz" + 'ettercap.desktop') +md5sums=('c6ae5f86361a85a8e193051f594a74fa' + '6fb03d9c890430d3afa84466bb01781b') build() { - cd ${srcdir}/${pkgname}-${_origver} - unset LDFLAGS - - libtoolize --force --copy - aclocal - autoconf - - patch -Np1 -i ${srcdir}/01_pointers_and_ints_dont_mix.diff - - [ "$CARCH" = "x86_64" ] && patch -Np1 -i ${srcdir}/ettercap-NG-0.7.3_dns_support_on_x86_64.patch + cd "${srcdir}" + + cp -r ${pkgbase}-${_origver} ${pkgbase}-${_origver}-gtk + cd ${pkgbase}-${_origver} ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ @@ -40,12 +30,37 @@ build() { --enable-plugins \ --enable-https \ --disable-gtk - sed -i 's/LTDL_SHLIB_EXT/\".so\"/' src/ec_plugins.c make + + cd ../${pkgbase}-${_origver}-gtk + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --datarootdir=/usr/share \ + --enable-plugins \ + --enable-https + make +} + +package_ettercap() { + pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - console" + depends=('ncurses' 'openssl' 'libpcap' 'zlib' 'pcre' 'libtool' 'libnet') + backup=('etc/etter.conf') + options=('!libtool') + + cd "${srcdir}"/${pkgbase}-${_origver} + make DESTDIR="${pkgdir}" install } -package() { - cd ${srcdir}/${pkgname}-${_origver} +package_ettercap-gtk() { + pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - GTK" + depends=('ettercap' 'gtk2' 'gksu') + install=ettercap-gtk.install - make DESTDIR=${pkgdir} install + cd "${srcdir}"/${pkgbase}-${_origver}-gtk + install -Dm755 src/ettercap "${pkgdir}"/usr/bin/ettercap-gtk + install -Dm644 "${srcdir}"/ettercap.desktop \ + "${pkgdir}"/usr/share/applications/ettercap.desktop + install -Dm644 desktop/ettercap.xpm \ + "${pkgdir}"/usr/share/pixmaps/ettercap.xpm } diff --git a/extra/ettercap/ettercap-NG-0.7.3_dns_support_on_x86_64.patch b/extra/ettercap/ettercap-NG-0.7.3_dns_support_on_x86_64.patch deleted file mode 100644 index 1754f2e3d..000000000 --- a/extra/ettercap/ettercap-NG-0.7.3_dns_support_on_x86_64.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/configure 2011-08-06 12:50:26.000000000 +0200 -+++ b/configure 2011-08-06 13:01:56.000000000 +0200 -@@ -15732,7 +15732,7 @@ - if ${ac_cv_search_dn_expand+:} false; then : - - else -- ac_cv_search_dn_expand=no -+ ac_cv_search_dn_expand='-lresolv' - fi - rm conftest.$ac_ext - LIBS=$ac_func_search_save_LIBS -@@ -15790,14 +15790,14 @@ - ac_ec_dns=yes - - else -- if false; then -+ if true; then - HAVE_DN_EXPAND_TRUE= - HAVE_DN_EXPAND_FALSE='#' - else - HAVE_DN_EXPAND_TRUE='#' - HAVE_DN_EXPAND_FALSE= - fi -- ac_ec_dns=no -+ ac_ec_dns=yes - fi - - ---- a/src/ec_log.c 2004-09-30 18:01:45.000000000 +0200 -+++ b/src/ec_log.c 2011-08-06 13:04:30.000000000 +0200 -@@ -190,7 +190,7 @@ - if (fd->cfd == NULL) - SEMIFATAL_ERROR("%s", gzerror(fd->cfd, &zerr)); - } else { -- fd->fd = open(filename, O_CREAT | O_TRUNC | O_RDWR | O_BINARY); -+ fd->fd = open(filename, O_CREAT | O_TRUNC | O_RDWR | O_BINARY, 0666); - if (fd->fd == -1) - SEMIFATAL_ERROR("Can't create %s: %s", filename, strerror(errno)); - } diff --git a/extra/ettercap/ettercap-gtk.install b/extra/ettercap/ettercap-gtk.install new file mode 100644 index 000000000..1a05f573e --- /dev/null +++ b/extra/ettercap/ettercap-gtk.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/ettercap/ettercap.desktop b/extra/ettercap/ettercap.desktop new file mode 100644 index 000000000..35261ebf4 --- /dev/null +++ b/extra/ettercap/ettercap.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=ettercap +GenericName=Ettercap +Comment=Multipurpose sniffer/interceptor/logger +Icon=ettercap.xpm +Exec=gksu "/usr/sbin/ettercap --gtk" +Terminal=false +Categories=Application;Network;System;Security;GTK diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD index c9eddff1b..af1b87c8f 100644 --- a/extra/feh/PKGBUILD +++ b/extra/feh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 135645 2011-08-16 22:40:28Z bisson $ +# $Id: PKGBUILD 137062 2011-09-05 19:40:28Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=feh -pkgver=1.15.1 +pkgver=1.16 pkgrel=1 pkgdesc='Fast, lightweight image viewer which uses imlib2' arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ depends=('giblib' 'curl' 'libxinerama') optdepends=('perl: feh-cam, webcam wrapper for feh') makedepends=('libxt') source=("${url}${pkgname}-${pkgver}.tar.bz2") -sha1sums=('0c098f2656b4ad8d178bc57a3692b06045b000ec') +sha1sums=('4793cecb7986335c096bb3c8adf0c364c36d8a34') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/fluidsynth/PKGBUILD b/extra/fluidsynth/PKGBUILD index 650b1689f..3b9d55016 100644 --- a/extra/fluidsynth/PKGBUILD +++ b/extra/fluidsynth/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 134628 2011-08-06 19:12:36Z schiv $ +# $Id: PKGBUILD 137033 2011-09-05 17:19:25Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=fluidsynth -pkgver=1.1.4 +pkgver=1.1.5 pkgrel=1 pkgdesc="A real-time software synthesizer based on the SoundFont 2 specifications" arch=(i686 x86_64 'mips64el') @@ -17,7 +17,7 @@ backup=('etc/conf.d/fluidsynth') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" 'fluidsynth.conf' 'fluidsynthd') -md5sums=('71f297a90d00a253f0f12ceb5d3d661d' +md5sums=('657e49e682b316432a4421dbb0313c3e' '16c5f4d4cbdddc6c5fcbd4fd4cc142f1' 'b296dbfb524c2164f552f68bd9abe2ec') diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD index 45628878a..bae1a0c3c 100644 --- a/extra/gcin/PKGBUILD +++ b/extra/gcin/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 136997 2011-09-05 01:18:48Z bisson $ +# $Id: PKGBUILD 137064 2011-09-05 20:37:32Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=gcin -pkgver=1.6.5 -pkgrel=2 +pkgver=1.6.6 +pkgrel=1 pkgdesc='Input method server supporting various input methods' arch=('i686' 'x86_64' 'mips64el') license=('LGPL') @@ -16,19 +16,23 @@ optdepends=('qt: support for qt4 input method' 'gtk3: support for gtk3 input method' 'anthy: support for anthy input method' 'libchewing: support for chewing input method') -source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.bz2" - 'gtk3-crash.patch' +source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.xz" 'qt4-lib64.patch') -sha1sums=('4ca040981b5a473a8ff70d46e4a92bba39e22405' - '5529884d655cf9c95e7bf5ddced3ffed140bbc20' +sha1sums=('d230f8cd0bd1d16321a49e51e42869fd18c3f399' '4307b0d7d6dc10f15909c94973c4357caf31de7e') install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../qt4-lib64.patch - patch -p1 -i ../gtk3-crash.patch + sed '/include suffixes-rule/a \ + CFLAGS+='"${CFLAGS}"' \ + LDFLAGS+='"${LDFLAGS}"' \ + OPTFLAGS=' \ + -i Makefile + ./configure --prefix=/usr --use_i18n=Y make } diff --git a/extra/gcin/gtk3-crash.patch b/extra/gcin/gtk3-crash.patch deleted file mode 100644 index 17cfa6c2d..000000000 --- a/extra/gcin/gtk3-crash.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur old/gtk3-im/gtkimcontextgcin.c new/gtk3-im/gtkimcontextgcin.c ---- old/gtk3-im/gtkimcontextgcin.c 2011-08-31 09:14:58.000000000 -0700 -+++ new/gtk3-im/gtkimcontextgcin.c 2011-09-04 13:29:58.838065420 -0700 -@@ -127,6 +127,8 @@ - { - GdkWindow *client_window = context_xim->client_window; - GdkScreen *screen = gdk_window_get_screen (client_window); -+ if (screen == NULL) -+ return; - GdkDisplay *display = gdk_screen_get_display (screen); - if (!context_xim->gcin_ch) { - if (!(context_xim->gcin_ch = gcin_im_client_open(GDK_DISPLAY_XDISPLAY(gdk_display_get_default())))) diff --git a/extra/gdb/PKGBUILD b/extra/gdb/PKGBUILD index 86090d46c..13c0207d5 100644 --- a/extra/gdb/PKGBUILD +++ b/extra/gdb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 133976 2011-07-31 04:32:05Z allan $ +# $Id: PKGBUILD 137004 2011-09-05 05:59:05Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gdb -pkgver=7.3 -pkgrel=2 +pkgver=7.3.1 +pkgrel=1 pkgdesc="The GNU Debugger" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/gdb/" @@ -15,7 +15,7 @@ backup=('etc/gdb/gdbinit') options=('!libtool') install=gdb.install source=(http://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.bz2) -md5sums=('485022b8df7ba2221f217e128f479fe7') +md5sums=('b89a5fac359c618dda97b88645ceab47') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/lame/03_lame-ffmpeg.diff b/extra/lame/03_lame-ffmpeg.diff deleted file mode 100644 index a80393517..000000000 --- a/extra/lame/03_lame-ffmpeg.diff +++ /dev/null @@ -1,72 +0,0 @@ ---- lame-3.98.2.orig/libmp3lame/lame.c 2009-07-07 10:52:01.000000000 +0200 -+++ lame-3.98.2/libmp3lame/lame.c 2009-07-07 10:52:03.000000000 +0200 -@@ -1602,6 +1602,13 @@ - /* update mfbuf[] counters */ - gfc->mf_size += n_out; - assert(gfc->mf_size <= MFSIZE); -+ -+ /* lame_encode_flush may have set gfc->mf_sample_to_encode to 0 -+ * so we have to reinitialize it here when that happened. -+ */ -+ if (gfc->mf_samples_to_encode < 1) { -+ gfc->mf_samples_to_encode = ENCDELAY + POSTDELAY; -+ } - gfc->mf_samples_to_encode += n_out; - - -@@ -1931,6 +1938,10 @@ - int frames_left; - int samples_to_encode = gfc->mf_samples_to_encode; - -+ /* Was flush already called? */ -+ if (gfc->mf_samples_to_encode < 1) { -+ return 0; -+ } - memset(buffer, 0, sizeof(buffer)); - mp3count = 0; - -@@ -1942,7 +1953,9 @@ - end_padding += pad_out_samples; - - frames_left = (samples_to_encode + pad_out_samples) / gfp->framesize; -- while (frames_left > 0) { -+ -+ /* send in a frame of 0 padding until all internal sample buffers are flushed */ -+ while (frames_left > 0 && imp3 >= 0) { - int frame_num = gfp->frameNum; - - mp3buffer_size_remaining = mp3buffer_size - mp3count; -@@ -1951,22 +1964,23 @@ - if (mp3buffer_size == 0) - mp3buffer_size_remaining = 0; - -- /* send in a frame of 0 padding until all internal sample buffers -- * are flushed -- */ - imp3 = lame_encode_buffer(gfp, buffer[0], buffer[1], 32, - mp3buffer, mp3buffer_size_remaining); - -- if (frame_num != gfp->frameNum) { -- --frames_left; -- } -- if (imp3 < 0) { -- /* some type of fatal error */ -- return imp3; -- } - mp3buffer += imp3; - mp3count += imp3; -+ frames_left -= (frame_num != gfp->frameNum) ? 1 : 0; - } -+ /* Set gfc->mf_samples_to_encode to 0, so we may detect -+ * and break loops calling it more than once in a row. -+ */ -+ gfc->mf_samples_to_encode = 0; -+ -+ if (imp3 < 0) { -+ /* some type of fatal error */ -+ return imp3; -+ } -+ - mp3buffer_size_remaining = mp3buffer_size - mp3count; - /* if user specifed buffer size = 0, dont check size */ - if (mp3buffer_size == 0) diff --git a/extra/lame/PKGBUILD b/extra/lame/PKGBUILD deleted file mode 100644 index 8ac24d0ac..000000000 --- a/extra/lame/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 80636 2010-05-20 16:06:46Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -# Contributor: Hugo Doria <hugo@archlinux.org> - -pkgname=lame -pkgver=3.98.4 -pkgrel=1 -pkgdesc="An MP3 encoder and graphical frame analyzer" -arch=('i686' 'x86_64' 'mips64el') -url="http://lame.sourceforge.net/" -depends=('ncurses') -makedepends=('nasm') -license=('LGPL') -options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('8e9866ad6b570c6c95c8cba48060473f') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr \ - --enable-nasm \ - --enable-shared - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 -} diff --git a/extra/lame/shared-frontend.patch b/extra/lame/shared-frontend.patch deleted file mode 100644 index e5ae0a95a..000000000 --- a/extra/lame/shared-frontend.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- lame-3.96.1.orig/frontend/Makefile.am 2004-01-21 01:41:36.000000000 -0800 -+++ lame-3.96.1/frontend/Makefile.am 2004-10-03 16:39:12.415901779 -0700 -@@ -50,7 +50,7 @@ - endif - - CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @FRONTEND_CFLAGS@ --LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ -static -+LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ - - INCLUDES = -I$(top_srcdir)/libmp3lame -I$(top_srcdir)/include -I$(top_builddir) - -diff -Naur lame-3.96.1.orig/frontend/Makefile.in lame-3.96.1/frontend/Makefile.in ---- lame-3.96.1.orig/frontend/Makefile.in 2004-01-21 05:50:29.000000000 -0800 -+++ lame-3.96.1/frontend/Makefile.in 2004-10-03 16:39:19.711701553 -0700 -@@ -91,7 +91,7 @@ - $(top_builddir)/libmp3lame/libmp3lame.la \ - @FRONTEND_LDADD@ - --LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ -static -+LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ - LIBTOOL = @LIBTOOL@ diff --git a/extra/libgda/PKGBUILD b/extra/libgda/PKGBUILD index 41b3a0f71..14f5e74b9 100644 --- a/extra/libgda/PKGBUILD +++ b/extra/libgda/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 123051 2011-05-07 19:17:52Z ibiru $ +# $Id: PKGBUILD 137050 2011-09-05 18:18:33Z ibiru $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=libgda -pkgver=4.2.7 +pkgver=4.2.9 pkgrel=1 pkgdesc="Data abstraction layer with mysql, pgsql, xml, sqlite providers" arch=(i686 x86_64 'mips64el') @@ -15,8 +15,8 @@ makedepends=('intltool' 'gobject-introspection' 'namcap') options=('!libtool') url="http://www.gnome-db.org" install=libgda.install -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('0c95d2ae4563bbb024c9179a20e95a4b544a7d4fc687ca79ac6b33c5adc113d5') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('bbae913734b0bf0149b36d1b8617e343f08611c10219fa5ba24b84dfa782e814') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/librsvg/PKGBUILD b/extra/librsvg/PKGBUILD index ddc574aa9..cc6d9e2dc 100644 --- a/extra/librsvg/PKGBUILD +++ b/extra/librsvg/PKGBUILD @@ -1,20 +1,19 @@ -# $Id: PKGBUILD 117525 2011-04-04 10:15:22Z ibiru $ +# $Id: PKGBUILD 137295 2011-09-06 22:08:52Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=librsvg -pkgver=2.34.0 +pkgver=2.34.1 pkgrel=1 pkgdesc="SAX-based renderer for SVG files into a GdkPixbuf" arch=(i686 x86_64 'mips64el') license=('LGPL') depends=('gdk-pixbuf2' 'pango' 'libcroco') makedepends=('intltool') -optdepends=('python2: rsvg commandline utility') options=('!libtool' '!emptydirs') url="http://librsvg.sourceforge.net/" install=librsvg.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.34/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('9d2111e086dcffd12466f48ab1ca088654011684c499a4cc4676da918290f3cd') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.34/${pkgname}-${pkgver}.tar.xz) +sha256sums=('4f2ab987eed2943b5a0ce3dde1672d2bc87123bee66d885dd7307eb7ede756db') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libssh2/PKGBUILD b/extra/libssh2/PKGBUILD index 00a2d0872..50eb290ec 100644 --- a/extra/libssh2/PKGBUILD +++ b/extra/libssh2/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 136215 2011-08-24 15:37:17Z angvp $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> +# $Id: PKGBUILD 137230 2011-09-06 21:12:10Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: ice-man <icemanf@gmail.com> pkgname=libssh2 -pkgver=1.2.9 +pkgver=1.3.0 pkgrel=1 pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts" url="http://www.libssh2.org/" @@ -14,17 +15,19 @@ license=('BSD') depends=('openssl') makedepends=('zlib') options=('!libtool') -source=("http://www.libssh2.org/download/${pkgname}-${pkgver}.tar.gz") -md5sums=('62ea143c41c6ed437a55d6a0b0579f2f') +source=("http://www.libssh2.org/download/$pkgname-$pkgver.tar.gz"{,.asc}) +md5sums=('6425331899ccf1015f1ed79448cb4709' + '6ddcc9f2b37941f8291d7494ee8f89b7') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/extra/libxml++/PKGBUILD b/extra/libxml++/PKGBUILD index 5f860c6c5..6d4dc8db8 100644 --- a/extra/libxml++/PKGBUILD +++ b/extra/libxml++/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 120095 2011-04-19 21:39:40Z ibiru $ +# $Id: PKGBUILD 137178 2011-09-06 09:14:31Z ibiru $ # Maintainer: damir <damir@archlinux.org> pkgbase=libxml++ pkgname=('libxml++' 'libxml++-docs') -pkgver=2.34.1 +pkgver=2.34.2 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') url="http://libxmlplusplus.sourceforge.net/" makedepends=('pkgconfig' 'glibmm-docs' 'libxml2' 'glibmm') options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.34/${pkgbase}-${pkgver}.tar.bz2) -sha256sums=('664f3636c425554bf5e7d1b60253244e2d723899be8a971fc54332148bfce040') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.34/${pkgbase}-${pkgver}.tar.xz) +sha256sums=('77daba20ab76631071d4ed4cc18fa2e981160ca05ae661e8d146f2b0728f9baa') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/licq/PKGBUILD b/extra/licq/PKGBUILD index 2c2104b33..3b2767f66 100644 --- a/extra/licq/PKGBUILD +++ b/extra/licq/PKGBUILD @@ -1,33 +1,40 @@ -# $Id: PKGBUILD 81727 2010-06-02 13:16:13Z juergen $ +# $Id: PKGBUILD 137082 2011-09-06 03:22:00Z eric $ # Maintainer: Juergen Hoetzel <juergen@archlinux.org> pkgname=licq -pkgver=1.3.9 +pkgver=1.5.1 pkgrel=1 pkgdesc="Advanced graphical ICQ clone and more for Unix" arch=('i686' 'x86_64' 'mips64el') url="http://www.licq.org" license=('GPL') -depends=('libxss' 'qt' 'openssl' 'boost') -makedepends=('cmake') -options=(!libtool) +depends=('libxss' 'qt' 'openssl') +makedepends=('cmake' 'boost') +options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/licq/licq-${pkgver}.tar.bz2) -md5sums=('5285efd538fc5540cc85bc8979b8efae') +md5sums=('7dbf9f4f190fdae4c34ab6edefb34997') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" + # licq - GPGME_CONFIG=/bin/false ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR=${pkgdir} install || return 1 + mkdir build + cd build + cmake -DCMAKE_INSTALL_PREFIX=/usr .. + make # qt4-gui - cd plugins/qt4-gui || return 1 + cd ../plugins/qt4-gui mkdir build cd build + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_MODULE_PATH="${srcdir}/${pkgname}-${pkgver}/cmake" .. + make +} - cmake -DWITH_KDE=OFF -DCMAKE_INSTALL_PREFIX=/usr .. || return 1 +package() { + cd "${srcdir}/${pkgname}-${pkgver}/build" + make DESTDIR="${pkgdir}" install - make || return 1 - make DESTDIR=${pkgdir} install || return 1 + cd ../plugins/qt4-gui/build + make DESTDIR="${pkgdir}" install } diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD index 575436cf9..adab6db53 100644 --- a/extra/maxima/PKGBUILD +++ b/extra/maxima/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 135557 2011-08-15 13:18:59Z dreisner $ +# $Id: PKGBUILD 137078 2011-09-05 23:07:50Z dreisner $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir@archlinux.org> pkgname=maxima pkgver=5.24.0 -pkgrel=5 +pkgrel=6 pkgdesc="Maxima - a sophisticated computer algebra system" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -12,7 +12,7 @@ url="http://maxima.sourceforge.net" if [ "${CARCH}" == "mips64el" ] ; then depends=('clisp' 'texinfo' 'sh') else - depends=('sbcl=1.0.50' 'texinfo' 'sh') + depends=('sbcl=1.0.51' 'texinfo' 'sh') fi makedepends=('python2') optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface') diff --git a/extra/mpd/mpd-0.16.3_ffmpeg_sigsegv.patch b/extra/mpd/mpd-0.16.3_ffmpeg_sigsegv.patch deleted file mode 100644 index a945a0a6a..000000000 --- a/extra/mpd/mpd-0.16.3_ffmpeg_sigsegv.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ur mpd-0.16.3.orig/src/decoder/ffmpeg_decoder_plugin.c mpd-0.16.3/src/decoder/ffmpeg_decoder_plugin.c ---- mpd-0.16.3.orig/src/decoder/ffmpeg_decoder_plugin.c 2011-06-04 17:36:33.000000000 +0300 -+++ mpd-0.16.3/src/decoder/ffmpeg_decoder_plugin.c 2011-06-24 18:18:51.840218251 +0300 -@@ -321,7 +321,7 @@ - } - - //ffmpeg works with ours "fileops" helper -- AVFormatContext *format_context; -+ AVFormatContext *format_context = NULL; - if (av_open_input_stream(&format_context, stream->io, input->uri, - input_format, NULL) != 0) { - g_warning("Open failed\n"); -@@ -470,7 +470,7 @@ - if (stream == NULL) - return NULL; - -- AVFormatContext *f; -+ AVFormatContext *f = NULL; - if (av_open_input_stream(&f, stream->io, is->uri, - input_format, NULL) != 0) { - mpd_ffmpeg_stream_close(stream); diff --git a/extra/oprofile/PKGBUILD b/extra/oprofile/PKGBUILD index 52adcf953..e5004d6ca 100644 --- a/extra/oprofile/PKGBUILD +++ b/extra/oprofile/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 135638 2011-08-16 21:35:38Z eric $ +# $Id: PKGBUILD 137218 2011-09-06 19:49:42Z eric $ # Maintainer : Aaron Griffin <aaron@archlinux.org> pkgname=oprofile pkgver=0.9.7 -pkgrel=1 +pkgrel=2 pkgdesc="A system-wide profiler for Linux systems, capable of profiling all running code at low overhead" arch=('i686' 'x86_64' 'mips64el') url="http://oprofile.sourceforge.net" @@ -26,6 +26,7 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install + install -d "$pkgdir/var/lib/oprofile" # installing development libraries - FS#20089 install -m644 libutil/op_types.h libop/op_sample_file.h libutil/op_list.h libop/op_events.h libop/op_cpu_type.h libop/op_config.h libdb/odb.h "$pkgdir/usr/include" diff --git a/extra/oprofile/oprofile.install b/extra/oprofile/oprofile.install index 025c9725a..5cd3e7e22 100644 --- a/extra/oprofile/oprofile.install +++ b/extra/oprofile/oprofile.install @@ -1,11 +1,14 @@ post_install(){ groupadd -g 492 oprofile &>/dev/null - useradd -u 492 -g oprofile -s /bin/false oprofile &>/dev/null + useradd -u 492 -g oprofile -d /var/lib/oprofile -s /bin/false oprofile &>/dev/null } post_upgrade(){ getent group oprofile >/dev/null 2>&1 || groupadd -g 492 oprofile &>/dev/null - getent passwd oprofile >/dev/null 2>&1 || useradd -u 492 -g oprofile -s /bin/false oprofile &>/dev/null + getent passwd oprofile >/dev/null 2>&1 || useradd -u 492 -g oprofile -d /var/lib/oprofile -s /bin/false oprofile &>/dev/null + if [ "$(vercmp $2 0.9.7-2)" -lt 0 ] ; then + usermod -d /var/lib/oprofile oprofile + fi } post_remove(){ diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD index 948c3f4eb..a29eaba92 100644 --- a/extra/python/PKGBUILD +++ b/extra/python/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 131166 2011-07-11 13:06:25Z stephane $ +# $Id: PKGBUILD 136999 2011-09-05 05:47:36Z allan $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=python -pkgver=3.2.1 +pkgver=3.2.2 pkgrel=1 _pybasever=3.2 pkgdesc="Next generation of the python high-level scripting language" @@ -20,7 +20,7 @@ provides=('python3') replaces=('python3') options=('!makeflags') source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz) -sha1sums=('ab5cf4a4c21abe590dea87473a1dee6820699d79') +sha1sums=('5e654dbd48476193ccdef4d604ed4f45b48c6769') build() { cd "${srcdir}/Python-${pkgver}" diff --git a/extra/rcs/PKGBUILD b/extra/rcs/PKGBUILD index ae1b2123b..63d22a943 100644 --- a/extra/rcs/PKGBUILD +++ b/extra/rcs/PKGBUILD @@ -1,31 +1,29 @@ -# $Id: PKGBUILD 127635 2011-06-17 10:04:08Z bisson $ +# $Id: PKGBUILD 137009 2011-09-05 07:46:17Z bisson $ # Contributor: dorphell <dorphell@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=rcs -pkgver=5.7 -pkgrel=6 -pkgdesc='Revision Control System' +pkgver=5.8 +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') -url="http://www.cs.purdue.edu/homes/trinkle/RCS/" -license=('GPL') -source=("http://www.cs.purdue.edu/homes/trinkle/RCS/rcs-${pkgver}.tar.Z" \ - 'path.patch') -sha1sums=('976774bda26a7743b8375797f92fbd18e51ac7a2' - '0f0be997e5d018e0d638b5f16430423ccb3774be') +source=("http://ftpmirror.gnu.org/${pkgname}/${pkgname}-${pkgver}.tar.gz") +sha1sums=('6ba0c3ea2d170990214a26b323feaadb89bb4206') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../path.patch ./configure --prefix=/usr make } -package() { +check() { cd "${srcdir}/${pkgname}-${pkgver}" - make install \ - prefix="${pkgdir}"/usr \ - man1dir="${pkgdir}"/usr/share/man/man1 \ - man5dir="${pkgdir}"/usr/share/man/man5 \ + make check +} +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make prefix="${pkgdir}/usr" install } diff --git a/extra/rcs/path.patch b/extra/rcs/path.patch deleted file mode 100644 index 0f062b357..000000000 --- a/extra/rcs/path.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -Naur rcs-5.7-orig/src/conf.heg rcs-5.7/src/conf.heg ---- rcs-5.7-orig/src/conf.heg 1995-06-02 11:19:00.000000000 -0700 -+++ rcs-5.7/src/conf.heg 2004-11-29 12:41:37.000000000 -0800 -@@ -210,10 +210,10 @@ - /* Do struct stat s and t describe the same file? Answer d if unknown. */ - #define same_file(s,t,d) ((s).st_ino==(t).st_ino && (s).st_dev==(t).st_dev) - #define has_utimbuf 1 /* Does struct utimbuf work? */ --#define CO "/usr/local/bin/co" /* name of 'co' program */ -+#define CO "/usr/bin/co" /* name of 'co' program */ - #define COMPAT2 0 /* Are version 2 files supported? */ --#define DIFF "/usr/local/bin/diff" /* name of 'diff' program */ --#define DIFF3 "/usr/local/bin/diff3" /* name of 'diff3' program */ -+#define DIFF "/usr/bin/diff" /* name of 'diff' program */ -+#define DIFF3 "/usr/bin/diff3" /* name of 'diff3' program */ - #define DIFF3_BIN 1 /* Is diff3 user-visible (not the /usr/lib auxiliary)? */ - #define DIFFFLAGS "-an" /* Make diff output suitable for RCS. */ - #define DIFF_L 1 /* Does diff -L work? */ -@@ -221,7 +221,7 @@ - #define DIFF_FAILURE 1 /* DIFF status if differences are found */ - #define DIFF_TROUBLE 2 /* DIFF status if trouble */ - #define ED "/bin/ed" /* name of 'ed' program (used only if !DIFF3_BIN) */ --#define MERGE "/usr/local/bin/merge" /* name of 'merge' program */ -+#define MERGE "/usr/bin/merge" /* name of 'merge' program */ - #define TMPDIR "/tmp" /* default directory for temporary files */ - #define SLASH '/' /* principal filename separator */ - #define SLASHes '/' /* `case SLASHes:' labels all filename separators */ -diff -Naur rcs-5.7-orig/src/conf.sh rcs-5.7/src/conf.sh ---- rcs-5.7-orig/src/conf.sh 1995-06-15 23:19:24.000000000 -0700 -+++ rcs-5.7/src/conf.sh 2004-11-29 12:42:28.000000000 -0800 -@@ -32,7 +32,7 @@ - # and can be inspected for clues otherwise. - - # The Makefile overrides the following defaults. --: ${RCSPREFIX=/usr/local/bin/} -+: ${RCSPREFIX=/usr/bin/} - : ${ALL_CFLAGS=-Dhas_conf_h} - : ${CC=cc} - : ${COMPAT2=0} -@@ -42,8 +42,8 @@ - : ${DIFFFLAGS=-an} - : ${DIFF_L=1} - : ${DIFF_SUCCESS=0} ${DIFF_FAILURE=1} ${DIFF_TROUBLE=2} --: ${ED=/bin/ed} --: ${SENDMAIL='"/usr/lib/sendmail"'} -+: ${ED=/usr/bin/ed} -+: ${SENDMAIL='"/usr/sbin/sendmail"'} - # : ${LDFLAGS=} ${LIBS=} tickles old shell bug - - C="$CC $ALL_CFLAGS" -@@ -73,17 +73,6 @@ - ech='echo -n' dots='... ' - esac - --$ech >&3 "$0: testing permissions $dots" --rm -f a.d && --date >a.d && --chmod 0 a.d && --{ test -w a.d || cp /dev/null a.d 2>/dev/null; } && { -- echo >&3 "$n$0: This command should not be run with superuser permissions." -- exit 1 --} --echo >&3 OK --rm -f a.d || exit -- - $ech >&3 "$0: testing compiler for plausibility $dots" - echo 'main() { return 0; }' >a.c - rm -f a.exe a.out || exit diff --git a/extra/sbcl/0001-Fix-version-string-parsing-for-Linux-3.0.patch b/extra/sbcl/0001-Fix-version-string-parsing-for-Linux-3.0.patch deleted file mode 100644 index fe5a807ee..000000000 --- a/extra/sbcl/0001-Fix-version-string-parsing-for-Linux-3.0.patch +++ /dev/null @@ -1,43 +0,0 @@ -From b43c51beeb0569a38900e1e5a78606711f987742 Mon Sep 17 00:00:00 2001 -From: Paul Khuong <pvk@pvk.ca> -Date: Wed, 3 Aug 2011 10:20:41 -0400 -Subject: [PATCH] Fix version string parsing for Linux 3.0 - - Stop assuming the presence of minor and patch version numbers; missing - values are defaulted to 0 (e.g. 3.0.0). - - Reported by a few people on IRC. ---- - src/runtime/linux-os.c | 14 ++++++++++---- - 1 files changed, 10 insertions(+), 4 deletions(-) - -diff --git a/src/runtime/linux-os.c b/src/runtime/linux-os.c -index db72fa6..e262f41 100644 ---- a/src/runtime/linux-os.c -+++ b/src/runtime/linux-os.c -@@ -198,12 +198,18 @@ os_init(char *argv[], char *envp[]) - int patch_version; - char *p; - uname(&name); -+ - p=name.release; - major_version = atoi(p); -- p=strchr(p,'.')+1; -- minor_version = atoi(p); -- p=strchr(p,'.')+1; -- patch_version = atoi(p); -+ minor_version = patch_version = 0; -+ p=strchr(p,'.'); -+ if (p != NULL) { -+ minor_version = atoi(++p); -+ p=strchr(p,'.'); -+ if (p != NULL) -+ patch_version = atoi(++p); -+ } -+ - if (major_version<2) { - lose("linux kernel version too old: major version=%d (can't run in version < 2.0.0)\n", - major_version); --- -1.7.6 - diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD index c1e659b61..7fd330474 100644 --- a/extra/sbcl/PKGBUILD +++ b/extra/sbcl/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 135444 2011-08-13 20:11:24Z dreisner $ +# $Id: PKGBUILD 137076 2011-09-05 23:05:51Z dreisner $ # 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.0.50 -pkgrel=2 +pkgver=1.0.51 +pkgrel=1 pkgdesc="Steel Bank Common Lisp" url="http://www.sbcl.org/" arch=('i686' 'x86_64' 'mips64el') @@ -16,18 +16,13 @@ provides=('common-lisp' 'cl-asdf') makedepends=('sbcl' 'texinfo') [ "$CARCH" = "mips64el" ] && \ makedepends=('clisp' 'texinfo') -source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2" "arch-fixes.lisp" - "mips-arch.h.diff") -md5sums=('74ce9b24516885d066ec4287cde52e8c' - '7ac0c1936547f4278198b8bf7725204d' - 'a456535d65d6c5b85b1b646f11455fce') install=sbcl.install source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2" "arch-fixes.lisp" - "0001-Fix-version-string-parsing-for-Linux-3.0.patch") -md5sums=('74ce9b24516885d066ec4287cde52e8c' + "mips-arch.h.diff") +md5sums=('08032cc777f1236953cb901e24775457' '7ac0c1936547f4278198b8bf7725204d' - '7af58d1de2d788ad6a8d82c89279a75f') + 'a456535d65d6c5b85b1b646f11455fce') build() { cd "$srcdir/$pkgname-$pkgver" @@ -39,7 +34,7 @@ build() { export LINKFLAGS="$LDFLAGS" unset LDFLAGS - # Make a multi-threaded SBCL, disable LARGEFILE + # Make a multi-threaded SBCL, disable LARGEFILE cat >customize-target-features.lisp <<EOF (lambda (features) (flet ((enable (x) (pushnew x features)) @@ -48,16 +43,11 @@ build() { (disable :largefile))) EOF - # fix build against 3.0-ARCH - patch -Np1 < "$srcdir/0001-Fix-version-string-parsing-for-Linux-3.0.patch" - patch -Nup1 < "${srcdir}/mips-arch.h.diff" - if [ "$CARCH" = "mips64el" ]; then sh make.sh clisp else sh make.sh sbcl fi - make -C doc/manual info } diff --git a/extra/scim/PKGBUILD b/extra/scim/PKGBUILD index 7e5ad4220..e8a4224f7 100644 --- a/extra/scim/PKGBUILD +++ b/extra/scim/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 134853 2011-08-08 03:28:47Z bisson $ +# $Id: PKGBUILD 137306 2011-09-06 22:52:36Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Gan Lu <rhythm.gan@gmail.com> pkgname=scim pkgver=1.4.11 -pkgrel=1 +pkgrel=2 pkgdesc='Input method user interface and development platform' url='http://www.scim-im.org/projects/scim' license=('GPL') @@ -14,16 +14,13 @@ options=('!libtool') makedepends=('intltool') depends=('gtk2' 'libtool') backup=('etc/scim/config' 'etc/scim/global') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" - 'wtf.patch') -sha1sums=('dd93094f62e5707db88d4f0e7ebd3392ae75b942' - '14d2be6c8f9f4af6494c3e806d3cadef5803597a') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") +sha1sums=('e202e42df52f5c9a88f6ae4d4ce04f94bc22e27c') install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../wtf.patch # revert broken commit 303 ./bootstrap ./configure \ diff --git a/extra/scim/wtf.patch b/extra/scim/wtf.patch deleted file mode 100644 index c0e5ab078..000000000 --- a/extra/scim/wtf.patch +++ /dev/null @@ -1,93 +0,0 @@ -diff -aur old/extras/panel/scim_panel_gtk.cpp new/extras/panel/scim_panel_gtk.cpp ---- old/extras/panel/scim_panel_gtk.cpp 2011-08-04 13:21:29.000000000 -0700 -+++ new/extras/panel/scim_panel_gtk.cpp 2011-08-07 16:11:12.977663776 -0700 -@@ -479,12 +479,12 @@ - - static bool _should_exit = false; - -+static bool _panel_is_on = false; - --static struct timeval _last_menu_deactivate_time = {0, 0}; -+static GThread *_panel_agent_thread = 0; -+ -+static PanelAgent *_panel_agent = 0; - --// client repository --static PropertyRepository _frontend_property_repository; --static HelperPropertyRepository _helper_property_repository; - static std::vector<String> _factory_menu_uuids; - - static std::list<String> _recent_factory_uuids; -@@ -1187,16 +1187,16 @@ - - GtkRequisition ws; - gint pos_x, pos_y; -+ -+ gtk_widget_size_request (_toolbar_window, &ws); -+ -+ pos_x = _config->read (String (SCIM_CONFIG_PANEL_GTK_TOOLBAR_POS_X), - workarea_x + workarea_width - ws.width); - pos_y = _config->read (String (SCIM_CONFIG_PANEL_GTK_TOOLBAR_POS_Y), - workarea_y + workarea_height - ws.height); - if (pos_x == -1 && pos_y == -1) { - pos_x = workarea_x + workarea_width - ws.width; - pos_y = workarea_y + workarea_height - ws.height; -- workarea_y + workarea_height - ws.height); -- if (pos_x == -1 && pos_y == -1) { -- pos_x = workarea_x + workarea_width - ws.width; -- pos_y = workarea_y + workarea_height - ws.height; - } - - if (_toolbar_auto_snap) { -@@ -1215,6 +1215,10 @@ - else if (pos_y < 0) - pos_y = 0; - -+ if (_toolbar_window_x != pos_x || _toolbar_window_y != pos_y || force) { -+ gtk_window_move (GTK_WINDOW (_toolbar_window), pos_x, pos_y); -+ _toolbar_window_x = pos_x; -+ _toolbar_window_y = pos_y; - } - } - -@@ -1227,9 +1231,9 @@ - #endif - return gdk_screen_width (); - } -- return gdk_screen_get_width (_current_screen); --#endif -- return gdk_screen_width (); -+ -+static int -+ui_screen_height (void) - { - #if GDK_MULTIHEAD_SAFE - if (_current_screen) -@@ -1237,10 +1241,6 @@ - #endif - return gdk_screen_height (); - } -- return gdk_screen_get_height (_current_screen); --#endif -- return gdk_screen_height (); --} - - static void - ui_get_workarea (int &x, int &y, int &width, int &height) -@@ -1929,11 +1929,11 @@ - static gulong motion_handler; - GdkCursor *cursor; - -- if (!_config.null () && -- (_toolbar_window_x != pos_x || _toolbar_window_y != pos_y)) { -- _config->write ( -- SCIM_CONFIG_PANEL_GTK_TOOLBAR_POS_X, pos_x); -- _config->write ( -+ if (click_type == 0 && event->button <= 1) { -+ if (_toolbar_window_draging) -+ return FALSE; -+ -+ // Connection pointer motion handler to this window. - motion_handler = g_signal_connect (G_OBJECT (window), "motion-notify-event", - G_CALLBACK (ui_toolbar_window_motion_cb), - NULL); diff --git a/extra/sdl/PKGBUILD b/extra/sdl/PKGBUILD deleted file mode 100644 index daaf7073f..000000000 --- a/extra/sdl/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 135310 2011-08-12 14:45:48Z ibiru $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: dorphell <dorphell@archlinux.org> - -pkgname=sdl -pkgver=1.2.14 -pkgrel=7 -pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.libsdl.org" -license=('LGPL') -depends=('glibc' 'libxext' 'libxrender' 'libx11') -makedepends=('alsa-lib' 'mesa' 'libpulse') -options=('!libtool') -source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz - sdl-1.2.14-joystick-crash.diff - sdl-1.2.14-fix-mouse-clicking.patch - sdl-1.2.14-fix-disappearing-cursor.patch) -md5sums=('e52086d1b508fa0b76c52ee30b55bec4' - '9d8890b3817736a5d365f7497f096634' - '04d8c179f125e04bcd4c9d60e013c2d7' - 'a6cf3e71b653aa97d0d8ae6c0a789807') - -build() { - cd ${srcdir}/SDL-${pkgver} - patch -Np1 -i $srcdir/sdl-1.2.14-joystick-crash.diff - patch -Np1 -i $srcdir/sdl-1.2.14-fix-mouse-clicking.patch - patch -Np1 -i $srcdir/sdl-1.2.14-fix-disappearing-cursor.patch - ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \ - --with-x --disable-rpath - make -} - -package() { - cd ${srcdir}/SDL-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/extra/sdl/sdl-1.2.14-fix-disappearing-cursor.patch b/extra/sdl/sdl-1.2.14-fix-disappearing-cursor.patch deleted file mode 100644 index fcd3c314d..000000000 --- a/extra/sdl/sdl-1.2.14-fix-disappearing-cursor.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: SDL-1.2.14/src/video/x11/SDL_x11events.c -=================================================================== ---- SDL-1.2.14.orig/src/video/x11/SDL_x11events.c 2010-04-30 09:16:35.000000000 -0400 -+++ SDL-1.2.14/src/video/x11/SDL_x11events.c 2010-04-30 09:16:35.000000000 -0400 -@@ -444,8 +444,10 @@ - if ( xevent.xcrossing.mode == NotifyUngrab ) - printf("Mode: NotifyUngrab\n"); - #endif -- if ( xevent.xcrossing.detail != NotifyInferior ) { -- if ( this->input_grab == SDL_GRAB_OFF ) { -+ if ( (xevent.xcrossing.mode != NotifyGrab) && -+ (xevent.xcrossing.mode != NotifyUngrab) && -+ (xevent.xcrossing.detail != NotifyInferior) ) { -+ if ( this->input_grab == SDL_GRAB_OFF ) { - posted = SDL_PrivateAppActive(0, SDL_APPMOUSEFOCUS); - } else { - posted = SDL_PrivateMouseMotion(0, 0, diff --git a/extra/sdl/sdl-1.2.14-fix-mouse-clicking.patch b/extra/sdl/sdl-1.2.14-fix-mouse-clicking.patch deleted file mode 100644 index 7d3e5acfc..000000000 --- a/extra/sdl/sdl-1.2.14-fix-mouse-clicking.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- SDL-1.2.14/src/video/x11/SDL_x11events.c.orig 2010-04-08 11:57:05.003169834 -0700 -+++ SDL-1.2.14/src/video/x11/SDL_x11events.c 2010-04-08 12:33:51.690926340 -0700 -@@ -423,12 +423,15 @@ - if ( xevent.xcrossing.mode == NotifyUngrab ) - printf("Mode: NotifyUngrab\n"); - #endif -- if ( this->input_grab == SDL_GRAB_OFF ) { -- posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS); -+ if ( (xevent.xcrossing.mode != NotifyGrab) && -+ (xevent.xcrossing.mode != NotifyUngrab) ) { -+ if ( this->input_grab == SDL_GRAB_OFF ) { -+ posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS); -+ } -+ posted = SDL_PrivateMouseMotion(0, 0, -+ xevent.xcrossing.x, -+ xevent.xcrossing.y); - } -- posted = SDL_PrivateMouseMotion(0, 0, -- xevent.xcrossing.x, -- xevent.xcrossing.y); - } - break; - diff --git a/extra/sdl/sdl-1.2.14-joystick-crash.diff b/extra/sdl/sdl-1.2.14-joystick-crash.diff deleted file mode 100644 index 949e18b96..000000000 --- a/extra/sdl/sdl-1.2.14-joystick-crash.diff +++ /dev/null @@ -1,14 +0,0 @@ -Description: Fix crash with joystick detection. -Index: libsdl1.2-1.2.14/src/joystick/linux/SDL_sysjoystick.c -=================================================================== ---- libsdl1.2-1.2.14.orig/src/joystick/linux/SDL_sysjoystick.c 2010-01-12 12:37:36.000000000 -0500 -+++ libsdl1.2-1.2.14/src/joystick/linux/SDL_sysjoystick.c 2010-01-12 12:38:27.000000000 -0500 -@@ -700,7 +700,7 @@ - continue; - } - if ( test_bit(i, absbit) ) { -- int values[5]; -+ int values[6]; - - if ( ioctl(fd, EVIOCGABS(i), values) < 0 ) - continue; diff --git a/extra/telepathy-mission-control/PKGBUILD b/extra/telepathy-mission-control/PKGBUILD index d7d3b6b79..c5d1f2a43 100644 --- a/extra/telepathy-mission-control/PKGBUILD +++ b/extra/telepathy-mission-control/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 132301 2011-07-22 16:07:21Z ibiru $ +# $Id: PKGBUILD 137223 2011-09-06 20:13:49Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Ju Liu <liuju86 at gmail dot com> # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> # Contributor: Andreas Zwinkau <beza1e1@web.de> pkgname=telepathy-mission-control -pkgver=5.8.0 +pkgver=5.8.1 pkgrel=1 pkgdesc="A Telepathy component providing abstraction of some of the details of connection managers." arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ depends=('telepathy-glib' 'libgnome-keyring') makedepends=('libxslt' 'python2') options=('!libtool') source=(http://telepathy.freedesktop.org/releases/telepathy-mission-control/$pkgname-$pkgver.tar.gz) -md5sums=('a708767687a6515058ee1a3654eda5c1') +md5sums=('91c616e082c6326087ec5236beef67ae') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/unzip/PKGBUILD b/extra/unzip/PKGBUILD deleted file mode 100644 index 645f9facc..000000000 --- a/extra/unzip/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 70615 2010-02-27 15:46:11Z thayer $ -# Maintainer: Thayer Williams <thayer@archlinux.org> -# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> -# Contributor: Robson Peixoto - -pkgname=unzip -pkgver=6.0 -pkgrel=5 -pkgdesc="Unpacks .zip archives such as those made by PKZIP" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.info-zip.org/" -license=('custom') -depends=('bzip2' 'bash') -source=('http://downloads.sourceforge.net/infozip/unzip60.tar.gz') -md5sums=('62b490407489521db863b523a7f86375') - -build() { - cd ${srcdir}/${pkgname}${pkgver/./} - - # set CFLAGS -- from Debian - export CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DACORN_FTYPE_NFS \ - -DWILD_STOP_AT_DIR -DLARGE_FILE_SUPPORT -DUNICODE_SUPPORT \ - -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DNO_LCHMOD -DDATE_FORMAT=DF_YMD \ - -DUSE_BZIP2 -DNATIVE" - - # make -- from Debian - make -f unix/Makefile LOCAL_UNZIP="$CFLAGS" prefix=/usr LF2="" \ - D_USE_BZ2=-DUSE_BZIP2 L_BZ2=-lbz2 unzips || return 1 - - # install -- from Debian - make -f unix/Makefile prefix=${pkgdir}/usr INSTALL_PROGRAM="install" install || return 1 - - # install the license file - install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/unzip/LICENSE || return 1 - - # fix manpage location - mkdir -p ${pkgdir}/usr/share || return 1 - mv ${pkgdir}/usr/man ${pkgdir}/usr/share/ || return 1 -} - diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index ccb3b441f..a22ceb648 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 136823 2011-09-01 21:33:21Z eric $ +# $Id: PKGBUILD 137072 2011-09-05 21:46:27Z eric $ # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Maintainer: tobias [ tobias at archlinux org ] # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> @@ -6,9 +6,9 @@ pkgbase=vim pkgname=('vim' 'gvim' 'vim-runtime') _topver=7.3 -_patchlevel=289 +_patchlevel=294 pkgver=${_topver}.${_patchlevel} -__hgrev=ba9f075a347d +__hgrev=9c96fb7330b5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('custom:vim') @@ -97,7 +97,7 @@ build() { package_vim() { pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor' - depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'perl') + depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm') conflicts=('gvim') cd "${srcdir}"/vim-build |