[arch-commits] Commit in python2/repos (staging-x86_64)

2010-10-19 Thread Allan McRae
Date: Tuesday, October 19, 2010 @ 23:31:37
  Author: allan
Revision: 96377

archrelease: copy trunk to staging-x86_64

Added:
  python2/repos/staging-x86_64/



[arch-commits] Commit in python2/repos (staging-x86_64)

2010-10-19 Thread Allan McRae
Date: Tuesday, October 19, 2010 @ 23:31:12
  Author: allan
Revision: 96376

archrelease: remove staging-x86_64

Deleted:
  python2/repos/staging-x86_64/



[arch-commits] Commit in python2/repos (staging-i686)

2010-10-19 Thread Allan McRae
Date: Tuesday, October 19, 2010 @ 23:30:47
  Author: allan
Revision: 96375

archrelease: copy trunk to staging-i686

Added:
  python2/repos/staging-i686/



[arch-commits] Commit in python2/repos (staging-i686)

2010-10-19 Thread Allan McRae
Date: Tuesday, October 19, 2010 @ 23:30:22
  Author: allan
Revision: 96374

archrelease: remove staging-i686

Deleted:
  python2/repos/staging-i686/



[arch-commits] Commit in python2/trunk (PKGBUILD python-2.7-db51.diff)

2010-10-19 Thread Allan McRae
Date: Tuesday, October 19, 2010 @ 23:29:47
  Author: allan
Revision: 96373

upgpkg: python2 2.7-3
db-5.1 rebuild

Added:
  python2/trunk/python-2.7-db51.diff
Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |8 ++--
 python-2.7-db51.diff |   42 ++
 2 files changed, 48 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-10-20 02:51:19 UTC (rev 96372)
+++ PKGBUILD2010-10-20 03:29:47 UTC (rev 96373)
@@ -15,12 +15,16 @@
 optdepends=('tk: for IDLE')
 conflicts=('python<3')
 options=('!makeflags')
