rpms/galeon/F-9 galeon-2.0.7-gtkprint.patch, NONE, 1.1 galeon-2.0.7-warnings.patch, NONE, 1.1 galeon.spec, 1.57, 1.58 galeon-2.0.7-print.patch, 1.1, NONE

Denis Leroy denis at fedoraproject.org
Sun Feb 15 09:43:53 UTC 2009


Author: denis

Update of /cvs/pkgs/rpms/galeon/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24258

Modified Files:
	galeon.spec 
Added Files:
	galeon-2.0.7-gtkprint.patch galeon-2.0.7-warnings.patch 
Removed Files:
	galeon-2.0.7-print.patch 
Log Message:
- Added upstream patch to use Gnome print support 
- Added patch to fix compiler warnings


galeon-2.0.7-gtkprint.patch:

--- NEW FILE galeon-2.0.7-gtkprint.patch ---
diff -urN galeon-2.0.7.orig/aclocal.m4 galeon-2.0.7/aclocal.m4
--- galeon-2.0.7.orig/aclocal.m4	2008-09-27 05:16:08.000000000 +0200
+++ galeon-2.0.7/aclocal.m4	2009-02-15 09:39:16.000000000 +0100
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,6 +11,14 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.63],,
+[m4_warning([this file was generated for autoconf 2.63.
+You have another version of autoconf.  It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
+
 dnl AM_GCONF_SOURCE_2
 dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
 dnl  (i.e. pass to gconftool-2
@@ -26,8 +34,10 @@
     GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
   fi
 
-  AC_ARG_WITH(gconf-source, 
-  [  --with-gconf-source=sourceaddress      Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",)
+  AC_ARG_WITH([gconf-source],
+	      AC_HELP_STRING([--with-gconf-source=sourceaddress],
+			     [Config database for installing schema files.]),
+	      [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
 
   AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
   AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
@@ -36,8 +46,10 @@
     GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
   fi
 
-  AC_ARG_WITH(gconf-schema-file-dir, 
-  [  --with-gconf-schema-file-dir=dir        Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",)
+  AC_ARG_WITH([gconf-schema-file-dir],
+	      AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
+			     [Directory for installing schema files.]),
+	      [GCONF_SCHEMA_FILE_DIR="$withval"],)
 
   AC_SUBST(GCONF_SCHEMA_FILE_DIR)
   AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
@@ -535,8 +547,9 @@
 
 dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
 # serial 40 IT_PROG_INTLTOOL
-AC_DEFUN([IT_PROG_INTLTOOL],
-[AC_PREREQ([2.50])dnl
+AC_DEFUN([IT_PROG_INTLTOOL], [
+AC_PREREQ([2.50])dnl
+AC_REQUIRE([AM_NLS])dnl
 
 case "$am__api_version" in
     1.[01234])
@@ -609,6 +622,7 @@
 AC_PATH_PROG(XGETTEXT, xgettext)
 AC_PATH_PROG(MSGMERGE, msgmerge)
 AC_PATH_PROG(MSGFMT, msgfmt)
+AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
 if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
     AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
 fi
@@ -680,6 +694,9 @@
 dnl of config.status.
 AC_CONFIG_COMMANDS_PRE([
   AC_CONFIG_COMMANDS([$1/stamp-it], [
+    if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" ]; then
+       AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
+    fi
     rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
     >"$1/stamp-it.tmp"
     [sed '/^#/d
@@ -688,22 +705,17 @@
 	'"s|^|	$ac_top_srcdir/|" \
       "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
     ]
-    if test ! -f "$1/Makefile"; then
-      AC_MSG_ERROR([$1/Makefile is not ready.])
-    fi
-    mv "$1/Makefile" "$1/Makefile.tmp"
     [sed '/^POTFILES =/,/[^\\]$/ {
 		/^POTFILES =/!d
 		r $1/POTFILES
 	  }
-	 ' "$1/Makefile.tmp" >"$1/Makefile"]
+	 ' "$1/Makefile.in" >"$1/Makefile"]
     rm -f "$1/Makefile.tmp"
     mv "$1/stamp-it.tmp" "$1/stamp-it"
   ])
 ])dnl
 ])
 
-
 # deprecated macros
 AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
 # A hint is needed for aclocal from Automake <= 1.9.4:
@@ -712,7 +724,7 @@
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
-# serial 51 AC_PROG_LIBTOOL
+# serial 52 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -800,7 +812,6 @@
 AC_REQUIRE([AC_OBJEXT])dnl
 AC_REQUIRE([AC_EXEEXT])dnl
 dnl
-
 AC_LIBTOOL_SYS_MAX_CMD_LEN
 AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
 AC_LIBTOOL_OBJDIR
@@ -902,6 +913,8 @@
   ;;
 esac
 
+_LT_REQUIRED_DARWIN_CHECKS
+
 AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
 AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
 enable_win32_dll=yes, enable_win32_dll=no)
@@ -981,9 +994,80 @@
 echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
 ])# _LT_LINKER_BOILERPLATE
 
+# _LT_REQUIRED_DARWIN_CHECKS
+# --------------------------
+# Check for some things on darwin
+AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
+  case $host_os in
+    rhapsody* | darwin*)
+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+
+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+      [lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+   # By default we will add the -single_module flag. You can override
+   # by either setting the environment variable LT_MULTI_MODULE
+   # non-empty at configure time, or by adding -multi_module to the
+   # link flags.
+   echo "int foo(void){return 1;}" > conftest.c
+   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+     -dynamiclib ${wl}-single_module conftest.c
+   if test -f libconftest.dylib; then
+     lt_cv_apple_cc_single_mod=yes
+     rm -rf libconftest.dylib*
+   fi
+   rm conftest.c
+      fi])
+    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+      [lt_cv_ld_exported_symbols_list],
+      [lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+   [lt_cv_ld_exported_symbols_list=yes],
+   [lt_cv_ld_exported_symbols_list=no])
+   LDFLAGS="$save_LDFLAGS"
+    ])
+    case $host_os in
+    rhapsody* | darwin1.[[0123]])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*)
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+   10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+   10.[[012]]*)
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+   10.*)
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
[...27129 lines suppressed...]
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -301,8 +283,12 @@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 INCLUDES = \
 	-I$(top_srcdir)/bookmarks	\
 	-I$(top_srcdir)/embed		\
