Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1419

Modified Files:
        gtk+2.info gtk+2.patch 
Removed Files:
        gtk+2-10.4.info 
Log Message:
new version; reunifies 10.4/10.5; moves more stuff out of gtk+2


Index: gtk+2.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gtk+2.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- gtk+2.patch 18 Oct 2008 17:04:43 -0000      1.9
+++ gtk+2.patch 26 Nov 2008 23:19:51 -0000      1.10
@@ -1,7 +1,7 @@
-diff -Nurd -x'*~' gtk+-2.14.3.orig/Makefile.in gtk+-2.14.3/Makefile.in
---- gtk+-2.14.3.orig/Makefile.in       2008-09-23 23:11:35.000000000 -0400
-+++ gtk+-2.14.3/Makefile.in    2008-10-10 01:11:47.000000000 -0400
-@@ -516,7 +516,7 @@
+diff -Nurd -x'*~' gtk+-2.14.5.orig/Makefile.in gtk+-2.14.5/Makefile.in
+--- gtk+-2.14.5.orig/Makefile.in       2008-11-24 11:08:14.000000000 -0500
++++ gtk+-2.14.5/Makefile.in    2008-11-26 16:15:40.000000000 -0500
+@@ -520,7 +520,7 @@
        && DISPLAY=:$$XID && export DISPLAY
  
  
@@ -10,10 +10,10 @@
  SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
  
  # require automake 1.4
-diff -Nurd -x'*~' gtk+-2.14.3.orig/configure gtk+-2.14.3/configure
---- gtk+-2.14.3.orig/configure 2008-09-23 23:11:45.000000000 -0400
-+++ gtk+-2.14.3/configure      2008-10-16 00:38:12.000000000 -0400
-@@ -33739,16 +33739,6 @@
+diff -Nurd -x'*~' gtk+-2.14.5.orig/configure gtk+-2.14.5/configure
+--- gtk+-2.14.5.orig/configure 2008-11-24 01:41:48.000000000 -0500
++++ gtk+-2.14.5/configure      2008-11-26 16:15:40.000000000 -0500
+@@ -30554,16 +30554,6 @@
  fi
  
  
@@ -30,9 +30,9 @@
  
    # Checks for Xcursor library
  
-diff -Nurd -x'*~' gtk+-2.14.3.orig/docs/tools/shooter.c 
gtk+-2.14.3/docs/tools/shooter.c
---- gtk+-2.14.3.orig/docs/tools/shooter.c      2008-09-19 00:44:09.000000000 
-0400
-+++ gtk+-2.14.3/docs/tools/shooter.c   2008-10-10 01:11:47.000000000 -0400
+diff -Nurd -x'*~' gtk+-2.14.5.orig/docs/tools/shooter.c 
gtk+-2.14.5/docs/tools/shooter.c
+--- gtk+-2.14.5.orig/docs/tools/shooter.c      2008-11-24 01:35:42.000000000 
-0500
++++ gtk+-2.14.5/docs/tools/shooter.c   2008-11-26 16:15:40.000000000 -0500
 @@ -16,7 +16,11 @@
  #include <stdlib.h>
  #include <fcntl.h>
@@ -45,10 +45,10 @@
  #include "widgets.h"
  #include "shadow.h"
  
-diff -Nurd -x'*~' gtk+-2.14.3.orig/gdk/Makefile.in gtk+-2.14.3/gdk/Makefile.in
---- gtk+-2.14.3.orig/gdk/Makefile.in   2008-09-23 23:11:38.000000000 -0400
-+++ gtk+-2.14.3/gdk/Makefile.in        2008-10-11 13:13:23.000000000 -0400
-@@ -577,7 +577,7 @@
+diff -Nurd -x'*~' gtk+-2.14.5.orig/gdk/Makefile.in gtk+-2.14.5/gdk/Makefile.in
+--- gtk+-2.14.5.orig/gdk/Makefile.in   2008-11-24 01:41:41.000000000 -0500
++++ gtk+-2.14.5/gdk/Makefile.in        2008-11-26 16:15:40.000000000 -0500
+@@ -581,7 +581,7 @@
  libgdk_x11_2_0_la_LIBADD = x11/libgdk-x11.la $(GDK_DEP_LIBS) \
    $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
  
