From 5358892233fba98a675cfc2306e283b73909466a Mon Sep 17 00:00:00 2001 From: raveit65 Date: May 13 2018 10:22:31 +0000 Subject: libpeas-loader-python3 for all branches and a fix for using HIDPI --- diff --git a/eom.spec b/eom.spec index 7b1ba4a..dca2b4f 100644 --- a/eom.spec +++ b/eom.spec @@ -15,7 +15,7 @@ Name: eom Version: %{branch}.0 %if 0%{?rel_build} -Release: 2%{?dist} +Release: 3%{?dist} %else Release: 0.5%{?git_rel}%{?dist} %endif @@ -29,8 +29,12 @@ 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/163 +# https://github.com/mate-desktop/eom/commit/530d7cb Patch1: eom_0001-Scale-HiDPI-images-correctly.patch +# https://github.com/mate-desktop/eom/commit/c94e091 +Patch2: eom_0001-plugins-Use-Python-3.x-for-Python-plugins.patch +# https://github.com/mate-desktop/eom/pull/166 +Patch3: eom_0001-svg-Fix-offset-coordinates-when-transforming-SVG-ima.patch BuildRequires: mate-common BuildRequires: zlib-devel @@ -51,7 +55,7 @@ BuildRequires: desktop-file-utils Requires: mate-desktop-libs # libpeas isn't splited in rhel7 %if 0%{?fedora} -Requires: libpeas-loader-python +Requires: libpeas-loader-python3 %endif %description @@ -129,6 +133,12 @@ find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';' %changelog +* Sun May 13 2018 Wolfgang Ulbrich - 1.20.0-3 +- Fix offset coordinates when transforming SVG images on HiDPI +- https://github.com/mate-desktop/eom/commit/530d7cb +- use libpeas-loader-python3 for all branches +- https://github.com/mate-desktop/eom/commit/c94e091 + * Wed Apr 25 2018 Wolfgang Ulbrich - 1.20.0-2 - Scale images correctly with HIDPI - drop IconCache scriptlet diff --git a/eom_0001-plugins-Use-Python-3.x-for-Python-plugins.patch b/eom_0001-plugins-Use-Python-3.x-for-Python-plugins.patch new file mode 100644 index 0000000..6a54d3d --- /dev/null +++ b/eom_0001-plugins-Use-Python-3.x-for-Python-plugins.patch @@ -0,0 +1,25 @@ +From f6c4234d9efe39fbab7fad92a44619589bf27f1b Mon Sep 17 00:00:00 2001 +From: Felix Riemann +Date: Tue, 7 Jan 2014 23:07:26 +0100 +Subject: [PATCH] plugins: Use Python 3.x for Python plugins + +--- + src/eom-plugin-engine.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/eom-plugin-engine.c b/src/eom-plugin-engine.c +index 48d960d..534b28c 100644 +--- a/src/eom-plugin-engine.c ++++ b/src/eom-plugin-engine.c +@@ -120,7 +120,7 @@ eom_plugin_engine_new (void) + + engine = EOM_PLUGIN_ENGINE (g_object_new (EOM_TYPE_PLUGIN_ENGINE, NULL)); + +- peas_engine_enable_loader (PEAS_ENGINE (engine), "python"); ++ peas_engine_enable_loader (PEAS_ENGINE (engine), "python3"); + + user_plugin_path = g_build_filename (eom_util_dot_dir (), + USER_EOM_PLUGINS_LOCATION, NULL); +-- +2.17.0 + diff --git a/eom_0001-svg-Fix-offset-coordinates-when-transforming-SVG-ima.patch b/eom_0001-svg-Fix-offset-coordinates-when-transforming-SVG-ima.patch new file mode 100644 index 0000000..c960775 --- /dev/null +++ b/eom_0001-svg-Fix-offset-coordinates-when-transforming-SVG-ima.patch @@ -0,0 +1,49 @@ +From f2948baddf06d4d880be6cc6dcc2f40f562b65d3 Mon Sep 17 00:00:00 2001 +From: Victor Kareh +Date: Wed, 2 May 2018 13:43:06 -0400 +Subject: [PATCH] svg: Fix offset coordinates when transforming SVG images on + HiDPI displays + +--- + src/eom-scroll-view.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/src/eom-scroll-view.c b/src/eom-scroll-view.c +index a461b67..7307368 100644 +--- a/src/eom-scroll-view.c ++++ b/src/eom-scroll-view.c +@@ -1273,17 +1273,17 @@ display_draw (GtkWidget *widget, cairo_t *cr, gpointer data) + switch (eom_transform_get_transform_type (transform)) { + case EOM_TRANSFORM_ROT_90: + case EOM_TRANSFORM_FLIP_HORIZONTAL: +- image_offset_x = (double) gdk_pixbuf_get_width (priv->pixbuf) / priv->scale; ++ image_offset_x = (double) gdk_pixbuf_get_width (priv->pixbuf); + break; + case EOM_TRANSFORM_ROT_270: + case EOM_TRANSFORM_FLIP_VERTICAL: +- image_offset_y = (double) gdk_pixbuf_get_height (priv->pixbuf) / priv->scale; ++ image_offset_y = (double) gdk_pixbuf_get_height (priv->pixbuf); + break; + case EOM_TRANSFORM_ROT_180: + case EOM_TRANSFORM_TRANSPOSE: + case EOM_TRANSFORM_TRANSVERSE: +- image_offset_x = (double) gdk_pixbuf_get_width (priv->pixbuf) / priv->scale; +- image_offset_y = (double) gdk_pixbuf_get_height (priv->pixbuf) / priv->scale; ++ image_offset_x = (double) gdk_pixbuf_get_width (priv->pixbuf); ++ image_offset_y = (double) gdk_pixbuf_get_height (priv->pixbuf); + break; + case EOM_TRANSFORM_NONE: + default: +@@ -1292,7 +1292,8 @@ display_draw (GtkWidget *widget, cairo_t *cr, gpointer data) + cairo_matrix_init_translate (&translate, image_offset_x, image_offset_y); + cairo_matrix_multiply (&matrix, &matrix, &translate); + } +- cairo_matrix_init_scale (&scale, priv->zoom, priv->zoom); ++ /* Zoom factor for SVGs is already scaled, so scale back to application pixels. */ ++ cairo_matrix_init_scale (&scale, priv->zoom / priv->scale, priv->zoom / priv->scale); + cairo_matrix_multiply (&matrix, &matrix, &scale); + cairo_matrix_init_translate (&translate, xofs, yofs); + cairo_matrix_multiply (&matrix, &matrix, &translate); +-- +2.17.0 +