[gentoo-commits] repo/gentoo:master commit in: app-arch/unrar/files/

[gentoo-commits] repo/gentoo:master commit in: app-arch/unrar/files/

[Matt Turner]

commit:     e93e5ac3d5af1addff83eb402a61f087f422a06f
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Jun  5 14:55:24 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Jun  5 15:21:03 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e93e5ac3

app-arch/unrar: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31319
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 app-arch/unrar/files/unrar-5.5.5-honor-flags.patch | 46 ----------------------
 1 file changed, 46 deletions(-)

diff --git a/app-arch/unrar/files/unrar-5.5.5-honor-flags.patch b/app-arch/unrar/files/unrar-5.5.5-honor-flags.patch
deleted file mode 100644
index 0237e3d30f05..000000000000
--- a/app-arch/unrar/files/unrar-5.5.5-honor-flags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Makefile: Honor {LD,CXX}FLAGS, add LIBFLAGS
-
- - append -pthread to LDFLAGS instead of replacing them
- - use CXXFLAGS when linking
- - append LIBFLAGS to the individual targets instead of the final link
-
-Gentoo-Bug: https://bugs.gentoo.org/461806
-
---- a/makefile
-+++ b/makefile
-@@ -8,7 +8,7 @@ LIBFLAGS=-fPIC
- DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DRAR_SMP
- STRIP=strip
- AR=ar
--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 $(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
--lib:	CXXFLAGS+=$(LIBFLAGS)
- lib:	$(OBJECTS) $(LIB_OBJ)
--	$(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
-