-source=(http://www.python.org/ftp/python/${pkgver}/Python-${pkgver}.tar.bz2)
-md5sums=('0e8c9ec32abf5b732bea7d91b38c3339')
+source=(http://www.python.org/ftp/python/${pkgver}/Python-${pkgver}.tar.bz2
+python-2.7-db51.diff)
+md5sums=('0e8c9ec32abf5b732bea7d91b38c3339'
+ 'd9b8161568ce17a305c1b71e61ccd4b5')
 
 build() {
   cd ${srcdir}/Python-${pkgver}
 
+  patch -Np1 -i $srcdir/python-2.7-db51.diff
+
   export OPT="${CFLAGS}"
   ./configure --prefix=/usr --enable-shared --with-threads \
   --enable-unicode=ucs4 --with-system-expat

Added: python-2.7-db51.diff
===
--- python-2.7-db51.diff(rev 0)
+++ python-2.7-db51.diff2010-10-20 03:29:47 UTC (rev 96373)
@@ -0,0 +1,42 @@
+diff -Naur Python-2.7-orig//Modules/_bsddb.c Python-2.7/Modules/_bsddb.c
+--- Python-2.7-orig//Modules/_bsddb.c  2010-05-10 00:46:46.0 +1000
 Python-2.7/Modules/_bsddb.c2010-10-20 13:19:26.436669911 +1000
+@@ -9765,8 +9765,11 @@
+ 
+ ADD_INT(d, DB_REP_PERMANENT);
+ 
+-#if (DBVER >= 44)
++#if (DBVER >= 44) && (DBVER <= 48)
+ ADD_INT(d, DB_REP_CONF_NOAUTOINIT);
++#endif
++
++#if (DBVER >= 44)
+ ADD_INT(d, DB_REP_CONF_DELAYCLIENT);
+ ADD_INT(d, DB_REP_CONF_BULK);
+ ADD_INT(d, DB_REP_CONF_NOWAIT);
+diff -Naur Python-2.7-orig//setup.py Python-2.7/setup.py
+--- Python-2.7-orig//setup.py  2010-06-27 22:36:16.0 +1000
 Python-2.7/setup.py2010-10-20 13:10:48.256670026 +1000
+@@ -765,7 +765,7 @@
+ # a release.  Most open source OSes come with one or more
+ # versions of BerkeleyDB already installed.
+ 
+-max_db_ver = (4, 8)
++max_db_ver = (5, 1)
+ min_db_ver = (4, 1)
+ db_setup_debug = False   # verbose debug prints from this script?
+ 
+@@ -787,8 +787,12 @@
+ return True
+ 
+ def gen_db_minor_ver_nums(major):
+-if major == 4:
++if major == 5:
+ for x in range(max_db_ver[1]+1):
++if allow_db_ver((5, x)):
++yield x
++if major == 4:
++for x in range(9):
+ if allow_db_ver((4, x)):
+ yield x
+ elif major == 3:



[arch-commits] Commit in fvwm-crystal/repos (extra-i686 extra-x86_64)

2010-10-19 Thread Eric Bélanger
Date: Tuesday, October 19, 2010 @ 22:51:19
  Author: eric
Revision: 96372

removed extra-i686 and extra-x86_64 for fvwm-crystal

Deleted:
  fvwm-crystal/repos/extra-i686/
  fvwm-crystal/repos/extra-x86_64/



[arch-commits] Commit in fvwm-crystal/repos (extra-any)

2010-10-19 Thread Eric Bélanger
Date: Tuesday, October 19, 2010 @ 22:51:15
  Author: eric
Revision: 96371

archrelease: copy trunk to extra-any

Added:
  fvwm-crystal/repos/extra-any/



[arch-commits] Commit in fvwm-crystal/trunk (ChangeLog PKGBUILD python2.6.patch)

2010-10-19 Thread Eric Bélanger
Date: Tuesday, October 19, 2010 @ 22:50:21
  Author: eric
Revision: 96370

upgpkg: fvwm-crystal 3.0.6-3
Rebuilt for python2, Switched to 'any' arch, Added docs, Updated url

Modified:
  fvwm-crystal/trunk/PKGBUILD
  fvwm-crystal/trunk/python2.6.patch
Deleted:
  fvwm-crystal/trunk/ChangeLog

-+
 ChangeLog   |   14 --
 PKGBUILD|   35 ---
 python2.6.patch |4 ++--
 3 files changed, 18 insertions(+), 35 deletions(-)

Deleted: ChangeLog
===
--- ChangeLog   2010-10-20 02:45:06 UTC (rev 96369)
+++ ChangeLog   2010-10-20 02:50:21 UTC (rev 96370)
@@ -1,14 +0,0 @@
-2008-11-09  Eric Belanger  
-
-   * fvwm-crystal 3.0.6-2
-   * Rebuilt for python 2.6 (close FS#12033)
-   * Removed unneeded .install file
-
-2008-07-08  Eric Belanger  
-
-   * fvwm-crystal 3.0.6-1
-   * Upstream update
-   * Added arch field
-   * Cleaned up install scriptlet
-   * Removed from the package unneeded files coming from the svn tree 
-   * Added ChangeLog

Modified: PKGBUILD
===
--- PKGBUILD2010-10-20 02:45:06 UTC (rev 96369)
+++ PKGBUILD2010-10-20 02:50:21 UTC (rev 96370)
@@ -1,33 +1,30 @@
 # $Id$
 # Maintainer: Eric Belanger 
-# Contributor: Simo Leone 
 
 pkgname=fvwm-crystal
 pkgver=3.0.6
-pkgrel=2
+pkgrel=3
 pkgdesc="Transparent Themes for fvwm"
-arch=('i686' 'x86_64')
-url="http://www.fvwm-crystal.org";
+arch=('any')
+url="http://gna.org/projects/fvwm-crystal/";
 license=('GPL')
-depends=('fvwm-devel' 'imagemagick' 'python' 'habak' 'trayer')
+depends=('fvwm-devel' 'imagemagick' 'python2' 'habak' 'trayer')
 
source=(http://download.gna.org/fvwm-crystal/${pkgver}/${pkgname}-${pkgver}.tar.gz
 python2.6.patch)
-md5sums=('82e2800882abb2c822519f1aa4dc0c72' '8e381c0233e3b6053722390e0e19b5ae')
-sha1sums=('965e521f64b8a89994f5afee25c8b1c88239bff0' 
'6dfa5c12a29477111de8fbc3789d06c2ec04cf5e')
+md5sums=('82e2800882abb2c822519f1aa4dc0c72' 'c0baa3da5e188f7e0f7a01d6481b6a53')
+sha1sums=('965e521f64b8a89994f5afee25c8b1c88239bff0' 
'cfac2165ca8311fc446410cfed3b1d1f92b8ae61')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}/bin
-  patch -p0 < ../../python2.6.patch || return 1
-  cd ..
-  make prefix=${pkgdir}/usr install || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p0 < ../python2.6.patch
+}
 
-  # make gdm work
-  install -D -m644 addons/fvwm-crystal.desktop 
${pkgdir}/etc/X11/sessions/fvwm-crystal.desktop || return 1
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make prefix="${pkgdir}/usr" install install-doc
+  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' 
"${pkgdir}"/usr/bin/fvwm-crystal.{apps,wallpaper} \
+
"${pkgdir}"/usr/share/fvwm-crystal/fvwm/scripts/FvwmMPD/{getprevdir.py,stripnames.py}
+  install -D -m644 addons/fvwm-crystal.desktop 
"${pkgdir}/etc/X11/sessions/fvwm-crystal.desktop"
 
   # Cleaning up files from svn tree
-  cd ${pkgdir}/usr/share/fvwm-crystal/fvwm/
-  rm -r */.svn
-  rm -r */*/.svn
-  rm -r */*/*/.svn
-  rm -r */*/*/*/.svn
-  rm -r */*/*/*/*/.svn
+  find "${pkgdir}" -depth -type d -name .svn -exec rm -rf {} \;
 }

Modified: python2.6.patch
===
--- python2.6.patch 2010-10-20 02:45:06 UTC (rev 96369)
+++ python2.6.patch 2010-10-20 02:50:21 UTC (rev 96370)
@@ -1,5 +1,5 @@
 fvwm-crystal.apps.new  2008-10-24 23:48:23.0 +0200
-+++ fvwm-crystal.apps  2008-10-24 23:54:45.0 +0200
+--- bin/fvwm-crystal.apps.new  2008-10-24 23:48:23.0 +0200
 bin/fvwm-crystal.apps  2008-10-24 23:54:45.0 +0200
 @@ -102,7 +102,7 @@
group = OptionGroup(parser, "General creation options", "Options 
definig what should be generated")
  # group.add_option('-g', '--generate', action = 'store', 
choices=['all','menus','panel','topapps'], dest='generate', default='all', 
metavar='WHAT',



[arch-commits] Commit in python2/repos (staging-x86_64)

2010-10-19 Thread Stéphane Gaudreault
Date: Tuesday, October 19, 2010 @ 22:45:06
  Author: stephane
Revision: 96369

archrelease: copy trunk to staging-x86_64

Added:
  python2/repos/staging-x86_64/



[arch-commits] Commit in python2/repos (staging-i686)

2010-10-19 Thread Stéphane Gaudreault
Date: Tuesday, October 19, 2010 @ 22:43:36
  Author: stephane
Revision: 96368

archrelease: copy trunk to staging-i686

Added:
  python2/repos/staging-i686/



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

2010-10-19 Thread Stéphane Gaudreault
Date: Tuesday, October 19, 2010 @ 22:42:07
  Author: stephane
Revision: 96367

db-5.1 rebuild

Modified:
  python2/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2010-10-20 01:41:07 UTC (rev 96366)
+++ PKGBUILD2010-10-20 02:42:07 UTC (rev 96367)
@@ -4,7 +4,7 @@
 
 pkgname=python2
 pkgver=2.7
-pkgrel=2
+pkgrel=3
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
 arch=('i686' 'x86_64')



[arch-commits] Commit in apr-util/repos (staging-x86_64)

2010-10-19 Thread Allan McRae
Date: Tuesday, October 19, 2010 @ 21:41:07
  Author: allan
Revision: 96366

archrelease: copy trunk to staging-x86_64

Added:
  apr-util/repos/staging-x86_64/



[arch-commits] Commit in apr-util/repos (staging-i686)

2010-10-19 Thread Allan McRae
Date: Tuesday, October 19, 2010 @ 21:40:34
  Author: allan
Revision: 96365

archrelease: copy trunk to staging-i686

Added:
  apr-util/repos/staging-i686/



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

2010-10-19 Thread Allan McRae
Date: Tuesday, October 19, 2010 @ 21:39:57
  Author: allan
Revision: 96364

upgpkg: apr-util 1.3.10-2
db-5.1 rebuild

Modified:
  apr-util/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2010-10-19 23:22:07 UTC (rev 96363)
+++ PKGBUILD2010-10-20 01:39:57 UTC (rev 96364)
@@ -4,11 +4,11 @@
 
 pkgname=apr-util
 pkgver=1.3.10
-pkgrel=1
+pkgrel=2
 pkgdesc="The Apache Portable Runtime"
 arch=('i686' 'x86_64')
 url="http://apr.apache.org/";
-depends=('apr>=1.4.2' 'gdbm' 'expat' 'db>=4.8' 'libldap' 'unixodbc')
+depends=('apr>=1.4.2' 'gdbm' 'expat' 'db' 'libldap' 'unixodbc')
 options=('!libtool')
 license=('APACHE')
 source=("http://www.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2";)



[arch-commits] Commit in xemacs/repos (staging-x86_64)

2010-10-19 Thread Stéphane Gaudreault
Date: Tuesday, October 19, 2010 @ 19:22:07
  Author: stephane
Revision: 96363

archrelease: copy trunk to staging-x86_64

Added:
  xemacs/repos/staging-x86_64/



[arch-commits] Commit in xemacs/repos (staging-i686)

2010-10-19 Thread Stéphane Gaudreault
Date: Tuesday, October 19, 2010 @ 19:20:29
  Author: stephane
Revision: 96362

archrelease: copy trunk to staging-i686

Added:
  xemacs/repos/staging-i686/



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

2010-10-19 Thread Stéphane Gaudreault
Date: Tuesday, October 19, 2010 @ 19:18:53
  Author: stephane
Revision: 96361

db-5.1 rebuild
Apply security patches from Gentoo
Fix FS#20977 and FS#21148

Added:
  xemacs/trunk/xemacs-21.5.29-large-images.patch
  xemacs/trunk/xemacs-21.5.29-optimization-bug.patch
  xemacs/trunk/xemacs-21.5.29-vcdiff.patch
Modified:
  xemacs/trunk/PKGBUILD

---+
 PKGBUILD  |   50 
 xemacs-21.5.29-large-images.patch |   96 
 xemacs-21.5.29-optimization-bug.patch |   14 
 xemacs-21.5.29-vcdiff.patch   |   19 ++
 4 files changed, 167 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-10-19 22:10:37 UTC (rev 96360)
+++ PKGBUILD2010-10-19 23:18:53 UTC (rev 96361)
@@ -1,25 +1,46 @@
 # $Id$
 # Maintainer: juergen 
+# Contributor : Stéphane Gaudreault 
 
 pkgname=xemacs
 pkgver=21.5.29
-pkgrel=2
+pkgrel=3
 pkgdesc="highly customizable open source text editor and application 
development system forked from GNU Emacs"
 arch=(i686 x86_64)
 url="http://www.xemacs.org/";
 license=('GPL')
-depends=('db>=4.8' 'libpng' 'libtiff' 'gpm>=1.20.4' 'bash' 'ncurses>=5.6-7' 
'desktop-file-utils' 'libxaw' 'libjpeg')
+depends=('db' 'libpng' 'libtiff' 'gpm>=1.20.4' 'bash' 'ncurses>=5.6-7' 
'desktop-file-utils' 'libxaw' 'libjpeg')
 optdepends=('xorg-fonts-75dpi: X bitmap fonts needed for the interface'
-'xorg-fonts-100dpi: X bitmap fonts needed for the interface') 
+'xorg-fonts-100dpi: X bitmap fonts needed for the interface')
 makedepends=('giflib' 'xbitmaps')
 install=xemacs.install
-source=(http://ftp.xemacs.org/pub/xemacs/beta/$pkgname-$pkgver.tar.gz 
xemacs.desktop)
-md5sums=('5364192ae0d3de23d9f4ce197e6493b5' 'a4d3d5c0aa2c7ce7bec491f809ca3694')
-   
+source=(http://ftp.xemacs.org/pub/xemacs/beta/$pkgname-$pkgver.tar.gz
+xemacs.desktop
+xemacs-21.5.29-large-images.patch
+xemacs-21.5.29-optimization-bug.patch
+xemacs-21.5.29-vcdiff.patch)
+md5sums=('5364192ae0d3de23d9f4ce197e6493b5'
+ 'a4d3d5c0aa2c7ce7bec491f809ca3694'
+ '23ca5a7c50fe7ebebd9fc4525882cdf1'
+ 'eb061b10ea3bbe1026df5326ae1618e3'
+ '4ada657a351b226cdd557f9faaeab075')
+
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  infodir=/usr/share/info
-  mandir=/usr/share/man/man1
+
+  # Fix security issue in vcdiff script
+  patch -Np0 -i ../xemacs-21.5.29-vcdiff.patch
+
+   # Fix problem caused by improper optimization with GCC>=4.1.2 on i686
+   # (and possibly other arches). See
+   # http://tracker.xemacs.org/XEmacs/its/issue354
+  # for the upstream bug report.
+  patch -Np0 -i ../xemacs-21.5.29-optimization-bug.patch
+   
+   # Fix for security bug
+  # See http://bugs.gentoo.org/show_bug.cgi?id=275397
+  patch -Np1 -i ../xemacs-21.5.29-large-images.patch
+
   ./configure --build="${CHOST}" --prefix=/usr --with-dynamic \
   --with-x11 --without-postgresql --with-athena=xaw \
   --enable-database=berkdb --without-ldap \
@@ -28,12 +49,17 @@
   --enable-external-widget \
   --with-jpeg --with-png --with-tiff \
   --with-ncurses --with-pop --with-xfs --disable-sound \
-  --infodir=${infodir} \
-  --mandir=${mandir} || return 1
+  --infodir=/usr/share/info \
+  --with-mule \
+  --mandir=/usr/share/man/man1
 
-  make || return 1
-  make -j1 prefix="${pkgdir}/usr" mandir="${pkgdir}${mandir}" 
infodir="${pkgdir}${infodir}" install gzip-el || return 1
+  make
+}
 
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make -j1 prefix="${pkgdir}/usr" mandir="${pkgdir}/usr/share/man/man1" 
infodir="${pkgdir}/usr/share/info" install gzip-el
+
   rm ${pkgdir}/usr/bin/{b2m,ctags,etags,rcs-checkin}
   rm ${pkgdir}/usr/share/man/man1/{ctags.1,etags.1}
 

Added: xemacs-21.5.29-large-images.patch
===
--- xemacs-21.5.29-large-images.patch   (rev 0)
+++ xemacs-21.5.29-large-images.patch   2010-10-19 23:18:53 UTC (rev 96361)
@@ -0,0 +1,96 @@
+APPROVE COMMIT 21.5
+
+This patch has been committed.  When trying to open very large image
+files (or image files with header files that claim the image is very
+large), we multiply length times width to get the number of pixels in
+the image (and possibly multiply that number if a pixel occupies more
+than 1 byte).  The multiplication can overflow, resulting in passing
+negative or insufficiently positive size values to malloc.  This patch
+checks whether the multiplication will overflow.  If so, XEmacs
+refuses to attempt to load the image.
+
+(Patch taken from upstream, already applied there)
+
+--- a/src/glyphs-eimage.c  Mon Jun 29 08:20:47 2009 -0600
 b/src/glyphs-eimage.c  Wed Jul 01 15:42:54 2009 -0600
+@@ -409,6 +409,7 @@
+*/
+
+   {
++UINT_64_BIT pixels_sq;
+ int jpeg_gray 

[arch-commits] Commit in (mod_python)

2010-10-19 Thread Andrea Scarpino
Date: Tuesday, October 19, 2010 @ 18:10:37
  Author: andrea
Revision: 96360

mod_python is dead, mod_wsgi replaces it

Deleted:
  mod_python/



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

2010-10-19 Thread Andrea Scarpino
Date: Tuesday, October 19, 2010 @ 18:08:38
  Author: andrea
Revision: 96359

db-remove: mod_python removed by andrea

Deleted:
  mod_python/repos/extra-x86_64/



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

2010-10-19 Thread Andrea Scarpino
Date: Tuesday, October 19, 2010 @ 18:08:18
  Author: andrea
Revision: 96358

db-remove: mod_python removed by andrea

Deleted:
  mod_python/repos/extra-i686/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:57:08
  Author: ibiru
Revision: 96357

archrelease: copy trunk to extra-x86_64

Added:
  gtk2/repos/extra-x86_64/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:56:55
  Author: ibiru
Revision: 96356

archrelease: remove extra-x86_64

Deleted:
  gtk2/repos/extra-x86_64/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:56:43
  Author: ibiru
Revision: 96355

archrelease: copy trunk to extra-i686

Added:
  gtk2/repos/extra-i686/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:56:28
  Author: ibiru
Revision: 96354

archrelease: remove extra-i686

Deleted:
  gtk2/repos/extra-i686/



[arch-commits] Commit in gtk2/trunk (PKGBUILD old-icon-symlinks.patch)

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:56:12
  Author: ibiru
Revision: 96353

upgpkg: gtk2 2.22.0-5
fix missing icons. FS#21084

Added:
  gtk2/trunk/old-icon-symlinks.patch
Modified:
  gtk2/trunk/PKGBUILD

-+
 PKGBUILD|8 -
 old-icon-symlinks.patch |  269 ++
 2 files changed, 274 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-10-19 21:49:50 UTC (rev 96352)
+++ PKGBUILD2010-10-19 21:56:12 UTC (rev 96353)
@@ -3,7 +3,7 @@
 
 pkgname=gtk2
 pkgver=2.22.0
-pkgrel=4
+pkgrel=5
 pkgdesc="The GTK+ Toolkit (v2)"
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/";
@@ -17,13 +17,15 @@
 backup=(etc/gtk-2.0/gtkrc)
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.22/gtk+-${pkgver}.tar.bz2
-xid-collision-debug.patch)
+xid-collision-debug.patch old-icon-symlinks.patch)
 sha256sums=('d9522c80d4b8a954f7474e32bd5a99ba3051996f1c4681426db5f79a1c1b4602'
-'d758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
+'d758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
+'1298e4103f71d0304378f1e7503011150f6f68398ae8ebae5522a48feaea7c0d')
 
 build() {
   cd "${srcdir}/gtk+-${pkgver}"
   patch -Np1 -i "${srcdir}/xid-collision-debug.patch"
+  patch -Np1 -i "${srcdir}/old-icon-symlinks.patch"
 
   CXX=/bin/false ./configure --prefix=/usr \
   --sysconfdir=/etc \

Added: old-icon-symlinks.patch
===
--- old-icon-symlinks.patch (rev 0)
+++ old-icon-symlinks.patch 2010-10-19 21:56:12 UTC (rev 96353)
@@ -0,0 +1,269 @@
+diff -aur gtk+-2.22.0.orig//gtk/Makefile.in gtk+-2.22.0/gtk/Makefile.in
+--- gtk+-2.22.0.orig//gtk/Makefile.in  2010-10-15 04:57:50.810006145 +0800
 gtk+-2.22.0/gtk/Makefile.in2010-10-15 05:13:49.083339478 +0800
+@@ -1598,7 +1598,172 @@
+   stock-icons/24/folder-remote.png\
+   stock-icons/24/user-home.png\
+   stock-icons/24/user-desktop.png \
+-  stock-icons/24/text-x-generic.png
++  stock-icons/24/text-x-generic.png   \
++  stock-icons/16/gtk-quit.png \
++  stock-icons/16/gtk-info.png \
++  stock-icons/16/gtk-file.png \
++  stock-icons/16/gtk-open.png \
++  stock-icons/16/gtk-print-preview.png\
++  stock-icons/16/gtk-print.png\
++  stock-icons/16/gtk-properties.png   \
++  stock-icons/16/gtk-revert-to-saved-ltr.png  \
++  stock-icons/16/gtk-revert-to-saved-rtl.png  \
++  stock-icons/16/gtk-save-as.png  \
++  stock-icons/16/gtk-new.png  \
++  stock-icons/16/gtk-harddisk.png \
++  stock-icons/16/gtk-clear.png\
++  stock-icons/16/gtk-copy.png \
++  stock-icons/16/gtk-cut.png  \
++  stock-icons/16/gtk-delete.png   \
++  stock-icons/16/gtk-find-and-replace.png \
++  stock-icons/16/gtk-find.png \
++  stock-icons/16/gtk-paste.png\
++  stock-icons/16/gtk-redo-ltr.png \
++  stock-icons/16/gtk-redo-rtl.png \
++  stock-icons/16/gtk-select-all.png   \
++  stock-icons/16/gtk-undo-ltr.png \
++  stock-icons/16/gtk-undo-rtl.png \
++  stock-icons/16/gtk-directory.png\
++  stock-icons/16/gtk-unindent-ltr.png \
++  stock-icons/16/gtk-unindent-rtl.png \
++  stock-icons/16/gtk-indent-ltr.png   \
++  stock-icons/16/gtk-indent-rtl.png   \
++  stock-icons/16/gtk-justify-center.png   \
++  stock-icons/16/gtk-justify-fill.png \
++  stock-icons/16/gtk-justify-left.png \
++  stock-icons/16/gtk-justify-right.png\
++  stock-icons/16/gtk-bold.png \
++  stock-icons/16/gtk-italic.png   \
++  stock-icons/16/gtk-strikethrough.png\
++  stock-icons/16/gtk-underline.png\
++  stock-icons/16/gtk-goto-bottom.png  \
++  stock-icons/16/gtk-go-down.png  \
++  stock-icons/16/gtk-goto-first-ltr.png   \
++  stock-icons/16/gtk-home.png \
++  stock-icons/16/gtk-jump-to-ltr.png  \
++  stock-icons/16/gtk-jump-to-rtl.png  \
++  stock-icons/16/gtk-goto-last-ltr.png\
++  stock-icons/16/gtk-go-forward-ltr.png   \
++  stock-icons/16/gtk-go-back-ltr.png  \
++  stock-icons

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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:49:50
  Author: ibiru
Revision: 96352

db-move: moved strigi from [staging] to [extra] (x86_64)

Added:
  strigi/repos/extra-x86_64/
Deleted:
  strigi/repos/staging-x86_64/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:49:49
  Author: ibiru
Revision: 96351

db-move: strigi removed by ibiru for move to [extra] (x86_64)

Deleted:
  strigi/repos/extra-x86_64/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:49:48
  Author: ibiru
Revision: 96350

db-move: moved strigi from [staging] to [extra] (i686)

Added:
  strigi/repos/extra-i686/
Deleted:
  strigi/repos/staging-i686/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:49:47
  Author: ibiru
Revision: 96349

db-move: strigi removed by ibiru for move to [extra] (i686)

Deleted:
  strigi/repos/extra-i686/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:49:39
  Author: ibiru
Revision: 96346

db-move: moved koffice from [staging] to [extra] (i686)

Added:
  koffice/repos/extra-i686/
Deleted:
  koffice/repos/staging-i686/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:49:44
  Author: ibiru
Revision: 96348

db-move: moved koffice from [staging] to [extra] (x86_64)

Added:
  koffice/repos/extra-x86_64/
Deleted:
  koffice/repos/staging-x86_64/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:49:43
  Author: ibiru
Revision: 96347

db-move: koffice removed by ibiru for move to [extra] (x86_64)

Deleted:
  koffice/repos/extra-x86_64/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:49:37
  Author: ibiru
Revision: 96345

db-move: koffice removed by ibiru for move to [extra] (i686)

Deleted:
  koffice/repos/extra-i686/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:49:35
  Author: ibiru
Revision: 96344

db-move: moved kdegraphics from [staging] to [extra] (x86_64)

Added:
  kdegraphics/repos/extra-x86_64/
Deleted:
  kdegraphics/repos/staging-x86_64/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:49:33
  Author: ibiru
Revision: 96343

db-move: kdegraphics removed by ibiru for move to [extra] (x86_64)

Deleted:
  kdegraphics/repos/extra-x86_64/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:49:31
  Author: ibiru
Revision: 96342

db-move: moved kdegraphics from [staging] to [extra] (i686)

Added:
  kdegraphics/repos/extra-i686/
Deleted:
  kdegraphics/repos/staging-i686/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:49:29
  Author: ibiru
Revision: 96341

db-move: kdegraphics removed by ibiru for move to [extra] (i686)

Deleted:
  kdegraphics/repos/extra-i686/



[arch-commits] Commit in kdebase-runtime/repos (extra-x86_64 staging-x86_64)

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:49:28
  Author: ibiru
Revision: 96340

db-move: moved kdebase-runtime from [staging] to [extra] (x86_64)

Added:
  kdebase-runtime/repos/extra-x86_64/
Deleted:
  kdebase-runtime/repos/staging-x86_64/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:49:27
  Author: ibiru
Revision: 96339

db-move: kdebase-runtime removed by ibiru for move to [extra] (x86_64)

Deleted:
  kdebase-runtime/repos/extra-x86_64/



[arch-commits] Commit in kdebase-runtime/repos (extra-i686 staging-i686)

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:49:25
  Author: ibiru
Revision: 96338

db-move: moved kdebase-runtime from [staging] to [extra] (i686)

Added:
  kdebase-runtime/repos/extra-i686/
Deleted:
  kdebase-runtime/repos/staging-i686/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:49:24
  Author: ibiru
Revision: 96337

db-move: kdebase-runtime removed by ibiru for move to [extra] (i686)

Deleted:
  kdebase-runtime/repos/extra-i686/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:49:21
  Author: ibiru
Revision: 96336

db-move: moved hugin from [staging] to [extra] (x86_64)

Added:
  hugin/repos/extra-x86_64/
Deleted:
  hugin/repos/staging-x86_64/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:49:20
  Author: ibiru
Revision: 96335

db-move: hugin removed by ibiru for move to [extra] (x86_64)

Deleted:
  hugin/repos/extra-x86_64/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:49:19
  Author: ibiru
Revision: 96334

db-move: moved hugin from [staging] to [extra] (i686)

Added:
  hugin/repos/extra-i686/
Deleted:
  hugin/repos/staging-i686/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:49:17
  Author: ibiru
Revision: 96333

db-move: hugin removed by ibiru for move to [extra] (i686)

Deleted:
  hugin/repos/extra-i686/



[arch-commits] Commit in gimp-ufraw/repos (extra-x86_64 staging-x86_64)

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:49:16
  Author: ibiru
Revision: 96332

db-move: moved gimp-ufraw from [staging] to [extra] (x86_64)

Added:
  gimp-ufraw/repos/extra-x86_64/
Deleted:
  gimp-ufraw/repos/staging-x86_64/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:49:14
  Author: ibiru
Revision: 96331

db-move: gimp-ufraw removed by ibiru for move to [extra] (x86_64)

Deleted:
  gimp-ufraw/repos/extra-x86_64/



[arch-commits] Commit in gimp-ufraw/repos (extra-i686 staging-i686)

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:49:12
  Author: ibiru
Revision: 96330

db-move: moved gimp-ufraw from [staging] to [extra] (i686)

Added:
  gimp-ufraw/repos/extra-i686/
Deleted:
  gimp-ufraw/repos/staging-i686/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:49:10
  Author: ibiru
Revision: 96329

db-move: gimp-ufraw removed by ibiru for move to [extra] (i686)

Deleted:
  gimp-ufraw/repos/extra-i686/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:49:04
  Author: ibiru
Revision: 96326

db-move: moved geeqie from [staging] to [extra] (i686)

Added:
  geeqie/repos/extra-i686/
Deleted:
  geeqie/repos/staging-i686/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:49:03
  Author: ibiru
Revision: 96325

db-move: geeqie removed by ibiru for move to [extra] (i686)

Deleted:
  geeqie/repos/extra-i686/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:49:01
  Author: ibiru
Revision: 96324

db-move: moved exiv2 from [staging] to [extra] (x86_64)

Added:
  exiv2/repos/extra-x86_64/
Deleted:
  exiv2/repos/staging-x86_64/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:49:08
  Author: ibiru
Revision: 96328

db-move: moved geeqie from [staging] to [extra] (x86_64)

Added:
  geeqie/repos/extra-x86_64/
Deleted:
  geeqie/repos/staging-x86_64/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:49:06
  Author: ibiru
Revision: 96327

db-move: geeqie removed by ibiru for move to [extra] (x86_64)

Deleted:
  geeqie/repos/extra-x86_64/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:48:59
  Author: ibiru
Revision: 96323

db-move: exiv2 removed by ibiru for move to [extra] (x86_64)

Deleted:
  exiv2/repos/extra-x86_64/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:48:58
  Author: ibiru
Revision: 96322

db-move: moved exiv2 from [staging] to [extra] (i686)

Added:
  exiv2/repos/extra-i686/
Deleted:
  exiv2/repos/staging-i686/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:48:57
  Author: ibiru
Revision: 96321

db-move: exiv2 removed by ibiru for move to [extra] (i686)

Deleted:
  exiv2/repos/extra-i686/



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

2010-10-19 Thread Allan McRae
Date: Tuesday, October 19, 2010 @ 17:39:21
  Author: allan
Revision: 96320

db-move: moved coreutils from [testing] to [core] (x86_64)

Added:
  coreutils/repos/core-x86_64/
Deleted:
  coreutils/repos/testing-x86_64/



[arch-commits] Commit in coreutils/repos (core-x86_64)

2010-10-19 Thread Allan McRae
Date: Tuesday, October 19, 2010 @ 17:39:18
  Author: allan
Revision: 96319

db-move: coreutils removed by allan for move to [core] (x86_64)

Deleted:
  coreutils/repos/core-x86_64/



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

2010-10-19 Thread Allan McRae
Date: Tuesday, October 19, 2010 @ 17:39:16
  Author: allan
Revision: 96318

db-move: moved coreutils from [testing] to [core] (i686)

Added:
  coreutils/repos/core-i686/
Deleted:
  coreutils/repos/testing-i686/



[arch-commits] Commit in coreutils/repos (core-i686)

2010-10-19 Thread Allan McRae
Date: Tuesday, October 19, 2010 @ 17:39:15
  Author: allan
Revision: 96317

db-move: coreutils removed by allan for move to [core] (i686)

Deleted:
  coreutils/repos/core-i686/



[arch-commits] Commit in koffice/repos (staging-x86_64)

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:32:21
  Author: ibiru
Revision: 96316

archrelease: copy trunk to staging-x86_64

Added:
  koffice/repos/staging-x86_64/



[arch-commits] Commit in koffice/repos (staging-i686)

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:30:46
  Author: ibiru
Revision: 96315

archrelease: copy trunk to staging-i686

Added:
  koffice/repos/staging-i686/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:29:08
  Author: ibiru
Revision: 96314

upgpkg: koffice 2.2.2-4
exiv2 rebuild

Modified:
  koffice/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2010-10-19 21:25:38 UTC (rev 96313)
+++ PKGBUILD2010-10-19 21:29:08 UTC (rev 96314)
@@ -30,7 +30,7 @@
'koffice-tools'
'koffice-thesaurus-doc')
 pkgver=2.2.2
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url='http://koffice.kde.org'
 license=('GPL' 'LGPL' 'FDL')



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

