commit: f0d703c8eb743b367378af0edba5ff72325d78d6 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Tue Jan 19 08:19:09 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Jan 19 15:15:59 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0d703c8
app-text/mupdf: remove unused patches Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/19126 Signed-off-by: Sam James <sam <AT> gentoo.org> app-text/mupdf/files/mupdf-1.15-Makefile.patch | 42 --------- .../mupdf-1.16.1-freeglut-fg_gl2-gcc-10.patch | 80 ---------------- .../mupdf/files/mupdf-1.17.0-cross-fixes.patch | 103 --------------------- 3 files changed, 225 deletions(-) diff --git a/app-text/mupdf/files/mupdf-1.15-Makefile.patch b/app-text/mupdf/files/mupdf-1.15-Makefile.patch deleted file mode 100644 index cff348d95e4..00000000000 --- a/app-text/mupdf/files/mupdf-1.15-Makefile.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/Makefile b/Makefile -index a9539342..e76b2c61 100644 ---- a/Makefile -+++ b/Makefile -@@ -3,7 +3,7 @@ - -include user.make - - ifndef build -- build := release -+ build := debug - endif - - ifndef OUT -@@ -187,13 +187,15 @@ generate: source/pdf/js/util.js.h - - # --- Library --- - --MUPDF_LIB = $(OUT)/libmupdf.a --THIRD_LIB = $(OUT)/libmupdf-third.a -+MUPDF_LIB = libmupdf.so.$(GENTOO_PV) -+MUPDF_STATIC = $(OUT)/libmupdf.a -+THIRD_LIB = - THREAD_LIB = $(OUT)/libmupdf-threads.a - PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a - --$(MUPDF_LIB) : $(MUPDF_OBJ) --$(THIRD_LIB) : $(THIRD_OBJ) -+$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_OBJ) -+ $(QUIET_LINK) $(CC) $(LDFLAGS) --shared -Wl,-soname -Wl,$(MUPDF_LIB) -o $@ $^ $(THIRD_LIBS) $(LIBS) -+$(MUPDF_STATIC): $(MUPDF_OBJ) $(THIRD_OBJ) - $(THREAD_LIB) : $(THREAD_OBJ) - $(PKCS7_LIB) : $(PKCS7_OBJ) - -@@ -322,7 +324,7 @@ install: libs apps - - install -d $(DESTDIR)$(docdir) - install -d $(DESTDIR)$(docdir)/examples -- install -m 644 README COPYING CHANGES $(DESTDIR)$(docdir) -+ install -m 644 README CHANGES $(DESTDIR)$(docdir) - install -m 644 docs/*.html docs/*.css docs/*.png $(DESTDIR)$(docdir) - install -m 644 docs/examples/* $(DESTDIR)$(docdir)/examples - diff --git a/app-text/mupdf/files/mupdf-1.16.1-freeglut-fg_gl2-gcc-10.patch b/app-text/mupdf/files/mupdf-1.16.1-freeglut-fg_gl2-gcc-10.patch deleted file mode 100644 index c9c37e2efac..00000000000 --- a/app-text/mupdf/files/mupdf-1.16.1-freeglut-fg_gl2-gcc-10.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 5791564dd934d193df771a0a7c52013e9f456aa1 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <[email protected]> -Date: Tue, 21 Jan 2020 22:33:49 +0000 -Subject: [PATCH] fg_gl2: fix build failure against gcc-10 - -On gcc-10 (and gcc-9 -fno-common) build fails as: - -``` -[ 31%] Linking C executable bin/Lorenz_static -/usr/bin/cmake -E cmake_link_script CMakeFiles/Lorenz_static.dir/link.txt --verbose=1 -/usr/lib/ccache/bin/cc -Wall -pedantic -rdynamic CMakeFiles/Lorenz_static.dir/progs/demos/Lorenz/lorenz.c.o \ - -o bin/Lorenz_static -lGLU -lGL -lm -lX11 -lXrandr -lXxf86vm -lXi -lm lib/libglut.a -lGL -lm -lX11 -lXrandr -lXxf86vm -lXi -ld: lib/libglut.a(fg_gl2.c.o):(.bss+0x0): - multiple definition of `fghGenBuffers'; lib/libglut.a(fg_window.c.o):(.bss+0x0): first defined here -ld: lib/libglut.a(fg_gl2.c.o):(.bss+0x8): - multiple definition of `fghDeleteBuffers'; lib/libglut.a(fg_window.c.o):(.bss+0x8): first defined here -``` - -Note: duplicate definition comes here from 'fg_gl2.h'. -The fix is to move declaration to a 'fg_gl2.c' file. - -gcc-10 will change the default from -fcommon to fno-common: -https://gcc.gnu.org/PR85678. - -The error also happens if CFLAGS=-fno-common passed explicitly. - -Bug: https://bugs.gentoo.org/705840 -Signed-off-by: Sergei Trofimovich <[email protected]> ---- - freeglut/freeglut/src/fg_gl2.c | 12 ++++++++++++ - freeglut/freeglut/src/fg_gl2.h | 14 +++++++------- - 2 files changed, 19 insertions(+), 7 deletions(-) - ---- a/thirdparty/freeglut/src/fg_gl2.c -+++ b/thirdparty/freeglut/src/fg_gl2.c -@@ -27,6 +27,18 @@ - #include "fg_internal.h" - #include "fg_gl2.h" - -+#ifdef GL_ES_VERSION_2_0 -+/* Use existing functions on GLES 2.0 */ -+#else -+FGH_PFNGLGENBUFFERSPROC fghGenBuffers; -+FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; -+FGH_PFNGLBINDBUFFERPROC fghBindBuffer; -+FGH_PFNGLBUFFERDATAPROC fghBufferData; -+FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; -+FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; -+FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; -+#endif -+ - void FGAPIENTRY glutSetVertexAttribCoord3(GLint attrib) { - if (fgStructure.CurrentWindow != NULL) - fgStructure.CurrentWindow->Window.attribute_v_coord = attrib; ---- a/thirdparty/freeglut/src/fg_gl2.h -+++ b/thirdparty/freeglut/src/fg_gl2.h -@@ -67,13 +67,13 @@ typedef void (APIENTRY *FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index); - typedef void (APIENTRY *FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint); - typedef void (APIENTRY *FGH_PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); - --FGH_PFNGLGENBUFFERSPROC fghGenBuffers; --FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; --FGH_PFNGLBINDBUFFERPROC fghBindBuffer; --FGH_PFNGLBUFFERDATAPROC fghBufferData; --FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; --FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; --FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; -+extern FGH_PFNGLGENBUFFERSPROC fghGenBuffers; -+extern FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; -+extern FGH_PFNGLBINDBUFFERPROC fghBindBuffer; -+extern FGH_PFNGLBUFFERDATAPROC fghBufferData; -+extern FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; -+extern FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; -+extern FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; - - # endif - --- -2.25.0 - diff --git a/app-text/mupdf/files/mupdf-1.17.0-cross-fixes.patch b/app-text/mupdf/files/mupdf-1.17.0-cross-fixes.patch deleted file mode 100644 index ae14f9bb5e4..00000000000 --- a/app-text/mupdf/files/mupdf-1.17.0-cross-fixes.patch +++ /dev/null @@ -1,103 +0,0 @@ -Refreshed patches based on: -https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0004-MuPDF-crossbuild-use-target-arch-pkg-config.patch/ -https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0005-MuPDF-crossbuild-use-host-cc-for-utils.patch/ ---- a/Makefile -+++ b/Makefile -@@ -134,6 +134,9 @@ PKCS7_OBJ := $(PKCS7_SRC:%.c=$(OUT)/%.o) - - HEXDUMP_EXE := $(OUT)/scripts/hexdump.exe - -+$(HEXDUMP_EXE): scripts/hexdump.c -+ $(QUIET_CC) $(MKTGTDIR) ; $(CC_FOR_BUILD) $(CFLAGS) -o $@ $< -+ - FONT_BIN := $(sort $(wildcard resources/fonts/urw/*.cff)) - FONT_BIN += $(sort $(wildcard resources/fonts/han/*.ttc)) - FONT_BIN += $(sort $(wildcard resources/fonts/droid/*.ttf)) ---- a/Makerules -+++ b/Makerules -@@ -15,6 +15,9 @@ OS := $(OS:MSYS%=MINGW) - OS := $(OS:Windows_NT=MINGW) - OS := $(OS:Darwin=MACOS) - -+PKG_CONFIG ?= pkg-config -+CC_FOR_BUILD ?= $(CC) -+ - ifeq ($(findstring -fembed-bitcode,$(XCFLAGS)),) - # clang does not support these in combination with -fembed-bitcode - CFLAGS += -ffunction-sections -fdata-sections -@@ -101,35 +104,35 @@ else ifeq ($(OS),MACOS) - else ifeq ($(OS),Linux) - HAVE_OBJCOPY := yes - -- ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes) -- SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2) -- SYS_FREETYPE_LIBS := $(shell pkg-config --libs freetype2) -+ ifeq ($(shell $(PKG_CONFIG) --exists freetype2 && echo yes),yes) -+ SYS_FREETYPE_CFLAGS := $(shell $(PKG_CONFIG) --cflags freetype2) -+ SYS_FREETYPE_LIBS := $(shell $(PKG_CONFIG) --libs freetype2) - endif -- ifeq ($(shell pkg-config --exists harfbuzz && echo yes),yes) -- SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz) -- SYS_HARFBUZZ_LIBS := $(shell pkg-config --libs harfbuzz) -+ ifeq ($(shell $(PKG_CONFIG) --exists harfbuzz && echo yes),yes) -+ SYS_HARFBUZZ_CFLAGS := $(shell $(PKG_CONFIG) --cflags harfbuzz) -+ SYS_HARFBUZZ_LIBS := $(shell $(PKG_CONFIG) --libs harfbuzz) - endif -- ifeq ($(shell pkg-config --exists lcms2 && echo yes),yes) -- SYS_LCMS2_CFLAGS := $(shell pkg-config --cflags lcms2) -- SYS_LCMS2_LIBS := $(shell pkg-config --libs lcms2) -+ ifeq ($(shell $(PKG_CONFIG) --exists lcms2 && echo yes),yes) -+ SYS_LCMS2_CFLAGS := $(shell $(PKG_CONFIG) --cflags lcms2) -+ SYS_LCMS2_LIBS := $(shell $(PKG_CONFIG) --libs lcms2) - endif -- ifeq ($(shell pkg-config --exists libjpeg && echo yes),yes) -- SYS_LIBJPEG_CFLAGS := $(shell pkg-config --cflags libjpeg) -- SYS_LIBJPEG_LIBS := $(shell pkg-config --libs libjpeg) -+ ifeq ($(shell $(PKG_CONFIG) --exists libjpeg && echo yes),yes) -+ SYS_LIBJPEG_CFLAGS := $(shell $(PKG_CONFIG) --cflags libjpeg) -+ SYS_LIBJPEG_LIBS := $(shell $(PKG_CONFIG) --libs libjpeg) - endif -- ifeq ($(shell pkg-config --exists libopenjp2 && echo yes),yes) -- SYS_OPENJPEG_CFLAGS := $(shell pkg-config --cflags libopenjp2) -- SYS_OPENJPEG_LIBS := $(shell pkg-config --libs libopenjp2) -+ ifeq ($(shell $(PKG_CONFIG) --exists libopenjp2 && echo yes),yes) -+ SYS_OPENJPEG_CFLAGS := $(shell $(PKG_CONFIG) --cflags libopenjp2) -+ SYS_OPENJPEG_LIBS := $(shell $(PKG_CONFIG) --libs libopenjp2) - endif -- ifeq ($(shell pkg-config --exists zlib && echo yes),yes) -- SYS_ZLIB_CFLAGS := $(shell pkg-config --cflags zlib) -- SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib) -+ ifeq ($(shell $(PKG_CONFIG) --exists zlib && echo yes),yes) -+ SYS_ZLIB_CFLAGS := $(shell $(PKG_CONFIG) --cflags zlib) -+ SYS_ZLIB_LIBS := $(shell $(PKG_CONFIG) --libs zlib) - endif - -- HAVE_SYS_CURL := $(shell pkg-config --exists libcurl && echo yes) -+ HAVE_SYS_CURL := $(shell $(PKG_CONFIG) --exists libcurl && echo yes) - ifeq ($(HAVE_SYS_CURL),yes) -- SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl) -- SYS_CURL_LIBS := $(shell pkg-config --libs libcurl) -+ SYS_CURL_CFLAGS := $(shell $(PKG_CONFIG) --cflags libcurl) -+ SYS_CURL_LIBS := $(shell $(PKG_CONFIG) --libs libcurl) - endif - - HAVE_GLUT := yes -@@ -140,14 +143,14 @@ else ifeq ($(OS),Linux) - - HAVE_X11 := not-unless-portage-tells-me - ifeq ($(HAVE_X11),yes) -- X11_CFLAGS := $(shell pkg-config --cflags x11 xext) -- X11_LIBS := $(shell pkg-config --libs x11 xext) -+ X11_CFLAGS := $(shell $(PKG_CONFIG) --cflags x11 xext) -+ X11_LIBS := $(shell $(PKG_CONFIG) --libs x11 xext) - endif - - HAVE_LIBCRYPTO := not-unless-portage-tells-me - ifeq ($(HAVE_LIBCRYPTO),yes) -- LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO -- LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto) -+ LIBCRYPTO_CFLAGS := $(shell $(PKG_CONFIG) --cflags libcrypto) -DHAVE_LIBCRYPTO -+ LIBCRYPTO_LIBS := $(shell $(PKG_CONFIG) --libs libcrypto) - endif - - HAVE_PTHREAD := yes