@@ -443,7 +429,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libutils.la: $(libutils_la_OBJECTS) $(libutils_la_DEPENDENCIES) 
-	$(LINK)  $(libutils_la_LDFLAGS) $(libutils_la_OBJECTS) $(libutils_la_LIBADD) $(LIBS)
+	$(LINK)  $(libutils_la_OBJECTS) $(libutils_la_LIBADD) $(LIBS)
 
 clean-noinstPROGRAMS:
 	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
@@ -495,22 +481,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/stroke.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -521,17 +507,13 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -543,8 +525,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -554,13 +536,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -574,23 +555,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/$(top_srcdir)/idl
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -642,7 +621,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -656,12 +635,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -682,19 +669,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \
 	ctags distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am
+	tags uninstall uninstall-am
 
 
 galeon-marshal.c: galeon-marshal.list

galeon-2.0.7-warnings.patch:

--- NEW FILE galeon-2.0.7-warnings.patch ---
diff -ur galeon-2.0.7.orig/bookmarks/bookmarks-context-menu.c galeon-2.0.7/bookmarks/bookmarks-context-menu.c
--- galeon-2.0.7.orig/bookmarks/bookmarks-context-menu.c	2008-10-07 10:22:44.000000000 +0200
+++ galeon-2.0.7/bookmarks/bookmarks-context-menu.c	2008-10-07 10:23:42.000000000 +0200
@@ -236,7 +236,7 @@
 
 	p->menu = gtk_menu_new ();
 	g_object_ref (p->menu);
-	gtk_object_sink (GTK_OBJECT (p->menu));
+	g_object_ref_sink (p->menu);
 
 	if (GB_IS_SITE (p->bm))
 	{
diff -ur galeon-2.0.7.orig/bookmarks/bookmarks-editor.c galeon-2.0.7/bookmarks/bookmarks-editor.c
--- galeon-2.0.7.orig/bookmarks/bookmarks-editor.c	2008-10-07 10:22:44.000000000 +0200
+++ galeon-2.0.7/bookmarks/bookmarks-editor.c	2008-10-07 10:23:42.000000000 +0200
@@ -524,7 +524,7 @@
 
 		gtk_widget_show (GTK_WIDGET (p->left_tree_view));
 		g_object_ref (p->left_tree_view);
-		gtk_object_sink (GTK_OBJECT (p->left_tree_view));
+		g_object_ref_sink (p->left_tree_view);
 
 		p->right_tree_view = gb_tree_view_new ();
 		if (p->location_source)
@@ -540,7 +540,7 @@
 		
 		gtk_widget_show (GTK_WIDGET (p->right_tree_view));
 		g_object_ref (p->right_tree_view);
-		gtk_object_sink (GTK_OBJECT (p->right_tree_view));
+		g_object_ref_sink (p->right_tree_view);
 
 		gb_tree_view_set_autoexpand_roots (p->right_tree_view, FALSE);
 	}
