Hello community, here is the log from the commit of package xreader for openSUSE:Factory checked in at 2017-12-29 18:50:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xreader (Old) and /work/SRC/openSUSE:Factory/.xreader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xreader" Fri Dec 29 18:50:16 2017 rev:14 rq:559722 version:1.6.2 Changes: -------- --- /work/SRC/openSUSE:Factory/xreader/xreader.changes 2017-11-27 22:16:25.890945914 +0100 +++ /work/SRC/openSUSE:Factory/.xreader.new/xreader.changes 2017-12-29 18:50:22.949979206 +0100 @@ -1,0 +2,10 @@ +Sun Dec 24 10:19:44 UTC 2017 - [email protected] + +- Update to version 1.6.2: + * configure.ac: Use a major.minor version only for API, this + broke loading of introspection otherwise, which seems to expect + only the *-1.5.typelib. + * Fix searching for a word that is a continuation of a + non-existent word (gh#linuxmint/xreader#135). + +------------------------------------------------------------------- Old: ---- xreader-1.6.1.tar.gz New: ---- xreader-1.6.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xreader.spec ++++++ --- /var/tmp/diff_new_pack.6bvYHo/_old 2017-12-29 18:50:23.621786259 +0100 +++ /var/tmp/diff_new_pack.6bvYHo/_new 2017-12-29 18:50:23.621786259 +0100 @@ -17,10 +17,10 @@ %define sover 3 -%define typelib1 typelib-1_0-XreaderDocument-1_5_0 -%define typelib2 typelib-1_0-XreaderView-1_5_0 +%define typelib1 typelib-1_0-XreaderDocument-1_5 +%define typelib2 typelib-1_0-XreaderView-1_5 Name: xreader -Version: 1.6.1 +Version: 1.6.2 Release: 0 Summary: Document viewer for documents like PDF/PostScript License: GPL-2.0 AND LGPL-2.0 @@ -83,7 +83,10 @@ %package -n %{typelib1} Summary: XReaderDocument -- Introspection Bindings +# typelib-1_0-XreaderDocument-1_5_0 was last used in openSUSE Leap 42.3. Group: System/Libraries +Provides: typelib-1_0-XreaderDocument-1_5_0 = %{version} +Obsoletes: typelib-1_0-XreaderDocument-1_5_0 < %{version} %description -n %{typelib1} Xreader is a document viewer capable of displaying multiple and @@ -91,7 +94,10 @@ %package -n %{typelib2} Summary: XReaderView -- Introspection Bindings +# typelib-1_0-XreaderView-1_5_0 was last used in openSUSE Leap 42.3. Group: System/Libraries +Provides: typelib-1_0-XreaderView-1_5_0 = %{version} +Obsoletes: typelib-1_0-XreaderView-1_5_0 < %{version} %description -n %{typelib2} Xreader is a document viewer capable of displaying multiple and @@ -243,10 +249,10 @@ %endif %files -n %{typelib1} -%{_libdir}/girepository-1.0/XreaderDocument-1.5.0.typelib +%{_libdir}/girepository-1.0/XreaderDocument-1.5.typelib %files -n %{typelib2} -%{_libdir}/girepository-1.0/XreaderView-1.5.0.typelib +%{_libdir}/girepository-1.0/XreaderView-1.5.typelib %files backends %doc AUTHORS README COPYING ++++++ xreader-1.6.1.tar.gz -> xreader-1.6.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-1.6.1/configure.ac new/xreader-1.6.2/configure.ac --- old/xreader-1.6.1/configure.ac 2017-11-23 13:32:27.000000000 +0100 +++ new/xreader-1.6.2/configure.ac 2017-12-18 14:29:43.000000000 +0100 @@ -4,12 +4,12 @@ m4_define([ev_major_version], [1]) m4_define([ev_minor_version], [6]) -m4_define([ev_micro_version], [1]) +m4_define([ev_micro_version], [2]) m4_define([ev_extra_version], []) m4_define([ev_version], [ev_major_version.ev_minor_version.ev_micro_version()ev_extra_version]) # The xreader API version -m4_define([ev_api_version], [1.5.0]) +m4_define([ev_api_version], [1.5]) # Libtool versioning. The backend and view libraries have separate versions. # Before making a release, the libtool version should be modified. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-1.6.1/debian/changelog new/xreader-1.6.2/debian/changelog --- old/xreader-1.6.1/debian/changelog 2017-11-23 13:32:27.000000000 +0100 +++ new/xreader-1.6.2/debian/changelog 2017-12-18 14:29:43.000000000 +0100 @@ -1,3 +1,13 @@ +xreader (1.6.2) sylvia; urgency=medium + + [ Michael Webster ] + * configure.ac: Use major.minor version only for API, this breaks loading of introspection otherwise, which seems to expect only *-1.5.typelib. + + [ Mickael Albertus ] + * BugFix #135 (#186) + + -- Clement Lefebvre <[email protected]> Mon, 18 Dec 2017 13:28:50 +0000 + xreader (1.6.1) sylvia; urgency=medium * l10n: Update translations diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-1.6.1/libview/ev-jobs.c new/xreader-1.6.2/libview/ev-jobs.c --- old/xreader-1.6.1/libview/ev-jobs.c 2017-11-23 13:32:27.000000000 +0100 +++ new/xreader-1.6.2/libview/ev-jobs.c 2017-12-18 14:29:43.000000000 +0100 @@ -1482,6 +1482,12 @@ } } +const gchar * +ev_job_find_get_text (EvJobFind *job) +{ + return job->text; +} + gdouble ev_job_find_get_progress (EvJobFind *job) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-1.6.1/libview/ev-jobs.h new/xreader-1.6.2/libview/ev-jobs.h --- old/xreader-1.6.1/libview/ev-jobs.h 2017-11-23 13:32:27.000000000 +0100 +++ new/xreader-1.6.2/libview/ev-jobs.h 2017-12-18 14:29:43.000000000 +0100 @@ -484,7 +484,8 @@ const gchar *text, gboolean case_sensitive); gint ev_job_find_get_n_results (EvJobFind *job, - gint pages); + gint pages); +const gchar *ev_job_find_get_text (EvJobFind *job); gdouble ev_job_find_get_progress (EvJobFind *job); gboolean ev_job_find_has_results (EvJobFind *job); GList **ev_job_find_get_results (EvJobFind *job); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-1.6.1/shell/ev-window.c new/xreader-1.6.2/shell/ev-window.c --- old/xreader-1.6.1/shell/ev-window.c 2017-11-23 13:32:27.000000000 +0100 +++ new/xreader-1.6.2/shell/ev-window.c 2017-12-18 14:29:43.000000000 +0100 @@ -5292,16 +5292,30 @@ return; search_string = egg_find_bar_get_search_string (find_bar); + gboolean has_string = (search_string && search_string[0]); + + if (has_string && ev_window->priv->find_job != NULL + && ev_job_is_finished (ev_window->priv->find_job)) { + + EvJobFind *job_find = EV_JOB_FIND (ev_window->priv->find_job); + const gchar *searched_string = ev_job_find_get_text (job_find); - ev_window_clear_find_job (ev_window); + if (!ev_job_find_has_results (job_find) + && strstr (search_string, searched_string)) { + egg_find_bar_set_status_text (find_bar, _("Not found")); + return; + } + } - if (search_string && search_string[0]) { + ev_window_clear_find_job (ev_window); + + if (has_string) { ev_window->priv->find_job = ev_job_find_new (ev_window->priv->document, ev_document_model_get_page (ev_window->priv->model), ev_document_get_n_pages (ev_window->priv->document), search_string, egg_find_bar_get_case_sensitive (find_bar)); - + g_signal_connect (ev_window->priv->find_job, "finished", G_CALLBACK (ev_window_find_job_finished_cb), ev_window);
