[gimp] icons: fix compile errors

[Benoit Touchette <bentou src gnome org>]

commit fdb582b95c3076b289a60490b4948c9ab5b59571
Author: Benoit Touchette <draekko software+gimp gmail com>
Date:   Mon Jan 11 08:48:14 2016 -0500

    icons: fix compile errors
    
    Fixed "gimpicons.c:30:45: fatal error: icons/Default/gimp-icon-pixbufs.c:
    No such file or directory" after commits :
    ee512b610d832c3c505e837e48fc10c1ecc66ec9
    fa9e5b8f98bc00433ac802973dd3564144e6be16
    Fixed "ln: failed to create symbolic link ‘12/gimp-default-colors.png’:
    File exists" by forcing new symlinking on creating get-default-colors.png
    for Symbolic-inverted to prevent error during make.

 app/core/gimpviewable.c             |    2 +-
 icons/Symbolic-Inverted/Makefile.am |    2 +-
 libgimpwidgets/gimpicons.c          |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/app/core/gimpviewable.c b/app/core/gimpviewable.c
index 43e5f9f..def1ffb 100644
--- a/app/core/gimpviewable.c
+++ b/app/core/gimpviewable.c
@@ -38,7 +38,7 @@
 #include "gimptempbuf.h"
 #include "gimpviewable.h"
 
-#include "icons/Default/gimp-core-pixbufs.c"
+#include "icons/Color/gimp-core-pixbufs.c"
 
 
 enum
diff --git a/icons/Symbolic-Inverted/Makefile.am b/icons/Symbolic-Inverted/Makefile.am
index a697306..4cdb4c9 100644
--- a/icons/Symbolic-Inverted/Makefile.am
+++ b/icons/Symbolic-Inverted/Makefile.am
@@ -25,7 +25,7 @@ include $(top_srcdir)/icons/Symbolic/icon-list.mk
 # As an exception, we do not want to invert gimp-default-colors.
 # Just use it as-is.
 12/gimp-default-colors.png: $(top_srcdir)/icons/Symbolic/12/gimp-default-colors.png
-       $(LN_S) $< $@
+       $(LN_S) -f $< $@
 
 # We are basically repeating the same rule for every subdirectory, which
 # is very dirty. But this is the only way we found to have a rule
diff --git a/libgimpwidgets/gimpicons.c b/libgimpwidgets/gimpicons.c
index 063e237..a52bd2e 100644
--- a/libgimpwidgets/gimpicons.c
+++ b/libgimpwidgets/gimpicons.c
@@ -27,7 +27,7 @@
 
 #include "gimpicons.h"
 
-#include "icons/Default/gimp-icon-pixbufs.c"
+#include "icons/Color/gimp-icon-pixbufs.c"
 
 #include "libgimp/libgimp-intl.h"