Date: Sunday, September 6, 2015 @ 23:42:50 Author: foutrelis Revision: 139382
archrelease: copy trunk to community-staging-i686, community-staging-x86_64 Added: unace/repos/community-staging-i686/ unace/repos/community-staging-i686/01-makefiles.dpatch (from rev 139381, unace/trunk/01-makefiles.dpatch) unace/repos/community-staging-i686/04-64bit.dpatch (from rev 139381, unace/trunk/04-64bit.dpatch) unace/repos/community-staging-i686/ChangeLog (from rev 139381, unace/trunk/ChangeLog) unace/repos/community-staging-i686/PKGBUILD (from rev 139381, unace/trunk/PKGBUILD) unace/repos/community-staging-i686/unace.install (from rev 139381, unace/trunk/unace.install) unace/repos/community-staging-x86_64/ unace/repos/community-staging-x86_64/01-makefiles.dpatch (from rev 139381, unace/trunk/01-makefiles.dpatch) unace/repos/community-staging-x86_64/04-64bit.dpatch (from rev 139381, unace/trunk/04-64bit.dpatch) unace/repos/community-staging-x86_64/ChangeLog (from rev 139381, unace/trunk/ChangeLog) unace/repos/community-staging-x86_64/PKGBUILD (from rev 139381, unace/trunk/PKGBUILD) unace/repos/community-staging-x86_64/unace.install (from rev 139381, unace/trunk/unace.install) ----------------------------------------------+ community-staging-i686/01-makefiles.dpatch | 52 ++++++++++ community-staging-i686/04-64bit.dpatch | 119 +++++++++++++++++++++++++ community-staging-i686/ChangeLog | 9 + community-staging-i686/PKGBUILD | 35 +++++++ community-staging-i686/unace.install | 14 ++ community-staging-x86_64/01-makefiles.dpatch | 52 ++++++++++ community-staging-x86_64/04-64bit.dpatch | 119 +++++++++++++++++++++++++ community-staging-x86_64/ChangeLog | 9 + community-staging-x86_64/PKGBUILD | 35 +++++++ community-staging-x86_64/unace.install | 14 ++ 10 files changed, 458 insertions(+) Copied: unace/repos/community-staging-i686/01-makefiles.dpatch (from rev 139381, unace/trunk/01-makefiles.dpatch) =================================================================== --- community-staging-i686/01-makefiles.dpatch (rev 0) +++ community-staging-i686/01-makefiles.dpatch 2015-09-06 21:42:50 UTC (rev 139382) @@ -0,0 +1,52 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +## 01-makefiles.dpatch by Fabian Greffrath <fab...@debian-unofficial.org> +## +## DP: Fix upstream makefiles + +@DPATCH@ + +diff -Nru unace-nonfree-2.5.orig/base.mk unace-nonfree-2.5/base.mk +--- unace-nonfree-2.5.orig/base.mk 2003-11-27 20:16:20.000000000 +0100 ++++ unace-nonfree-2.5/base.mk 2006-01-31 09:33:04.000000000 +0100 +@@ -427,9 +427,7 @@ + ############################################################################## + + ifndef ISWMAKE +-include $(MAKE_DIR)baseace.mk + include $(MAKE_DIR)baseuace.mk + else +-!include $(MAKE_DIR)baseace.mk + !include $(MAKE_DIR)baseuace.mk + endif +diff -Nru unace-nonfree-2.5.orig/makefile unace-nonfree-2.5/makefile +--- unace-nonfree-2.5.orig/makefile 2003-11-24 00:24:24.000000000 +0100 ++++ unace-nonfree-2.5/makefile 2006-01-31 09:40:17.000000000 +0100 +@@ -18,6 +18,6 @@ + INCLDIR = //usr/include + +-DEFINES = -D__LINUX__ -D__unix__ -D__GCC__ -D__HAS_IO_H__ ++DEFINES = -D__LINUX__ -D__unix__ -D__GCC__ -U__HAS_IO_H__ + + ifdef DEBUG + LSWITCHES = +@@ -47,7 +47,7 @@ + $(APPS_UNACEEXE_CFILES) + + unace: $(UNACEEXELIN_CFILES) +- gcc $(LSWITCHES) -Wl,-lncurses -static -I$(INCLDIR) -I$(INCLSYSDIR) -I$(SRCSsl) $(DEFINES) $(UNACEEXELIN_CFILES) -ggdb -o$(EXECS_DIR)unace ++ gcc $(LSWITCHES) -Wl,-lncurses -I$(INCLDIR) -idirafter $(INCLSYSDIR) -I$(SRCSsl) $(DEFINES) $(UNACEEXELIN_CFILES) -ggdb -o$(EXECS_DIR)unace + ifndef DEBUG + tar cfvz linunace25.tgz unace file_id.diz licence + #sh linpack.sh +diff -Nru unace-nonfree-2.5.orig/unace.mk unace-nonfree-2.5/unace.mk +--- unace-nonfree-2.5.orig/unace.mk 2003-11-27 20:17:46.000000000 +0100 ++++ unace-nonfree-2.5/unace.mk 2006-01-31 09:33:21.000000000 +0100 +@@ -27,8 +27,6 @@ + + ifndef ISWMAKE + include $(MAKE_DIR)unaceexe.mk +-include $(MAKE_DIR)unacedll.mk + else + !include $(MAKE_DIR)unaceexe.mk +-!include $(MAKE_DIR)unacedll.mk + endif Copied: unace/repos/community-staging-i686/04-64bit.dpatch (from rev 139381, unace/trunk/04-64bit.dpatch) =================================================================== --- community-staging-i686/04-64bit.dpatch (rev 0) +++ community-staging-i686/04-64bit.dpatch 2015-09-06 21:42:50 UTC (rev 139382) @@ -0,0 +1,119 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04-64bit.dpatch by Michael Karcher +## <deb...@mkarcher.dialup.fu-berlin.de> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Replace declare.h by a generic stdint based version. + +@DPATCH@ +diff -urNad unace-nonfree-2.5~/source/base/all/declare.h unace-nonfree-2.5/source/base/all/declare.h +--- unace-nonfree-2.5~/source/base/all/declare.h 2007-11-06 00:11:47.000000000 +0100 ++++ unace-nonfree-2.5/source/base/all/declare.h 2007-11-06 00:13:18.498574104 +0100 +@@ -7,76 +7,47 @@ + #ifndef _DECLARE_H_INCLUDED + #define _DECLARE_H_INCLUDED + +-#if !defined(__OS2__) && !defined(_WINDOWS_) +- typedef int BOOL; +- +- typedef char CHAR; +- typedef unsigned char UCHAR; +- typedef UCHAR *PUCHAR; +- typedef char *PSZ; +- +- typedef short SHORT; +- typedef unsigned short USHORT; +- typedef USHORT *PUSHORT; +- +- typedef long LONG; +- typedef unsigned long ULONG; +- +- typedef ULONG *PULONG; +- +- typedef int INT; +- typedef unsigned int UINT; +- typedef unsigned int *PUINT; ++#include <stdint.h> + +- typedef CHAR *LPSTR; +-#endif ++typedef int BOOL; ++typedef BOOL *PBOOL; + +-#if __WATCOMC__==1060 +- typedef long __int64[2]; +- typedef __int64 LONGLONG; +- typedef LONGLONG *PLONGLONG; +- typedef __int64 ULONGLONG; +- typedef ULONGLONG DWORDLONG; +-#else +- #if !defined(_WINDOWS_) +- #if !defined(__WATCOMC__) && !defined(__int64) +- #define __int64 long long +- #endif ++typedef char CHAR; ++typedef CHAR *PCHAR; ++typedef unsigned char UCHAR; ++typedef UCHAR *PUCHAR; ++typedef signed char SCHAR; ++typedef CHAR *PSZ; ++typedef CHAR *LPSTR; + +- typedef __int64 LONGLONG; +- typedef LONGLONG *PLONGLONG; +- typedef unsigned __int64 ULONGLONG; +- typedef ULONGLONG DWORDLONG; +- #endif +-#endif ++typedef int INT; ++typedef INT *PINT; ++typedef unsigned int UINT; ++typedef unsigned int *PUINT; + ++typedef int16_t SHORT; ++typedef SHORT *PSHORT; ++typedef uint16_t USHORT; ++typedef USHORT *PUSHORT; + +-#if !defined(_WINDOWS_) +- typedef BOOL *PBOOL; +- typedef INT *PINT; +-#endif ++typedef int32_t LONG; ++typedef LONG *PLONG; ++typedef uint32_t ULONG; ++typedef ULONG *PULONG; + +-#if !defined(__wtypes_h__) +- typedef void *PVOID; +- typedef CHAR *PCHAR; +- typedef SHORT *PSHORT; +- typedef LONG *PLONG; +- typedef ULONGLONG *PULONGLONG; +-#endif ++typedef int64_t LONGLONG; ++typedef LONGLONG *PLONGLONG; ++typedef uint64_t ULONGLONG; ++typedef ULONGLONG *PULONGLONG; + +-#if defined(_GNU_H_WINDOWS32_BASE) +- typedef LONGLONG ULONGLONG; +- typedef ULONGLONG *PULONGLONG; +-#endif ++typedef void *PVOID; + +-typedef signed char SCHAR; ++/* Dear ACE team, please clean your code to remove the following types */ ++typedef LONGLONG __int64; ++typedef ULONGLONG DWORDLONG; + + #ifndef NULL +- #if defined(__SMALL__) || defined(__MEDIUM__) || defined(__386__) || defined(__AXP__) || defined(__PPC__) +- #define NULL 0 +- #else +- #define NULL 0L +- #endif ++#include <stdlib.h> + #endif + + Copied: unace/repos/community-staging-i686/ChangeLog (from rev 139381, unace/trunk/ChangeLog) =================================================================== --- community-staging-i686/ChangeLog (rev 0) +++ community-staging-i686/ChangeLog 2015-09-06 21:42:50 UTC (rev 139382) @@ -0,0 +1,9 @@ +2008-04-04 Eric Belanger <e...@archlinux.org> + + * unace-2.5-5.1 + * fixed seg faults on x86_64 + +2007-05-28 Alessio 'mOLOk' Bolognino <themo...@gmail.com> + * unace-2.5-5 + moved in [community] + now it's built from source (from debian) Copied: unace/repos/community-staging-i686/PKGBUILD (from rev 139381, unace/trunk/PKGBUILD) =================================================================== --- community-staging-i686/PKGBUILD (rev 0) +++ community-staging-i686/PKGBUILD 2015-09-06 21:42:50 UTC (rev 139382) @@ -0,0 +1,35 @@ +# $Id$ +# Maintainer: Eric Belanger <e...@archlinux.org> +# Contributor: lowercase + +pkgname=unace +pkgver=2.5 +pkgrel=9 +pkgdesc="An extraction tool for the proprietary ace archive format" +arch=('i686' 'x86_64') +url="http://www.winace.com/" +license=("custom") +depends=(ncurses) +install=unace.install +source=(http://ftp.debian.org/debian/pool/non-free/u/unace-nonfree/unace-nonfree_2.5.orig.tar.gz \ + 01-makefiles.dpatch 04-64bit.dpatch) +md5sums=('59013e74e5ac2ee15c1e92026ec1e3cc' '6a1498f24d6430723acf556e0d1cc72b'\ + 'c46de484cf5dc0e04c342062139a8aaf') +sha1sums=('f658f03aa6f663c1a90af85e3e8c6e7ef12adb42' + '83b2b84223072b6f456d7255c80bec4e01572be0' + 'cccd98f1b99218ec69f27425b56b44d23c75eb1e') + +build() { + cd ${srcdir}/unace-$pkgver + + patch -p1 < ../01-makefiles.dpatch + [ "$CARCH" = "x86_64" ] && (patch -p1 < ../04-64bit.dpatch) + make +} + +package() { + cd ${srcdir}/unace-$pkgver + + install -D -m755 unace ${pkgdir}/usr/bin/unace + install -D -m644 licence ${pkgdir}/usr/share/licenses/unace/license +} Copied: unace/repos/community-staging-i686/unace.install (from rev 139381, unace/trunk/unace.install) =================================================================== --- community-staging-i686/unace.install (rev 0) +++ community-staging-i686/unace.install 2015-09-06 21:42:50 UTC (rev 139382) @@ -0,0 +1,14 @@ +# arg 1: the new package version +post_install() { + +cat << EOM + +==> unace post-install message: +==> to use this software, you have to accept the Public UnAce Licence, +==> ( it's in /usr/share/licenses/unace/license ) +==> otherwise, remove this package! + +EOM + +} + Copied: unace/repos/community-staging-x86_64/01-makefiles.dpatch (from rev 139381, unace/trunk/01-makefiles.dpatch) =================================================================== --- community-staging-x86_64/01-makefiles.dpatch (rev 0) +++ community-staging-x86_64/01-makefiles.dpatch 2015-09-06 21:42:50 UTC (rev 139382) @@ -0,0 +1,52 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +## 01-makefiles.dpatch by Fabian Greffrath <fab...@debian-unofficial.org> +## +## DP: Fix upstream makefiles + +@DPATCH@ + +diff -Nru unace-nonfree-2.5.orig/base.mk unace-nonfree-2.5/base.mk +--- unace-nonfree-2.5.orig/base.mk 2003-11-27 20:16:20.000000000 +0100 ++++ unace-nonfree-2.5/base.mk 2006-01-31 09:33:04.000000000 +0100 +@@ -427,9 +427,7 @@ + ############################################################################## + + ifndef ISWMAKE +-include $(MAKE_DIR)baseace.mk + include $(MAKE_DIR)baseuace.mk + else +-!include $(MAKE_DIR)baseace.mk + !include $(MAKE_DIR)baseuace.mk + endif +diff -Nru unace-nonfree-2.5.orig/makefile unace-nonfree-2.5/makefile +--- unace-nonfree-2.5.orig/makefile 2003-11-24 00:24:24.000000000 +0100 ++++ unace-nonfree-2.5/makefile 2006-01-31 09:40:17.000000000 +0100 +@@ -18,6 +18,6 @@ + INCLDIR = //usr/include + +-DEFINES = -D__LINUX__ -D__unix__ -D__GCC__ -D__HAS_IO_H__ ++DEFINES = -D__LINUX__ -D__unix__ -D__GCC__ -U__HAS_IO_H__ + + ifdef DEBUG + LSWITCHES = +@@ -47,7 +47,7 @@ + $(APPS_UNACEEXE_CFILES) + + unace: $(UNACEEXELIN_CFILES) +- gcc $(LSWITCHES) -Wl,-lncurses -static -I$(INCLDIR) -I$(INCLSYSDIR) -I$(SRCSsl) $(DEFINES) $(UNACEEXELIN_CFILES) -ggdb -o$(EXECS_DIR)unace ++ gcc $(LSWITCHES) -Wl,-lncurses -I$(INCLDIR) -idirafter $(INCLSYSDIR) -I$(SRCSsl) $(DEFINES) $(UNACEEXELIN_CFILES) -ggdb -o$(EXECS_DIR)unace + ifndef DEBUG + tar cfvz linunace25.tgz unace file_id.diz licence + #sh linpack.sh +diff -Nru unace-nonfree-2.5.orig/unace.mk unace-nonfree-2.5/unace.mk +--- unace-nonfree-2.5.orig/unace.mk 2003-11-27 20:17:46.000000000 +0100 ++++ unace-nonfree-2.5/unace.mk 2006-01-31 09:33:21.000000000 +0100 +@@ -27,8 +27,6 @@ + + ifndef ISWMAKE + include $(MAKE_DIR)unaceexe.mk +-include $(MAKE_DIR)unacedll.mk + else + !include $(MAKE_DIR)unaceexe.mk +-!include $(MAKE_DIR)unacedll.mk + endif Copied: unace/repos/community-staging-x86_64/04-64bit.dpatch (from rev 139381, unace/trunk/04-64bit.dpatch) =================================================================== --- community-staging-x86_64/04-64bit.dpatch (rev 0) +++ community-staging-x86_64/04-64bit.dpatch 2015-09-06 21:42:50 UTC (rev 139382) @@ -0,0 +1,119 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04-64bit.dpatch by Michael Karcher +## <deb...@mkarcher.dialup.fu-berlin.de> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Replace declare.h by a generic stdint based version. + +@DPATCH@ +diff -urNad unace-nonfree-2.5~/source/base/all/declare.h unace-nonfree-2.5/source/base/all/declare.h +--- unace-nonfree-2.5~/source/base/all/declare.h 2007-11-06 00:11:47.000000000 +0100 ++++ unace-nonfree-2.5/source/base/all/declare.h 2007-11-06 00:13:18.498574104 +0100 +@@ -7,76 +7,47 @@ + #ifndef _DECLARE_H_INCLUDED + #define _DECLARE_H_INCLUDED + +-#if !defined(__OS2__) && !defined(_WINDOWS_) +- typedef int BOOL; +- +- typedef char CHAR; +- typedef unsigned char UCHAR; +- typedef UCHAR *PUCHAR; +- typedef char *PSZ; +- +- typedef short SHORT; +- typedef unsigned short USHORT; +- typedef USHORT *PUSHORT; +- +- typedef long LONG; +- typedef unsigned long ULONG; +- +- typedef ULONG *PULONG; +- +- typedef int INT; +- typedef unsigned int UINT; +- typedef unsigned int *PUINT; ++#include <stdint.h> + +- typedef CHAR *LPSTR; +-#endif ++typedef int BOOL; ++typedef BOOL *PBOOL; + +-#if __WATCOMC__==1060 +- typedef long __int64[2]; +- typedef __int64 LONGLONG; +- typedef LONGLONG *PLONGLONG; +- typedef __int64 ULONGLONG; +- typedef ULONGLONG DWORDLONG; +-#else +- #if !defined(_WINDOWS_) +- #if !defined(__WATCOMC__) && !defined(__int64) +- #define __int64 long long +- #endif ++typedef char CHAR; ++typedef CHAR *PCHAR; ++typedef unsigned char UCHAR; ++typedef UCHAR *PUCHAR; ++typedef signed char SCHAR; ++typedef CHAR *PSZ; ++typedef CHAR *LPSTR; + +- typedef __int64 LONGLONG; +- typedef LONGLONG *PLONGLONG; +- typedef unsigned __int64 ULONGLONG; +- typedef ULONGLONG DWORDLONG; +- #endif +-#endif ++typedef int INT; ++typedef INT *PINT; ++typedef unsigned int UINT; ++typedef unsigned int *PUINT; + ++typedef int16_t SHORT; ++typedef SHORT *PSHORT; ++typedef uint16_t USHORT; ++typedef USHORT *PUSHORT; + +-#if !defined(_WINDOWS_) +- typedef BOOL *PBOOL; +- typedef INT *PINT; +-#endif ++typedef int32_t LONG; ++typedef LONG *PLONG; ++typedef uint32_t ULONG; ++typedef ULONG *PULONG; + +-#if !defined(__wtypes_h__) +- typedef void *PVOID; +- typedef CHAR *PCHAR; +- typedef SHORT *PSHORT; +- typedef LONG *PLONG; +- typedef ULONGLONG *PULONGLONG; +-#endif ++typedef int64_t LONGLONG; ++typedef LONGLONG *PLONGLONG; ++typedef uint64_t ULONGLONG; ++typedef ULONGLONG *PULONGLONG; + +-#if defined(_GNU_H_WINDOWS32_BASE) +- typedef LONGLONG ULONGLONG; +- typedef ULONGLONG *PULONGLONG; +-#endif ++typedef void *PVOID; + +-typedef signed char SCHAR; ++/* Dear ACE team, please clean your code to remove the following types */ ++typedef LONGLONG __int64; ++typedef ULONGLONG DWORDLONG; + + #ifndef NULL +- #if defined(__SMALL__) || defined(__MEDIUM__) || defined(__386__) || defined(__AXP__) || defined(__PPC__) +- #define NULL 0 +- #else +- #define NULL 0L +- #endif ++#include <stdlib.h> + #endif + + Copied: unace/repos/community-staging-x86_64/ChangeLog (from rev 139381, unace/trunk/ChangeLog) =================================================================== --- community-staging-x86_64/ChangeLog (rev 0) +++ community-staging-x86_64/ChangeLog 2015-09-06 21:42:50 UTC (rev 139382) @@ -0,0 +1,9 @@ +2008-04-04 Eric Belanger <e...@archlinux.org> + + * unace-2.5-5.1 + * fixed seg faults on x86_64 + +2007-05-28 Alessio 'mOLOk' Bolognino <themo...@gmail.com> + * unace-2.5-5 + moved in [community] + now it's built from source (from debian) Copied: unace/repos/community-staging-x86_64/PKGBUILD (from rev 139381, unace/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2015-09-06 21:42:50 UTC (rev 139382) @@ -0,0 +1,35 @@ +# $Id$ +# Maintainer: Eric Belanger <e...@archlinux.org> +# Contributor: lowercase + +pkgname=unace +pkgver=2.5 +pkgrel=9 +pkgdesc="An extraction tool for the proprietary ace archive format" +arch=('i686' 'x86_64') +url="http://www.winace.com/" +license=("custom") +depends=(ncurses) +install=unace.install +source=(http://ftp.debian.org/debian/pool/non-free/u/unace-nonfree/unace-nonfree_2.5.orig.tar.gz \ + 01-makefiles.dpatch 04-64bit.dpatch) +md5sums=('59013e74e5ac2ee15c1e92026ec1e3cc' '6a1498f24d6430723acf556e0d1cc72b'\ + 'c46de484cf5dc0e04c342062139a8aaf') +sha1sums=('f658f03aa6f663c1a90af85e3e8c6e7ef12adb42' + '83b2b84223072b6f456d7255c80bec4e01572be0' + 'cccd98f1b99218ec69f27425b56b44d23c75eb1e') + +build() { + cd ${srcdir}/unace-$pkgver + + patch -p1 < ../01-makefiles.dpatch + [ "$CARCH" = "x86_64" ] && (patch -p1 < ../04-64bit.dpatch) + make +} + +package() { + cd ${srcdir}/unace-$pkgver + + install -D -m755 unace ${pkgdir}/usr/bin/unace + install -D -m644 licence ${pkgdir}/usr/share/licenses/unace/license +} Copied: unace/repos/community-staging-x86_64/unace.install (from rev 139381, unace/trunk/unace.install) =================================================================== --- community-staging-x86_64/unace.install (rev 0) +++ community-staging-x86_64/unace.install 2015-09-06 21:42:50 UTC (rev 139382) @@ -0,0 +1,14 @@ +# arg 1: the new package version +post_install() { + +cat << EOM + +==> unace post-install message: +==> to use this software, you have to accept the Public UnAce Licence, +==> ( it's in /usr/share/licenses/unace/license ) +==> otherwise, remove this package! + +EOM + +} +