diff options
| -rwxr-xr-x[-rw-r--r--] | office/evince/evince.SlackBuild | 29 | ||||
| -rw-r--r-- | office/evince/evince.info | 6 | ||||
| -rw-r--r-- | office/evince/rem_unused_makedeps.patch | 135 | ||||
| -rw-r--r-- | office/evince/slack-desc | 6 |
4 files changed, 25 insertions, 151 deletions
diff --git a/office/evince/evince.SlackBuild b/office/evince/evince.SlackBuild index 0213ee19d2..2a6fb34265 100644..100755 --- a/office/evince/evince.SlackBuild +++ b/office/evince/evince.SlackBuild @@ -24,11 +24,20 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=evince -VERSION=${VERSION:-2.26.2} -ARCH=${ARCH:-i486} +VERSION=${VERSION:-2.30.1} BUILD=${BUILD:-1} TAG=${TAG=_SBo} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + NLS=${NLS:-YES} CWD=$(pwd) @@ -45,6 +54,9 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi set -e @@ -53,7 +65,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* +tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 cd $PRGNAM-$VERSION chown -R root:root . find . \ @@ -69,9 +81,6 @@ if [ "NLS" != "YES" ]; then -e 's/ENABLE_NLS 1/ENABLE_NLS 0/g' configure fi -# Remove some hard deps that aren't :-) -patch -p1 < $CWD/rem_unused_makedeps.patch - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -111,12 +120,10 @@ sed -i "/NoDisplay=true/d" $PKG/usr/share/applications/evince.desktop rm -rf $PKG/*.schemas find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -( cd $PKG/usr/man || exit 1 - find . -type f -exec gzip -9 {} \; - for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done -) +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done rm -rf $PKG/{usr/share/gtk-doc,etc} mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/office/evince/evince.info b/office/evince/evince.info index b2fc89551c..9f95a216a8 100644 --- a/office/evince/evince.info +++ b/office/evince/evince.info @@ -1,8 +1,8 @@ PRGNAM="evince" -VERSION="2.26.2" +VERSION="2.30.1" HOMEPAGE="http://projects.gnome.org/evince/" -DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/evince/2.26/evince-2.26.2.tar.bz2" -MD5SUM="ed8b9fb5c5d6feafd19f0114b736c9ef" +DOWNLOAD="ftp://ftp.gnome.org/pub/gnome/sources/evince/2.30/evince-2.30.1.tar.bz2" +MD5SUM="84eb6c8bb460edd382025fdd29c3bc64" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Michiel van Wessem" diff --git a/office/evince/rem_unused_makedeps.patch b/office/evince/rem_unused_makedeps.patch deleted file mode 100644 index 4329d432d3..0000000000 --- a/office/evince/rem_unused_makedeps.patch +++ /dev/null @@ -1,135 +0,0 @@ -diff -Nur evince-2.26.2.orig/configure evince-2.26.2/configure ---- evince-2.26.2.orig/configure 2009-05-18 15:52:16.000000000 -0500 -+++ evince-2.26.2/configure 2009-07-30 23:51:49.884803776 -0500 -@@ -842,7 +842,6 @@ - G_IR_SCANNER - GOBJECT_INTROSPECTION_LIBS - GOBJECT_INTROSPECTION_CFLAGS --GCONFTOOL - GCONF_SCHEMAS_INSTALL_FALSE - GCONF_SCHEMAS_INSTALL_TRUE - GCONF_SCHEMA_FILE_DIR -@@ -26114,11 +26113,11 @@ - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= \$LIBXML_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED gtk+-unix-print-2.0 >= \$GTK_REQUIRED gio-2.0 >= \$GLIB_REQUIRED gnome-icon-theme >= \$GNOME_ICON_THEME_REQUIRED gthread-2.0\"") >&5 -- ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gtk+-unix-print-2.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gthread-2.0") 2>&5 -+ ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gtk+-unix-print-2.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gthread-2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- pkg_cv_SHELL_CORE_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gtk+-unix-print-2.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gthread-2.0" 2>/dev/null` -+ pkg_cv_SHELL_CORE_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gtk+-unix-print-2.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gthread-2.0" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -26130,11 +26129,11 @@ - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= \$LIBXML_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED gtk+-unix-print-2.0 >= \$GTK_REQUIRED gio-2.0 >= \$GLIB_REQUIRED gnome-icon-theme >= \$GNOME_ICON_THEME_REQUIRED gthread-2.0\"") >&5 -- ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gtk+-unix-print-2.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gthread-2.0") 2>&5 -+ ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gtk+-unix-print-2.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gthread-2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- pkg_cv_SHELL_CORE_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gtk+-unix-print-2.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gthread-2.0" 2>/dev/null` -+ pkg_cv_SHELL_CORE_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gtk+-unix-print-2.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gthread-2.0" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -26152,14 +26151,14 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- SHELL_CORE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gtk+-unix-print-2.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gthread-2.0" 2>&1` -+ SHELL_CORE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gtk+-unix-print-2.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gthread-2.0" 2>&1` - else -- SHELL_CORE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gtk+-unix-print-2.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gthread-2.0" 2>&1` -+ SHELL_CORE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gtk+-unix-print-2.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gthread-2.0" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$SHELL_CORE_PKG_ERRORS" >&5 - -- { { $as_echo "$as_me:$LINENO: error: Package requirements (libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gtk+-unix-print-2.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gthread-2.0) were not met: -+ { { $as_echo "$as_me:$LINENO: error: Package requirements (libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gtk+-unix-print-2.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gthread-2.0) were not met: - - $SHELL_CORE_PKG_ERRORS - -@@ -26170,7 +26169,7 @@ - and SHELL_CORE_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - " >&5 --$as_echo "$as_me: error: Package requirements (libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gtk+-unix-print-2.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gthread-2.0) were not met: -+$as_echo "$as_me: error: Package requirements (libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gtk+-unix-print-2.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gthread-2.0) were not met: - - $SHELL_CORE_PKG_ERRORS - -@@ -27149,13 +27148,6 @@ - - - -- if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then -- GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` -- else -- GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE -- fi -- -- - # Check whether --with-gconf-source was given. - if test "${with_gconf_source+set}" = set; then - withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval" -@@ -27200,54 +27192,6 @@ - fi - - -- --# Extract the first word of "gconftool-2", so it can be a program name with args. --set dummy gconftool-2; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_GCONFTOOL+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- case $GCONFTOOL in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_GCONFTOOL="$GCONFTOOL" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS -- -- test -z "$ac_cv_path_GCONFTOOL" && ac_cv_path_GCONFTOOL="no" -- ;; --esac --fi --GCONFTOOL=$ac_cv_path_GCONFTOOL --if test -n "$GCONFTOOL"; then -- { $as_echo "$as_me:$LINENO: result: $GCONFTOOL" >&5 --$as_echo "$GCONFTOOL" >&6; } --else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } --fi -- -- --if test "x$GCONFTOOL" = "xno"; then -- { { $as_echo "$as_me:$LINENO: error: gconftool-2 executable not found in your path - should be installed with GConf" >&5 --$as_echo "$as_me: error: gconftool-2 executable not found in your path - should be installed with GConf" >&2;} -- { (exit 1); exit 1; }; } --fi -- - # *** - # GIR - # *** diff --git a/office/evince/slack-desc b/office/evince/slack-desc index 665fee5afb..63c4677ac6 100644 --- a/office/evince/slack-desc +++ b/office/evince/slack-desc @@ -7,11 +7,13 @@ |-----handy-ruler------------------------------------------------------| evince: evince (a simple gnome-based document viewer) -evince: +evince: evince: Evince is a document viewer for multiple document formats. It evince: Ccurrently supports pdf, postscript, djvu, tiff and dvi. The goal of evince: evince is to replace the multiple document viewers that exist on the evince: GNOME Desktop with a single simple application. -evince: +evince: evince: homepage: http://projects.gnome.org/evince/ evince: +evince: +evince: |