diff -ur galeon-2.0.7.orig/bookmarks/bookmarks-gtk-menu-item.c galeon-2.0.7/bookmarks/bookmarks-gtk-menu-item.c
--- galeon-2.0.7.orig/bookmarks/bookmarks-gtk-menu-item.c	2008-10-07 10:22:44.000000000 +0200
+++ galeon-2.0.7/bookmarks/bookmarks-gtk-menu-item.c	2008-10-07 10:23:42.000000000 +0200
@@ -82,7 +82,6 @@
 	GB_GTK_MENU_ITEM_LAST_SIGNAL
 };
 static gint GbGtkMenuItemSignals[GB_GTK_MENU_ITEM_LAST_SIGNAL];
-static GtkTooltips *_gb_gtk_menu_item_tooltips = NULL;
 
 /**
  * GtkMenu object
@@ -115,14 +114,6 @@
 	GbGtkMenuItemPrivate *p = GB_GTK_MENU_ITEM_GET_PRIVATE (m);
 	m->priv = p;
 
-	if (!_gb_gtk_menu_item_tooltips)
-	{
-		_gb_gtk_menu_item_tooltips = gtk_tooltips_new ();
-		g_object_add_weak_pointer (G_OBJECT (_gb_gtk_menu_item_tooltips),
-					   (gpointer)&_gb_gtk_menu_item_tooltips);
-	}
-	g_object_ref (_gb_gtk_menu_item_tooltips);
-	gtk_object_sink (GTK_OBJECT(_gb_gtk_menu_item_tooltips));
 }
 
 static void
@@ -153,8 +144,6 @@
 
 	g_object_unref (G_OBJECT (p->bookmark));
 
-	g_object_unref (_gb_gtk_menu_item_tooltips);
-
 	G_OBJECT_CLASS (gb_gtk_menu_item_parent_class)->finalize (o);
 }
 
@@ -228,9 +217,7 @@
 		char *tooltip;
 
 		tooltip = g_strjoinv("\n\n", parts);
-		gtk_tooltips_set_tip (_gb_gtk_menu_item_tooltips,
-				      GTK_WIDGET(bmi),
-				      tooltip, NULL);
+		gtk_widget_set_tooltip_text (GTK_WIDGET(bmi), tooltip);
 		g_free (tooltip);
 	}
 }
diff -ur galeon-2.0.7.orig/bookmarks/bookmarks-gtk-toolbar.c galeon-2.0.7/bookmarks/bookmarks-gtk-toolbar.c
--- galeon-2.0.7.orig/bookmarks/bookmarks-gtk-toolbar.c	2008-10-07 10:22:44.000000000 +0200
+++ galeon-2.0.7/bookmarks/bookmarks-gtk-toolbar.c	2008-10-07 10:23:42.000000000 +0200
@@ -247,7 +247,7 @@
 		 * feedback */
 		toolbar->priv->drag_item = gtk_tool_button_new (NULL, "m");
 		g_object_ref (G_OBJECT (toolbar->priv->drag_item));
-		gtk_object_sink (GTK_OBJECT (toolbar->priv->drag_item));
+		g_object_ref_sink (toolbar->priv->drag_item);
 	}
   
 	gdk_drag_status (context, context->suggested_action, time);
diff -ur galeon-2.0.7.orig/bookmarks/bookmarks-gtk-toolbar-set.c galeon-2.0.7/bookmarks/bookmarks-gtk-toolbar-set.c
--- galeon-2.0.7.orig/bookmarks/bookmarks-gtk-toolbar-set.c	2008-10-07 10:22:44.000000000 +0200
+++ galeon-2.0.7/bookmarks/bookmarks-gtk-toolbar-set.c	2008-10-07 10:23:42.000000000 +0200
@@ -228,7 +228,7 @@
 	
 	gtk_widget_show (GTK_WIDGET (tb));
 	g_hash_table_insert (p->folder_to_toolbar, g_object_ref (f), g_object_ref (tb));
