diff options
Diffstat (limited to 'app-text/mupdf/files')
-rw-r--r-- | app-text/mupdf/files/mupdf-1.15-openssl-x11.patch | 2 | ||||
-rw-r--r-- | app-text/mupdf/files/mupdf-1.18.0-darwin.patch | 41 |
2 files changed, 41 insertions, 2 deletions
diff --git a/app-text/mupdf/files/mupdf-1.15-openssl-x11.patch b/app-text/mupdf/files/mupdf-1.15-openssl-x11.patch index 22829279e147..3f3aac4c933a 100644 --- a/app-text/mupdf/files/mupdf-1.15-openssl-x11.patch +++ b/app-text/mupdf/files/mupdf-1.15-openssl-x11.patch @@ -1,5 +1,3 @@ -diff --git a/Makerules b/Makerules -index 298b5737..b2079435 100644 --- a/Makerules +++ b/Makerules @@ -119,13 +119,13 @@ else ifeq ($(OS),Linux) diff --git a/app-text/mupdf/files/mupdf-1.18.0-darwin.patch b/app-text/mupdf/files/mupdf-1.18.0-darwin.patch new file mode 100644 index 000000000000..cdd8ccf0f40d --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.18.0-darwin.patch @@ -0,0 +1,41 @@ +--- a/Makerules ++++ b/Makerules +@@ -117,11 +117,11 @@ ifeq ($(OS),MINGW) + else ifeq ($(OS),MACOS) + HAVE_GLUT := yes + SYS_GLUT_CFLAGS := -Wno-deprecated-declarations +- SYS_GLUT_LIBS := -framework GLUT -framework OpenGL +- CC = xcrun cc +- AR = xcrun ar +- LD = xcrun ld +- RANLIB = xcrun ranlib ++ SYS_GLUT_LIBS ?= -framework GLUT -framework OpenGL ++ CC ?= xcrun cc ++ AR ?= xcrun ar ++ LD ?= xcrun ld ++ RANLIB ?= xcrun ranlib + + else ifeq ($(OS),Linux) + HAVE_OBJCOPY := yes +--- a/Makerules ++++ b/Makerules +@@ -122,9 +122,7 @@ else ifeq ($(OS),MACOS) + AR ?= xcrun ar + LD ?= xcrun ld + RANLIB ?= xcrun ranlib +- +-else ifeq ($(OS),Linux) +- HAVE_OBJCOPY := yes ++endif + + ifeq ($(shell $(PKG_CONFIG) --exists freetype2 && echo yes),yes) + SYS_FREETYPE_CFLAGS := $(shell $(PKG_CONFIG) --cflags freetype2) +@@ -197,8 +195,6 @@ else ifeq ($(OS),Linux) + PTHREAD_LIBS := -lpthread + endif + +-endif +- + # The following section has various cross compilation configurations. + # + # Invoke these as: |