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

[Giovanni Scafora]

    Date: Saturday, May 16, 2009 @ 19:45:46
  Author: giovanni
Revision: 39453

Merged revisions 39451 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/xchm/trunk

........
  r39451 | giovanni | 2009-05-16 16:39:56 -0700 (sab, 16 mag 2009) | 2 lines
  
  upgpkg: xchm 1.16-1
      New version 1.16
........

Added:
  xchm/repos/extra-i686/xchm-1.16-gcc44.patch
    (from rev 39451, xchm/trunk/xchm-1.16-gcc44.patch)
Modified:
  xchm/repos/extra-i686/	(properties)
  xchm/repos/extra-i686/PKGBUILD

-----------------------+
 PKGBUILD              |    9 ++++++---
 xchm-1.16-gcc44.patch |   21 +++++++++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)


Property changes on: xchm/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /xchm/trunk:1-35628
   + /xchm/trunk:1-39452

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-05-16 23:40:36 UTC (rev 39452)
+++ extra-i686/PKGBUILD	2009-05-16 23:45:46 UTC (rev 39453)
@@ -2,18 +2,21 @@
 # Maintainer: Giovanni Scafora <giovanni at archlinux.org>
 
 pkgname=xchm
-pkgver=1.15
+pkgver=1.16
 pkgrel=1
 pkgdesc="A cross-platform GUI front-end to chmlib"
 arch=('i686' 'x86_64')
 url="http://xchm.sourceforge.net"
 license=('GPL')
 depends=('chmlib' 'wxgtk')
-source=(http://downloads.sourceforge.net/sourceforge/xchm/${pkgname}-${pkgver}.tar.gz xchm.desktop)
-md5sums=('a054dd396bf40d1823dbbb63ae08ec49' '58b60b388189d104923a9150c037920d')
+source=(http://downloads.sourceforge.net/sourceforge/xchm/${pkgname}-${pkgver}.tar.gz xchm.desktop xchm-1.16-gcc44.patch)
+md5sums=('bf3449c26ea2177edea056a75534e04b' 
+         '58b60b388189d104923a9150c037920d'
+	 '58626f871fe5867bcc537d9262cdfe25')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/xchm-1.16-gcc44.patch || return 1
   ./configure --prefix=/usr
   make || return 1
   make DESTDIR=${pkgdir} install || return 1

Copied: xchm/repos/extra-i686/xchm-1.16-gcc44.patch (from rev 39451, xchm/trunk/xchm-1.16-gcc44.patch)
===================================================================
--- extra-i686/xchm-1.16-gcc44.patch	                        (rev 0)
+++ extra-i686/xchm-1.16-gcc44.patch	2009-05-16 23:45:46 UTC (rev 39453)
@@ -0,0 +1,21 @@
+--- a/src/chmfile.h	2009-05-17 01:28:11.000000000 -0700
++++ b/src/chmfile.h	2009-05-17 01:28:11.000000000 -0700
+@@ -24,6 +24,7 @@
+ #define __CHMFILE_H_
+ 
+ #include <config.h>
++#include <stdint.h>
+ #include <chm_lib.h>
+ #include <wx/filefn.h>
+ #include <wx/string.h>
+--- a/src/bitfiddle.inl	2009-05-17 01:29:06.000000000 -0700
++++ b/src/bitfiddle.inl	2009-05-17 01:29:06.000000000 -0700
+@@ -23,7 +23,7 @@
+ 
+ 
+ #include <wx/string.h>
+-
++#include <stdint.h>
+ 
+ #define FIXENDIAN16(x) (x = wxUINT16_SWAP_ON_BE(x))
+ #define FIXENDIAN32(x) (x = wxUINT32_SWAP_ON_BE(x))