diff --git a/.gitignore b/.gitignore index 603a0f6..b9824f2 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /eom-1.12.0.tar.xz /eom-1.12.1.tar.xz /eom-1.12.2.tar.xz +/eom-1.14.1.tar.xz diff --git a/eom.spec b/eom.spec index 9b989ae..33f3bce 100644 --- a/eom.spec +++ b/eom.spec @@ -2,7 +2,7 @@ %global rel_build 1 # This is needed, because src-url contains branched part of versioning-scheme. -%global branch 1.12 +%global branch 1.14 # Settings used for build from snapshots. %{!?rel_build:%global commit 7ba7e03f4d5e2ecd3c77f9d9394521b7608ca05f} @@ -13,7 +13,7 @@ %{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz} Name: eom -Version: %{branch}.2 +Version: %{branch}.1 %if 0%{?rel_build} Release: 1%{?dist} %else @@ -29,6 +29,9 @@ URL: http://mate-desktop.org # Source for snapshot-builds. %{!?rel_build:Source0: http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}} +# https://github.com/mate-desktop/eom/pull/126 +Patch0: eom_Fix-the-zoom-and-scroll-performance.patch + BuildRequires: zlib-devel BuildRequires: cairo-gobject-devel BuildRequires: gtk2-devel @@ -77,6 +80,8 @@ Development files for eom %prep %setup -q%{!?rel_build:n %{name}-%{commit}} +%patch0 -p1 -b .scrolling + %if 0%{?rel_build} #NOCONFIGURE=1 ./autogen.sh %else # 0%{?rel_build} @@ -106,9 +111,6 @@ find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';' %find_lang %{name} --with-gnome --all-name -# remove needless gsettings convert file -rm -f $RPM_BUILD_ROOT%{_datadir}/MateConf/gsettings/eom.convert - %post /usr/bin/update-desktop-database &> /dev/null || : @@ -153,6 +155,10 @@ fi %changelog +* Sun Jun 12 2016 Wolfgang Ulbrich - 1.14.1-1 +- update to 1.14.1 release +- add upstream patch + * Fri Feb 19 2016 Wolfgang Ulbrich - 1.12.2-1 - update to 1.12.2 release diff --git a/eom_Fix-the-zoom-and-scroll-performance.patch b/eom_Fix-the-zoom-and-scroll-performance.patch new file mode 100644 index 0000000..b6920cb --- /dev/null +++ b/eom_Fix-the-zoom-and-scroll-performance.patch @@ -0,0 +1,19 @@ +diff --git a/src/eom-scroll-view.c b/src/eom-scroll-view.c +index 6d1b290..5ec6c57 100644 +--- a/src/eom-scroll-view.c ++++ b/src/eom-scroll-view.c +@@ -1355,9 +1355,10 @@ display_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer data) + cairo_scale (cr, priv->zoom, priv->zoom); + cairo_set_source_surface (cr, priv->surface, xofs/priv->zoom, yofs/priv->zoom); + cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_PAD); +- if ((is_zoomed_in (view) && priv->interp_type_in == CAIRO_FILTER_NEAREST) || +- (is_zoomed_out (view) && priv->interp_type_out == CAIRO_FILTER_NEAREST)) +- cairo_pattern_set_filter (cairo_get_source (cr), CAIRO_FILTER_NEAREST); ++ if (is_zoomed_in (view)) ++ cairo_pattern_set_filter (cairo_get_source (cr), priv->interp_type_in); ++ else if (is_zoomed_out (view)) ++ cairo_pattern_set_filter (cairo_get_source (cr), priv->interp_type_out); + cairo_paint (cr); + } + + diff --git a/sources b/sources index 1f62f40..2494ca6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bc8105d1f58477d02ab6732214c5ecf7 eom-1.12.2.tar.xz +2f812879081f1392e97dade169daa5ad eom-1.14.1.tar.xz