[arch-commits] Commit in gajim/trunk (PKGBUILD)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 07:44:24
  Author: ibiru
Revision: 84669

upgpkg: gajim 0.13.4-2
cleanup dependency. FS##20014

Modified:
  gajim/trunk/PKGBUILD

--+
 PKGBUILD |   22 ++
 1 file changed, 14 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-07-03 05:43:05 UTC (rev 84668)
+++ PKGBUILD2010-07-03 11:44:24 UTC (rev 84669)
@@ -5,14 +5,20 @@
 
 pkgname=gajim
 pkgver=0.13.4
-pkgrel=1
+pkgrel=2
 pkgdesc=Jabber client written in PyGTK
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url=http://www.gajim.org/;
 license=('GPL3')
-depends=('gtkspell' 'sqlite3' 'dnsutils' 'pygtk' 'libxss' 'python=2.6')
-makedepends=('gettext' 'intltool' 'dbus')
-optdepends=('dbus-python' 'pyopenssl' 'notification-daemon: for desktop 
notification')
+depends=('pygtk' 'python')
+makedepends=('gettext' 'intltool')
+optdepends=('dbus-python'
+'pyopenssl: for secure SSL/TLS.'
+'notification-daemon: for desktop notification'
+'dnsutils: for SRV support'
+'libxss: for idle module'
+'gtkspell:spelling support'
+'gnome-python-desktop: for GnomeKeyring support')
 options=(!libtool)
 source=(http://www.gajim.org/downloads/0.13/gajim-${pkgver}.tar.gz)
 sha256sums=('d5f74da5bb6fe667e5c0ef074099d2192b4e0b53f829736628ffaac56b6ced70')
@@ -20,8 +26,8 @@
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  ./configure --prefix=/usr
+  make
+  make DESTDIR=${pkgdir} install
   find ${pkgdir}/usr/share/gajim/ -name *.pyo | xargs rm -rf
 }



[arch-commits] Commit in gajim/repos (extra-i686)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 07:45:10
  Author: ibiru
Revision: 84670

archrelease: remove extra-i686

Deleted:
  gajim/repos/extra-i686/



[arch-commits] Commit in gajim/repos (extra-i686)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 07:45:25
  Author: ibiru
Revision: 84671

archrelease: copy trunk to extra-i686

Added:
  gajim/repos/extra-i686/



[arch-commits] Commit in gajim/repos (extra-x86_64)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 07:45:59
  Author: ibiru
Revision: 84672

archrelease: remove extra-x86_64

Deleted:
  gajim/repos/extra-x86_64/



[arch-commits] Commit in gajim/repos (extra-x86_64)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 07:46:15
  Author: ibiru
Revision: 84673

archrelease: copy trunk to extra-x86_64

Added:
  gajim/repos/extra-x86_64/



[arch-commits] Commit in libtorrent-rasterbar/trunk (PKGBUILD)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 10:54:56
  Author: ibiru
Revision: 84674

upgpkg: libtorrent-rasterbar 0.15.1-1 update to 0.15.1

Modified:
  libtorrent-rasterbar/trunk/PKGBUILD

--+
 PKGBUILD |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-07-03 11:46:15 UTC (rev 84673)
+++ PKGBUILD2010-07-03 14:54:56 UTC (rev 84674)
@@ -4,8 +4,8 @@
 # Contributor: Andrea Scarpino bash@gmail.com
 
 pkgname=libtorrent-rasterbar
-pkgver=0.15.0
-pkgrel=5
+pkgver=0.15.1
+pkgrel=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/;
 arch=('i686' 'x86_64')
@@ -14,16 +14,16 @@
 makedepends=('boost')
 source=(http://libtorrent.googlecode.com/files/${pkgname}-${pkgver}.tar.gz
disable-valloc.dpatch)
-sha256sums=('e1a79045ad041dd82850d2255037108bb17dcbe9a9a8819169a2624b72667db0'
-   'ab05b0f9f6fe4d865cf1d440a67b43be8d8ecae2117ca5f79291c17574d3f8d2')
+md5sums=('6803d692ee57ce78f07092e135ec79d5'
+ '615990e49e2e40d37bd0f4ff26d12184')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/disable-valloc.dpatch || return 1
+  patch -Np1 -i ${srcdir}/disable-valloc.dpatch
   ./configure --prefix=/usr --enable-python-binding \
   --with-boost-filesystem=mt \
-  --with-boost-thread=mt || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  --with-boost-thread=mt
+  make
+  make DESTDIR=${pkgdir} install
   install -D COPYING ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
 }



[arch-commits] Commit in libtorrent-rasterbar/repos (extra-i686)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 10:55:06
  Author: ibiru
Revision: 84675

archrelease: remove extra-i686

Deleted:
  libtorrent-rasterbar/repos/extra-i686/



[arch-commits] Commit in libtorrent-rasterbar/repos (extra-i686)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 10:55:20
  Author: ibiru
Revision: 84676

archrelease: copy trunk to extra-i686

Added:
  libtorrent-rasterbar/repos/extra-i686/



[arch-commits] Commit in libtorrent-rasterbar/repos (extra-x86_64)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 10:55:29
  Author: ibiru
Revision: 84677

archrelease: remove extra-x86_64

Deleted:
  libtorrent-rasterbar/repos/extra-x86_64/



[arch-commits] Commit in libtorrent-rasterbar/repos (extra-x86_64)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 10:55:42
  Author: ibiru
Revision: 84678

archrelease: copy trunk to extra-x86_64

Added:
  libtorrent-rasterbar/repos/extra-x86_64/



[arch-commits] Commit in sane/trunk (PKGBUILD fix_xerox_mfp_color_mode.patch)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 11:09:26
  Author: ibiru
Revision: 84679

upgpkg: sane 1.0.21-3
fix scanning FS#20053

Added:
  sane/trunk/fix_xerox_mfp_color_mode.patch
Modified:
  sane/trunk/PKGBUILD

+
 PKGBUILD   |   24 ++--
 fix_xerox_mfp_color_mode.patch |   21 +
 2 files changed, 35 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-07-03 14:55:42 UTC (rev 84678)
+++ PKGBUILD2010-07-03 15:09:26 UTC (rev 84679)
@@ -4,7 +4,7 @@
 
 pkgname=sane
 pkgver=1.0.21
-pkgrel=2
+pkgrel=3
 pkgdesc=Scanner Access Now Easy
 url=http://www.sane-project.org;
 arch=('i686' 'x86_64')
@@ -14,22 +14,24 @@
 
backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.conf,leo.conf,lexmark.conf,ma1509.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,nec.conf,net.conf,p5.conf,pie.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.conf,s9036.conf,saned.conf,sceptre.conf,sharp.conf,sm3840.conf,snapscan.conf,sp15c.conf,st400.conf,stv680.conf,tamarack.conf,teco1.conf,teco2.conf,teco3.conf,test.conf,u12.conf,umax.conf,umax1220u.conf,umax_pp.conf,xerox_mfp,v4l.conf}
 etc/xinetd.d/sane)
 
source=(ftp://ftp.sane-project.org/pub/sane/$pkgname-backends-$pkgver/$pkgname-backends-$pkgver.tar.gz
 
ftp://ftp.sane-project.org/pub/sane/$pkgname-backends-$pkgver/sane-backends-1.0.21-i18n.patch
-sane.xinetd)
+sane.xinetd
+fix_xerox_mfp_color_mode.patch)
 options=(!libtool)
 
 build() {
   cd ${srcdir}/${pkgname}-backends-${pkgver}
-  patch -Np1 -i ../sane-backends-1.0.21-i18n.patch || return 1
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var 
--with-docdir=/usr/share/doc/sane --enable-avahi || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  patch -Np1 -i ${srcdir}/sane-backends-1.0.21-i18n.patch
+  patch -Np1 -i ${srcdir}/fix_xerox_mfp_color_mode.patch
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var 
--with-docdir=/usr/share/doc/sane --enable-avahi
+  make
+  make DESTDIR=${pkgdir} install
   # fix hp officejets
-  echo #hpaio  ${pkgdir}/etc/sane.d/dll.conf || return 1
+  echo #hpaio  ${pkgdir}/etc/sane.d/dll.conf
   # install udev files
   install -D -m0644 tools/udev/libsane.rules \
-${pkgdir}/lib/udev/rules.d/53-sane.rules || return 1
+${pkgdir}/lib/udev/rules.d/53-sane.rules
   # fix udev rules
-  sed -i 's|NAME=%k, ||g' ${pkgdir}/lib/udev/rules.d/53-sane.rules || return 
1
+  sed -i 's|NAME=%k, ||g' ${pkgdir}/lib/udev/rules.d/53-sane.rules
   # fix group on /var/lock
   mkdir -p ${pkgdir}/var/lock/sane
   chgrp 0 ${pkgdir}/var
@@ -43,4 +45,6 @@
 }
 md5sums=('be586a23633949cf2ecf0c9c6d769130'
  '8a6443b731f04dada814e268c42b139a'
- 'da946cc36fb83612162cf9505986d4b2')
+ 'da946cc36fb83612162cf9505986d4b2'
+ 'd6542c340c2acf30ccb7ead7094ab9d9')
+