@@ -57,9 +57,9 @@
  
  libgdk_quartz_2_0_la_SOURCES = $(common_sources) gdkkeynames.c
  libgdk_quartz_2_0_la_LIBADD = quartz/libgdk-quartz.la $(GDK_DEP_LIBS) \
-diff -Nurd -x'*~' gtk+-2.14.3.orig/gdk/directfb/gdkim-directfb.c 
gtk+-2.14.3/gdk/directfb/gdkim-directfb.c
---- gtk+-2.14.3.orig/gdk/directfb/gdkim-directfb.c     2008-09-19 
00:44:41.000000000 -0400
-+++ gtk+-2.14.3/gdk/directfb/gdkim-directfb.c  2008-10-10 01:11:47.000000000 
-0400
+diff -Nurd -x'*~' gtk+-2.14.5.orig/gdk/directfb/gdkim-directfb.c 
gtk+-2.14.5/gdk/directfb/gdkim-directfb.c
+--- gtk+-2.14.5.orig/gdk/directfb/gdkim-directfb.c     2008-11-24 
01:36:03.000000000 -0500
++++ gtk+-2.14.5/gdk/directfb/gdkim-directfb.c  2008-11-26 16:15:40.000000000 
-0500
 @@ -33,7 +33,11 @@
  #include "config.h"
  
@@ -72,9 +72,9 @@
  
  #include "gdkdirectfb.h"
  
-diff -Nurd -x'*~' gtk+-2.14.3.orig/gdk/x11/gdkdrawable-x11.c 
gtk+-2.14.3/gdk/x11/gdkdrawable-x11.c
---- gtk+-2.14.3.orig/gdk/x11/gdkdrawable-x11.c 2008-09-19 00:44:44.000000000 
-0400
-+++ gtk+-2.14.3/gdk/x11/gdkdrawable-x11.c      2008-10-10 01:11:47.000000000 
-0400
+diff -Nurd -x'*~' gtk+-2.14.5.orig/gdk/x11/gdkdrawable-x11.c 
gtk+-2.14.5/gdk/x11/gdkdrawable-x11.c
+--- gtk+-2.14.5.orig/gdk/x11/gdkdrawable-x11.c 2008-11-24 01:36:03.000000000 
-0500
++++ gtk+-2.14.5/gdk/x11/gdkdrawable-x11.c      2008-11-26 16:15:40.000000000 
-0500
 @@ -959,11 +959,19 @@
     * RENDER's preferred order
     */