2010-10-19 Thread Allan McRae
Date: Tuesday, October 19, 2010 @ 17:25:38
  Author: allan
Revision: 96313

clean-up

Deleted:
  wicd/repos/extra-i686/
  wicd/repos/extra-x86_64/



[arch-commits] Commit in gift-openft/repos (staging-x86_64)

2010-10-19 Thread Stéphane Gaudreault
Date: Tuesday, October 19, 2010 @ 17:07:21
  Author: stephane
Revision: 96312

archrelease: copy trunk to staging-x86_64

Added:
  gift-openft/repos/staging-x86_64/



[arch-commits] Commit in gift-openft/repos (staging-i686)

2010-10-19 Thread Stéphane Gaudreault
Date: Tuesday, October 19, 2010 @ 17:07:15
  Author: stephane
Revision: 96311

archrelease: copy trunk to staging-i686

Added:
  gift-openft/repos/staging-i686/



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

2010-10-19 Thread Stéphane Gaudreault
Date: Tuesday, October 19, 2010 @ 17:07:07
  Author: stephane
Revision: 96310

db-5.1 rebuild

Modified:
  gift-openft/trunk/PKGBUILD

--+
 PKGBUILD |   14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-10-19 21:03:41 UTC (rev 96309)
+++ PKGBUILD2010-10-19 21:07:07 UTC (rev 96310)
@@ -4,18 +4,22 @@
 
 pkgname=gift-openft
 pkgver=0.2.1.6