Added: fix_xerox_mfp_color_mode.patch
===
--- fix_xerox_mfp_color_mode.patch  (rev 0)
+++ fix_xerox_mfp_color_mode.patch  2010-07-03 15:09:26 UTC (rev 84679)
@@ -0,0 +1,21 @@
+Description: Fix xerox_mfp color mode
+ Corrected color mode malfunction.
+ 
+ Bug was introduced by mass change to SANE_VALUE macro, (commit 
ff048f41760c74e67dfea36a079c71fdb72bbf4c).
+Author: Alex Belkin a...@telekom.ru
+Origin: upstream, 
http://git.debian.org/?p=sane/sane-backends.git;a=commitdiff;h=043cc4b1651fe602f1b7fb58e6592bd3bef0f4ac
+Bug: 
https://alioth.debian.org/tracker/?func=detailatid=410366aid=312485group_id=30186
+Bug-Debian: http://bugs.debian.org/583789
+
+Index: sane-backends-1.0.21/backend/xerox_mfp.c
+===
+--- sane-backends-1.0.21.orig/backend/xerox_mfp.c  2010-04-05 
15:18:05.0 +0200
 sane-backends-1.0.21/backend/xerox_mfp.c   2010-06-01 19:34:07.350975337 
+0200
+@@ -386,6 +386,7 @@
+ 
+ static SANE_String_Const scan_modes[] = {
+   SANE_VALUE_SCAN_MODE_LINEART,
++  SANE_VALUE_SCAN_MODE_HALFTONE,
+   SANE_VALUE_SCAN_MODE_GRAY,
+   SANE_VALUE_SCAN_MODE_COLOR,
+   NULL



[arch-commits] Commit in sane/repos (extra-i686)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 11:09:53
  Author: ibiru
Revision: 84680

archrelease: remove extra-i686

Deleted:
  sane/repos/extra-i686/



[arch-commits] Commit in sane/repos (extra-i686)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 11:10:17
  Author: ibiru
Revision: 84681

archrelease: copy trunk to extra-i686

Added:
  sane/repos/extra-i686/



[arch-commits] Commit in sane/repos (extra-x86_64)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 11:10:59
  Author: ibiru
Revision: 84683

archrelease: copy trunk to extra-x86_64

Added:
  sane/repos/extra-x86_64/



[arch-commits] Commit in sane/repos (extra-x86_64)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 11:10:44
  Author: ibiru
Revision: 84682

archrelease: remove extra-x86_64

Deleted:
  sane/repos/extra-x86_64/



[arch-commits] Commit in xine-lib/trunk (ChangeLog PKGBUILD)

2010-07-03 Thread Eric Bélanger
Date: Saturday, July 3, 2010 @ 11:35:07
  Author: eric
Revision: 84684

upgpkg: xine-lib 1.1.18.1-2
Rebuilt against imagemagick 6.6.2.10, Added gtk2 and mesa optdepends

Modified:
  xine-lib/trunk/ChangeLog
  xine-lib/trunk/PKGBUILD

---+
 ChangeLog |6 ++
 PKGBUILD  |   28 +---
 2 files changed, 23 insertions(+), 11 deletions(-)

Modified: ChangeLog
===
--- ChangeLog   2010-07-03 15:10:59 UTC (rev 84683)
+++ ChangeLog   2010-07-03 15:35:07 UTC (rev 84684)
@@ -1,3 +1,9 @@
+2010-07-03  Eric Belanger  e...@archlinux.org
+
+   * xine-lib 1.1.18.1-2
+   * Rebuilt against imagemagick 6.6.2.10
+   * Added gtk2 and mesa optdepends
+
 2010-03-23  Eric Belanger  e...@archlinux.org
 
* xine-lib 1.1.18.1-1

Modified: PKGBUILD
===
--- PKGBUILD2010-07-03 15:10:59 UTC (rev 84683)
+++ PKGBUILD2010-07-03 15:35:07 UTC (rev 84684)
@@ -4,7 +4,7 @@
 
 pkgname=xine-lib
 pkgver=1.1.18.1
-pkgrel=1
+pkgrel=2
 pkgdesc=A multimedia playback engine
 arch=('i686' 'x86_64')
 url=http://www.xine-project.org;
@@ -12,10 +12,12 @@
 depends=('libgl' 'libxvmc' 'esound' 'flac' 'libvorbis' 'sdl' 'libmng' 
'libtheora'
  'libxcb' 'wavpack' 'ffmpeg' 'heimdal' 'faad2')
 makedepends=('pkgconfig' 'libtool' 'imagemagick' 'smbclient' 'mesa' 'alsa-lib' 
- 'vcdimager' 'jack')
+ 'vcdimager' 'jack' 'gtk2')
 optdepends=('imagemagick: for using the imagemagick plugin' 'smbclient: for 
using the smb plugin' \
-'jack: for using the jack plugin' 'vcdimager: for using the vcd 
plugin')
+'jack: for using the jack plugin' 'vcdimager: for using the vcd 
plugin' \
+'gtk2: for using the gdk-pixbuf plugin' 'mesa: for using the 
opengl plugin')
 options=('!libtool')
+changelog=ChangeLog
 
source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.bz2
 xine-lib-1.1.1-configure-no-mcpu-march.patch)
 md5sums=('3efad551f2f8a9c5734855a6639694ef' '9776df4eb54d2f1f68d8268adbc3b5c2')
@@ -23,19 +25,23 @@
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -p0  ../xine-lib-1.1.1-configure-no-mcpu-march.patch || return 1
+  patch -p0  ../xine-lib-1.1.1-configure-no-mcpu-march.patch
 
-  libtoolize --force --copy || return 1
-  aclocal -I m4 || return 1
-  autoconf || return 1
-  automake --add-missing || return 1
+  libtoolize --force --copy
+  aclocal -I m4
+  autoconf
+  automake --add-missing
 
   ./configure --prefix=/usr --with-w32-path=/usr/lib/codecs \
 --with-xv-path=/usr/lib --with-xxmc-path=/usr/lib 
--with-xvmc-path=/usr/lib \
 --with-libflac --with-wavpack --with-xcb \
 --without-arts --with-jack --without-speex \
 --disable-gnomevfs --without-pulseaudio --disable-aalib \
---disable-modplug --with-external-ffmpeg || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+--disable-modplug --with-external-ffmpeg
+  make
 }
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}



[arch-commits] Commit in xine-lib/repos (testing-i686)

2010-07-03 Thread Eric Bélanger
Date: Saturday, July 3, 2010 @ 11:35:50
  Author: eric
Revision: 84685

archrelease: copy trunk to testing-i686

Added:
  xine-lib/repos/testing-i686/



[arch-commits] Commit in xine-lib/repos (testing-x86_64)

2010-07-03 Thread Eric Bélanger
Date: Saturday, July 3, 2010 @ 11:36:30
  Author: eric
Revision: 84686

archrelease: copy trunk to testing-x86_64

Added:
  xine-lib/repos/testing-x86_64/



[arch-commits] Commit in recode/trunk (3 files)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 12:15:25
  Author: ibiru
Revision: 84687

upgpkg: recode 3.6-5 using debian and gentoo patches to fix FS#15297

Added:
  recode/trunk/recode-3.6-as-if.patch
  recode/trunk/recode-3.6-gettextfix.diff
Modified:
  recode/trunk/PKGBUILD

+
 PKGBUILD   |   22 +-
 recode-3.6-as-if.patch |   19 +++
 recode-3.6-gettextfix.diff |   23 +++
 3 files changed, 59 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-07-03 15:36:30 UTC (rev 84686)
+++ PKGBUILD2010-07-03 16:15:25 UTC (rev 84687)
@@ -3,7 +3,7 @@
 
 pkgname=recode
 pkgver=3.6
-pkgrel=4
+pkgrel=5
 pkgdesc=Converts files between various character sets and usages
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/recode/recode.html;
@@ -11,14 +11,26 @@
 depends=('glibc' 'texinfo')
 options=('!libtool')
 install=recode.install
-source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz 
recode-3.6-gcc43.patch)
-md5sums=('be3f40ad2e93dae5cd5f628264bf1877' '47b62d7031d208180552174f9e223e9d')
+source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz
+
http://ftp.de.debian.org/debian/pool/main/r/recode/recode_3.6-15.diff.gz
+recode-3.6-as-if.patch recode-3.6-gettextfix.diff)
+md5sums=('be3f40ad2e93dae5cd5f628264bf1877'
+ '95ca772e367a7ef56d3f46d724b6f86e'
+ 'fca7484ba332c8ad59eb02334883cd92'
+ 'eb602e80a24b5448604bfebeacc55304')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -p0  ../recode-3.6-gcc43.patch || return 1
+  patch -Np1 -i ${srcdir}/recode-3.6-as-if.patch
+  patch -Np1 -i ${srcdir}/recode-3.6-gettextfix.diff
+  patch -Np1 -i ${srcdir}/recode_3.6-15.diff
+  sed -i '1i#include stdlib.h' src/argmatch.c
+  rm -f acinclude.m4
+  autoreconf -fi
+  libtoolize
   ./configure --prefix=/usr --mandir=/usr/share/man \
