diff --git a/app-arch/unrar/additional-files/unrar.rdef b/app-arch/unrar/additional-files/unrar.rdef index 332ffd392..f46180d89 100644 --- a/app-arch/unrar/additional-files/unrar.rdef +++ b/app-arch/unrar/additional-files/unrar.rdef @@ -9,5 +9,5 @@ resource app_version { variety = 0, internal = 0, short_info = "UnRAR", - long_info = "UnRAR ©1993-2018 Alexander Roshal" + long_info = "UnRAR ©1993-2021 Alexander Roshal" }; diff --git a/app-arch/unrar/patches/unrar-5.6.8.patchset b/app-arch/unrar/patches/unrar-5.6.8.patchset deleted file mode 100644 index 647163d4e..000000000 --- a/app-arch/unrar/patches/unrar-5.6.8.patchset +++ /dev/null @@ -1,21 +0,0 @@ -From 1c19dea55d375f6968ce54a51ab42958347726a8 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Mon, 12 May 2014 18:07:44 +0000 -Subject: initial Haiku patch - - -diff --git a/archive.hpp b/archive.hpp -index fd33ac3..787977b 100644 ---- a/archive.hpp -+++ b/archive.hpp -@@ -67,7 +67,6 @@ class Archive:public File - size_t SearchSubBlock(const wchar *Type); - size_t SearchRR(); - void WriteBlock(HEADER_TYPE HeaderType,BaseBlock *wb=NULL,bool OnlySetSize=false,bool NonFinalWrite=false); -- void SetBlockSize(HEADER_TYPE HeaderType,BaseBlock *wb=NULL) {WriteBlock(HeaderType,wb,true);} - size_t ReadHeader(); - void CheckArc(bool EnableBroken); - void CheckOpen(const wchar *Name); --- -2.16.2 - diff --git a/app-arch/unrar/patches/unrar-5.7.3.patchset b/app-arch/unrar/patches/unrar-5.7.3.patchset deleted file mode 100644 index 647163d4e..000000000 --- a/app-arch/unrar/patches/unrar-5.7.3.patchset +++ /dev/null @@ -1,21 +0,0 @@ -From 1c19dea55d375f6968ce54a51ab42958347726a8 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Mon, 12 May 2014 18:07:44 +0000 -Subject: initial Haiku patch - - -diff --git a/archive.hpp b/archive.hpp -index fd33ac3..787977b 100644 ---- a/archive.hpp -+++ b/archive.hpp -@@ -67,7 +67,6 @@ class Archive:public File - size_t SearchSubBlock(const wchar *Type); - size_t SearchRR(); - void WriteBlock(HEADER_TYPE HeaderType,BaseBlock *wb=NULL,bool OnlySetSize=false,bool NonFinalWrite=false); -- void SetBlockSize(HEADER_TYPE HeaderType,BaseBlock *wb=NULL) {WriteBlock(HeaderType,wb,true);} - size_t ReadHeader(); - void CheckArc(bool EnableBroken); - void CheckOpen(const wchar *Name); --- -2.16.2 - diff --git a/app-arch/unrar/patches/unrar-5.8.3.patchset b/app-arch/unrar/patches/unrar-5.8.3.patchset deleted file mode 100644 index 647163d4e..000000000 --- a/app-arch/unrar/patches/unrar-5.8.3.patchset +++ /dev/null @@ -1,21 +0,0 @@ -From 1c19dea55d375f6968ce54a51ab42958347726a8 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Mon, 12 May 2014 18:07:44 +0000 -Subject: initial Haiku patch - - -diff --git a/archive.hpp b/archive.hpp -index fd33ac3..787977b 100644 ---- a/archive.hpp -+++ b/archive.hpp -@@ -67,7 +67,6 @@ class Archive:public File - size_t SearchSubBlock(const wchar *Type); - size_t SearchRR(); - void WriteBlock(HEADER_TYPE HeaderType,BaseBlock *wb=NULL,bool OnlySetSize=false,bool NonFinalWrite=false); -- void SetBlockSize(HEADER_TYPE HeaderType,BaseBlock *wb=NULL) {WriteBlock(HeaderType,wb,true);} - size_t ReadHeader(); - void CheckArc(bool EnableBroken); - void CheckOpen(const wchar *Name); --- -2.16.2 - diff --git a/app-arch/unrar/unrar-5.6.8.recipe b/app-arch/unrar/unrar-5.6.8.recipe deleted file mode 100644 index 5048c077e..000000000 --- a/app-arch/unrar/unrar-5.6.8.recipe +++ /dev/null @@ -1,112 +0,0 @@ -SUMMARY="Uncompress rar files" -DESCRIPTION="UnRAR decompresses rar files. It is a powerful archive manager \ -that can backup your data and reduce the size of email attachments. UnRAR can \ -decompress the following file formats: -- RAR -- ZIP -- CAB -- ARJ -- JZH -- TAR -- GZ and TAR.GZ -- BZ2 and TAR.BZ2 -- ACE -- UUE -- JAR (Java Archive) -- ISO -- 7Z -- XZ -- Z (Unix Compress)" -HOMEPAGE="https://www.rarlab.com/rar_add.htm" -COPYRIGHT="1993-2018 Alexander Roshal" -LICENSE="UnRAR" -REVISION="1" -SOURCE_URI="https://www.rarlab.com/rar/unrarsrc-$portVersion.tar.gz" -CHECKSUM_SHA256="a4cc0ac14a354827751912d2af4a0a09e2c2129df5766576fa7e151791dd3dff" -SOURCE_DIR="unrar" -PATCHES="unrar-$portVersion.patchset" -ADDITIONAL_FILES=" - test.rar - unrar.rdef - " - -ARCHITECTURES="x86_gcc2 x86 x86_64" - -PROVIDES=" - unrar = $portVersion - cmd:unrar = $portVersion - devel:libunrar = $portVersion - lib:libunrar = $portVersion - " -REQUIRES=" - haiku - " - -BUILD_REQUIRES=" - haiku_devel - " -BUILD_PREREQUIRES=" - cmd:cut - cmd:g++ - cmd:make - cmd:sed - " - -PATCH() -{ - if [ "$effectiveTargetArchitecture" = x86_gcc2 ]; then - sed -i \ - -e "/^CXXFLAGS=/ s/ -Wno-logical-op-parentheses//;" \ - -e "/^CXXFLAGS=/ s/ -Wno-dangling-else//;" \ - makefile - fi - sed -i -e "/^LDFLAGS=/ d;" makefile -} - -BUILD() -{ - local MAJOR="`echo "$portVersion" | cut -d. -f1`" - local MIDDLE="`echo "$portVersion" | cut -d. -f2`" - local MINOR="`echo "$portVersion" | cut -d. -f3`" - sed \ - -e "s|@MAJOR@|$MAJOR|" \ - -e "s|@MIDDLE@|$MIDDLE|" \ - -e "s|@MINOR@|$MINOR|" \ - "$portDir"/additional-files/unrar.rdef > unrar.rdef - - for i in unrar lib sfx; do - mkdir -p $i - cd $i - ln -f -s ../*.cpp ../*.hpp ../makefile . - CPPFLAGS="-D_BSD_SOURCE" LDFLAGS="-lbsd" make $i - cd .. - done -} - -INSTALL() -{ - install -d "$libDir"/unrar - install -t "$libDir"/unrar sfx/default.sfx - for i in unrar lib; do - make -C $i DESTDIR="$prefix" install-$i - done - rm "$libDir"/libunrar.a - - prepareInstalledDevelLib libunrar - - addResourcesToBinaries unrar.rdef "$binDir"/unrar - mimeset -f "$binDir"/unrar -} - -TEST() -{ - rm -rf dir - "$sourceDir"/unrar/unrar x "$portDir"/additional-files/test.rar - test "`cat dir/haiku.txt`" = Haiku - - cat sfx/default.sfx "$portDir"/additional-files/test.rar >dir/sfxtest - cd dir - chmod +x sfxtest - ./sfxtest - test "`cat dir/haiku.txt`" = Haiku -} diff --git a/app-arch/unrar/unrar-5.7.3.recipe b/app-arch/unrar/unrar-5.7.3.recipe deleted file mode 100644 index e04801c5b..000000000 --- a/app-arch/unrar/unrar-5.7.3.recipe +++ /dev/null @@ -1,112 +0,0 @@ -SUMMARY="Uncompress rar files" -DESCRIPTION="UnRAR decompresses rar files. It is a powerful archive manager \ -that can backup your data and reduce the size of email attachments. UnRAR can \ -decompress the following file formats: -- RAR -- ZIP -- CAB -- ARJ -- JZH -- TAR -- GZ and TAR.GZ -- BZ2 and TAR.BZ2 -- ACE -- UUE -- JAR (Java Archive) -- ISO -- 7Z -- XZ -- Z (Unix Compress)" -HOMEPAGE="https://www.rarlab.com/rar_add.htm" -COPYRIGHT="1993-2018 Alexander Roshal" -LICENSE="UnRAR" -REVISION="1" -SOURCE_URI="https://www.rarlab.com/rar/unrarsrc-$portVersion.tar.gz" -CHECKSUM_SHA256="40e856b78374f258d8a1f5f02c02f828c5392a0118c9300fd169a300b520a444" -SOURCE_DIR="unrar" -PATCHES="unrar-$portVersion.patchset" -ADDITIONAL_FILES=" - test.rar - unrar.rdef - " - -ARCHITECTURES="x86_gcc2 x86 x86_64" - -PROVIDES=" - unrar = $portVersion - cmd:unrar = $portVersion - devel:libunrar = $portVersion - lib:libunrar = $portVersion - " -REQUIRES=" - haiku - " - -BUILD_REQUIRES=" - haiku_devel - " -BUILD_PREREQUIRES=" - cmd:cut - cmd:g++ - cmd:make - cmd:sed - " - -PATCH() -{ - if [ "$effectiveTargetArchitecture" = x86_gcc2 ]; then - sed -i \ - -e "/^CXXFLAGS=/ s/ -Wno-logical-op-parentheses//;" \ - -e "/^CXXFLAGS=/ s/ -Wno-dangling-else//;" \ - makefile - fi - sed -i -e "/^LDFLAGS=/ d;" makefile -} - -BUILD() -{ - local MAJOR="`echo "$portVersion" | cut -d. -f1`" - local MIDDLE="`echo "$portVersion" | cut -d. -f2`" - local MINOR="`echo "$portVersion" | cut -d. -f3`" - sed \ - -e "s|@MAJOR@|$MAJOR|" \ - -e "s|@MIDDLE@|$MIDDLE|" \ - -e "s|@MINOR@|$MINOR|" \ - "$portDir"/additional-files/unrar.rdef > unrar.rdef - - for i in unrar lib sfx; do - mkdir -p $i - cd $i - ln -f -s ../*.cpp ../*.hpp ../makefile . - CPPFLAGS="-D_BSD_SOURCE" LDFLAGS="-lbsd" make $i - cd .. - done -} - -INSTALL() -{ - install -d "$libDir"/unrar - install -t "$libDir"/unrar sfx/default.sfx - for i in unrar lib; do - make -C $i DESTDIR="$prefix" install-$i - done - rm "$libDir"/libunrar.a - - prepareInstalledDevelLib libunrar - - addResourcesToBinaries unrar.rdef "$binDir"/unrar - mimeset -f "$binDir"/unrar -} - -TEST() -{ - rm -rf dir - "$sourceDir"/unrar/unrar x "$portDir"/additional-files/test.rar - test "`cat dir/haiku.txt`" = Haiku - - cat sfx/default.sfx "$portDir"/additional-files/test.rar >dir/sfxtest - cd dir - chmod +x sfxtest - ./sfxtest - test "`cat dir/haiku.txt`" = Haiku -} diff --git a/app-arch/unrar/unrar-5.8.3.recipe b/app-arch/unrar/unrar-6.0.4.recipe similarity index 93% rename from app-arch/unrar/unrar-5.8.3.recipe rename to app-arch/unrar/unrar-6.0.4.recipe index 8de9ae031..1e07c823c 100644 --- a/app-arch/unrar/unrar-5.8.3.recipe +++ b/app-arch/unrar/unrar-6.0.4.recipe @@ -18,13 +18,12 @@ decompress the following file formats: - XZ - Z (Unix Compress)" HOMEPAGE="https://www.rarlab.com/rar_add.htm" -COPYRIGHT="1993-2018 Alexander Roshal" +COPYRIGHT="1993-2021 Alexander Roshal" LICENSE="UnRAR" -REVISION="3" +REVISION="4" SOURCE_URI="https://www.rarlab.com/rar/unrarsrc-$portVersion.tar.gz" -CHECKSUM_SHA256="3591685c8f5bbcb0be09de3d0a0544adb88966b9cccb80986f6cd2b534fd91a6" +CHECKSUM_SHA256="130197e495d6e2c2ee790a5beee123edeed642508be13f0159672e5397aca6c1" SOURCE_DIR="unrar" -PATCHES="unrar-$portVersion.patchset" ADDITIONAL_FILES=" test.rar unrar.rdef diff --git a/dev-python/unrardll/unrardll-0.1.4.recipe b/dev-python/unrardll/unrardll-0.1.4.recipe index 6b91cc0f5..7471acc79 100644 --- a/dev-python/unrardll/unrardll-0.1.4.recipe +++ b/dev-python/unrardll/unrardll-0.1.4.recipe @@ -4,7 +4,7 @@ HOMEPAGE="https://github.com/kovidgoyal/unrardll https://pypi.org/project/unrardll/" COPYRIGHT="2017 Kovid Goyal" LICENSE="BSD (3-clause)" -REVISION="3" +REVISION="4" SOURCE_URI="https://github.com/kovidgoyal/unrardll/archive/v$portVersion.tar.gz" CHECKSUM_SHA256="88c23a76492cf0d4aef5861947064698984c930294776dc66e9c46c2004ff0a2"