Wed Nov 2 23:14:55 UTC 2011

6 files changed, 164 insertions, 12 deletions

diff --git a/community-testing/acpitool/PKGBUILD b/community-testing/acpitool/PKGBUILD
new file mode 100644
index 000000000..d9b079988
--- /dev/null
+++ b/community-testing/acpitool/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 57685 2011-11-01 09:10:22Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Gerhard Brauer <gerhard.brauer@web.de>
+# Contributor: Milosz Piglas <archeofuture@gmail.com>
+
+pkgname=acpitool
+pkgver=0.5.1
+pkgrel=4
+pkgdesc="ACPI client - replacement for apm tool"
+url="http://sourceforge.net/projects/acpitool/"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gcc-libs')
+source=(http://downloads.sourceforge.net/sourceforge/acpitool/acpitool-$pkgver.tar.bz2
+	linux-3.0.patch
+	sysfs-battery.patch)
+md5sums=('9e4ec55201be0be71ffbc56d38b42b57'
+         'eb149edb32be6cdf20a7d16beb3e9f70'
+         '8211c37dbf888b76388699b7c6098503')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -p1 <$srcdir/linux-3.0.patch
+  patch -p1 <$srcdir/sysfs-battery.patch
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make prefix="$pkgdir/usr" install
+}
diff --git a/community-testing/acpitool/linux-3.0.patch b/community-testing/acpitool/linux-3.0.patch
new file mode 100644
index 000000000..ba454a0c2
--- /dev/null
+++ b/community-testing/acpitool/linux-3.0.patch
@@ -0,0 +1,18 @@
+diff -wbBur acpitool-0.5.1/src/acpitool.cpp acpitool-0.5.1.my/src/acpitool.cpp
+--- acpitool-0.5.1/src/acpitool.cpp	2009-08-13 23:37:48.000000000 +0400
++++ acpitool-0.5.1.my/src/acpitool.cpp	2011-08-11 21:53:17.000000000 +0400
+@@ -205,8 +205,12 @@
+ 	Kernel_24 = 1;           
+ 	Kernel_26 = 0;
+     }
+-        
+-    if(strncmp(str,"2.6",3)==0)
++    else if(strncmp(str,"2.6",3)==0)
++    {
++	Kernel_24 = 0;
++	Kernel_26 = 1;
++    }
++    else
+     {
+ 	Kernel_24 = 0;           
+ 	Kernel_26 = 1;
diff --git a/community-testing/acpitool/sysfs-battery.patch b/community-testing/acpitool/sysfs-battery.patch
new file mode 100644
index 000000000..11a58ecc5
--- /dev/null
+++ b/community-testing/acpitool/sysfs-battery.patch
@@ -0,0 +1,50 @@
+diff -wbBur acpitool-0.5.1/src/battery.cpp acpitool-0.5.1.my/src/battery.cpp
+--- acpitool-0.5.1/src/battery.cpp	2009-08-13 23:42:43.000000000 +0400
++++ acpitool-0.5.1.my/src/battery.cpp	2011-11-01 13:07:20.000000000 +0400
+@@ -781,45 +781,7 @@
+ 
+ int Count_Batteries_ProcFS()
+ {
+-    DIR *battery_dir;
+-    char *name, *dirname;
+-    int t = 0;
+-       
+-    dirname = "/proc/acpi/battery/";    
+-    battery_dir = opendir(dirname);
+-    if(battery_dir)                  
+-    {
+-	struct dirent **namelist;
+-	int n = 0;
+-
+-	n = scandir(dirname, &namelist, 0, alphasort);
+-	if(n<0)
+-	  t = -1;
+-	else
+-	{
+-	    while(n--)
+-	    {
+-		name = namelist[n]->d_name;
+-		// skip . and .. //
+-		if (!strcmp (".", name) || !strcmp ("..", name))
+-		{
+-		    // do nothing
+-		}
+-		else
+-		{
+-		    t++;
+-		}
+-		free(namelist[n]);
+-	    }
+-	    free(namelist);
+-	}
+-    }
+-    else
+-    {
+-	t = 0;
+-    }
+-    closedir(battery_dir);
+-    return t;
++    return 0;
+ }
+ 
+ 
diff --git a/community-testing/gambas3/PKGBUILD b/community-testing/gambas3/PKGBUILD
index 517c91293..5fcce3d22 100644
--- a/community-testing/gambas3/PKGBUILD
+++ b/community-testing/gambas3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 57225 2011-10-24 20:32:33Z andrea $
+# $Id: PKGBUILD 57734 2011-11-01 19:55:59Z lcarlier $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 
 pkgbase=gambas3
@@ -12,7 +12,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba
          'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit'
          'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal'
          'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') 
-pkgver=2.99.5
+pkgver=2.99.6
 pkgrel=2
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('i686' 'x86_64')
@@ -20,14 +20,14 @@ url="http://gambas.sourceforge.net/"
 license=('GPL')
 groups=('gambas3')
 makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils'
-         'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'qtwebkit' 'gtk2' 'imlib2' 'gdk-pixbuf2'
+         'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'gtk2' 'imlib2' 'gdk-pixbuf2' 'qtwebkit'
          'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3' 'librsvg'
          'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre'
          'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring')
 options=('!emptydirs' '!makeflags')
 source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2"
         'gambas3-script.install' 'gambas3-runtime.install')