---infodir=/usr/share/info --host=i686-pc-linux-gnu || return 1
+--infodir=/usr/share/info --host=i686-pc-linux-gnu \
+--without-included-gettext
   make || return 1
   make DESTDIR=${pkgdir} install || return 1
   rm ${pkgdir}/usr/share/info/dir

Added: recode-3.6-as-if.patch
===
--- recode-3.6-as-if.patch  (rev 0)
+++ recode-3.6-as-if.patch  2010-07-03 16:15:25 UTC (rev 84687)
@@ -0,0 +1,19 @@
+http://bugs.gentoo.org/283029
+
+--- a/m4/flex.m4
 b/m4/flex.m4
+@@ -8,11 +8,11 @@ dnl ad_AC_PROG_FLEX
+ dnl Look for flex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
+ AC_DEFUN(ad_AC_PROG_FLEX,
+ [AC_CHECK_PROGS(LEX, flex, missing)
+-if test $LEX = missing; then
++AS_IF([test $LEX = missing], [dnl
+   LEX=\$(top_srcdir)/$ac_aux_dir/missing flex
+   LEX_OUTPUT_ROOT=lex.yy
+   AC_SUBST(LEX_OUTPUT_ROOT)dnl
+-else
++], [:
+   AC_PROG_LEX
+   AC_DECL_YYTEXT
+-fi])
++])])

Added: recode-3.6-gettextfix.diff
===
--- recode-3.6-gettextfix.diff  (rev 0)
+++ recode-3.6-gettextfix.diff  2010-07-03 16:15:25 UTC (rev 84687)
@@ -0,0 +1,23 @@
+http://bugs.gentoo.org/239372
+
+patch by Dmitry Karasik
+
+--- recode-3.6/m4/gettext.m4
 recode-3.6/m4/gettext.m4
+@@ -109,12 +109,12 @@
+ else
+   ac_items=$LINGUAS
+   for ac_item in $ac_items; do
+-  case $ALL_LINGUAS in
+-*$ac_item*)
++for supported_item in $ALL_LINGUAS; do
++  if test $ac_item = $supported_item; then
+   ac_print=$ac_print $ac_item
+   MOFILES=$MOFILES $ac_item.mo
+-  ;;
+-  esac
++  fi
++done
+   done
+ fi
+ AC_SUBST(MOFILES)



[arch-commits] Commit in recode/repos (extra-i686)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 12:15:35
  Author: ibiru
Revision: 84688

archrelease: remove extra-i686

Deleted:
  recode/repos/extra-i686/



[arch-commits] Commit in recode/repos (extra-i686)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 12:15:50
  Author: ibiru
Revision: 84689

archrelease: copy trunk to extra-i686

Added:
  recode/repos/extra-i686/



[arch-commits] Commit in recode/repos (extra-x86_64)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 12:16:03
  Author: ibiru
Revision: 84690

archrelease: remove extra-x86_64

Deleted:
  recode/repos/extra-x86_64/



[arch-commits] Commit in recode/repos (extra-x86_64)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 12:16:18
  Author: ibiru
Revision: 84691

archrelease: copy trunk to extra-x86_64

Added:
  recode/repos/extra-x86_64/



[arch-commits] Commit in recode/trunk (PKGBUILD)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 12:19:26
  Author: ibiru
Revision: 84692

upgpkg: recode 3.6-5 removing host option

Modified:
  recode/trunk/PKGBUILD

--+
 PKGBUILD |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-07-03 16:16:18 UTC (rev 84691)
+++ PKGBUILD2010-07-03 16:19:26 UTC (rev 84692)
@@ -29,8 +29,7 @@
   autoreconf -fi
   libtoolize
   ./configure --prefix=/usr --mandir=/usr/share/man \
---infodir=/usr/share/info --host=i686-pc-linux-gnu \
---without-included-gettext
+--infodir=/usr/share/info --without-included-gettext
   make || return 1
   make DESTDIR=${pkgdir} install || return 1
   rm ${pkgdir}/usr/share/info/dir



[arch-commits] Commit in recode/repos (extra-i686)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 12:19:34
  Author: ibiru
Revision: 84693

archrelease: remove extra-i686

Deleted:
  recode/repos/extra-i686/



[arch-commits] Commit in recode/repos (extra-x86_64)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 12:19:59
  Author: ibiru
Revision: 84695

archrelease: remove extra-x86_64

Deleted:
  recode/repos/extra-x86_64/



[arch-commits] Commit in recode/repos (extra-x86_64)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 12:20:17
  Author: ibiru
Revision: 84696

archrelease: copy trunk to extra-x86_64

Added:
  recode/repos/extra-x86_64/



[arch-commits] Commit in eject/trunk (PKGBUILD)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 12:22:38
  Author: ibiru
Revision: 84697

fix download url

Modified:
  eject/trunk/PKGBUILD

--+
 PKGBUILD |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-07-03 16:20:17 UTC (rev 84696)
+++ PKGBUILD2010-07-03 16:22:38 UTC (rev 84697)
@@ -6,12 +6,14 @@
 pkgver=2.1.5
 pkgrel=4
 pkgdesc=Eject is a program for ejecting removable media under software 
control
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url=http://ca.geocities.com/jefftran...@rogers.com/eject.html;
 license=('GPL')
 depends=('glibc')
