[arch-commits] Commit in seahorse/repos (3 files)

[Allan McRae]

    Date: Saturday, September 19, 2009 @ 09:01:51
  Author: allan
Revision: 52431

Merged revisions 52428 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/seahorse/trunk

........
  r52428 | allan | 2009-09-19 22:56:07 +1000 (Sat, 19 Sep 2009) | 2 lines
  
  upgpkg: seahorse 2.26.2-3
      libldap rebuild, add build patch
........

Added:
  seahorse/repos/testing-x86_64/seahorse-2.26.2-gpgme-lfs.patch
    (from rev 52428, seahorse/trunk/seahorse-2.26.2-gpgme-lfs.patch)
Modified:
  seahorse/repos/testing-x86_64/	(properties)
  seahorse/repos/testing-x86_64/PKGBUILD

---------------------------------+
 PKGBUILD                        |    9 +++++---
 seahorse-2.26.2-gpgme-lfs.patch |   39 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 3 deletions(-)


Property changes on: seahorse/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /seahorse/trunk:1-52371
   + /seahorse/trunk:1-52430

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-09-19 12:56:54 UTC (rev 52430)
+++ testing-x86_64/PKGBUILD	2009-09-19 13:01:51 UTC (rev 52431)
@@ -4,7 +4,7 @@
 
 pkgname=seahorse
 pkgver=2.26.2
-pkgrel=2
+pkgrel=3
 pkgdesc="GNOME application for managing PGP keys."
 arch=(i686 x86_64)
 license=('GPL')
@@ -17,11 +17,14 @@
 groups=('gnome-extra')
 replaces=('gnome-keyring-manager')
 install=seahorse.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/seahorse/2.26/seahorse-${pkgver}.tar.bz2)
-md5sums=('c5126bd7ddfda3317daa71c06f261034')
+source=(http://ftp.gnome.org/pub/GNOME/sources/seahorse/2.26/seahorse-${pkgver}.tar.bz2
+        seahorse-2.26.2-gpgme-lfs.patch)
+md5sums=('c5126bd7ddfda3317daa71c06f261034'
+         '20d527f7531cc7182964ef92895c9b28')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/seahorse-2.26.2-gpgme-lfs.patch" || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --disable-static \
 	      --enable-ldap --enable-hkp \

Copied: seahorse/repos/testing-x86_64/seahorse-2.26.2-gpgme-lfs.patch (from rev 52428, seahorse/trunk/seahorse-2.26.2-gpgme-lfs.patch)
===================================================================
--- testing-x86_64/seahorse-2.26.2-gpgme-lfs.patch	                        (rev 0)
+++ testing-x86_64/seahorse-2.26.2-gpgme-lfs.patch	2009-09-19 13:01:51 UTC (rev 52431)
@@ -0,0 +1,39 @@
+diff --exclude-from=/opt/home/dang/.scripts/diffrc -up -ruN seahorse-2.26.2.orig/pgp/seahorse-gpg-op.c seahorse-2.26.2/pgp/seahorse-gpg-op.c
+--- seahorse-2.26.2.orig/pgp/seahorse-gpg-op.c	2009-04-20 11:35:00.000000000 -0400
++++ seahorse-2.26.2/pgp/seahorse-gpg-op.c	2009-07-10 09:43:31.550476889 -0400
+@@ -18,7 +18,9 @@
+  * 59 Temple Place, Suite 330,
+  * Boston, MA 02111-1307, USA.
+  */
+- 
++
++#include "config.h"
++
+ #include <glib.h>
+ #include <gpgme.h>
+ #include <string.h>
+diff --exclude-from=/opt/home/dang/.scripts/diffrc -up -ruN seahorse-2.26.2.orig/pgp/seahorse-gpg-options.c seahorse-2.26.2/pgp/seahorse-gpg-options.c
+--- seahorse-2.26.2.orig/pgp/seahorse-gpg-options.c	2009-04-20 11:35:00.000000000 -0400
++++ seahorse-2.26.2/pgp/seahorse-gpg-options.c	2009-07-10 09:36:16.012409729 -0400
+@@ -19,6 +19,11 @@
+  * Boston, MA 02111-1307, USA.
+  */
+ 
++#include "config.h"
++
++#include "seahorse-util.h"
++#include "seahorse-context.h"
++
+ #include <sys/param.h>
+ #include <sys/wait.h>
+ #include <sys/file.h>
+@@ -31,9 +36,6 @@
+ #include <unistd.h>
+ #include <sys/stat.h>
+ 
+-#include "seahorse-util.h"
+-#include "seahorse-context.h"
+-
+ #include "pgp/seahorse-gpgme.h"
+ #include "pgp/seahorse-gpg-options.h"
+