-	gtk_object_sink (GTK_OBJECT (tb));
+	g_object_ref_sink (tb);
 	
 	if (p->add_func)
 	{
diff -ur galeon-2.0.7.orig/bookmarks/bookmarks-icon-provider.c galeon-2.0.7/bookmarks/bookmarks-icon-provider.c
--- galeon-2.0.7.orig/bookmarks/bookmarks-icon-provider.c	2008-10-07 10:22:44.000000000 +0200
+++ galeon-2.0.7/bookmarks/bookmarks-icon-provider.c	2008-10-07 10:23:42.000000000 +0200
@@ -209,7 +209,7 @@
 	GtkWidget *dummy = gtk_toolbar_new ();
 
 	g_object_ref (dummy);
-	gtk_object_sink (GTK_OBJECT (dummy));
+	g_object_ref_sink (dummy);
 
 	if (p->folder_pixbuf_data)
 	{
diff -ur galeon-2.0.7.orig/configure.in galeon-2.0.7/configure.in
--- galeon-2.0.7.orig/configure.in	2008-10-07 10:22:45.000000000 +0200
+++ galeon-2.0.7/configure.in	2008-10-07 10:23:42.000000000 +0200
@@ -367,9 +367,9 @@
 #CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT $MOZILLA_COMPONENT_CFLAGS $GALEON_DEPENDENCY_CFLAGS"
 #CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS -I$MOZILLA_INCLUDE_ROOT $MOZILLA_COMPONENT_CFLAGS"
 #LDFLAGS="$_SAVE_LDFLAGS $AM_LDFLAGS $MOZILLA_COMPONENT_LIBS"
-CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT `$PKG_CONFIG --cflags-only-I $MOZILLA-xpcom` $GALEON_DEPENDENCY_CFLAGS"
-CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS -I$MOZILLA_INCLUDE_ROOT `pkg-config --cflags $MOZILLA-xpcom`"
-LDFLAGS="$_SAVE_LDFLAGS $AM_LDFLAGS `pkg-config --libs $MOZILLA-xpcom`"
+CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT `$PKG_CONFIG --cflags-only-I $MOZILLA_XPCOM` $GALEON_DEPENDENCY_CFLAGS"
+CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS -I$MOZILLA_INCLUDE_ROOT `pkg-config --cflags $MOZILLA_XPCOM`"
+LDFLAGS="$_SAVE_LDFLAGS $AM_LDFLAGS `pkg-config --libs $MOZILLA_XPCOM`"
 
 
 TEST_MOZILLA_INCLUDE_DIRS="widget mimetype docshell history dom necko string layout gfx content js exthandler pipnss uriloader caps xpconnect nkcache fastfind gtkembedmoz chrome"
diff -ur galeon-2.0.7.orig/embed/galeon-embed-shell.c galeon-2.0.7/embed/galeon-embed-shell.c
--- galeon-2.0.7.orig/embed/galeon-embed-shell.c	2008-10-07 10:22:45.000000000 +0200
+++ galeon-2.0.7/embed/galeon-embed-shell.c	2008-10-07 10:23:42.000000000 +0200
@@ -321,7 +321,7 @@
 	{
 		shell->priv->js_console = GALEON_JS_CONSOLE (galeon_js_console_new ());
 		g_object_ref (shell->priv->js_console);
-		gtk_object_sink (GTK_OBJECT (shell->priv->js_console));
+		g_object_ref_sink (shell->priv->js_console);
 	}
 	
 	return shell->priv->js_console;
diff -ur galeon-2.0.7.orig/libegg/dock/egg-dock-item.c galeon-2.0.7/libegg/dock/egg-dock-item.c
--- galeon-2.0.7.orig/libegg/dock/egg-dock-item.c	2008-10-07 10:22:44.000000000 +0200
+++ galeon-2.0.7/libegg/dock/egg-dock-item.c	2008-10-07 10:23:42.000000000 +0200
@@ -1154,7 +1154,7 @@
         {
             GEnumClass *enum_class = G_ENUM_CLASS (g_type_class_ref (EGG_TYPE_DOCK_PLACEMENT));
             GEnumValue *enum_value = g_enum_get_value (enum_class, position);
-            gchar *name = enum_value ? enum_value->value_name : NULL;
+            const gchar *name = enum_value ? enum_value->value_name : NULL;
             
             g_warning (("Unsupported docking strategy %s in dock object of type %s"),
                        name,  G_OBJECT_TYPE_NAME (object));
@@ -1485,13 +1485,13 @@
                                                   NULL, item);
             g_object_set (item->_priv->tab_label, "item", NULL, NULL);
         }
-        gtk_widget_unref (item->_priv->tab_label);
+        g_object_unref (item->_priv->tab_label);
         item->_priv->tab_label = NULL;
     }
     
     if (tablabel) {
-        gtk_widget_ref (tablabel);
-        gtk_object_sink (GTK_OBJECT (tablabel));
+        g_object_ref (tablabel);
+        g_object_ref_sink (tablabel);
         item->_priv->tab_label = tablabel;
         if (EGG_IS_DOCK_TABLABEL (tablabel)) {
             g_object_set (tablabel, "item", item, NULL);
@@ -1564,7 +1564,7 @@
                           "host", item,
                           NULL));
         g_object_ref (item->_priv->ph);
