Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unrar ver. bump

Browse Source
This commit is contained in:
Rmys
2022-11-06 13:37:06 +03:00
parent b132c229e3
commit 5e43675ca4
3 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/archive/unrar/files/unrar-5.5.5-build.patch
+11 -20
View File
@@ -6,39 +6,30 @@ try to link and fail.
Gentoo-Bug: https://bugs.gentoo.org/528218 Gentoo-Bug: https://bugs.gentoo.org/528218
--- a/makefile --- unrar/makefile
+++ b/makefile +++ unrar/makefile
@@ -139,23 +139,23 @@ uninstall: uninstall-unrar @@ -142,21 +142,18 @@
@rm -f $(OBJECTS) $(UNRAR_OBJ) $(LIB_OBJ)
clean: @rm -f unrar libunrar.*
@rm -f *.o *.bak *~
-
-unrar: clean $(OBJECTS) $(UNRAR_OBJ) -unrar: clean $(OBJECTS) $(UNRAR_OBJ)
@rm -f unrar - @rm -f unrar
+ @rm -f default.sfx
+ @rm -f libunrar.so
+ @rm -f libunrar.a
+
+unrar: $(OBJECTS) $(UNRAR_OBJ) +unrar: $(OBJECTS) $(UNRAR_OBJ)
$(LINK) -o unrar $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS) $(LINK) -o unrar $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS)
$(STRIP) unrar $(STRIP) unrar
sfx: WHAT=SFX_MODULE sfx: WHAT=SFX_MODULE
-sfx: clean $(OBJECTS) -sfx: clean $(OBJECTS)
- @rm -f default.sfx - @rm -f default.sfx
+sfx: $(OBJECTS) +sfx: $(OBJECTS)
$(LINK) -o default.sfx $(LDFLAGS) $(OBJECTS) $(LINK) -o default.sfx $(LDFLAGS) $(OBJECTS)
$(STRIP) default.sfx $(STRIP) default.sfx
lib: WHAT=RARDLL lib: WHAT=RARDLL
lib: CXXFLAGS+=$(LIBFLAGS) lib: CXXFLAGS+=$(LIBFLAGS)
-lib: clean $(OBJECTS) $(LIB_OBJ) -lib: clean $(OBJECTS) $(LIB_OBJ)
- @rm -f libunrar.so - @rm -f libunrar.*
- @rm -f libunrar.a
+lib: $(OBJECTS) $(LIB_OBJ) +lib: $(OBJECTS) $(LIB_OBJ)
$(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ) $(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
$(AR) rcs libunrar.a $(OBJECTS) $(LIB_OBJ) $(AR) rcs libunrar.a $(OBJECTS) $(LIB_OBJ)
--
2.13.1
util/archive/unrar/files/unrar-5.5.5-honor-flags.patch
+7 -7
View File
@@ -15,22 +15,22 @@ Gentoo-Bug: https://bugs.gentoo.org/461806
-LDFLAGS=-pthread -LDFLAGS=-pthread
+LDFLAGS+=-pthread +LDFLAGS+=-pthread
DESTDIR=/usr DESTDIR=/usr
# Linux using LCC # Linux using LCC
@@ -145,18 +145,19 @@ clean: @@ -145,18 +145,19 @@ clean:
@rm -f libunrar.a @rm -f libunrar.a
unrar: $(OBJECTS) $(UNRAR_OBJ) 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) + $(LINK) -o unrar $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS)
$(STRIP) unrar $(STRIP) unrar
sfx: WHAT=SFX_MODULE sfx: WHAT=SFX_MODULE
sfx: $(OBJECTS) sfx: $(OBJECTS)
- $(LINK) -o default.sfx $(LDFLAGS) $(OBJECTS) - $(LINK) -o default.sfx $(LDFLAGS) $(OBJECTS)
+ $(LINK) -o default.sfx $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) + $(LINK) -o default.sfx $(CXXFLAGS) $(LDFLAGS) $(OBJECTS)
$(STRIP) default.sfx $(STRIP) default.sfx
+$(OBJECTS) $(LIB_OBJ): CXXFLAGS+=$(LIBFLAGS) +$(OBJECTS) $(LIB_OBJ): CXXFLAGS+=$(LIBFLAGS)
+ +
lib: WHAT=RARDLL 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 $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
+ $(LINK) -shared -o libunrar.so $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(LIB_OBJ) + $(LINK) -shared -o libunrar.so $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
$(AR) rcs libunrar.a $(OBJECTS) $(LIB_OBJ) $(AR) rcs libunrar.a $(OBJECTS) $(LIB_OBJ)
install-unrar: install-unrar:
-- --
2.13.1 2.13.1
util/archive/unrar/pspec.xml
+10 -3
View File
@@ -12,10 +12,10 @@
<IsA>app:console</IsA> <IsA>app:console</IsA>
<Summary>RAR decompressor</Summary> <Summary>RAR decompressor</Summary>
<Description>unrar is a program to decompress RAR archives.</Description> <Description>unrar is a program to decompress RAR archives.</Description>
<Archive sha1sum="6af7fc7a56639e22c982f4469decc519bc73fbad" type="targz">http://www.rarlab.com/rar/unrarsrc-5.9.1.tar.gz</Archive> <Archive sha1sum="1df74f8e34f7f8ec6d5cf525c053b21a1e52e5eb" type="targz">http://www.rarlab.com/rar/unrarsrc-6.2.1.tar.gz</Archive>
<Patches> <Patches>
<Patch level="1">unrar-5.5.5-build.patch</Patch> <!-- <Patch level="1">unrar-5.5.5-build.patch</Patch> -->
<Patch level="1">unrar-5.5.5-honor-flags.patch</Patch> <!-- <Patch level="1">unrar-5.5.5-honor-flags.patch</Patch> -->
</Patches> </Patches>
</Source> </Source>
@@ -33,6 +33,13 @@
</Package> </Package>
<History> <History>
<Update release="7">
<Date>2022-10-25</Date>
<Version>6.2.1</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="6"> <Update release="6">
<Date>2020-02-19</Date> <Date>2020-02-19</Date>
<Version>5.9.1</Version> <Version>5.9.1</Version>