-pkgrel=9
+pkgrel=10
 pkgdesc="GiFT's OpenFT plugin"
 arch=('i686' 'x86_64')
 url="http://gift.sourceforge.net/";
 license=('GPL')
-depends=('gift' 'zlib' 'db>=4.8')
+depends=('gift' 'zlib' 'db')
 
source=(http://downloads.sourceforge.net/sourceforge/gift/$pkgname-$pkgver.tar.bz2)
 md5sums=('6661f01304246a29aeabda113691ca93')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
+  ./configure --prefix=/usr
+  make 
 }
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install 
+} 



[arch-commits] Commit in gimp-ufraw/repos (staging-x86_64)

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:03:41
  Author: ibiru
Revision: 96309

archrelease: copy trunk to staging-x86_64

Added:
  gimp-ufraw/repos/staging-x86_64/



[arch-commits] Commit in gimp-ufraw/repos (staging-i686)

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:03:21
  Author: ibiru
Revision: 96308

archrelease: copy trunk to staging-i686

Added:
  gimp-ufraw/repos/staging-i686/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 17:03:01
  Author: ibiru
Revision: 96307

upgpkg: gimp-ufraw 0.16-4
exiv2 rebuild

Modified:
  gimp-ufraw/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2010-10-19 21:02:38 UTC (rev 96306)