@@ -140,9 +140,9 @@
  
    *format = XRenderFindFormat (xdisplay,
                               (PictFormatType | PictFormatDepth |
-diff -Nurd -x'*~' gtk+-2.14.3.orig/gdk/x11/gdkfont-x11.c 
gtk+-2.14.3/gdk/x11/gdkfont-x11.c
---- gtk+-2.14.3.orig/gdk/x11/gdkfont-x11.c     2008-09-19 00:44:44.000000000 
-0400
-+++ gtk+-2.14.3/gdk/x11/gdkfont-x11.c  2008-10-10 01:11:47.000000000 -0400
+diff -Nurd -x'*~' gtk+-2.14.5.orig/gdk/x11/gdkfont-x11.c 
gtk+-2.14.5/gdk/x11/gdkfont-x11.c
+--- gtk+-2.14.5.orig/gdk/x11/gdkfont-x11.c     2008-11-24 01:36:03.000000000 
-0500
++++ gtk+-2.14.5/gdk/x11/gdkfont-x11.c  2008-11-26 16:15:40.000000000 -0500
 @@ -29,7 +29,11 @@
  #include "config.h"
  #include <X11/Xlib.h>
@@ -155,9 +155,9 @@
  
  #include "gdkx.h"
  #include "gdkfont.h"
-diff -Nurd -x'*~' gtk+-2.14.3.orig/gdk/x11/gdkim-x11.c 
gtk+-2.14.3/gdk/x11/gdkim-x11.c
---- gtk+-2.14.3.orig/gdk/x11/gdkim-x11.c       2008-09-19 00:44:44.000000000 
-0400
-+++ gtk+-2.14.3/gdk/x11/gdkim-x11.c    2008-10-10 01:11:47.000000000 -0400
+diff -Nurd -x'*~' gtk+-2.14.5.orig/gdk/x11/gdkim-x11.c 
gtk+-2.14.5/gdk/x11/gdkim-x11.c
+--- gtk+-2.14.5.orig/gdk/x11/gdkim-x11.c       2008-11-24 01:36:03.000000000 
-0500
++++ gtk+-2.14.5/gdk/x11/gdkim-x11.c    2008-11-26 16:15:40.000000000 -0500
 @@ -26,7 +26,11 @@
  
  #include "config.h"
@@ -170,9 +170,30 @@
  #include <stdlib.h>
  #include <string.h>
  
-diff -Nurd -x'*~' gtk+-2.14.3.orig/gtk/gtkimmulticontext.c 
gtk+-2.14.3/gtk/gtkimmulticontext.c
---- gtk+-2.14.3.orig/gtk/gtkimmulticontext.c   2008-09-19 10:34:52.000000000 
-0400
-+++ gtk+-2.14.3/gtk/gtkimmulticontext.c        2008-10-10 01:11:47.000000000 
-0400
+diff -Nurd -x'*~' gtk+-2.14.5.orig/gtk/gtk-builder-convert 
gtk+-2.14.5/gtk/gtk-builder-convert
+--- gtk+-2.14.5.orig/gtk/gtk-builder-convert   2008-11-24 01:35:35.000000000 
-0500
++++ gtk+-2.14.5/gtk/gtk-builder-convert        2008-11-26 16:15:40.000000000 
-0500
+@@ -269,9 +269,14 @@
+ 
+         # Output the newly created root objects and sort them
+         # by attribute id
+-        for obj in sorted(self.root_objects,
+-                          key=lambda n: n.getAttribute('id'),
+-                          reverse=True):
++        # FIXME: Use sorted(self.root_objects,
++        #                   key=lambda n: n.getAttribute('id'),
++        #                   reverse=True):
++        # when we can depend on python 2.4 or higher
++        root_objects = self.root_objects[:]
++        root_objects.sort(lambda a, b: cmp(b.getAttribute('id'),
++                                           a.getAttribute('id')))
++        for obj in root_objects:
+             self._interface.childNodes.insert(0, obj)
+ 
+     def _convert(self, klass, node):
+diff -Nurd -x'*~' gtk+-2.14.5.orig/gtk/gtkimmulticontext.c 
gtk+-2.14.5/gtk/gtkimmulticontext.c
+--- gtk+-2.14.5.orig/gtk/gtkimmulticontext.c   2008-11-24 01:35:35.000000000 
-0500
++++ gtk+-2.14.5/gtk/gtkimmulticontext.c        2008-11-26 16:15:40.000000000 
-0500
 @@ -20,7 +20,11 @@
  #include "config.h"
  
@@ -185,9 +206,9 @@
  
  #include "gtkimmulticontext.h"
  #include "gtkimmodule.h"
-diff -Nurd -x'*~' gtk+-2.14.3.orig/gtk/gtkmain.c gtk+-2.14.3/gtk/gtkmain.c
---- gtk+-2.14.3.orig/gtk/gtkmain.c     2008-09-19 00:44:04.000000000 -0400
-+++ gtk+-2.14.3/gtk/gtkmain.c  2008-10-10 01:11:47.000000000 -0400
+diff -Nurd -x'*~' gtk+-2.14.5.orig/gtk/gtkmain.c gtk+-2.14.5/gtk/gtkmain.c
+--- gtk+-2.14.5.orig/gtk/gtkmain.c     2008-11-24 01:35:35.000000000 -0500
++++ gtk+-2.14.5/gtk/gtkmain.c  2008-11-26 16:15:40.000000000 -0500
 @@ -29,7 +29,11 @@
  #include <glib.h>
  #include "gdkconfig.h"
@@ -200,9 +221,9 @@
  
  #include <stdio.h>
  #include <stdlib.h>
-diff -Nurd -x'*~' gtk+-2.14.3.orig/gtk/gtkpagesetupunixdialog.c 
gtk+-2.14.3/gtk/gtkpagesetupunixdialog.c
---- gtk+-2.14.3.orig/gtk/gtkpagesetupunixdialog.c      2008-09-19 
00:44:04.000000000 -0400
-+++ gtk+-2.14.3/gtk/gtkpagesetupunixdialog.c   2008-10-10 01:11:47.000000000 
-0400
+diff -Nurd -x'*~' gtk+-2.14.5.orig/gtk/gtkpagesetupunixdialog.c 
gtk+-2.14.5/gtk/gtkpagesetupunixdialog.c
+--- gtk+-2.14.5.orig/gtk/gtkpagesetupunixdialog.c      2008-11-24 
01:35:35.000000000 -0500
++++ gtk+-2.14.5/gtk/gtkpagesetupunixdialog.c   2008-11-26 16:15:40.000000000 
-0500
 @@ -21,7 +21,11 @@
  
  #include "config.h"
@@ -215,9 +236,9 @@
  
  #ifdef HAVE__NL_MEASUREMENT_MEASUREMENT
  #include <langinfo.h>
-diff -Nurd -x'*~' gtk+-2.14.3.orig/gtk/gtkpapersize.c 
gtk+-2.14.3/gtk/gtkpapersize.c
---- gtk+-2.14.3.orig/gtk/gtkpapersize.c        2008-09-19 00:44:05.000000000 
-0400
-+++ gtk+-2.14.3/gtk/gtkpapersize.c     2008-10-10 01:11:47.000000000 -0400
+diff -Nurd -x'*~' gtk+-2.14.5.orig/gtk/gtkpapersize.c 
gtk+-2.14.5/gtk/gtkpapersize.c
+--- gtk+-2.14.5.orig/gtk/gtkpapersize.c        2008-11-24 01:35:36.000000000 
-0500
++++ gtk+-2.14.5/gtk/gtkpapersize.c     2008-11-26 16:15:40.000000000 -0500
 @@ -22,7 +22,11 @@
  #include "config.h"
  #include <string.h>
@@ -230,9 +251,9 @@
  #if defined(HAVE__NL_PAPER_HEIGHT) && defined(HAVE__NL_PAPER_WIDTH)
  #include <langinfo.h>
  #endif
-diff -Nurd -x'*~' gtk+-2.14.3.orig/gtk/gtkrc.c gtk+-2.14.3/gtk/gtkrc.c
---- gtk+-2.14.3.orig/gtk/gtkrc.c       2008-09-19 00:44:05.000000000 -0400
-+++ gtk+-2.14.3/gtk/gtkrc.c    2008-10-10 01:11:47.000000000 -0400
+diff -Nurd -x'*~' gtk+-2.14.5.orig/gtk/gtkrc.c gtk+-2.14.5/gtk/gtkrc.c
+--- gtk+-2.14.5.orig/gtk/gtkrc.c       2008-11-24 01:35:36.000000000 -0500
++++ gtk+-2.14.5/gtk/gtkrc.c    2008-11-26 16:15:40.000000000 -0500
 @@ -26,7 +26,11 @@
  
  #include "config.h"
@@ -245,9 +266,9 @@
  #ifdef HAVE_UNISTD_H
  #include <unistd.h>
  #endif
-diff -Nurd -x'*~' gtk+-2.14.3.orig/gtk/gtkspinbutton.c 
gtk+-2.14.3/gtk/gtkspinbutton.c
---- gtk+-2.14.3.orig/gtk/gtkspinbutton.c       2008-09-23 18:21:10.000000000 
-0400
-+++ gtk+-2.14.3/gtk/gtkspinbutton.c    2008-10-10 01:11:47.000000000 -0400
+diff -Nurd -x'*~' gtk+-2.14.5.orig/gtk/gtkspinbutton.c 
gtk+-2.14.5/gtk/gtkspinbutton.c
+--- gtk+-2.14.5.orig/gtk/gtkspinbutton.c       2008-11-24 01:35:35.000000000 
-0500
++++ gtk+-2.14.5/gtk/gtkspinbutton.c    2008-11-26 16:15:40.000000000 -0500
 @@ -32,7 +32,11 @@
  #include <stdlib.h>
  #include <math.h>
@@ -260,9 +281,9 @@
  #include "gdk/gdkkeysyms.h"
  #include "gtkbindings.h"
  #include "gtkspinbutton.h"
-diff -Nurd -x'*~' gtk+-2.14.3.orig/gtk/gtkwidget.c gtk+-2.14.3/gtk/gtkwidget.c
---- gtk+-2.14.3.orig/gtk/gtkwidget.c   2008-09-19 00:44:03.000000000 -0400
-+++ gtk+-2.14.3/gtk/gtkwidget.c        2008-10-10 01:11:47.000000000 -0400
+diff -Nurd -x'*~' gtk+-2.14.5.orig/gtk/gtkwidget.c gtk+-2.14.5/gtk/gtkwidget.c
+--- gtk+-2.14.5.orig/gtk/gtkwidget.c   2008-11-24 01:35:35.000000000 -0500
++++ gtk+-2.14.5/gtk/gtkwidget.c        2008-11-26 16:15:40.000000000 -0500
 @@ -27,7 +27,11 @@
  #include "config.h"
  #include <stdarg.h>
@@ -275,179 +296,9 @@
  #include "gtkcontainer.h"
  #include "gtkaccelmap.h"
  #include "gtkclipboard.h"
-diff -Nurd -x'*~' gtk+-2.14.3.orig/ltmain.sh gtk+-2.14.3/ltmain.sh
---- gtk+-2.14.3.orig/ltmain.sh 2008-08-29 18:27:25.000000000 -0400
-+++ gtk+-2.14.3/ltmain.sh      2008-10-10 01:11:47.000000000 -0400
-@@ -2924,100 +2925,72 @@
-           fi
-           tmp_libs="$tmp_libs $deplib"
-         done
--
--        if test "$link_all_deplibs" != no; then
--          # Add the search paths of all dependency libraries
--          for deplib in $dependency_libs; do
--            case $deplib in
--            -L*) path="$deplib" ;;
--            *.la)
--              dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
--              test "X$dir" = "X$deplib" && dir="."
--              # We need an absolute path.
--              case $dir in
--              [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
--              *)
--                absdir=`cd "$dir" && pwd`
--                if test -z "$absdir"; then
--                  $echo "$modename: warning: cannot determine absolute 
directory name of \`$dir'" 1>&2
--                  absdir="$dir"
--                fi
--                ;;
--              esac
--              if grep "^installed=no" $deplib > /dev/null; then
--                path="$absdir/$objdir"
--              else
--                eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
--                if test -z "$libdir"; then
--                  $echo "$modename: \`$deplib' is not a valid libtool 
archive" 1>&2
--                  exit $EXIT_FAILURE
--                fi
--                if test "$absdir" != "$libdir"; then
--                  $echo "$modename: warning: \`$deplib' seems to be moved" 
1>&2
--                fi
--                path="$absdir"
--              fi
--              depdepl=
--              case $host in
--              *-*-darwin*)
--                # we do not want to link against static libs,
--                # but need to link against shared
--                eval deplibrary_names=`${SED} -n -e 
's/^library_names=\(.*\)$/\1/p' $deplib`
--                eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
--                if test -n "$deplibrary_names" ; then
--                  for tmp in $deplibrary_names ; do
--                    depdepl=$tmp
--                  done
--                  if test -f "$deplibdir/$depdepl" ; then
--                    depdepl="$deplibdir/$depdepl"
--                  elif test -f "$path/$depdepl" ; then
--                    depdepl="$path/$depdepl"
--                  else
--                    # Can't find it, oh well...
--                    depdepl=
--                  fi
--                  # do not add paths which are already there
--                  case " $newlib_search_path " in
--                  *" $path "*) ;;
--                  *) newlib_search_path="$newlib_search_path $path";;
--                  esac
--                fi
--                path=""
--                ;;
--              *)
--                path="-L$path"
--                ;;
--              esac
--              ;;
--            -l*)
--              case $host in
--              *-*-darwin*)
--                # Again, we only want to link against shared libraries
--                eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
--                for tmp in $newlib_search_path ; do
--                  if test -f "$tmp/lib$tmp_libs.dylib" ; then
--                    eval depdepl="$tmp/lib$tmp_libs.dylib"
--                    break
--                  fi
--                done
--                path=""
--                ;;
--              *) continue ;;
--              esac
--              ;;
--            *) continue ;;
--            esac
--            case " $deplibs " in
--            *" $path "*) ;;
--            *) deplibs="$path $deplibs" ;;
--            esac
--            case " $deplibs " in
--            *" $depdepl "*) ;;
--            *) deplibs="$depdepl $deplibs" ;;
--            esac
--          done
--        fi # link_all_deplibs != no
--      fi # linkmode = lib
-+          if test "$link_all_deplibs" != no; then
-+            # Add the search paths of all dependency libraries
-+            for deplib in $dependency_libs; do
-+              case $deplib in
-+              -L*) path="$deplib" ;;
-+              *.la)
-+#               func_dirname "$deplib" "" "."
-+#               dir="$func_dirname_result"
-+                case "$deplib" in
-+                  */*) dir="${deplib%/*}" ;;
-+                  *  ) dir="." ;;
-+                esac
-+                # We need an absolute path.
-+                case $dir in
-+                [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-+                *)
-+                  absdir=`cd "$dir" && pwd`
-+                  if test -z "$absdir"; then
-+                    $echo "$modename: warning: cannot determine absolute 
directory name of \`$dir'" 1>&2
-+                    absdir="$dir"
-+                  fi
-+                  ;;
-+                esac
-+                if grep "^installed=no" $deplib > /dev/null; then
-+                case $host in
-+                *-*-darwin*)
-+                  depdepl=
-+                  eval deplibrary_names=`${SED} -n -e 
's/^library_names=\(.*\)$/\1/p' $deplib`
-+                  if test -n "$deplibrary_names" ; then
-+                    for tmp in $deplibrary_names ; do
-+                      depdepl=$tmp
-+                    done
-+                    if test -f "$absdir/$objdir/$depdepl" ; then
-+                      depdepl="$absdir/$objdir/$depdepl"
-+                      darwin_install_name=`otool -L $depdepl | awk '{if (NR 
== 2) {print $1;exit}}'`
-+                      if test -z "$darwin_install_name"; then
-+                          darwin_install_name=`otool64 -L $depdepl  | awk 
'{if (NR == 2) {print $1;exit}}'`
-+                      fi
-+                      compiler_flags="$compiler_flags ${wl}-dylib_file 
${wl}${darwin_install_name}:${depdepl}"
-+                      linker_flags="$linker_flags -dylib_file 
${darwin_install_name}:${depdepl}"
-+                      path=
-+                    fi
-+                  fi
-+                  ;;
-+                *)
-+                  path="-L$absdir/$objdir"
-+                  ;;
-+                esac
-+                else
-+                  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+                  test -z "$libdir" && \
-+                    $echo "\`$deplib' is not a valid libtool archive" 1>&2
-+                  test -z "$libdir" && exit 1
-+                  test "$absdir" != "$libdir" && \
-+                    $echo "\`$deplib' seems to be moved" 1>&2
-+                  path="-L$absdir"
-+                fi
-+                ;;
-+              esac
-+              case " $deplibs " in
-+              *" $path "*) ;;
-+              *) deplibs="$path $deplibs" ;;
-+              esac
-+            done
-+          fi # link_all_deplibs != no
-+        fi # linkmode = lib
-       done # for deplib in $libs
-       dependency_libs="$newdependency_libs"
-       if test "$pass" = dlpreopen; then
-diff -Nurd -x'*~' gtk+-2.14.3.orig/modules/input/gtkimcontextxim.c 
gtk+-2.14.3/modules/input/gtkimcontextxim.c
---- gtk+-2.14.3.orig/modules/input/gtkimcontextxim.c   2008-09-19 
00:44:17.000000000 -0400
-+++ gtk+-2.14.3/modules/input/gtkimcontextxim.c        2008-10-10 
01:15:00.000000000 -0400
+diff -Nurd -x'*~' gtk+-2.14.5.orig/modules/input/gtkimcontextxim.c 
gtk+-2.14.5/modules/input/gtkimcontextxim.c
+--- gtk+-2.14.5.orig/modules/input/gtkimcontextxim.c   2008-11-24 
01:35:53.000000000 -0500
++++ gtk+-2.14.5/modules/input/gtkimcontextxim.c        2008-11-26 
16:15:40.000000000 -0500
 @@ -18,7 +18,11 @@
   */
  
