Hello community, here is the log from the commit of package atril for openSUSE:Factory checked in at 2020-04-04 12:23:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/atril (Old) and /work/SRC/openSUSE:Factory/.atril.new.3248 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "atril" Sat Apr 4 12:23:12 2020 rev:30 rq:790967 version:1.24.0 Changes: -------- --- /work/SRC/openSUSE:Factory/atril/atril.changes 2020-03-03 10:16:20.170662263 +0100 +++ /work/SRC/openSUSE:Factory/.atril.new.3248/atril.changes 2020-04-04 12:23:37.975841140 +0200 @@ -1,0 +2,6 @@ +Mon Mar 30 14:26:19 UTC 2020 - Alexei Sorokin <[email protected]> + +- Add atril-synctex-1.18.patch: Restore SyncTeX 1.18 support. +- Add atril-glib-2.54.patch: Restore GLib 2.54 support. + +------------------------------------------------------------------- New: ---- atril-glib-2.54.patch atril-synctex-1.18.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ atril.spec ++++++ --- /var/tmp/diff_new_pack.bx94r8/_old 2020-04-04 12:23:38.691841755 +0200 +++ /var/tmp/diff_new_pack.bx94r8/_new 2020-04-04 12:23:38.695841759 +0200 @@ -27,6 +27,10 @@ License: GPL-2.0-only AND LGPL-2.0-only URL: https://mate-desktop.org/ Source: https://pub.mate-desktop.org/releases/%{_version}/%{name}-%{version}.tar.xz +# PATCH-FEATURE-OPENSUSE atril-synctex-1.18.patch -- Restore SyncTeX 1.18 support. +Patch0: %{name}-synctex-1.18.patch +# PATCH-FEATURE-OPENSUSE atril-glib-2.54.patch -- Restore GLib 2.54 support. +Patch1: %{name}-glib-2.54.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: mate-common >= %{_version} @@ -158,7 +162,7 @@ This package contains the Atril extension for the Caja file manager. %prep -%setup -q +%autosetup -p1 %build NOCONFIGURE=1 mate-autogen ++++++ atril-glib-2.54.patch ++++++ --- a/configure.ac +++ b/configure.ac @@ -84,7 +84,7 @@ GLIB_GSETTINGS dnl Specify required versions of dependencies CAIRO_REQUIRED=1.14.0 -GLIB_REQUIRED=2.62.0 +GLIB_REQUIRED=2.54.0 GTK_REQUIRED=3.22.0 WEBKIT_REQUIRED=2.6.0 LIBSECRET_REQUIRED=0.5 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -2194,12 +2194,18 @@ set_uri_mtime (GFile *source, info = g_file_query_info_finish (source, async_result, NULL); if (info) { +#if GLIB_CHECK_VERSION (2, 62, 0) GDateTime *mtime; mtime = g_file_info_get_modification_date_time (info); if (mtime) { utime = g_date_time_to_unix (mtime); g_date_time_unref (mtime); } +#else + GTimeVal mtime; + g_file_info_get_modification_time (info, &mtime); + utime = mtime.tv_sec; +#endif g_object_unref (info); } ev_window->priv->uri_mtime = utime; @@ -2597,7 +2603,11 @@ query_remote_uri_mtime_cb (GFile EvWindow *ev_window) { GFileInfo *info; +#if GLIB_CHECK_VERSION (2, 62, 0) GDateTime *mtime; +#else + GTimeVal mtime; +#endif GError *error = NULL; gint64 utime; @@ -2610,9 +2620,14 @@ query_remote_uri_mtime_cb (GFile return; } +#if GLIB_CHECK_VERSION (2, 62, 0) mtime = g_file_info_get_modification_date_time (info); utime = g_date_time_to_unix (mtime); g_date_time_unref (mtime); +#else + g_file_info_get_modification_time (info, &mtime); + utime = mtime.tv_sec; +#endif if (ev_window->priv->uri_mtime != utime) { GFile *target_file; ++++++ atril-synctex-1.18.patch ++++++ --- a/configure.ac +++ b/configure.ac @@ -89,7 +89,7 @@ GTK_REQUIRED=3.22.0 WEBKIT_REQUIRED=2.6.0 LIBSECRET_REQUIRED=0.5 LIBXML_REQUIRED=2.5.0 -SYNCTEX_REQUIRED=1.21 +SYNCTEX_REQUIRED=1.18 AC_SUBST([GLIB_REQUIRED]) AC_SUBST([GTK_REQUIRED]) @@ -364,6 +364,11 @@ dnl ================== libsynctex ====== PKG_CHECK_MODULES(SYNCTEX, [synctex >= $SYNCTEX_REQUIRED], has_synctex=yes, has_synctex=no) +PKG_CHECK_EXISTS(synctex >= 1.21, [have_synctex_1_21=yes], [have_synctex_1_21=no]) +if test "$have_synctex_1_21" = yes; then + AC_DEFINE(HAVE_SYNCTEX_1_21, 1, [synctex >= 1.21 present]) +fi + dnl not found? use internal code copy. if test "x$has_synctex" = "xno"; then AC_MSG_ERROR("SyncTeX support is disabled since library version $SYNCTEX_REQUIRED or newer not found") --- a/libdocument/ev-document.c +++ b/libdocument/ev-document.c @@ -28,6 +28,12 @@ #include "synctex_parser.h" #include "ev-file-helpers.h" +#ifndef HAVE_SYNCTEX_1_21 +typedef synctex_node_t synctex_node_p; +typedef synctex_scanner_t synctex_scanner_p; +#define synctex_scanner_next_result synctex_next_result +#endif + typedef struct _EvPageSize { gdouble width; @@ -471,7 +477,11 @@ ev_document_synctex_forward_search (EvDo if (!scanner) return NULL; +#ifdef HAVE_SYNCTEX_1_21 if (synctex_display_query (scanner, link->filename, link->line, link->col, 0) > 0) { +#else + if (synctex_display_query (scanner, link->filename, link->line, link->col) > 0) { +#endif synctex_node_p node; gint page;