+++ PKGBUILD2010-10-19 21:03:01 UTC (rev 96307)
@@ -4,7 +4,7 @@
 pkgname=gimp-ufraw
 _srcname=ufraw
 pkgver=0.16
-pkgrel=3
+pkgrel=4
 pkgdesc="Standalone or gimp plugin converter for raw files"
 url="http://ufraw.sourceforge.net/";
 arch=('i686' 'x86_64')
@@ -23,13 +23,13 @@
   --enable-extras \
   --enable-mime \
   --enable-openmp \
-  --with-exiv2 || return 1
-  sed -i "s/-ffast-math -fomit-frame-pointer -W -Wall -O3/${CFLAGS}/" Makefile 
|| return 1
-  make || return 1
+  --with-exiv2
+  sed -i "s/-ffast-math -fomit-frame-pointer -W -Wall -O3/${CFLAGS}/" Makefile
+  make
 }
 
 package() {
   cd ${srcdir}/${_srcname}-${pkgver}
-  make DESTDIR="${pkgdir}" install || return 1
+  make DESTDIR="${pkgdir}" install
   rm -f ${pkgdir}/usr/bin/dcraw
 }



[arch-commits] Commit in openldap/repos (staging-x86_64)

2010-10-19 Thread Stéphane Gaudreault
Date: Tuesday, October 19, 2010 @ 17:02:38
  Author: stephane
Revision: 96306

archrelease: copy trunk to staging-x86_64

Added:
  openldap/repos/staging-x86_64/



[arch-commits] Commit in openldap/repos (staging-i686)

2010-10-19 Thread Stéphane Gaudreault
Date: Tuesday, October 19, 2010 @ 17:02:25
  Author: stephane
Revision: 96305

archrelease: copy trunk to staging-i686

Added:
  openldap/repos/staging-i686/



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

2010-10-19 Thread Stéphane Gaudreault
Date: Tuesday, October 19, 2010 @ 17:02:12
  Author: stephane
Revision: 96304

db-5.1 rebuild

Modified:
  openldap/trunk/PKGBUILD

--+
 PKGBUILD |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-10-19 20:59:14 UTC (rev 96303)
+++ PKGBUILD2010-10-19 21:02:12 UTC (rev 96304)
@@ -4,7 +4,7 @@
 
 pkgname=openldap
 pkgver=2.4.23
-pkgrel=1
+pkgrel=2
 pkgdesc="LDAP Server"
 arch=('i686' 'x86_64')
 license=('custom')
@@ -23,17 +23,20 @@
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+   
+  export LIBS=-ldb
   ./configure --prefix=/usr \
   --mandir=/usr/share/man \
   --libexecdir=/usr/sbin \
   --sysconfdir=/etc \
   --localstatedir=/var/lib/openldap \