@@ -461,9 +312,9 @@
  #include <string.h>
  #include <stdlib.h>
  
-diff -Nurd -x'*~' gtk+-2.14.3.orig/tests/testicontheme.c 
gtk+-2.14.3/tests/testicontheme.c
---- gtk+-2.14.3.orig/tests/testicontheme.c     2008-09-19 00:44:16.000000000 
-0400
-+++ gtk+-2.14.3/tests/testicontheme.c  2008-10-10 01:11:47.000000000 -0400
+diff -Nurd -x'*~' gtk+-2.14.5.orig/tests/testicontheme.c 
gtk+-2.14.5/tests/testicontheme.c
+--- gtk+-2.14.5.orig/tests/testicontheme.c     2008-11-24 01:35:46.000000000 
-0500
++++ gtk+-2.14.5/tests/testicontheme.c  2008-11-26 16:15:40.000000000 -0500
 @@ -21,7 +21,11 @@
  #include <gtk/gtk.h>
  #include <stdlib.h>
@@ -476,9 +327,9 @@
  
  static void
  usage (void)
-diff -Nurd -x'*~' gtk+-2.14.3.orig/update-gdk-pixbuf-loaders 
gtk+-2.14.3/update-gdk-pixbuf-loaders
---- gtk+-2.14.3.orig/update-gdk-pixbuf-loaders 1969-12-31 19:00:00.000000000 
-0500
-+++ gtk+-2.14.3/update-gdk-pixbuf-loaders      2008-10-10 01:11:47.000000000 
-0400
+diff -Nurd -x'*~' gtk+-2.14.5.orig/update-gdk-pixbuf-loaders 
gtk+-2.14.5/update-gdk-pixbuf-loaders
+--- gtk+-2.14.5.orig/update-gdk-pixbuf-loaders 1969-12-31 19:00:00.000000000 
-0500
++++ gtk+-2.14.5/update-gdk-pixbuf-loaders      2008-11-26 16:15:40.000000000 
-0500
 @@ -0,0 +1,21 @@
 +#!/bin/sh -e
 +#
