Update to 2.8.4.

Convert to OptionsNG, remove shlib versions, update Makefile header.
Disable helpbrowser for now, need newer webkit.
Use USE_PKGCONFIG and switch to pathfix instead of gnomehack

Requested by many.

Obtained from:	gnome team repo

3 files changed, 43 insertions, 32 deletions

diff --git a/graphics/gimp-app/files/patch-app_base_base-utils.c b/graphics/gimp-app/files/patch-app_base_base-utils.c
new file mode 100644
index 000000000000..7cf17b3d70f4
--- /dev/null
+++ b/graphics/gimp-app/files/patch-app_base_base-utils.c
@@ -0,0 +1,20 @@
+--- app/base/base-utils.c~
++++ app/base/base-utils.c
+@@ -29,7 +29,7 @@
+ #include <process.h>
+ #endif
+ 
+-#ifdef G_OS_UNIX
++#ifdef __GLIBC__
+ /* For get_backtrace() */
+ #include <stdlib.h>
+ #include <string.h>
+@@ -112,7 +112,7 @@ get_physical_memory_size (void)
+ char *
+ get_backtrace (void)
+ {
+-#ifdef G_OS_UNIX
++#ifdef __GLIBC__
+   void     *functions[MAX_FUNC];
+   char    **function_names;
+   int       n_functions;
diff --git a/graphics/gimp-app/files/patch-configure b/graphics/gimp-app/files/patch-configure
index 1a89a1cc26f4..a5c08c91f121 100644
--- a/graphics/gimp-app/files/patch-configure
+++ b/graphics/gimp-app/files/patch-configure
@@ -1,14 +1,6 @@
---- configure.orig	Thu Nov 23 15:16:53 2006
-+++ configure	Sun Dec 31 19:29:32 2006
-@@ -29404,6 +29404,7 @@
-     if test "x$enable_gtktest" = "xyes" ; then
-       ac_save_CFLAGS="$CFLAGS"
-       ac_save_LIBS="$LIBS"
-+      GTK_LIBS="$GIMP_THREAD_LIBS $GTK_LIBS"
-       CFLAGS="$CFLAGS $GTK_CFLAGS"
-       LIBS="$GTK_LIBS $LIBS"
-       rm -f conf.gtktest
-@@ -38514,9 +38515,9 @@
+--- configure.orig	2013-02-03 09:15:30.000000000 +0000
++++ configure	2013-02-03 09:15:31.000000000 +0000
+@@ -23307,9 +23307,9 @@
  fi
  
  
diff --git a/graphics/gimp-app/files/patch-plug-ins_pygimp_Makefile.in b/graphics/gimp-app/files/patch-plug-ins_pygimp_Makefile.in
index 4f46084a052a..aaa49f5b3fa1 100644
--- a/graphics/gimp-app/files/patch-plug-ins_pygimp_Makefile.in
+++ b/graphics/gimp-app/files/patch-plug-ins_pygimp_Makefile.in
@@ -1,7 +1,7 @@
---- plug-ins/pygimp/Makefile.in.orig	2008-08-31 09:39:24.157774518 -0500
-+++ plug-ins/pygimp/Makefile.in	2008-08-31 09:42:47.663351903 -0500
-@@ -61,7 +61,7 @@
- pygimpLTLIBRARIES_INSTALL = $(INSTALL)
+--- plug-ins/pygimp/Makefile.in.orig	2012-05-05 10:19:33.000000000 +0200
++++ plug-ins/pygimp/Makefile.in	2012-05-05 10:22:53.000000000 +0200
+@@ -99,7 +99,7 @@
+ 	"$(DESTDIR)$(pygimpdir)"
  LTLIBRARIES = $(pygimp_LTLIBRARIES)
  am__DEPENDENCIES_1 =
 -_gimpenums_la_DEPENDENCIES = $(libgimp) $(libgimpcolor) $(libgimpbase) \
@@ -9,8 +9,8 @@
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_1)
  am__gimpenums_la_OBJECTS = gimpenumsmodule.lo
