From: Jakub Bogusz Date: Sun, 20 Sep 2020 08:52:54 +0000 (+0200) Subject: - updated to 3.38.0; now uses meson X-Git-Tag: auto/th/evince-3.38.0-1 X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=c3402a6fe7455dc9f061f3f462f7a97a2cbb8ea6;hp=103f2942c1a695ddcd8f8d98464f56955ec039da;p=packages%2Fevince.git - updated to 3.38.0; now uses meson - updated icon-theme patch - removed obsolete linking patch --- diff --git a/evince-linking.patch b/evince-linking.patch deleted file mode 100644 index 27017aa..0000000 --- a/evince-linking.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- evince-3.1.2/configure.ac~ 2011-06-13 20:09:47.000000000 +0200 -+++ evince-3.1.2/configure.ac 2011-07-29 19:52:23.832704003 +0200 -@@ -313,7 +313,7 @@ - AM_CONDITIONAL(ENABLE_TESTS, test x$enable_tests = xyes) - - LIBDOCUMENT_CFLAGS="$LIBDOCUMENT_CFLAGS $DEBUG_FLAGS" --LIBDOCUMENT_LIBS="$LIBDOCUMENT_LIBS" -+LIBDOCUMENT_LIBS="$LIBDOCUMENT_LIBS -lz" - AC_SUBST(LIBDOCUMENT_CFLAGS) - AC_SUBST(LIBDOCUMENT_LIBS) - diff --git a/evince.spec b/evince.spec index 7d63e99..b7c2818 100644 --- a/evince.spec +++ b/evince.spec @@ -10,24 +10,20 @@ Summary: Document viewer for multiple document formats Summary(pl.UTF-8): Przeglądarka dokumentów w wielu formatach Name: evince -Version: 3.36.7 +Version: 3.38.0 Release: 1 License: GPL v2+ Group: X11/Applications/Graphics -Source0: http://ftp.gnome.org/pub/GNOME/sources/evince/3.36/%{name}-%{version}.tar.xz -# Source0-md5: a7ebf1f76552579be71fc63947a15297 -Patch0: %{name}-linking.patch -Patch1: icon-theme.patch +Source0: http://ftp.gnome.org/pub/GNOME/sources/evince/3.38/%{name}-%{version}.tar.xz +# Source0-md5: 29dd770b8255bdf6343f83419c975905 +Patch0: icon-theme.patch URL: https://wiki.gnome.org/Apps/Evince -BuildRequires: autoconf >= 2.57 -BuildRequires: automake >= 1:1.10 BuildRequires: cairo-devel >= 1.10.0 BuildRequires: djvulibre-devel >= 3.5.22 BuildRequires: docbook-dtd412-xml -BuildRequires: gdk-pixbuf2-devel >= 2.36.5 +BuildRequires: gdk-pixbuf2-devel >= 2.40.0 BuildRequires: gettext-tools >= 0.19.8 -BuildRequires: glib2-devel >= 1:2.38.0 -BuildRequires: gnome-common >= 2.24.0 +BuildRequires: glib2-devel >= 1:2.44.0 BuildRequires: gnome-desktop-devel >= 3.0 BuildRequires: gobject-introspection-devel >= 1.0 BuildRequires: gsettings-desktop-schemas-devel @@ -42,15 +38,16 @@ BuildRequires: libgxps-devel >= 0.2.1 BuildRequires: libsecret-devel >= 0.5 BuildRequires: libspectre-devel >= 0.2.0 BuildRequires: libstdc++-devel -BuildRequires: libtiff-devel >= 3.6 -BuildRequires: libtool >= 2:2.2 +BuildRequires: libtiff-devel >= 4 BuildRequires: libxml2-devel >= 1:2.6.31 BuildRequires: libxml2-progs >= 1:2.6.31 +BuildRequires: meson >= 0.50.0 +BuildRequires: ninja >= 1.5 %{?with_nautilus:BuildRequires: nautilus-devel >= 3.0.0} BuildRequires: pkgconfig BuildRequires: poppler-glib-devel >= 0.33.0 BuildRequires: rpmbuild(find_lang) >= 1.23 -BuildRequires: rpmbuild(macros) >= 1.592 +BuildRequires: rpmbuild(macros) >= 1.736 BuildRequires: synctex-devel >= 1.19 BuildRequires: t1lib-devel BuildRequires: tar >= 1:1.22 @@ -61,11 +58,11 @@ BuildRequires: xz BuildRequires: yelp-tools BuildRequires: zlib-devel Requires(post,postun): desktop-file-utils -Requires(post,postun): glib2 >= 1:2.38.0 +Requires(post,postun): glib2 >= 1:2.44.0 Requires: %{name}-libs = %{version}-%{release} Requires: cairo >= 1.10.0 Requires: dconf -Requires: gdk-pixbuf2 >= 2.36.5 +Requires: gdk-pixbuf2 >= 2.40.0 Requires: gsettings-desktop-schemas Requires: gspell >= 1.6.0 Requires: gtk-update-icon-cache @@ -99,7 +96,7 @@ xpdf jedną prostą aplikacją. Summary: Evince shared libraries Summary(pl.UTF-8): Biblioteki współdzielone Evince Group: X11/Libraries -Requires: glib2 >= 1:2.38.0 +Requires: glib2 >= 1:2.44.0 Requires: gtk+3 >= 3.22.0 Conflicts: evince < 3.10.3-2 @@ -114,7 +111,7 @@ Summary: Header files for Evince Summary(pl.UTF-8): Pliki nagłówkowe Evince Group: X11/Development/Libraries Requires: %{name}-libs = %{version}-%{release} -Requires: glib2-devel >= 1:2.38.0 +Requires: glib2-devel >= 1:2.44.0 Requires: gtk+3-devel >= 3.22.0 %description devel @@ -233,46 +230,21 @@ Wtyczka Evince dla przegądarek WWW zgodnych z Mozillą. %prep %setup -q %patch0 -p1 -%patch1 -p1 %build -%{__gettextize} -%{__gtkdocize} -%{__libtoolize} -%{__aclocal} -I m4 -%{__autoconf} -%{__autoheader} -%{__automake} -%configure \ - BROWSER_PLUGIN_DIR=%{_browserpluginsdir} \ - --enable-browser-plugin \ - --enable-comics \ - --enable-djvu \ - --enable-dvi \ - %{?with_apidocs:--enable-gtk-doc} \ - --enable-introspection \ - --enable-nautilus%{!?with_nautilus:=no} \ - --enable-pdf \ - --enable-ps \ - --disable-silent-rules \ - --disable-static \ - --enable-t1lib \ - --enable-tiff \ - --with-html-dir=%{_gtkdocdir} -%{__make} +%meson build \ + -Dbrowser_plugin=true \ + -Dbrowser_plugin_dir=%{_browserpluginsdir} \ + %{!?with_apidocs:-Dgtk_doc=false} \ + %{!?with_nautilus:-Dnautilus=false} \ + -Dps=enabled + +%ninja_build -C build %install rm -rf $RPM_BUILD_ROOT -%{__make} install \ - DESTDIR=$RPM_BUILD_ROOT - -%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la -%{__rm} $RPM_BUILD_ROOT%{_browserpluginsdir}/*.la -%{__rm} $RPM_BUILD_ROOT%{backendsdir}/*.la -%if %{with nautilus} -%{__rm} $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-3.0/*.la -%endif +%ninja_install -C build %find_lang %{name} --with-gnome @@ -302,7 +274,7 @@ fi %files -f %{name}.lang %defattr(644,root,root,755) -%doc AUTHORS MAINTAINERS NEWS README.md TODO +%doc AUTHORS MAINTAINERS NEWS NEWS-security.md NOTES README.md TODO %attr(755,root,root) %{_bindir}/evince %attr(755,root,root) %{_bindir}/evince-previewer %attr(755,root,root) %{_bindir}/evince-thumbnailer @@ -324,6 +296,8 @@ fi %{_datadir}/thumbnailers/evince.thumbnailer %{systemduserunitdir}/org.gnome.Evince.service %{_mandir}/man1/evince.1* +%{_mandir}/man1/evince-previewer.1* +%{_mandir}/man1/evince-thumbnailer.1* %{_desktopdir}/org.gnome.Evince.desktop %{_desktopdir}/org.gnome.Evince-previewer.desktop %{_iconsdir}/hicolor/scalable/apps/org.gnome.Evince.svg diff --git a/icon-theme.patch b/icon-theme.patch index 58bf192..f565e46 100644 --- a/icon-theme.patch +++ b/icon-theme.patch @@ -1,27 +1,27 @@ ---- evince-3.14.0/configure.ac~ 2014-10-11 19:48:53.000000000 +0200 -+++ evince-3.14.0/configure.ac 2014-10-11 19:50:09.204494246 +0200 -@@ -174,24 +174,6 @@ - fi +--- evince-3.38.0/meson.build.orig 2020-09-12 21:36:51.826925800 +0200 ++++ evince-3.38.0/meson.build 2020-09-20 10:38:50.641170542 +0200 +@@ -171,13 +171,6 @@ - SHELL_PLATFORM_PKGS= --case "$with_platform" in -- gnome) -- # Evince has a rather soft run-time dependency on hicolor-icon-theme. -- # If the hicolor theme is not available, Evince fails to display some -- # icons. Because we cannot check for it at run-time, we instead -- # would like to require the icon theme at compile-time. But, because -- # the hicolor-icon-theme does not have a pkgconfig file, on gnome we -- # require the gnome icon theme instead. -- SHELL_PLATFORM_PKGS="adwaita-icon-theme >= $ADWAITA_ICON_THEME_REQUIRED" -- ;; -- *) -- # On all other platforms we issue a warning about the runtime -- # dependency. -- AC_MSG_WARN([Evince has a soft run-time dependency on hicolor-icon-theme. You are advised to have this theme installed when running Evince.]); -- SHELL_PLATFORM_PKGS="" -- ;; --esac -- - PKG_CHECK_MODULES([SHELL_CORE],[libxml-2.0 >= $LIBXML_REQUIRED gtk+-3.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 $SHELL_PLATFORM_PKGS]) + ev_platform = get_option('platform') + if ev_platform == 'gnome' +- # Evince has a rather soft run-time dependency on hicolor-icon-theme. +- # If the hicolor theme is not available, Evince fails to display some +- # icons. Because we cannot check for it at run-time, we instead +- # would like to require the icon theme at compile-time. But, because +- # the hicolor-icon-theme does not have a pkgconfig file, on gnome we +- # require the gnome icon theme instead. +- adwaita_icon_theme_dep = dependency('adwaita-icon-theme', version: '>= 2.17.1') - # *************** + # *** Nautilus property page build *** + enable_nautilus = get_option('nautilus') +--- evince-3.38.0/shell/meson.build.orig 2020-09-12 21:36:51.862926000 +0200 ++++ evince-3.38.0/shell/meson.build 2020-09-20 10:41:51.863522110 +0200 +@@ -92,8 +92,6 @@ + output: resource, + command: [find_program('windres'), '@INPUT@', '-I', data_dir, '@OUTPUT@'], + ) +-else +- deps += adwaita_icon_theme_dep + endif + + if enable_dbus