[arch-commits] Commit in unrar/trunk (6 files)
Giovanni Scafora
giovanni at archlinux.org
Sat May 5 11:21:12 UTC 2012
Date: Saturday, May 5, 2012 @ 07:21:12
Author: giovanni
Revision: 158646
upgpkg: unrar 4.2.1-1
upstream release
Added:
unrar/trunk/unrar-4.2.1-soname.patch
Modified:
unrar/trunk/PKGBUILD
Deleted:
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
--------------------------------+
PKGBUILD | 21 ++++++---------------
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 -----------
unrar-4.2.1-soname.patch | 11 +++++++++++
6 files changed, 17 insertions(+), 76 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-05-05 10:04:24 UTC (rev 158645)
+++ PKGBUILD 2012-05-05 11:21:12 UTC (rev 158646)
@@ -4,30 +4,21 @@
pkgbase=unrar
pkgname=('unrar' 'libunrar')
-pkgver=4.1.4
-pkgrel=2
+pkgver=4.2.1
+pkgrel=1
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')
+ 'unrar-4.2.1-soname.patch')
+md5sums=('759b3c6787864126050838153b768baa'
+ 'b9ec767da9a36f5ac38034c974e77758')
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"
+ patch -Np0 -i "${srcdir}/unrar-4.2.1-soname.patch"
cp -a ${srcdir}/unrar ${srcdir}/libunrar
make -C "${srcdir}"/libunrar -f makefile.unix lib libversion=${pkgver} CXXFLAGS="-fPIC ${CXXFLAGS}"
Deleted: unrar-4.1.4-gcc.patch
===================================================================
--- unrar-4.1.4-gcc.patch 2012-05-05 10:04:24 UTC (rev 158645)
+++ unrar-4.1.4-gcc.patch 2012-05-05 11:21:12 UTC (rev 158646)
@@ -1,18 +0,0 @@
---- 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
Deleted: unrar-4.1.4-soname.patch
===================================================================
--- unrar-4.1.4-soname.patch 2012-05-05 10:04:24 UTC (rev 158645)
+++ unrar-4.1.4-soname.patch 2012-05-05 11:21:12 UTC (rev 158646)
@@ -1,11 +0,0 @@
---- 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
Deleted: unrar-4.1.4-types.patch
===================================================================
--- unrar-4.1.4-types.patch 2012-05-05 10:04:24 UTC (rev 158645)
+++ unrar-4.1.4-types.patch 2012-05-05 11:21:12 UTC (rev 158646)
@@ -1,21 +0,0 @@
---- 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
Deleted: unrar-4.1.4-variablesize.patch
===================================================================
--- unrar-4.1.4-variablesize.patch 2012-05-05 10:04:24 UTC (rev 158645)
+++ unrar-4.1.4-variablesize.patch 2012-05-05 11:21:12 UTC (rev 158646)
@@ -1,11 +0,0 @@
---- 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)
Added: unrar-4.2.1-soname.patch
===================================================================
--- unrar-4.2.1-soname.patch (rev 0)
+++ unrar-4.2.1-soname.patch 2012-05-05 11:21:12 UTC (rev 158646)
@@ -0,0 +1,11 @@
+--- makefile.unix 2012-02-23 10:23:14.000000000 +0100
++++ makefile.unix 2012-05-05 12:58:13.000000000 +0200
+@@ -131,7 +131,7 @@
+ lib: CXXFLAGS+=$(LIBFLAGS)
+ lib: clean $(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
More information about the arch-commits
mailing list