- Downgrade to 1.1.12, new api not compatible with koffice

- Bump PORTEPOCH

5 files changed, 145 insertions, 34 deletions

diff --git a/graphics/GraphicsMagick13/files/patch-Makefile.in b/graphics/GraphicsMagick13/files/patch-Makefile.in
index 7c5d272c8bd3..072c2e820395 100644
--- a/graphics/GraphicsMagick13/files/patch-Makefile.in
+++ b/graphics/GraphicsMagick13/files/patch-Makefile.in
@@ -1,20 +1,89 @@
---- Makefile.in.orig	2008-05-18 17:22:51.000000000 -0400
-+++ Makefile.in	2008-06-06 18:41:23.620488084 -0400
-@@ -1775,7 +1775,7 @@
- MagickLibConfigPath = @MagickLibConfigPath@
- MagickLibPath = @MagickLibPath@
- MagickShareConfigPath = @MagickShareConfigPath@
--MagickSharePath = @MagickSharePath@
-+MagickSharePath = ${DATADIR}
- MogrifyDelegate = @MogrifyDelegate@
- NM = @NM@
- NMEDIT = @NMEDIT@
-@@ -4382,7 +4382,7 @@
- @WITH_PERL_DYNAMIC_FALSE@@WITH_PERL_STATIC_TRUE@@WITH_PERL_TRUE@PERLSTATICNAME = PerlMagick
+--- Makefile.in        Fri Mar 18 19:36:21 2005
++++ Makefile.in        Sun Jul 24 18:21:35 2005
+@@ -466,5 +466,5 @@
+ 
+ # Install HTML files
+-pkgdocdir = @MagickSharePath@
++pkgdocdir = ${DATA_DIR}/doc/GraphicsMagick
+ DOCDIRS = images www www/api www/Magick++
+ @WITH_PERL_TRUE@PERLMAGICK = PerlMagick
+@@ -1079,5 +1079,5 @@
+ 
+ # Install arch-independent package data
+-install-data-local: install-data-html
++install-data-local:
+ 
+ # Uninstall arch-independent package data
+--- coders/Makefile.in Fri Mar 18 19:36:16 2005
++++ coders/Makefile.in Sun Jul 24 19:22:21 2005
+@@ -1479,5 +1479,5 @@
+ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
++	test -z "$(pkgdir)" -o -z "$(pkg_LTLIBRARIES)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
+ 	@list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
+ 	 if test -f $$p; then \
+@@ -1825,5 +1825,5 @@
+ install-pkgDATA: $(pkg_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
++	test -z "$(pkgdir)" -o -z '$(pkg_DATA)' || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
+ 	@list='$(pkg_DATA)'; for p in $$list; do \
+ 	 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+@@ -1842,5 +1842,5 @@
+ install-pkgdataDATA: $(pkgdata_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
++	test -z "$(pkgdatadir)" -o -z '$(pkgdata_DATA)' || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ 	@list='$(pkgdata_DATA)'; for p in $$list; do \
+ 	 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+--- filters/Makefile.in        Fri Mar 18 19:36:17 2005
++++ filters/Makefile.in        Sun Jul 24 19:23:33 2005
+@@ -522,5 +522,5 @@
+ install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
++	test -z "$(pkgdir)"  -o -z '$(pkg_LTLIBRARIES)' || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
+ 	@list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+@@ -592,5 +592,5 @@
+ install-pkgDATA: $(pkg_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
++	test -z "$(pkgdir)" -o -z '$(pkg_DATA)' || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
+ 	@list='$(pkg_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+--- magick/Makefile.in	Fri Mar 18 19:36:18 2005
++++ magick/Makefile.in	Tue Jul 26 21:05:48 2005
+@@ -664,5 +664,5 @@
+ 
+ # Pkgconfig directory
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ 
+ # Files to install in Pkgconfig directory
+@@ -930,5 +930,5 @@
+ install-pkgDATA: $(pkg_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
++	test -z "$(pkgdir)" -o -z '$(pkg_DATA)' || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
+ 	@list='$(pkg_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+--- Magick++/lib/Makefile.in	Fri Mar 18 19:36:13 2005
++++ Magick++/lib/Makefile.in	Tue Jul 26 21:37:39 2005
+@@ -453,5 +453,5 @@
+ 
+ # Pkgconfig directory
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ 
+ # Files to install in Pkgconfig directory
+--- wand/Makefile.in	Fri Mar 18 19:36:20 2005
++++ wand/Makefile.in	Tue Jul 26 21:38:43 2005
+@@ -478,5 +478,5 @@
  
  # Pkgconfig directory
 -pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfigdir = $(prefix)/libdata/pkgconfig
  
  # Files to install in Pkgconfig directory
- pkgconfig_DATA = \
diff --git a/graphics/GraphicsMagick13/files/patch-configure b/graphics/GraphicsMagick13/files/patch-configure
new file mode 100644
index 000000000000..af50a04fedad
--- /dev/null
+++ b/graphics/GraphicsMagick13/files/patch-configure
@@ -0,0 +1,23 @@
+--- configure	Fri Mar 18 19:35:06 2005
++++ configure	Tue Jul 26 22:53:50 2005
+@@ -2092,5 +2092,5 @@
+ MagickLibConfigSubDir="${MagickLibSubdir}/config"
+ AC_DEFINE_UNQUOTED(MagickLibConfigSubDir,"$MagickLibConfigSubDir",Subdirectory of lib where architecture-dependent configuration files live.)
+-MagickLibConfigPath="${LIB_DIR}/${MagickLibConfigSubDir}"
++MagickLibConfigPath="${DATA_DIR}/GraphicsMagick/config"
+ MagickLibConfigPathDefine="${MagickLibConfigPath}/"
+ if test "$native_win32_build" = 'yes'
+@@ -2130,5 +2130,5 @@
+ # Path to GraphicsMagick share files
+ MagickShareSubdir="${PACKAGE_NAME}-${PACKAGE_VERSION}"
+-MagickSharePath="${DATA_DIR}/${MagickShareSubdir}"
++MagickSharePath="${DATA_DIR}/GraphicsMagick/"
+ MagickSharePathDefine="${MagickSharePath}/"
+ if test "$native_win32_build" = 'yes'
+@@ -2142,5 +2142,5 @@
+ MagickShareConfigSubDir="${MagickLibSubdir}/config"
+ AC_DEFINE_UNQUOTED(MagickShareConfigSubDir,"$MagickShareConfigSubDir",Subdirectory of lib where architecture-independent configuration files live.)
+-MagickShareConfigPath="${DATA_DIR}/${MagickShareConfigSubDir}"
++MagickShareConfigPath="${MagickLibConfigPath}"
+ MagickShareConfigPathDefine="${MagickShareConfigPath}/"
+ if test "$native_win32_build" = 'yes'
diff --git a/graphics/GraphicsMagick13/files/patch-configure.in b/graphics/GraphicsMagick13/files/patch-configure.in
deleted file mode 100644
index ed7a7535689b..000000000000
--- a/graphics/GraphicsMagick13/files/patch-configure.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig	2008-05-18 17:22:52.000000000 -0400
-+++ configure	2008-06-06 18:37:48.269146182 -0400
-@@ -37604,7 +37604,7 @@
- #
- 
- # Subdirectory under lib to place GraphicsMagick lib files
--MagickLibSubdir="${PACKAGE_NAME}-${PACKAGE_VERSION}"
-+MagickLibSubdir="${PACKAGE_NAME}"
- 
- cat >>confdefs.h <<_ACEOF
- #define MagickLibSubdir "$MagickLibSubdir"
-@@ -37708,7 +37708,7 @@
- 
- #
- # Path to GraphicsMagick share files
--MagickShareSubdir="${PACKAGE_NAME}-${PACKAGE_VERSION}"
-+MagickShareSubdir="${PACKAGE_NAME}"
- MagickSharePath="${DATA_DIR}/${MagickShareSubdir}"
- MagickSharePathDefine="${MagickSharePath}/"
- case "${build_os}" in
diff --git a/graphics/GraphicsMagick13/files/patch-magick_symbols.h b/graphics/GraphicsMagick13/files/patch-magick_symbols.h
new file mode 100644
index 000000000000..8edb9976ad45
--- /dev/null
+++ b/graphics/GraphicsMagick13/files/patch-magick_symbols.h
@@ -0,0 +1,19 @@
+--- magick/symbols.h.orig	Mon Jul 16 21:55:06 2007
++++ magick/symbols.h	Mon Jul 16 21:56:04 2007
+@@ -17,6 +17,8 @@
+ #if !defined(_MAGICK_SYMBOLS_H)
+ #define _MAGICK_SYMBOLS_H
+ 
++#define GetToken GmGetToken
++
+ #if defined(PREFIX_MAGICK_SYMBOLS)
+ #define AccessDefinition GmAccessDefinition
+ #define AcquireCacheNexus GmAcquireCacheNexus
+@@ -386,7 +388,6 @@
+ #define GetQuantizeInfo GmGetQuantizeInfo
+ #define GetSignatureInfo GmGetSignatureInfo
+ #define GetTimerInfo GmGetTimerInfo
+-#define GetToken GmGetToken
+ #define GetTypeInfo GmGetTypeInfo
+ #define GetTypeInfoByFamily GmGetTypeInfoByFamily
+ #define GetTypeList GmGetTypeList
diff --git a/graphics/GraphicsMagick13/files/patch-newfpx b/graphics/GraphicsMagick13/files/patch-newfpx
new file mode 100644
index 000000000000..6aa24bf3dacc
--- /dev/null
+++ b/graphics/GraphicsMagick13/files/patch-newfpx
@@ -0,0 +1,20 @@
+--- coders/fpx.c	2004-04-14 18:45:28.000000000 -0400
++++ coders/fpx.c	2007-11-01 23:30:18.000000000 -0500
+@@ -182,13 +182,13 @@
+   unsigned int
+     status,
+-    subimage;
+-
+-  unsigned long
++    subimage,
+     height,
+-    memory_limit,
+     tile_width,
+     tile_height,
+     width;
+ 
++  size_t
++    memory_limit;
++
+   /*
+     Open image.