diff --git a/.cvsignore b/.cvsignore index 147d50d..2db0a0a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gtkhtml-3.23.90.tar.bz2 +gtkhtml-3.23.91.tar.bz2 diff --git a/gtkhtml-3.23.91-compiler-warnings.patch b/gtkhtml-3.23.91-compiler-warnings.patch new file mode 100644 index 0000000..01cad84 --- /dev/null +++ b/gtkhtml-3.23.91-compiler-warnings.patch @@ -0,0 +1,53 @@ +diff -up gtkhtml-3.23.91/gtkhtml/htmlpainter.c.compiler-warnings gtkhtml-3.23.91/gtkhtml/htmlpainter.c +--- gtkhtml-3.23.91/gtkhtml/htmlpainter.c.compiler-warnings 2008-04-11 07:14:42.000000000 -0400 ++++ gtkhtml-3.23.91/gtkhtml/htmlpainter.c 2008-09-01 08:42:45.000000000 -0400 +@@ -432,8 +432,8 @@ html_painter_calc_entries_size (HTMLPain + HTMLTextPangoInfo *pi, GList *glyphs, gint *line_offset, + gint *width, gint *asc, gint *dsc) + { +- HTMLFontFace *font_face; +- GtkHTMLFontStyle font_style; ++ HTMLFontFace *font_face = NULL; ++ GtkHTMLFontStyle font_style = GTK_HTML_FONT_STYLE_DEFAULT; + HTMLFont *font; + + g_return_if_fail (painter != NULL); +diff -up gtkhtml-3.23.91/gtkhtml/testgtkhtml.c.compiler-warnings gtkhtml-3.23.91/gtkhtml/testgtkhtml.c +--- gtkhtml-3.23.91/gtkhtml/testgtkhtml.c.compiler-warnings 2008-06-12 23:05:58.000000000 -0400 ++++ gtkhtml-3.23.91/gtkhtml/testgtkhtml.c 2008-09-01 08:44:44.000000000 -0400 +@@ -947,29 +947,30 @@ goto_url(const char *url, int back_or_fo + static void + bug_cb (GtkWidget *widget, gpointer data) + { +- gchar cwd[PATH_MAX], *filename, *url; ++ gchar *cwd, *filename, *url; + +- getcwd(cwd, sizeof (cwd)); ++ cwd = g_get_current_dir (); + filename = g_strdup_printf("%s/bugs.html", cwd); + url = g_filename_to_uri(filename, NULL, NULL); + goto_url(url, 0); + g_free(url); + g_free(filename); ++ g_free(cwd); + } + + static void + test_cb (GtkWidget *widget, gpointer data) + { +- gchar cwd[PATH_MAX], *filename, *url; ++ gchar *cwd, *filename, *url; + +- getcwd(cwd, sizeof (cwd)); ++ cwd = g_get_current_dir (); + filename = g_strdup_printf ("%s/tests/test%d.html", cwd, + GPOINTER_TO_INT (data)); + url = g_filename_to_uri (filename, NULL, NULL); +- + goto_url(url, 0); + g_free(url); + g_free(filename); ++ g_free(cwd); + } + + static void diff --git a/gtkhtml3.spec b/gtkhtml3.spec index 672579e..a139501 100644 --- a/gtkhtml3.spec +++ b/gtkhtml3.spec @@ -9,7 +9,7 @@ ### Abstract ### Name: gtkhtml3 -Version: 3.23.90 +Version: 3.23.91 Release: 1%{?dist} License: LGPLv2+ and GPLv2 Group: System Environment/Libraries @@ -22,6 +22,9 @@ BuildRoot: %{_tmppath}/gtkhtml-%{version}-root # Remove gnome-common macros from configure.in. Patch1: gtkhtml-3.13.1-no-gnome-common.patch +# Get -Werror to work +Patch2: gtkhtml-3.23.91-compiler-warnings.patch + ### Dependencies ### Requires: gnome-icon-theme >= %{gnome_icon_theme_version} @@ -59,6 +62,7 @@ Libraries and include files that can be used to develop GtkHTML applications. %prep %setup -q -n gtkhtml-%{version} %patch1 -p1 -b .no-gnome-common +%patch2 -p1 -b .compiler-warnings %build @@ -77,7 +81,8 @@ CFLAGS="$CFLAGS \ -DGDK_DISABLE_DEPRECATED=1 \ -DGNOME_DISABLE_DEPRECATED=1 \ -Wdeclaration-after-statement \ - -Werror-implicit-function-declaration" + -Werror-implicit-function-declaration \ + -Werror" %endif # Rerun the GNU "autotools" since we patched configure.in. @@ -122,6 +127,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/*.pc %changelog +* Mon Sep 01 2008 Matthew Barnes - 3.23.91-1.fc10 +- Update to 3.23.91 +- Add -Werror to CFLAGS. + * Wed Aug 20 2008 Matthew Barnes - 3.23.90-1.fc10 - Update to 3.23.90 diff --git a/sources b/sources index 82f22c6..7c36479 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fe4e8e988b6a3e448988bc0d838a97ca gtkhtml-3.23.90.tar.bz2 +3629ec4287a1778a9640cc3fe98c33cb gtkhtml-3.23.91.tar.bz2