commit: 227dea7a3673b42a6073fff1f607ea3212a795e2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Sat Apr 8 17:15:34 2023 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Tue Apr 18 13:43:32 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=227dea7a
media-gfx/jhead: remove unused patch Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/30519 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> .../files/jhead-3.04-mkstemp-fix-makefile.patch | 53 ---------------------- 1 file changed, 53 deletions(-) diff --git a/media-gfx/jhead/files/jhead-3.04-mkstemp-fix-makefile.patch b/media-gfx/jhead/files/jhead-3.04-mkstemp-fix-makefile.patch deleted file mode 100644 index 0bb634b6f5b9..000000000000 --- a/media-gfx/jhead/files/jhead-3.04-mkstemp-fix-makefile.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/jhead.c b/jhead.c -index f78127a..d8d1472 100644 ---- a/jhead.c -+++ b/jhead.c -@@ -376,7 +376,7 @@ static void DoCommand(const char * FileName, int ShowIt) - // as mktemp - that is, that between getting the random name, and making the file - // some other program could snatch that exact same name! - // also, not all platforms support mkstemp. -- mktemp(TempName); -+ mkstemp(TempName); - - - if(!TempName[0]) { -diff --git a/makefile b/makefile -index f8f195e..c36d34f 100644 ---- a/makefile -+++ b/makefile -@@ -3,17 +3,20 @@ - #-------------------------------- - OBJ=. - SRC=. --CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) --CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) --LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) -+LFLAGS = -fPIC -shared -Wl,-soname,libjhead.so.1 - --all: jhead -+TARGET = libjhead.so.1.0.0 -+TARGET0 = libjhead.so -+TARGET1 = libjhead.so.1 -+TARGET2 = libjhead.so.1.0 -+ -+all: jhead $(TARGET) - - objs = $(OBJ)/jhead.o $(OBJ)/jpgfile.o $(OBJ)/jpgqguess.o $(OBJ)/paths.o \ - $(OBJ)/exif.o $(OBJ)/iptc.o $(OBJ)/gpsinfo.o $(OBJ)/makernote.o - - $(OBJ)/%.o:$(SRC)/%.c -- ${CC} $(CFLAGS) $(CPPFLAGS) -c $< -o $@ -+ ${CC} -fPIC $(CFLAGS) $(CPPFLAGS) -c $< -o $@ - - jhead: $(objs) jhead.h - ${CC} $(LDFLAGS) -o jhead $(objs) -lm -@@ -23,3 +26,9 @@ clean: - - install: - cp jhead ${DESTDIR}/usr/bin/ -+ -+$(TARGET): $(objs) jhead -+ ${CC} $(LDFLAGS) $(LFLAGS) -o $(TARGET) $(objs) -+ ln -s ${TARGET} ${TARGET0} -+ ln -s ${TARGET} ${TARGET1} -+ ln -s ${TARGET} ${TARGET2}
