Hello community, here is the log from the commit of package eom for openSUSE:Factory checked in at 2016-02-22 08:58:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/eom (Old) and /work/SRC/openSUSE:Factory/.eom.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "eom" Changes: -------- --- /work/SRC/openSUSE:Factory/eom/eom.changes 2015-12-21 12:05:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.eom.new/eom.changes 2016-02-22 08:58:09.000000000 +0100 @@ -1,0 +2,11 @@ +Thu Feb 18 17:54:13 UTC 2016 - sor.ale...@meowr.ru + +- Update to 1.12.2: + * Print preview: avoid integer overflow when allocating a large + block of memory. + * Fix build with introspection enabled. + * Fix GTK+3 build when --without-cms is set. + * Some more fixes. +- Remove eom-fix-introspection.patch: merged upstream. + +------------------------------------------------------------------- Old: ---- eom-1.12.1.tar.xz eom-fix-introspection.patch New: ---- eom-1.12.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ eom.spec ++++++ --- /var/tmp/diff_new_pack.oANJlg/_old 2016-02-22 08:58:10.000000000 +0100 +++ /var/tmp/diff_new_pack.oANJlg/_new 2016-02-22 08:58:10.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package eom # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,15 +19,13 @@ %define typelib typelib-1_0-Eom-1_0 %define _version 1.12 Name: eom -Version: 1.12.1 +Version: 1.12.2 Release: 0 Summary: MATE Desktop graphics viewer License: GPL-2.0+ and LGPL-2.1+ Group: System/GUI/Other Url: http://mate-desktop.org/ Source: http://pub.mate-desktop.org/releases/%{_version}/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM eom-fix-introspection.patch -- Fix compilation with GObject Introspection enabled. -Patch0: %{name}-fix-introspection.patch BuildRequires: hicolor-icon-theme BuildRequires: libjpeg-devel BuildRequires: libxml2-python @@ -67,6 +65,7 @@ Summary: MATE Desktop graphics viewer development files Group: Development/Tools/Other Requires: %{name} = %{version} +# mate-image-viewer-devel was last used in openSUSE 13.1. Provides: mate-image-viewer-devel = %{version} Obsoletes: mate-image-viewer-devel < %{version} @@ -88,7 +87,6 @@ %prep %setup -q -%patch0 -p1 %build NOCONFIGURE=1 mate-autogen ++++++ eom-1.12.1.tar.xz -> eom-1.12.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eom-1.12.1/NEWS new/eom-1.12.2/NEWS --- old/eom-1.12.1/NEWS 2015-12-07 09:01:33.000000000 +0100 +++ new/eom-1.12.2/NEWS 2016-02-15 14:19:28.000000000 +0100 @@ -1,3 +1,12 @@ +eom 1.12.2 +========== + + * Print preview: avoid integer overflow when allocating a large + block of memory + * Fix build with introspection enabled + * Fix GTK+3 build when --without-cms is set + * Some more fixes + eom 1.12.1 ========== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eom-1.12.1/aclocal.m4 new/eom-1.12.2/aclocal.m4 --- old/eom-1.12.1/aclocal.m4 2015-12-07 09:03:54.000000000 +0100 +++ new/eom-1.12.2/aclocal.m4 2016-02-15 14:20:15.000000000 +0100 @@ -693,7 +693,7 @@ DISABLE_DEPRECATED="" if test $USE_MAINTAINER_MODE = yes; then - DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK MATECONF MATECOMPONENT MATECOMPONENT_UI MATE LIBGLADE VTE MATE_VFS WNCK LIBSOUP" + DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK MATE LIBGLADE VTE WNCK LIBSOUP" for DOMAIN in $DOMAINS; do DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES" done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eom-1.12.1/configure new/eom-1.12.2/configure --- old/eom-1.12.1/configure 2015-12-07 09:03:55.000000000 +0100 +++ new/eom-1.12.2/configure 2016-02-15 14:20:15.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for eom 1.12.1. +# Generated by GNU Autoconf 2.69 for eom 1.12.2. # # Report bugs to <http://www.mate-desktop.org>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='eom' PACKAGE_TARNAME='eom' -PACKAGE_VERSION='1.12.1' -PACKAGE_STRING='eom 1.12.1' +PACKAGE_VERSION='1.12.2' +PACKAGE_STRING='eom 1.12.2' PACKAGE_BUGREPORT='http://www.mate-desktop.org' PACKAGE_URL='' @@ -1525,7 +1525,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures eom 1.12.1 to adapt to many kinds of systems. +\`configure' configures eom 1.12.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1599,7 +1599,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of eom 1.12.1:";; + short | recursive ) echo "Configuration of eom 1.12.2:";; esac cat <<\_ACEOF @@ -1769,7 +1769,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -eom configure 1.12.1 +eom configure 1.12.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2138,7 +2138,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by eom $as_me 1.12.1, which was +It was created by eom $as_me 1.12.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3001,7 +3001,7 @@ # Define the identity of the package. PACKAGE='eom' - VERSION='1.12.1' + VERSION='1.12.2' cat >>confdefs.h <<_ACEOF @@ -3147,9 +3147,9 @@ EOM_MINOR_VERSION=12 -$as_echo "#define EOM_MICRO_VERSION 1" >>confdefs.h +$as_echo "#define EOM_MICRO_VERSION 2" >>confdefs.h -EOM_MICRO_VERSION=1 +EOM_MICRO_VERSION=2 EOM_API_VERSION=2.20 @@ -3197,7 +3197,7 @@ DISABLE_DEPRECATED="" if test $USE_MAINTAINER_MODE = yes; then - DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK MATECONF MATECOMPONENT MATECOMPONENT_UI MATE LIBGLADE VTE MATE_VFS WNCK LIBSOUP" + DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK MATE LIBGLADE VTE WNCK LIBSOUP" for DOMAIN in $DOMAINS; do DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES" done @@ -15263,6 +15263,15 @@ have_introspection=no fi + if test "x$have_introspection" = xyes; then + HAVE_INTROSPECTION_TRUE= + HAVE_INTROSPECTION_FALSE='#' +else + HAVE_INTROSPECTION_TRUE='#' + HAVE_INTROSPECTION_FALSE= +fi + + # *************** # ZLIB (required) # *************** @@ -16324,9 +16333,13 @@ # ******************************************************* # Check GDK rendering target -gdk_target=`$PKG_CONFIG --variable=target gdk-${GTK_API_VERSION}` +if test "${GTK_API_VERSION}" = "2.0" ; then + gdk_target_has_x11=`$PKG_CONFIG --variable=target gdk-${GTK_API_VERSION} | grep x11` +else + gdk_target_has_x11=`$PKG_CONFIG --variable=targets gdk-${GTK_API_VERSION} | grep x11` +fi -if test "x$have_lcms" = "xyes" || test "$gdk_target" = "x11"; then +if test "x$have_lcms" = "xyes" || test "$gdk_target_has_x11" != ""; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11" >&5 @@ -18089,6 +18102,10 @@ as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}"; then + as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${HAVE_EXIF_TRUE}" && test -z "${HAVE_EXIF_FALSE}"; then as_fn_error $? "conditional \"HAVE_EXIF\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -18518,7 +18535,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by eom $as_me 1.12.1, which was +This file was extended by eom $as_me 1.12.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18584,7 +18601,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -eom config.status 1.12.1 +eom config.status 1.12.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eom-1.12.1/configure.ac new/eom-1.12.2/configure.ac --- old/eom-1.12.1/configure.ac 2015-12-07 09:00:05.000000000 +0100 +++ new/eom-1.12.2/configure.ac 2016-02-15 12:40:11.000000000 +0100 @@ -3,7 +3,7 @@ m4_define(eom_major_version, 1) m4_define(eom_minor_version, 12) -m4_define(eom_micro_version, 1) +m4_define(eom_micro_version, 2) m4_define(eom_version, eom_major_version.eom_minor_version.eom_micro_version) AC_INIT([eom], eom_version, [http://www.mate-desktop.org], [eom]) @@ -142,6 +142,8 @@ have_introspection=no fi +AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$have_introspection" = xyes) + # *************** # ZLIB (required) # *************** @@ -343,9 +345,13 @@ # ******************************************************* # Check GDK rendering target -gdk_target=`$PKG_CONFIG --variable=target gdk-${GTK_API_VERSION}` +if test "${GTK_API_VERSION}" = "2.0" ; then + gdk_target_has_x11=`$PKG_CONFIG --variable=target gdk-${GTK_API_VERSION} | grep x11` +else + gdk_target_has_x11=`$PKG_CONFIG --variable=targets gdk-${GTK_API_VERSION} | grep x11` +fi -if test "x$have_lcms" = "xyes" || test "$gdk_target" = "x11"; then +if test "x$have_lcms" = "xyes" || test "$gdk_target_has_x11" != ""; then PKG_CHECK_MODULES(X11, [x11], have_x11=yes, have_x11=no) if test "x$have_x11" != "xyes"; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eom-1.12.1/doc/reference/html/api-index.html new/eom-1.12.2/doc/reference/html/api-index.html --- old/eom-1.12.1/doc/reference/html/api-index.html 2015-12-07 09:04:28.000000000 +0100 +++ new/eom-1.12.2/doc/reference/html/api-index.html 2016-02-15 14:20:53.000000000 +0100 @@ -243,11 +243,11 @@ <dd></dd> <a name="idxD"></a><h3 class="title">D</h3> <dt> -<a class="link" href="eom-eom-debug.html#EomDebug" title="enum EomDebug">EomDebug</a>, enum in <a class="link" href="eom-eom-debug.html" title="eom-debug">eom-debug</a> +<a class="link" href="eom-eom-debug.html#eom-debug" title="eom_debug ()">eom_debug</a>, function in <a class="link" href="eom-eom-debug.html" title="eom-debug">eom-debug</a> </dt> <dd></dd> <dt> -<a class="link" href="eom-eom-debug.html#eom-debug" title="eom_debug ()">eom_debug</a>, function in <a class="link" href="eom-eom-debug.html" title="eom-debug">eom-debug</a> +<a class="link" href="eom-eom-debug.html#EomDebug" title="enum EomDebug">EomDebug</a>, enum in <a class="link" href="eom-eom-debug.html" title="eom-debug">eom-debug</a> </dt> <dd></dd> <dt> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eom-1.12.1/doc/reference/html/index.html new/eom-1.12.2/doc/reference/html/index.html --- old/eom-1.12.1/doc/reference/html/index.html 2015-12-07 09:04:28.000000000 +0100 +++ new/eom-1.12.2/doc/reference/html/index.html 2016-02-15 14:20:53.000000000 +0100 @@ -15,7 +15,7 @@ <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">Eye of MATE Reference Manual</p></th></tr></table></div> <div><p class="releaseinfo"> - for Eye of MATE 1.12.1 + for Eye of MATE 1.12.2 </p></div> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eom-1.12.1/doc/reference/version.xml new/eom-1.12.2/doc/reference/version.xml --- old/eom-1.12.1/doc/reference/version.xml 2015-12-07 09:04:02.000000000 +0100 +++ new/eom-1.12.2/doc/reference/version.xml 2016-02-15 14:20:22.000000000 +0100 @@ -1 +1 @@ -1.12.1 +1.12.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eom-1.12.1/src/eom-close-confirmation-dialog.c new/eom-1.12.2/src/eom-close-confirmation-dialog.c --- old/eom-1.12.1/src/eom-close-confirmation-dialog.c 2015-10-05 12:12:51.000000000 +0200 +++ new/eom-1.12.2/src/eom-close-confirmation-dialog.c 2016-02-09 13:07:31.000000000 +0100 @@ -399,7 +399,7 @@ /* Image */ image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_DIALOG); -#if GTK_CHECK_VERSION (3, 14, 0) +#if GTK_CHECK_VERSION (3, 0, 0) gtk_widget_set_valign (image, GTK_ALIGN_START); #else gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0); @@ -409,8 +409,8 @@ primary_label = gtk_label_new (NULL); gtk_label_set_line_wrap (GTK_LABEL (primary_label), TRUE); gtk_label_set_use_markup (GTK_LABEL (primary_label), TRUE); -#if GTK_CHECK_VERSION (3, 14, 0) - gtk_widget_set_halign (primary_label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (primary_label), 0.0); #else gtk_misc_set_alignment (GTK_MISC (primary_label), 0.0, 0.5); #endif @@ -432,8 +432,8 @@ secondary_label = gtk_label_new (str); g_free (str); gtk_label_set_line_wrap (GTK_LABEL (secondary_label), TRUE); -#if GTK_CHECK_VERSION (3, 14, 0) - gtk_widget_set_halign (secondary_label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (secondary_label), 0.0); #else gtk_misc_set_alignment (GTK_MISC (secondary_label), 0.0, 0.5); #endif @@ -603,7 +603,7 @@ /* Image */ image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_DIALOG); -#if GTK_CHECK_VERSION (3, 14, 0) +#if GTK_CHECK_VERSION (3, 0, 0) gtk_widget_set_valign (image, GTK_ALIGN_START); #else gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0); @@ -617,8 +617,8 @@ primary_label = gtk_label_new (NULL); gtk_label_set_line_wrap (GTK_LABEL (primary_label), TRUE); gtk_label_set_use_markup (GTK_LABEL (primary_label), TRUE); -#if GTK_CHECK_VERSION (3, 14, 0) - gtk_widget_set_halign (primary_label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (primary_label), 0.0); #else gtk_misc_set_alignment (GTK_MISC (primary_label), 0.0, 0.5); #endif @@ -646,8 +646,8 @@ gtk_box_pack_start (GTK_BOX (vbox2), select_label, FALSE, FALSE, 0); gtk_label_set_line_wrap (GTK_LABEL (select_label), TRUE); -#if GTK_CHECK_VERSION (3, 14, 0) - gtk_widget_set_halign (select_label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (select_label), 0.0); #else gtk_misc_set_alignment (GTK_MISC (select_label), 0.0, 0.5); #endif @@ -669,8 +669,8 @@ gtk_box_pack_start (GTK_BOX (vbox2), secondary_label, FALSE, FALSE, 0); gtk_label_set_line_wrap (GTK_LABEL (secondary_label), TRUE); -#if GTK_CHECK_VERSION (3, 14, 0) - gtk_widget_set_halign (secondary_label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (secondary_label), 0.0); #else gtk_misc_set_alignment (GTK_MISC (secondary_label), 0, 0.5); #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eom-1.12.1/src/eom-error-message-area.c new/eom-1.12.2/src/eom-error-message-area.c --- old/eom-1.12.1/src/eom-error-message-area.c 2015-10-05 12:12:51.000000000 +0200 +++ new/eom-1.12.2/src/eom-error-message-area.c 2016-02-09 13:07:31.000000000 +0100 @@ -59,7 +59,7 @@ image = gtk_image_new_from_stock (icon_stock_id, GTK_ICON_SIZE_DIALOG); gtk_widget_show (image); gtk_box_pack_start (GTK_BOX (hbox_content), image, FALSE, FALSE, 0); -#if GTK_CHECK_VERSION (3, 14, 0) +#if GTK_CHECK_VERSION (3, 0, 0) gtk_widget_set_valign (image, GTK_ALIGN_START); #else gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0); @@ -78,10 +78,10 @@ gtk_box_pack_start (GTK_BOX (vbox), primary_label, TRUE, TRUE, 0); gtk_label_set_use_markup (GTK_LABEL (primary_label), TRUE); gtk_label_set_line_wrap (GTK_LABEL (primary_label), FALSE); -#if GTK_CHECK_VERSION (3, 14, 0) - gtk_widget_set_halign (primary_label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (primary_label), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (primary_label), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (primary_label), 0.0, 0.5); #endif gtk_widget_set_can_focus (primary_label, TRUE); @@ -103,10 +103,10 @@ gtk_label_set_use_markup (GTK_LABEL (secondary_label), TRUE); gtk_label_set_line_wrap (GTK_LABEL (secondary_label), TRUE); gtk_label_set_selectable (GTK_LABEL (secondary_label), TRUE); -#if GTK_CHECK_VERSION (3, 14, 0) - gtk_widget_set_halign (secondary_label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (secondary_label), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (secondary_label), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (secondary_label), 0.0, 0.5); #endif } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eom-1.12.1/src/eom-image-jpeg.c new/eom-1.12.2/src/eom-image-jpeg.c --- old/eom-1.12.1/src/eom-image-jpeg.c 2015-09-25 16:11:51.000000000 +0200 +++ new/eom-1.12.2/src/eom-image-jpeg.c 2016-02-10 13:18:09.000000000 +0100 @@ -121,6 +121,8 @@ g_return_if_fail (EOM_IS_IMAGE (image)); + memset (info, 0x0, sizeof (jpeg_transform_info)); + priv = image->priv; if (priv->trans != NULL && priv->trans_autorotate != NULL) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eom-1.12.1/src/eom-plugin-manager.c new/eom-1.12.2/src/eom-plugin-manager.c --- old/eom-1.12.1/src/eom-plugin-manager.c 2015-12-07 08:58:54.000000000 +0100 +++ new/eom-1.12.2/src/eom-plugin-manager.c 2016-02-15 12:39:55.000000000 +0100 @@ -835,8 +835,8 @@ gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); -#if GTK_CHECK_VERSION (3, 14, 0) - gtk_widget_set_halign (label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (label), 0.0); #else gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eom-1.12.1/src/eom-print-image-setup.c new/eom-1.12.2/src/eom-print-image-setup.c --- old/eom-1.12.1/src/eom-print-image-setup.c 2015-10-05 12:12:51.000000000 +0200 +++ new/eom-1.12.2/src/eom-print-image-setup.c 2016-02-09 13:07:31.000000000 +0100 @@ -656,7 +656,7 @@ gchar *bold_text; label_widget = gtk_label_new (""); -#if GTK_CHECK_VERSION (3, 14, 0) +#if GTK_CHECK_VERSION (3, 0, 0) gtk_widget_set_halign (label_widget, GTK_ALIGN_START); #else gtk_misc_set_alignment (GTK_MISC (label_widget), 0.0, 0.5); @@ -703,8 +703,8 @@ GtkWidget *label, *spin_button; label = gtk_label_new_with_mnemonic (text_label); -#if GTK_CHECK_VERSION (3, 14, 0) - gtk_widget_set_halign (label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (label), 0.0); #else gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); #endif @@ -937,8 +937,8 @@ #endif label = gtk_label_new_with_mnemonic (_("C_enter:")); -#if GTK_CHECK_VERSION (3, 14, 0) - gtk_widget_set_halign (label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (label), 0.0); #else gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); #endif @@ -1024,8 +1024,8 @@ priv->scaling = hscale; label = gtk_label_new_with_mnemonic (_("_Unit:")); -#if GTK_CHECK_VERSION (3, 14, 0) - gtk_widget_set_halign (label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (label), 0.0); #else gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eom-1.12.1/src/eom-print-preview.c new/eom-1.12.2/src/eom-print-preview.c --- old/eom-1.12.1/src/eom-print-preview.c 2015-11-25 11:57:22.000000000 +0100 +++ new/eom-1.12.2/src/eom-print-preview.c 2016-02-10 13:01:54.000000000 +0100 @@ -732,7 +732,7 @@ format = CAIRO_FORMAT_ARGB32; cairo_stride = cairo_format_stride_for_width (format, width); - cairo_pixels = g_malloc (height * cairo_stride); + cairo_pixels = g_malloc_n (height, cairo_stride); surface = cairo_image_surface_create_for_data ((unsigned char *)cairo_pixels, format, width, height, cairo_stride); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eom-1.12.1/src/eom-window.c new/eom-1.12.2/src/eom-window.c --- old/eom-1.12.1/src/eom-window.c 2015-10-05 12:12:51.000000000 +0200 +++ new/eom-1.12.2/src/eom-window.c 2016-02-15 12:39:55.000000000 +0100 @@ -829,14 +829,17 @@ hbox = gtk_hbox_new (FALSE, 8); gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0); -#if GTK_CHECK_VERSION (3, 14, 0) - gtk_widget_set_valign (image, GTK_ALIGN_START); - gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); - gtk_widget_set_halign (label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 0, 0) + gtk_widget_set_halign (image, GTK_ALIGN_START); + gtk_widget_set_valign (image, GTK_ALIGN_END); #else - gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0); + gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0); +#endif gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (label), 0.0); +#else + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); #endif gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (info_bar))), hbox, TRUE, TRUE, 0); gtk_widget_show_all (hbox); @@ -2743,14 +2746,17 @@ hbox = gtk_hbox_new (FALSE, 8); gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0); -#if GTK_CHECK_VERSION (3, 14, 0) - gtk_widget_set_valign (image, GTK_ALIGN_START); - gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); - gtk_widget_set_halign (label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 0, 0) + gtk_widget_set_halign (image, GTK_ALIGN_START); + gtk_widget_set_valign (image, GTK_ALIGN_END); #else - gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0); + gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0); +#endif gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (label), 0.0); +#else + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); #endif gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (info_bar))), hbox, TRUE, TRUE, 0); gtk_widget_show_all (hbox); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eom-1.12.1/src/main.c new/eom-1.12.2/src/main.c --- old/eom-1.12.1/src/main.c 2015-12-07 08:58:54.000000000 +0100 +++ new/eom-1.12.2/src/main.c 2016-02-15 12:39:55.000000000 +0100 @@ -30,7 +30,7 @@ #include <dbus/dbus-glib-bindings.h> #include <gdk/gdkx.h> #endif -#ifdef HAVE_INSTROSPECTION +#ifdef HAVE_INTROSPECTION #include <girepository.h> #endif