@@ -501,9 +352,9 @@
 +chmod 0644 $CONFFILE
 +
 +exit 0
-diff -Nurd -x'*~' gtk+-2.14.3.orig/update-gtk-immodules 
gtk+-2.14.3/update-gtk-immodules
---- gtk+-2.14.3.orig/update-gtk-immodules      1969-12-31 19:00:00.000000000 
-0500
-+++ gtk+-2.14.3/update-gtk-immodules   2008-10-10 01:11:47.000000000 -0400
+diff -Nurd -x'*~' gtk+-2.14.5.orig/update-gtk-immodules 
gtk+-2.14.5/update-gtk-immodules
+--- gtk+-2.14.5.orig/update-gtk-immodules      1969-12-31 19:00:00.000000000 
-0500
++++ gtk+-2.14.5/update-gtk-immodules   2008-11-26 16:15:40.000000000 -0500
 @@ -0,0 +1,20 @@
 +#!/bin/sh -e
 +#

--- gtk+2-10.4.info DELETED ---

Index: gtk+2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gtk+2.info,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- gtk+2.info  9 Nov 2008 15:22:41 -0000       1.26
+++ gtk+2.info  26 Nov 2008 23:19:51 -0000      1.27
@@ -1,7 +1,6 @@
 Package: gtk+2
