Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7099fe9bf0d63c649c4ccfbdd9f98a6ebf50ed06
commit 7099fe9bf0d63c649c4ccfbdd9f98a6ebf50ed06 Author: exceed <exceed.ced...@gmail.com> Date: Tue Feb 16 23:48:16 2010 +0100 xdelta-3.0x-1-i686 * Version bump * Fixed build() * Removed useless makefile patch diff --git a/source/devel-extra/xdelta/FrugalBuild b/source/devel-extra/xdelta/FrugalBuild index 8f2a5b8..4e6a4f3 100644 --- a/source/devel-extra/xdelta/FrugalBuild +++ b/source/devel-extra/xdelta/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Othmane Benkirane <e...@rhyhann.net> pkgname=xdelta -pkgver=3.0w +pkgver=3.0x pkgrel=1 pkgdesc="Delta/differential compression tools and binary diff tool" url="http://xdelta.org"; @@ -13,15 +13,13 @@ depends=('glibc' 'python') _F_googlecode_sep="None" Finclude googlecode python up2date="Flastarchive http://code.google.com/p/$pkgname/downloads/list?q=label:Featured .tar.gz" -source=(http://${pkgname}.googlecode.com/files/${pkgname}${pkgver}.tar.gz \ - xdelta3-makefile.patch) +source=(http://${pkgname}.googlecode.com/files/${pkgname}${pkgver}.tar.gz) _F_cd_path="${pkgname}${pkgver}" -sha1sums=('2d661f78dab7eefe69136ca9f98d12c5b6a11809' \ - '14f7c5bbe31f8c3f73e45728ab38ab6e06de7429') +sha1sums=('8f0eea4b102a8b5ab649cd0932d655b648250e3e') build() { - Fpatchall + Fcd make xdelta3 || Fdie Fexerel /usr/bin/xdelta3 # python module: diff --git a/source/devel-extra/xdelta/xdelta3-makefile.patch b/source/devel-extra/xdelta/xdelta3-makefile.patch deleted file mode 100644 index f7fc6a6..0000000 --- a/source/devel-extra/xdelta/xdelta3-makefile.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Naur xdelta3.0v-old/Makefile xdelta3.0v/Makefile ---- xdelta3.0v-old/Makefile 2009-03-12 01:44:51.000000000 +0000 -+++ xdelta3.0v/Makefile 2009-03-14 17:02:33.000000000 +0000 -@@ -4,7 +4,7 @@ - UNAME = $(shell uname) - CYGWIN = $(findstring CYGWIN, $(UNAME)) - DARWIN = $(findstring Darwin, $(UNAME)) --PYVER = 2.5 -+PYVER = 2.6 - - ifeq ("$(CYGWIN)", "") - SWIGTGT = xdelta3module.so -@@ -200,6 +200,9 @@ - xdelta3.o: $(SOURCES) - $(CC) -O3 $(CFLAGS) -c xdelta3.c $(SWIG_FLAGS) -o xdelta3.o - -+xdelta3_PIC.o: $(SOURCES) -+ $(CC) -O3 $(CFLAGS) -fPIC -c xdelta3.c $(SWIG_FLAGS) -o xdelta3_PIC.o -+ - xdelta3_wrap.o: xdelta3_wrap.c - $(CC) -O3 $(CFLAGS) $(SWIG_FLAGS) \ - -DHAVE_CONFIG_H \ -@@ -218,8 +221,8 @@ - cp $(SWIGTGT) /usr/lib/python$(PYVER)/site-packages - - ifeq ("$(DARWIN)", "") --xdelta3module.so: xdelta3_wrap.o xdelta3.o -- ld -shared xdelta3.o xdelta3_wrap.o \ -+xdelta3module.so: xdelta3_wrap.o xdelta3_PIC.o -+ cc -shared xdelta3_PIC.o xdelta3_wrap.o \ - -o xdelta3module.so \ - /usr/lib/libpython$(PYVER).so \ - -lc _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