+  --enable-bdb \
   --enable-crypt \
   --enable-dynamic \
   --with-threads \
   --enable-wrappers \
- --enable-spasswd \
- --with-cyrus-sasl
+  --enable-spasswd \
+  --with-cyrus-sasl
   
   find . -name 'Makefile' -exec \
sed -e 
's|$(LDAP_LIBDIR)/liblber/liblber.la|/usr/lib/liblber-2.4.so.2|g' \



[arch-commits] Commit in geeqie/repos (staging-x86_64)

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 16:59:14
  Author: ibiru
Revision: 96303

archrelease: copy trunk to staging-x86_64

Added:
  geeqie/repos/staging-x86_64/



[arch-commits] Commit in geeqie/repos (staging-i686)

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 16:58:53
  Author: ibiru
Revision: 96302

archrelease: copy trunk to staging-i686

Added:
  geeqie/repos/staging-i686/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 16:58:33
  Author: ibiru
Revision: 96301

upgpkg: geeqie 1.0-3
exiv2 rebuild

Modified:
  geeqie/trunk/ChangeLog
  geeqie/trunk/PKGBUILD

---+
 ChangeLog |4 
 PKGBUILD  |8 
 2 files changed, 8 insertions(+), 4 deletions(-)

Modified: ChangeLog
===
--- ChangeLog   2010-10-19 20:51:10 UTC (rev 96300)
+++ ChangeLog   2010-10-19 20:58:33 UTC (rev 96301)
@@ -1,3 +1,7 @@
+2010-10-19  Ionut Biru 
+   * geeqie 1.0-3
+   * exiv2 0.20 rebuild
+
 2010-03-09  Andrea Scarpino 
* geeqie 1.0-2
* exiv2 0.19 rebuild

Modified: PKGBUILD
===
--- PKGBUILD2010-10-19 20:51:10 UTC (rev 96300)
+++ PKGBUILD2010-10-19 20:58:33 UTC (rev 96301)
@@ -4,7 +4,7 @@
 
 pkgname=geeqie
 pkgver=1.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A lightweight image browser and viewer (fork of GQview)"
 arch=('i686' 'x86_64')
 url="http://geeqie.sourceforge.net/";
@@ -18,11 +18,11 @@
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  CPPFLAGS="-D_FILE_OFFSET_BITS=64" ./configure --prefix=/usr || return 1
-  make || return 1
+  CPPFLAGS="-D_FILE_OFFSET_BITS=64" ./configure --prefix=/usr
+  make
 }
 
 package(){
   cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install || return 1
+  make DESTDIR="${pkgdir}" install
 }



[arch-commits] Commit in hugin/repos (staging-x86_64)

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 16:51:10
  Author: ibiru
Revision: 96300

archrelease: copy trunk to staging-x86_64

Added:
  hugin/repos/staging-x86_64/



[arch-commits] Commit in hugin/repos (staging-i686)

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 16:50:39
  Author: ibiru
Revision: 96299

archrelease: copy trunk to staging-i686

Added:
  hugin/repos/staging-i686/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 16:49:49
  Author: ibiru
Revision: 96298

upgpkg: hugin 2010.0.0-3
exiv2 rebuild

Modified:
  hugin/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2010-10-19 20:32:35 UTC (rev 96297)
+++ PKGBUILD2010-10-19 20:49:49 UTC (rev 96298)
@@ -5,7 +5,7 @@
 
 pkgname=hugin
 pkgver=2010.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A frontend to the panorama-tools"
 arch=('i686' 'x86_64')
 url="http://hugin.sourceforge.net/";
@@ -22,20 +22,20 @@
 
 build() {
   cd ${srcdir}
-  patch -Np0 -i libpng14.patch || return 1
+  patch -Np0 -i libpng14.patch
 
-  mkdir build && cd build || return 1
+  mkdir build && cd build
 
   cmake "${srcdir}/${pkgname}-${pkgver}" \
 -DCMAKE_BUILD_TYPE=Release \
 -DCMAKE_INSTALL_PREFIX=/usr \
 -DCMAKE_EXE_LINKER_FLAGS="-lpthread" \
--DENABLE_LAPACK=yes || return 1
+-DENABLE_LAPACK=yes
 
-  make || return 1
+  make
 }
 
 package(){
   cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR=${pkgdir} install
 }



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 16:32:35
  Author: ibiru
Revision: 96297

archrelease: copy trunk to extra-x86_64

Added:
  totem/repos/extra-x86_64/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 16:32:17
  Author: ibiru
Revision: 96296

archrelease: remove extra-x86_64

Deleted:
  totem/repos/extra-x86_64/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 16:32:02
  Author: ibiru
Revision: 96295

archrelease: copy trunk to extra-i686

Added:
  totem/repos/extra-i686/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 16:31:46
  Author: ibiru
Revision: 96294

archrelease: remove extra-i686

Deleted:
  totem/repos/extra-i686/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 16:31:32
  Author: ibiru
Revision: 96293

upgpkg: totem 2.32.0-3
pygtk rebuild

Modified:
  totem/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2010-10-19 19:58:48 UTC (rev 96292)
+++ PKGBUILD2010-10-19 20:31:32 UTC (rev 96293)
@@ -4,11 +4,11 @@
 pkgbase=totem
 pkgname=('totem' 'totem-plugin')
 pkgver=2.32.0
-pkgrel=2
+pkgrel=3
 url="http://www.hadess.net/totem.php3";
 arch=('i686' 'x86_64')
 license=('GPL2' 'custom')
-makedepends=('gstreamer0.10-base-plugins>=0.10.30' 
'gstreamer0.10-good-plugins>=0.10.22' 'totem-plparser>=2.31.92' 'libxxf86vm' 
'libxtst' 'desktop-file-utils' 'iso-codes>=3.10.1' 'libepc>=0.3.10' 'python2' 
'libgdata>=0.6.4' 'nautilus>=2.30.1' 'xulrunner>=1.9.2' 'pkgconfig' 
'bluez>=4.64' 'lirc-utils' 'gnome-doc-utils>=0.20.1' 
'gnome-control-center>=2.31.92' 'intltool' 'pygtk>=2.22.0')
+makedepends=('gstreamer0.10-base-plugins>=0.10.30' 
'gstreamer0.10-good-plugins>=0.10.22' 'totem-plparser>=2.32.0' 'libxxf86vm' 
'libxtst' 'desktop-file-utils' 'iso-codes>=3.10.1' 'libepc>=0.3.10' 'python2' 
'libgdata>=0.6.4' 'nautilus>=2.32.0' 'xulrunner>=1.9.2' 'pkgconfig' 
'bluez>=4.64' 'lirc-utils' 'gnome-doc-utils>=0.20.1' 
'gnome-control-center>=2.32.0' 'intltool' 'pygtk>=2.22.0')
 
 options=('!libtool' '!emptydirs')
 