-Version: 2.14.4
-Revision: 102
-Distribution: 10.5
+Version: 2.14.5
+Revision: 1
 Description: The Gimp Toolkit
 License: LGPL
 Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>
@@ -42,11 +41,11 @@
 Conflicts: %N-common
 Replaces: %N-common
 Source: mirror:gnome:sources/gtk+/2.14/gtk+-%v.tar.bz2
-Source-MD5: 72bf65a54d2d29a6644dc0d28313ee67
-Source2: mirror:debian:pool/main/g/gtk+2.0/gtk+2.0_2.12.11-4.diff.gz
-Source2-MD5: e88b12fe15289a6d15ab1c62b07f9671
+Source-MD5: 1b1b5d7ab5a25e84682cb27ee4808a40
+Source2: mirror:debian:pool/main/g/gtk+2.0/gtk+2.0_2.14.5-1.diff.gz
+Source2-MD5: 0c1ee9203ff4c348dcccf386ad91e545
 PatchFile: %n.patch
-PatchFile-MD5: 8e90a7a7b08ffa269485468212197d74
+PatchFile-MD5: 50367f47b8b32fd52d78c442b67473b6
 PatchScript: <<
 #!/bin/sh -ev
        sed -e 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p1
@@ -57,18 +56,20 @@
                030_gtkentry_password-char-circle.patch \
                042_treeview_single-focus.patch \
                060_ignore-random-icons.patch \
+               071_jasper_link_fix.patch \
                091_workaround_no_gtk_init_incorrect_display.patch \
+               092_fix_printtest_include.patch \
        ; do
                echo "applying $file"
                patch -p1 < debian/patches/$file
        done
-       perl -pi -e 's,/usr/bin/env python,/usr/bin/python,' 
gtk/gtk-builder-convert
+#      perl -pi -e 's,/usr/bin/env python,/usr/bin/python,' 
gtk/gtk-builder-convert
 <<
 
 SetCPPFLAGS: -DX_LOCALE -I%p/lib/fontconfig2/include
 SetLDFLAGS: -L%p/lib/fontconfig2/lib
 SetCFLAGS: -Os
-SetCXXFLAGS: -Os
+SetCXXFLAGS: -O1
 ConfigureParams: --mandir=%p/share/man --disable-shm --disable-gtk-doc 
--disable-dependency-tracking --disable-explicit-deps
 CompileScript: <<
 #!/bin/sh -ev
@@ -117,10 +118,9 @@
                libpng3-shlibs (>= 1.2.5-4),
                libtiff-shlibs,
                pango1-xft2-ft219-shlibs (>= 1.22.0-4),
+               shared-mime-info,
                x11-shlibs
        <<
-       # Add Depends:shared-mime-info during next upgrade for
-       # gdk-pixbuf-csource and other graphics-file dispatching
        Replaces: <<
                %N (<< 2.14.4-1),
                gtk2-engines (<< 2.6.3-1),
