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

[Jan de Groot]

    Date: Friday, July 3, 2009 @ 13:52:34
  Author: jgc
Revision: 44682

Merged revisions 44681 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/file-roller/trunk

........
  r44681 | jgc | 2009-07-03 19:52:09 +0200 (Fri, 03 Jul 2009) | 1 line
  
  Remove pregenerated file instead of patching it to make this build
........

Modified:
  file-roller/repos/extra-i686/	(properties)
  file-roller/repos/extra-i686/PKGBUILD
Deleted:
  file-roller/repos/extra-i686/fr-fix-source.patch

---------------------+
 PKGBUILD            |   13 ++++++-------
 fr-fix-source.patch |   12 ------------
 2 files changed, 6 insertions(+), 19 deletions(-)


Property changes on: file-roller/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /file-roller/trunk:1-39838
   + /file-roller/trunk:1-44681

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-07-03 17:52:09 UTC (rev 44681)
+++ extra-i686/PKGBUILD	2009-07-03 17:52:34 UTC (rev 44682)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=file-roller
-pkgver=2.26.2
+pkgver=2.26.3
 pkgrel=1
 pkgdesc="Archive manipulator for GNOME2"
 arch=(i686 x86_64)
@@ -15,16 +15,15 @@
 install=file-roller.install
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.26/${pkgname}-${pkgver}.tar.bz2
-	fr-rpm-bsdtar.patch
-	fr-fix-source.patch)
-md5sums=('9d4575665dcbf063a062aa5a776eca68'
-	 '918057080ef487c625f326ed5637f490'
-	 'd8669520863718319d80666e424ffafb')
+	fr-rpm-bsdtar.patch)
+md5sums=('1876e9807a12c37f9bb2d00807905755'
+	 '918057080ef487c625f326ed5637f490')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/fr-fix-source.patch" || return 1
   patch -Np0 -i "${srcdir}/fr-rpm-bsdtar.patch" || return 1
+  rm -f src/fr-enum-types.c
+
   ./configure --prefix=/usr --sysconfdir=/etc \
               --libexecdir=/usr/lib/file-roller \
               --localstatedir=/var --disable-static \

Deleted: extra-i686/fr-fix-source.patch
===================================================================
--- extra-i686/fr-fix-source.patch	2009-07-03 17:52:09 UTC (rev 44681)
+++ extra-i686/fr-fix-source.patch	2009-07-03 17:52:34 UTC (rev 44682)
@@ -1,12 +0,0 @@
---- file-roller-2.26.2/src/fr-enum-types.c~	2009-04-30 09:03:57.000000000 +0000
-+++ file-roller-2.26.2/src/fr-enum-types.c	2009-05-18 22:11:30.958610986 +0000
-@@ -3,8 +3,7 @@
- 
- #include <glib-object.h>
- 
--/* enumerations from "/home/paolo/workspace/file-roller/src/typedefs.h" */
--#include "/home/paolo/workspace/file-roller/src/typedefs.h"
-+#include "typedefs.h"
- GType
- fr_compression_get_type (void)
- {