source=(http://ftp.gnome.org/pub/gnome/sources/totem/2.32/${pkgbase}-${pkgver}.tar.bz2)
@@ -26,7 +26,7 @@
 
 package_totem() {
   pkgdesc="A GNOME2 integrated movie player based on Gstreamer."
-  depends=('gstreamer0.10-base-plugins>=0.10.30' 
'gstreamer0.10-good-plugins>=0.10.22' 'totem-plparser>=2.31.92' 'libxxf86vm' 
'libxtst' 'desktop-file-utils' 'iso-codes>=3.10.1' 'python2' 'libunique>=1.1.6')
+  depends=('gstreamer0.10-base-plugins>=0.10.30' 
'gstreamer0.10-good-plugins>=0.10.22' 'totem-plparser>=2.32.0' 'libxxf86vm' 
'libxtst' 'desktop-file-utils' 'iso-codes>=3.10.1' 'python2' 'libunique>=1.1.6')
   groups=('gnome-extra')
   install=totem.install
   optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs'



[arch-commits] Commit in ruby/repos (staging-x86_64)

2010-10-19 Thread Stéphane Gaudreault
Date: Tuesday, October 19, 2010 @ 15:58:48
  Author: stephane
Revision: 96292

archrelease: copy trunk to staging-x86_64

Added:
  ruby/repos/staging-x86_64/



[arch-commits] Commit in ruby/repos (staging-i686)

2010-10-19 Thread Stéphane Gaudreault
Date: Tuesday, October 19, 2010 @ 15:53:38
  Author: stephane
Revision: 96291

archrelease: copy trunk to staging-i686

Added:
  ruby/repos/staging-i686/



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

2010-10-19 Thread Andrea Scarpino
Date: Tuesday, October 19, 2010 @ 15:44:04
  Author: andrea
Revision: 96290

archrelease: copy trunk to extra-x86_64

Added:
  kdebindings/repos/extra-x86_64/



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

2010-10-19 Thread Andrea Scarpino
Date: Tuesday, October 19, 2010 @ 15:43:44
  Author: andrea
Revision: 96289

archrelease: remove extra-x86_64

Deleted:
  kdebindings/repos/extra-x86_64/



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

2010-10-19 Thread Andrea Scarpino
Date: Tuesday, October 19, 2010 @ 15:43:30
  Author: andrea
Revision: 96288

archrelease: copy trunk to extra-i686

Added:
  kdebindings/repos/extra-i686/



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

2010-10-19 Thread Andrea Scarpino
Date: Tuesday, October 19, 2010 @ 15:43:11
  Author: andrea
Revision: 96287

archrelease: remove extra-i686

Deleted:
  kdebindings/repos/extra-i686/



[arch-commits] Commit in kdebindings/trunk (PKGBUILD mono-2.8.patch)

2010-10-19 Thread Andrea Scarpino
Date: Tuesday, October 19, 2010 @ 14:57:18
  Author: andrea
Revision: 96286

mono-2.8.patch updated

Modified:
  kdebindings/trunk/PKGBUILD
  kdebindings/trunk/mono-2.8.patch

+
 PKGBUILD   |4 ++--
 mono-2.8.patch |   14 --
 2 files changed, 14 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-10-19 18:42:36 UTC (rev 96285)
+++ PKGBUILD2010-10-19 18:57:18 UTC (rev 96286)
@@ -20,7 +20,7 @@
 sha1sums=('108fd6e3dbb341adc0e90487d1b681534968f1d2'
'36b52d147fee24a65c756baaad00e3d1ac081d3d'
'c0045f5b57fb62e6b0a9443548938f93af501b9d'
-   '1e5e049bb18164c6fc43d120d024088b8dd1eea7')
+   '9fdcab702f4e0ac8adec40a4a97208f18d5b826a')
 
 build() {
cd ${srcdir}/${pkgbase}-${pkgver}
@@ -29,7 +29,7 @@

# Already fixed in 4.5.3
patch -Np4 -i ${srcdir}/fix-generator-segfaults.patch
-   patch -Np1 -i ${srcdir}/mono-2.8.patch
+   patch -Np3 -i ${srcdir}/mono-2.8.patch
 
export MONO_SHARED_DIR="${srcdir}/build/.mono"
mkdir -p "$MONO_SHARED_DIR"

Modified: mono-2.8.patch
===
--- mono-2.8.patch  2010-10-19 18:42:36 UTC (rev 96285)
+++ mono-2.8.patch  2010-10-19 18:57:18 UTC (rev 96286)
@@ -1,5 +1,5 @@
 kdebindings/csharp/kimono/CMakeLists.txt   2010/05/19 22:20:26 1128672
-+++ kdebindings/csharp/kimono/CMakeLists.txt   2010/10/09 14:30:30 1184234
+--- trunk/KDE/kdebindings/csharp/kimono/CMakeLists.txt 2010/05/19 22:20:26 
1128672
 trunk/KDE/kdebindings/csharp/kimono/CMakeLists.txt 2010/10/09 14:30:30 
1184234
 @@ -22,7 +22,7 @@
${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS})
  
@@ -9,3 +9,13 @@
  pkg_search_module(GLIB2 glib-2.0)
  
  macro_log_feature(LIBMONO_FOUND "libmono" "Mono library" 
"http://www.mono-project.com"; FALSE "" "Required to compile 
kimonopluginfactory")
+--- trunk/KDE/kdebindings/csharp/kimono/src/kimonopluginfactory.cpp
2010/10/09 14:25:41 1184233
 trunk/KDE/kdebindings/csharp/kimono/src/kimonopluginfactory.cpp
2010/10/09 14:30:30 1184234
+@@ -42,6 +42,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include 
+ #include 



[arch-commits] Commit in firefox-i18n/repos (extra-any)

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 14:42:36
  Author: ibiru
Revision: 96285

archrelease: copy trunk to extra-any

Added:
  firefox-i18n/repos/extra-any/



[arch-commits] Commit in firefox-i18n/repos (extra-any)

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 14:42:22
  Author: ibiru
Revision: 96284

archrelease: remove extra-any

Deleted:
  firefox-i18n/repos/extra-any/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 14:42:13
  Author: ibiru
Revision: 96283

upgpkg: firefox-i18n 3.6.11-1
3.6.11

Modified:
  firefox-i18n/trunk/PKGBUILD

--+
 PKGBUILD |  148 ++---
 1 file changed, 74 insertions(+), 74 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-10-19 18:27:50 UTC (rev 96282)
+++ PKGBUILD2010-10-19 18:42:13 UTC (rev 96283)
@@ -4,7 +4,7 @@
 # Contributor: Michal Hybner 
 
 pkgname=firefox-i18n
-pkgver=3.6.10
+pkgver=3.6.11
 pkgrel=1
 pkgdesc="Language packs for Firefox"
 arch=('any')
@@ -97,76 +97,76 @@
 install -D -m 644 chrome.manifest 
"${pkgdir}/usr/lib/firefox-3.6/chrome/${lang}.manifest"
   done
 }
-md5sums=('2bac23e636d4b1a3f90113be010d891b'
- '89bfa26945226c933d922434ee0c8203'
- 'b64283131648fb2ee9f8a826c843e733'
- '958e2308c4a95c34607aa2d18b4ac43c'
- 'af4f9e909f1abf7f58583d0467189e00'
- '7bfc92e2265db7926933776e5004b223'
- 'ae858e1754f7cc86cd96e6582e64edc3'
- '6cfd1a7883c5e7c4eb18521f8d8646d4'
- 'b0da061f8c287779ac8435fce1ec8231'
- '574cbb7d1a3073fc7347b97bf4d41af0'
- '344a031cd3344f0844e5e09afb7a'
- 'd4d465ec8ebdd7fe399253c708a42a08'
- 'efbbc14992f51c6caf9aa7827d193406'
- 'd5eed0fa2005dcd0028c939342125b63'
- '2f5260fa21c39b25e5495c3d47721857'
- 'f5fa4b7d032944955baa3be2975444d0'
- '185fcd976d45caea2014b3ba3e44aa00'
- '8a8710e5ee87a3e7e9b722ce532ef1b7'
- 'cba790948215d47102bd00d4dad7afc8'
- 'abb6c475129ba8f47764daa6fa25ffe1'
- '9fb243e30ab3c185662f0cc73e4ad34c'
- 'bd6c348f25e9b65dc6c889092f959bb1'
- '6a6dee7e7a6dc918f2c26054d873f6b8'
- 'c8e14bfcf90a422db4455b13a0aedc46'
- '35b806d8af6359a7472b72a096b2e3f7'
- 'c5909b954e7a630e4339e987b1bddc04'
- '713db70cbf0f11f285c3f72447779986'
- '4ae5aa3d76fbc4855aa772a7d7325006'
- '79927380c90e782ad009bcba9334f59b'
- 'a4aa77aba56025a6ab3ca3f47a50d0aa'
- 'e1afef8a6749a3354cab2de1daaa4231'
- '958d3b149defc7fad412c351073fcfbe'
- '381e8644fd92c2062ebdb6f84e8c687b'
- '463c84b43edee3228e9c3694e135e26d'
- '6ecae59f358bc399472334d9beccb3df'
- '8f759b4af1d0ecc38a6cb07afeb58fc5'
- 'f60f7d4aec76c14a2ec329cc1c6d34c4'
- 'caa2db805102bbd4d78fbf65c601a899'
- '164d108b0dd6a1000addc5ed8700968c'
- 'aeb9195479c448e98db06f5476a03317'
- 'da29a7038e08aa27248ca5e94fc7fb34'
- '63e61ede6e7f8a80d7e578d73d0c5c5f'
- 'b347c41fe02477143ef9abd9481026fa'
- '2ec036ad46f2b3e8d9ed48feeab0ddcb'
- '20f1d45414d0bd190e5a535fbdf52748'
- 'd15f0d154d6a626aa0753fb4fd10ca7d'
- '4c7bd007c92405a861dac4d75a81ce29'
- '7ad7584f76034b39ce32253a58401523'
- 'a1f75d91985201b7d5462c37528c301f'
- '43f72ff85a7ee764707ac130919a906e'
- 'd6c78abd6cea3f79fdb9491433eb1b66'
- '7952de3cb149aa080b1a0ed792558f39'
- '86b31f55ae9321611146c5587444e1f5'
- '48c2029f995b0ce206a4860b666d4562'
- 'c17e87fa636d9450079b59081c483a1b'
- '14e0a2a303d59bdcfaca029b3947d4d4'
- '03aea5d333bf08328fab95585d1ff477'
- '8ffbf5617de1d89ad67f5b72257be0fa'
- '9fc982e253840e85593dc32d82a285a1'
- '58d16b19c8de335f5cd834c3374e89b7'
- '93cdb8ca8832be903d314b1f07d57655'
- 'de410613c4a446484c13a77cf7c32177'
- '3719dfe65849882cd514efdc6fe1b639'
- 'aa8ae3a7a9fab53aee61d663e211cb8a'
- 'ab480ac7417b68a9d184ff892c6ca917'
- '5c93be3712e8bdadfa21e97c84b6d9fe'
- 'a828565ef23d9d5d535331d0a598f7dc'
- '3e6cb1cc7b6c8cfcf3931ef989f70911'
- '4175061750c2029a04744659ad6ef4ac'
- '769b018738ada8d0d9bc712595c9ed2c'
- '7fccdb772a23209fa83820b1be6fcfed'
- '5ace708a4e0a78fae4165075488fb5fc'
- '0d6fabd9a1fbb4f12688b85d958ba879')
+md5sums=('c893425c3c392408eb260201aa746578'
+ 'a2a09661091edff33a7ef91049b80e74'
+ '5c1015167fe455bb512e9a03f0cd0e34'
+ '80f4a56cf2e50591a6c121772de16dc4'
+ '5d9ec9417fce0e2d1b80bcc0c6b42d32'
+ '50978d56fa8db2cf154077ae4b740297'
+ '38232c9bc91a5755d93a723707453972'
+ '880d7d6050515d62ea7dd65fd6933b50'
+ '6baac275d2e533ca42156d4f993104fe'
+ 'a4d5ced07ab21e9cbbdc4569da726750'
+ '507ee7cd10174611d28dcbf6593f0e8b'
+ 'b05602d1f2d102c3a6ff4ae0682dfdf5'
+ '03c237996e1e032d512edab1c6bdccc6'
+ 'acbad5ce208501bc96e970564b0c0b4c'
+ '6355f9cb895a139699cd4254724877fc'
+ 'c1b7d07445c4797845315caf9f6a0de1'
+ '352240bdf0c2ccdb1a5b14225c3fc06e'
+ '4d1ab8a9b4b05bfd3206e957f4d0990b'
+ 'e58671061d0b20cbeb1602e53da7351e'
+ 'cafdd1e0d024d556c80d438b40a41468'
+ '0c1092898d683169f69

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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 14:27:50
  Author: ibiru
Revision: 96282

archrelease: copy trunk to extra-x86_64

Added:
  firefox/repos/extra-x86_64/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 14:27:35
  Author: ibiru
Revision: 96281

archrelease: remove extra-x86_64

Deleted:
  firefox/repos/extra-x86_64/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 14:27:24
  Author: ibiru
Revision: 96280

archrelease: copy trunk to extra-i686

Added:
  firefox/repos/extra-i686/



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

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 14:27:10
  Author: ibiru
Revision: 96279

archrelease: remove extra-i686

Deleted:
  firefox/repos/extra-i686/



[arch-commits] Commit in firefox/trunk (PKGBUILD mozconfig python2.7.patch)

2010-10-19 Thread Ionut Biru
Date: Tuesday, October 19, 2010 @ 14:27:02
  Author: ibiru
Revision: 96278

upgpkg: firefox 3.6.11-1
update to 3.6.11

Added:
  firefox/trunk/python2.7.patch
Modified:
  firefox/trunk/PKGBUILD
  firefox/trunk/mozconfig

-+
 PKGBUILD|   17 ++---
 mozconfig   |2 +-
 python2.7.patch |   11 +++
 3 files changed, 22 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-10-19 18:22:05 UTC (rev 96277)
+++ PKGBUILD2010-10-19 18:27:02 UTC (rev 96278)
@@ -2,14 +2,14 @@
 # Contributor: Jakub Schmidtke 
 
 pkgname=firefox
-pkgver=3.6.10
+pkgver=3.6.11
 pkgrel=1
-_xulver=1.9.2.10
+_xulver=1.9.2.11
 pkgdesc="Standalone web browser from mozilla.org"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
 depends=("xulrunner=${_xulver}" 'desktop-file-utils')
-makedepends=('zip' 'pkg-config' 'diffutils' 'libgnomeui>=2.24.1' 'python' 
'wireless_tools')
+makedepends=('zip' 'pkg-config' 'diffutils' 'libgnomeui>=2.24.1' 'python2' 
'wireless_tools' 'autoconf2.13')
 install=firefox.install
 url="http://www.mozilla.org/projects/firefox";
 
source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${pkgver}/source/firefox-${pkgver}.source.tar.bz2
@@ -19,15 +19,17 @@
 mozilla-firefox-1.0-lang.patch
 browser-defaulturls.patch
 firefox-version.patch
-   firefox-agent.patch)
-md5sums=('59ee60ddfd8b33e99a24788d3b12adb3'
- '1e4283a24953f8d0c6a5c00a36ae0981'
+   firefox-agent.patch
+python2.7.patch)
+md5sums=('f698dd0f8f145d84933a50f69662c8db'
+ 'ca385167401b98ef7adc6529e4b53205'
  'ba96924ece1d77453e462429037a2ce5'
  '6f38a5899034b7786cb1f75ad42032b8'
  'bd5db57c23c72a02a489592644f18995'
  '1807651225b021e043154f8bba715a19'
  '92c11c66dd69b03f214002fededd1fc8'
- 'f437e94acff8f810991271ef4677d859')
+ 'f437e94acff8f810991271ef4677d859'
+ 'ab3dc9aecae7f08b9492fb3c00a5fd28')
 
 build() {
   cd "${srcdir}/mozilla-1.9.2"
@@ -35,6 +37,7 @@
   patch -Np1 -i "${srcdir}/browser-defaulturls.patch"
   patch -Np1 -i "${srcdir}/firefox-version.patch"
   patch -Np1 -i "${srcdir}/firefox-agent.patch"
+  patch -Np0 -i "${srcdir}/python2.7.patch"
 
   cp "${srcdir}/mozconfig" .mozconfig
   unset CFLAGS

Modified: mozconfig
===
--- mozconfig   2010-10-19 18:22:05 UTC (rev 96277)
+++ mozconfig   2010-10-19 18:27:02 UTC (rev 96278)
@@ -17,7 +17,7 @@
 ac_add_options --disable-xprint
 ac_add_options --enable-strip
 ac_add_options --enable-pango
-ac_add_options --enable-system-cairo
+#ac_add_options --enable-system-cairo
 ac_add_options --enable-svg
 ac_add_options --enable-canvas
 ac_add_options --enable-startup-notification

Added: python2.7.patch
===
--- python2.7.patch (rev 0)
+++ python2.7.patch 2010-10-19 18:27:02 UTC (rev 96278)
@@ -0,0 +1,11 @@
+--- configure.in   2010-10-12 10:44:37.0 -0700
 configure.in~  2010-10-19 09:51:49.660019364 -0700
+@@ -811,7 +811,7 @@
+ AC_MSG_RESULT([yes])
+ fi
+ 
+-MOZ_PATH_PROGS(PYTHON, $PYTHON python2.5 python2.4 python)
++MOZ_PATH_PROGS(PYTHON, $PYTHON python2.7 python2.5 python2.4 python)
+ if test -z "$PYTHON"; then
+ AC_MSG_ERROR([python was not found in \$PATH])
+ fi



  1   2   3   >