From c7d265f743e89cac083dd546d86bca36b48f1a92 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 22 Mar 2012 11:23:42 +0100 Subject: [PATCH] evince: update to 3.3.92. --- common/shlibs | 2 +- srcpkgs/evince/depends | 2 +- srcpkgs/evince/evince-devel.template | 7 +++--- srcpkgs/evince/evince.rshlibs | 7 +++--- srcpkgs/evince/libevince.rshlibs | 3 --- srcpkgs/evince/libevince.template | 4 +--- .../evince/patches/gdk_target_detection.patch | 14 +++++++++++ srcpkgs/evince/template | 24 +++++++++++++------ 8 files changed, 41 insertions(+), 22 deletions(-) create mode 100644 srcpkgs/evince/patches/gdk_target_detection.patch diff --git a/common/shlibs b/common/shlibs index 221fb0e69f..6dd89347e7 100644 --- a/common/shlibs +++ b/common/shlibs @@ -832,7 +832,7 @@ libdjvulibre.so.21 libdjvulibre djvulibre-devel libgxps.so.2 libgxps libgxps-devel libt1.so.5 libt1 t1lib-devel libt1x.so.5 libt1 t1lib-devel -libevdocument3.so.3 libevince evince-devel +libevdocument3.so.4 libevince evince-devel libevview3.so.3 libevince evince-devel libjack.so.0 libjack jack-devel libjackserver.so.0 libjack jack-devel diff --git a/srcpkgs/evince/depends b/srcpkgs/evince/depends index 214cb4e13b..88592da749 100644 --- a/srcpkgs/evince/depends +++ b/srcpkgs/evince/depends @@ -1,2 +1,2 @@ -abi_depends=">=3.2.1" +abi_depends=">=3.3.92" api_depends="${abi_depends}" diff --git a/srcpkgs/evince/evince-devel.template b/srcpkgs/evince/evince-devel.template index acb1181e9c..16bf1bd1a3 100644 --- a/srcpkgs/evince/evince-devel.template +++ b/srcpkgs/evince/evince-devel.template @@ -6,10 +6,11 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." Add_dependency run gtk+3-devel -Add_dependency run libevince +Add_dependency run libevince ">=${version}" -do_install() -{ +noarch=yes + +do_install() { vmove usr/include usr vmove usr/lib/pkgconfig usr/lib vmove usr/share/gir-1.0 usr/share diff --git a/srcpkgs/evince/evince.rshlibs b/srcpkgs/evince/evince.rshlibs index 194d52c54b..ad386de247 100644 --- a/srcpkgs/evince/evince.rshlibs +++ b/srcpkgs/evince/evince.rshlibs @@ -1,15 +1,11 @@ -libevdocument3.so.3 libgtk-3.so.0 libgdk-3.so.0 libatk-1.0.so.0 libgio-2.0.so.0 -libpangoft2-1.0.so.0 libpangocairo-1.0.so.0 libgdk_pixbuf-2.0.so.0 libcairo-gobject.so.2 libpango-1.0.so.0 -libfreetype.so.6 -libfontconfig.so.1 libgmodule-2.0.so.0 libpoppler-glib.so.8 libgobject-2.0.so.0 @@ -32,3 +28,6 @@ libgnome-keyring.so.0 libgxps.so.2 libarchive.so.12 libtiff.so.5 +libevdocument3.so.4 +libSM.so.6 +libICE.so.6 diff --git a/srcpkgs/evince/libevince.rshlibs b/srcpkgs/evince/libevince.rshlibs index 5a351e655e..ffb73a6270 100644 --- a/srcpkgs/evince/libevince.rshlibs +++ b/srcpkgs/evince/libevince.rshlibs @@ -1,14 +1,11 @@ libgtk-3.so.0 libgdk-3.so.0 libatk-1.0.so.0 -libpangoft2-1.0.so.0 libpangocairo-1.0.so.0 libgdk_pixbuf-2.0.so.0 libcairo-gobject.so.2 libcairo.so.2 libpango-1.0.so.0 -libfreetype.so.6 -libfontconfig.so.1 libgio-2.0.so.0 libgobject-2.0.so.0 libgmodule-2.0.so.0 diff --git a/srcpkgs/evince/libevince.template b/srcpkgs/evince/libevince.template index 3b4b1b109b..1b2af0e1c8 100644 --- a/srcpkgs/evince/libevince.template +++ b/srcpkgs/evince/libevince.template @@ -1,13 +1,11 @@ # Template file for 'libevince'. # -revision=1 short_desc="${short_desc} - runtime libraries" long_desc="${long_desc} This package contains the runtime libraries." -do_install() -{ +do_install() { vmove "usr/lib/*.so*" usr/lib vmove usr/lib/girepository-1.0 usr/lib } diff --git a/srcpkgs/evince/patches/gdk_target_detection.patch b/srcpkgs/evince/patches/gdk_target_detection.patch new file mode 100644 index 0000000000..903808b0f8 --- /dev/null +++ b/srcpkgs/evince/patches/gdk_target_detection.patch @@ -0,0 +1,14 @@ +If gdk-3.0.pc contains more than 1 backend, detection fails. +https://bugzilla.gnome.org/show_bug.cgi?id=672613 + +--- configure.ac.orig 2012-03-22 11:01:48.336346451 +0100 ++++ configure.ac 2012-03-22 11:02:10.110810019 +0100 +@@ -202,7 +202,7 @@ AC_ARG_WITH([smclient], + [Setting smclient backend (default:auto)])], + [], + [case "$GDK_TARGET" in +- x11) case "$with_platform" in ++ x11*) case "$with_platform" in + gnome) with_smclient=xsmp ;; + *) with_smclient=no ;; + esac ;; diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template index f90a482d7a..a0275983ac 100644 --- a/srcpkgs/evince/template +++ b/srcpkgs/evince/template @@ -1,17 +1,16 @@ # Template file for 'evince' pkgname=evince -version=3.2.1 -distfiles="${GNOME_SITE}/$pkgname/3.2/$pkgname-$version.tar.xz" +version=3.3.92 +distfiles="${GNOME_SITE}/$pkgname/3.3/$pkgname-$version.tar.xz" build_style=gnu-configure configure_args="--enable-introspection --disable-schemas-compile --enable-comics --disable-scrollkeeper --enable-xps --disable-t1lib ---disable-tests --disable-static" -revision=6 +--disable-tests --disable-static --with-smclient-backend=xsmp" short_desc="GNOME Document viewer for multiple document formats" maintainer="Juan RP " homepage="http://projects.gnome.org/evince/" license="GPL-2" -checksum=9db61a39c977eb939deaee3ed1e66937f15532f46de988cacd5b638f3960ed35 +checksum=06b0511fde4d462fcb8276ee7a7ee858eeedc026704feba86e90e085f1360e00 long_desc=" Evince is specifically designed to support the file following formats: * PDF @@ -27,9 +26,13 @@ long_desc=" subpackages="lib${pkgname} ${pkgname}-devel" gtk_iconcache_dirs="/usr/share/icons/hicolor" +Add_dependency build which Add_dependency build pkg-config Add_dependency build intltool Add_dependency build gnome-doc-utils +Add_dependency build gnome-common +Add_dependency build gtk-doc +Add_dependency build gettext-devel Add_dependency build gobject-introspection Add_dependency build tiff-devel Add_dependency build libarchive-devel @@ -39,8 +42,15 @@ Add_dependency build libgnome-keyring-devel Add_dependency build libxml2-devel Add_dependency build djvulibre-devel Add_dependency build libgxps-devel +Add_dependency build libSM-devel +Add_dependency build libICE-devel +Add_dependency build gtk+3-devel -Add_dependency full desktop-file-utils -Add_dependency full hicolor-icon-theme +Add_dependency run desktop-file-utils +Add_dependency run hicolor-icon-theme Add_dependency full gnome-icon-theme Add_dependency full gsettings-desktop-schemas + +pre_configure() { + ./autogen.sh +}