haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 03:30:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

p7zip: bump version.

Browse Source
This commit is contained in:
Jerome Duval
2019-11-23 22:57:50 +01:00
parent b775fc03aa
commit c8d7bc62f1
4 changed files with 0 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
app-arch/p7zip/p7zip-9.13.recipe
View File

@@ -1,45 +0,0 @@
SUMMARY="7-zip file compression program"
DESCRIPTION="p7zip is a port of 7za.exe (command line 7-Zip) for POSIX systems. 7-Zip is a file archiver with a high compression ratio in 7z format with LZMA and LZMA2 compression. It provides a compression ratio that is 2-10% better than the ratio provided by PKZip and WinZip, and features AES-256 encryption in 7z and ZIP formats. 7-Zip also self-extracts files in 7z format.
Supported Formats:
- Packing/Unpacking: 7z, XZ, BZIP2, GZIP, TAR, ZIP, and WIM
- Unpacking Only: ARJ, CAB, CHM, CPIO, CramFS, DEB, DMG, FAT, HFS, ISO, LZH, LZMA, MBR, MSI, NSIS, NTFS, RAR, RPM, SquashFS, UDF, VHD, WIM, XAR, and Z."
HOMEPAGE="http://p7zip.sourceforge.net"
COPYRIGHT="1999-2010 7-Zip Igor Pavlov."
LICENSE="GNU LGPL v2.1"
REVISION="2"
SOURCE_URI="http://downloads.sourceforge.net/project/p7zip/p7zip/9.13/p7zip_9.13_src_all.tar.bz2"
CHECKSUM_SHA256="fc9c0fa2eabd367d6adbc3ea07bb305dbdc1f68717eea362c8c074b91c03d923"
SOURCE_DIR="p7zip_9.13"
PATCHES="p7zip-9.13.patch"
ARCHITECTURES="x86_gcc2 ?x86"
PROVIDES="
p7zip = $portVersion
cmd:7za = $portVersion compat >= 9
"
REQUIRES="
haiku
"
BUILD_REQUIRES="
"
BUILD_PREREQUIRES="
haiku_devel
cmd:gcc
cmd:ld
cmd:make
"
BUILD()
{
cp makefile.haiku makefile.machine
make
}
INSTALL()
{
make install DEST_DIR=$prefix DEST_HOME=$prefix DEST_SHARE_DOC=$docDir \
DEST_MAN=$manDir
}

49
app-arch/p7zip/p7zip-9.20.1.recipe
View File

@@ -1,49 +0,0 @@
SUMMARY="7-zip file compression program"
DESCRIPTION="
p7zip is a port of 7za.exe for POSIX systems like Unix (Linux, Solaris, \
OpenBSD, FreeBSD, Cygwin, AIX, ...), MacOS X and also for BeOS and Amiga."
HOMEPAGE="http://p7zip.sourceforge.net"
COPYRIGHT="1999-2011 7-Zip Igor Pavlov."
LICENSE="GNU LGPL v2.1"
REVISION="7"
SOURCE_URI="http://downloads.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2"
CHECKSUM_SHA256="49557e7ffca08100f9fc687f4dfc5aea703ca207640c76d9dee7b66f03cb4782"
SOURCE_DIR="p7zip_9.20.1"
PATCHES="p7zip-9.20.1.patchset"
ADDITIONAL_FILES="p7zip-expander-rules"
ARCHITECTURES="x86_gcc2 x86 x86_64"
PROVIDES="
p7zip = $portVersion
cmd:7za = $portVersion compat >= 9
"
REQUIRES="
haiku
"
BUILD_REQUIRES="
"
BUILD_PREREQUIRES="
haiku_devel
cmd:gcc
cmd:ld
cmd:make
"
BUILD()
{
cp makefile.haiku makefile.machine
make
}
INSTALL()
{
make install DEST_DIR="" DEST_HOME=$prefix DEST_SHARE_DOC=$docDir \
DEST_MAN=$manDir
expanderRulesDir=$dataDir/expander/rules
mkdir -p $expanderRulesDir
cp "$portDir/additional-files/p7zip-expander-rules" \
"$expanderRulesDir/p7zip"
}

191
app-arch/p7zip/patches/p7zip-9.13.patch
View File