-        gtk_object_sink (GTK_OBJECT (item->_priv->ph));
+        g_object_ref_sink (item->_priv->ph);
     }
     
     egg_dock_object_freeze (EGG_DOCK_OBJECT (item));
@@ -1627,7 +1627,7 @@
     if (reference && EGG_DOCK_OBJECT_ATTACHED (reference)) {
         if (EGG_IS_DOCK_PLACEHOLDER (reference)) {
             g_object_ref (reference);
-            gtk_object_sink (GTK_OBJECT (reference));
+            g_object_ref_sink (reference);
             item->_priv->ph = EGG_DOCK_PLACEHOLDER (reference);
         }
         else {
@@ -1637,7 +1637,7 @@
                               "host", reference,
                               NULL));
             g_object_ref (item->_priv->ph);
-            gtk_object_sink (GTK_OBJECT (item->_priv->ph));
+            g_object_ref_sink (item->_priv->ph);
         }
     }
 }
diff -ur galeon-2.0.7.orig/libegg/dock/egg-dock-master.c galeon-2.0.7/libegg/dock/egg-dock-master.c
--- galeon-2.0.7.orig/libegg/dock/egg-dock-master.c	2008-10-07 10:22:44.000000000 +0200
+++ galeon-2.0.7/libegg/dock/egg-dock-master.c	2008-10-07 10:23:42.000000000 +0200
@@ -736,7 +736,7 @@
         }
         else {
             g_object_ref (object);
-            gtk_object_sink (GTK_OBJECT (object));
+            g_object_ref_sink (object);
             g_hash_table_insert (master->dock_objects, g_strdup (object->name), object);
         }
     }
diff -ur galeon-2.0.7.orig/libegg/dock/egg-dock-object.c galeon-2.0.7/libegg/dock/egg-dock-object.c
--- galeon-2.0.7.orig/libegg/dock/egg-dock-object.c	2008-10-07 10:22:44.000000000 +0200
+++ galeon-2.0.7/libegg/dock/egg-dock-object.c	2008-10-07 10:23:42.000000000 +0200
@@ -28,6 +28,7 @@
 #include <egg-macros.h>
 #include <stdlib.h>
 #include <string.h>
+#include <gtk/gtkobject.h>
 
 #include "egg-dock-object.h"
 #include "egg-dock-master.h"
@@ -388,7 +389,7 @@
             g_object_unref (child);
         }
         /* sink the widget, so any automatic floating widget is destroyed */
-        gtk_object_sink (GTK_OBJECT (object));
+        g_object_ref_sink (object);
         /* don't reenter */
         object->reduce_pending = FALSE;
         egg_dock_object_thaw (object);
diff -ur galeon-2.0.7.orig/libegg/egg-editable-toolbar.c galeon-2.0.7/libegg/egg-editable-toolbar.c
--- galeon-2.0.7.orig/libegg/egg-editable-toolbar.c	2008-10-07 10:22:44.000000000 +0200
+++ galeon-2.0.7/libegg/egg-editable-toolbar.c	2008-10-07 10:23:42.000000000 +0200
@@ -476,7 +476,7 @@
         create_item_from_action (etoolbar, id, type,
 				 data_is_separator (id), NULL);
       g_object_ref (etoolbar->priv->dragged_item);
-      gtk_object_sink (GTK_OBJECT (etoolbar->priv->dragged_item));
+      g_object_ref_sink (etoolbar->priv->dragged_item);
     }
   else
     {
@@ -1278,7 +1278,7 @@
       toolbar->priv->fixed_toolbar = gtk_toolbar_new ();
       gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar->priv->fixed_toolbar), FALSE);
       g_object_ref (toolbar->priv->fixed_toolbar);
