From 1e1984ceaf1e78dd821ffc09bc254a70ddc470fd Mon Sep 17 00:00:00 2001 From: Koop Mast Date: Mon, 2 Dec 2013 21:19:11 +0000 Subject: Update to 2.8.10. Add upstream patch to fix build with freetype 2.5.1. Switch to libtool free ltverhack. --- graphics/gimp-app/Makefile | 4 ++-- graphics/gimp-app/distinfo | 4 ++-- graphics/gimp-app/files/patch-app_text_gimpfont.c | 13 +++++++++++++ graphics/gimp-app/pkg-plist | 20 ++------------------ graphics/gimp/Makefile | 2 +- graphics/py-gimp/pkg-plist | 5 ----- 6 files changed, 20 insertions(+), 28 deletions(-) create mode 100644 graphics/gimp-app/files/patch-app_text_gimpfont.c diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile index feffd13623aa..88730c10a9b2 100644 --- a/graphics/gimp-app/Makefile +++ b/graphics/gimp-app/Makefile @@ -3,7 +3,7 @@ # $MCom: ports/graphics/gimp-app/Makefile,v 1.65 2012/12/30 18:09:11 mezz Exp $ PORTNAME?= gimp-app -PORTVERSION= 2.8.8 +PORTVERSION= 2.8.10 PORTREVISION?= 0 PORTEPOCH?= 1 CATEGORIES?= graphics gnome @@ -34,7 +34,7 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-co USE_BZIP2= yes USE_XORG= xpm xmu xext -USE_AUTOTOOLS= libtool +GNU_CONFIGURE= yes USE_GNOME+= intltool intlhack gtk20 libartlgpl2 ltverhack gnomehier USES= desktop-file-utils gettext gmake pathfix pkgconfig USE_LDCONFIG= yes diff --git a/graphics/gimp-app/distinfo b/graphics/gimp-app/distinfo index bad945e68a8a..aab7a144ce8c 100644 --- a/graphics/gimp-app/distinfo +++ b/graphics/gimp-app/distinfo @@ -1,2 +1,2 @@ -SHA256 (gimp-2.8.8.tar.bz2) = 74c4509bae55f07140bc46f16100fc1e0e052829c13d4d87dc31d07d3e696a67 -SIZE (gimp-2.8.8.tar.bz2) = 20345808 +SHA256 (gimp-2.8.10.tar.bz2) = e7fd8b19f989138d826003c75f56bd5b6f136eef597e86e3978ede0bba470ae6 +SIZE (gimp-2.8.10.tar.bz2) = 20343461 diff --git a/graphics/gimp-app/files/patch-app_text_gimpfont.c b/graphics/gimp-app/files/patch-app_text_gimpfont.c new file mode 100644 index 000000000000..a15ace1402aa --- /dev/null +++ b/graphics/gimp-app/files/patch-app_text_gimpfont.c @@ -0,0 +1,13 @@ +--- app/text/gimpfont.c.orig 2013-12-02 21:01:06.000000000 +0100 ++++ app/text/gimpfont.c 2013-12-02 21:01:47.000000000 +0100 +@@ -27,7 +27,9 @@ + + #define PANGO_ENABLE_ENGINE 1 /* Argh */ + #include +-#include ++ ++#include ++#include FT_TRUETYPE_TABLES_H + + #include "text-types.h" + diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist index 92fc279d61aa..8823e6ecc1e0 100644 --- a/graphics/gimp-app/pkg-plist +++ b/graphics/gimp-app/pkg-plist @@ -224,39 +224,30 @@ include/gimp-2.0/libgimpwidgets/gimpwidgets.h include/gimp-2.0/libgimpwidgets/gimpwidgetsenums.h include/gimp-2.0/libgimpwidgets/gimpwidgetstypes.h include/gimp-2.0/libgimpwidgets/gimpzoommodel.h -lib/libgimp-2.0.a lib/libgimp-2.0.la lib/libgimp-2.0.so lib/libgimp-2.0.so.0 -lib/libgimpbase-2.0.a lib/libgimpbase-2.0.la lib/libgimpbase-2.0.so lib/libgimpbase-2.0.so.0 -lib/libgimpcolor-2.0.a lib/libgimpcolor-2.0.la lib/libgimpcolor-2.0.so lib/libgimpcolor-2.0.so.0 -lib/libgimpconfig-2.0.a lib/libgimpconfig-2.0.la lib/libgimpconfig-2.0.so lib/libgimpconfig-2.0.so.0 -lib/libgimpmath-2.0.a lib/libgimpmath-2.0.la lib/libgimpmath-2.0.so lib/libgimpmath-2.0.so.0 -lib/libgimpmodule-2.0.a lib/libgimpmodule-2.0.la lib/libgimpmodule-2.0.so lib/libgimpmodule-2.0.so.0 -lib/libgimpthumb-2.0.a lib/libgimpthumb-2.0.la lib/libgimpthumb-2.0.so lib/libgimpthumb-2.0.so.0 -lib/libgimpui-2.0.a lib/libgimpui-2.0.la lib/libgimpui-2.0.so lib/libgimpui-2.0.so.0 -lib/libgimpwidgets-2.0.a lib/libgimpwidgets-2.0.la lib/libgimpwidgets-2.0.so lib/libgimpwidgets-2.0.so.0 @@ -265,31 +256,22 @@ libdata/pkgconfig/gimpthumb-2.0.pc libdata/pkgconfig/gimpui-2.0.pc libexec/gimp/2.2/environ/default.env libexec/gimp/2.2/interpreters/default.interp -libexec/gimp/2.2/modules/libcolor-selector-cmyk.a libexec/gimp/2.2/modules/libcolor-selector-cmyk.la libexec/gimp/2.2/modules/libcolor-selector-cmyk.so -libexec/gimp/2.2/modules/libcolor-selector-water.a libexec/gimp/2.2/modules/libcolor-selector-water.la libexec/gimp/2.2/modules/libcolor-selector-water.so -libexec/gimp/2.2/modules/libcolor-selector-wheel.a libexec/gimp/2.2/modules/libcolor-selector-wheel.la libexec/gimp/2.2/modules/libcolor-selector-wheel.so -libexec/gimp/2.2/modules/libcontroller-midi.a libexec/gimp/2.2/modules/libcontroller-midi.la libexec/gimp/2.2/modules/libcontroller-midi.so -libexec/gimp/2.2/modules/libdisplay-filter-color-blind.a libexec/gimp/2.2/modules/libdisplay-filter-color-blind.la libexec/gimp/2.2/modules/libdisplay-filter-color-blind.so -libexec/gimp/2.2/modules/libdisplay-filter-gamma.a libexec/gimp/2.2/modules/libdisplay-filter-gamma.la libexec/gimp/2.2/modules/libdisplay-filter-gamma.so -libexec/gimp/2.2/modules/libdisplay-filter-high-contrast.a libexec/gimp/2.2/modules/libdisplay-filter-high-contrast.la libexec/gimp/2.2/modules/libdisplay-filter-high-contrast.so -libexec/gimp/2.2/modules/libdisplay-filter-lcms.a libexec/gimp/2.2/modules/libdisplay-filter-lcms.la libexec/gimp/2.2/modules/libdisplay-filter-lcms.so -libexec/gimp/2.2/modules/libdisplay-filter-proof.a libexec/gimp/2.2/modules/libdisplay-filter-proof.la libexec/gimp/2.2/modules/libdisplay-filter-proof.so libexec/gimp/2.2/plug-ins/alien-map @@ -473,6 +455,7 @@ man/man1/gimptool-2.0.1.gz man/man5/gimprc-2.8.5.gz man/man5/gimprc.5.gz share/aclocal/gimp-2.0.m4 +share/appdata/gimp.appdata.xml share/applications/gimp.desktop share/doc/gimp/libgimp/GimpAspectPreview.html share/doc/gimp/libgimp/GimpBrushSelectButton.html @@ -2290,6 +2273,7 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo @dirrm share/doc/gimp/libgimpbase @dirrm share/doc/gimp/libgimp @dirrm share/doc/gimp +@dirrmtry share/appdata @dirrm libexec/gimp/2.2/plug-ins @dirrm libexec/gimp/2.2/modules @dirrm libexec/gimp/2.2/interpreters diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile index 2f059ac8ef05..f22c7ad85d86 100644 --- a/graphics/gimp/Makefile +++ b/graphics/gimp/Makefile @@ -3,7 +3,7 @@ # $MCom: ports/graphics/gimp/Makefile,v 1.22 2012/11/26 13:31:16 kwm Exp $ PORTNAME= gimp -DISTVERSION?= 2.8.8 +DISTVERSION?= 2.8.10 PORTREVISION?= 0 PORTEPOCH?= 2 CATEGORIES= graphics gnome diff --git a/graphics/py-gimp/pkg-plist b/graphics/py-gimp/pkg-plist index e108a12979d3..0a752455e9c8 100644 --- a/graphics/py-gimp/pkg-plist +++ b/graphics/py-gimp/pkg-plist @@ -12,16 +12,12 @@ libexec/gimp/2.2/plug-ins/pyconsole.py libexec/gimp/2.2/plug-ins/python-console.py libexec/gimp/2.2/plug-ins/python-eval.py libexec/gimp/2.2/plug-ins/text-brush.py -libexec/gimp/2.2/python/_gimpenums.a libexec/gimp/2.2/python/_gimpenums.la libexec/gimp/2.2/python/_gimpenums.so -libexec/gimp/2.2/python/_gimpui.a libexec/gimp/2.2/python/_gimpui.la libexec/gimp/2.2/python/_gimpui.so -libexec/gimp/2.2/python/gimp.a libexec/gimp/2.2/python/gimp.la libexec/gimp/2.2/python/gimp.so -libexec/gimp/2.2/python/gimpcolor.a libexec/gimp/2.2/python/gimpcolor.la libexec/gimp/2.2/python/gimpcolor.so libexec/gimp/2.2/python/gimpenums.py @@ -36,7 +32,6 @@ libexec/gimp/2.2/python/gimpplugin.pyo libexec/gimp/2.2/python/gimpshelf.py libexec/gimp/2.2/python/gimpshelf.pyc libexec/gimp/2.2/python/gimpshelf.pyo -libexec/gimp/2.2/python/gimpthumb.a libexec/gimp/2.2/python/gimpthumb.la libexec/gimp/2.2/python/gimpthumb.so libexec/gimp/2.2/python/gimpui.py -- cgit v1.2.3