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

[Giovanni Scafora]

    Date: Tuesday, May 26, 2009 @ 19:11:43
  Author: giovanni
Revision: 40074

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

........
  r40073 | giovanni | 2009-05-26 16:11:02 -0700 (mar, 26 mag 2009) | 2 lines
  
  upgpkg: xchm 1.17-1
      New version 1.17
........

Modified:
  xchm/repos/extra-x86_64/	(properties)
  xchm/repos/extra-x86_64/PKGBUILD
Deleted:
  xchm/repos/extra-x86_64/xchm-1.16-gcc44.patch

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


Property changes on: xchm/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /xchm/trunk:1-39451
   + /xchm/trunk:1-40073

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-05-26 23:11:02 UTC (rev 40073)
+++ extra-x86_64/PKGBUILD	2009-05-26 23:11:43 UTC (rev 40074)
@@ -2,21 +2,19 @@
 # Maintainer: Giovanni Scafora <giovanni at archlinux.org>
 
 pkgname=xchm
-pkgver=1.16
+pkgver=1.17
 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 xchm-1.16-gcc44.patch)
-md5sums=('bf3449c26ea2177edea056a75534e04b' 
-         '58b60b388189d104923a9150c037920d'
-	 '58626f871fe5867bcc537d9262cdfe25')
+source=(http://downloads.sourceforge.net/sourceforge/xchm/${pkgname}-${pkgver}.tar.gz xchm.desktop)
+md5sums=('4f34bc046fcc59f1af590d8eb1e08934' 
+         '58b60b388189d104923a9150c037920d')
 
 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

Deleted: extra-x86_64/xchm-1.16-gcc44.patch
===================================================================
--- extra-x86_64/xchm-1.16-gcc44.patch	2009-05-26 23:11:02 UTC (rev 40073)
+++ extra-x86_64/xchm-1.16-gcc44.patch	2009-05-26 23:11:43 UTC (rev 40074)
@@ -1,21 +0,0 @@
---- 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))