@@ -1,191 +0,0 @@
diff -ruN p7zip_9.13-orig/CPP/Windows/System.cpp p7zip_9.13/CPP/Windows/System.cpp
--- p7zip_9.13-orig/CPP/Windows/System.cpp 2009-02-15 04:19:45.043515904 -0500
+++ p7zip_9.13/CPP/Windows/System.cpp 2010-11-29 06:20:22.664272896 -0500
@@ -15,7 +15,7 @@
#include <sys/sysinfo.h>
#endif
-#if defined(ENV_BEOS)
+#if defined(ENV_BEOS) || defined(ENV_HAIKU)
#include <be/kernel/OS.h>
#endif
@@ -79,7 +79,7 @@
if (nbcpu < 1) nbcpu = 1;
return nbcpu;
}
- #elif defined(ENV_BEOS)
+ #elif defined(ENV_BEOS) || defined(ENV_HAIKU)
UInt32 GetNumberOfProcessors() {
system_info info;
get_system_info(&info);
diff -ruN p7zip_9.13-orig/CPP/myWindows/config.h p7zip_9.13/CPP/myWindows/config.h
--- p7zip_9.13-orig/CPP/myWindows/config.h 2009-12-22 13:10:30.037486592 -0500
+++ p7zip_9.13/CPP/myWindows/config.h 2010-11-29 06:20:22.666632192 -0500
@@ -24,7 +24,7 @@
#endif /* !ENV_MACOSX && !ENV_BEOS */
- #if !defined(ENV_BEOS)
+ #if !defined(ENV_BEOS) && !defined(ENV_HAIKU)
#define HAVE_GETPASS
#endif
diff -ruN p7zip_9.13-orig/install.sh p7zip_9.13/install.sh
--- p7zip_9.13-orig/install.sh 2008-03-02 08:35:05.024379392 -0500
+++ p7zip_9.13/install.sh 2010-11-29 06:20:22.669515776 -0500
@@ -56,10 +56,10 @@
cp bin/7za "${DEST_DIR}${DEST_SHARE}/7za"
chmod 777 "${DEST_DIR}${DEST_SHARE}/7za"
strip "${DEST_DIR}${DEST_SHARE}/7za"
- chmod 555 "${DEST_DIR}${DEST_SHARE}/7za"
+ chmod 755 "${DEST_DIR}${DEST_SHARE}/7za"
echo "#! /bin/sh" > "${DEST_DIR}${DEST_BIN}/7za"
echo "\"${DEST_SHARE}/7za\" \"\$@\"" >> "${DEST_DIR}${DEST_BIN}/7za"
- chmod 555 "${DEST_DIR}${DEST_BIN}/7za"
+ chmod 755 "${DEST_DIR}${DEST_BIN}/7za"
fi
if [ -x bin/7zr ]
@@ -68,10 +68,10 @@
cp bin/7zr "${DEST_DIR}${DEST_SHARE}/7zr"
chmod 777 "${DEST_DIR}${DEST_SHARE}/7zr"
strip "${DEST_DIR}${DEST_SHARE}/7zr"
- chmod 555 "${DEST_DIR}${DEST_SHARE}/7zr"
+ chmod 755 "${DEST_DIR}${DEST_SHARE}/7zr"
echo "#! /bin/sh" > "${DEST_DIR}${DEST_BIN}/7zr"
echo "\"${DEST_SHARE}/7zr\" \"\$@\"" >> "${DEST_DIR}${DEST_BIN}/7zr"
- chmod 555 "${DEST_DIR}${DEST_BIN}/7zr"
+ chmod 755 "${DEST_DIR}${DEST_BIN}/7zr"
fi
if [ -x bin/7zCon.sfx ]
@@ -80,7 +80,7 @@
cp bin/7zCon.sfx "${DEST_DIR}${DEST_SHARE}/7zCon.sfx"
chmod 777 "${DEST_DIR}${DEST_SHARE}/7zCon.sfx"
strip "${DEST_DIR}${DEST_SHARE}/7zCon.sfx"
- chmod 555 "${DEST_DIR}${DEST_SHARE}/7zCon.sfx"
+ chmod 755 "${DEST_DIR}${DEST_SHARE}/7zCon.sfx"
fi
if [ -x bin/7z ]
@@ -89,14 +89,14 @@
cp bin/7z "${DEST_DIR}${DEST_SHARE}/7z"
chmod 777 "${DEST_DIR}${DEST_SHARE}/7z"
strip "${DEST_DIR}${DEST_SHARE}/7z"
- chmod 555 "${DEST_DIR}${DEST_SHARE}/7z"
+ chmod 755 "${DEST_DIR}${DEST_SHARE}/7z"
cp -r bin/Codecs "${DEST_DIR}${DEST_SHARE}/"
- chmod 555 "${DEST_DIR}${DEST_SHARE}"/*/*
+ chmod 755 "${DEST_DIR}${DEST_SHARE}"/*/*
cp bin/7z.so "${DEST_DIR}${DEST_SHARE}/7z.so"
- chmod 555 "${DEST_DIR}${DEST_SHARE}/7z.so"
+ chmod 755 "${DEST_DIR}${DEST_SHARE}/7z.so"
echo "#! /bin/sh" > "${DEST_DIR}${DEST_BIN}/7z"
echo "\"${DEST_SHARE}/7z\" \"\$@\"" >> "${DEST_DIR}${DEST_BIN}/7z"
- chmod 555 "${DEST_DIR}${DEST_BIN}/7z"
+ chmod 755 "${DEST_DIR}${DEST_BIN}/7z"
fi
else
@@ -105,7 +105,7 @@
echo "- installing ${DEST_DIR}${DEST_BIN}/7za"
mkdir -p "${DEST_DIR}${DEST_BIN}"
cp bin/7za "${DEST_DIR}${DEST_BIN}/7za"
- chmod 555 "${DEST_DIR}${DEST_BIN}/7za"
+ chmod 755 "${DEST_DIR}${DEST_BIN}/7za"
fi
if [ -x bin/7zr ]
@@ -113,7 +113,7 @@
echo "- installing ${DEST_DIR}${DEST_BIN}/7zr"
mkdir -p "${DEST_DIR}${DEST_BIN}"
cp bin/7zr "${DEST_DIR}${DEST_BIN}/7zr"
- chmod 555 "${DEST_DIR}${DEST_BIN}/7zr"
+ chmod 755 "${DEST_DIR}${DEST_BIN}/7zr"
fi
fi
@@ -122,27 +122,27 @@
then
echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7z.1"
sed -e s?"{DEST_SHARE_DOC}"?"${DEST_SHARE_DOC}/DOCS"?g man1/7z.1 > "${DEST_DIR}${DEST_MAN}/man1/7z.1"
- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7z.1"
+ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7z.1"
echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7za.1"
sed -e s?"{DEST_SHARE_DOC}"?"${DEST_SHARE_DOC}/DOCS"?g man1/7za.1 > "${DEST_DIR}${DEST_MAN}/man1/7za.1"
- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7za.1"
+ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7za.1"
echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7zr.1"
sed -e s?"{DEST_SHARE_DOC}"?"${DEST_SHARE_DOC}/DOCS"?g man1/7zr.1 > "${DEST_DIR}${DEST_MAN}/man1/7zr.1"
- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7zr.1"
+ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7zr.1"
else
echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7z.1"
grep -v "{DEST_SHARE_DOC}" man1/7z.1 > "${DEST_DIR}${DEST_MAN}/man1/7z.1"
- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7z.1"
+ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7z.1"
echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7za.1"
grep -v "{DEST_SHARE_DOC}" man1/7za.1 > "${DEST_DIR}${DEST_MAN}/man1/7za.1"
- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7za.1"
+ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7za.1"
echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7zr.1"
grep -v "{DEST_SHARE_DOC}" man1/7zr.1 > "${DEST_DIR}${DEST_MAN}/man1/7zr.1"
- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7zr.1"
+ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7zr.1"
fi
if [ -f README ]
@@ -150,7 +150,7 @@
echo "- installing ${DEST_DIR}${DEST_SHARE_DOC}/README"
mkdir -p "${DEST_DIR}${DEST_SHARE_DOC}"
cp README "${DEST_DIR}${DEST_SHARE_DOC}/README"
- chmod 444 "${DEST_DIR}${DEST_SHARE_DOC}/README"
+ chmod 644 "${DEST_DIR}${DEST_SHARE_DOC}/README"
fi
if [ -f ChangeLog ]
@@ -158,7 +158,7 @@
echo "- installing ${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog"
mkdir -p "${DEST_DIR}${DEST_SHARE_DOC}"
cp ChangeLog "${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog"
- chmod 444 "${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog"
+ chmod 644 "${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog"
fi
if [ -d DOCS ]
@@ -166,7 +166,7 @@
echo "- installing HTML help in ${DEST_DIR}${DEST_SHARE_DOC}/DOCS"
mkdir -p "${DEST_DIR}${DEST_SHARE_DOC}"
cp -r DOCS "${DEST_DIR}${DEST_SHARE_DOC}/DOCS"
- find "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -type d -exec chmod 555 {} \;
- find "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -type f -exec chmod 444 {} \;
+ find "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -type d -exec chmod 755 {} \;
+ find "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -type f -exec chmod 644 {} \;
fi
diff -ruN p7zip_9.13-orig/makefile.haiku p7zip_9.13/makefile.haiku
--- p7zip_9.13-orig/makefile.haiku 1969-12-31 19:00:00.000000000 -0500
+++ p7zip_9.13/makefile.haiku 2010-11-29 06:20:22.672399360 -0500
@@ -0,0 +1,17 @@
+OPTFLAGS=-O
+
+ALLFLAGS=${OPTFLAGS} -s \
+ -DENV_HAIKU \
+ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
+ -DNDEBUG -D_REENTRANT -DENV_UNIX \
+ $(LOCAL_FLAGS)
+
+CXX=g++ $(ALLFLAGS)
+CC=gcc $(ALLFLAGS)
+LINK_SHARED=-nostart
+
+LOCAL_LIBS=
+LOCAL_LIBS_DLL=$(LOCAL_LIBS)
+
+OBJ_CRC32=$(OBJ_CRC32_C)
+

89
app-arch/p7zip/patches/p7zip-9.20.1.patchset
View File

@@ -1,89 +0,0 @@
From 15a2cc74e7d3ef5b5078cc151918ab59d73c2c17 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 14 Feb 2016 10:08:25 +0100
Subject: applying patch p7zip-9.20.1.patch
diff --git a/CPP/Windows/System.cpp b/CPP/Windows/System.cpp
index b63ebec..32d14cd 100644
--- a/CPP/Windows/System.cpp
+++ b/CPP/Windows/System.cpp
@@ -15,7 +15,7 @@
#include <sys/sysinfo.h>
#endif
-#if defined(ENV_BEOS)
+#if defined(ENV_BEOS) || defined(ENV_HAIKU)
#include <be/kernel/OS.h>
#endif
@@ -79,7 +79,7 @@ namespace NWindows
if (nbcpu < 1) nbcpu = 1;
return nbcpu;
}
- #elif defined(ENV_BEOS)
+ #elif defined(ENV_BEOS) || defined(ENV_HAIKU)
UInt32 GetNumberOfProcessors() {
system_info info;
get_system_info(&info);
diff --git a/CPP/myWindows/config.h b/CPP/myWindows/config.h
index 54332aa..be19f17 100644
--- a/CPP/myWindows/config.h
+++ b/CPP/myWindows/config.h
@@ -24,7 +24,7 @@
#endif /* !ENV_MACOSX && !ENV_BEOS */
- #if !defined(ENV_BEOS)
+ #if !defined(ENV_BEOS) && !defined(ENV_HAIKU)
#define ENV_HAVE_GETPASS
#if !defined(sun)
diff --git a/makefile.haiku b/makefile.haiku
new file mode 100644
index 0000000..654e977
--- /dev/null
+++ b/makefile.haiku
@@ -0,0 +1,16 @@
+OPTFLAGS=-O
+
+ALLFLAGS=${OPTFLAGS} -s \
+ -DENV_HAIKU \
+ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
+ -DNDEBUG -D_REENTRANT -DENV_UNIX \
+ $(LOCAL_FLAGS)
+
+CXX=g++ $(ALLFLAGS)
+CC=gcc $(ALLFLAGS)
+LINK_SHARED=-nostart
+
+LOCAL_LIBS=
+LOCAL_LIBS_DLL=$(LOCAL_LIBS)
+
+OBJ_CRC32=$(OBJ_CRC32_C)
--
2.7.0
From e1583ddb02ed9e282869786c51d175bab7e284c3 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 14 Feb 2016 10:15:58 +0100
Subject: Fix detection of RAM size.
diff --git a/CPP/Windows/System.cpp b/CPP/Windows/System.cpp
index 32d14cd..8ad7975 100644
--- a/CPP/Windows/System.cpp
+++ b/CPP/Windows/System.cpp
@@ -150,7 +150,7 @@ namespace NWindows
if ( pstat( PSTAT_STATIC, pu, (size_t)sizeof(pst), (size_t)0, 0 ) != -1 ) {
ullTotalPhys = ((UInt64)pst.physical_memory)*pst.page_size;
}
-#elif defined(ENV_BEOS)
+#elif defined(ENV_BEOS) || defined(ENV_HAIKU)
system_info info;
get_system_info(&info);
ullTotalPhys = info.max_pages;
--
2.7.0