-md5sums=('dfa16f5208463e81ba8ca801948c353a'
+md5sums=('746aaae5494c4b267bdae802c5c006d5'
          'b284be39d147ec799f1116a6abc068b4'
          'b5cc403990f31b8ea1c5cf37366d3d29')
 
diff --git a/community-testing/shotwell/PKGBUILD b/community-testing/shotwell/PKGBUILD
index c61cd1b00..4e238db97 100644
--- a/community-testing/shotwell/PKGBUILD
+++ b/community-testing/shotwell/PKGBUILD
@@ -1,25 +1,26 @@
-# $Id: PKGBUILD 57609 2011-10-31 14:06:37Z spupykin $
+# $Id: PKGBUILD 57683 2011-11-01 08:40:42Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
 
 pkgname=shotwell
 pkgver=0.11.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A digital photo organizer designed for the GNOME desktop environment"
 arch=('i686' 'x86_64')
 url="http://yorba.org/shotwell/"
 license=('LGPL2.1')
 depends=('gconf' 'libgee' 'libgphoto2' 'libunique' 'libwebkit' 'libgexiv2' 'libraw'
 	 'librsvg' 'json-glib' 'desktop-file-utils' 'dconf')
-makedepends=('intltool' 'vala')
+makedepends=('intltool')
+# 'vala'
 install=shotwell.install
 source=("http://yorba.org/download/shotwell/0.11/shotwell-${pkgver}.tar.bz2"
 	"http://ftp.gnome.org/pub/gnome/sources/vala/0.12/vala-0.12.1.tar.bz2"
-	"build-hack.patch")
+	"fix-with-libraw-0.4.patch")
 md5sums=('d437c73127b1cb29a8f9c014effc6aa0'
          'bf35262cc611de447147d01cbac33767'
-         'afc8657b3fb3803d40f5e621e7857af8')
+         '488787b6d2cbc7348bc88348b78b6005')
 
 build() {
   cd "${srcdir}/vala-0.12.1"
@@ -29,14 +30,15 @@ build() {
   export PATH=$srcdir/vala/bin:$PATH
 
   cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -Np1 -i ../fix-with-libraw-0.4.patch
+
   ./configure --prefix=/usr \
 	--with-gconf-schema-file-dir=/usr/share/gconf/schemas \
 	--disable-schemas-install \
 	--disable-desktop-update \
 	--disable-icon-update
-  # hack
-  make || true
-  patch -p1 <$srcdir/build-hack.patch
+
   make
 }
 
diff --git a/community-testing/shotwell/fix-with-libraw-0.4.patch b/community-testing/shotwell/fix-with-libraw-0.4.patch
new file mode 100644
index 000000000..f6f021b61
--- /dev/null
+++ b/community-testing/shotwell/fix-with-libraw-0.4.patch
@@ -0,0 +1,50 @@
+Seulement dans shotwell-0.11.5-fixed/misc: gschemas.compiled
+diff -ru shotwell-0.11.5/src/photos/GRaw.vala shotwell-0.11.5-fixed/src/photos/GRaw.vala
+--- shotwell-0.11.5/src/photos/GRaw.vala	2011-09-24 00:52:27.000000000 +0200
++++ shotwell-0.11.5-fixed/src/photos/GRaw.vala	2011-11-01 00:25:05.976289495 +0100
+@@ -163,9 +163,9 @@
+         proc = new LibRaw.Processor(options);
+     }
+     
+-    public void add_masked_borders_to_bitmap() {
+-        proc.add_masked_borders_to_bitmap();
+-    }
++//    public void add_masked_borders_to_bitmap() {
++//        proc.add_masked_borders_to_bitmap();
++//    }
+     
+     public void adjust_sizes_info_only() throws Exception {
+         throw_exception("adjust_sizes_info_only", proc.adjust_sizes_info_only());
+@@ -215,9 +215,9 @@
+         throw_exception("ppm_tiff_writer", proc.ppm_tiff_writer(filename));
+     }
+     
+-    public void rotate_fuji_raw() throws Exception {
+-        throw_exception("rotate_fuji_raw", proc.rotate_fuji_raw());
+-    }
++//    public void rotate_fuji_raw() throws Exception {
++//        throw_exception("rotate_fuji_raw", proc.rotate_fuji_raw());
++//    }
+     
+     public void thumb_writer(string filename) throws Exception {
+         throw_exception("thumb_writer", proc.thumb_writer(filename));
+@@ -262,7 +262,7 @@
+         // camera_profile
+         // bad_pixels
+         // dark_frame
+-        output_params->filtering_mode = LibRaw.Filtering.AUTOMATIC;
++        // output_params->filtering_mode = LibRaw.Filtering.AUTOMATIC;
+         output_params->output_bps = 8;
+         // output_tiff
+         output_params->user_flip = GRaw.Flip.FROM_SOURCE;
+@@ -303,8 +303,8 @@
+         case LibRaw.Result.UNSUPPORTED_THUMBNAIL:
+             throw new Exception.UNSUPPORTED_THUMBNAIL(msg);
+         
+-        case LibRaw.Result.CANNOT_ADDMASK:
+-            throw new Exception.CANNOT_ADDMASK(msg);
++//        case LibRaw.Result.CANNOT_ADDMASK:
++//            throw new Exception.CANNOT_ADDMASK(msg);
+         
+         case LibRaw.Result.UNSUFFICIENT_MEMORY:
+             throw new Exception.OUT_OF_MEMORY(msg);