-@@ -69,16 +69,15 @@
- _gimpenums_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+@@ -110,16 +110,15 @@
+ _gimpenums_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
  	$(_gimpenums_la_LDFLAGS) $(LDFLAGS) -o $@
 -_gimpui_la_DEPENDENCIES = $(libgimpui) $(libgimpwidgets) \
@@ -21,32 +21,32 @@
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
  am__gimpui_la_OBJECTS = gimpuimodule.lo gimpui.lo
  _gimpui_la_OBJECTS = $(am__gimpui_la_OBJECTS)
- _gimpui_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ _gimpui_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
  	$(_gimpui_la_LDFLAGS) $(LDFLAGS) -o $@
 -gimp_la_DEPENDENCIES = $(libgimp) $(libgimpcolor) $(libgimpbase) \
 +gimp_la_DEPENDENCIES = \
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_1)
- am_gimp_la_OBJECTS = gimpmodule.lo pygimp-display.lo \
-@@ -88,14 +87,14 @@
- gimp_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(gimp_la_LDFLAGS) \
- 	$(LDFLAGS) -o $@
+ am_gimp_la_OBJECTS = gimpmodule.lo pygimp-item.lo pygimp-display.lo \
+@@ -129,14 +128,14 @@
+ gimp_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(gimp_la_LDFLAGS) $(LDFLAGS) -o $@
 -gimpcolor_la_DEPENDENCIES = $(libgimpcolor) $(am__DEPENDENCIES_1) \
 +gimpcolor_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_1)
  am_gimpcolor_la_OBJECTS = gimpcolormodule.lo pygimp-colors.lo
  gimpcolor_la_OBJECTS = $(am_gimpcolor_la_OBJECTS)
- gimpcolor_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ gimpcolor_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
  	$(gimpcolor_la_LDFLAGS) $(LDFLAGS) -o $@
 -gimpthumb_la_DEPENDENCIES = $(libgimpthumb) $(am__DEPENDENCIES_1) \
-+gimpthumb_la_DEPENDENCIES =  $(am__DEPENDENCIES_1) \
++gimpthumb_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_1)
  am_gimpthumb_la_OBJECTS = gimpthumbmodule.lo gimpthumb.lo
  gimpthumb_la_OBJECTS = $(am_gimpthumb_la_OBJECTS)
-@@ -486,9 +485,7 @@
+@@ -588,9 +587,7 @@
  	-export-symbols-regex initgimp
  
  gimp_la_LIBADD = \
@@ -57,7 +57,7 @@
  	$(GLIB_LIBS)		\
  	$(PYLINK_LIBS)		\
  	$(RT_LIBS)
-@@ -500,9 +497,7 @@
+@@ -602,9 +599,7 @@
  	-export-symbols-regex init_gimpenums
  
  _gimpenums_la_LIBADD = \
@@ -68,7 +68,7 @@
  	$(GLIB_LIBS)		\
  	$(PYLINK_LIBS)		\
  	$(RT_LIBS)
-@@ -517,7 +512,7 @@
+@@ -619,7 +614,7 @@
  	-export-symbols-regex initgimpcolor
  
  gimpcolor_la_LIBADD = \
@@ -77,7 +77,7 @@
  	$(GLIB_LIBS)		\
  	$(PYLINK_LIBS)
  
-@@ -529,13 +524,8 @@
+@@ -631,13 +626,7 @@
  	-export-symbols-regex init_gimpui
  
  _gimpui_la_LIBADD = \
@@ -89,16 +89,15 @@
 -	$(libgimpcolor)		\
 -	$(libgimpbase)		\
 +	%%GIMP_LIBS%%		\
-+	%%GIMP_UI_LIBS%%	\
  	$(GTK_LIBS)		\
  	$(PYLINK_LIBS)		\
  	$(RT_LIBS)		\
-@@ -549,7 +539,7 @@
+@@ -651,7 +640,7 @@
  	-export-symbols-regex initgimpthumb
  
  gimpthumb_la_LIBADD = \
 -	$(libgimpthumb)		\
-+	%%GIMP_THUMB_LIBS%%	\
++	%%GIMP_LIBS%%		\
  	$(GDK_PIXBUF_LIBS)	\
  	$(PYLINK_LIBS)