FreeBSD Bugzilla – Attachment 159501 Details for
Bug 200304
[PATCH] graphics/GraphicsMagick: Update to version 1.3.21
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
graphics_GraphicsMagick.diff
graphics_GraphicsMagick.diff (text/plain), 5.74 KB, created by
tkato432
on 2015-08-03 18:31:35 UTC
(
hide
)
Description:
graphics_GraphicsMagick.diff
Filename:
MIME Type:
Creator:
tkato432
Created:
2015-08-03 18:31:35 UTC
Size:
5.74 KB
patch
obsolete
>diff -urN /usr/ports/graphics/GraphicsMagick/Makefile graphics/GraphicsMagick/Makefile >--- /usr/ports/graphics/GraphicsMagick/Makefile 2015-08-03 05:15:13.387947000 +0900 >+++ graphics/GraphicsMagick/Makefile 2015-08-04 00:00:00.000000000 +0900 >@@ -2,8 +2,7 @@ > # $FreeBSD: head/graphics/GraphicsMagick/Makefile 393429 2015-08-02 15:03:19Z tijl $ > > PORTNAME= GraphicsMagick >-PORTVERSION= 1.3.20 >-PORTREVISION= 5 >+PORTVERSION= 1.3.21 > PORTEPOCH= 1 > CATEGORIES= graphics > MASTER_SITES= SF \ >@@ -14,6 +13,7 @@ > > LIB_DEPENDS= libjbig.so:${PORTSDIR}/graphics/jbigkit \ > libjasper.so:${PORTSDIR}/graphics/jasper \ >+ libjpeg.so:${PORTSDIR}/graphics/jpeg \ > liblcms2.so:${PORTSDIR}/graphics/lcms2 \ > libpng.so:${PORTSDIR}/graphics/png \ > libtiff.so:${PORTSDIR}/graphics/tiff \ >@@ -21,8 +21,9 @@ > > PORTSCOUT= limit:^1\.3\. > >-USES= ghostscript iconv jpeg libtool tar:bzip2 >+USES= iconv libtool tar:bzip2 > USE_GNOME= libxml2 >+USE_GHOSTSCRIPT=yes > GNU_CONFIGURE= yes > CONFIGURE_ENV= PTHREAD_LIBS="-lpthread" > CONFIGURE_ARGS= --without-perl --enable-shared --enable-static \ >@@ -96,6 +97,10 @@ > WINDOWS_FONT_DIR=${LOCALBASE}/share/fonts/webfonts > .endif > >+post-patch: >+ @${REINPLACE_CMD} -e \ >+ 's|"GNU strip"|"strip"|' ${WRKSRC}/configure >+ > .if ${PORT_OPTIONS:MTESTS} > post-build:: regression-test > .else >diff -urN /usr/ports/graphics/GraphicsMagick/distinfo graphics/GraphicsMagick/distinfo >--- /usr/ports/graphics/GraphicsMagick/distinfo 2014-09-01 07:27:15.000000000 +0900 >+++ graphics/GraphicsMagick/distinfo 2015-08-04 00:00:00.000000000 +0900 >@@ -1,2 +1,2 @@ >-SHA256 (GraphicsMagick-1.3.20.tar.bz2) = 7caf27691ec21682de1f0259c9243725db7cdeca699c40958c28aece99e4f1dc >-SIZE (GraphicsMagick-1.3.20.tar.bz2) = 7371945 >+SHA256 (GraphicsMagick-1.3.21.tar.bz2) = a0ce08f2710c158e39faa083463441f6eeeecce07dbd59510498ffa4e0b053d1 >+SIZE (GraphicsMagick-1.3.21.tar.bz2) = 7527643 >diff -urN /usr/ports/graphics/GraphicsMagick/files/patch-Makefile.in graphics/GraphicsMagick/files/patch-Makefile.in >--- /usr/ports/graphics/GraphicsMagick/files/patch-Makefile.in 2014-06-21 17:44:57.000000000 +0900 >+++ graphics/GraphicsMagick/files/patch-Makefile.in 2015-08-04 00:00:00.000000000 +0900 >@@ -1,6 +1,6 @@ >---- 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 @@ >+--- Makefile.in.orig 2015-02-28 20:53:46 UTC >++++ Makefile.in >+@@ -2221,7 +2221,7 @@ MagickFilterModulesPath = @MagickFilterM > MagickLibConfigPath = @MagickLibConfigPath@ > MagickLibPath = @MagickLibPath@ > MagickShareConfigPath = @MagickShareConfigPath@ >@@ -9,7 +9,7 @@ > MogrifyDelegate = @MogrifyDelegate@ > NM = @NM@ > NMEDIT = @NMEDIT@ >-@@ -4382,7 +4382,7 @@ >+@@ -4381,7 +4381,7 @@ PERLMAGICK_MAINTAINER_TARGETS = $(top_sr > @WITH_PERL_DYNAMIC_FALSE@@WITH_PERL_STATIC_TRUE@@WITH_PERL_TRUE@PERLSTATICNAME = PerlMagick > > # Pkgconfig directory >diff -urN /usr/ports/graphics/GraphicsMagick/files/patch-configure graphics/GraphicsMagick/files/patch-configure >--- /usr/ports/graphics/GraphicsMagick/files/patch-configure 2014-06-21 17:44:57.000000000 +0900 >+++ graphics/GraphicsMagick/files/patch-configure 2015-08-04 00:00:00.000000000 +0900 >@@ -1,6 +1,6 @@ >---- configure.orig 2013-12-31 20:58:17.000000000 +0100 >-+++ configure 2014-04-26 15:53:04.000000000 +0200 >-@@ -12919,7 +12919,6 @@ >+--- configure.orig 2015-02-28 20:53:46 UTC >++++ configure >+@@ -13277,7 +13277,6 @@ fi > # FreeBSD 3 and greater uses gcc -shared to do shared libraries. > freebsd* | dragonfly*) > archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' >@@ -8,7 +8,7 @@ > hardcode_direct=yes > hardcode_shlibpath_var=no > ;; >-@@ -23889,60 +23888,6 @@ >+@@ -24497,60 +24496,6 @@ else > X_CFLAGS="$X_CFLAGS -I$x_includes" > fi > >@@ -69,7 +69,7 @@ > > # Check for system-dependent libraries X programs must link with. > # Do this before checking for the system-independent R6 libraries >-@@ -24637,15 +24582,16 @@ >+@@ -25245,15 +25190,16 @@ fi > # Cygwin doesn't deliver -lXt as a DLL, which prevents a DLL build. > # Adobe DPS (as delivered on Solaris) doesn't require -lXt. > # GraphicsMagick itself doesn't use -lXt. >@@ -88,7 +88,7 @@ > cat confdefs.h - <<_ACEOF >conftest.$ac_ext > /* end confdefs.h. */ > >-@@ -27095,7 +27041,7 @@ >+@@ -27703,7 +27649,7 @@ fi > # > > # Subdirectory under lib to place GraphicsMagick lib files >@@ -97,7 +97,7 @@ > > cat >>confdefs.h <<_ACEOF > #define MagickLibSubdir "$MagickLibSubdir" >-@@ -27199,7 +27145,7 @@ >+@@ -27807,7 +27753,7 @@ _ACEOF > > # > # Path to GraphicsMagick share files >diff -urN /usr/ports/graphics/GraphicsMagick/pkg-plist graphics/GraphicsMagick/pkg-plist >--- /usr/ports/graphics/GraphicsMagick/pkg-plist 2015-03-03 19:52:35.048434000 +0900 >+++ graphics/GraphicsMagick/pkg-plist 2015-08-04 00:00:00.000000000 +0900 >@@ -91,16 +91,16 @@ > lib/GraphicsMagick/config/type.mgk > lib/libGraphicsMagick++.a > lib/libGraphicsMagick++.so >-lib/libGraphicsMagick++.so.3 >-lib/libGraphicsMagick++.so.3.7.0 >+lib/libGraphicsMagick++.so.11 >+lib/libGraphicsMagick++.so.11.0.0 > lib/libGraphicsMagick.a > lib/libGraphicsMagick.so > lib/libGraphicsMagick.so.3 >-lib/libGraphicsMagick.so.3.12.0 >+lib/libGraphicsMagick.so.3.13.0 > lib/libGraphicsMagickWand.a > lib/libGraphicsMagickWand.so > lib/libGraphicsMagickWand.so.2 >-lib/libGraphicsMagickWand.so.2.7.0 >+lib/libGraphicsMagickWand.so.2.7.1 > libdata/pkgconfig/GraphicsMagick++.pc > libdata/pkgconfig/GraphicsMagick.pc > libdata/pkgconfig/GraphicsMagickWand.pc >@@ -142,6 +142,7 @@ > %%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2011.html > %%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2012.html > %%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2013.html >+%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2014.html > %%PORTDOCS%%%%DOCSDIR%%/www/Changelog.html > %%PORTDOCS%%%%DOCSDIR%%/www/Changes.html > %%PORTDOCS%%%%DOCSDIR%%/www/Copyright.html
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 200304
:
156904
|
157155
|
159501
|
160797