-source=(http://www.pobox.com/~tranter/$pkgname-$pkgver.tar.gz 
eject-2.1.5-handle-spaces.patch)
-md5sums=('b96a6d4263122f1711db12701d79f738' '595b97c3bd56fd41e3b01b07885f81dc')
+source=(ftp://mirrors.kernel.org/slackware/slackware-13.1/source/a/$pkgname/$pkgname-$pkgver.tar.bz2
 
+eject-2.1.5-handle-spaces.patch)
+md5sums=('5a6cab2184ae4ed21128054d931d558f'
+ '595b97c3bd56fd41e3b01b07885f81dc')
 
 build() {
   cd $srcdir/$pkgname



[arch-commits] Commit in eject/repos (extra-i686)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 12:22:57
  Author: ibiru
Revision: 84698

archrelease: remove extra-i686

Deleted:
  eject/repos/extra-i686/



[arch-commits] Commit in eject/repos (extra-i686)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 12:23:17
  Author: ibiru
Revision: 84699

archrelease: copy trunk to extra-i686

Added:
  eject/repos/extra-i686/



[arch-commits] Commit in eject/repos (extra-x86_64)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 12:23:21
  Author: ibiru
Revision: 84700

archrelease: remove extra-x86_64

Deleted:
  eject/repos/extra-x86_64/



[arch-commits] Commit in eject/repos (extra-x86_64)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 12:23:38
  Author: ibiru
Revision: 84701

archrelease: copy trunk to extra-x86_64

Added:
  eject/repos/extra-x86_64/



[arch-commits] Commit in bind/trunk (PKGBUILD)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 12:47:54
  Author: ibiru
Revision: 84702

upgpkg: bind 9.7.1-1
update to 9.7.1 and added arm documentation. implementing FS#18839

Modified:
  bind/trunk/PKGBUILD

--+
 PKGBUILD |   18 +++---
 1 file changed, 11 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-07-03 16:23:38 UTC (rev 84701)
+++ PKGBUILD2010-07-03 16:47:54 UTC (rev 84702)
@@ -3,9 +3,9 @@
 # Contributor: Mario Vazquez mario_v...@hotmail.com
 pkgname=bind
 # Use a period and not a hyphen before the patch level for proper versioning.
-pkgver=9.7.0.P1
-_pkgver=9.7.0-P1
-pkgrel=2
+pkgver=9.7.1
+_pkgver=9.7.1
+pkgrel=1
 pkgdesc=Berkeley Internet Name Domain - named server
 arch=(i686 x86_64)
 url=https://www.isc.org/software/bind/;
@@ -22,12 +22,12 @@
 build() {
   export MAKEFLAGS=-j1
   cd ${srcdir}/${pkgname}-${_pkgver}
-  patch -Np0 -i ${srcdir}/bind.so_bsdcompat.diff || return 1
-  patch -Np1 -i ${srcdir}/notools.patch || return 1
+  patch -Np0 -i ${srcdir}/bind.so_bsdcompat.diff
+  patch -Np1 -i ${srcdir}/notools.patch
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
   --with-libtool --enable-shared --disable-threads \
   --with-openssl=yes --disable-linux-caps --without-libxml2
-  make || return 1
+  make
   make DESTDIR=${pkgdir} install
   install -D -m755 ../named ${pkgdir}/etc/rc.d/named
   install -D -m640 ../named.conf ${pkgdir}/etc/named.conf
@@ -45,8 +45,12 @@
   chown root:40 ${pkgdir}/etc/named.conf
   chown -R 40:40 ${pkgdir}/var/named
   chown 40:40 ${pkgdir}/var/run/named
+
+  # documentation
+  mkdir -p ${pkgdir}/usr/share/doc/bind
+  cp  ./doc/arm/*.html ${pkgdir}/usr/share/doc/bind/
 }
-md5sums=('78e3e38c6252e41ded1afa1aeb183622'
+md5sums=('712c425e59cb4aa9309bc4716283742f'
  '447d58721cfee0e1e377b46f7d50b327'
  'e7f3c5c54f18c86f6716700e82f7e9fd'
  'f58fa49a92df16534d31fcb6b0d1be1e'



[arch-commits] Commit in bind/repos (extra-i686)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 12:48:17
  Author: ibiru
Revision: 84703

archrelease: remove extra-i686

Deleted:
  bind/repos/extra-i686/



[arch-commits] Commit in bind/repos (extra-i686)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 12:48:33
  Author: ibiru
Revision: 84704

archrelease: copy trunk to extra-i686

Added:
  bind/repos/extra-i686/



[arch-commits] Commit in bind/repos (extra-x86_64)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 12:48:54
  Author: ibiru
Revision: 84705

archrelease: remove extra-x86_64

Deleted:
  bind/repos/extra-x86_64/



[arch-commits] Commit in bind/repos (extra-x86_64)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 12:49:10
  Author: ibiru
Revision: 84706

archrelease: copy trunk to extra-x86_64

Added:
  bind/repos/extra-x86_64/



[arch-commits] Commit in transcode/trunk (PKGBUILD)

2010-07-03 Thread Eric Bélanger
Date: Saturday, July 3, 2010 @ 13:30:48
  Author: eric
Revision: 84707

upgpkg: transcode 1.1.5-4
Rebuilt against imagemagick 6.6.2.10

Modified:
  transcode/trunk/PKGBUILD

--+
 PKGBUILD |   36 +---
 1 file changed, 21 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-07-03 16:49:10 UTC (rev 84706)
+++ PKGBUILD2010-07-03 17:30:48 UTC (rev 84707)
@@ -6,7 +6,7 @@
 pkgname=transcode
 _sripver=0.3-4
 pkgver=1.1.5
-pkgrel=3
+pkgrel=4
 pkgdesc=A video/DVD ripper and encoder for the terminal/console.
 arch=('i686' 'x86_64')
 url=http://tcforge.berlios.de/;
@@ -14,12 +14,12 @@
 depends=('imagemagick' 'lzo2' 'libdv' 'libdvdread' 'ffmpeg' 'mjpegtools'
'xvidcore' 'libmpeg2' 'libtheora' 'libxaw' 'x264' 'libxml2'
'libxv' 'a52dec' 'alsa-lib')
-makedepends=('nasm' 'pkgconfig')
+makedepends=('nasm' 'pkg-config')
 options=('!libtool' '!makeflags')
 source=(http://download2.berlios.de/tcforge/${pkgname}-${pkgver}.tar.bz2

http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz)
-md5sums=('41ac6b1c0fe30f3aab286e771fc31b9e'
-   'c0bd49a88f667c68c4430ad25bbed510')
+md5sums=('41ac6b1c0fe30f3aab286e771fc31b9e' 'c0bd49a88f667c68c4430ad25bbed510')
+sha1sums=('48c36e06ca0cd1cdc1a9c6a241e231f896eefd26' 
'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -42,24 +42,30 @@
 --with-lzo-libs=/usr/lib \
 --with-libavcodec-prefix=/usr \
 --with-libavcodec-includes=/usr/include \
---with-libavcodec-libs=/usr/lib || return 1
+--with-libavcodec-libs=/usr/lib
 
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  make
  ##
  # this imports the latest subtitleripper sources and replaces the internal
   mkdir contrib
   mv ${srcdir}/subtitleripper contrib/subrip
  # removes dependency on libppm, make it dependend on netpbm just failed, 
argh...
-  cd contrib/subrip || return 1
+  cd contrib/subrip
   sed -e 's|^\(.*lppm.*\)$|#\1|' \
   -e 's|^\(.*D_HAVE_LIB_PPM.*\)$|#\1|' \
   -e 's/DEFINES :=/DEFINES = -DHAVE_GETLINE/' \
-  -i Makefile || return 1
-  make || return 1
-  install -m 755 pgm2txt ${pkgdir}/usr/bin/ || return 1
-  install -m 755 srttool ${pkgdir}/usr/bin/ || return 1
-  install -m 755 subtitle2pgm ${pkgdir}/usr/bin/ || return 1
-  install -m 755 subtitle2vobsub ${pkgdir}/usr/bin/ || return 1
-  install -m 755 vobsub2pgm ${pkgdir}/usr/bin/ || return 1
+  -i Makefile
+  make
 }
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  cd contrib/subrip
+  install -m 755 pgm2txt ${pkgdir}/usr/bin/
+  install -m 755 srttool ${pkgdir}/usr/bin/
+  install -m 755 subtitle2pgm ${pkgdir}/usr/bin/
+  install -m 755 subtitle2vobsub ${pkgdir}/usr/bin/
+  install -m 755 vobsub2pgm ${pkgdir}/usr/bin/
+}



[arch-commits] Commit in transcode/repos (testing-i686)

2010-07-03 Thread Eric Bélanger
Date: Saturday, July 3, 2010 @ 13:31:09
  Author: eric
Revision: 84708

archrelease: copy trunk to testing-i686

Added:
  transcode/repos/testing-i686/



[arch-commits] Commit in transcode/repos (testing-x86_64)

2010-07-03 Thread Eric Bélanger
Date: Saturday, July 3, 2010 @ 13:31:30
  Author: eric
Revision: 84709

archrelease: copy trunk to testing-x86_64

Added:
  transcode/repos/testing-x86_64/



[arch-commits] Commit in netpbm/trunk (9 files)

2010-07-03 Thread Eric Bélanger
Date: Saturday, July 3, 2010 @ 14:02:11
  Author: eric
Revision: 84710

upgpkg: netpbm 10.47.16-1
Upstream update, Fixed pgmtopbm (close FS#20030), Updated build procedure, 
PKGBUILD clean up, Updated libpng patch, Added security fixes, Removed old 
patches

Added:
  netpbm/trunk/netpbm-CAN-2005-2471.patch
  netpbm/trunk/netpbm-security-code.patch
  netpbm/trunk/netpbm-security-scripts.patch
Modified:
  netpbm/trunk/PKGBUILD
  netpbm/trunk/libpng-1.4.patch
Deleted:
  netpbm/trunk/Makefile.config
  netpbm/trunk/arch.patch
  netpbm/trunk/netpbm-10.35-glibc.patch
  netpbm/trunk/netpbm-10.35-jpeg7.patch

---+
 Makefile.config   |  650 --
 PKGBUILD  |  106 +-
 arch.patch|   12 
 libpng-1.4.patch  |   43 
 netpbm-10.35-glibc.patch  |   37 
 netpbm-10.35-jpeg7.patch  |   11 
 netpbm-CAN-2005-2471.patch|   16 
 netpbm-security-code.patch| 1817 
 netpbm-security-scripts.patch |  393 
 9 files changed, 2297 insertions(+), 788 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 84709:84710 to see the changes.


[arch-commits] Commit in netpbm/repos (extra-i686)

2010-07-03 Thread Eric Bélanger
Date: Saturday, July 3, 2010 @ 14:02:33
  Author: eric
Revision: 84711

archrelease: remove extra-i686

Deleted:
  netpbm/repos/extra-i686/



[arch-commits] Commit in netpbm/repos (extra-i686)

2010-07-03 Thread Eric Bélanger
Date: Saturday, July 3, 2010 @ 14:02:42
  Author: eric
Revision: 84712

archrelease: copy trunk to extra-i686

Added:
  netpbm/repos/extra-i686/



[arch-commits] Commit in netpbm/repos (extra-x86_64)

2010-07-03 Thread Eric Bélanger
Date: Saturday, July 3, 2010 @ 14:03:04
  Author: eric
Revision: 84713

archrelease: remove extra-x86_64

Deleted:
  netpbm/repos/extra-x86_64/



[arch-commits] Commit in netpbm/repos (extra-x86_64)

2010-07-03 Thread Eric Bélanger
Date: Saturday, July 3, 2010 @ 14:03:12
  Author: eric
Revision: 84714

archrelease: copy trunk to extra-x86_64

Added:
  netpbm/repos/extra-x86_64/



[arch-commits] Commit in udisks/repos (extra-i686)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 14:33:24
  Author: ibiru
Revision: 84716

archrelease: remove extra-i686

Deleted:
  udisks/repos/extra-i686/



[arch-commits] Commit in udisks/repos (extra-i686)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 14:33:37
  Author: ibiru
Revision: 84717

archrelease: copy trunk to extra-i686

Added:
  udisks/repos/extra-i686/



[arch-commits] Commit in udisks/repos (extra-x86_64)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 14:33:43
  Author: ibiru
Revision: 84718

archrelease: remove extra-x86_64

Deleted:
  udisks/repos/extra-x86_64/



[arch-commits] Commit in udisks/repos (extra-x86_64)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 14:33:56
  Author: ibiru
Revision: 84719

archrelease: copy trunk to extra-x86_64

Added:
  udisks/repos/extra-x86_64/



[arch-commits] Commit in inkscape/trunk (PKGBUILD)

2010-07-03 Thread Eric Bélanger
Date: Saturday, July 3, 2010 @ 15:21:55
  Author: eric
Revision: 84720

upgpkg: inkscape 0.47-4
Rebuilt against imagemagick 6.6.2.10

Modified:
  inkscape/trunk/PKGBUILD

--+
 PKGBUILD |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-07-03 18:33:56 UTC (rev 84719)
+++ PKGBUILD2010-07-03 19:21:55 UTC (rev 84720)
@@ -4,13 +4,13 @@
 
 pkgname=inkscape
 pkgver=0.47
-pkgrel=3
+pkgrel=4
 pkgdesc=A vector-based drawing program - svg compliant
 url=http://inkscape.sourceforge.net/;
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL')
 depends=('poppler-glib=0.14.0' 'imagemagick=6.6.2.0' 'gtkspell=2.0.16' 
'gc=7.1' 'gtkmm=2.20.3' 'libxslt=1.1.26' 'gsl=1.14' 'pyxml=0.8.4' 
'desktop-file-utils' 'popt')
-makedepends=('boost' 'pkgconfig' 'intltool')
+makedepends=('boost' 'pkg-config' 'intltool')
 options=('!libtool')
 install=inkscape.install
 
source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
@@ -33,5 +33,9 @@
 --enable-poppler-cairo \
 --disable-dependency-tracking
   make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
 }



[arch-commits] Commit in inkscape/repos (testing-i686)

2010-07-03 Thread Eric Bélanger
Date: Saturday, July 3, 2010 @ 15:24:34
  Author: eric
Revision: 84721

archrelease: copy trunk to testing-i686

Added:
  inkscape/repos/testing-i686/



[arch-commits] Commit in inkscape/repos (testing-i686)

2010-07-03 Thread Eric Bélanger
Date: Saturday, July 3, 2010 @ 15:29:35
  Author: eric
Revision: 84722

archrelease: remove testing-i686

Deleted:
  inkscape/repos/testing-i686/



[arch-commits] Commit in scim/trunk (PKGBUILD gcc45.patch)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 15:29:41
  Author: ibiru
Revision: 84723

upgpkg: scim 1.4.9-2 fix compilation with latest toolchain

Added:
  scim/trunk/gcc45.patch
Modified:
  scim/trunk/PKGBUILD

-+
 PKGBUILD|   15 +--
 gcc45.patch |   12 
 2 files changed, 21 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-07-03 19:29:35 UTC (rev 84722)
+++ PKGBUILD2010-07-03 19:29:41 UTC (rev 84723)
@@ -4,7 +4,7 @@
 
 pkgname=scim
 pkgver=1.4.9
-pkgrel=1
+pkgrel=2
 pkgdesc=A Input Method development platform
 arch=(i686 x86_64)
 url=http://www.scim-im.org/projects/scim;
@@ -14,13 +14,16 @@
 backup=('etc/scim/config' 'etc/scim/global')
 options=('!libtool')
 install=scim.install
-source=(http://downloads.sourceforge.net/sourceforge/scim/$pkgname-$pkgver.tar.gz)
-md5sums=('975ba34b01304ea8166ac8ea27aa9e88')
+source=(http://downloads.sourceforge.net/sourceforge/scim/$pkgname-$pkgver.tar.gz
+gcc45.patch)
+md5sums=('975ba34b01304ea8166ac8ea27aa9e88'
+ '9d7b41421424cedcbc5740098afa4921')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
+  patch -Np1 -i $srcdir/gcc45.patch
   ./configure --prefix=/usr --sysconfdir=/etc \
---with-gnu-ld --with-x --disable-static || return 1
-  make || return 1
-  make DESTDIR=$startdir/pkg install || return 1
+--with-gnu-ld --with-x --disable-static
+  make
+  make DESTDIR=$pkgdir install
 }

Added: gcc45.patch
===
--- gcc45.patch (rev 0)
+++ gcc45.patch 2010-07-03 19:29:41 UTC (rev 84723)
@@ -0,0 +1,12 @@
+diff -Nur scim-1.4.9.orig//src/ltdl.cpp scim-1.4.9/src/ltdl.cpp
+--- scim-1.4.9.orig//src/ltdl.cpp  2008-11-02 01:42:40.0 -0500
 scim-1.4.9/src/ltdl.cpp2010-07-04 00:19:58.924925581 -0500
+@@ -3361,7 +3361,7 @@
+ {
+   lt_dlhandle handle  = 0;
+   char *  tmp = 0;
+-  char *  ext = 0;
++  const char *ext = 0;
+   size_t  len;
+   int errors  = 0;
+ 



[arch-commits] Commit in inkscape/repos (testing-i686)

2010-07-03 Thread Eric Bélanger
Date: Saturday, July 3, 2010 @ 15:29:43
  Author: eric
Revision: 84724

archrelease: copy trunk to testing-i686

Added:
  inkscape/repos/testing-i686/



[arch-commits] Commit in scim/repos (extra-i686)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 15:29:49
  Author: ibiru
Revision: 84725

archrelease: remove extra-i686

Deleted:
  scim/repos/extra-i686/



[arch-commits] Commit in inkscape/repos (testing-x86_64)

2010-07-03 Thread Eric Bélanger
Date: Saturday, July 3, 2010 @ 15:29:54
  Author: eric
Revision: 84726

archrelease: copy trunk to testing-x86_64

Added:
  inkscape/repos/testing-x86_64/



[arch-commits] Commit in scim/repos (extra-i686)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 15:30:05
  Author: ibiru
Revision: 84727

archrelease: copy trunk to extra-i686

Added:
  scim/repos/extra-i686/



[arch-commits] Commit in scim/repos (extra-x86_64)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 15:30:16
  Author: ibiru
Revision: 84728

archrelease: remove extra-x86_64

Deleted:
  scim/repos/extra-x86_64/



[arch-commits] Commit in libid3tag/trunk (3 files)

2010-07-03 Thread Eric Bélanger
Date: Saturday, July 3, 2010 @ 15:30:28
  Author: eric
Revision: 84729

upgpkg: libid3tag 0.15.1b-5
Added encoding fixes (close FS#18595), Added gperf makedepends

Added:
  libid3tag/trunk/10_utf16.diff
  libid3tag/trunk/11_unknown_encoding.diff
Modified:
  libid3tag/trunk/PKGBUILD

--+
 10_utf16.diff|   48 +
 11_unknown_encoding.diff |   37 ++
 PKGBUILD |   28 +-
 3 files changed, 104 insertions(+), 9 deletions(-)

Added: 10_utf16.diff
===
--- 10_utf16.diff   (rev 0)
+++ 10_utf16.diff   2010-07-03 19:30:28 UTC (rev 84729)
@@ -0,0 +1,48 @@
+#! /bin/sh -e
+## 10_utf16.dpatch by  k...@roeckx.be
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Handle bogus UTF16 sequences that have a length that is not
+## DP: an even number of 8 bit characters.
+
+if [ $# -lt 1 ]; then
+echo `basename $0`: script expects -patch|-unpatch as argument 2
+exit 1
+fi
+
+[ -f debian/patches/00patch-opts ]  . debian/patches/00patch-opts
+patch_opts=${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}
+
+case $1 in
+-patch) patch -p1 ${patch_opts}  $0;;
+-unpatch) patch -R -p1 ${patch_opts}  $0;;
+*)
+echo `basename $0`: script expects -patch|-unpatch as argument 2
+exit 1;;
+esac
+
+exit 0
+
+...@dpatch@
+diff -urNad libid3tag-0.15.1b/utf16.c 
/tmp/dpep.tKvO7a/libid3tag-0.15.1b/utf16.c
+--- libid3tag-0.15.1b/utf16.c  2006-01-13 15:26:29.0 +0100
 /tmp/dpep.tKvO7a/libid3tag-0.15.1b/utf16.c 2006-01-13 15:27:19.0 
+0100
+@@ -282,5 +282,18 @@
+ 
+   free(utf16);
+ 
++  if (end == *ptr  length % 2 != 0)
++  {
++ /* We were called with a bogus length.  It should always
++  * be an even number.  We can deal with this in a few ways:
++  * - Always give an error.
++  * - Try and parse as much as we can and
++  *   - return an error if we're called again when we
++  * already tried to parse everything we can.
++  *   - tell that we parsed it, which is what we do here.
++  */
++ (*ptr)++;
++  }
++
+   return ucs4;
+ }