-      gtk_object_sink (GTK_OBJECT (toolbar->priv->fixed_toolbar));
+      g_object_ref_sink (toolbar->priv->fixed_toolbar);
     }
 
   if (toolbar->priv->fixed)
@@ -1293,7 +1293,7 @@
   if (fixed)
     {
       g_object_ref (fixed);
-      gtk_object_sink (GTK_OBJECT (fixed));
+      g_object_ref_sink (fixed);
 
       gtk_toolbar_insert (GTK_TOOLBAR (toolbar->priv->fixed_toolbar), fixed, 0);
     }
diff -ur galeon-2.0.7.orig/mozilla/EphyPromptService.cpp galeon-2.0.7/mozilla/EphyPromptService.cpp
--- galeon-2.0.7.orig/mozilla/EphyPromptService.cpp	2008-10-07 10:22:45.000000000 +0200
+++ galeon-2.0.7/mozilla/EphyPromptService.cpp	2008-10-07 10:23:42.000000000 +0200
@@ -146,7 +146,7 @@
 
 	mDialog = GTK_DIALOG (gtk_dialog_new ());
 	g_object_ref (mDialog);
-	gtk_object_sink (GTK_OBJECT (mDialog));
+	g_object_ref_sink (mDialog);
 
 	char *title = NULL;
 	if (aTitle)
