diff options
Diffstat (limited to 'graphics/GraphicsMagick13/files')
-rw-r--r-- | graphics/GraphicsMagick13/files/patch-Makefile.in | 89 | ||||
-rw-r--r-- | graphics/GraphicsMagick13/files/patch-configure | 23 | ||||
-rw-r--r-- | graphics/GraphicsMagick13/files/patch-freebsd | 70 | ||||
-rw-r--r-- | graphics/GraphicsMagick13/files/patch-utility | 21 | ||||
-rw-r--r-- | graphics/GraphicsMagick13/files/patch-warnings | 25 |
5 files changed, 0 insertions, 228 deletions
diff --git a/graphics/GraphicsMagick13/files/patch-Makefile.in b/graphics/GraphicsMagick13/files/patch-Makefile.in deleted file mode 100644 index 695f093c89fc..000000000000 --- a/graphics/GraphicsMagick13/files/patch-Makefile.in +++ /dev/null @@ -1,89 +0,0 @@ ---- 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 diff --git a/graphics/GraphicsMagick13/files/patch-configure b/graphics/GraphicsMagick13/files/patch-configure deleted file mode 100644 index af50a04fedad..000000000000 --- a/graphics/GraphicsMagick13/files/patch-configure +++ /dev/null @@ -1,23 +0,0 @@ ---- 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-freebsd b/graphics/GraphicsMagick13/files/patch-freebsd deleted file mode 100644 index 4f5c664fbbd5..000000000000 --- a/graphics/GraphicsMagick13/files/patch-freebsd +++ /dev/null @@ -1,70 +0,0 @@ -Index: magick/command.c -=================================================================== -RCS file: /GraphicsMagick/GraphicsMagick/magick/command.c,v -retrieving revision 1.147.2.8 -retrieving revision 1.147.2.9 -diff -u -r1.147.2.8 -r1.147.2.9 ---- magick/command.c 28 Apr 2005 22:57:28 -0000 1.147.2.8 -+++ magick/command.c 16 Jul 2005 01:42:22 -0000 1.147.2.9 -@@ -6525,7 +6525,7 @@ - } - if (resource_database != (XrmDatabase) NULL) - { -- XrmDestroyDatabase(resource_database); -+ /* XrmDestroyDatabase(resource_database); */ - resource_database=(XrmDatabase) NULL; - } - -Index: magick/image.c -=================================================================== -RCS file: /GraphicsMagick/GraphicsMagick/magick/image.c,v -retrieving revision 1.1207.2.5 -retrieving revision 1.1207.2.6 -diff -u -r1.1207.2.5 -r1.1207.2.6 ---- magick/image.c 1 May 2005 18:43:29 -0000 1.1207.2.5 -+++ magick/image.c 16 Jul 2005 01:42:23 -0000 1.1207.2.6 -@@ -2527,7 +2527,7 @@ - } - if (resource_database != (XrmDatabase) NULL) - { -- XrmDestroyDatabase(resource_database); -+ /* XrmDestroyDatabase(resource_database); */ - resource_database=(XrmDatabase) NULL; - } - XDestroyResourceInfo(&resource_info); -Index: magick/nt_base.c -=================================================================== -RCS file: /GraphicsMagick/GraphicsMagick/magick/nt_base.c,v -retrieving revision 1.35.2.6 -retrieving revision 1.35.2.7 -diff -u -r1.35.2.6 -r1.35.2.7 ---- magick/nt_base.c 20 Mar 2005 01:39:13 -0000 1.35.2.6 -+++ magick/nt_base.c 19 Jun 2005 00:13:29 -0000 1.35.2.7 -@@ -2027,8 +2027,8 @@ - } - entry->firsttime=FALSE; - (void) strncpy(entry->file_info.d_name,entry->Win32FindData.cFileName, -- MaxTextExtent-1); -- entry->file_info.d_name[MaxTextExtent-1]='\0'; -+ sizeof(entry->file_info.d_name)-1); -+ entry->file_info.d_name[sizeof(entry->file_info.d_name)-1]='\0'; - entry->file_info.d_namlen=strlen(entry->file_info.d_name); - return(&entry->file_info); - } -Index: magick/version.h -=================================================================== -RCS file: /GraphicsMagick/GraphicsMagick/magick/version.h,v -retrieving revision 1.142.2.43 -retrieving revision 1.142.2.46 -diff -u -r1.142.2.43 -r1.142.2.46 ---- magick/version.h 1 May 2005 20:09:53 -0000 1.142.2.43 -+++ magick/version.h 16 Jul 2005 01:42:24 -0000 1.142.2.46 -@@ -38,7 +38,7 @@ - #define MagickLibVersion 0x010006 - #define MagickLibVersionText "1.1.6" - #define MagickLibVersionNumber 1,0,6 --#define MagickChangeDate "20050501" -+#define MagickChangeDate "20050715" - #define MagickReleaseDate "2005-05-01" - - diff --git a/graphics/GraphicsMagick13/files/patch-utility b/graphics/GraphicsMagick13/files/patch-utility deleted file mode 100644 index 6dd5fb61c3d3..000000000000 --- a/graphics/GraphicsMagick13/files/patch-utility +++ /dev/null @@ -1,21 +0,0 @@ ---- magick/utility.c Sat Apr 2 17:35:06 2005 -+++ magick/utility.c Sun Jul 24 18:22:40 2005 -@@ -47,4 +47,8 @@ - #include "magick/utility.h" - -+#if defined(POSIX) -+# include <sys/types.h> -+# include <sys/wait.h> -+#endif - - /* -@@ -3874,4 +3878,9 @@ - #if defined(POSIX) - status=system(command); -+ if (status == -1) -+ perror(command); -+ else if (WIFSIGNALED(status)) { -+ fprintf(stderr, "Command ``\n%s\n'' terminated due to signal %d\n", command, WTERMSIG(status)); -+ } - #elif defined(vms) - status=!system(command); diff --git a/graphics/GraphicsMagick13/files/patch-warnings b/graphics/GraphicsMagick13/files/patch-warnings deleted file mode 100644 index f317adbf1116..000000000000 --- a/graphics/GraphicsMagick13/files/patch-warnings +++ /dev/null @@ -1,25 +0,0 @@ ---- magick/blob.c Wed Apr 14 18:45:16 2004 -+++ magick/blob.c Sun Jul 24 12:30:20 2005 -@@ -2364,5 +2364,5 @@ - (void) rewind(image->blob->file); - (void) LogMagickEvent(BlobEvent,GetMagickModule(), -- " read %d magic header bytes", count); -+ " read %td magic header bytes", count); - #if defined(HasZLIB) - if ((magick[0] == 0x1F) && (magick[1] == 0x8B) && ---- coders/ept.c Wed Apr 14 18:45:28 2004 -+++ coders/ept.c Sun Jul 24 13:33:39 2005 -@@ -584,5 +584,5 @@ - if (logging) - (void) LogMagickEvent(CoderEvent,GetMagickModule(), -- "Writing EPS section at offset %lld",TellBlob(image)); -+ "Writing EPS section at offset %lld", (long long)TellBlob(image)); - for (c=fgetc(ps_file); c != EOF; c=fgetc(ps_file)) - (void) WriteBlobByte(image,c); -@@ -590,5 +590,5 @@ - if (logging) - (void) LogMagickEvent(CoderEvent,GetMagickModule(), -- "Writing TIFF section at offset %lld",TellBlob(image)); -+ "Writing TIFF section at offset %lld", (long long)TellBlob(image)); - for (c=fgetc(tiff_file); c != EOF; c=fgetc(tiff_file)) - (void) WriteBlobByte(image,c); |