Added: 11_unknown_encoding.diff
===
--- 11_unknown_encoding.diff(rev 0)
+++ 11_unknown_encoding.diff2010-07-03 19:30:28 UTC (rev 84729)
@@ -0,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 11_unknown_encoding.dpatch by Andreas Henriksson andr...@fatal.se
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: In case of an unknown/invalid encoding, id3_parse_string() will
+## DP: return NULL, but the return value wasn't checked resulting
+## DP: in segfault in id3_ucs4_length().  This is the only place
+## DP: the return value wasn't checked.
+
+...@dpatch@
+diff -urNad libid3tag-0.15.1b~/compat.gperf libid3tag-0.15.1b/compat.gperf
+--- libid3tag-0.15.1b~/compat.gperf2004-01-23 09:41:32.0 +
 libid3tag-0.15.1b/compat.gperf 2007-01-14 14:36:53.0 +
+@@ -236,6 +236,10 @@
+ 
+ encoding = id3_parse_uint(data, 1);
+ string   = id3_parse_string(data, end - data, encoding, 0);
++if (!string)
++{
++  continue;
++}
+ 
+ if (id3_ucs4_length(string)  4) {
+   free(string);
+diff -urNad libid3tag-0.15.1b~/parse.c libid3tag-0.15.1b/parse.c
+--- libid3tag-0.15.1b~/parse.c 2004-01-23 09:41:32.0 +
 libid3tag-0.15.1b/parse.c  2007-01-14 14:37:34.0 +
+@@ -165,6 +165,9 @@
+   case ID3_FIELD_TEXTENCODING_UTF_8:
+ ucs4 = id3_utf8_deserialize(ptr, length);
+ break;
++  default:
++  /* FIXME: Unknown encoding! Print warning? */
++  return NULL;
+   }
+ 
+   if (ucs4  !full) {

Modified: PKGBUILD
===
--- PKGBUILD2010-07-03 19:30:16 UTC (rev 84728)
+++ PKGBUILD2010-07-03 19:30:28 UTC (rev 84729)
@@ -3,21 +3,31 @@
 
 pkgname=libid3tag
 pkgver=0.15.1b
-pkgrel=4
+pkgrel=5
 pkgdesc=library for id3 tagging
 arch=('i686' 'x86_64')
 url=http://www.underbit.com/products/mad/;
 license=('GPL')
 depends=('zlib')
+makedepends=('gperf')
 options=(!libtool)
-source=(ftp://ftp.mars.org/pub/mpeg/$pkgname-$pkgver.tar.gz id3tag.pc)
-md5sums=('e5808ad997ba32c498803822078748c3' '8bb41fd814fafcc37ec8bc88f5545a4a')
-sha1sums=('4d867e8a8436e73cd7762fe0e85958e35f1e4306' 
'27753135177029bd443be188307c2934dd3caa13')
+source=(ftp://ftp.mars.org/pub/mpeg/${pkgname}-${pkgver}.tar.gz \
+id3tag.pc 10_utf16.diff 11_unknown_encoding.diff)
+md5sums=('e5808ad997ba32c498803822078748c3' '8bb41fd814fafcc37ec8bc88f5545a4a'\
+ '4f9df4011e6a8c23240fff5de2d05f6e' '3ca856b97924d48a0fdfeff0bd83ce7d')
+sha1sums=('4d867e8a8436e73cd7762fe0e85958e35f1e4306' 
'27753135177029bd443be188307c2934dd3caa13'\

[arch-commits] Commit in libid3tag/repos (extra-i686)

2010-07-03 Thread Eric Bélanger
Date: Saturday, July 3, 2010 @ 15:30:32
  Author: eric
Revision: 84731

archrelease: remove extra-i686

Deleted:
  libid3tag/repos/extra-i686/



[arch-commits] Commit in libid3tag/repos (extra-i686)

2010-07-03 Thread Eric Bélanger
Date: Saturday, July 3, 2010 @ 15:30:40
  Author: eric
Revision: 84732

archrelease: copy trunk to extra-i686

Added:
  libid3tag/repos/extra-i686/



[arch-commits] Commit in libid3tag/repos (extra-x86_64)

2010-07-03 Thread Eric Bélanger
Date: Saturday, July 3, 2010 @ 15:30:44
  Author: eric
Revision: 84733

archrelease: remove extra-x86_64

Deleted:
  libid3tag/repos/extra-x86_64/



[arch-commits] Commit in pstoedit/trunk (PKGBUILD aclocal-fixes.patch)

2010-07-03 Thread Eric Bélanger
Date: Saturday, July 3, 2010 @ 16:15:27
  Author: eric
Revision: 84735

upgpkg: pstoedit 3.50-3
Rebuilt against imagemagick 6.6.2.10, Capitalized description, Added 
ghostscript makedepends, Removed old patch

Modified:
  pstoedit/trunk/PKGBUILD
Deleted:
  pstoedit/trunk/aclocal-fixes.patch

-+
 PKGBUILD|   22 ++
 aclocal-fixes.patch |   11 ---
 2 files changed, 14 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-07-03 19:30:52 UTC (rev 84734)
+++ PKGBUILD2010-07-03 20:15:27 UTC (rev 84735)
@@ -5,20 +5,26 @@
 
 pkgname=pstoedit
 pkgver=3.50
-pkgrel=2
-depends=(gcc-libs=4.4.1 plotutils=2.5.1 gd imagemagick=6.5.6.1)
-pkgdesc=translates PostScript and PDF graphics into other vector formats
+pkgrel=3
+pkgdesc=Translates PostScript and PDF graphics into other vector formats
 arch=(i686 x86_64)
+url=http://www.pstoedit.net/;
 license=('GPL')
-source=(http://downloads.sourceforge.net/sourceforge/pstoedit/pstoedit-$pkgver.tar.gz;)
-url=http://www.pstoedit.net/;
+depends=('gcc-libs' 'plotutils' 'gd' 'imagemagick')
+makedepends=('ghostscript')
 options=('!libtool' '!makeflags')
+source=(http://downloads.sourceforge.net/sourceforge/pstoedit/pstoedit-${pkgver}.tar.gz;)
 md5sums=('97d649305ad90fab7a569154f17e0916')
+sha1sums=('5685bef29fa00aae7cc314d3a1dd21612a98eb2b')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}-${pkgver}
   sed -i 's/-pedantic//' configure
   ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  make
 }
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}

Deleted: aclocal-fixes.patch
===
--- aclocal-fixes.patch 2010-07-03 19:30:52 UTC (rev 84734)
+++ aclocal-fixes.patch 2010-07-03 20:15:27 UTC (rev 84735)
@@ -1,11 +0,0 @@
 config/pstoedit.m4.orig2006-03-05 13:36:37.0 +
-+++ config/pstoedit.m4 2006-03-05 13:36:51.0 +
-@@ -4,7 +4,7 @@
- dnl AM_PATH_PSTOEDIT([MINIMUM-VERSION, [ACTION-IF-FOUND [, 
ACTION-IF-NOT-FOUND]])
- dnl Test to see if libpstoedit is installed, and define PSTOEDIT_CFLAGS, LIBS
- dnl
--AC_DEFUN(AM_PATH_PSTOEDIT,
-+AC_DEFUN([AM_PATH_PSTOEDIT],
- [dnl
- dnl Get the cflags and libraries from the pstoedit-config script
- dnl



[arch-commits] Commit in pstoedit/repos (testing-i686)

2010-07-03 Thread Eric Bélanger
Date: Saturday, July 3, 2010 @ 16:15:42
  Author: eric
Revision: 84736

archrelease: copy trunk to testing-i686

Added:
  pstoedit/repos/testing-i686/



[arch-commits] Commit in pstoedit/repos (testing-x86_64)

2010-07-03 Thread Eric Bélanger
Date: Saturday, July 3, 2010 @ 16:15:57
  Author: eric
Revision: 84737

archrelease: copy trunk to testing-x86_64

Added:
  pstoedit/repos/testing-x86_64/



[arch-commits] Commit in dvdauthor/trunk (PKGBUILD)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 16:19:40
  Author: ibiru
Revision: 84738

upgpkg: dvdauthor 0.6.14-7 imagemagick rebuild

Modified:
  dvdauthor/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-07-03 20:15:57 UTC (rev 84737)
+++ PKGBUILD2010-07-03 20:19:40 UTC (rev 84738)
@@ -6,12 +6,13 @@
 
 pkgname=dvdauthor
 pkgver=0.6.14
-pkgrel=6
+pkgrel=7
 pkgdesc=DVD authoring tools
 arch=('i686' 'x86_64')
 url=http://dvdauthor.sourceforge.net/;
 license=('GPL')
-depends=('libdvdread' 'imagemagick')
+depends=('libdvdread' 'imagemagick' 'libxml2' 'libpng')
+options=('!makeflags')
 
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 md5sums=('bd646b47950c4091ffd781d43fd2c5e9')
 



[arch-commits] Commit in dvdauthor/repos (testing-i686)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 16:19:58
  Author: ibiru
Revision: 84739

archrelease: copy trunk to testing-i686

Added:
  dvdauthor/repos/testing-i686/



[arch-commits] Commit in dvdauthor/repos (testing-x86_64)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 16:20:16
  Author: ibiru
Revision: 84740

archrelease: copy trunk to testing-x86_64

Added:
  dvdauthor/repos/testing-x86_64/



[arch-commits] Commit in libfprint/trunk (PKGBUILD)

2010-07-03 Thread Eric Bélanger
Date: Saturday, July 3, 2010 @ 16:35:54
  Author: eric
Revision: 84741

upgpkg: libfprint 0.0.6-7
Rebuilt against imagemagick 6.6.2.10, Capitalized description

Modified:
  libfprint/trunk/PKGBUILD

--+
 PKGBUILD |   22 +-
 1 file changed, 13 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-07-03 20:20:16 UTC (rev 84740)
+++ PKGBUILD2010-07-03 20:35:54 UTC (rev 84741)
@@ -3,24 +3,28 @@
 
 pkgname=libfprint
 pkgver=0.0.6
-pkgrel=6
-pkgdesc=library for fingerprint scanner support in applications
+pkgrel=7
+pkgdesc=Library for fingerprint scanner support in applications
+arch=('i686' 'x86_64')
 url=http://reactivated.net/fprint/wiki/Main_Page;
 license=('LGPL')
+depends=('libusb' 'imagemagick' 'openssl' 'glib2')
 groups=('fprint')
-depends=('libusb' 'imagemagick=6.4.8.10' 'openssl' 'glib2')
-arch=('i686' 'x86_64')
+options=(!libtool)
 install=fprint.install
 
source=(http://downloads.sourceforge.net/sourceforge/fprint/$pkgname-$pkgver.tar.bz2
 50-fprint.rules)
-md5sums=('4f47b46021b186488b60aaa97f90fe43'
- '2c4021484509498fb17bdbe0b6d85ebf')
-options=(!libtool)
+md5sums=('4f47b46021b186488b60aaa97f90fe43' '2c4021484509498fb17bdbe0b6d85ebf')
+sha1sums=('430af91efbefeb2b98fe30215fb33051e4f8efc5' 
'86e7274711226685dabf7d28f4b93dae85ffb29b')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
   ./configure --prefix=/usr #--enable-debug-log
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
   install -D -m644 $srcdir/50-fprint.rules 
$pkgdir/lib/udev/rules.d/70-fprint.rules
 }



[arch-commits] Commit in libfprint/repos (testing-i686)

2010-07-03 Thread Eric Bélanger
Date: Saturday, July 3, 2010 @ 16:36:06
  Author: eric
Revision: 84742

archrelease: copy trunk to testing-i686

Added:
  libfprint/repos/testing-i686/



[arch-commits] Commit in totem/trunk (PKGBUILD)

2010-07-03 Thread Ionut Biru
Date: Saturday, July 3, 2010 @ 17:39:27
  Author: ibiru
Revision: 84744

add gnome-python  to optdepends. FS#20050

Modified:
  totem/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-07-03 20:36:16 UTC (rev 84743)
+++ PKGBUILD2010-07-03 21:39:27 UTC (rev 84744)
@@ -41,7 +41,8 @@
   'lirc-utils: Infrared Remote Control plugin'
   'libepc: Publish Playlist plugin'
   'pyxdg: Subtitle Downloader plugin'
-  'libgdata: YouTube Browser plugin')
+  'libgdata: YouTube Browser plugin'
+  'gnome-python: Subtitle plugin')
   conflicts=('totem-xine')
   replaces=('totem-xine')
 



[arch-commits] Commit in moon-lander/trunk (3 files)

2010-07-03 Thread Angel Velásquez
Date: Saturday, July 3, 2010 @ 22:43:42
  Author: angvp
Revision: 84745

upgpkg: moon-lander 1.0-7
-m

Added:
  moon-lander/trunk/moon-lander-background.patch
  moon-lander/trunk/moon-lander.desktop
Modified:
  moon-lander/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 moon-lander-background.patch |   25 +
 moon-lander.desktop  |   11 +++
 3 files changed, 39 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-07-03 21:39:27 UTC (rev 84744)
+++ PKGBUILD2010-07-04 02:43:42 UTC (rev 84745)
@@ -4,7 +4,7 @@
 
 pkgname=moon-lander
 pkgver=1.0
-pkgrel=6
+pkgrel=7
 pkgdesc=An addictive game of skill where you must land a space-ship on the 
moon at a perfect speed.
 arch=('i686' 'x86_64')
 url=None
@@ -28,7 +28,8 @@
 
   install -dm755 
$pkgdir/usr/share/$pkgname/{fonts,images/{backgrounds,kablam},sounds}  
   for dir in fonts images{,/backgrounds,/kablam} sounds; do
-install -m644 $dir/* $pkgdir/usr/share/$pkgname/$dir
+#install -m644 $dir/* $pkgdir/usr/share/$pkgname/$dir 
+cp -R $dir/* $pkgdir/usr/share/$pkgname/$dir  chmod -R 755 
$pkgdir/usr/share/$pkgname/$dir
   done
   install -Dm755 moon-lander.bin $pkgdir/usr/bin/moon-lander
   

Added: moon-lander-background.patch
===
--- moon-lander-background.patch(rev 0)
+++ moon-lander-background.patch2010-07-04 02:43:42 UTC (rev 84745)
@@ -0,0 +1,25 @@
+--- moon-lander-1.0.orig/moon_lander.c 2007-03-10 23:07:38.0 +0100
 moon-lander-1.0/moon_lander.c  2007-03-10 23:14:50.0 +0100
+@@ -197,6 +197,8 @@
+ while (!done){
+   if ( files[count] = readdir(dir) ){
+   
++  if ( files[count]-d_type  DT_DIR )
++continue;
+   //printf(I see - %d %s\n, count, files[count]-d_name);
+   count++;
+   }
+@@ -222,12 +224,12 @@
+ 
+   game-back_no++;
+   
+-  if (game-back_no  2){
+-game-back_no = 2;
++  if (game-back_no  0){
++game-back_no = 0;
+   }
+ 
+   if (game-back_no = count){
+-game-back_no = 2;
++game-back_no = 0;
+   }

Added: moon-lander.desktop
===
--- moon-lander.desktop (rev 0)
+++ moon-lander.desktop 2010-07-04 02:43:42 UTC (rev 84745)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Icon=/usr/share/moon-lander/images/win_icon.bmp
+Exec=/usr/bin/moon-lander
+Terminal=false
+StartupNotify=false
+Name=Moon-Lander
+GenericName=Game
+Comment=An addictive game of skill where you must land a space-ship on the 
moon at a perfect speed.
+Categories=Game;



[arch-commits] Commit in moon-lander/repos (extra-i686)

2010-07-03 Thread Angel Velásquez
Date: Saturday, July 3, 2010 @ 22:44:29
  Author: angvp
Revision: 84746

archrelease: remove extra-i686

Deleted:
  moon-lander/repos/extra-i686/



[arch-commits] Commit in moon-lander/repos (extra-i686)

2010-07-03 Thread Angel Velásquez
Date: Saturday, July 3, 2010 @ 22:44:38
  Author: angvp
Revision: 84747

archrelease: copy trunk to extra-i686

Added:
  moon-lander/repos/extra-i686/



[arch-commits] Commit in moon-lander/repos (extra-x86_64)

2010-07-03 Thread Angel Velásquez
Date: Saturday, July 3, 2010 @ 22:45:29
  Author: angvp
Revision: 84748

archrelease: remove extra-x86_64

Deleted:
  moon-lander/repos/extra-x86_64/



[arch-commits] Commit in moon-lander/repos (extra-x86_64)

2010-07-03 Thread Angel Velásquez
Date: Saturday, July 3, 2010 @ 22:45:37
  Author: angvp
Revision: 84749

archrelease: copy trunk to extra-x86_64

Added:
  moon-lander/repos/extra-x86_64/



[arch-commits] Commit in qiv/trunk (PKGBUILD)

2010-07-03 Thread Angel Velásquez
Date: Saturday, July 3, 2010 @ 22:53:11
  Author: angvp
Revision: 84750

upgpkg: qiv 2.2.3-2
-m

Modified:
  qiv/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-07-04 02:45:37 UTC (rev 84749)
+++ PKGBUILD2010-07-04 02:53:11 UTC (rev 84750)
@@ -3,11 +3,11 @@
 # Maintainer: Paul Mattal p...@archlinux.org
 pkgname=qiv
 pkgver=2.2.3
-pkgrel=1
+pkgrel=2
 pkgdesc=Quick Image Viewer (qiv) is a very small and fast GDK/Imlib image 
viewer
 arch=('i686' 'x86_64')
 license=('GPL2')
-depends=('libexif' 'file' 'gtk2' 'imlib2')
+depends=('file' 'gtk2' 'imlib2')
 makedepends=('pkgconfig')
 source=(http://spiegl.de/qiv/download/$pkgname-$pkgver.tgz)
 url=http://spiegl.de/qiv/;



[arch-commits] Commit in qiv/repos (extra-i686)

2010-07-03 Thread Angel Velásquez
Date: Saturday, July 3, 2010 @ 22:53:15
  Author: angvp
Revision: 84751

archrelease: remove extra-i686

Deleted:
  qiv/repos/extra-i686/



[arch-commits] Commit in qiv/repos (extra-i686)

2010-07-03 Thread Angel Velásquez
Date: Saturday, July 3, 2010 @ 22:53:24
  Author: angvp
Revision: 84752

archrelease: copy trunk to extra-i686

Added:
  qiv/repos/extra-i686/



[arch-commits] Commit in qiv/repos (extra-x86_64)

2010-07-03 Thread Angel Velásquez
Date: Saturday, July 3, 2010 @ 22:53:28
  Author: angvp
Revision: 84753

archrelease: remove extra-x86_64

Deleted:
  qiv/repos/extra-x86_64/



[arch-commits] Commit in qiv/repos (extra-x86_64)

2010-07-03 Thread Angel Velásquez
Date: Saturday, July 3, 2010 @ 22:53:37
  Author: angvp
Revision: 84754

archrelease: copy trunk to extra-x86_64

Added:
  qiv/repos/extra-x86_64/



[arch-commits] Commit in mjpegtools/trunk (4 files)

2010-07-03 Thread Eric Bélanger
Date: Saturday, July 3, 2010 @ 23:32:01
  Author: eric
Revision: 84755

upgpkg: mjpegtools 1.9.0-4
Fixed jpeg seg fault (close FS#18659), Added install scriptlet to handle info 
page, Remove old patch

Added:
  mjpegtools/trunk/mjpegtools-1.9.0-jpeg-7.patch
  mjpegtools/trunk/mjpegtools.install
Modified:
  mjpegtools/trunk/PKGBUILD
Deleted:
  mjpegtools/trunk/mjpegtools-1.8.0-gcc41.patch

---+
 PKGBUILD  |   32 +++-
 mjpegtools-1.8.0-gcc41.patch  |   12 
 mjpegtools-1.9.0-jpeg-7.patch |   24 
 mjpegtools.install|   16 
 4 files changed, 59 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-07-04 02:53:37 UTC (rev 84754)
+++ PKGBUILD2010-07-04 03:32:01 UTC (rev 84755)
@@ -4,7 +4,7 @@
 
 pkgname=mjpegtools
 pkgver=1.9.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)
 license=('GPL')
@@ -13,22 +13,28 @@
 makedepends=('gtk2=2.18.6')
 optdepends=('gtk2: glav GUI')
 options=('!makeflags' '!libtool')
+install=mjpegtools.install
 
source=(http://downloads.sourceforge.net/sourceforge/mjpeg/${pkgname}-${pkgver}.tar.gz
 mjpegtools-1.9.0-glibc-2.10.patch
-png2yuv-fix-memleak.patch)
-md5sums=('309a6fcf0900a010d6a9c1e91afc2f5c'
- 'b8ae66237d83be533db8eea166fd3357'
- '39e1def8fb0f7c58a217b22dc251a86a')
+png2yuv-fix-memleak.patch
+mjpegtools-1.9.0-jpeg-7.patch)
+md5sums=('309a6fcf0900a010d6a9c1e91afc2f5c' 'b8ae66237d83be533db8eea166fd3357'\
+ '39e1def8fb0f7c58a217b22dc251a86a' 'ccc7562a3933877d3362da7cf4695ea0')
+sha1sums=('1701233354c7ea86b5b7808c4dd5d03a71118e48' 
'3029f0e835e693b144298ed9f8143c9566be26f3'\
+ '8af5c3747756353bef56d03bafbdd086ff15c02c' 
'2bdb1b3b8591cede11d4a133a758e8ead35db4dd')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure || return 1
-  patch -Np1 -i $srcdir/mjpegtools-1.9.0-glibc-2.10.patch || return 1
-  patch -Np1 -i ${srcdir}/png2yuv-fix-memleak.patch || return 1
-  ./configure --prefix=/usr --enable-largefile || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
+  patch -Np1 -i $srcdir/mjpegtools-1.9.0-glibc-2.10.patch
+  patch -Np1 -i ${srcdir}/png2yuv-fix-memleak.patch
+  patch -Np0 -i ${srcdir}/mjpegtools-1.9.0-jpeg-7.patch
+  ./configure --prefix=/usr --enable-largefile
+  make
+}
 
-  install -m644 mpeg2enc/mpeg2syntaxcodes.h \
-  ${pkgdir}/usr/include/mjpegtools/mpeg2enc/ || return 1
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -m644 mpeg2enc/mpeg2syntaxcodes.h 
${pkgdir}/usr/include/mjpegtools/mpeg2enc/
 }

Deleted: mjpegtools-1.8.0-gcc41.patch
===
--- mjpegtools-1.8.0-gcc41.patch2010-07-04 02:53:37 UTC (rev 84754)
+++ mjpegtools-1.8.0-gcc41.patch2010-07-04 03:32:01 UTC (rev 84755)
@@ -1,12 +0,0 @@
-diff -ur mjpegtools-1.8.0-orig/y4mdenoise/Region2D.hh 
mjpegtools-1.8.0/y4mdenoise/Region2D.hh
 mjpegtools-1.8.0-orig/y4mdenoise/Region2D.hh   2005-12-19 
12:36:54.0 +0300
-+++ mjpegtools-1.8.0/y4mdenoise/Region2D.hh2005-12-19 12:44:36.0 
+0300
-@@ -16,7 +16,7 @@
- 
- #include Status_t.h
- #include iostream
--
-+#include cassert
- 
- 
- // The 2-dimensional region class.  Parameterized by the numeric type

Added: mjpegtools-1.9.0-jpeg-7.patch
===
--- mjpegtools-1.9.0-jpeg-7.patch   (rev 0)
+++ mjpegtools-1.9.0-jpeg-7.patch   2010-07-04 03:32:01 UTC (rev 84755)
@@ -0,0 +1,24 @@
+Fix segmentation fault with jpeg-7 and above where dinfo.do_fancy_upsampling 
isn't set by default to FALSE anymore.
+
+Patch by: Salah Coronya
+
+http://bugs.gentoo.org/show_bug.cgi?id=293919
+
+--- lavtools/jpegutils.c
 lavtools/jpegutils.c
+@@ -502,6 +502,7 @@
+ 
+jpeg_read_header (dinfo, TRUE);
+dinfo.raw_data_out = TRUE;
++   dinfo.do_fancy_upsampling = FALSE;
+dinfo.out_color_space = JCS_YCbCr;
+dinfo.dct_method = JDCT_IFAST;
+guarantee_huff_tables(dinfo);
+@@ -599,6 +600,7 @@
+   if (field  0) {
+  jpeg_read_header (dinfo, TRUE);
+  dinfo.raw_data_out = TRUE;
++ dinfo.do_fancy_upsampling = FALSE;
+  dinfo.out_color_space = JCS_YCbCr;
+  dinfo.dct_method = JDCT_IFAST;
+  jpeg_start_decompress (dinfo);

Added: mjpegtools.install
===
--- mjpegtools.install  (rev 0)
+++ mjpegtools.install  2010-07-04 03:32:01 UTC (rev 84755)
@@ -0,0 +1,16 @@

[arch-commits] Commit in mjpegtools/repos (extra-i686)

2010-07-03 Thread Eric Bélanger
Date: Saturday, July 3, 2010 @ 23:32:14
  Author: eric
Revision: 84756

archrelease: remove extra-i686

Deleted:
  mjpegtools/repos/extra-i686/



[arch-commits] Commit in mjpegtools/repos (extra-i686)

2010-07-03 Thread Eric Bélanger
Date: Saturday, July 3, 2010 @ 23:32:21
  Author: eric
Revision: 84757

archrelease: copy trunk to extra-i686

Added:
  mjpegtools/repos/extra-i686/



[arch-commits] Commit in mjpegtools/repos (extra-x86_64)

2010-07-03 Thread Eric Bélanger
Date: Saturday, July 3, 2010 @ 23:32:34
  Author: eric
Revision: 84758

archrelease: remove extra-x86_64

Deleted:
  mjpegtools/repos/extra-x86_64/



[arch-commits] Commit in mjpegtools/repos (extra-x86_64)

2010-07-03 Thread Eric Bélanger
Date: Saturday, July 3, 2010 @ 23:32:42
  Author: eric
Revision: 84759

archrelease: copy trunk to extra-x86_64

Added:
  mjpegtools/repos/extra-x86_64/