diff -ur galeon-2.0.7.orig/mozilla/HeaderSniffer.cpp galeon-2.0.7/mozilla/HeaderSniffer.cpp
--- galeon-2.0.7.orig/mozilla/HeaderSniffer.cpp	2008-10-07 10:22:45.000000000 +0200
+++ galeon-2.0.7/mozilla/HeaderSniffer.cpp	2008-10-07 10:23:42.000000000 +0200
@@ -586,11 +586,12 @@
 
 	if (mDocument && (flags & EMBED_PERSIST_SAVE_CONTENT))
 	{
-		GtkWidget *toggle;
-
 		/* Reset the flags to turn off content, the user toggles
 		 * if they want to turn it on */
-		(gint&)flags &= ~EMBED_PERSIST_SAVE_CONTENT;
+		GtkWidget *toggle;
+                int f = flags & ~EMBED_PERSIST_SAVE_CONTENT;
+                flags = (EmbedPersistFlags) f;
+
 		galeon_embed_persist_set_flags (mEmbedPersist, flags);
 
 		toggle = gtk_check_button_new_with_mnemonic (_("Save _with content"));
diff -ur galeon-2.0.7.orig/mozilla/mozilla-embed-shell.cpp galeon-2.0.7/mozilla/mozilla-embed-shell.cpp
--- galeon-2.0.7.orig/mozilla/mozilla-embed-shell.cpp	2008-10-07 10:22:45.000000000 +0200
+++ galeon-2.0.7/mozilla/mozilla-embed-shell.cpp	2008-10-07 10:23:42.000000000 +0200
@@ -21,9 +21,21 @@
 #endif
 
 #include <nscore.h>
+
+/* Some versions of nscore.h appears to #define nscore_h___, while
+ * gtkmozembed.h looks for nscore_h__ to see if stuff needs
+ * redefining (what were they thinking?!).  Define explicitly, then
+ * curse. */
+#ifndef nscore_h__
+#define nscore_h__
+#endif
+
 #include <nsComponentManagerUtils.h>
 #include <nsServiceManagerUtils.h>
 
+#define HAVE_VISIBILITY_HIDDEN_ATTRIBUTE 1
+#define HAVE_VISIBILITY_ATTRIBUTE 1
+
 #ifdef XPCOM_GLUE
 #include <nsXPCOMGlue.h>
 #include <gtkmozembed_glue.cpp>
diff -ur galeon-2.0.7.orig/mozilla/mozilla-notifiers.cpp galeon-2.0.7/mozilla/mozilla-notifiers.cpp
--- galeon-2.0.7.orig/mozilla/mozilla-notifiers.cpp	2008-10-07 10:22:45.000000000 +0200
+++ galeon-2.0.7/mozilla/mozilla-notifiers.cpp	2008-10-07 10:23:42.000000000 +0200
@@ -131,7 +131,7 @@
 
 static const struct 
 {
-	char *gconf_key;
+	const char *gconf_key;
 	guint pref_type;
 	const char *mozilla_key;
 }
@@ -369,7 +369,7 @@
 	for (i = 0; i < num_font_languages; i++)
 	{
 		int k;
-		char *types [] = { "serif", "sans-serif", "cursive", "fantasy", "monospace" };
+		const char *types [] = { "serif", "sans-serif", "cursive", "fantasy", "monospace" };
 		char key[255];
 		char *info;
 		const char* language = font_languages[i].key;
@@ -614,7 +614,7 @@
 	g_slist_free(language_list);
 }
 
-static char *autodetect_charset_prefs[] =
+static const char *autodetect_charset_prefs[] =
 {
         "",
         "zh_parallel_state_machine",
diff -ur galeon-2.0.7.orig/mozilla/ProgressListener.h galeon-2.0.7/mozilla/ProgressListener.h
--- galeon-2.0.7.orig/mozilla/ProgressListener.h	2008-10-07 10:22:45.000000000 +0200
+++ galeon-2.0.7/mozilla/ProgressListener.h	2008-10-07 10:23:42.000000000 +0200
@@ -60,7 +60,7 @@
 #define G_PROGRESSDIALOG_CLASSNAME "Galeon's Download Progress Dialog"
 #define G_PROGRESSDIALOG_CONTRACTID "@mozilla.org/progressdialog;1"
 
-class GProgressListener : 
+class NS_COM_GLUE GProgressListener : 
 			  public nsITransfer,
  			  public nsSupportsWeakReference
 {
diff -ur galeon-2.0.7.orig/utils/galeon-sidebar.c galeon-2.0.7/utils/galeon-sidebar.c
--- galeon-2.0.7.orig/utils/galeon-sidebar.c	2008-10-07 10:22:45.000000000 +0200
+++ galeon-2.0.7/utils/galeon-sidebar.c	2008-10-07 10:23:42.000000000 +0200
@@ -304,7 +304,7 @@
 
         sidebar->priv->title_menu = gtk_menu_new ();
         g_object_ref (sidebar->priv->title_menu);
-        gtk_object_sink (GTK_OBJECT (sidebar->priv->title_menu));
+        g_object_ref_sink (sidebar->priv->title_menu);
         gtk_widget_show (sidebar->priv->title_button);
         gtk_widget_show (sidebar->priv->title_menu);
 
diff -ur galeon-2.0.7.orig/utils/gul-notebook.c galeon-2.0.7/utils/gul-notebook.c
--- galeon-2.0.7.orig/utils/gul-notebook.c	2008-10-07 10:22:45.000000000 +0200
+++ galeon-2.0.7/utils/gul-notebook.c	2008-10-07 10:23:42.000000000 +0200
@@ -77,7 +77,6 @@
 /* Local variables */
 static GdkCursor *cursor = NULL;
 static GList *notebooks  = NULL;
-static GtkTooltips *_gul_notebook_tooltips = NULL;
 
 
 /* Local functions */
@@ -662,15 +661,6 @@
 static void
 gul_notebook_init (GulNotebook *notebook)
 {
-	if (!_gul_notebook_tooltips)
-	{
-		_gul_notebook_tooltips = gtk_tooltips_new ();
-		g_object_add_weak_pointer (G_OBJECT (_gul_notebook_tooltips),
-					   (gpointer)&_gul_notebook_tooltips);
-	}
-	g_object_ref (_gul_notebook_tooltips);
-	gtk_object_sink (GTK_OBJECT (_gul_notebook_tooltips));
-
 	notebook->priv = g_new (GulNotebookPrivate, 1);
 
 	notebook->priv->drag_in_progress = FALSE;
@@ -706,8 +696,6 @@
 
 	g_free (notebook->priv);
 
-	g_object_unref (_gul_notebook_tooltips);
-
 	G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
@@ -794,7 +782,7 @@
 	rcstyle = gtk_rc_style_new ();
 	rcstyle->xthickness = rcstyle->ythickness = 0;
 	gtk_widget_modify_style (close_button, rcstyle);
-	gtk_rc_style_unref (rcstyle),
+	g_object_unref (rcstyle),
 
 	image = gtk_image_new_from_stock (GTK_STOCK_CLOSE,
 					  GTK_ICON_SIZE_MENU);
@@ -802,8 +790,7 @@
 	gtk_widget_set_size_request (close_button, size.width, size.height);
 	gtk_container_add (GTK_CONTAINER (close_button), image);
 
-	gtk_tooltips_set_tip (_gul_notebook_tooltips, close_button,
-			      _("Close this tab"), NULL);
+	gtk_widget_set_tooltip_text (close_button, _("Close this tab"));
 
 	/* setup label, need eventbox for tooltips and left-padding to get
 	 * comfortable space between the label and icon/tab border */
@@ -997,7 +984,7 @@
  	/* remove the tool tip for this ebox */
  	label = gtk_notebook_get_tab_label (GTK_NOTEBOOK (nb), child);
  	ebox = GTK_WIDGET (g_object_get_data (G_OBJECT (label), "label-ebox"));
- 	gtk_tooltips_set_tip (_gul_notebook_tooltips, ebox, NULL, NULL);
+ 	gtk_widget_set_tooltip_text (ebox, NULL);
  
 	/* If we don't clear the icon then for some reason it gets reset back
 	 * to an empty icon. This means that although gul_notebook_move_page() has
@@ -1052,7 +1039,7 @@
 
 	gtk_label_set_label (GTK_LABEL (label), title);
 	gtk_notebook_set_menu_label_text (GTK_NOTEBOOK (nb), child, short_title);
-	gtk_tooltips_set_tip (_gul_notebook_tooltips, ebox, title, NULL);
+	gtk_widget_set_tooltip_text (ebox, title);
 
 	g_free (short_title);
 }
diff -ur galeon-2.0.7.orig/utils/gul-toolbutton.c galeon-2.0.7/utils/gul-toolbutton.c
--- galeon-2.0.7.orig/utils/gul-toolbutton.c	2008-10-07 10:22:45.000000000 +0200
+++ galeon-2.0.7/utils/gul-toolbutton.c	2008-10-07 10:23:42.000000000 +0200
@@ -227,7 +227,7 @@
 
 	p->menu = gtk_menu_new ();
 	g_object_ref (p->menu);
-	gtk_object_sink (GTK_OBJECT (p->menu));
+	g_object_ref_sink (p->menu);
 
 	hbox = gtk_hbox_new (FALSE, 0);
 	gtk_widget_show (hbox);


Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/F-9/galeon.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- galeon.spec	4 Feb 2009 19:15:04 -0000	1.57
+++ galeon.spec	15 Feb 2009 09:43:21 -0000	1.58
@@ -3,19 +3,20 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.7
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
 Source0:	http://download.sourceforge.net/galeon/%{name}-%{version}%{?extraversion}.tar.bz2
 Patch0:		galeon-2.0.7-plugins.patch
-Patch4:		galeon-2.0.7-confignspr.patch
-Patch5:		galeon-2.0.7-print.patch
-Patch6:		galeon-2.0.7-dfltfont.patch
+Patch1:		galeon-2.0.7-confignspr.patch
+Patch2:		galeon-2.0.7-gtkprint.patch
+Patch3:		galeon-2.0.7-dfltfont.patch
+Patch4:		galeon-2.0.7-warnings.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 BuildRequires:	gettext desktop-file-utils
-BuildRequires:	gtk2-devel >= 2.4.0
+BuildRequires:	gtk2-devel >= 2.12.0
 BuildRequires:	gnome-desktop-devel
 BuildRequires:	gecko-devel >= %{gecko_ver}
 BuildRequires:	gecko-devel-unstable >= %{gecko_ver}
@@ -23,6 +24,7 @@
 BuildRequires:  perl(XML::Parser) scrollkeeper
 BuildRequires:  intltool
 BuildRequires:  nspr-devel
+BuildRequires:  gail-devel
 
 Requires: gecko-libs >= %{gecko_ver}
 
@@ -44,9 +46,10 @@
 %prep
 %setup -q -n %{name}-%{version}%{?extraversion}
 %patch0 -p1 -b .plugins
-%patch4 -p1 -b .confignspr
-%patch5 -p1 -b .print
-%patch6 -p1 -b .dfltfont
+%patch2 -p1 -b .gtkprint
+%patch1 -p1 -b .confignspr
+%patch3 -p1 -b .dfltfont
+%patch4 -p1 -b .warnings
 
 
 %build
@@ -121,6 +124,10 @@
 
 
 %changelog
+* Sun Feb 15 2009 Denis Leroy <denis at poolshark.org> - 2.0.7-6
+- Added upstream patch to use Gnome print support 
+- Added patch to fix compiler warnings
+
 * Wed Feb 04 2009 Christopher Aillon <caillon at redhat.com> - 2.0.7-5
 - Rebuild against newer gecko
 


--- galeon-2.0.7-print.patch DELETED ---




More information about the scm-commits mailing list