rebuild against xulrunner

This commit is contained in:
Martin Stransky 2007-11-22 11:31:06 +00:00
parent d9c2bdcfaa
commit 61d1e587fa
2 changed files with 24 additions and 3 deletions

View File

@ -0,0 +1,16 @@
diff -up yelp-2.20.0/src/yelp-gecko-services.cpp.xl yelp-2.20.0/src/yelp-gecko-services.cpp
--- yelp-2.20.0/src/yelp-gecko-services.cpp.xl 2007-09-17 22:49:09.000000000 +0200
+++ yelp-2.20.0/src/yelp-gecko-services.cpp 2007-11-22 11:00:33.000000000 +0100
@@ -298,7 +298,11 @@ PrintListener::SetPrintSettings (YelpPri
target->SetPrintInColor (gtk_print_settings_get_use_color (settings->config));
target->SetPaperSizeUnit(nsIPrintSettings::kPaperSizeMillimeters);
- target->SetPaperSize (nsIPrintSettings::kPaperSizeDefined);
+#ifdef HAVE_GECKO_1_9
+ target->SetPaperSizeType(nsIPrintSettings::kPaperSizeDefined);
+#else
+ target->SetPaperSize(nsIPrintSettings::kPaperSizeDefined);
+#endif
GtkPaperSize *paperSize = gtk_page_setup_get_paper_size (settings->setup);
if (!paperSize) {

View File

@ -12,7 +12,7 @@
%define libxslt_version 1.1.4 %define libxslt_version 1.1.4
%define startup_notification_version 0.8 %define startup_notification_version 0.8
%define rarian_version 0.5.0 %define rarian_version 0.5.0
%define gecko_version 1.8.1.9 %define gecko_version 1.9
%define pango_version 1.0.99 %define pango_version 1.0.99
%define desktop_file_utils_version 0.3-7 %define desktop_file_utils_version 0.3-7
@ -20,7 +20,7 @@
Summary: A system documentation reader from the Gnome project Summary: A system documentation reader from the Gnome project
Name: yelp Name: yelp
Version: 2.20.0 Version: 2.20.0
Release: 7%{?dist} Release: 8%{?dist}
Source: http://ftp.gnome.org/pub/GNOME/sources/yelp/2.19/%{name}-%{version}.tar.bz2 Source: http://ftp.gnome.org/pub/GNOME/sources/yelp/2.19/%{name}-%{version}.tar.bz2
URL: http://live.gnome.org/Yelp URL: http://live.gnome.org/Yelp
# http://bugzilla.gnome.org/show_bug.cgi?id=319096 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
@ -33,6 +33,7 @@ Patch4: rarian-crash.patch
Patch5: search-crash.patch Patch5: search-crash.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=497559 # http://bugzilla.gnome.org/show_bug.cgi?id=497559
Patch6: hp.patch Patch6: hp.patch
Patch7: yelp-2.20.0-xulrunner.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=431077 # http://bugzilla.gnome.org/show_bug.cgi?id=431077
# XXX Does this no longer apply to yelp >= 2.19.1 ? # XXX Does this no longer apply to yelp >= 2.19.1 ?
@ -94,12 +95,13 @@ one central tool.
%patch4 -p1 -b .rarian-crash %patch4 -p1 -b .rarian-crash
%patch5 -p1 -b .search-crash %patch5 -p1 -b .search-crash
%patch6 -p1 -b .hp %patch6 -p1 -b .hp
%patch7 -p1 -b .xl
#%patch8 -p1 -b .posix-man #%patch8 -p1 -b .posix-man
%build %build
%configure \ %configure \
--enable-search \ --enable-search \
--with-mozilla=firefox \ --with-mozilla=xulrunner\
--enable-man \ --enable-man \
--enable-info \ --enable-info \
--disable-schemas-install --disable-schemas-install
@ -158,6 +160,9 @@ update-desktop-database &> /dev/null ||:
%{_datadir}/yelp %{_datadir}/yelp
%changelog %changelog
* Thu Nov 22 2007 Martin Stransky <stransky@redhat.com> - 2.20.0-8
- rebuild against xulrunner
* Fri Nov 16 2007 Matthias Clasen <mclasen@redhat.com> - 2.20.0-7 * Fri Nov 16 2007 Matthias Clasen <mclasen@redhat.com> - 2.20.0-7
- Handle .HP tags in man pages - Handle .HP tags in man pages