diff --git a/configure.ac b/configure.ac index d2a4b871..77d8e6b4 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ 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]) @@ -41,7 +41,7 @@ m4_define([ev_binary_version], [ev_document_lt_current]) AC_PREREQ([2.57]) AC_INIT([Atril], [ev_version], [http://www.mate-desktop.org/], [mate-document-viewer]) -AM_INIT_AUTOMAKE([1.10 foreign dist-xz no-dist-gzip]) +AM_INIT_AUTOMAKE([1.10 foreign tar-ustar dist-xz no-dist-gzip]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) @@ -150,7 +150,7 @@ AC_SUBST([GLIB_REQUIRED]) AC_SUBST([GTK_REQUIRED]) AC_SUBST([GTK_API_VERSION]) -MATE_ICON_THEME_REQUIRED=2.17.1 +MATE_ICON_THEME_REQUIRED=1.1.0 LIBXML_REQUIRED=2.5.0 dnl Check dependencies @@ -182,7 +182,7 @@ case "$with_platform" in # would like to require the icon theme at compile-time. But, because # the hicolor-icon-theme does not have a pkgconfig file, on mate we # require the mate icon theme instead. - SHELL_PLATFORM_PKGS="mate-icon-theme >= 1.1.0" + SHELL_PLATFORM_PKGS="mate-icon-theme >= $MATE_ICON_THEME_REQUIRED" # The totem-screensaver and egg_smclient code use x11 directly. SHELL_PLATFORM_PKGS="$SHELL_PLATFORM_PKGS x11" ;; @@ -196,6 +196,20 @@ esac PKG_CHECK_MODULES([SHELL_CORE],[libxml-2.0 >= $LIBXML_REQUIRED gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gthread-2.0 $SHELL_PLATFORM_PKGS]) +dnl +dnl zlib support +dnl + +PKG_CHECK_MODULES([ZLIB], [zlib], [found_zlib=yes], [found_zlib=no]) +AS_IF([test "x$found_zlib" = "xno"], [ + AC_CHECK_LIB(z, inflate, [AC_CHECK_HEADER(zlib.h, found_zlib=yes)]) + if test "x$found_zlib" = "xno" ; then + AC_MSG_ERROR([*** Working zlib library and headers not found ***]) + fi + ZLIB_LIBS='-lz' + AC_SUBST(ZLIB_LIBS) +]) + # ********* # SM client # ********* diff --git a/distro/archlinux/PKGBUILD b/distro/archlinux/PKGBUILD deleted file mode 100644 index 36364413..00000000 --- a/distro/archlinux/PKGBUILD +++ /dev/null @@ -1,55 +0,0 @@ -pkgname=mate-document-viewer -pkgver=1.4.0 -pkgrel=1 -pkgdesc="Simply a document viewer" -url="https://github.com/mate-desktop/mate-document-viewer" -arch=('i686' 'x86_64') -license=('GPL') -depends=('gtk2' 'libspectre' 'gsfonts' 'poppler-glib' 'libgxps' 'djvulibre' - 'mate-icon-theme' 't1lib' 'libmatekeyring' 'desktop-file-utils' - 'texlive-bin') # 'dconf' 'gsettings-desktop-schemas' -makedepends=('mate-doc-utils' 'mate-file-manager' 'intltool' 'gobject-introspection') -optdepends=('texlive-bin: DVI support') -groups=('mate-extra') -install=mate-document-viewer.install -options=('!libtool' '!emptydirs') -source=() -sha256sums=() - -build() { - cd "${srcdir}/../../../" - - ./autogen.sh \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/mate-document-viewer \ - --disable-static \ - --enable-caja \ - --enable-pdf \ - --enable-tiff \ - --enable-xps \ - --enable-djvu \ - --enable-dvi \ - --enable-t1lib \ - --enable-comics \ - --enable-pixbuf \ - --enable-impress \ - --disable-scrollkeeper \ - --enable-introspection \ - --disable-schemas-compile \ - --disable-schemas-install || return 1 - - make || return 1 -} - -package() { - cd "${srcdir}/../../../" - make MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1 - - ln -s atril ${pkgdir}/usr/bin/mate-document-viewer - - install -m755 -d "${pkgdir}/usr/share/mateconf/schemas" - mateconf-merge-schema "${pkgdir}/usr/share/mateconf/schemas/${pkgname}.schemas" --domain ${pkgname} ${pkgdir}/etc/mateconf/schemas/*.schemas - rm -f ${pkgdir}/etc/mateconf/schemas/*.schemas -} diff --git a/distro/archlinux/mate-document-viewer.install b/distro/archlinux/mate-document-viewer.install deleted file mode 100644 index 4dd1d023..00000000 --- a/distro/archlinux/mate-document-viewer.install +++ /dev/null @@ -1,30 +0,0 @@ -pkgname=mate-document-viewer - -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - usr/sbin/mateconfpkg --install ${pkgname} - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - - update-desktop-database -q - - update-mime-database usr/share/mime > /dev/null -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/mateconfpkg --uninstall ${pkgname} -} - -post_remove() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q - update-mime-database usr/share/mime > /dev/null -} diff --git a/libdocument/Makefile.am b/libdocument/Makefile.am index b53fce16..b3ea2c5f 100644 --- a/libdocument/Makefile.am +++ b/libdocument/Makefile.am @@ -115,7 +115,8 @@ libatrildocument_la_LDFLAGS = \ libatrildocument_la_LIBADD = \ $(LIBDOCUMENT_LIBS) \ $(GMODULE_LIBS) \ - $(top_builddir)/cut-n-paste/synctex/libsynctex.la + $(top_builddir)/cut-n-paste/synctex/libsynctex.la \ + $(ZLIB_LIBS) BUILT_SOURCES = \ diff --git a/libmisc/ev-page-action-widget.c b/libmisc/ev-page-action-widget.c index e0cd9c62..62fe01fd 100644 --- a/libmisc/ev-page-action-widget.c +++ b/libmisc/ev-page-action-widget.c @@ -243,8 +243,10 @@ ev_page_action_widget_finalize (GObject *object) if (action_widget->doc_model != NULL) { if (action_widget->signal_id > 0) { - g_signal_handler_disconnect (action_widget->doc_model, - action_widget->signal_id); + if (g_signal_handler_is_connected(action_widget->doc_model, + action_widget->signal_id)) + g_signal_handler_disconnect (action_widget->doc_model, + action_widget->signal_id); action_widget->signal_id = 0; } g_object_remove_weak_pointer (G_OBJECT (action_widget->doc_model),