Date: Friday, February 10, 2012 @ 18:28:49 Author: giovanni Revision: 149802
archrelease: copy trunk to extra-i686, extra-x86_64 Added: unrar/repos/extra-i686/PKGBUILD (from rev 149801, unrar/trunk/PKGBUILD) unrar/repos/extra-i686/unrar-4.1.4-gcc.patch (from rev 149801, unrar/trunk/unrar-4.1.4-gcc.patch) unrar/repos/extra-i686/unrar-4.1.4-soname.patch (from rev 149801, unrar/trunk/unrar-4.1.4-soname.patch) unrar/repos/extra-i686/unrar-4.1.4-types.patch (from rev 149801, unrar/trunk/unrar-4.1.4-types.patch) unrar/repos/extra-i686/unrar-4.1.4-variablesize.patch (from rev 149801, unrar/trunk/unrar-4.1.4-variablesize.patch) Deleted: unrar/repos/extra-i686/PKGBUILD unrar/repos/extra-x86_64/PKGBUILD -------------------------------------------+ extra-i686/PKGBUILD | 86 ++++++++++++++++++---------- extra-i686/unrar-4.1.4-gcc.patch | 18 +++++ extra-i686/unrar-4.1.4-soname.patch | 11 +++ extra-i686/unrar-4.1.4-types.patch | 21 ++++++ extra-i686/unrar-4.1.4-variablesize.patch | 11 +++ extra-x86_64/PKGBUILD | 28 --------- 6 files changed, 119 insertions(+), 56 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2012-02-10 23:27:13 UTC (rev 149801) +++ extra-i686/PKGBUILD 2012-02-10 23:28:49 UTC (rev 149802) @@ -1,28 +0,0 @@ -# $Id$ -# Maintainer: Giovanni Scafora <giova...@archlinux.org> -# Contributor: dorphell <dorph...@gmx.net> - -pkgname=unrar -pkgver=4.1.4 -pkgrel=1 -pkgdesc="The RAR uncompression program" -arch=('i686' 'x86_64') -url="http://www.rarlab.com/rar_add.htm" -license=('custom') -depends=('gcc-libs') -source=("http://www.rarlab.com/rar/unrarsrc-${pkgver}.tar.gz") -md5sums=('808c92a661820a637ca1330cf40c18e4') - -build() { - cd "${srcdir}/${pkgname}" - - make -f makefile.unix -} - -package() { - cd "${srcdir}/${pkgname}" - - install -Dm755 unrar ${pkgdir}/usr/bin/unrar - # install license - install -Dm644 license.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} Copied: unrar/repos/extra-i686/PKGBUILD (from rev 149801, unrar/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2012-02-10 23:28:49 UTC (rev 149802) @@ -0,0 +1,58 @@ +# $Id$ +# Maintainer: Giovanni Scafora <giova...@archlinux.org> +# Contributor: dorphell <dorph...@gmx.net> + +pkgbase=unrar +pkgname=('unrar' 'libunrar') +pkgver=4.1.4 +pkgrel=2 +arch=('i686' 'x86_64') +url="http://www.rarlab.com/rar_add.htm" +license=('custom') +makedepends=('gcc-libs') +source=("http://www.rarlab.com/rar/unrarsrc-${pkgver}.tar.gz" + 'unrar-4.1.4-types.patch' + 'unrar-4.1.4-gcc.patch' + 'unrar-4.1.4-variablesize.patch' + 'unrar-4.1.4-soname.patch') +md5sums=('808c92a661820a637ca1330cf40c18e4' + 'ce5396b4cce009962c393a34c81e8f99' + '7af8795807b9d5c9e29b240be643223c' + '72df7e8d7049ed12a228f172c42eccb1' + '90935a3f6a55f2c3b85e2fd0c10a4d86') + +build() { + cd "${srcdir}/${pkgbase}" + + patch -Np0 -i "${srcdir}/unrar-4.1.4-types.patch" + patch -Np0 -i "${srcdir}/unrar-4.1.4-gcc.patch" + patch -Np0 -i "${srcdir}/unrar-4.1.4-variablesize.patch" + patch -Np0 -i "${srcdir}/unrar-4.1.4-soname.patch" + + cp -a ${srcdir}/unrar ${srcdir}/libunrar + make -C "${srcdir}"/libunrar -f makefile.unix lib libversion=${pkgver} CXXFLAGS="-fPIC ${CXXFLAGS}" + make -f makefile.unix CXXFLAGS="-fPIC ${CXXFLAGS}" STRIP="true" +} + +package_unrar() { + pkgdesc="The RAR uncompression program" + depends=('gcc-libs') + cd "${srcdir}/${pkgbase}" + + install -Dm755 unrar "${pkgdir}/usr/bin/unrar" + # install license + install -Dm644 license.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} + +package_libunrar() { + pkgdesc="Library and header file for applications that use libunrar" + depends=('gcc-libs') + cd "${srcdir}/libunrar" + + install -Dm755 libunrar.so.${pkgver} "${pkgdir}/usr/lib/libunrar.so.${pkgver}" + install -Dm644 dll.hpp "${pkgdir}/usr/include/unrar/dll.hpp" + ln -s libunrar.so.${pkgver} "${pkgdir}/usr/lib/libunrar.so.4" + ln -s libunrar.so.${pkgver} "${pkgdir}/usr/lib/libunrar.so" + # install license + install -Dm644 license.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} Copied: unrar/repos/extra-i686/unrar-4.1.4-gcc.patch (from rev 149801, unrar/trunk/unrar-4.1.4-gcc.patch) =================================================================== --- extra-i686/unrar-4.1.4-gcc.patch (rev 0) +++ extra-i686/unrar-4.1.4-gcc.patch 2012-02-10 23:28:49 UTC (rev 149802) @@ -0,0 +1,18 @@ +--- rar.hpp 2011-01-04 14:28:47.000000000 +0200 ++++ rar.hpp 2011-01-05 01:25:54.667105215 +0200 +@@ -20,6 +20,7 @@ + #include "array.hpp" + #include "timefn.hpp" + #include "options.hpp" ++#include "global.hpp" + #include "headers.hpp" + #include "pathfn.hpp" + #include "strfn.hpp" +@@ -73,7 +74,6 @@ + #include "smallfn.hpp" + #include "ulinks.hpp" + +-#include "global.hpp" + + + #endif Copied: unrar/repos/extra-i686/unrar-4.1.4-soname.patch (from rev 149801, unrar/trunk/unrar-4.1.4-soname.patch) =================================================================== --- extra-i686/unrar-4.1.4-soname.patch (rev 0) +++ extra-i686/unrar-4.1.4-soname.patch 2012-02-10 23:28:49 UTC (rev 149802) @@ -0,0 +1,11 @@ +--- makefile.unix 2010-03-30 17:26:26.000000000 +0200 ++++ makefile.unix 2011-01-05 01:27:11.092105262 +0200 +@@ -133,7 +133,7 @@ sfx: $(OBJECTS) + lib: WHAT=RARDLL + lib: $(OBJECTS) $(LIB_OBJ) + @rm -f libunrar.so +- $(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ) ++ $(LINK) -shared -Wl,-soname,libunrar.so.$(libversion) -o libunrar.so.$(libversion) $(LDFLAGS) $(OBJECTS) $(LIB_OBJ) + + install-unrar: + install -D unrar $(DESTDIR)/bin/unrar Copied: unrar/repos/extra-i686/unrar-4.1.4-types.patch (from rev 149801, unrar/trunk/unrar-4.1.4-types.patch) =================================================================== --- extra-i686/unrar-4.1.4-types.patch (rev 0) +++ extra-i686/unrar-4.1.4-types.patch 2012-02-10 23:28:49 UTC (rev 149802) @@ -0,0 +1,21 @@ +--- rartypes.hpp ++++ rartypes.hpp +@@ -1,14 +1,15 @@ + #ifndef _RAR_TYPES_ + #define _RAR_TYPES_ ++#include<stdint.h> + + typedef unsigned char byte; // unsigned 8 bits +-typedef unsigned short ushort; // preferably 16 bits, but can be more ++typedef uint16_t ushort; //preferably 16 bits, but can be more + typedef unsigned int uint; // 32 bits or more + + #define PRESENT_INT32 // undefine if signed 32 bits is not available + +-typedef unsigned int uint32; // 32 bits exactly +-typedef signed int int32; // signed 32 bits exactly ++typedef uint32_t uint32; //32 bits exactly ++typedef int32_t int32; //signed 32 bits exactly + + // If compiler does not support 64 bit variables, we can define + // uint64 and int64 as 32 bit, but it will limit the maximum processed Copied: unrar/repos/extra-i686/unrar-4.1.4-variablesize.patch (from rev 149801, unrar/trunk/unrar-4.1.4-variablesize.patch) =================================================================== --- extra-i686/unrar-4.1.4-variablesize.patch (rev 0) +++ extra-i686/unrar-4.1.4-variablesize.patch 2012-02-10 23:28:49 UTC (rev 149802) @@ -0,0 +1,11 @@ +--- match.cpp 2011-01-04 14:28:47.000000000 +0200 ++++ match.cpp 2011-01-05 01:26:05.813980804 +0200 +@@ -59,7 +59,7 @@ bool CmpName(const char *Wildcard,const + + char Path1[NM],Path2[NM]; + GetFilePath(Wildcard,Path1,ASIZE(Path1)); +- GetFilePath(Name,Path2,ASIZE(Path1)); ++ GetFilePath(Name,Path2,ASIZE(Path2)); + + if ((CmpMode==MATCH_EXACT || CmpMode==MATCH_EXACTPATH) && + mstricompc(Path1,Path2,ForceCase)!=0) Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2012-02-10 23:27:13 UTC (rev 149801) +++ extra-x86_64/PKGBUILD 2012-02-10 23:28:49 UTC (rev 149802) @@ -1,28 +0,0 @@ -# $Id$ -# Maintainer: Giovanni Scafora <giova...@archlinux.org> -# Contributor: dorphell <dorph...@gmx.net> - -pkgname=unrar -pkgver=4.1.4 -pkgrel=1 -pkgdesc="The RAR uncompression program" -arch=('i686' 'x86_64') -url="http://www.rarlab.com/rar_add.htm" -license=('custom') -depends=('gcc-libs') -source=("http://www.rarlab.com/rar/unrarsrc-${pkgver}.tar.gz") -md5sums=('808c92a661820a637ca1330cf40c18e4') - -build() { - cd "${srcdir}/${pkgname}" - - make -f makefile.unix -} - -package() { - cd "${srcdir}/${pkgname}" - - install -Dm755 unrar ${pkgdir}/usr/bin/unrar - # install license - install -Dm644 license.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -}