[arch-commits] Commit in unrar/trunk (5 files)
Giovanni Scafora
giovanni at archlinux.org
Fri Feb 10 23:27:14 UTC 2012
Date: Friday, February 10, 2012 @ 18:27:13
Author: giovanni
Revision: 149801
upgpkg: unrar 4.1.4-2
Splitted package provides unrar and libunrar
Added:
unrar/trunk/unrar-4.1.4-gcc.patch
unrar/trunk/unrar-4.1.4-soname.patch
unrar/trunk/unrar-4.1.4-types.patch
unrar/trunk/unrar-4.1.4-variablesize.patch
Modified:
unrar/trunk/PKGBUILD
--------------------------------+
PKGBUILD | 52 ++++++++++++++++++++++++++++++---------
unrar-4.1.4-gcc.patch | 18 +++++++++++++
unrar-4.1.4-soname.patch | 11 ++++++++
unrar-4.1.4-types.patch | 21 +++++++++++++++
unrar-4.1.4-variablesize.patch | 11 ++++++++
5 files changed, 102 insertions(+), 11 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-02-10 23:21:36 UTC (rev 149800)
+++ PKGBUILD 2012-02-10 23:27:13 UTC (rev 149801)
@@ -2,27 +2,57 @@
# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
# Contributor: dorphell <dorphell at gmx.net>
-pkgname=unrar
+pkgbase=unrar
+pkgname=('unrar' 'libunrar')
pkgver=4.1.4
-pkgrel=1
-pkgdesc="The RAR uncompression program"
+pkgrel=2
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')
+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}/${pkgname}"
+ cd "${srcdir}/${pkgbase}"
- make -f makefile.unix
+ 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() {
- cd "${srcdir}/${pkgname}"
+package_unrar() {
+ pkgdesc="The RAR uncompression program"
+ depends=('gcc-libs')
+ cd "${srcdir}/${pkgbase}"
- install -Dm755 unrar ${pkgdir}/usr/bin/unrar
+ 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"
+}
Added: unrar-4.1.4-gcc.patch
===================================================================
--- unrar-4.1.4-gcc.patch (rev 0)
+++ unrar-4.1.4-gcc.patch 2012-02-10 23:27:13 UTC (rev 149801)
@@ -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
Added: unrar-4.1.4-soname.patch
===================================================================
--- unrar-4.1.4-soname.patch (rev 0)
+++ unrar-4.1.4-soname.patch 2012-02-10 23:27:13 UTC (rev 149801)
@@ -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
Added: unrar-4.1.4-types.patch
===================================================================
--- unrar-4.1.4-types.patch (rev 0)
+++ unrar-4.1.4-types.patch 2012-02-10 23:27:13 UTC (rev 149801)
@@ -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
Added: unrar-4.1.4-variablesize.patch
===================================================================
--- unrar-4.1.4-variablesize.patch (rev 0)
+++ unrar-4.1.4-variablesize.patch 2012-02-10 23:27:13 UTC (rev 149801)
@@ -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)
More information about the arch-commits
mailing list