[pkgsrc/pkgsrc-2006Q3]: pkgsrc/x11/gtk2 Pullup ticket 1854 - requested by dmc...

[ghen <ghen%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0cb58977652d
branches:  pkgsrc-2006Q3
changeset: 519122:0cb58977652d
user:      ghen <ghen%pkgsrc.org@localhost>
date:      Mon Oct 09 15:42:42 2006 +0000

description:
Pullup ticket 1854 - requested by dmcmahill
build fix for gtk2

Revisions pulled up:
- pkgsrc/x11/gtk2/distinfo                      patch
- pkgsrc/x11/gtk2/patches/patch-ab              patch
- pkgsrc/x11/gtk2/patches/patch-ae              patch

   Fix build on systems such as Solaris where "ln -fs" will not overwrite
   an existing link.  Patches from gtk+-2.10.6.

diffstat:

 x11/gtk2/distinfo         |   4 +++-
 x11/gtk2/patches/patch-ab |  28 ++++++++++++++++++++++++++++
 x11/gtk2/patches/patch-ae |  28 ++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 1 deletions(-)

diffs (80 lines):

diff -r 56b853c1db63 -r 0cb58977652d x11/gtk2/distinfo
--- a/x11/gtk2/distinfo Sat Oct 07 15:37:17 2006 +0000
+++ b/x11/gtk2/distinfo Mon Oct 09 15:42:42 2006 +0000
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.73 2006/09/22 21:27:11 tron Exp $
+$NetBSD: distinfo,v 1.73.2.1 2006/10/09 15:42:42 ghen Exp $
 
 SHA1 (gtk+-2.10.3.tar.bz2) = d9e9ca2728e560c46503a1e768cba3145510ca57
 RMD160 (gtk+-2.10.3.tar.bz2) = aa945237ebdbf5613faf3e762ed3bc37dcd45c5c
 Size (gtk+-2.10.3.tar.bz2) = 14543034 bytes
 SHA1 (patch-aa) = 7efcbf733e3459fd3853c0d49842136b434ca983
+SHA1 (patch-ab) = b1ff4d33814652991f79074d6495f17ec1428ccb
 SHA1 (patch-ac) = d9a47653b8db5ffae28dc233aea0dc15399eea79
 SHA1 (patch-ad) = f38270c343961be2892d8f2b2f89a67d21f0dc15
+SHA1 (patch-ae) = bf694092d7d1caab8510232df194831d4dab3d96
 SHA1 (patch-ai) = 7eb2545ee97b8841f8f575890d4e167fbe856e58
diff -r 56b853c1db63 -r 0cb58977652d x11/gtk2/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/gtk2/patches/patch-ab Mon Oct 09 15:42:42 2006 +0000
@@ -0,0 +1,28 @@
+$NetBSD: patch-ab,v 1.13.2.1 2006/10/09 15:42:42 ghen Exp $
+
+http://bugzilla.gnome.org/show_bug.cgi?id=348438
+
+--- gtk/Makefile.am.orig       2006-08-17 09:27:06.000000000 -0400
++++ gtk/Makefile.am    2006-10-09 07:46:14.486250000 -0400
+@@ -1073,12 +1073,21 @@
+       for i in 16 24; do                                                      \
+          (cd stock-icons/$$i                                                  \
++         && $(RM) -f gtk-go-back-rtl.png                                      \
+          && $(LN_S) -f gtk-go-forward-ltr.png gtk-go-back-rtl.png             \
++         && $(RM) -f gtk-go-forward-rtl.png                                   \
+          && $(LN_S) -f gtk-go-back-ltr.png gtk-go-forward-rtl.png             \
++         && $(RM) -f gtk-goto-first-rtl.png                                   \
+          && $(LN_S) -f gtk-goto-last-ltr.png gtk-goto-first-rtl.png           \
++         && $(RM) -f gtk-goto-last-rtl.png                                    \
+          && $(LN_S) -f gtk-goto-first-ltr.png gtk-goto-last-rtl.png           \
++         && $(RM) -f gtk-media-forward-rtl.png                                \
+          && $(LN_S) -f gtk-media-rewind-ltr.png gtk-media-forward-rtl.png     \
++         && $(RM) -f gtk-media-next-rtl.png                                   \
+          && $(LN_S) -f gtk-media-previous-ltr.png gtk-media-next-rtl.png      \
++         && $(RM) -f gtk-media-previous-rtl.png                               \
+          && $(LN_S) -f gtk-media-next-ltr.png gtk-media-previous-rtl.png      \
++         && $(RM) -f gtk-media-rewind-rtl.png                                 \
+          && $(LN_S) -f gtk-media-forward-ltr.png gtk-media-rewind-rtl.png     \
++         && $(RM) -f gtk-save.png                                             \
+          && $(LN_S) -f gtk-floppy.png gtk-save.png)                           \
+       done                                                                    \
diff -r 56b853c1db63 -r 0cb58977652d x11/gtk2/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/gtk2/patches/patch-ae Mon Oct 09 15:42:42 2006 +0000
@@ -0,0 +1,28 @@
+$NetBSD: patch-ae,v 1.11.2.1 2006/10/09 15:42:42 ghen Exp $
+
+http://bugzilla.gnome.org/show_bug.cgi?id=348438
+
+--- gtk/Makefile.in.orig       2006-09-04 22:40:10.000000000 -0400
++++ gtk/Makefile.in    2006-10-09 07:47:01.127682000 -0400
+@@ -2916,12 +2916,21 @@
+       for i in 16 24; do                                                      \
+          (cd stock-icons/$$i                                                  \
++         && $(RM) -f gtk-go-back-rtl.png                                      \
+          && $(LN_S) -f gtk-go-forward-ltr.png gtk-go-back-rtl.png             \
++         && $(RM) -f gtk-go-forward-rtl.png                                   \
+          && $(LN_S) -f gtk-go-back-ltr.png gtk-go-forward-rtl.png             \
++         && $(RM) -f gtk-goto-first-rtl.png                                   \
+          && $(LN_S) -f gtk-goto-last-ltr.png gtk-goto-first-rtl.png           \
++         && $(RM) -f gtk-goto-last-rtl.png                                    \
+          && $(LN_S) -f gtk-goto-first-ltr.png gtk-goto-last-rtl.png           \
++         && $(RM) -f gtk-media-forward-rtl.png                                \
+          && $(LN_S) -f gtk-media-rewind-ltr.png gtk-media-forward-rtl.png     \
++         && $(RM) -f gtk-media-next-rtl.png                                   \
+          && $(LN_S) -f gtk-media-previous-ltr.png gtk-media-next-rtl.png      \
++         && $(RM) -f gtk-media-previous-rtl.png                               \
+          && $(LN_S) -f gtk-media-next-ltr.png gtk-media-previous-rtl.png      \
++         && $(RM) -f gtk-media-rewind-rtl.png                                 \
+          && $(LN_S) -f gtk-media-forward-ltr.png gtk-media-rewind-rtl.png     \
++         && $(RM) -f gtk-save.png                                             \
+          && $(LN_S) -f gtk-floppy.png gtk-save.png)                           \
+       done                                                                    \