diff --git a/util/archive/unrar/files/unrar-5.5.5-build.patch b/util/archive/unrar/files/unrar-5.5.5-build.patch index 5d69a25d65..d7969c2c00 100644 --- a/util/archive/unrar/files/unrar-5.5.5-build.patch +++ b/util/archive/unrar/files/unrar-5.5.5-build.patch @@ -6,39 +6,30 @@ try to link and fail. Gentoo-Bug: https://bugs.gentoo.org/528218 ---- a/makefile -+++ b/makefile -@@ -139,23 +139,23 @@ uninstall: uninstall-unrar - - clean: - @rm -f *.o *.bak *~ -- +--- unrar/makefile ++++ unrar/makefile +@@ -142,21 +142,18 @@ + @rm -f $(OBJECTS) $(UNRAR_OBJ) $(LIB_OBJ) + @rm -f unrar libunrar.* + -unrar: clean $(OBJECTS) $(UNRAR_OBJ) - @rm -f unrar -+ @rm -f default.sfx -+ @rm -f libunrar.so -+ @rm -f libunrar.a -+ +- @rm -f unrar +unrar: $(OBJECTS) $(UNRAR_OBJ) - $(LINK) -o unrar $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS) + $(LINK) -o unrar $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS) $(STRIP) unrar - + sfx: WHAT=SFX_MODULE -sfx: clean $(OBJECTS) - @rm -f default.sfx +sfx: $(OBJECTS) $(LINK) -o default.sfx $(LDFLAGS) $(OBJECTS) $(STRIP) default.sfx - + lib: WHAT=RARDLL lib: CXXFLAGS+=$(LIBFLAGS) -lib: clean $(OBJECTS) $(LIB_OBJ) -- @rm -f libunrar.so -- @rm -f libunrar.a +- @rm -f libunrar.* +lib: $(OBJECTS) $(LIB_OBJ) $(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ) $(AR) rcs libunrar.a $(OBJECTS) $(LIB_OBJ) - --- -2.13.1 diff --git a/util/archive/unrar/files/unrar-5.5.5-honor-flags.patch b/util/archive/unrar/files/unrar-5.5.5-honor-flags.patch index 0237e3d30f..deab86236d 100644 --- a/util/archive/unrar/files/unrar-5.5.5-honor-flags.patch +++ b/util/archive/unrar/files/unrar-5.5.5-honor-flags.patch @@ -15,22 +15,22 @@ Gentoo-Bug: https://bugs.gentoo.org/461806 -LDFLAGS=-pthread +LDFLAGS+=-pthread DESTDIR=/usr - + # Linux using LCC @@ -145,18 +145,19 @@ clean: @rm -f libunrar.a - + unrar: $(OBJECTS) $(UNRAR_OBJ) -- $(LINK) -o unrar $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS) +- $(LINK) -o unrar $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS) + $(LINK) -o unrar $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS) $(STRIP) unrar - + sfx: WHAT=SFX_MODULE sfx: $(OBJECTS) - $(LINK) -o default.sfx $(LDFLAGS) $(OBJECTS) + $(LINK) -o default.sfx $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(STRIP) default.sfx - + +$(OBJECTS) $(LIB_OBJ): CXXFLAGS+=$(LIBFLAGS) + lib: WHAT=RARDLL @@ -39,8 +39,8 @@ Gentoo-Bug: https://bugs.gentoo.org/461806 - $(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ) + $(LINK) -shared -o libunrar.so $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(LIB_OBJ) $(AR) rcs libunrar.a $(OBJECTS) $(LIB_OBJ) - + install-unrar: --- +-- 2.13.1 diff --git a/util/archive/unrar/pspec.xml b/util/archive/unrar/pspec.xml index 9db970a553..315a04acec 100644 --- a/util/archive/unrar/pspec.xml +++ b/util/archive/unrar/pspec.xml @@ -12,10 +12,10 @@ app:console RAR decompressor unrar is a program to decompress RAR archives. - http://www.rarlab.com/rar/unrarsrc-5.9.1.tar.gz + http://www.rarlab.com/rar/unrarsrc-6.2.1.tar.gz - unrar-5.5.5-build.patch - unrar-5.5.5-honor-flags.patch + + @@ -33,6 +33,13 @@ + + 2022-10-25 + 6.2.1 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2020-02-19 5.9.1