@@ -154,13 +154,19 @@
 <<
 SplitOff2: <<
        Package: %N-dev
-       Depends: %N (= %v-%r), %N-shlibs (= %v-%r)
+       Depends: <<
+               %N (= %v-%r),
+               %N-shlibs (= %v-%r),
+               glib2-shlibs (>= 2.18.0-1),
+               libgettext3-shlibs,
+               libiconv
+       <<
        Conflicts: <<
                gtk+ (<< 1.2.10-12),
                gail16-dev, gail17-dev
        <<
        Replaces: <<
-               %N (<< 2.14.4-2),
+               %N (<< 2.14.5-1),
                %N-shlibs (<< 2.14.3-1),
                gail16, gail17, gail18,
                gail16-dev, gail17-dev, gail18-dev
@@ -168,11 +174,13 @@
        BuildDependsOnly: True
        DocFiles: AUTHORS COPYING ChangeLog NEWS README
        Files: <<
+               bin/gdk-pixbuf-csource
                bin/gtk-builder-convert
                include
                lib
                share/aclocal
                share/gtk-doc
+               share/man/man1/gdk-pixbuf-csource.1
                share/man/man1/gtk-builder-convert.1
        <<
 <<
@@ -235,13 +243,11 @@
        (dir is as versioned as pkgname is, could split off into
        %N-themes if needed to keep across new libversion pkgname)
 
-       Move gtk-query-immodules-2.0 %N -> %N-shlibs as of 2.14.4-1
-       (name and datadir name are as versioned as pkgname is, could
-       split off into %N-themes if needed to keep across new
-       libversion pkgname)
+       Move gdk-pixbuf-csource %N -> %N-dev as of 2.14.5-1
+       (developer tool to generate C code)
 
-       gtk-builder-convert requires python >= 2.4, so can use Apple's on
-       OS X >= 10.5 but need fink's on OS X <= 10.4. See:
+       Patch gtk-builder-convert to work with any python version (svn
+       revision #21807). See:
        http://bugzilla.gnome.org/show_bug.cgi?id=559947
 <<
 DescPort: <<
@@ -250,9 +256,10 @@
 
 Import some Debian patches (whichever ones look useful)
 
-Import ltmain.sh dependent-lib dependency handlers from libtool2
-(prevents linking against installed lib instead of build-dir one).
-Thanks pogma!
+#Import ltmain.sh dependent-lib dependency handlers from libtool2
+#(prevents linking against installed lib instead of build-dir one).
+#Thanks pogma!
+^-- comes with ltmain.sh from libtool-2.2.6 as of 2.14.5-1
 
        Make sure libgdk-x11 links against Xrender even on 10.4. See:
        http://bugzilla.gnome.org/show_bug.cgi?id=555763


-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to