summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weber <xmw@gentoo.org>2011-02-17 02:15:27 +0000
committerMichael Weber <xmw@gentoo.org>2011-02-17 02:15:27 +0000
commit80749566839cde7520ea452695ccbcc2ca42177f (patch)
tree154eb365476302ba3704529a8eb85542f3015dc4 /app-text/mupdf/files
parentVersion bump (diff)
downloadgentoo-2-80749566839cde7520ea452695ccbcc2ca42177f.tar.gz
gentoo-2-80749566839cde7520ea452695ccbcc2ca42177f.tar.bz2
gentoo-2-80749566839cde7520ea452695ccbcc2ca42177f.zip
Removed old ebuilds. Created a snapshot and added -j1.
(Portage version: 2.1.9.25/cvs/Linux x86_64)
Diffstat (limited to 'app-text/mupdf/files')
-rw-r--r--app-text/mupdf/files/mupdf-0.6-buildsystem.patch51
-rw-r--r--app-text/mupdf/files/mupdf-0.7_p20110212-buildsystem.patch22
-rw-r--r--app-text/mupdf/files/mupdf-0.7_p20110212-zoom.patch (renamed from app-text/mupdf/files/mupdf-9999-zoom.patch)0
3 files changed, 22 insertions, 51 deletions
diff --git a/app-text/mupdf/files/mupdf-0.6-buildsystem.patch b/app-text/mupdf/files/mupdf-0.6-buildsystem.patch
deleted file mode 100644
index 56086726e6c3..000000000000
--- a/app-text/mupdf/files/mupdf-0.6-buildsystem.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Michael Weber Jun 5th 2010
- Possibility to pass /usr/lib64 on multilib/64bit systems.
- Dropped the hard compiler options for compartibility on older chips.
-
---- Makefile 2010-06-05 16:38:48.000000000 +0200
-+++ Makefile 2010-06-05 16:41:43.000000000 +0200
-@@ -7,6 +7,7 @@
-
- build ?= debug
- prefix ?= /usr/local
-+libprefix ?= $(prefix)/lib
-
- OBJDIR := build/$(build)
- GENDIR := build/generated
-@@ -314,8 +315,8 @@
- rm -rf build
-
- install: $(DIRS) $(APPS) $(MUPDF_LIB)
-- install -d $(prefix)/bin $(prefix)/lib $(prefix)/include
-+ install -d $(prefix)/bin $(libprefix) $(prefix)/include
- install $(APPS) $(prefix)/bin
-- install $(MUPDF_LIB) $(prefix)/lib
-+ install $(MUPDF_LIB) $(libprefix)
- install $(MUPDF_HDR) $(prefix)/include
-
---- Makerules 2010-06-05 16:38:48.000000000 +0200
-+++ Makerules 2010-06-05 16:49:44.000000000 +0200
-@@ -4,8 +4,8 @@
- OS := $(OS:MINGW%=MINGW)
-
- LIBS := -ljbig2dec -lopenjpeg -ljpeg -lz -lm
--CFLAGS := -Wall --std=gnu99 -Ifitz -Imupdf $(THIRD_INCS)
--LDFLAGS =
-+CFLAGS += -Wall --std=gnu99 -Ifitz -Imupdf $(THIRD_INCS)
-+LDFLAGS +=
- CC = cc
- LD = $(CC)
- AR = ar
-@@ -23,10 +23,10 @@
- CFLAGS += `pkg-config --cflags freetype2`
- LDFLAGS += `pkg-config --libs freetype2`
- endif
--X11LIBS = -lX11 -lXext
-+X11LIBS = `pkg-config --libs x11 xext`
- PDFVIEW_EXE = $(X11VIEW_EXE)
- ifeq "$(build)" "release"
--CFLAGS += -mmmx -ftree-vectorize -msse -msse2 -march=k8 -DARCH_X86
-+CFLAGS +=
- ARCH_SRC = archx86.c
- endif
- endif
diff --git a/app-text/mupdf/files/mupdf-0.7_p20110212-buildsystem.patch b/app-text/mupdf/files/mupdf-0.7_p20110212-buildsystem.patch
new file mode 100644
index 000000000000..299179706ea5
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-0.7_p20110212-buildsystem.patch
@@ -0,0 +1,22 @@
+--- mupdf-0.7_p20110212/Makerules.orig
++++ mupdf-0.7_p20110212/Makerules
+@@ -4,8 +4,8 @@
+ OS := $(OS:MINGW%=MINGW)
+
+ CC ?= cc
+-CFLAGS := -Ifitz -Imupdf -Wall
+-LDFLAGS :=
++CFLAGS += -Ifitz -Imupdf
++LDFLAGS +=
+
+ ifeq "$(build)" "debug"
+ CFLAGS += -pipe -g
+@@ -21,7 +21,7 @@
+
+ ifeq "$(OS)" "Linux"
+ SYS_FREETYPE_INC := `pkg-config --cflags freetype2`
+-X11LIBS := -lX11 -lXext
++X11LIBS := `pkg-config --libs x11 xext`
+ PDFVIEW_EXE = $(X11VIEW_EXE)
+ endif
+
diff --git a/app-text/mupdf/files/mupdf-9999-zoom.patch b/app-text/mupdf/files/mupdf-0.7_p20110212-zoom.patch
index 4576ea4407e4..4576ea4407e4 100644
--- a/app-text/mupdf/files/mupdf-9999-zoom.patch
+++ b/app-text/mupdf/files/mupdf-0.7_p20110212-zoom.patch