diff --git a/.gitignore b/.gitignore index 2c54e0a..b4ad850 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ evince-2.31.6.tar.bz2 /evince-2.31.90.tar.bz2 evince-2.31.92.tar.bz2 /evince-2.32.0.tar.bz2 +/evince-2.91.0.tar.bz2 diff --git a/evince-2.91.0-introspection-build-fix.patch b/evince-2.91.0-introspection-build-fix.patch new file mode 100644 index 0000000..34b41a9 --- /dev/null +++ b/evince-2.91.0-introspection-build-fix.patch @@ -0,0 +1,24 @@ +diff -up evince-2.91.0/libdocument/Makefile.am.gtk3-introspection evince-2.91.0/libdocument/Makefile.am +--- evince-2.91.0/libdocument/Makefile.am.gtk3-introspection 2010-09-28 04:25:31.000000000 -0400 ++++ evince-2.91.0/libdocument/Makefile.am 2010-10-04 17:44:49.037388415 -0400 +@@ -158,7 +158,7 @@ EvinceDocument-$(EV_API_VERSION).gir: li + --include=Gdk-2.0 \ + --include=GdkPixbuf-2.0 \ + --include=Gtk-2.0 \ +- --library=evdocument \ ++ --library=evdocument3 \ + --libtool="$(SAVED_LIBTOOL)" \ + --output $@ \ + --pkg evince-document-$(EV_API_VERSION) \ +diff -up evince-2.91.0/libview/Makefile.am.gtk3-introspection evince-2.91.0/libview/Makefile.am +--- evince-2.91.0/libview/Makefile.am.gtk3-introspection 2010-10-04 17:46:52.099042343 -0400 ++++ evince-2.91.0/libview/Makefile.am 2010-10-04 17:46:59.080625757 -0400 +@@ -131,7 +131,7 @@ EvinceView-$(EV_API_VERSION).gir: libevv + --include=GdkPixbuf-2.0 \ + --include=Gtk-2.0 \ + --include=EvinceDocument-$(EV_API_VERSION) \ +- --library=evview \ ++ --library=evview3 \ + --libtool="$(LIBTOOL)" \ + --output $@ \ + --pkg evince-document-$(EV_API_VERSION) \ diff --git a/evince.spec b/evince.spec index d53e8b5..08b10b4 100644 --- a/evince.spec +++ b/evince.spec @@ -4,17 +4,18 @@ %global theme_version 2.17.1 Name: evince -Version: 2.32.0 -Release: 2%{?dist} +Version: 2.91.0 +Release: 1%{?dist} Summary: Document viewer License: GPLv2+ and GFDL Group: Applications/Publishing URL: http://projects.gnome.org/evince/ -Source0: http://download.gnome.org/sources/%{name}/2.32/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/%{name}/2.91/%{name}-%{version}.tar.bz2 # https://bugzilla.redhat.com/show_bug.cgi?id=562648 Patch2: evince-t1font-mapping.patch -Patch4: gtk-build-fixes.patch +# https://bugzilla.gnome.org/show_bug.cgi?id=631360 +Patch3: evince-2.91.0-introspection-build-fix.patch BuildRequires: gtk3-devel BuildRequires: glib2-devel >= %{glib2_version} @@ -36,6 +37,8 @@ BuildRequires: intltool BuildRequires: t1lib-devel BuildRequires: GConf2-devel BuildRequires: gobject-introspection-devel +# For patch3 +BuildRequires: automake # for the nautilus properties page BuildRequires: nautilus-devel @@ -106,9 +109,10 @@ It adds an additional tab called "Document" to the file properties dialog. %prep %setup -q %patch2 -p1 -b .t1font-map -%patch4 -p1 -b .build-fixes +%patch3 -p1 -b .introspection-build-fix %build +automake %configure \ --disable-static \ --disable-scrollkeeper \ @@ -195,8 +199,8 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas ||: %files libs %defattr(-,root,root,-) %doc README COPYING NEWS AUTHORS -%{_libdir}/libevview.so.* -%{_libdir}/libevdocument.so.* +%{_libdir}/libevview3.so.* +%{_libdir}/libevdocument3.so.* %dir %{_libdir}/evince %dir %{_libdir}/evince/3 %dir %{_libdir}/evince/3/backends @@ -208,22 +212,22 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas ||: %{_libdir}/evince/3/backends/tiffdocument.evince-backend %{_libdir}/evince/3/backends/libcomicsdocument.so %{_libdir}/evince/3/backends/comicsdocument.evince-backend -%{_libdir}/girepository-1.0/EvinceDocument-2.32.typelib -%{_libdir}/girepository-1.0/EvinceView-2.32.typelib +%{_libdir}/girepository-1.0/EvinceDocument-3.0.typelib +%{_libdir}/girepository-1.0/EvinceView-3.0.typelib %files devel %defattr(-,root,root,-) %{_datadir}/gtk-doc/html/evince/ -%{_datadir}/gtk-doc/html/libevview-2.32 -%{_datadir}/gtk-doc/html/libevdocument-2.32 +%{_datadir}/gtk-doc/html/libevview-3.0 +%{_datadir}/gtk-doc/html/libevdocument-3.0 %dir %{_includedir}/evince -%{_includedir}/evince/2.32 -%{_libdir}/libevview.so -%{_libdir}/libevdocument.so -%{_libdir}/pkgconfig/evince-view-2.32.pc -%{_libdir}/pkgconfig/evince-document-2.32.pc -%{_datadir}/gir-1.0/EvinceDocument-2.32.gir -%{_datadir}/gir-1.0/EvinceView-2.32.gir +%{_includedir}/evince/3.0 +%{_libdir}/libevview3.so +%{_libdir}/libevdocument3.so +%{_libdir}/pkgconfig/evince-view-3.0.pc +%{_libdir}/pkgconfig/evince-document-3.0.pc +%{_datadir}/gir-1.0/EvinceDocument-3.0.gir +%{_datadir}/gir-1.0/EvinceView-3.0.gir %files dvi %defattr(-,root,root,-) @@ -240,6 +244,9 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas ||: %{_libdir}/nautilus/extensions-2.0/libevince-properties-page.so %changelog +* Mon Oct 4 2010 Owen Taylor - 2.91.0-1 +- Update to 2.91.0 so we can rebuild against current gtk3 + * Fri Oct 1 2010 Marek Kasik - 2.32.0-2 - Rebuild against newer poppler diff --git a/gtk-build-fixes.patch b/gtk-build-fixes.patch deleted file mode 100644 index 3cb9349..0000000 --- a/gtk-build-fixes.patch +++ /dev/null @@ -1,496 +0,0 @@ -diff --git a/cut-n-paste/totem-screensaver/totem-scrsaver.c b/cut-n-paste/totem-screensaver/totem-scrsaver.c -index c8dcc09..36d314e 100644 ---- a/cut-n-paste/totem-screensaver/totem-scrsaver.c -+++ b/cut-n-paste/totem-screensaver/totem-scrsaver.c -@@ -279,6 +279,7 @@ screensaver_finalize_dbus (TotemScrsaver *scr) - static void - screensaver_enable_x11 (TotemScrsaver *scr) - { -+ Display *xdisplay; - - #ifdef HAVE_XTEST - if (scr->priv->have_xtest != FALSE) -@@ -288,13 +289,14 @@ screensaver_enable_x11 (TotemScrsaver *scr) - } - #endif /* HAVE_XTEST */ - -- XLockDisplay (GDK_DISPLAY()); -- XSetScreenSaver (GDK_DISPLAY(), -+ xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); -+ XLockDisplay (xdisplay); -+ XSetScreenSaver (xdisplay, - scr->priv->timeout, - scr->priv->interval, - scr->priv->prefer_blanking, - scr->priv->allow_exposures); -- XUnlockDisplay (GDK_DISPLAY()); -+ XUnlockDisplay (xdisplay); - } - - #ifdef HAVE_XTEST -@@ -303,12 +305,15 @@ fake_event (TotemScrsaver *scr) - { - if (scr->priv->disabled) - { -- XLockDisplay (GDK_DISPLAY()); -- XTestFakeKeyEvent (GDK_DISPLAY(), *scr->priv->keycode, -+ Display *display; -+ -+ xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); -+ XLockDisplay (xdisplay); -+ XTestFakeKeyEvent (xdisplay, *scr->priv->keycode, - True, CurrentTime); -- XTestFakeKeyEvent (GDK_DISPLAY(), *scr->priv->keycode, -+ XTestFakeKeyEvent (xdisplay, *scr->priv->keycode, - False, CurrentTime); -- XUnlockDisplay (GDK_DISPLAY()); -+ XUnlockDisplay (xdisplay); - /* Swap the keycode */ - if (scr->priv->keycode == &scr->priv->keycode1) - scr->priv->keycode = &scr->priv->keycode2; -@@ -323,16 +328,19 @@ fake_event (TotemScrsaver *scr) - static void - screensaver_disable_x11 (TotemScrsaver *scr) - { -+ Display *xdisplay; -+ -+ xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); - - #ifdef HAVE_XTEST - if (scr->priv->have_xtest != FALSE) - { -- XLockDisplay (GDK_DISPLAY()); -- XGetScreenSaver(GDK_DISPLAY(), &scr->priv->timeout, -+ XLockDisplay (xdisplay); -+ XGetScreenSaver(xdisplay, &scr->priv->timeout, - &scr->priv->interval, - &scr->priv->prefer_blanking, - &scr->priv->allow_exposures); -- XUnlockDisplay (GDK_DISPLAY()); -+ XUnlockDisplay (xdisplay); - - if (scr->priv->timeout != 0) { - g_timeout_add_seconds (scr->priv->timeout / 2, -@@ -346,14 +354,14 @@ screensaver_disable_x11 (TotemScrsaver *scr) - } - #endif /* HAVE_XTEST */ - -- XLockDisplay (GDK_DISPLAY()); -- XGetScreenSaver(GDK_DISPLAY(), &scr->priv->timeout, -+ XLockDisplay (xdisplay); -+ XGetScreenSaver(xdisplay, &scr->priv->timeout, - &scr->priv->interval, - &scr->priv->prefer_blanking, - &scr->priv->allow_exposures); -- XSetScreenSaver(GDK_DISPLAY(), 0, 0, -+ XSetScreenSaver(xdisplay, 0, 0, - DontPreferBlanking, DontAllowExposures); -- XUnlockDisplay (GDK_DISPLAY()); -+ XUnlockDisplay (xdisplay); - } - - static void -@@ -361,25 +369,28 @@ screensaver_init_x11 (TotemScrsaver *scr) - { - #ifdef HAVE_XTEST - int a, b, c, d; -+ Display *display; -+ -+ xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); - -- XLockDisplay (GDK_DISPLAY()); -- scr->priv->have_xtest = (XTestQueryExtension (GDK_DISPLAY(), &a, &b, &c, &d) == True); -+ XLockDisplay (xdisplay); -+ scr->priv->have_xtest = (XTestQueryExtension (xdisplay, &a, &b, &c, &d) == True); - if (scr->priv->have_xtest != FALSE) - { -- scr->priv->keycode1 = XKeysymToKeycode (GDK_DISPLAY(), XK_Alt_L); -+ scr->priv->keycode1 = XKeysymToKeycode (xdisplay, XK_Alt_L); - if (scr->priv->keycode1 == 0) { - g_warning ("scr->priv->keycode1 not existant"); - } -- scr->priv->keycode2 = XKeysymToKeycode (GDK_DISPLAY(), XK_Alt_R); -+ scr->priv->keycode2 = XKeysymToKeycode (xdisplay, XK_Alt_R); - if (scr->priv->keycode2 == 0) { -- scr->priv->keycode2 = XKeysymToKeycode (GDK_DISPLAY(), XK_Alt_L); -+ scr->priv->keycode2 = XKeysymToKeycode (xdisplay, XK_Alt_L); - if (scr->priv->keycode2 == 0) { - g_warning ("scr->priv->keycode2 not existant"); - } - } - scr->priv->keycode = &scr->priv->keycode1; - } -- XUnlockDisplay (GDK_DISPLAY()); -+ XUnlockDisplay (xdisplay); - #endif /* HAVE_XTEST */ - } - -diff --git a/libview/ev-loading-window.c b/libview/ev-loading-window.c -index c04933b..e6d6ff2 100644 ---- a/libview/ev-loading-window.c -+++ b/libview/ev-loading-window.c -@@ -177,7 +177,12 @@ ev_loading_window_size_allocate (GtkWidget *widget, - GtkAllocation *allocation) - { - EvLoadingWindow *window = EV_LOADING_WINDOW (widget); -- GdkPixmap *mask; -+#if GTK_CHECK_VERSION (2, 90, 8) -+ cairo_surface_t *surface; -+ cairo_region_t *shape; -+#else -+ GdkPixmap *mask; -+#endif - cairo_t *cr; - double r; - -@@ -189,8 +194,15 @@ ev_loading_window_size_allocate (GtkWidget *widget, - window->width = allocation->width; - window->height = allocation->height; - -- mask = gdk_pixmap_new (NULL, window->width, window->height, 1); -- cr = gdk_cairo_create (GDK_DRAWABLE (mask)); -+#if GTK_CHECK_VERSION (2, 90, 8) -+ surface = cairo_image_surface_create (CAIRO_FORMAT_A8, -+ window->width, -+ window->height); -+ cr = cairo_create (surface); -+#else -+ mask = gdk_pixmap_new (NULL, window->width, window->height, 1); -+ cr = gdk_cairo_create (GDK_DRAWABLE (mask)); -+#endif - - cairo_save (cr); - cairo_rectangle (cr, 0, 0, window->width, window->height); -@@ -205,8 +217,16 @@ ev_loading_window_size_allocate (GtkWidget *widget, - - cairo_destroy (cr); - -+#if GTK_CHECK_VERSION (2, 90, 8) -+ shape = gdk_cairo_region_create_from_surface (surface); -+ cairo_surface_destroy (surface); -+ -+ gtk_widget_shape_combine_region (widget, shape); -+ cairo_region_destroy (shape); -+#else - gtk_widget_shape_combine_mask (widget, mask, 0, 0); - g_object_unref (mask); -+#endif - } - - static void -diff --git a/libview/ev-view-presentation.c b/libview/ev-view-presentation.c -index 0a11ce1..b522f44 100644 ---- a/libview/ev-view-presentation.c -+++ b/libview/ev-view-presentation.c -@@ -534,7 +534,7 @@ ev_view_presentation_previous_page (EvViewPresentation *pview) - - /* Goto Window */ - #define KEY_IS_NUMERIC(keyval) \ -- ((keyval >= GDK_0 && keyval <= GDK_9) || (keyval >= GDK_KP_0 && keyval <= GDK_KP_9)) -+ ((keyval >= GDK_KEY_0 && keyval <= GDK_KEY_9) || (keyval >= GDK_KEY_KP_0 && keyval <= GDK_KEY_KP_9)) - - /* Cut and paste from gtkwindow.c */ - static void -@@ -579,17 +579,17 @@ ev_view_presentation_goto_window_key_press_event (GtkWidget *widget, - EvViewPresentation *pview) - { - switch (event->keyval) { -- case GDK_Escape: -- case GDK_Tab: -- case GDK_KP_Tab: -- case GDK_ISO_Left_Tab: -+ case GDK_KEY_Escape: -+ case GDK_KEY_Tab: -+ case GDK_KEY_KP_Tab: -+ case GDK_KEY_ISO_Left_Tab: - ev_view_presentation_goto_window_hide (pview); - return TRUE; -- case GDK_Return: -- case GDK_KP_Enter: -- case GDK_ISO_Enter: -- case GDK_BackSpace: -- case GDK_Delete: -+ case GDK_KEY_Return: -+ case GDK_KEY_KP_Enter: -+ case GDK_KEY_ISO_Enter: -+ case GDK_KEY_BackSpace: -+ case GDK_KEY_Delete: - return FALSE; - default: - if (!KEY_IS_NUMERIC (event->keyval)) -@@ -1033,6 +1033,7 @@ ev_view_presentation_expose_event (GtkWidget *widget, - page_area.width--; - - ev_transition_animation_paint (pview->animation, cr, page_area); -+ - cairo_destroy (cr); - } - -@@ -1075,31 +1076,31 @@ ev_view_presentation_key_press_event (GtkWidget *widget, - return gtk_bindings_activate_event (GTK_OBJECT (widget), event); - - switch (event->keyval) { -- case GDK_b: -- case GDK_B: -- case GDK_period: -- case GDK_KP_Decimal: -+ case GDK_KEY_b: -+ case GDK_KEY_B: -+ case GDK_KEY_period: -+ case GDK_KEY_KP_Decimal: - if (pview->state == EV_PRESENTATION_BLACK) - ev_view_presentation_set_normal (pview); - else - ev_view_presentation_set_black (pview); - - return TRUE; -- case GDK_w: -- case GDK_W: -+ case GDK_KEY_w: -+ case GDK_KEY_W: - if (pview->state == EV_PRESENTATION_WHITE) - ev_view_presentation_set_normal (pview); - else - ev_view_presentation_set_white (pview); - - return TRUE; -- case GDK_Home: -+ case GDK_KEY_Home: - if (pview->state == EV_PRESENTATION_NORMAL) { - ev_view_presentation_update_current_page (pview, 0); - return TRUE; - } - break; -- case GDK_End: -+ case GDK_KEY_End: - if (pview->state == EV_PRESENTATION_NORMAL) { - gint page; - -@@ -1303,7 +1304,7 @@ add_change_page_binding_keypad (GtkBindingSet *binding_set, - GdkModifierType modifiers, - GtkScrollType scroll) - { -- guint keypad_keyval = keyval - GDK_Left + GDK_KP_Left; -+ guint keypad_keyval = keyval - GDK_KEY_Left + GDK_KEY_KP_Left; - - gtk_binding_entry_add_signal (binding_set, keyval, modifiers, - "change_page", 1, -@@ -1438,32 +1439,32 @@ ev_view_presentation_class_init (EvViewPresentationClass *klass) - G_TYPE_NONE); - - binding_set = gtk_binding_set_by_class (klass); -- add_change_page_binding_keypad (binding_set, GDK_Left, 0, GTK_SCROLL_PAGE_BACKWARD); -- add_change_page_binding_keypad (binding_set, GDK_Right, 0, GTK_SCROLL_PAGE_FORWARD); -- add_change_page_binding_keypad (binding_set, GDK_Up, 0, GTK_SCROLL_PAGE_BACKWARD); -- add_change_page_binding_keypad (binding_set, GDK_Down, 0, GTK_SCROLL_PAGE_FORWARD); -- gtk_binding_entry_add_signal (binding_set, GDK_space, 0, -+ add_change_page_binding_keypad (binding_set, GDK_KEY_Left, 0, GTK_SCROLL_PAGE_BACKWARD); -+ add_change_page_binding_keypad (binding_set, GDK_KEY_Right, 0, GTK_SCROLL_PAGE_FORWARD); -+ add_change_page_binding_keypad (binding_set, GDK_KEY_Up, 0, GTK_SCROLL_PAGE_BACKWARD); -+ add_change_page_binding_keypad (binding_set, GDK_KEY_Down, 0, GTK_SCROLL_PAGE_FORWARD); -+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_space, 0, - "change_page", 1, - GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_FORWARD); -- gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, 0, -+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_BackSpace, 0, - "change_page", 1, - GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_BACKWARD); -- gtk_binding_entry_add_signal (binding_set, GDK_Page_Down, 0, -+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Page_Down, 0, - "change_page", 1, - GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_FORWARD); -- gtk_binding_entry_add_signal (binding_set, GDK_Page_Up, 0, -+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Page_Up, 0, - "change_page", 1, - GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_BACKWARD); -- gtk_binding_entry_add_signal (binding_set, GDK_J, 0, -+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_J, 0, - "change_page", 1, - GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_FORWARD); -- gtk_binding_entry_add_signal (binding_set, GDK_H, 0, -+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_H, 0, - "change_page", 1, - GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_BACKWARD); -- gtk_binding_entry_add_signal (binding_set, GDK_L, 0, -+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_L, 0, - "change_page", 1, - GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_FORWARD); -- gtk_binding_entry_add_signal (binding_set, GDK_K, 0, -+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_K, 0, - "change_page", 1, - GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_BACKWARD); - } -diff --git a/libview/ev-view.c b/libview/ev-view.c -index 24710f9..0607771 100644 ---- a/libview/ev-view.c -+++ b/libview/ev-view.c -@@ -791,7 +791,7 @@ add_scroll_binding_keypad (GtkBindingSet *binding_set, - GtkScrollType scroll, - gboolean horizontal) - { -- guint keypad_keyval = keyval - GDK_Left + GDK_KP_Left; -+ guint keypad_keyval = keyval - GDK_KEY_Left + GDK_KEY_KP_Left; - - gtk_binding_entry_add_signal (binding_set, keyval, modifiers, - "binding_activated", 2, -@@ -4726,21 +4726,21 @@ ev_view_class_init (EvViewClass *class) - - binding_set = gtk_binding_set_by_class (class); - -- add_scroll_binding_keypad (binding_set, GDK_Left, 0, GTK_SCROLL_STEP_BACKWARD, TRUE); -- add_scroll_binding_keypad (binding_set, GDK_Right, 0, GTK_SCROLL_STEP_FORWARD, TRUE); -- add_scroll_binding_keypad (binding_set, GDK_Left, GDK_MOD1_MASK, GTK_SCROLL_STEP_DOWN, TRUE); -- add_scroll_binding_keypad (binding_set, GDK_Right, GDK_MOD1_MASK, GTK_SCROLL_STEP_UP, TRUE); -- add_scroll_binding_keypad (binding_set, GDK_Up, 0, GTK_SCROLL_STEP_BACKWARD, FALSE); -- add_scroll_binding_keypad (binding_set, GDK_Down, 0, GTK_SCROLL_STEP_FORWARD, FALSE); -- add_scroll_binding_keypad (binding_set, GDK_Up, GDK_MOD1_MASK, GTK_SCROLL_STEP_DOWN, FALSE); -- add_scroll_binding_keypad (binding_set, GDK_Down, GDK_MOD1_MASK, GTK_SCROLL_STEP_UP, FALSE); -- gtk_binding_entry_add_signal (binding_set, GDK_H, 0, "binding_activated", 2, GTK_TYPE_SCROLL_TYPE, -+ add_scroll_binding_keypad (binding_set, GDK_KEY_Left, 0, GTK_SCROLL_STEP_BACKWARD, TRUE); -+ add_scroll_binding_keypad (binding_set, GDK_KEY_Right, 0, GTK_SCROLL_STEP_FORWARD, TRUE); -+ add_scroll_binding_keypad (binding_set, GDK_KEY_Left, GDK_MOD1_MASK, GTK_SCROLL_STEP_DOWN, TRUE); -+ add_scroll_binding_keypad (binding_set, GDK_KEY_Right, GDK_MOD1_MASK, GTK_SCROLL_STEP_UP, TRUE); -+ add_scroll_binding_keypad (binding_set, GDK_KEY_Up, 0, GTK_SCROLL_STEP_BACKWARD, FALSE); -+ add_scroll_binding_keypad (binding_set, GDK_KEY_Down, 0, GTK_SCROLL_STEP_FORWARD, FALSE); -+ add_scroll_binding_keypad (binding_set, GDK_KEY_Up, GDK_MOD1_MASK, GTK_SCROLL_STEP_DOWN, FALSE); -+ add_scroll_binding_keypad (binding_set, GDK_KEY_Down, GDK_MOD1_MASK, GTK_SCROLL_STEP_UP, FALSE); -+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_H, 0, "binding_activated", 2, GTK_TYPE_SCROLL_TYPE, - GTK_SCROLL_STEP_BACKWARD, G_TYPE_BOOLEAN, TRUE); -- gtk_binding_entry_add_signal (binding_set, GDK_J, 0, "binding_activated", 2, GTK_TYPE_SCROLL_TYPE, -+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_J, 0, "binding_activated", 2, GTK_TYPE_SCROLL_TYPE, - GTK_SCROLL_STEP_FORWARD, G_TYPE_BOOLEAN, FALSE); -- gtk_binding_entry_add_signal (binding_set, GDK_K, 0, "binding_activated", 2, GTK_TYPE_SCROLL_TYPE, -+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_K, 0, "binding_activated", 2, GTK_TYPE_SCROLL_TYPE, - GTK_SCROLL_STEP_BACKWARD, G_TYPE_BOOLEAN, FALSE); -- gtk_binding_entry_add_signal (binding_set, GDK_L, 0, "binding_activated", 2, GTK_TYPE_SCROLL_TYPE, -+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_L, 0, "binding_activated", 2, GTK_TYPE_SCROLL_TYPE, - GTK_SCROLL_STEP_FORWARD, G_TYPE_BOOLEAN, TRUE); - - } -diff --git a/shell/eggfindbar.c b/shell/eggfindbar.c -index 9ddb2c0..f887a25 100644 ---- a/shell/eggfindbar.c -+++ b/shell/eggfindbar.c -@@ -181,25 +181,25 @@ egg_find_bar_class_init (EggFindBarClass *klass) - - binding_set = gtk_binding_set_by_class (klass); - -- gtk_binding_entry_add_signal (binding_set, GDK_Escape, 0, -+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Escape, 0, - "close", 0); - -- gtk_binding_entry_add_signal (binding_set, GDK_Up, 0, -+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Up, 0, - "scroll", 1, - GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_STEP_BACKWARD); -- gtk_binding_entry_add_signal (binding_set, GDK_Down, 0, -+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Down, 0, - "scroll", 1, - GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_STEP_FORWARD); -- gtk_binding_entry_add_signal (binding_set, GDK_Page_Up, 0, -+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Page_Up, 0, - "scroll", 1, - GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_BACKWARD); -- gtk_binding_entry_add_signal (binding_set, GDK_KP_Page_Up, 0, -+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Page_Up, 0, - "scroll", 1, - GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_BACKWARD); -- gtk_binding_entry_add_signal (binding_set, GDK_Page_Down, 0, -+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Page_Down, 0, - "scroll", 1, - GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_FORWARD); -- gtk_binding_entry_add_signal (binding_set, GDK_KP_Page_Down, 0, -+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Page_Down, 0, - "scroll", 1, - GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_FORWARD); - } -diff --git a/shell/ev-annotation-properties-dialog.c b/shell/ev-annotation-properties-dialog.c -index 0f5c6e1..68013f2 100644 ---- a/shell/ev-annotation-properties-dialog.c -+++ b/shell/ev-annotation-properties-dialog.c -@@ -139,7 +139,9 @@ ev_annotation_properties_dialog_init (EvAnnotationPropertiesDialog *annot_dialog - gtk_window_set_title (GTK_WINDOW (annot_dialog), _("Annotation Properties")); - gtk_window_set_destroy_with_parent (GTK_WINDOW (annot_dialog), TRUE); - gtk_container_set_border_width (GTK_CONTAINER (annot_dialog), 5); -+#if !GTK_CHECK_VERSION (2, 90, 7) - gtk_dialog_set_has_separator (dialog, FALSE); -+#endif - gtk_dialog_add_buttons (dialog, - GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, - GTK_STOCK_APPLY, GTK_RESPONSE_APPLY, -diff --git a/shell/ev-convert-metadata.c b/shell/ev-convert-metadata.c -index 52e59fc..44a71b7 100644 ---- a/shell/ev-convert-metadata.c -+++ b/shell/ev-convert-metadata.c -@@ -164,7 +164,7 @@ show_progress_dialog (ConvertData *data) - - dialog = gtk_dialog_new_with_buttons (_("Converting metadata"), - NULL, -- GTK_DIALOG_NO_SEPARATOR, -+ 0, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - NULL); - action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog)); -diff --git a/shell/ev-password-view.c b/shell/ev-password-view.c -index bb5ba31..6998b0b 100644 ---- a/shell/ev-password-view.c -+++ b/shell/ev-password-view.c -@@ -255,7 +255,9 @@ ev_password_view_ask_password (EvPasswordView *password_view) - action_area = gtk_dialog_get_action_area (dialog); - - /* Set the dialog up with HIG properties */ -- gtk_dialog_set_has_separator (dialog, FALSE); -+#if !GTK_CHECK_VERSION (2, 90, 7) -+ gtk_dialog_set_has_separator (dialog, FALSE); -+#endif - gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); - gtk_box_set_spacing (GTK_BOX (content_area), 2); /* 2 * 5 + 2 = 12 */ - gtk_container_set_border_width (GTK_CONTAINER (action_area), 5); -diff --git a/shell/ev-properties-dialog.c b/shell/ev-properties-dialog.c -index e3785bf..dac890b 100644 ---- a/shell/ev-properties-dialog.c -+++ b/shell/ev-properties-dialog.c -@@ -61,7 +61,9 @@ ev_properties_dialog_init (EvPropertiesDialog *properties) - - gtk_window_set_title (GTK_WINDOW (properties), _("Properties")); - gtk_window_set_destroy_with_parent (GTK_WINDOW (properties), TRUE); -- gtk_dialog_set_has_separator (GTK_DIALOG (properties), FALSE); -+#if !GTK_CHECK_VERSION (2, 90, 7) -+ gtk_dialog_set_has_separator (GTK_DIALOG (properties), FALSE); -+#endif - gtk_container_set_border_width (GTK_CONTAINER (properties), 5); - gtk_box_set_spacing (content_area, 2); - -diff --git a/shell/ev-sidebar.c b/shell/ev-sidebar.c -index 1a2c660..cf5f2a3 100644 ---- a/shell/ev-sidebar.c -+++ b/shell/ev-sidebar.c -@@ -261,10 +261,10 @@ ev_sidebar_select_button_key_press_cb (GtkWidget *widget, - { - EvSidebar *ev_sidebar = EV_SIDEBAR (user_data); - -- if (event->keyval == GDK_space || -- event->keyval == GDK_KP_Space || -- event->keyval == GDK_Return || -- event->keyval == GDK_KP_Enter) { -+ if (event->keyval == GDK_KEY_space || -+ event->keyval == GDK_KEY_KP_Space || -+ event->keyval == GDK_KEY_Return || -+ event->keyval == GDK_KEY_KP_Enter) { - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE); - gtk_menu_popup (GTK_MENU (ev_sidebar->priv->menu), - NULL, NULL, ev_sidebar_menu_position_under, widget, -diff --git a/shell/ev-window.c b/shell/ev-window.c -index 9aa3926..01c5e9f 100644 ---- a/shell/ev-window.c -+++ b/shell/ev-window.c -@@ -4211,7 +4211,9 @@ ev_window_cmd_edit_toolbar (GtkAction *action, EvWindow *ev_window) - gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE); - gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)), 5); - gtk_box_set_spacing (GTK_BOX (content_area), 2); -+#if !GTK_CHECK_VERSION (2, 90, 7) - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); -+#endif - gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 400); - - toolbar = EGG_EDITABLE_TOOLBAR (ev_window->priv->toolbar); diff --git a/sources b/sources index ecc6daf..9935d3e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ebc3ce6df8dcbf29cb9492f8dd031319 evince-2.32.0.tar.bz2 +b5a615aa44dc7cdd39859c203a2da7f7 evince-2.91.0.tar.bz2