diff -Nru gnome-documents-3.8.0/Makefile.am gnome-documents-3.8.3.1/Makefile.am --- gnome-documents-3.8.0/Makefile.am 2013-03-04 22:43:32.000000000 +0000 +++ gnome-documents-3.8.3.1/Makefile.am 2013-06-07 14:21:43.000000000 +0000 @@ -1,6 +1,6 @@ ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS} -SUBDIRS = libgd egg-list-box src data po +SUBDIRS = libgd egg-list-box src data man po if ENABLE_GETTING_STARTED diff -Nru gnome-documents-3.8.0/Makefile.in gnome-documents-3.8.3.1/Makefile.in --- gnome-documents-3.8.0/Makefile.in 2013-03-25 15:35:51.000000000 +0000 +++ gnome-documents-3.8.3.1/Makefile.in 2013-06-14 15:43:51.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.1 from Makefile.am. +# Makefile.in generated by automake 1.13.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,9 +84,9 @@ $(top_srcdir)/configure $(am__configure_deps) \ $(top_srcdir)/config/config.h.in ABOUT-NLS AUTHORS COPYING \ NEWS README TODO config/compile config/config.guess \ - config/config.rpath config/config.sub config/depcomp \ - config/install-sh config/missing config/ltmain.sh \ - $(top_srcdir)/config/compile $(top_srcdir)/config/config.guess \ + config/config.rpath config/config.sub config/install-sh \ + config/missing config/ltmain.sh $(top_srcdir)/config/compile \ + $(top_srcdir)/config/config.guess \ $(top_srcdir)/config/config.rpath \ $(top_srcdir)/config/config.sub \ $(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \ @@ -137,7 +165,7 @@ ETAGS = etags CTAGS = ctags CSCOPE = cscope -DIST_SUBDIRS = libgd egg-list-box src data po getting-started +DIST_SUBDIRS = libgd egg-list-box src data man po getting-started DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -302,6 +330,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ +XSLTPROC = @XSLTPROC@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -363,7 +392,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS} -SUBDIRS = libgd egg-list-box src data po $(am__append_1) +SUBDIRS = libgd egg-list-box src data man po $(am__append_1) DISTCHECK_CONFIGURE_FLAGS = --enable-getting-started EXTRA_DIST = \ autogen.sh \ @@ -446,13 +475,12 @@ # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. $(am__recursive_targets): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ diff -Nru gnome-documents-3.8.0/NEWS gnome-documents-3.8.3.1/NEWS --- gnome-documents-3.8.0/NEWS 2013-03-25 15:35:21.000000000 +0000 +++ gnome-documents-3.8.3.1/NEWS 2013-06-14 15:40:14.000000000 +0000 @@ -1,3 +1,48 @@ +3.8.3.1 - "Nostalgia" +===================== + +- Ignore Google documents without a thumbnail URI (Debarshi Ray) + +3.8.3 - "The Bridge" +==================== + +- Show thumbnails for Google Documents (Debarshi Ray) +- Add a manual page (Debarshi Ray) +- Don't forward key events to search bar on error (Debarshi Ray) +- Fix crash when trying to load links on a document that does not + support them (Debarshi Ray) +- Fix crash when trying to search into a document that does not support + it (Debarshi Ray) +- Fix hang when going back to overview after disabling a GOA + account while previewing or editing (Debarshi Ray) +- Fix stray unoconv process when loading is cancelled in-flight (Debarshi Ray) +- Fix a not working in overview (Debarshi Ray) +- Fix user input being incorrectly overwritten with the lowercase version + used internally (Debarshi Ray) + +3.8.2.1 +======= + +- Fix build + +3.8.2 - "Moving" +================ + +- Flip navigation buttons in RTL +- Update to latest libgd +- Translation updates + +3.8.1 - "Duster" +================ + +- Support rubberband selection in views (Alexander Larsson) +- Fix default response in Properties (Debarshi Ray) +- Fix prev/next page buttons not working in dual mode +- Fix bugs when launched from a search provider result +- Fix PDF from Google Drive not using the right document type +- Fix icon for Google Drawings +- Fix a crash when closing the preview soon after show + 3.8.0 - "Talkin' in My Sleep" ============================= diff -Nru gnome-documents-3.8.0/aclocal.m4 gnome-documents-3.8.3.1/aclocal.m4 --- gnome-documents-3.8.0/aclocal.m4 2013-03-25 15:35:50.000000000 +0000 +++ gnome-documents-3.8.3.1/aclocal.m4 2013-06-14 15:43:49.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.13.1 -*- Autoconf -*- +# generated automatically by aclocal 1.13.2 -*- Autoconf -*- -# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,1481 +20,1520 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +dnl GLIB_GSETTINGS +dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether +dnl the schema should be compiled +dnl -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -# (This private macro should not be called outside this file.) -AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.13' -dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to -dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.13.1], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl -]) +AC_DEFUN([GLIB_GSETTINGS], +[ + m4_pattern_allow([AM_V_GEN]) + AC_ARG_ENABLE(schemas-compile, + AS_HELP_STRING([--disable-schemas-compile], + [Disable regeneration of gschemas.compiled on install]), + [case ${enableval} in + yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;; + no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;; + esac]) + AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE]) + PKG_PROG_PKG_CONFIG([0.16]) + AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas]) + if test x$cross_compiling != xyes; then + GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` + else + AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas) + fi + AC_SUBST(GLIB_COMPILE_SCHEMAS) + if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then + ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2]) + else + ifelse([$1],,[:],[$1]) + fi -# _AM_AUTOCONF_VERSION(VERSION) -# ----------------------------- -# aclocal traces this macro to find the Autoconf version. -# This is a private macro too. Using m4_define simplifies -# the logic in aclocal, which can simply ignore this definition. -m4_define([_AM_AUTOCONF_VERSION], []) + GSETTINGS_RULES=' +.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. -# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.13.1])dnl -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) +mostlyclean-am: clean-gsettings-schemas -# AM_AUX_DIR_EXPAND -*- Autoconf -*- +gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +%.gschema.valid: %.gschema.xml $(gsettings__enum_file) + $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@ -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to -# '$srcdir', '$srcdir/..', or '$srcdir/../..'. -# -# Of course, Automake must honor this variable whenever it calls a -# tool from the auxiliary directory. The problem is that $srcdir (and -# therefore $ac_aux_dir as well) can be either absolute or relative, -# depending on how configure is run. This is pretty annoying, since -# it makes $ac_aux_dir quite unusable in subdirectories: in the top -# source directory, any form will work fine, but in subdirectories a -# relative path needs to be adjusted first. -# -# $ac_aux_dir/missing -# fails when called from a subdirectory if $ac_aux_dir is relative -# $top_srcdir/$ac_aux_dir/missing -# fails if $ac_aux_dir is absolute, -# fails when called from a subdirectory in a VPATH build with -# a relative $ac_aux_dir -# -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -# are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is '.', but things will broke when you -# start a VPATH build or use an absolute $srcdir. -# -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -# and then we would define $MISSING as -# MISSING="\${SHELL} $am_aux_dir/missing" -# This will work as long as MISSING is not called from configure, because -# unfortunately $(top_srcdir) has no meaning in configure. -# However there are other variables, like CC, which are often used in -# configure, and could therefore not use this "fixed" $ac_aux_dir. -# -# Another solution, used here, is to always expand $ac_aux_dir to an -# absolute PATH. The drawback is that using absolute paths prevent a -# configured tree to be moved without reconfiguration. +all-am: $(gsettings_SCHEMAS:.xml=.valid) +uninstall-am: uninstall-gsettings-schemas +install-data-am: install-gsettings-schemas -AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` -]) +.SECONDARY: $(gsettings_SCHEMAS) -# AM_CONDITIONAL -*- Autoconf -*- +install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) + @$(NORMAL_INSTALL) + if test -n "$^"; then \ + test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \ + $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \ + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \ + fi -# Copyright (C) 1997-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +uninstall-gsettings-schemas: + @$(NORMAL_UNINSTALL) + @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ([2.52])dnl - m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE])dnl -AC_SUBST([$1_FALSE])dnl -_AM_SUBST_NOTMAKE([$1_TRUE])dnl -_AM_SUBST_NOTMAKE([$1_FALSE])dnl -m4_define([_AM_COND_VALUE_$1], [$2])dnl -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([[conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]]) -fi])]) +clean-gsettings-schemas: + rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +ifdef gsettings_ENUM_NAMESPACE +$(gsettings__enum_file): $(gsettings_ENUM_FILES) + $(AM_V_GEN) glib-mkenums --comments '\'''\'' --fhead "" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " " --vtail " " --ftail "" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@ +endif +' + _GSETTINGS_SUBST(GSETTINGS_RULES) +]) +dnl _GSETTINGS_SUBST(VARIABLE) +dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST +AC_DEFUN([_GSETTINGS_SUBST], +[ +AC_SUBST([$1]) +m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) +] +) -# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... +dnl -*- mode: autoconf -*- +dnl Copyright 2009 Johan Dahlin +dnl +dnl This file is free software; the author(s) gives unlimited +dnl permission to copy and/or distribute it, with or without +dnl modifications, as long as this notice is preserved. +dnl +# serial 1 -# _AM_DEPENDENCIES(NAME) -# ---------------------- -# See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". -# We try a few techniques and use that to set a single cache variable. -# -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -# dependency, and given that the user is not expected to run this macro, -# just rely on AC_PROG_CC. -AC_DEFUN([_AM_DEPENDENCIES], -[AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -AC_REQUIRE([AM_MAKE_INCLUDE])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl +m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], +[ + AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([LT_INIT],[$0])dnl setup libtool first -m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], - [$1], [CXX], [depcc="$CXX" am_compiler_list=], - [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], - [$1], [UPC], [depcc="$UPC" am_compiler_list=], - [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) + dnl enable/disable introspection + m4_if([$2], [require], + [dnl + enable_introspection=yes + ],[dnl + AC_ARG_ENABLE(introspection, + AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], + [Enable introspection for this build]),, + [enable_introspection=auto]) + ])dnl -AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], -[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named 'D' -- because '-MD' means "put the output - # in D". - rm -rf conftest.dir - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub + AC_MSG_CHECKING([for gobject-introspection]) - am_cv_$1_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` - fi - am__universal=false - m4_case([$1], [CC], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac], - [CXX], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac]) + dnl presence/version checking + AS_CASE([$enable_introspection], + [no], [dnl + found_introspection="no (disabled, use --enable-introspection to enable)" + ],dnl + [yes],[dnl + PKG_CHECK_EXISTS([gobject-introspection-1.0],, + AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) + PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], + found_introspection=yes, + AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) + ],dnl + [auto],[dnl + PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) + dnl Canonicalize enable_introspection + enable_introspection=$found_introspection + ],dnl + [dnl + AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) + ])dnl - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with - # Solaris 10 /bin/sh. - echo '/* dummy */' > sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + AC_MSG_RESULT([$found_introspection]) - # We check with '-c' and '-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle '-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs. - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # After this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested. - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok '-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_$1_dependencies_compiler_type=$depmode - break - fi + INTROSPECTION_SCANNER= + INTROSPECTION_COMPILER= + INTROSPECTION_GENERATE= + INTROSPECTION_GIRDIR= + INTROSPECTION_TYPELIBDIR= + if test "x$found_introspection" = "xyes"; then + INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` + INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` + INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` + INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` + INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" + INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` + INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` + INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection fi - done + AC_SUBST(INTROSPECTION_SCANNER) + AC_SUBST(INTROSPECTION_COMPILER) + AC_SUBST(INTROSPECTION_GENERATE) + AC_SUBST(INTROSPECTION_GIRDIR) + AC_SUBST(INTROSPECTION_TYPELIBDIR) + AC_SUBST(INTROSPECTION_CFLAGS) + AC_SUBST(INTROSPECTION_LIBS) + AC_SUBST(INTROSPECTION_MAKEFILE) - cd .. - rm -rf conftest.dir -else - am_cv_$1_dependencies_compiler_type=none -fi -]) -AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -AM_CONDITIONAL([am__fastdep$1], [ - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) + AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") ]) -# AM_SET_DEPDIR -# ------------- -# Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES. -AC_DEFUN([AM_SET_DEPDIR], -[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -]) - +dnl Usage: +dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) -# AM_DEP_TRACK -# ------------ -AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE([dependency-tracking], [dnl -AS_HELP_STRING( - [--enable-dependency-tracking], - [do not reject slow dependency extractors]) -AS_HELP_STRING( - [--disable-dependency-tracking], - [speeds up one-time build])]) -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' - am__nodep='_no' -fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH])dnl -_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl -AC_SUBST([am__nodep])dnl -_AM_SUBST_NOTMAKE([am__nodep])dnl +AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], +[ + _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) ]) -# Generate code to set up dependency tracking. -*- Autoconf -*- - -# Copyright (C) 1999-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - - -# _AM_OUTPUT_DEPENDENCY_COMMANDS -# ------------------------------ -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[{ - # Older Autoconf quotes --file arguments for eval, but not when files - # are listed without --file. Let's play safe and only enable the eval - # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac - shift - for mf - do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done - done -} -])# _AM_OUTPUT_DEPENDENCY_COMMANDS +dnl Usage: +dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) -# AM_OUTPUT_DEPENDENCY_COMMANDS -# ----------------------------- -# This macro should only be invoked once -- use via AC_REQUIRE. -# -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each '.P' file that we will -# need in order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -[AC_CONFIG_COMMANDS([depfiles], - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], +[ + _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) ]) -# Do all the work for Automake. -*- Autoconf -*- - -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) +# +# Copyright © 2004 Scott James Remnant . # -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. -# This macro actually does too much. Some checks are only needed if -# your package does certain things. But this isn't really a big deal. +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.65])dnl -dnl Autoconf wants to disallow AM_ names. We explicitly allow -dnl the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -AC_REQUIRE([AC_PROG_INSTALL])dnl -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) - fi +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi +fi[]dnl +])# PKG_PROG_PKG_CONFIG -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi -AC_SUBST([CYGPATH_W]) +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +# only at the first occurence in configure.ac, so if the first place +# it's called might be skipped (such as if it is within an "if", you +# have to call PKG_CHECK_EXISTS manually +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_default([$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[AC_DIAGNOSE([obsolete], - [$0: two- and three-arguments forms are deprecated.]) -m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl -dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if( - m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), - [ok:ok],, - [m4_fatal([AC_INIT should be called with package and version arguments])])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], + [pkg_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) - AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) -AM_MISSING_PROG([AUTOCONF], [autoconf]) -AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) -AM_MISSING_PROG([AUTOHEADER], [autoheader]) -AM_MISSING_PROG([MAKEINFO], [makeinfo]) -AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -# For better backward compatibility. To be removed once Automake 1.9.x -# dies out for good. For more background, see: -# -# -AC_SUBST([mkdir_p], ['$(MKDIR_P)']) -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_SET_LEADING_DOT])dnl -_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES([CC])], - [m4_define([AC_PROG_CC], - m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES([CXX])], - [m4_define([AC_PROG_CXX], - m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl -AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES([OBJC])], - [m4_define([AC_PROG_OBJC], - m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl -AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], - [_AM_DEPENDENCIES([OBJCXX])], - [m4_define([AC_PROG_OBJCXX], - m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl -]) -AC_REQUIRE([AM_SILENT_RULES])dnl -dnl The testsuite driver may need to know about EXEEXT, so add the -dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This -dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. -AC_CONFIG_COMMANDS_PRE(dnl -[m4_provide_if([_AM_COMPILER_EXEEXT], - [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) -dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not -dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further -dnl mangled by Autoconf and run in a shell conditional statement. -m4_define([_AC_COMPILER_EXEEXT], -m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl +pkg_failed=no +AC_MSG_CHECKING([for $1]) -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. The stamp files are numbered to have different names. +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -# loop where config.status creates the headers, so we can generate -# our stamp files there. -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -[# Compute $1's index in $config_headers. -_am_arg=$1 -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD -# AM_PROG_INSTALL_SH -# ------------------ -# Define $install_sh. -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; - *) - install_sh="\${SHELL} $am_aux_dir/install-sh" - esac -fi -AC_SUBST([install_sh])]) + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: -# Copyright (C) 2003-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +$$1_PKG_ERRORS -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. -# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- -# From Jim Meyering +_PKG_TEXT])[]dnl + ]) +elif test $pkg_failed = untried; then + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. -# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +_PKG_TEXT -# AM_MAINTAINER_MODE([DEFAULT-MODE]) -# ---------------------------------- -# Control maintainer-specific portions of Makefiles. -# Default is to disable them, unless 'enable' is passed literally. -# For symmetry, 'disable' may be passed as well. Anyway, the user -# can override the default with the --enable/--disable switch. -AC_DEFUN([AM_MAINTAINER_MODE], -[m4_case(m4_default([$1], [disable]), - [enable], [m4_define([am_maintainer_other], [disable])], - [disable], [m4_define([am_maintainer_other], [enable])], - [m4_define([am_maintainer_other], [enable]) - m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) - dnl maintainer-mode's default is 'disable' unless 'enable' is passed - AC_ARG_ENABLE([maintainer-mode], - [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], - am_maintainer_other[ make rules and dependencies not useful - (and sometimes confusing) to the casual installer])], - [USE_MAINTAINER_MODE=$enableval], - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) - AC_MSG_RESULT([$USE_MAINTAINER_MODE]) - AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) - MAINT=$MAINTAINER_MODE_TRUE - AC_SUBST([MAINT])dnl -] -) +To get pkg-config, see .])[]dnl + ]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])# PKG_CHECK_MODULES -# Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# PKG_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable pkgconfigdir as the location where a module +# should install pkg-config .pc files. By default the directory is +# $libdir/pkgconfig, but the default can be changed by passing +# DIRECTORY. The user can override through the --with-pkgconfigdir +# parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_INSTALLDIR -# AM_MAKE_INCLUDE() -# ----------------- -# Check to see how make treats includes. -AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo this is the am__doit target -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# PKG_NOARCH_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable noarch_pkgconfigdir as the location where a +# module should install arch-independent pkg-config .pc files. By +# default the directory is $datadir/pkgconfig, but the default can be +# changed by passing DIRECTORY. The user can override through the +# --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_NOARCH_INSTALLDIR + +# Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# AM_PROG_CC_C_O -# -------------- -# Like AC_PROG_CC_C_O, but changed for automake. -AC_DEFUN([AM_PROG_CC_C_O], -[AC_REQUIRE([AC_PROG_CC_C_O])dnl -AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -dnl Make sure AC_PROG_CC is never called again, or it will override our -dnl setting of CC. -m4_define([AC_PROG_CC], - [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +# (This private macro should not be called outside this file.) +AC_DEFUN([AM_AUTOMAKE_VERSION], +[am__api_version='1.13' +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +dnl require some minimum version. Point them to the right macro. +m4_if([$1], [1.13.2], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) -# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +[AM_AUTOMAKE_VERSION([1.13.2])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) + +# AM_AUX_DIR_EXPAND -*- Autoconf -*- + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# AM_MISSING_PROG(NAME, PROGRAM) -# ------------------------------ -AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -$1=${$1-"${am_missing_run}$2"} -AC_SUBST($1)]) +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. +# +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. +# +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir +# +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is '.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. +# +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. -# AM_MISSING_HAS_RUN -# ------------------ -# Define MISSING if not defined so far and test if it is modern enough. -# If it is, set am_missing_run to use it, otherwise, to nothing. -AC_DEFUN([AM_MISSING_HAS_RUN], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([missing])dnl -if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac -fi -# Use eval to expand $SHELL -if eval "$MISSING --is-lightweight"; then - am_missing_run="$MISSING " -else - am_missing_run= - AC_MSG_WARN(['missing' script is too old or missing]) -fi +AC_DEFUN([AM_AUX_DIR_EXPAND], +[dnl Rely on autoconf to set up CDPATH properly. +AC_PREREQ([2.50])dnl +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` ]) -# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# AM_CONDITIONAL -*- Autoconf -*- + +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# AM_PROG_MKDIR_P -# --------------- -# Check for 'mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl FIXME to be removed in Automake 1.14. -AC_DIAGNOSE([obsolete], -[$0: this macro is deprecated, and will soon be removed. -You should use the Autoconf-provided 'AC][_PROG_MKDIR_P' macro instead, -and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am files.]) -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) - -# Helper functions for option handling. -*- Autoconf -*- +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl +m4_define([_AM_COND_VALUE_$1], [$2])dnl +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - -# _AM_SET_OPTION(NAME) -# -------------------- -# Set option NAME. Presently that only means defining a flag for this option. -AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) -# _AM_SET_OPTIONS(OPTIONS) -# ------------------------ -# OPTIONS is a space-separated list of Automake options. -AC_DEFUN([_AM_SET_OPTIONS], -[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -# ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# _AM_DEPENDENCIES(NAME) +# ---------------------- +# See how the compiler implements dependency checking. +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". +# We try a few techniques and use that to set a single cache variable. # -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl -# AM_RUN_LOG(COMMAND) -# ------------------- -# Run COMMAND, save the exit status in ac_status, and log it. -# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) -AC_DEFUN([AM_RUN_LOG], -[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD - ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - (exit $ac_status); }]) +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) + +AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi + am__universal=false + m4_case([$1], [CC], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac], + [CXX], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac]) + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf -# Check to make sure that the build environment is sane. -*- Autoconf -*- + # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_$1_dependencies_compiler_type=$depmode + break + fi + fi + done -# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. + cd .. + rm -rf conftest.dir +else + am_cv_$1_dependencies_compiler_type=none +fi +]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +]) -# AM_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Reject unsafe characters in $srcdir or the absolute working directory -# name. Accept space and tab only in the latter. -am_lf=' -' -case `pwd` in - *[[\\\"\#\$\&\'\`$am_lf]]*) - AC_MSG_ERROR([unsafe absolute working directory name]);; -esac -case $srcdir in - *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; -esac -# Do 'set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - am_has_slept=no - for am_try in 1 2; do - echo "timestamp, slept: $am_has_slept" > conftest.file - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. +AC_DEFUN([AM_SET_DEPDIR], +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +]) - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken - alias in your environment]) - fi - if test "$[2]" = conftest.file || test $am_try -eq 2; then - break - fi - # Just in case. - sleep 1 - am_has_slept=yes - done - test "$[2]" = conftest.file - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -AC_MSG_RESULT([yes]) -# If we didn't sleep, we still need to ensure time stamps of config.status and -# generated files are strictly newer. -am_sleep_pid= -if grep 'slept: no' conftest.file >/dev/null 2>&1; then - ( sleep 1 ) & - am_sleep_pid=$! + +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + am__nodep='_no' fi -AC_CONFIG_COMMANDS_PRE( - [AC_MSG_CHECKING([that generated files are newer than configure]) - if test -n "$am_sleep_pid"; then - # Hide warnings about reused PIDs. - wait $am_sleep_pid 2>/dev/null - fi - AC_MSG_RESULT([done])]) -rm -f conftest.file +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +AC_SUBST([AMDEPBACKSLASH])dnl +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl ]) -# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# Generate code to set up dependency tracking. -*- Autoconf -*- + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# AM_SILENT_RULES([DEFAULT]) -# -------------------------- -# Enable less verbose build rules; with the default set to DEFAULT -# ("yes" being less verbose, "no" or empty being verbose). -AC_DEFUN([AM_SILENT_RULES], -[AC_ARG_ENABLE([silent-rules], [dnl -AS_HELP_STRING( - [--enable-silent-rules], - [less verbose build output (undo: "make V=1")]) -AS_HELP_STRING( - [--disable-silent-rules], - [verbose build output (undo: "make V=0")])dnl -]) -case $enable_silent_rules in @%:@ ((( - yes) AM_DEFAULT_VERBOSITY=0;; - no) AM_DEFAULT_VERBOSITY=1;; - *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; -esac -dnl -dnl A few 'make' implementations (e.g., NonStop OS and NextStep) -dnl do not support nested variable expansions. -dnl See automake bug#9928 and bug#10237. -am_make=${MAKE-make} -AC_CACHE_CHECK([whether $am_make supports nested variables], - [am_cv_make_support_nested_variables], - [if AS_ECHO([['TRUE=$(BAR$(V)) -BAR0=false -BAR1=true -V=1 -am__doit: - @$(TRUE) -.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then - am_cv_make_support_nested_variables=yes -else - am_cv_make_support_nested_variables=no -fi]) -if test $am_cv_make_support_nested_variables = yes; then - dnl Using '$V' instead of '$(V)' breaks IRIX make. - AM_V='$(V)' - AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' -else - AM_V=$AM_DEFAULT_VERBOSITY - AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY -fi -AC_SUBST([AM_V])dnl -AM_SUBST_NOTMAKE([AM_V])dnl -AC_SUBST([AM_DEFAULT_V])dnl -AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl -AC_SUBST([AM_DEFAULT_VERBOSITY])dnl -AM_BACKSLASH='\' -AC_SUBST([AM_BACKSLASH])dnl -_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl -]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[{ + # Older Autoconf quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named 'Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running 'make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "$am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done + done +} +])# _AM_OUTPUT_DEPENDENCY_COMMANDS + + +# AM_OUTPUT_DEPENDENCY_COMMANDS +# ----------------------------- +# This macro should only be invoked once -- use via AC_REQUIRE. # -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each '.P' file that we will +# need in order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +]) -# AM_PROG_INSTALL_STRIP -# --------------------- -# One issue with vendor 'install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially -# annoying in cross-compiling environments, where the build's strip -# is unlikely to handle the host's binaries. -# Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in "make install-strip", and initialize -# STRIPPROG with the value of the STRIP variable (set by the user). -AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using 'strip' when the user -# run "make install-strip". However 'strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the 'STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -AC_SUBST([INSTALL_STRIP_PROGRAM])]) +# Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 2006-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# _AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. -# This macro is traced by Automake. -AC_DEFUN([_AM_SUBST_NOTMAKE]) +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. -# AM_SUBST_NOTMAKE(VARIABLE) -# -------------------------- -# Public sister of _AM_SUBST_NOTMAKE. -AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_PREREQ([2.65])dnl +dnl Autoconf wants to disallow AM_ names. We explicitly allow +dnl the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])dnl +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi +fi -# Check how to create a tarball. -*- Autoconf -*- +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +AC_SUBST([CYGPATH_W]) -# Copyright (C) 2004-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl -# _AM_PROG_TAR(FORMAT) -# -------------------- -# Check how to create a tarball in format FORMAT. -# FORMAT should be one of 'v7', 'ustar', or 'pax'. -# -# Substitute a variable $(am__tar) that is a command -# writing to stdout a FORMAT-tarball containing the directory -# $tardir. -# tardir=directory && $(am__tar) > result.tar -# -# Substitute a variable $(am__untar) that extract such -# a tarball read from stdin. -# $(am__untar) < result.tar -AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. Yes, it's still used -# in the wild :-( We should find a proper way to deprecate it ... -AC_SUBST([AMTAR], ['$${TAR-tar}']) -m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of '-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl + +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_REQUIRE([AM_SET_LEADING_DOT])dnl +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl +]) +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_CONFIG_COMMANDS_PRE(dnl +[m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl +]) - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +dnl mangled by Autoconf and run in a shell conditional statement. +m4_define([_AC_COMPILER_EXEEXT], +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) - rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -AC_SUBST([am__tar]) -AC_SUBST([am__untar]) -]) # _AM_PROG_TAR +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant . -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[# Compute $1's index in $config_headers. +_am_arg=$1 +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- -AC_DEFUN([PKG_PROG_PKG_CONFIG], -[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) -m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) -AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) -AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=m4_default([$1], [0.9.0]) - AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - PKG_CONFIG="" - fi -fi[]dnl -])# PKG_PROG_PKG_CONFIG +AC_SUBST([install_sh])]) -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# Copyright (C) 2003-2013 Free Software Foundation, Inc. # -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# have to call PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_EXISTS], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -if test -n "$PKG_CONFIG" && \ - AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_default([$2], [:]) -m4_ifvaln([$3], [else - $3])dnl -fi]) - -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- -m4_define([_PKG_CONFIG], -[if test -n "$$1"; then - pkg_cv_[]$1="$$1" - elif test -n "$PKG_CONFIG"; then - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes ], - [pkg_failed=yes]) - else - pkg_failed=untried -fi[]dnl -])# _PKG_CONFIG +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. else - _pkg_short_errors_supported=no -fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +# From Jim Meyering -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_MODULES], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -pkg_failed=no -AC_MSG_CHECKING([for $1]) +# AM_MAINTAINER_MODE([DEFAULT-MODE]) +# ---------------------------------- +# Control maintainer-specific portions of Makefiles. +# Default is to disable them, unless 'enable' is passed literally. +# For symmetry, 'disable' may be passed as well. Anyway, the user +# can override the default with the --enable/--disable switch. +AC_DEFUN([AM_MAINTAINER_MODE], +[m4_case(m4_default([$1], [disable]), + [enable], [m4_define([am_maintainer_other], [disable])], + [disable], [m4_define([am_maintainer_other], [enable])], + [m4_define([am_maintainer_other], [enable]) + m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) +AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode's default is 'disable' unless 'enable' is passed + AC_ARG_ENABLE([maintainer-mode], + [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], + am_maintainer_other[ make rules and dependencies not useful + (and sometimes confusing) to the casual installer])], + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST([MAINT])dnl +] +) -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) +# Check to see how 'make' treats includes. -*- Autoconf -*- -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -and $1[]_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details.]) +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) - _PKG_SHORT_ERRORS_SUPPORTED - if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD +# AM_MAKE_INCLUDE() +# ----------------- +# Check to see how make treats includes. +AC_DEFUN([AM_MAKE_INCLUDE], +[am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo this is the am__doit target +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +AC_MSG_CHECKING([for style of include used by $am_make]) +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from 'make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac +fi +AC_SUBST([am__include]) +AC_SUBST([am__quote]) +AC_MSG_RESULT([$_am_result]) +rm -f confinc confmf +]) - m4_default([$4], [AC_MSG_ERROR( -[Package requirements ($2) were not met: +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -$$1_PKG_ERRORS +# AM_PROG_CC_C_O +# -------------- +# Like AC_PROG_CC_C_O, but changed for automake. +AC_DEFUN([AM_PROG_CC_C_O], +[AC_REQUIRE([AC_PROG_CC_C_O])dnl +AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +# FIXME: we rely on the cache variable name because +# there is no other way. +set dummy $CC +am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` +eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o +if test "$am_t" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +dnl Make sure AC_PROG_CC is never called again, or it will override our +dnl setting of CC. +m4_define([AC_PROG_CC], + [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) +]) -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -_PKG_TEXT])[]dnl - ]) -elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) - m4_default([$4], [AC_MSG_FAILURE( -[The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -_PKG_TEXT +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) -To get pkg-config, see .])[]dnl - ]) +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([missing])dnl +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi +# Use eval to expand $SHELL +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - AC_MSG_RESULT([yes]) - $3 -fi[]dnl -])# PKG_CHECK_MODULES - + am_missing_run= + AC_MSG_WARN(['missing' script is too old or missing]) +fi +]) -# PKG_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable pkgconfigdir as the location where a module -# should install pkg-config .pc files. By default the directory is -# $libdir/pkgconfig, but the default can be changed by passing -# DIRECTORY. The user can override through the --with-pkgconfigdir -# parameter. -AC_DEFUN([PKG_INSTALLDIR], -[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) -m4_pushdef([pkg_description], - [pkg-config installation directory @<:@]pkg_default[@:>@]) -AC_ARG_WITH([pkgconfigdir], - [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, - [with_pkgconfigdir=]pkg_default) -AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) -m4_popdef([pkg_default]) -m4_popdef([pkg_description]) -]) dnl PKG_INSTALLDIR +# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. +# AM_PROG_MKDIR_P +# --------------- +# Check for 'mkdir -p'. +AC_DEFUN([AM_PROG_MKDIR_P], +[AC_PREREQ([2.60])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +dnl FIXME we are no longer going to remove this! adjust warning +dnl FIXME message accordingly. +AC_DIAGNOSE([obsolete], +[$0: this macro is deprecated, and will soon be removed. +You should use the Autoconf-provided 'AC][_PROG_MKDIR_P' macro instead, +and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am files.]) +dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, +dnl while keeping a definition of mkdir_p for backward compatibility. +dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. +dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of +dnl Makefile.ins that do not define MKDIR_P, so we do our own +dnl adjustment using top_builddir (which is defined more often than +dnl MKDIR_P). +AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl +case $mkdir_p in + [[\\/$]]* | ?:[[\\/]]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac +]) -# PKG_NOARCH_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable noarch_pkgconfigdir as the location where a -# module should install arch-independent pkg-config .pc files. By -# default the directory is $datadir/pkgconfig, but the default can be -# changed by passing DIRECTORY. The user can override through the -# --with-noarch-pkgconfigdir parameter. -AC_DEFUN([PKG_NOARCH_INSTALLDIR], -[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) -m4_pushdef([pkg_description], - [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) -AC_ARG_WITH([noarch-pkgconfigdir], - [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, - [with_noarch_pkgconfigdir=]pkg_default) -AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) -m4_popdef([pkg_default]) -m4_popdef([pkg_description]) -]) dnl PKG_NOARCH_INSTALLDIR +# Helper functions for option handling. -*- Autoconf -*- -dnl GLIB_GSETTINGS -dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether -dnl the schema should be compiled -dnl +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -AC_DEFUN([GLIB_GSETTINGS], -[ - m4_pattern_allow([AM_V_GEN]) - AC_ARG_ENABLE(schemas-compile, - AS_HELP_STRING([--disable-schemas-compile], - [Disable regeneration of gschemas.compiled on install]), - [case ${enableval} in - yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;; - no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;; - esac]) - AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE]) - PKG_PROG_PKG_CONFIG([0.16]) - AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas]) - if test x$cross_compiling != xyes; then - GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` - else - AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas) - fi - AC_SUBST(GLIB_COMPILE_SCHEMAS) - if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then - ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2]) - else - ifelse([$1],,[:],[$1]) - fi +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - GSETTINGS_RULES=' -.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas +# _AM_SET_OPTION(NAME) +# -------------------- +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) -mostlyclean-am: clean-gsettings-schemas +# _AM_SET_OPTIONS(OPTIONS) +# ------------------------ +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) -gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -%.gschema.valid: %.gschema.xml $(gsettings__enum_file) - $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@ +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -all-am: $(gsettings_SCHEMAS:.xml=.valid) -uninstall-am: uninstall-gsettings-schemas -install-data-am: install-gsettings-schemas +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) -.SECONDARY: $(gsettings_SCHEMAS) +# Check to make sure that the build environment is sane. -*- Autoconf -*- -install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) - @$(NORMAL_INSTALL) - if test -n "$^"; then \ - test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \ - $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \ - test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \ - fi +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -uninstall-gsettings-schemas: - @$(NORMAL_UNINSTALL) - @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files - test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[[\\\"\#\$\&\'\`$am_lf]]*) + AC_MSG_ERROR([unsafe absolute working directory name]);; +esac +case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; +esac -clean-gsettings-schemas: - rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) +# Do 'set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then -ifdef gsettings_ENUM_NAMESPACE -$(gsettings__enum_file): $(gsettings_ENUM_FILES) - $(AM_V_GEN) glib-mkenums --comments '\'''\'' --fhead "" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " " --vtail " " --ftail "" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@ -endif -' - _GSETTINGS_SUBST(GSETTINGS_RULES) + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done + test "$[2]" = conftest.file + ) +then + # Ok. + : +else + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) +fi +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file ]) -dnl _GSETTINGS_SUBST(VARIABLE) -dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST -AC_DEFUN([_GSETTINGS_SUBST], -[ -AC_SUBST([$1]) -m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) -] -) +# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -dnl -*- mode: autoconf -*- -dnl Copyright 2009 Johan Dahlin -dnl -dnl This file is free software; the author(s) gives unlimited -dnl permission to copy and/or distribute it, with or without -dnl modifications, as long as this notice is preserved. +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# ("yes" being less verbose, "no" or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac dnl +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) -# serial 1 +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], -[ - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([LT_INIT],[$0])dnl setup libtool first +# AM_PROG_INSTALL_STRIP +# --------------------- +# One issue with vendor 'install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in "make install-strip", and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) - dnl enable/disable introspection - m4_if([$2], [require], - [dnl - enable_introspection=yes - ],[dnl - AC_ARG_ENABLE(introspection, - AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], - [Enable introspection for this build]),, - [enable_introspection=auto]) - ])dnl +# Copyright (C) 2006-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - AC_MSG_CHECKING([for gobject-introspection]) +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) - dnl presence/version checking - AS_CASE([$enable_introspection], - [no], [dnl - found_introspection="no (disabled, use --enable-introspection to enable)" - ],dnl - [yes],[dnl - PKG_CHECK_EXISTS([gobject-introspection-1.0],, - AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], - found_introspection=yes, - AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) - ],dnl - [auto],[dnl - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) - dnl Canonicalize enable_introspection - enable_introspection=$found_introspection - ],dnl - [dnl - AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) - ])dnl +# AM_SUBST_NOTMAKE(VARIABLE) +# -------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) - AC_MSG_RESULT([$found_introspection]) +# Check how to create a tarball. -*- Autoconf -*- - INTROSPECTION_SCANNER= - INTROSPECTION_COMPILER= - INTROSPECTION_GENERATE= - INTROSPECTION_GIRDIR= - INTROSPECTION_TYPELIBDIR= - if test "x$found_introspection" = "xyes"; then - INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` - INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection - fi - AC_SUBST(INTROSPECTION_SCANNER) - AC_SUBST(INTROSPECTION_COMPILER) - AC_SUBST(INTROSPECTION_GENERATE) - AC_SUBST(INTROSPECTION_GIRDIR) - AC_SUBST(INTROSPECTION_TYPELIBDIR) - AC_SUBST(INTROSPECTION_CFLAGS) - AC_SUBST(INTROSPECTION_LIBS) - AC_SUBST(INTROSPECTION_MAKEFILE) +# Copyright (C) 2004-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") -]) +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +# +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -dnl Usage: -dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], -AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], -[ - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) -]) + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac -dnl Usage: -dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done + rm -rf conftest.dir + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], -[ - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) -]) +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR m4_include([libgd/libgd.m4]) m4_include([m4/ax_config_dir.m4]) diff -Nru gnome-documents-3.8.0/config/config.guess gnome-documents-3.8.3.1/config/config.guess --- gnome-documents-3.8.0/config/config.guess 2013-02-27 18:40:45.000000000 +0000 +++ gnome-documents-3.8.3.1/config/config.guess 2013-06-14 15:43:50.000000000 +0000 @@ -1,10 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012, 2013 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2012-12-29' +timestamp='2013-04-24' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -26,7 +24,7 @@ # program. This Exception is an additional permission under section 7 # of the GNU General Public License, version 3 ("GPLv3"). # -# Originally written by Per Bothner. +# Originally written by Per Bothner. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD @@ -52,9 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, -2012, 2013 Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -887,6 +883,9 @@ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ @@ -925,6 +924,11 @@ #ifdef __dietlibc__ LIBC=dietlibc #endif + #else + #include + #ifdef __UCLIBC__ + LIBC=uclibc + #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` echo "${UNAME_MACHINE}-pc-linux-${LIBC}" @@ -957,6 +961,9 @@ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; or32:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; @@ -999,7 +1006,9 @@ echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + LIBC=gnu + test -r /lib/libc.so && od -An -S13 /lib/libc.so | grep -q __uClibc_main && LIBC=uclibc + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu diff -Nru gnome-documents-3.8.0/config/config.sub gnome-documents-3.8.3.1/config/config.sub --- gnome-documents-3.8.0/config/config.sub 2013-02-27 18:40:45.000000000 +0000 +++ gnome-documents-3.8.3.1/config/config.sub 2013-06-14 15:43:50.000000000 +0000 @@ -1,10 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012, 2013 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2012-12-29' +timestamp='2013-04-24' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -70,9 +68,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, -2012, 2013 Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -256,7 +252,7 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc \ + | arc | arceb \ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ | avr | avr32 \ | be32 | be64 \ @@ -290,16 +286,17 @@ | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ | nds32 | nds32le | nds32be \ - | nios | nios2 \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ | open8 \ - | or32 \ + | or1k | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ @@ -369,7 +366,7 @@ | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | be32-* | be64-* \ @@ -407,12 +404,13 @@ | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ | orion-* \ @@ -1354,7 +1352,7 @@ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ @@ -1500,9 +1498,6 @@ -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; @@ -1594,6 +1589,9 @@ mips*-*) os=-elf ;; + or1k-*) + os=-elf + ;; or32-*) os=-coff ;; diff -Nru gnome-documents-3.8.0/configure gnome-documents-3.8.3.1/configure --- gnome-documents-3.8.0/configure 2013-03-25 15:35:51.000000000 +0000 +++ gnome-documents-3.8.3.1/configure 2013-06-14 15:43:50.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for gnome-documents 3.8.0. +# Generated by GNU Autoconf 2.69 for gnome-documents 3.8.3.1. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='gnome-documents' PACKAGE_TARNAME='gnome-documents' -PACKAGE_VERSION='3.8.0' -PACKAGE_STRING='gnome-documents 3.8.0' +PACKAGE_VERSION='3.8.3.1' +PACKAGE_STRING='gnome-documents 3.8.3.1' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -642,6 +642,10 @@ LIBGD_GIR_INCLUDES LIBGD_LIBS LIBGD_CFLAGS +LIBGD__VIEW_COMMON_FALSE +LIBGD__VIEW_COMMON_TRUE +LIBGD__HEADER_BUTTON_FALSE +LIBGD__HEADER_BUTTON_TRUE LIBGD_GIR_FALSE LIBGD_GIR_TRUE LIBGD_VAPI_FALSE @@ -656,14 +660,10 @@ LIBGD_NOTIFICATION_TRUE LIBGD_MARGIN_CONTAINER_FALSE LIBGD_MARGIN_CONTAINER_TRUE -LIBGD__HEADER_BUTTON_FALSE -LIBGD__HEADER_BUTTON_TRUE LIBGD_HEADER_BAR_FALSE LIBGD_HEADER_BAR_TRUE LIBGD_MAIN_TOOLBAR_FALSE LIBGD_MAIN_TOOLBAR_TRUE -LIBGD__VIEW_COMMON_FALSE -LIBGD__VIEW_COMMON_TRUE LIBGD_MAIN_LIST_VIEW_FALSE LIBGD_MAIN_LIST_VIEW_TRUE LIBGD_MAIN_ICON_VIEW_FALSE @@ -679,6 +679,7 @@ MINER_CFLAGS DOCUMENTS_LIBS DOCUMENTS_CFLAGS +XSLTPROC LIBM GETTING_STARTED_RULES ENABLE_GETTING_STARTED_FALSE @@ -1459,7 +1460,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gnome-documents 3.8.0 to adapt to many kinds of systems. +\`configure' configures gnome-documents 3.8.3.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1530,7 +1531,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gnome-documents 3.8.0:";; + short | recursive ) echo "Configuration of gnome-documents 3.8.3.1:";; esac cat <<\_ACEOF @@ -1668,7 +1669,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gnome-documents configure 3.8.0 +gnome-documents configure 3.8.3.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2067,7 +2068,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gnome-documents $as_me 3.8.0, which was +It was created by gnome-documents $as_me 3.8.3.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3050,7 +3051,7 @@ # Define the identity of the package. PACKAGE='gnome-documents' - VERSION='3.8.0' + VERSION='3.8.3.1' cat >>confdefs.h <<_ACEOF @@ -3091,86 +3092,125 @@ AMTAR='$${TAR-tar}' -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 -$as_echo_n "checking how to create a ustar tar archive... " >&6; } -# Loop over all known methods to create a tar archive until one works. +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar plaintar pax cpio none' -_am_tools=${am_cv_prog_tar_ustar-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of '-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - { echo "$as_me:$LINENO: $_am_tar --version" >&5 + +# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5 +$as_echo_n "checking whether UID '$am_uid' is supported by ustar format... " >&6; } + if test $am_uid -le $am_max_uid; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + _am_tools=none + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5 +$as_echo_n "checking whether GID '$am_gid' is supported by ustar format... " >&6; } + if test $am_gid -le $am_max_gid; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + _am_tools=none + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 +$as_echo_n "checking how to create a ustar tar archive... " >&6; } + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_ustar-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + { echo "$as_me:$LINENO: $_am_tar --version" >&5 ($_am_tar --version) >&5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && break - done - am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x ustar -w "$$tardir"' - am__tar_='pax -L -x ustar -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H ustar -L' - am__tar_='find "$tardir" -print | cpio -o -H ustar -L' - am__untar='cpio -i -H ustar -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_ustar}" && break + done + am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x ustar -w "$$tardir"' + am__tar_='pax -L -x ustar -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H ustar -L' + am__tar_='find "$tardir" -print | cpio -o -H ustar -L' + am__untar='cpio -i -H ustar -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_ustar}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } - rm -rf conftest.dir - if test -s conftest.tar; then - { echo "$as_me:$LINENO: $am__untar &5 + rm -rf conftest.dir + if test -s conftest.tar; then + { echo "$as_me:$LINENO: $am__untar &5 ($am__untar &5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } - grep GrepMe conftest.dir/file >/dev/null 2>&1 && break - fi -done -rm -rf conftest.dir + { echo "$as_me:$LINENO: cat conftest.dir/file" >&5 + (cat conftest.dir/file) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break + fi + done + rm -rf conftest.dir -if ${am_cv_prog_tar_ustar+:} false; then : + if ${am_cv_prog_tar_ustar+:} false; then : $as_echo_n "(cached) " >&6 else am_cv_prog_tar_ustar=$_am_tool fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 $as_echo "$am_cv_prog_tar_ustar" >&6; } @@ -3178,6 +3218,7 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -19359,7 +19400,7 @@ svgname=$(srcdir)/$(patsubst %.pdf,%.svg,$@); \ inkscape -z -A "$@" "$$svgname" -$(_HELP_PDF_OUTPUTS): $(_HELP_LC_PDFS) +$(_HELP_PDF_OUTPUTS): $(_HELP_LC_PDFS) $(_HELP_C_PDFS) lc=`dirname $@`; \ files="$(foreach f,$(_HELP_PDFFILES),$$lc/$(f))"; \ pdfunite $$files "$$lc/$(_HELP_OUTPUT)"; \ @@ -19697,6 +19738,47 @@ ZAPOJIT_MIN_VERSION=0.0.2 SOUP_MIN_VERSION=2.41.3 +# Extract the first word of "xsltproc", so it can be a program name with args. +set dummy xsltproc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_XSLTPROC+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $XSLTPROC in + [\\/]* | ?:[\\/]*) + ac_cv_path_XSLTPROC="$XSLTPROC" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +XSLTPROC=$ac_cv_path_XSLTPROC +if test -n "$XSLTPROC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5 +$as_echo "$XSLTPROC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DOCUMENTS" >&5 @@ -20137,21 +20219,6 @@ - # _view-common: - if true; then - LIBGD__VIEW_COMMON_TRUE= - LIBGD__VIEW_COMMON_FALSE='#' -else - LIBGD__VIEW_COMMON_TRUE='#' - LIBGD__VIEW_COMMON_FALSE= -fi - - - -$as_echo "#define LIBGD__VIEW_COMMON 1" >>confdefs.h - - - # main-toolbar: if true; then LIBGD_MAIN_TOOLBAR_TRUE= @@ -20184,21 +20251,6 @@ - # _header-button: - if true; then - LIBGD__HEADER_BUTTON_TRUE= - LIBGD__HEADER_BUTTON_FALSE='#' -else - LIBGD__HEADER_BUTTON_TRUE='#' - LIBGD__HEADER_BUTTON_FALSE= -fi - - - -$as_echo "#define LIBGD__HEADER_BUTTON 1" >>confdefs.h - - - # margin-container: if true; then LIBGD_MARGIN_CONTAINER_TRUE= @@ -20255,6 +20307,7 @@ + $as_echo "#define LIBGD_STACK 1" >>confdefs.h @@ -20385,6 +20438,36 @@ + # _header-button: + if true; then + LIBGD__HEADER_BUTTON_TRUE= + LIBGD__HEADER_BUTTON_FALSE='#' +else + LIBGD__HEADER_BUTTON_TRUE='#' + LIBGD__HEADER_BUTTON_FALSE= +fi + + + +$as_echo "#define LIBGD__HEADER_BUTTON 1" >>confdefs.h + + + + # _view-common: + if true; then + LIBGD__VIEW_COMMON_TRUE= + LIBGD__VIEW_COMMON_FALSE='#' +else + LIBGD__VIEW_COMMON_TRUE='#' + LIBGD__VIEW_COMMON_FALSE= +fi + + + +$as_echo "#define LIBGD__VIEW_COMMON 1" >>confdefs.h + + + pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGD" >&5 @@ -20527,7 +20610,7 @@ -ac_config_files="$ac_config_files Makefile libgd/Makefile src/Makefile data/Makefile data/icons/Makefile data/gnome-documents.desktop.in getting-started/Makefile po/Makefile.in" +ac_config_files="$ac_config_files Makefile libgd/Makefile src/Makefile data/Makefile data/icons/Makefile data/gnome-documents.desktop.in getting-started/Makefile man/Makefile po/Makefile.in" cat >confcache <<\_ACEOF @@ -20707,10 +20790,6 @@ as_fn_error $? "conditional \"LIBGD_MAIN_LIST_VIEW\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${LIBGD__VIEW_COMMON_TRUE}" && test -z "${LIBGD__VIEW_COMMON_FALSE}"; then - as_fn_error $? "conditional \"LIBGD__VIEW_COMMON\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${LIBGD_MAIN_TOOLBAR_TRUE}" && test -z "${LIBGD_MAIN_TOOLBAR_FALSE}"; then as_fn_error $? "conditional \"LIBGD_MAIN_TOOLBAR\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -20719,10 +20798,6 @@ as_fn_error $? "conditional \"LIBGD_HEADER_BAR\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${LIBGD__HEADER_BUTTON_TRUE}" && test -z "${LIBGD__HEADER_BUTTON_FALSE}"; then - as_fn_error $? "conditional \"LIBGD__HEADER_BUTTON\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${LIBGD_MARGIN_CONTAINER_TRUE}" && test -z "${LIBGD_MARGIN_CONTAINER_FALSE}"; then as_fn_error $? "conditional \"LIBGD_MARGIN_CONTAINER\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -20755,6 +20830,14 @@ as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${LIBGD__HEADER_BUTTON_TRUE}" && test -z "${LIBGD__HEADER_BUTTON_FALSE}"; then + as_fn_error $? "conditional \"LIBGD__HEADER_BUTTON\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${LIBGD__VIEW_COMMON_TRUE}" && test -z "${LIBGD__VIEW_COMMON_FALSE}"; then + as_fn_error $? "conditional \"LIBGD__VIEW_COMMON\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -21152,7 +21235,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gnome-documents $as_me 3.8.0, which was +This file was extended by gnome-documents $as_me 3.8.3.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21218,7 +21301,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gnome-documents config.status 3.8.0 +gnome-documents config.status 3.8.3.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -21740,6 +21823,7 @@ "data/icons/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/Makefile" ;; "data/gnome-documents.desktop.in") CONFIG_FILES="$CONFIG_FILES data/gnome-documents.desktop.in" ;; "getting-started/Makefile") CONFIG_FILES="$CONFIG_FILES getting-started/Makefile" ;; + "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; @@ -22389,7 +22473,7 @@ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the diff -Nru gnome-documents-3.8.0/configure.ac gnome-documents-3.8.3.1/configure.ac --- gnome-documents-3.8.0/configure.ac 2013-03-25 15:35:32.000000000 +0000 +++ gnome-documents-3.8.3.1/configure.ac 2013-06-14 15:38:51.000000000 +0000 @@ -1,6 +1,6 @@ dnl -*- mode: m4 -*- AC_PREREQ(2.63) -AC_INIT([gnome-documents],[3.8.0],[],[gnome-documents]) +AC_INIT([gnome-documents],[3.8.3.1],[],[gnome-documents]) AC_CONFIG_HEADERS([config/config.h]) AC_CONFIG_SRCDIR([src/main.js]) @@ -70,6 +70,8 @@ ZAPOJIT_MIN_VERSION=0.0.2 SOUP_MIN_VERSION=2.41.3 +AC_PATH_PROG([XSLTPROC], [xsltproc]) + PKG_CHECK_MODULES(DOCUMENTS, evince-document-3.0 >= $EVINCE_MIN_VERSION evince-view-3.0 >= $EVINCE_MIN_VERSION @@ -124,6 +126,7 @@ data/icons/Makefile data/gnome-documents.desktop.in getting-started/Makefile +man/Makefile po/Makefile.in ]) diff -Nru gnome-documents-3.8.0/data/Makefile.in gnome-documents-3.8.3.1/data/Makefile.in --- gnome-documents-3.8.0/data/Makefile.in 2013-03-25 15:35:51.000000000 +0000 +++ gnome-documents-3.8.3.1/data/Makefile.in 2013-06-14 15:43:51.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.1 from Makefile.am. +# Makefile.in generated by automake 1.13.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -304,6 +332,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ +XSLTPROC = @XSLTPROC@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -505,13 +534,12 @@ # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. $(am__recursive_targets): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ diff -Nru gnome-documents-3.8.0/data/gnome-documents.desktop gnome-documents-3.8.3.1/data/gnome-documents.desktop --- gnome-documents-3.8.0/data/gnome-documents.desktop 2013-03-25 15:36:12.000000000 +0000 +++ gnome-documents-3.8.3.1/data/gnome-documents.desktop 2013-06-14 15:44:11.000000000 +0000 @@ -156,7 +156,7 @@ Keywords[he]=מסמכים;PDF;מסמך; Keywords[hi]=डॉक्स;पीडीएफ;दस्तावेज़; Keywords[hu]=Dokumentum;PDF;Doksi; -Keywords[id]=Docs;PDF;Document; +Keywords[id]=Dok;PDF;Dokumen; Keywords[it]=Documenti;PDF;Doc; Keywords[ja]=Docs;PDF;Document;文書;ドキュメント; Keywords[kk]=Құжаттар;PDF;Құжат; diff -Nru gnome-documents-3.8.0/data/icons/Makefile.in gnome-documents-3.8.3.1/data/icons/Makefile.in --- gnome-documents-3.8.0/data/icons/Makefile.in 2013-03-25 15:35:51.000000000 +0000 +++ gnome-documents-3.8.3.1/data/icons/Makefile.in 2013-06-14 15:43:51.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.1 from Makefile.am. +# Makefile.in generated by automake 1.13.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -214,6 +242,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ +XSLTPROC = @XSLTPROC@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru gnome-documents-3.8.0/debian/changelog gnome-documents-3.8.3.1/debian/changelog --- gnome-documents-3.8.0/debian/changelog 2013-05-31 06:15:50.000000000 +0000 +++ gnome-documents-3.8.3.1/debian/changelog 2013-06-19 21:18:59.000000000 +0000 @@ -1,8 +1,22 @@ -gnome-documents (3.8.0-1~raring1) raring; urgency=medium +gnome-documents (3.8.3.1-1~ubuntu13.04.1) raring; urgency=low - * Copied from saucy + * No-change backport to raring - -- Rico Tzschichholz Fri, 31 May 2013 08:15:50 +0200 + -- Jeremy Bicha Wed, 19 Jun 2013 17:18:59 -0400 + +gnome-documents (3.8.3.1-1) experimental; urgency=low + + [ Jeremy Bicha ] + * New upstream release + * debian/control.in: + - Add missing dependency on gir1.2-gnomedesktop-3.0 + - Bump minimum GTK for newer libgd + - Build-depend on gtk-doc-tools and yelp-tools + - Build-depend on inkscape and poppler-utils to generate + getting-started PDF + * debian/rules: --enable-getting-started + + -- Andreas Henriksson Mon, 17 Jun 2013 22:24:54 +0200 gnome-documents (3.8.0-1) experimental; urgency=low diff -Nru gnome-documents-3.8.0/debian/control gnome-documents-3.8.3.1/debian/control --- gnome-documents-3.8.0/debian/control 2013-05-31 06:15:54.000000000 +0000 +++ gnome-documents-3.8.3.1/debian/control 2013-06-17 20:33:14.000000000 +0000 @@ -2,18 +2,20 @@ # # Modifications should be made to debian/control.in instead. # This file is regenerated automatically in the clean target. + Source: gnome-documents Section: gnome Priority: optional Maintainer: Debian GNOME Maintainers Uploaders: Jeremy Bicha , Andreas Henriksson , Laurent Bigonville , Michael Biebl Build-Depends: cdbs (>= 0.4.41), - gnome-pkg-tools (>= 0.10), - gnome-common, dh-autoreconf, debhelper (>= 8), + gnome-pkg-tools (>= 0.10), + gnome-common, gobject-introspection (>= 1.31.6), - itstool, + gtk-doc-tools, + inkscape, libevince-dev (>= 3.7.4), libgdata-dev (>= 0.13.3), libgirepository1.0-dev (>= 1.31.6), @@ -21,13 +23,16 @@ libglib2.0-dev (>= 2.35.1), libgnome-desktop-3-dev, libgoa-1.0-dev (>= 3.2.0), - libgtk-3-dev (>= 3.7.7), + libgtk-3-dev (>= 3.7.10), libsoup2.4-dev (>= 2.41.3), libtracker-miner-0.16-dev (>= 0.15), libtracker-sparql-0.16-dev (>= 0.15), libwebkitgtk-3.0-dev (>= 1.10.0), - libzapojit-dev (>= 0.0.2-2) -Standards-Version: 3.9.3 + libzapojit-dev (>= 0.0.2-2), + poppler-utils, + yelp-tools +Standards-Version: 3.9.4 +Homepage: https://live.gnome.org/GnomeDocuments Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gnome-documents Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-documents/ @@ -37,6 +42,7 @@ ${misc:Depends}, ${gir:Depends}, gir1.2-glib-2.0, + gir1.2-gnomedesktop-3.0, gir1.2-gtk-3.0, gir1.2-pango-1.0, gir1.2-gdkpixbuf-2.0, diff -Nru gnome-documents-3.8.0/debian/control.in gnome-documents-3.8.3.1/debian/control.in --- gnome-documents-3.8.0/debian/control.in 2013-03-18 12:59:39.000000000 +0000 +++ gnome-documents-3.8.3.1/debian/control.in 2013-06-10 02:46:14.000000000 +0000 @@ -4,12 +4,13 @@ Maintainer: Debian GNOME Maintainers Uploaders: Jeremy Bicha , @GNOME_TEAM@ Build-Depends: cdbs (>= 0.4.41), - gnome-pkg-tools (>= 0.10), - gnome-common, dh-autoreconf, debhelper (>= 8), + gnome-pkg-tools (>= 0.10), + gnome-common, gobject-introspection (>= 1.31.6), - itstool, + gtk-doc-tools, + inkscape, libevince-dev (>= 3.7.4), libgdata-dev (>= 0.13.3), libgirepository1.0-dev (>= 1.31.6), @@ -17,13 +18,16 @@ libglib2.0-dev (>= 2.35.1), libgnome-desktop-3-dev, libgoa-1.0-dev (>= 3.2.0), - libgtk-3-dev (>= 3.7.7), + libgtk-3-dev (>= 3.7.10), libsoup2.4-dev (>= 2.41.3), libtracker-miner-0.16-dev (>= 0.15), libtracker-sparql-0.16-dev (>= 0.15), libwebkitgtk-3.0-dev (>= 1.10.0), - libzapojit-dev (>= 0.0.2-2) -Standards-Version: 3.9.3 + libzapojit-dev (>= 0.0.2-2), + poppler-utils, + yelp-tools +Standards-Version: 3.9.4 +Homepage: https://live.gnome.org/GnomeDocuments Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gnome-documents Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-documents/ @@ -33,6 +37,7 @@ ${misc:Depends}, ${gir:Depends}, gir1.2-glib-2.0, + gir1.2-gnomedesktop-3.0, gir1.2-gtk-3.0, gir1.2-pango-1.0, gir1.2-gdkpixbuf-2.0, diff -Nru gnome-documents-3.8.0/debian/rules gnome-documents-3.8.3.1/debian/rules --- gnome-documents-3.8.0/debian/rules 2011-12-30 13:23:21.000000000 +0000 +++ gnome-documents-3.8.3.1/debian/rules 2013-06-10 02:46:14.000000000 +0000 @@ -11,6 +11,8 @@ LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed DEB_DH_AUTORECONF_ARGS := --as-needed +DEB_CONFIGURE_EXTRA_FLAGS += --enable-getting-started + DEB_DH_MAKESHLIBS_ARGS += -X/usr/lib/gnome-documents DEB_DH_GIREPOSITORY_ARGS_ALL += -ldebian/gnome-documents/usr/share/gnome-documents/gir-1.0 /usr/lib/gnome-documents/ /usr/lib/gnome-documents/girepository-1.0/ diff -Nru gnome-documents-3.8.0/egg-list-box/INSTALL gnome-documents-3.8.3.1/egg-list-box/INSTALL --- gnome-documents-3.8.0/egg-list-box/INSTALL 2013-03-04 20:55:12.000000000 +0000 +++ gnome-documents-3.8.3.1/egg-list-box/INSTALL 2013-06-14 15:43:44.000000000 +0000 @@ -1,7 +1,7 @@ Installation Instructions ************************* -Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation, +Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, diff -Nru gnome-documents-3.8.0/egg-list-box/Makefile.in gnome-documents-3.8.3.1/egg-list-box/Makefile.in --- gnome-documents-3.8.0/egg-list-box/Makefile.in 2013-03-04 20:55:13.000000000 +0000 +++ gnome-documents-3.8.3.1/egg-list-box/Makefile.in 2013-06-14 15:43:44.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.1 from Makefile.am. +# Makefile.in generated by automake 1.13.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -17,23 +17,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -512,8 +540,10 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libeggflowbox.la: $(libeggflowbox_la_OBJECTS) $(libeggflowbox_la_DEPENDENCIES) $(EXTRA_libeggflowbox_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libeggflowbox_la_OBJECTS) $(libeggflowbox_la_LIBADD) $(LIBS) + libegglistbox.la: $(libegglistbox_la_OBJECTS) $(libegglistbox_la_DEPENDENCIES) $(EXTRA_libegglistbox_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libegglistbox_la_OBJECTS) $(libegglistbox_la_LIBADD) $(LIBS) @@ -525,18 +555,23 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + test-flow-box$(EXEEXT): $(test_flow_box_OBJECTS) $(test_flow_box_DEPENDENCIES) $(EXTRA_test_flow_box_DEPENDENCIES) @rm -f test-flow-box$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_flow_box_OBJECTS) $(test_flow_box_LDADD) $(LIBS) + test-focus$(EXEEXT): $(test_focus_OBJECTS) $(test_focus_DEPENDENCIES) $(EXTRA_test_focus_DEPENDENCIES) @rm -f test-focus$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_focus_OBJECTS) $(test_focus_LDADD) $(LIBS) + test-list$(EXEEXT): $(test_list_OBJECTS) $(test_list_DEPENDENCIES) $(EXTRA_test_list_DEPENDENCIES) @rm -f test-list$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_list_OBJECTS) $(test_list_LDADD) $(LIBS) + test-scrolled$(EXEEXT): $(test_scrolled_OBJECTS) $(test_scrolled_DEPENDENCIES) $(EXTRA_test_scrolled_DEPENDENCIES) @rm -f test-scrolled$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_scrolled_OBJECTS) $(test_scrolled_LDADD) $(LIBS) + test-sel$(EXEEXT): $(test_sel_OBJECTS) $(test_sel_DEPENDENCIES) $(EXTRA_test_sel_DEPENDENCIES) @rm -f test-sel$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_sel_OBJECTS) $(test_sel_LDADD) $(LIBS) diff -Nru gnome-documents-3.8.0/egg-list-box/aclocal.m4 gnome-documents-3.8.3.1/egg-list-box/aclocal.m4 --- gnome-documents-3.8.0/egg-list-box/aclocal.m4 2013-03-04 20:55:10.000000000 +0000 +++ gnome-documents-3.8.3.1/egg-list-box/aclocal.m4 2013-06-14 15:43:43.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.13.1 -*- Autoconf -*- +# generated automatically by aclocal 1.13.2 -*- Autoconf -*- -# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,6 +20,103 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) +dnl -*- mode: autoconf -*- +dnl Copyright 2009 Johan Dahlin +dnl +dnl This file is free software; the author(s) gives unlimited +dnl permission to copy and/or distribute it, with or without +dnl modifications, as long as this notice is preserved. +dnl + +# serial 1 + +m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], +[ + AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([LT_INIT],[$0])dnl setup libtool first + + dnl enable/disable introspection + m4_if([$2], [require], + [dnl + enable_introspection=yes + ],[dnl + AC_ARG_ENABLE(introspection, + AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], + [Enable introspection for this build]),, + [enable_introspection=auto]) + ])dnl + + AC_MSG_CHECKING([for gobject-introspection]) + + dnl presence/version checking + AS_CASE([$enable_introspection], + [no], [dnl + found_introspection="no (disabled, use --enable-introspection to enable)" + ],dnl + [yes],[dnl + PKG_CHECK_EXISTS([gobject-introspection-1.0],, + AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) + PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], + found_introspection=yes, + AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) + ],dnl + [auto],[dnl + PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) + dnl Canonicalize enable_introspection + enable_introspection=$found_introspection + ],dnl + [dnl + AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) + ])dnl + + AC_MSG_RESULT([$found_introspection]) + + INTROSPECTION_SCANNER= + INTROSPECTION_COMPILER= + INTROSPECTION_GENERATE= + INTROSPECTION_GIRDIR= + INTROSPECTION_TYPELIBDIR= + if test "x$found_introspection" = "xyes"; then + INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` + INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` + INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` + INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` + INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" + INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` + INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` + INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection + fi + AC_SUBST(INTROSPECTION_SCANNER) + AC_SUBST(INTROSPECTION_COMPILER) + AC_SUBST(INTROSPECTION_GENERATE) + AC_SUBST(INTROSPECTION_GIRDIR) + AC_SUBST(INTROSPECTION_TYPELIBDIR) + AC_SUBST(INTROSPECTION_CFLAGS) + AC_SUBST(INTROSPECTION_LIBS) + AC_SUBST(INTROSPECTION_MAKEFILE) + + AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") +]) + + +dnl Usage: +dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) + +AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], +[ + _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) +]) + +dnl Usage: +dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) + + +AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], +[ + _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) +]) + # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # serial 1 (pkg-config-0.24) # @@ -220,103 +317,6 @@ m4_popdef([pkg_description]) ]) dnl PKG_NOARCH_INSTALLDIR -dnl -*- mode: autoconf -*- -dnl Copyright 2009 Johan Dahlin -dnl -dnl This file is free software; the author(s) gives unlimited -dnl permission to copy and/or distribute it, with or without -dnl modifications, as long as this notice is preserved. -dnl - -# serial 1 - -m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], -[ - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([LT_INIT],[$0])dnl setup libtool first - - dnl enable/disable introspection - m4_if([$2], [require], - [dnl - enable_introspection=yes - ],[dnl - AC_ARG_ENABLE(introspection, - AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], - [Enable introspection for this build]),, - [enable_introspection=auto]) - ])dnl - - AC_MSG_CHECKING([for gobject-introspection]) - - dnl presence/version checking - AS_CASE([$enable_introspection], - [no], [dnl - found_introspection="no (disabled, use --enable-introspection to enable)" - ],dnl - [yes],[dnl - PKG_CHECK_EXISTS([gobject-introspection-1.0],, - AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], - found_introspection=yes, - AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) - ],dnl - [auto],[dnl - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) - dnl Canonicalize enable_introspection - enable_introspection=$found_introspection - ],dnl - [dnl - AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) - ])dnl - - AC_MSG_RESULT([$found_introspection]) - - INTROSPECTION_SCANNER= - INTROSPECTION_COMPILER= - INTROSPECTION_GENERATE= - INTROSPECTION_GIRDIR= - INTROSPECTION_TYPELIBDIR= - if test "x$found_introspection" = "xyes"; then - INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` - INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection - fi - AC_SUBST(INTROSPECTION_SCANNER) - AC_SUBST(INTROSPECTION_COMPILER) - AC_SUBST(INTROSPECTION_GENERATE) - AC_SUBST(INTROSPECTION_GIRDIR) - AC_SUBST(INTROSPECTION_TYPELIBDIR) - AC_SUBST(INTROSPECTION_CFLAGS) - AC_SUBST(INTROSPECTION_LIBS) - AC_SUBST(INTROSPECTION_MAKEFILE) - - AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") -]) - - -dnl Usage: -dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) - -AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], -[ - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) -]) - -dnl Usage: -dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) - - -AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], -[ - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) -]) - # Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation @@ -332,7 +332,7 @@ [am__api_version='1.13' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.13.1], [], +m4_if([$1], [1.13.2], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -348,7 +348,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.13.1])dnl +[AM_AUTOMAKE_VERSION([1.13.2])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -729,7 +729,7 @@ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the @@ -1317,76 +1317,114 @@ # Substitute a variable $(am__untar) that extract such # a tarball read from stdin. # $(am__untar) < result.tar +# AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AC_SUBST([AMTAR], ['$${TAR-tar}']) -m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. + +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of '-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR diff -Nru gnome-documents-3.8.0/egg-list-box/config.guess gnome-documents-3.8.3.1/egg-list-box/config.guess --- gnome-documents-3.8.0/egg-list-box/config.guess 2013-03-04 20:55:12.000000000 +0000 +++ gnome-documents-3.8.3.1/egg-list-box/config.guess 2013-06-14 15:43:44.000000000 +0000 @@ -1,10 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012, 2013 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2012-12-29' +timestamp='2013-04-24' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -26,7 +24,7 @@ # program. This Exception is an additional permission under section 7 # of the GNU General Public License, version 3 ("GPLv3"). # -# Originally written by Per Bothner. +# Originally written by Per Bothner. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD @@ -52,9 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, -2012, 2013 Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -887,6 +883,9 @@ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ @@ -925,6 +924,11 @@ #ifdef __dietlibc__ LIBC=dietlibc #endif + #else + #include + #ifdef __UCLIBC__ + LIBC=uclibc + #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` echo "${UNAME_MACHINE}-pc-linux-${LIBC}" @@ -957,6 +961,9 @@ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; or32:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; @@ -999,7 +1006,9 @@ echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + LIBC=gnu + test -r /lib/libc.so && od -An -S13 /lib/libc.so | grep -q __uClibc_main && LIBC=uclibc + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu diff -Nru gnome-documents-3.8.0/egg-list-box/config.sub gnome-documents-3.8.3.1/egg-list-box/config.sub --- gnome-documents-3.8.0/egg-list-box/config.sub 2013-03-04 20:55:12.000000000 +0000 +++ gnome-documents-3.8.3.1/egg-list-box/config.sub 2013-06-14 15:43:44.000000000 +0000 @@ -1,10 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012, 2013 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2012-12-29' +timestamp='2013-04-24' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -70,9 +68,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, -2012, 2013 Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -256,7 +252,7 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc \ + | arc | arceb \ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ | avr | avr32 \ | be32 | be64 \ @@ -290,16 +286,17 @@ | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ | nds32 | nds32le | nds32be \ - | nios | nios2 \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ | open8 \ - | or32 \ + | or1k | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ @@ -369,7 +366,7 @@ | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | be32-* | be64-* \ @@ -407,12 +404,13 @@ | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ | orion-* \ @@ -1354,7 +1352,7 @@ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ @@ -1500,9 +1498,6 @@ -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; @@ -1594,6 +1589,9 @@ mips*-*) os=-elf ;; + or1k-*) + os=-elf + ;; or32-*) os=-coff ;; diff -Nru gnome-documents-3.8.0/egg-list-box/configure gnome-documents-3.8.3.1/egg-list-box/configure --- gnome-documents-3.8.0/egg-list-box/configure 2013-03-04 20:55:11.000000000 +0000 +++ gnome-documents-3.8.3.1/egg-list-box/configure 2013-06-14 15:43:43.000000000 +0000 @@ -2769,12 +2769,17 @@ # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar pax cpio none' + am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' + # Enable silent rules is available # Check whether --enable-silent-rules was given. if test "${enable_silent_rules+set}" = set; then : @@ -14283,7 +14288,7 @@ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the diff -Nru gnome-documents-3.8.0/getting-started/Makefile.in gnome-documents-3.8.3.1/getting-started/Makefile.in --- gnome-documents-3.8.0/getting-started/Makefile.in 2013-03-25 15:35:51.000000000 +0000 +++ gnome-documents-3.8.3.1/getting-started/Makefile.in 2013-06-14 15:43:51.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.1 from Makefile.am. +# Makefile.in generated by automake 1.13.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -212,6 +240,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ +XSLTPROC = @XSLTPROC@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru gnome-documents-3.8.0/libgd/Makefile.am gnome-documents-3.8.3.1/libgd/Makefile.am --- gnome-documents-3.8.0/libgd/Makefile.am 2013-02-20 00:53:43.000000000 +0000 +++ gnome-documents-3.8.3.1/libgd/Makefile.am 2013-06-14 15:40:58.000000000 +0000 @@ -26,6 +26,14 @@ libgd_la_SOURCES = libgd/gd.h nodist_libgd_la_SOURCES = +catalog_sources = \ + libgd/gd-types-catalog.c \ + libgd/gd-types-catalog.h \ + $(NULL) + +nodist_libgd_la_SOURCES += $(catalog_sources) +EXTRA_DIST += $(catalog_sources) + if LIBGD_GTK_HACKS gtk_hacks_sources = \ libgd/gd-entry-focus-hack.c \ diff -Nru gnome-documents-3.8.0/libgd/Makefile.in gnome-documents-3.8.3.1/libgd/Makefile.in --- gnome-documents-3.8.0/libgd/Makefile.in 2013-03-25 15:35:51.000000000 +0000 +++ gnome-documents-3.8.3.1/libgd/Makefile.in 2013-06-14 15:43:51.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.1 from Makefile.am. +# Makefile.in generated by automake 1.13.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -17,23 +17,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -144,52 +172,53 @@ libgd_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_libgd_la_OBJECTS = am__objects_1 = -@LIBGD_GTK_HACKS_TRUE@am__objects_2 = gd-entry-focus-hack.lo \ +am__objects_2 = gd-types-catalog.lo $(am__objects_1) +@LIBGD_GTK_HACKS_TRUE@am__objects_3 = gd-entry-focus-hack.lo \ @LIBGD_GTK_HACKS_TRUE@ gd-icon-utils.lo $(am__objects_1) -@LIBGD_GTK_HACKS_TRUE@am__objects_3 = $(am__objects_2) -@LIBGD__VIEW_COMMON_TRUE@am__objects_4 = gd-main-view-generic.lo \ +@LIBGD_GTK_HACKS_TRUE@am__objects_4 = $(am__objects_3) +@LIBGD__VIEW_COMMON_TRUE@am__objects_5 = gd-main-view-generic.lo \ @LIBGD__VIEW_COMMON_TRUE@ gd-styled-text-renderer.lo \ @LIBGD__VIEW_COMMON_TRUE@ gd-two-lines-renderer.lo \ @LIBGD__VIEW_COMMON_TRUE@ $(am__objects_1) -@LIBGD__VIEW_COMMON_TRUE@am__objects_5 = $(am__objects_4) -@LIBGD_MAIN_ICON_VIEW_TRUE@am__objects_6 = gd-main-icon-view.lo \ +@LIBGD__VIEW_COMMON_TRUE@am__objects_6 = $(am__objects_5) +@LIBGD_MAIN_ICON_VIEW_TRUE@am__objects_7 = gd-main-icon-view.lo \ @LIBGD_MAIN_ICON_VIEW_TRUE@ gd-toggle-pixbuf-renderer.lo \ @LIBGD_MAIN_ICON_VIEW_TRUE@ $(am__objects_1) -@LIBGD_MAIN_ICON_VIEW_TRUE@am__objects_7 = $(am__objects_6) -@LIBGD_MAIN_LIST_VIEW_TRUE@am__objects_8 = gd-main-list-view.lo \ +@LIBGD_MAIN_ICON_VIEW_TRUE@am__objects_8 = $(am__objects_7) +@LIBGD_MAIN_LIST_VIEW_TRUE@am__objects_9 = gd-main-list-view.lo \ @LIBGD_MAIN_LIST_VIEW_TRUE@ $(am__objects_1) -@LIBGD_MAIN_LIST_VIEW_TRUE@am__objects_9 = $(am__objects_8) -@LIBGD_MAIN_VIEW_TRUE@am__objects_10 = gd-main-view.lo \ +@LIBGD_MAIN_LIST_VIEW_TRUE@am__objects_10 = $(am__objects_9) +@LIBGD_MAIN_VIEW_TRUE@am__objects_11 = gd-main-view.lo \ @LIBGD_MAIN_VIEW_TRUE@ $(am__objects_1) -@LIBGD_MAIN_VIEW_TRUE@am__objects_11 = $(am__objects_10) -@LIBGD_MAIN_TOOLBAR_TRUE@am__objects_12 = gd-main-toolbar.lo \ +@LIBGD_MAIN_VIEW_TRUE@am__objects_12 = $(am__objects_11) +@LIBGD_MAIN_TOOLBAR_TRUE@am__objects_13 = gd-main-toolbar.lo \ @LIBGD_MAIN_TOOLBAR_TRUE@ $(am__objects_1) -@LIBGD_MAIN_TOOLBAR_TRUE@am__objects_13 = $(am__objects_12) -@LIBGD_HEADER_BAR_TRUE@am__objects_14 = gd-header-bar.lo \ +@LIBGD_MAIN_TOOLBAR_TRUE@am__objects_14 = $(am__objects_13) +@LIBGD_HEADER_BAR_TRUE@am__objects_15 = gd-header-bar.lo \ @LIBGD_HEADER_BAR_TRUE@ $(am__objects_1) -@LIBGD_HEADER_BAR_TRUE@am__objects_15 = $(am__objects_14) -@LIBGD__HEADER_BUTTON_TRUE@am__objects_16 = gd-header-button.lo \ +@LIBGD_HEADER_BAR_TRUE@am__objects_16 = $(am__objects_15) +@LIBGD__HEADER_BUTTON_TRUE@am__objects_17 = gd-header-button.lo \ @LIBGD__HEADER_BUTTON_TRUE@ $(am__objects_1) -@LIBGD__HEADER_BUTTON_TRUE@am__objects_17 = $(am__objects_16) -@LIBGD_MARGIN_CONTAINER_TRUE@am__objects_18 = gd-margin-container.lo \ +@LIBGD__HEADER_BUTTON_TRUE@am__objects_18 = $(am__objects_17) +@LIBGD_MARGIN_CONTAINER_TRUE@am__objects_19 = gd-margin-container.lo \ @LIBGD_MARGIN_CONTAINER_TRUE@ $(am__objects_1) -@LIBGD_MARGIN_CONTAINER_TRUE@am__objects_19 = $(am__objects_18) -@LIBGD_NOTIFICATION_TRUE@am__objects_20 = gd-notification.lo \ +@LIBGD_MARGIN_CONTAINER_TRUE@am__objects_20 = $(am__objects_19) +@LIBGD_NOTIFICATION_TRUE@am__objects_21 = gd-notification.lo \ @LIBGD_NOTIFICATION_TRUE@ $(am__objects_1) -@LIBGD_NOTIFICATION_TRUE@am__objects_21 = $(am__objects_20) -@LIBGD_REVEALER_TRUE@am__objects_22 = gd-revealer.lo $(am__objects_1) -@LIBGD_REVEALER_TRUE@am__objects_23 = $(am__objects_22) -@LIBGD_STACK_TRUE@am__objects_24 = gd-stack.lo gd-stack-switcher.lo \ +@LIBGD_NOTIFICATION_TRUE@am__objects_22 = $(am__objects_21) +@LIBGD_REVEALER_TRUE@am__objects_23 = gd-revealer.lo $(am__objects_1) +@LIBGD_REVEALER_TRUE@am__objects_24 = $(am__objects_23) +@LIBGD_STACK_TRUE@am__objects_25 = gd-stack.lo gd-stack-switcher.lo \ @LIBGD_STACK_TRUE@ $(am__objects_1) -@LIBGD_STACK_TRUE@am__objects_25 = $(am__objects_24) -@LIBGD_TAGGED_ENTRY_TRUE@am__objects_26 = gd-tagged-entry.lo \ +@LIBGD_STACK_TRUE@am__objects_26 = $(am__objects_25) +@LIBGD_TAGGED_ENTRY_TRUE@am__objects_27 = gd-tagged-entry.lo \ @LIBGD_TAGGED_ENTRY_TRUE@ $(am__objects_1) -@LIBGD_TAGGED_ENTRY_TRUE@am__objects_27 = $(am__objects_26) -nodist_libgd_la_OBJECTS = $(am__objects_3) $(am__objects_5) \ - $(am__objects_7) $(am__objects_9) $(am__objects_11) \ - $(am__objects_13) $(am__objects_15) $(am__objects_17) \ - $(am__objects_19) $(am__objects_21) $(am__objects_23) \ - $(am__objects_25) $(am__objects_27) +@LIBGD_TAGGED_ENTRY_TRUE@am__objects_28 = $(am__objects_27) +nodist_libgd_la_OBJECTS = $(am__objects_2) $(am__objects_4) \ + $(am__objects_6) $(am__objects_8) $(am__objects_10) \ + $(am__objects_12) $(am__objects_14) $(am__objects_16) \ + $(am__objects_18) $(am__objects_20) $(am__objects_22) \ + $(am__objects_24) $(am__objects_26) $(am__objects_28) libgd_la_OBJECTS = $(am_libgd_la_OBJECTS) $(nodist_libgd_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -413,6 +442,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ +XSLTPROC = @XSLTPROC@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -476,11 +506,12 @@ NULL = CLEANFILES = $(am__append_33) MAINTAINERCLEANFILES = $(am__append_32) $(am__append_36) -EXTRA_DIST = $(am__append_2) $(am__append_4) $(am__append_6) \ - $(am__append_8) $(am__append_10) $(am__append_12) \ - $(am__append_14) $(am__append_17) $(am__append_19) \ - $(am__append_21) $(am__append_23) $(am__append_26) \ - $(am__append_29) $(am__append_31) $(am__append_35) +EXTRA_DIST = $(catalog_sources) $(am__append_2) $(am__append_4) \ + $(am__append_6) $(am__append_8) $(am__append_10) \ + $(am__append_12) $(am__append_14) $(am__append_17) \ + $(am__append_19) $(am__append_21) $(am__append_23) \ + $(am__append_26) $(am__append_29) $(am__append_31) \ + $(am__append_35) noinst_DATA = $(am__append_30) $(am__append_34) AM_CPPFLAGS = \ -I$(top_srcdir) \ @@ -496,11 +527,16 @@ libgd_la_LIBADD = $(LIBGD_LIBS) $(LIBM) libgd_la_LDFLAGS = -avoid-version libgd_la_SOURCES = libgd/gd.h -nodist_libgd_la_SOURCES = $(am__append_1) $(am__append_3) \ - $(am__append_5) $(am__append_7) $(am__append_9) \ - $(am__append_11) $(am__append_13) $(am__append_16) \ - $(am__append_18) $(am__append_20) $(am__append_22) \ - $(am__append_25) $(am__append_28) +nodist_libgd_la_SOURCES = $(catalog_sources) $(am__append_1) \ + $(am__append_3) $(am__append_5) $(am__append_7) \ + $(am__append_9) $(am__append_11) $(am__append_13) \ + $(am__append_16) $(am__append_18) $(am__append_20) \ + $(am__append_22) $(am__append_25) $(am__append_28) +catalog_sources = \ + libgd/gd-types-catalog.c \ + libgd/gd-types-catalog.h \ + $(NULL) + @LIBGD_GTK_HACKS_TRUE@gtk_hacks_sources = \ @LIBGD_GTK_HACKS_TRUE@ libgd/gd-entry-focus-hack.c \ @LIBGD_GTK_HACKS_TRUE@ libgd/gd-entry-focus-hack.h \ @@ -702,6 +738,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libgd.la: $(libgd_la_OBJECTS) $(libgd_la_DEPENDENCIES) $(EXTRA_libgd_la_DEPENDENCIES) $(AM_V_CCLD)$(libgd_la_LINK) $(am_libgd_la_rpath) $(libgd_la_OBJECTS) $(libgd_la_LIBADD) $(LIBS) @@ -713,12 +750,15 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + test-header-bar$(EXEEXT): $(test_header_bar_OBJECTS) $(test_header_bar_DEPENDENCIES) $(EXTRA_test_header_bar_DEPENDENCIES) @rm -f test-header-bar$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_header_bar_OBJECTS) $(test_header_bar_LDADD) $(LIBS) + test-revealer$(EXEEXT): $(test_revealer_OBJECTS) $(test_revealer_DEPENDENCIES) $(EXTRA_test_revealer_DEPENDENCIES) @rm -f test-revealer$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_revealer_OBJECTS) $(test_revealer_LDADD) $(LIBS) + test-stack$(EXEEXT): $(test_stack_OBJECTS) $(test_stack_DEPENDENCIES) $(EXTRA_test_stack_DEPENDENCIES) @rm -f test-stack$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_stack_OBJECTS) $(test_stack_LDADD) $(LIBS) @@ -747,6 +787,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gd-tagged-entry.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gd-toggle-pixbuf-renderer.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gd-two-lines-renderer.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gd-types-catalog.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-header-bar.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-revealer.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-stack.Po@am__quote@ @@ -772,6 +813,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< +gd-types-catalog.lo: libgd/gd-types-catalog.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gd-types-catalog.lo -MD -MP -MF $(DEPDIR)/gd-types-catalog.Tpo -c -o gd-types-catalog.lo `test -f 'libgd/gd-types-catalog.c' || echo '$(srcdir)/'`libgd/gd-types-catalog.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gd-types-catalog.Tpo $(DEPDIR)/gd-types-catalog.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libgd/gd-types-catalog.c' object='gd-types-catalog.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gd-types-catalog.lo `test -f 'libgd/gd-types-catalog.c' || echo '$(srcdir)/'`libgd/gd-types-catalog.c + gd-entry-focus-hack.lo: libgd/gd-entry-focus-hack.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gd-entry-focus-hack.lo -MD -MP -MF $(DEPDIR)/gd-entry-focus-hack.Tpo -c -o gd-entry-focus-hack.lo `test -f 'libgd/gd-entry-focus-hack.c' || echo '$(srcdir)/'`libgd/gd-entry-focus-hack.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gd-entry-focus-hack.Tpo $(DEPDIR)/gd-entry-focus-hack.Plo diff -Nru gnome-documents-3.8.0/libgd/libgd/gd-header-button.c gnome-documents-3.8.3.1/libgd/libgd/gd-header-button.c --- gnome-documents-3.8.0/libgd/libgd/gd-header-button.c 2013-03-25 15:29:37.000000000 +0000 +++ gnome-documents-3.8.3.1/libgd/libgd/gd-header-button.c 2013-05-15 15:17:16.000000000 +0000 @@ -414,6 +414,35 @@ { } +typedef GtkRadioButtonClass GdHeaderRadioButtonClass; +G_DEFINE_TYPE_WITH_CODE (GdHeaderRadioButton, gd_header_radio_button, GTK_TYPE_RADIO_BUTTON, + G_IMPLEMENT_INTERFACE (GD_TYPE_HEADER_BUTTON, gd_header_button_generic_iface_init)) + +static void +gd_header_radio_button_constructed (GObject *object) +{ + GdHeaderRadioButton *self = (GdHeaderRadioButton *) (object); + + G_OBJECT_CLASS (GET_PARENT_CLASS (object))->constructed (object); + + gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (self), FALSE); +} + +static void +gd_header_radio_button_class_init (GdHeaderRadioButtonClass *klass) +{ + GObjectClass *oclass = G_OBJECT_CLASS (klass); + + oclass->constructed = gd_header_radio_button_constructed; + + gd_header_button_generic_class_init (klass); +} + +static void +gd_header_radio_button_init (GdHeaderRadioButton *self) +{ +} + /** * gd_header_simple_button_new: * @@ -437,6 +466,17 @@ } /** + * gd_header_radio_button_new: + * + * Returns: (transfer none): + */ +GtkWidget * +gd_header_radio_button_new (void) +{ + return g_object_new (GD_TYPE_HEADER_RADIO_BUTTON, NULL); +} + +/** * gd_header_menu_button_new: * * Returns: (transfer none): diff -Nru gnome-documents-3.8.0/libgd/libgd/gd-header-button.h gnome-documents-3.8.3.1/libgd/libgd/gd-header-button.h --- gnome-documents-3.8.0/libgd/libgd/gd-header-button.h 2013-03-25 15:29:37.000000000 +0000 +++ gnome-documents-3.8.3.1/libgd/libgd/gd-header-button.h 2013-05-15 15:17:16.000000000 +0000 @@ -49,6 +49,11 @@ GType gd_header_toggle_button_get_type (void) G_GNUC_CONST; GtkWidget * gd_header_toggle_button_new (void); +#define GD_TYPE_HEADER_RADIO_BUTTON (gd_header_radio_button_get_type ()) +typedef GtkRadioButton GdHeaderRadioButton; +GType gd_header_radio_button_get_type (void) G_GNUC_CONST; +GtkWidget * gd_header_radio_button_new (void); + #define GD_TYPE_HEADER_MENU_BUTTON (gd_header_menu_button_get_type ()) typedef GtkMenuButton GdHeaderMenuButton; GType gd_header_menu_button_get_type (void) G_GNUC_CONST; diff -Nru gnome-documents-3.8.0/libgd/libgd/gd-main-icon-view.c gnome-documents-3.8.3.1/libgd/libgd/gd-main-icon-view.c --- gnome-documents-3.8.0/libgd/libgd/gd-main-icon-view.c 2013-02-19 21:50:39.000000000 +0000 +++ gnome-documents-3.8.3.1/libgd/libgd/gd-main-icon-view.c 2013-05-15 15:17:16.000000000 +0000 @@ -128,13 +128,180 @@ } static void +path_from_line_rects (cairo_t *cr, + GdkRectangle *lines, + int n_lines) +{ + int start_line, end_line; + GdkRectangle *r; + int i; + + /* Join rows vertically by extending to the middle */ + for (i = 0; i < n_lines - 1; i++) + { + GdkRectangle *r1 = &lines[i]; + GdkRectangle *r2 = &lines[i+1]; + int gap = r2->y - (r1->y + r1->height); + int old_y; + + r1->height += gap / 2; + old_y = r2->y; + r2->y = r1->y + r1->height; + r2->height += old_y - r2->y; + } + + cairo_new_path (cr); + start_line = 0; + + do + { + for (i = start_line; i < n_lines; i++) + { + r = &lines[i]; + if (i == start_line) + cairo_move_to (cr, r->x + r->width, r->y); + else + cairo_line_to (cr, r->x + r->width, r->y); + cairo_line_to (cr, r->x + r->width, r->y + r->height); + + if (i < n_lines - 1 && + (r->x + r->width < lines[i+1].x || + r->x > lines[i+1].x + lines[i+1].width)) + { + i++; + break; + } + } + end_line = i; + for (i = end_line - 1; i >= start_line; i--) + { + r = &lines[i]; + cairo_line_to (cr, r->x, r->y + r->height); + cairo_line_to (cr, r->x, r->y); + } + cairo_close_path (cr); + start_line = end_line; + } + while (end_line < n_lines); +} + +static gboolean +gd_main_icon_view_draw (GtkWidget *widget, + cairo_t *cr) +{ + GdMainIconView *self = GD_MAIN_ICON_VIEW (widget); + GtkAllocation allocation; + GtkStyleContext *context; + GdkRectangle line_rect; + GdkRectangle rect; + GtkTreePath *path; + GArray *lines; + GtkTreePath *rubberband_start, *rubberband_end; + + GTK_WIDGET_CLASS (gd_main_icon_view_parent_class)->draw (widget, cr); + + _gd_main_view_generic_get_rubberband_range (GD_MAIN_VIEW_GENERIC (self), + &rubberband_start, &rubberband_end); + + if (rubberband_start) + { + cairo_save (cr); + + context = gtk_widget_get_style_context (widget); + + gtk_style_context_save (context); + gtk_style_context_add_class (context, GTK_STYLE_CLASS_RUBBERBAND); + + path = gtk_tree_path_copy (rubberband_start); + + line_rect.width = 0; + lines = g_array_new (FALSE, FALSE, sizeof (GdkRectangle)); + + while (gtk_tree_path_compare (path, rubberband_end) <= 0) + { + if (gtk_icon_view_get_cell_rect (GTK_ICON_VIEW (widget), + path, + NULL, &rect)) + { + if (line_rect.width == 0) + line_rect = rect; + else + { + if (rect.y == line_rect.y) + gdk_rectangle_union (&rect, &line_rect, &line_rect); + else + { + g_array_append_val (lines, line_rect); + line_rect = rect; + } + } + } + gtk_tree_path_next (path); + } + + if (line_rect.width != 0) + g_array_append_val (lines, line_rect); + + if (lines->len > 0) + { + GtkStateFlags state; + cairo_path_t *path; + GtkBorder border; + GdkRGBA border_color; + + path_from_line_rects (cr, (GdkRectangle *)lines->data, lines->len); + + /* For some reason we need to copy and reapply the path, or it gets + eaten by gtk_render_background() */ + path = cairo_copy_path (cr); + + cairo_save (cr); + cairo_clip (cr); + gtk_widget_get_allocation (widget, &allocation); + gtk_render_background (context, cr, + 0, 0, + allocation.width, allocation.height); + cairo_restore (cr); + + cairo_append_path (cr, path); + cairo_path_destroy (path); + + state = gtk_widget_get_state_flags (widget); + gtk_style_context_get_border_color (context, + state, + &border_color); + gtk_style_context_get_border (context, state, + &border); + + cairo_set_line_width (cr, border.left); + gdk_cairo_set_source_rgba (cr, &border_color); + cairo_stroke (cr); + } + g_array_free (lines, TRUE); + + gtk_tree_path_free (path); + + gtk_style_context_restore (context); + cairo_restore (cr); + } + + return FALSE; +} + +static void gd_main_icon_view_class_init (GdMainIconViewClass *klass) { GObjectClass *oclass = G_OBJECT_CLASS (klass); GtkWidgetClass *wclass = GTK_WIDGET_CLASS (klass); + GtkBindingSet *binding_set; + GdkModifierType activate_modifiers[] = { GDK_SHIFT_MASK, GDK_CONTROL_MASK, GDK_SHIFT_MASK | GDK_CONTROL_MASK }; + int i; + + binding_set = gtk_binding_set_by_class (klass); oclass->constructed = gd_main_icon_view_constructed; wclass->drag_data_get = gd_main_icon_view_drag_data_get; + wclass->draw = gd_main_icon_view_draw; gtk_widget_class_install_style_property (wclass, g_param_spec_int ("check-icon-size", @@ -144,6 +311,21 @@ G_PARAM_READWRITE)); g_type_class_add_private (klass, sizeof (GdMainIconViewPrivate)); + + + for (i = 0; i < G_N_ELEMENTS (activate_modifiers); i++) + { + gtk_binding_entry_add_signal (binding_set, GDK_KEY_space, activate_modifiers[i], + "activate-cursor-item", 0); + gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Space, activate_modifiers[i], + "activate-cursor-item", 0); + gtk_binding_entry_add_signal (binding_set, GDK_KEY_Return, activate_modifiers[i], + "activate-cursor-item", 0); + gtk_binding_entry_add_signal (binding_set, GDK_KEY_ISO_Enter, activate_modifiers[i], + "activate-cursor-item", 0); + gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Enter, activate_modifiers[i], + "activate-cursor-item", 0); + } } static void diff -Nru gnome-documents-3.8.0/libgd/libgd/gd-main-list-view.c gnome-documents-3.8.3.1/libgd/libgd/gd-main-list-view.c --- gnome-documents-3.8.0/libgd/libgd/gd-main-list-view.c 2012-11-14 23:50:58.000000000 +0000 +++ gnome-documents-3.8.3.1/libgd/libgd/gd-main-list-view.c 2013-05-15 15:17:16.000000000 +0000 @@ -37,6 +37,9 @@ G_IMPLEMENT_INTERFACE (GD_TYPE_MAIN_VIEW_GENERIC, gd_main_view_generic_iface_init)) +static gboolean gd_main_list_view_draw (GtkWidget *widget, + cairo_t *cr); + static GtkTreePath* get_source_row (GdkDragContext *context) { @@ -141,11 +144,37 @@ { GObjectClass *oclass = G_OBJECT_CLASS (klass); GtkWidgetClass *wclass = GTK_WIDGET_CLASS (klass); + GtkBindingSet *binding_set; + GdkModifierType activate_modifiers[] = { GDK_SHIFT_MASK, GDK_CONTROL_MASK, GDK_SHIFT_MASK | GDK_CONTROL_MASK }; + int i; + + binding_set = gtk_binding_set_by_class (klass); oclass->constructed = gd_main_list_view_constructed; wclass->drag_data_get = gd_main_list_view_drag_data_get; + wclass->draw = gd_main_list_view_draw; g_type_class_add_private (klass, sizeof (GdMainListViewPrivate)); + + for (i = 0; i < G_N_ELEMENTS (activate_modifiers); i++) + { + gtk_binding_entry_add_signal (binding_set, GDK_KEY_space, activate_modifiers[i], + "select-cursor-row", 1, + G_TYPE_BOOLEAN, TRUE); + gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Space, activate_modifiers[i], + "select-cursor-row", 1, + G_TYPE_BOOLEAN, TRUE); + gtk_binding_entry_add_signal (binding_set, GDK_KEY_Return, activate_modifiers[i], + "select-cursor-row", 1, + G_TYPE_BOOLEAN, TRUE); + gtk_binding_entry_add_signal (binding_set, GDK_KEY_ISO_Enter, activate_modifiers[i], + "select-cursor-row", 1, + G_TYPE_BOOLEAN, TRUE); + gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Enter, activate_modifiers[i], + "select-cursor-row", 1, + G_TYPE_BOOLEAN, TRUE); + } + } static void @@ -181,6 +210,60 @@ gtk_tree_view_column_queue_resize (self->priv->tree_col); } +static gboolean +gd_main_list_view_draw (GtkWidget *widget, + cairo_t *cr) +{ + GdMainListView *self = GD_MAIN_LIST_VIEW (widget); + GtkStyleContext *context; + GdkRectangle lines_rect; + GdkRectangle rect; + GtkTreePath *path; + GtkTreePath *rubberband_start, *rubberband_end; + + GTK_WIDGET_CLASS (gd_main_list_view_parent_class)->draw (widget, cr); + + _gd_main_view_generic_get_rubberband_range (GD_MAIN_VIEW_GENERIC (self), + &rubberband_start, &rubberband_end); + + if (rubberband_start) + { + context = gtk_widget_get_style_context (widget); + + gtk_style_context_save (context); + gtk_style_context_add_class (context, GTK_STYLE_CLASS_RUBBERBAND); + + path = gtk_tree_path_copy (rubberband_start); + + lines_rect.width = 0; + + while (gtk_tree_path_compare (path, rubberband_end) <= 0) + { + gtk_tree_view_get_cell_area (GTK_TREE_VIEW (self), + path, self->priv->tree_col, &rect); + if (lines_rect.width == 0) + lines_rect = rect; + else + gdk_rectangle_union (&rect, &lines_rect, &lines_rect); + + gtk_tree_path_next (path); + } + gtk_tree_path_free (path); + + gtk_render_background (context, cr, + lines_rect.x, lines_rect.y, + lines_rect.width, lines_rect.height); + gtk_render_frame (context, cr, + lines_rect.x, lines_rect.y, + lines_rect.width, lines_rect.height); + + + gtk_style_context_restore (context); + } + + return FALSE; +} + static void gd_main_list_view_scroll_to_path (GdMainViewGeneric *mv, GtkTreePath *path) diff -Nru gnome-documents-3.8.0/libgd/libgd/gd-main-view-generic.c gnome-documents-3.8.3.1/libgd/libgd/gd-main-view-generic.c --- gnome-documents-3.8.0/libgd/libgd/gd-main-view-generic.c 2013-01-22 22:53:29.000000000 +0000 +++ gnome-documents-3.8.3.1/libgd/libgd/gd-main-view-generic.c 2013-05-15 15:17:16.000000000 +0000 @@ -82,6 +82,84 @@ (* iface->set_selection_mode) (self, selection_mode); } + +typedef struct { + GtkTreePath *rubberband_start; + GtkTreePath *rubberband_end; +} RubberbandInfo; + +static void +rubber_band_info_destroy (RubberbandInfo *info) +{ + g_clear_pointer (&info->rubberband_start, + gtk_tree_path_free); + g_clear_pointer (&info->rubberband_end, + gtk_tree_path_free); + g_slice_free (RubberbandInfo, info); +} + +static RubberbandInfo* +get_rubber_band_info (GdMainViewGeneric *self) +{ + RubberbandInfo *info; + + info = g_object_get_data (G_OBJECT (self), "gd-main-view-generic-rubber-band"); + if (info == NULL) + { + info = g_slice_new0 (RubberbandInfo); + g_object_set_data_full (G_OBJECT (self), "gd-main-view-generic-rubber-band", + info, (GDestroyNotify)rubber_band_info_destroy); + } + + return info; +} + +void +gd_main_view_generic_set_rubberband_range (GdMainViewGeneric *self, + GtkTreePath *start, + GtkTreePath *end) +{ + RubberbandInfo *info; + + info = get_rubber_band_info (self); + + if (start == NULL || end == NULL) + { + g_clear_pointer (&info->rubberband_start, + gtk_tree_path_free); + g_clear_pointer (&info->rubberband_end, + gtk_tree_path_free); + } + else + { + if (gtk_tree_path_compare (start, end) < 0) + { + info->rubberband_start = gtk_tree_path_copy (start); + info->rubberband_end = gtk_tree_path_copy (end); + } + else + { + info->rubberband_start = gtk_tree_path_copy (end); + info->rubberband_end = gtk_tree_path_copy (start); + } + } + + gtk_widget_queue_draw (GTK_WIDGET (self)); +} + +void +_gd_main_view_generic_get_rubberband_range (GdMainViewGeneric *self, + GtkTreePath **start, + GtkTreePath **end) +{ + RubberbandInfo *info; + + info = get_rubber_band_info (self); + + *start = info->rubberband_start; + *end = info->rubberband_end; +} + void gd_main_view_generic_scroll_to_path (GdMainViewGeneric *self, GtkTreePath *path) diff -Nru gnome-documents-3.8.0/libgd/libgd/gd-main-view-generic.h gnome-documents-3.8.3.1/libgd/libgd/gd-main-view-generic.h --- gnome-documents-3.8.0/libgd/libgd/gd-main-view-generic.h 2012-11-14 23:50:58.000000000 +0000 +++ gnome-documents-3.8.3.1/libgd/libgd/gd-main-view-generic.h 2013-05-15 15:17:16.000000000 +0000 @@ -98,12 +98,18 @@ gint y); void gd_main_view_generic_select_all (GdMainViewGeneric *self); void gd_main_view_generic_unselect_all (GdMainViewGeneric *self); +void gd_main_view_generic_set_rubberband_range (GdMainViewGeneric *self, + GtkTreePath *start, + GtkTreePath *end); /* private */ void _gd_main_view_generic_dnd_common (GtkTreeModel *model, gboolean selection_mode, GtkTreePath *path, GtkSelectionData *data); +void _gd_main_view_generic_get_rubberband_range (GdMainViewGeneric *self, + GtkTreePath **start, + GtkTreePath **end); G_END_DECLS diff -Nru gnome-documents-3.8.0/libgd/libgd/gd-main-view.c gnome-documents-3.8.3.1/libgd/libgd/gd-main-view.c --- gnome-documents-3.8.0/libgd/libgd/gd-main-view.c 2013-03-07 20:02:32.000000000 +0000 +++ gnome-documents-3.8.3.1/libgd/libgd/gd-main-view.c 2013-05-15 15:17:16.000000000 +0000 @@ -27,6 +27,7 @@ #define MAIN_VIEW_TYPE_INITIAL -1 #define MAIN_VIEW_DND_ICON_OFFSET 20 +#define MAIN_VIEW_RUBBERBAND_SELECT_TRIGGER_LENGTH 32 struct _GdMainViewPrivate { GdMainViewType current_type; @@ -35,7 +36,16 @@ GtkWidget *current_view; GtkTreeModel *model; + gboolean track_motion; + gboolean rubberband_select; + GtkTreePath *rubberband_select_first_path; + GtkTreePath *rubberband_select_last_path; + int button_down_x; + int button_down_y; + gchar *button_press_item_path; + + gchar *last_selected_id; }; enum { @@ -73,6 +83,13 @@ GdMainView *self = GD_MAIN_VIEW (obj); g_free (self->priv->button_press_item_path); + g_free (self->priv->last_selected_id); + + if (self->priv->rubberband_select_first_path) + gtk_tree_path_free (self->priv->rubberband_select_first_path); + + if (self->priv->rubberband_select_last_path) + gtk_tree_path_free (self->priv->rubberband_select_last_path); G_OBJECT_CLASS (gd_main_view_parent_class)->finalize (obj); } @@ -166,6 +183,7 @@ GD_MAIN_VIEW_LIST, GD_MAIN_VIEW_ICON, G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS); properties[PROP_SELECTION_MODE] = @@ -318,6 +336,31 @@ } static void +do_select_row (GdMainView *self, + GtkTreeIter *iter, + gboolean value) +{ + GtkTreeModel *model; + GtkTreeModelFilter *filter; + GtkTreeIter my_iter, child_iter; + + model = self->priv->model; + my_iter = *iter; + + while (GTK_IS_TREE_MODEL_FILTER (model)) + { + filter = GTK_TREE_MODEL_FILTER (model); + gtk_tree_model_filter_convert_iter_to_child_iter (filter, &child_iter, &my_iter); + model = gtk_tree_model_filter_get_model (filter); + my_iter = child_iter; + } + + gtk_list_store_set (GTK_LIST_STORE (model), &my_iter, + GD_MAIN_COLUMN_SELECTED, value, + -1); +} + +static void selection_mode_do_select_range (GdMainView *self, GtkTreeIter *first_element, GtkTreeIter *last_element) @@ -326,14 +369,23 @@ GtkTreePath *path, *last_path; gboolean equal; + path = gtk_tree_model_get_path (self->priv->model, first_element); last_path = gtk_tree_model_get_path (self->priv->model, last_element); - iter = *first_element; + if (gtk_tree_path_compare (path, last_path) > 0) + { + gtk_tree_path_free (last_path); + last_path = path; + iter = *last_element; + } + else + { + gtk_tree_path_free (path); + iter = *first_element; + } do { - gtk_list_store_set (GTK_LIST_STORE (self->priv->model), &iter, - GD_MAIN_COLUMN_SELECTED, TRUE, - -1); + do_select_row (self, &iter, TRUE); path = gtk_tree_model_get_path (self->priv->model, &iter); equal = (gtk_tree_path_compare (path, last_path) == 0); @@ -354,50 +406,69 @@ GtkTreeIter other; gboolean found = FALSE; gboolean selected; + char *id; - other = *iter; - while (gtk_tree_model_iter_previous (self->priv->model, &other)) + if (self->priv->last_selected_id != NULL && + gtk_tree_model_get_iter_first (self->priv->model, &other)) { - gtk_tree_model_get (self->priv->model, &other, - GD_MAIN_COLUMN_SELECTED, &selected, - -1); - - if (selected) - { - found = TRUE; - break; - } + do + { + gtk_tree_model_get (self->priv->model, &other, + GD_MAIN_COLUMN_ID, &id, + -1); + if (g_strcmp0 (id, self->priv->last_selected_id) == 0) + { + g_free (id); + found = TRUE; + break; + } + g_free (id); + } + while (gtk_tree_model_iter_next (self->priv->model, &other)); } - if (found) + if (!found) { - selection_mode_do_select_range (self, &other, iter); - return; + other = *iter; + while (gtk_tree_model_iter_previous (self->priv->model, &other)) + { + gtk_tree_model_get (self->priv->model, &other, + GD_MAIN_COLUMN_SELECTED, &selected, + -1); + + if (selected) + { + found = TRUE; + break; + } + } } - other = *iter; - while (gtk_tree_model_iter_next (self->priv->model, &other)) + if (!found) { - gtk_tree_model_get (self->priv->model, &other, - GD_MAIN_COLUMN_SELECTED, &selected, - -1); - if (selected) - { - found = TRUE; - break; - } + other = *iter; + while (gtk_tree_model_iter_next (self->priv->model, &other)) + { + gtk_tree_model_get (self->priv->model, &other, + GD_MAIN_COLUMN_SELECTED, &selected, + -1); + if (selected) + { + found = TRUE; + break; + } + } } if (found) + selection_mode_do_select_range (self, iter, &other); + else { - selection_mode_do_select_range (self, iter, &other); - return; + /* no other selected element found, just select the iter */ + do_select_row (self, iter, TRUE); } - /* no other selected element found, just select the iter */ - gtk_list_store_set (GTK_LIST_STORE (self->priv->model), iter, - GD_MAIN_COLUMN_SELECTED, TRUE, - -1); + g_signal_emit (self, signals[VIEW_SELECTION_CHANGED], 0); } static gboolean @@ -407,6 +478,7 @@ { gboolean selected; GtkTreeIter iter; + char *id; if (self->priv->model == NULL) return FALSE; @@ -420,18 +492,22 @@ if (selected) { - gtk_list_store_set (GTK_LIST_STORE (self->priv->model), &iter, - GD_MAIN_COLUMN_SELECTED, FALSE, - -1); + do_select_row (self, &iter, FALSE); } else if (!selected) { if (select_range) selection_mode_select_range (self, &iter); else - gtk_list_store_set (GTK_LIST_STORE (self->priv->model), &iter, - GD_MAIN_COLUMN_SELECTED, TRUE, - -1); + { + gtk_tree_model_get (self->priv->model, &iter, + GD_MAIN_COLUMN_ID, &id, + -1); + g_free (self->priv->last_selected_id); + self->priv->last_selected_id = id; + + do_select_row (self, &iter, TRUE); + } } g_signal_emit (self, signals[VIEW_SELECTION_CHANGED], 0); @@ -479,16 +555,26 @@ } static gboolean +event_triggers_selection_mode (GdkEventButton *event) +{ + return + (event->button == 3) || + ((event->button == 1) && (event->state & GDK_CONTROL_MASK)); +} + +static gboolean on_button_release_event (GtkWidget *view, GdkEventButton *event, gpointer user_data) { GdMainView *self = user_data; GdMainViewGeneric *generic = get_generic (self); - GtkTreePath *path; + GtkTreePath *path, *start_path, *end_path, *tmp_path; + GtkTreeIter iter; gchar *button_release_item_path; gboolean selection_mode; gboolean res, same_item = FALSE; + gboolean is_selected; /* eat double/triple click events */ if (event->type != GDK_BUTTON_RELEASE) @@ -508,6 +594,54 @@ g_free (self->priv->button_press_item_path); self->priv->button_press_item_path = NULL; + self->priv->track_motion = FALSE; + if (self->priv->rubberband_select) + { + self->priv->rubberband_select = FALSE; + gd_main_view_generic_set_rubberband_range (get_generic (self), NULL, NULL); + if (self->priv->rubberband_select_last_path) + { + if (!self->priv->selection_mode) + g_signal_emit (self, signals[SELECTION_MODE_REQUEST], 0); + + start_path = gtk_tree_path_copy (self->priv->rubberband_select_first_path); + end_path = gtk_tree_path_copy (self->priv->rubberband_select_last_path); + if (gtk_tree_path_compare (start_path, end_path) > 0) + { + tmp_path = start_path; + start_path = end_path; + end_path = tmp_path; + } + + while (gtk_tree_path_compare (start_path, end_path) <= 0) + { + if (gtk_tree_model_get_iter (self->priv->model, + &iter, start_path)) + { + gtk_tree_model_get (self->priv->model, &iter, + GD_MAIN_COLUMN_SELECTED, &is_selected, + -1); + do_select_row (self, &iter, !is_selected); + } + + gtk_tree_path_next (start_path); + } + + g_signal_emit (self, signals[VIEW_SELECTION_CHANGED], 0); + + gtk_tree_path_free (start_path); + gtk_tree_path_free (end_path); + } + + g_clear_pointer (&self->priv->rubberband_select_first_path, + gtk_tree_path_free); + g_clear_pointer (&self->priv->rubberband_select_last_path, + gtk_tree_path_free); + + res = TRUE; + goto out; + } + if (!same_item) { res = FALSE; @@ -518,8 +652,7 @@ if (!selection_mode) { - if ((event->button == 3) || - ((event->button == 1) && (event->state & GDK_CONTROL_MASK))) + if (event_triggers_selection_mode (event)) { g_signal_emit (self, signals[SELECTION_MODE_REQUEST], 0); selection_mode = TRUE; @@ -547,40 +680,106 @@ GList *selection, *l; GtkTreePath *sel_path; gboolean found = FALSE; + gboolean force_selection; path = gd_main_view_generic_get_path_at_pos (generic, event->x, event->y); if (path != NULL) self->priv->button_press_item_path = gtk_tree_path_to_string (path); - if (!self->priv->selection_mode || - path == NULL) + force_selection = event_triggers_selection_mode (event); + if (!self->priv->selection_mode && !force_selection) { gtk_tree_path_free (path); return FALSE; } - selection = gd_main_view_get_selection (self); - - for (l = selection; l != NULL; l = l->next) + if (path && !force_selection) { - sel_path = l->data; - if (gtk_tree_path_compare (path, sel_path) == 0) - { - found = TRUE; - break; - } - } + selection = gd_main_view_get_selection (self); - if (selection != NULL) - g_list_free_full (selection, (GDestroyNotify) gtk_tree_path_free); + for (l = selection; l != NULL; l = l->next) + { + sel_path = l->data; + if (gtk_tree_path_compare (path, sel_path) == 0) + { + found = TRUE; + break; + } + } + + if (selection != NULL) + g_list_free_full (selection, (GDestroyNotify) gtk_tree_path_free); + } /* if we did not find the item in the selection, block * drag and drop, while in selection mode */ - return !found; + if (!found) + { + self->priv->track_motion = TRUE; + self->priv->rubberband_select = FALSE; + self->priv->rubberband_select_first_path = NULL; + self->priv->rubberband_select_last_path = NULL; + self->priv->button_down_x = event->x; + self->priv->button_down_y = event->y; + return TRUE; + } + else + return FALSE; } +static gboolean +on_motion_event (GtkWidget *widget, + GdkEventMotion *event, + gpointer user_data) +{ + GdMainView *self = user_data; + GtkTreePath *path; + + if (self->priv->track_motion) + { + if (!self->priv->rubberband_select && + (event->x - self->priv->button_down_x) * (event->x - self->priv->button_down_x) + + (event->y - self->priv->button_down_y) * (event->y - self->priv->button_down_y) > + MAIN_VIEW_RUBBERBAND_SELECT_TRIGGER_LENGTH * MAIN_VIEW_RUBBERBAND_SELECT_TRIGGER_LENGTH) + { + self->priv->rubberband_select = TRUE; + if (self->priv->button_press_item_path) + { + self->priv->rubberband_select_first_path = + gtk_tree_path_new_from_string (self->priv->button_press_item_path); + } + } + + if (self->priv->rubberband_select) + { + path = gd_main_view_generic_get_path_at_pos (get_generic (self), event->x, event->y); + if (path != NULL) + { + if (self->priv->rubberband_select_first_path == NULL) + self->priv->rubberband_select_first_path = gtk_tree_path_copy (path); + + if (self->priv->rubberband_select_last_path == NULL || + gtk_tree_path_compare (self->priv->rubberband_select_last_path, path) != 0) + { + if (self->priv->rubberband_select_last_path) + gtk_tree_path_free (self->priv->rubberband_select_last_path); + self->priv->rubberband_select_last_path = path; + + gd_main_view_generic_set_rubberband_range (get_generic (self), + self->priv->rubberband_select_first_path, + self->priv->rubberband_select_last_path); + } + else + gtk_tree_path_free (path); + } + } + } + return FALSE; +} + + static void on_drag_begin (GdMainViewGeneric *generic, GdkDragContext *drag_context, @@ -637,8 +836,16 @@ on_view_path_activated (GdMainView *self, GtkTreePath *path) { - if (self->priv->selection_mode) - toggle_selection_for_path (self, path, FALSE); + GdkModifierType state; + + gtk_get_current_event_state (&state); + + if (self->priv->selection_mode || (state & GDK_CONTROL_MASK) != 0) + { + if (!self->priv->selection_mode) + g_signal_emit (self, signals[SELECTION_MODE_REQUEST], 0); + toggle_selection_for_path (self, path, ((state & GDK_SHIFT_MASK) != 0)); + } else activate_item_for_path (self, path); } @@ -730,6 +937,8 @@ G_CALLBACK (on_button_press_event), self); g_signal_connect (self->priv->current_view, "button-release-event", G_CALLBACK (on_button_release_event), self); + g_signal_connect (self->priv->current_view, "motion-notify-event", + G_CALLBACK (on_motion_event), self); g_signal_connect_after (self->priv->current_view, "drag-begin", G_CALLBACK (on_drag_begin), self); g_signal_connect (self->priv->current_view, "view-selection-changed", diff -Nru gnome-documents-3.8.0/libgd/libgd/gd-stack-switcher.c gnome-documents-3.8.3.1/libgd/libgd/gd-stack-switcher.c --- gnome-documents-3.8.0/libgd/libgd/gd-stack-switcher.c 2013-03-25 15:29:37.000000000 +0000 +++ gnome-documents-3.8.3.1/libgd/libgd/gd-stack-switcher.c 2013-05-15 15:17:16.000000000 +0000 @@ -18,6 +18,7 @@ */ #include "gd-stack-switcher.h" +#include "gd-header-button.h" struct _GdStackSwitcherPrivate { @@ -77,56 +78,21 @@ { char *title; char *symbolic_icon_name; - GtkStyleContext *context; - GtkWidget *button_child; gtk_container_child_get (GTK_CONTAINER (self->priv->stack), widget, "title", &title, "symbolic-icon-name", &symbolic_icon_name, NULL); - context = gtk_widget_get_style_context (button); - button_child = gtk_bin_get_child (GTK_BIN (button)); - - if (symbolic_icon_name != NULL && symbolic_icon_name[0] != '\0') - { - if (button_child != NULL && !GTK_IS_IMAGE (button_child)) - { - gtk_widget_set_size_request (button, -1, -1); - gtk_widget_destroy (button_child); - button_child = NULL; - } - - if (button_child == NULL) - { - button_child = gtk_image_new (); - gtk_container_add (GTK_CONTAINER (button), button_child); - gtk_widget_show (button_child); - } + gd_header_button_set_symbolic_icon_name (GD_HEADER_BUTTON (button), symbolic_icon_name); + gd_header_button_set_label (GD_HEADER_BUTTON (button), title); - gtk_image_set_from_icon_name (GTK_IMAGE (button_child), symbolic_icon_name, GTK_ICON_SIZE_MENU); - gtk_widget_set_tooltip_text (button, title); + gtk_widget_set_visible (button, title != NULL || symbolic_icon_name != NULL); - gtk_style_context_add_class (context, "image-button"); - gtk_style_context_remove_class (context, "text-button"); - } + if (symbolic_icon_name != NULL) + gtk_widget_set_size_request (button, -1, -1); else - { - if (button_child != NULL && GTK_IS_LABEL (button_child)) - gtk_label_set_text (GTK_LABEL (button_child), title); - else - { - if (button_child) - gtk_widget_destroy (button_child); - button_child = gtk_label_new (title); - gtk_widget_show (button_child); - gtk_container_add (GTK_CONTAINER (button), button_child); - gtk_widget_set_size_request (button, 100, -1); - - gtk_style_context_add_class (context, "text-button"); - gtk_style_context_remove_class (context, "image-button"); - } - } + gtk_widget_set_size_request (button, 100, -1); g_free (title); g_free (symbolic_icon_name); @@ -169,14 +135,9 @@ GList *group; GtkStyleContext *context; - button = gtk_radio_button_new (NULL); - context = gtk_widget_get_style_context (button); - gtk_style_context_add_class (context, "raised"); - + button = gd_header_radio_button_new (); update_button (self, widget, button); - gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (button), FALSE); - group = gtk_container_get_children (GTK_CONTAINER (self)); if (group != NULL) { @@ -185,7 +146,6 @@ } gtk_container_add (GTK_CONTAINER (self), button); - gtk_widget_show (button); g_object_set_data (G_OBJECT (button), "stack-child", widget); g_signal_connect (button, "clicked", G_CALLBACK (on_button_clicked), self); @@ -257,6 +217,8 @@ g_signal_handlers_disconnect_by_func (priv->stack, on_stack_child_removed, switcher); g_signal_handlers_disconnect_by_func (priv->stack, on_child_changed, switcher); + + g_signal_handlers_disconnect_by_func (priv->stack, disconnect_stack_signals, switcher); } static void @@ -270,6 +232,9 @@ G_CALLBACK (on_stack_child_removed), switcher); g_signal_connect (priv->stack, "notify::visible-child", G_CALLBACK (on_child_changed), switcher); + + g_signal_connect_swapped (priv->stack, "destroy", + G_CALLBACK (disconnect_stack_signals), switcher); } /** diff -Nru gnome-documents-3.8.0/libgd/libgd/gd-stack.c gnome-documents-3.8.3.1/libgd/libgd/gd-stack.c --- gnome-documents-3.8.0/libgd/libgd/gd-stack.c 2013-03-25 15:29:37.000000000 +0000 +++ gnome-documents-3.8.3.1/libgd/libgd/gd-stack.c 2013-06-14 15:40:58.000000000 +0000 @@ -603,15 +603,16 @@ gdouble pos) { GdStackPrivate *priv = stack->priv; - GtkAllocation allocation; gboolean done; priv->transition_pos = pos; gtk_widget_queue_draw (GTK_WIDGET (stack)); - if (priv->transition_type == GD_STACK_TRANSITION_TYPE_SLIDE_LEFT || - priv->transition_type == GD_STACK_TRANSITION_TYPE_SLIDE_RIGHT) + if (priv->bin_window != NULL && + (priv->transition_type == GD_STACK_TRANSITION_TYPE_SLIDE_LEFT || + priv->transition_type == GD_STACK_TRANSITION_TYPE_SLIDE_RIGHT)) { + GtkAllocation allocation; gtk_widget_get_allocation (GTK_WIDGET (stack), &allocation); gdk_window_move (priv->bin_window, get_bin_window_x (stack, &allocation), 0); @@ -856,6 +857,7 @@ priv->children = g_list_append (priv->children, child_info); + gtk_widget_set_parent_window (child, priv->bin_window); gtk_widget_set_parent (child, GTK_WIDGET (stack)); g_signal_connect (child, "notify::visible", @@ -1176,7 +1178,8 @@ GdStackPrivate *priv = stack->priv; cairo_t *pattern_cr; - if (priv->visible_child) + if (priv->visible_child && + gtk_cairo_should_draw_window (cr, priv->bin_window)) { if (priv->transition_pos < 1.0) { @@ -1211,7 +1214,7 @@ } } - else if (gtk_cairo_should_draw_window (cr, priv->bin_window)) + else gtk_container_propagate_draw (GTK_CONTAINER (stack), priv->visible_child->widget, cr); diff -Nru gnome-documents-3.8.0/libgd/libgd/gd-types-catalog.c gnome-documents-3.8.3.1/libgd/libgd/gd-types-catalog.c --- gnome-documents-3.8.0/libgd/libgd/gd-types-catalog.c 1970-01-01 00:00:00.000000000 +0000 +++ gnome-documents-3.8.3.1/libgd/libgd/gd-types-catalog.c 2013-05-15 15:17:16.000000000 +0000 @@ -0,0 +1,142 @@ +/* + * Copyright (c) 2012 Red Hat, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include "gd-types-catalog.h" + +#ifdef LIBGD__VIEW_COMMON +# include "gd-main-view-generic.h" +# include "gd-styled-text-renderer.h" +# include "gd-toggle-pixbuf-renderer.h" +# include "gd-two-lines-renderer.h" +#endif + +#ifdef LIBGD_MAIN_ICON_VIEW +# include "gd-main-icon-view.h" +#endif + +#ifdef LIBGD_MAIN_LIST_VIEW +# include "gd-main-list-view.h" +#endif + +#ifdef LIBGD_MAIN_VIEW +# include "gd-main-view.h" +#endif + +#ifdef LIBGD_MAIN_TOOLBAR +# include "gd-main-toolbar.h" +#endif + +#ifdef LIBGD_HEADER_BAR +# include "gd-header-bar.h" +#endif + +#ifdef LIBGD__HEADER_BUTTON +# include "gd-header-button.h" +#endif + +#ifdef LIBGD_MARGIN_CONTAINER +# include "gd-margin-container.h" +#endif + +#ifdef LIBGD_TAGGED_ENTRY +# include "gd-tagged-entry.h" +#endif + +#ifdef LIBGD_NOTIFICATION +# include "gd-notification.h" +#endif + +#ifdef LIBGD_REVEALER +# include "gd-revealer.h" +#endif + +#ifdef LIBGD_STACK +# include "gd-stack.h" +# include "gd-stack-switcher.h" +#endif + +/** + * gd_ensure_types: + * + * This functions must be called during initialization + * to make sure the widget types are available to GtkBuilder. + */ +void +gd_ensure_types (void) +{ +#ifdef LIBGD__VIEW_COMMON + g_type_ensure (GD_TYPE_MAIN_VIEW_GENERIC); + g_type_ensure (GD_TYPE_STYLED_TEXT_RENDERER); + g_type_ensure (GD_TYPE_TOGGLE_PIXBUF_RENDERER); + g_type_ensure (GD_TYPE_TWO_LINES_RENDERER); +#endif + +#ifdef LIBGD_MAIN_ICON_VIEW + g_type_ensure (GD_TYPE_MAIN_ICON_VIEW); +#endif + +#ifdef LIBGD_MAIN_LIST_VIEW + g_type_ensure (GD_TYPE_MAIN_LIST_VIEW); +#endif + +#ifdef LIBGD_MAIN_VIEW + g_type_ensure (GD_TYPE_MAIN_VIEW); +#endif + +#ifdef LIBGD_MAIN_TOOLBAR + g_type_ensure (GD_TYPE_MAIN_TOOLBAR); +#endif + +#ifdef LIBGD_HEADER_BAR + g_type_ensure (GD_TYPE_HEADER_BAR); +#endif + +#ifdef LIBGD__HEADER_BUTTON + g_type_ensure (GD_TYPE_HEADER_SIMPLE_BUTTON); + g_type_ensure (GD_TYPE_HEADER_MENU_BUTTON); + g_type_ensure (GD_TYPE_HEADER_TOGGLE_BUTTON); + g_type_ensure (GD_TYPE_HEADER_RADIO_BUTTON); +#endif + +#ifdef LIBGD_MARGIN_CONTAINER + g_type_ensure (GD_TYPE_MARGIN_CONTAINER); +#endif + +#ifdef LIBGD_TAGGED_ENTRY + g_type_ensure (GD_TYPE_TAGGED_ENTRY); +#endif + +#ifdef LIBGD_NOTIFICATION + g_type_ensure (GD_TYPE_NOTIFICATION); +#endif + +#ifdef LIBGD_REVEALER + g_type_ensure (GD_TYPE_REVEALER); +#endif + +#ifdef LIBGD_STACK + g_type_ensure (GD_TYPE_STACK); + g_type_ensure (GD_TYPE_STACK_SWITCHER); +#endif +} + diff -Nru gnome-documents-3.8.0/libgd/libgd/gd-types-catalog.h gnome-documents-3.8.3.1/libgd/libgd/gd-types-catalog.h --- gnome-documents-3.8.0/libgd/libgd/gd-types-catalog.h 1970-01-01 00:00:00.000000000 +0000 +++ gnome-documents-3.8.3.1/libgd/libgd/gd-types-catalog.h 2013-05-15 15:17:16.000000000 +0000 @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2012 Red Hat, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#ifndef __GD_TYPES_CATALOG_H__ +#define __GD_TYPES_CATALOG_H__ + +#include + +G_BEGIN_DECLS + +void gd_ensure_types (void); + +G_END_DECLS + +#endif /* __GD_TYPES_CATALOG_H__ */ diff -Nru gnome-documents-3.8.0/libgd/libgd/gd.h gnome-documents-3.8.3.1/libgd/libgd/gd.h --- gnome-documents-3.8.0/libgd/libgd/gd.h 2013-03-03 20:27:13.000000000 +0000 +++ gnome-documents-3.8.3.1/libgd/libgd/gd.h 2013-05-15 15:17:16.000000000 +0000 @@ -28,6 +28,8 @@ G_BEGIN_DECLS +#include + #ifdef LIBGD_GTK_HACKS # include # include diff -Nru gnome-documents-3.8.0/libgd/libgd.m4 gnome-documents-3.8.3.1/libgd/libgd.m4 --- gnome-documents-3.8.0/libgd/libgd.m4 2013-03-25 15:29:37.000000000 +0000 +++ gnome-documents-3.8.3.1/libgd/libgd.m4 2013-05-15 15:17:16.000000000 +0000 @@ -72,12 +72,6 @@ AC_DEFINE([LIBGD_MAIN_LIST_VIEW], [1], [Description]) ]) - # _view-common: - AM_CONDITIONAL([LIBGD__VIEW_COMMON],[_LIBGD_IF_OPTION_SET([_view-common],[true],[false])]) - _LIBGD_IF_OPTION_SET([_view-common],[ - AC_DEFINE([LIBGD__VIEW_COMMON], [1], [Description]) - ]) - # main-toolbar: AM_CONDITIONAL([LIBGD_MAIN_TOOLBAR],[_LIBGD_IF_OPTION_SET([main-toolbar],[true],[false])]) _LIBGD_IF_OPTION_SET([main-toolbar],[ @@ -92,12 +86,6 @@ AC_DEFINE([LIBGD_HEADER_BAR], [1], [Description]) ]) - # _header-button: - AM_CONDITIONAL([LIBGD__HEADER_BUTTON],[_LIBGD_IF_OPTION_SET([_header-button],[true],[false])]) - _LIBGD_IF_OPTION_SET([_header-button],[ - AC_DEFINE([LIBGD__HEADER_BUTTON], [1], [Description]) - ]) - # margin-container: AM_CONDITIONAL([LIBGD_MARGIN_CONTAINER],[_LIBGD_IF_OPTION_SET([margin-container],[true],[false])]) _LIBGD_IF_OPTION_SET([margin-container],[ @@ -119,6 +107,7 @@ # stack: AM_CONDITIONAL([LIBGD_STACK],[_LIBGD_IF_OPTION_SET([stack],[true],[false])]) _LIBGD_IF_OPTION_SET([stack],[ + _LIBGD_SET_OPTION([_header-button]) AC_DEFINE([LIBGD_STACK], [1], [Description]) ]) @@ -144,6 +133,18 @@ GOBJECT_INTROSPECTION_REQUIRE([0.9.6]) ]) + # _header-button: + AM_CONDITIONAL([LIBGD__HEADER_BUTTON],[_LIBGD_IF_OPTION_SET([_header-button],[true],[false])]) + _LIBGD_IF_OPTION_SET([_header-button],[ + AC_DEFINE([LIBGD__HEADER_BUTTON], [1], [Description]) + ]) + + # _view-common: + AM_CONDITIONAL([LIBGD__VIEW_COMMON],[_LIBGD_IF_OPTION_SET([_view-common],[true],[false])]) + _LIBGD_IF_OPTION_SET([_view-common],[ + AC_DEFINE([LIBGD__VIEW_COMMON], [1], [Description]) + ]) + PKG_CHECK_MODULES(LIBGD, [ $LIBGD_MODULES ]) AC_SUBST(LIBGD_GIR_INCLUDES) AC_SUBST(LIBGD_SOURCES) diff -Nru gnome-documents-3.8.0/m4/getting-started.m4 gnome-documents-3.8.3.1/m4/getting-started.m4 --- gnome-documents-3.8.0/m4/getting-started.m4 2013-03-04 20:25:29.000000000 +0000 +++ gnome-documents-3.8.3.1/m4/getting-started.m4 2013-04-03 11:08:32.000000000 +0000 @@ -73,7 +73,7 @@ svgname=$(srcdir)/$(patsubst %.pdf,%.svg,[$]@); \ inkscape -z -A "[$]@" "$$svgname" -$(_HELP_PDF_OUTPUTS): $(_HELP_LC_PDFS) +$(_HELP_PDF_OUTPUTS): $(_HELP_LC_PDFS) $(_HELP_C_PDFS) lc=`dirname [$]@`; \ files="$(foreach f,$(_HELP_PDFFILES),$$lc/$(f))"; \ pdfunite $$files "$$lc/$(_HELP_OUTPUT)"; \ diff -Nru gnome-documents-3.8.0/man/Makefile.am gnome-documents-3.8.3.1/man/Makefile.am --- gnome-documents-3.8.0/man/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ gnome-documents-3.8.3.1/man/Makefile.am 2013-06-07 14:21:43.000000000 +0000 @@ -0,0 +1,19 @@ +XSLTPROC_FLAGS = \ + --nonet \ + --stringparam man.output.quietly 1 \ + --stringparam funcsynopsis.style ansi \ + --stringparam man.th.extra1.suppress 1 \ + --stringparam man.authors.section.enabled 0 \ + --stringparam man.copyright.section.enabled 0 + +.xml.1: + $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< + +man_MANS = \ + gnome-documents.1 + +xml_files = $(man_MANS:.1=.xml) + +EXTRA_DIST = $(xml_files) + +DISTCLEANFILES = $(man_MANS) diff -Nru gnome-documents-3.8.0/man/Makefile.in gnome-documents-3.8.3.1/man/Makefile.in --- gnome-documents-3.8.0/man/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ gnome-documents-3.8.3.1/man/Makefile.in 2013-06-14 15:43:51.000000000 +0000 @@ -0,0 +1,596 @@ +# Makefile.in generated by automake 1.13.2 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +subdir = man +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/libgd/libgd.m4 \ + $(top_srcdir)/m4/ax_config_dir.m4 $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/getting-started.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +man1dir = $(mandir)/man1 +am__installdirs = "$(DESTDIR)$(man1dir)" +NROFF = nroff +MANS = $(man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@ +DLLTOOL = @DLLTOOL@ +DOCUMENTS_CFLAGS = @DOCUMENTS_CFLAGS@ +DOCUMENTS_LIBS = @DOCUMENTS_LIBS@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GJS_CONSOLE = @GJS_CONSOLE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ +GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ +GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ +INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ +INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ +INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ +INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@ +INTROSPECTION_LIBS = @INTROSPECTION_LIBS@ +INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ +INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ +INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ +ITSTOOL = @ITSTOOL@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBGD_CFLAGS = @LIBGD_CFLAGS@ +LIBGD_GIR_INCLUDES = @LIBGD_GIR_INCLUDES@ +LIBGD_LIBS = @LIBGD_LIBS@ +LIBGD_MODULE_DIR = @LIBGD_MODULE_DIR@ +LIBGD_SOURCES = @LIBGD_SOURCES@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ +LIBM = @LIBM@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MINER_CFLAGS = @MINER_CFLAGS@ +MINER_LIBS = @MINER_LIBS@ +MKDIR_P = @MKDIR_P@ +MSGFMT = @MSGFMT@ +MSGFMT_015 = @MSGFMT_015@ +MSGMERGE = @MSGMERGE@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +POSUB = @POSUB@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ +XSLTPROC = @XSLTPROC@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +XSLTPROC_FLAGS = \ + --nonet \ + --stringparam man.output.quietly 1 \ + --stringparam funcsynopsis.style ansi \ + --stringparam man.th.extra1.suppress 1 \ + --stringparam man.authors.section.enabled 0 \ + --stringparam man.copyright.section.enabled 0 + +man_MANS = \ + gnome-documents.1 + +xml_files = $(man_MANS:.1=.xml) +EXTRA_DIST = $(xml_files) +DISTCLEANFILES = $(man_MANS) +all: all-am + +.SUFFIXES: +.SUFFIXES: .1 .xml +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign man/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-man1: $(man_MANS) + @$(NORMAL_INSTALL) + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man1dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.1[a-z]*$$/p'; \ + fi; \ + } | while read p; do \ + if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; echo "$$p"; \ + done | \ + sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \ + sed 'N;N;s,\n, ,g' | { \ + list=; while read file base inst; do \ + if test "$$base" = "$$inst"; then list="$$list $$file"; else \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \ + fi; \ + done; \ + for i in $$list; do echo "$$i"; done | $(am__base_list) | \ + while read files; do \ + test -z "$$files" || { \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \ + done; } + +uninstall-man1: + @$(NORMAL_UNINSTALL) + @list=''; test -n "$(man1dir)" || exit 0; \ + files=`{ for i in $$list; do echo "$$i"; done; \ + l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ + sed -n '/\.1[a-z]*$$/p'; \ + } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) +tags TAGS: + +ctags CTAGS: + +cscope cscopelist: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(MANS) +installdirs: + for dir in "$(DESTDIR)$(man1dir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-man + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: install-man1 + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-man + +uninstall-man: uninstall-man1 + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-man1 install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-man \ + uninstall-man1 + + +.xml.1: + $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru gnome-documents-3.8.0/man/gnome-documents.xml gnome-documents-3.8.3.1/man/gnome-documents.xml --- gnome-documents-3.8.0/man/gnome-documents.xml 1970-01-01 00:00:00.000000000 +0000 +++ gnome-documents-3.8.3.1/man/gnome-documents.xml 2013-06-07 14:21:43.000000000 +0000 @@ -0,0 +1,66 @@ + + + + + + + gnome-documents + GNOME + + + + Maintainer + Cosimo + Cecchi + cosimoc@gnome.org + + + + + + + gnome-documents + 1 + User Commands + + + + gnome-documents + A document manager application for GNOME + + + + + gnome-documents + + + + + Description + + gnome-documents is a document + manager application designed to work with GNOME 3. You + can view your local and online documents, search through + them, print or mark them as favorites. It's included in + the default set of core applications since GNOME 3.2. + + + + Bugs + + The bug tracker can be reached by visiting the + website https://bugzilla.gnome.org/buglist.cgi?product=gnome-documents. + Before sending a bug report, please verify that you have + the latest version of gnome-documents. Many bugs (major and + minor) are fixed at each release, and if yours is out of + date, the problem may already have been solved. + + + + Additional Information + + For further information, visit the website + http://live.gnome.org/GnomeDocuments. + + diff -Nru gnome-documents-3.8.0/po/en_GB.po gnome-documents-3.8.3.1/po/en_GB.po --- gnome-documents-3.8.0/po/en_GB.po 2012-10-01 13:36:54.000000000 +0000 +++ gnome-documents-3.8.3.1/po/en_GB.po 2013-06-14 15:36:05.000000000 +0000 @@ -1,13 +1,14 @@ # British English translation of gnome-documents. # Copyright (C) 2011 gnome-documents'S COPYRIGHT HOLDER # This file is distributed under the same licence as the gnome-documents package. -# Bruce Cowan , 2011, 2012. +# Bruce Cowan , 2011, 2012, 2013. +# msgid "" msgstr "" "Project-Id-Version: gnome-documents\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-18 08:28+0100\n" -"PO-Revision-Date: 2012-09-18 08:28+0100\n" +"POT-Creation-Date: 2013-04-06 17:00+0100\n" +"PO-Revision-Date: 2013-04-06 17:02+0100\n" "Last-Translator: Bruce Cowan \n" "Language-Team: British English \n" "Language: en_GB\n" @@ -15,11 +16,11 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Virtaal 0.7.1\n" +"X-Generator: Gtranslator 2.91.6\n" "X-Project-Style: gnome\n" -#: ../data/gnome-documents.desktop.in.in.h:1 ../src/mainWindow.js:51 -#: ../src/mainWindow.js:205 +#: ../data/gnome-documents.desktop.in.in.h:1 ../src/application.js:101 +#: ../src/mainWindow.js:53 ../src/mainWindow.js:274 msgid "Documents" msgstr "Documents" @@ -64,151 +65,232 @@ msgid "Window maximized state" msgstr "Window maximised state" -#: ../src/documents.js:640 ../src/sources.js:95 +#. Translators: this refers to local documents +#: ../src/documents.js:590 ../src/search.js:416 msgid "Local" msgstr "Local" +#. Translators: Documents ships a "Getting Started with Documents" +#. tutorial PDF. The "GNOME" string below is displayed as the author name +#. of that document, and doesn't normally need to be translated. +#: ../src/documents.js:611 +msgid "GNOME" +msgstr "GNOME" + +#: ../src/documents.js:612 +msgid "Getting Started with Documents" +msgstr "Getting Started with Documents" + #. overridden -#: ../src/documents.js:693 +#: ../src/documents.js:659 msgid "Google Docs" msgstr "Google Docs" -#: ../src/documents.js:694 +#: ../src/documents.js:660 msgid "Google" msgstr "Google" -#: ../src/documents.js:758 ../src/documents.js:857 +#: ../src/documents.js:724 ../src/documents.js:823 msgid "Spreadsheet" msgstr "Spreadsheet" -#: ../src/documents.js:760 ../src/documents.js:859 +#: ../src/documents.js:726 ../src/documents.js:825 ../src/presentation.js:48 msgid "Presentation" msgstr "Presentation" -#: ../src/documents.js:762 ../src/documents.js:861 +#: ../src/documents.js:728 ../src/documents.js:827 msgid "Collection" msgstr "Collection" -#: ../src/documents.js:764 ../src/documents.js:863 +#: ../src/documents.js:730 ../src/documents.js:829 msgid "Document" msgstr "Document" #. overridden -#: ../src/documents.js:791 ../src/documents.js:792 +#: ../src/documents.js:757 ../src/documents.js:758 msgid "Skydrive" msgstr "Skydrive" +#: ../src/documents.js:942 +msgid "Please check the network connection." +msgstr "Please check the network connection." + +#: ../src/documents.js:945 +msgid "Please check the network proxy settings." +msgstr "Please check the network proxy settings." + +#: ../src/documents.js:948 +msgid "Unable to sign in to the document service." +msgstr "Unable to sign in to the document service." + +#: ../src/documents.js:951 +msgid "Unable to locate this document." +msgstr "Unable to locate this document." + +#: ../src/documents.js:954 +#, c-format +msgid "Hmm, something is fishy (%d)." +msgstr "Hmm, something is fishy (%d)." + #. Translators: %s is the title of a document -#: ../src/documents.js:976 +#: ../src/documents.js:967 #, c-format -msgid "Unable to load \"%s\" for preview" -msgstr "Unable to load \"%s\" for preview" +msgid "Oops! Unable to load “%s”" +msgstr "Oops! Unable to load “%s”" -#: ../src/embed.js:74 -msgid "Loading..." +#: ../src/edit.js:191 +msgid "View" +msgstr "View" + +#: ../src/embed.js:63 ../src/lib/gd-places-bookmarks.c:382 +#: ../src/lib/gd-places-links.c:257 ../src/view.js:71 +msgid "Loading…" msgstr "Loading…" -#: ../src/embed.js:220 +#: ../src/embed.js:145 msgid "No Documents Found" msgstr "No Documents Found" #. Translators: %s here is "System Settings", which is in a separate string #. due to markup, and should be translated only in the context of this sentence -#: ../src/embed.js:243 +#: ../src/embed.js:166 #, c-format msgid "You can add your online accounts in %s" msgstr "You can add your online accounts in %s" #. Translators: this should be translated in the context of the #. "You can add your online accounts in System Settings" sentence above -#: ../src/embed.js:247 +#: ../src/embed.js:170 msgid "System Settings" msgstr "System Settings" -#: ../src/lib/gd-pdf-loader.c:224 +#: ../src/lib/gd-nav-bar.c:235 +#, c-format +msgid "Page %u of %u" +msgstr "Page %u of %u" + +#: ../src/lib/gd-pdf-loader.c:226 msgid "Unable to load the document" msgstr "Unable to load the document" -#: ../src/lib/gd-pdf-loader.c:673 -msgid "Cannot find \"unoconv\", please check your LibreOffice installation" -msgstr "Cannot find \"unoconv\", please check your LibreOffice installation" +#: ../src/lib/gd-pdf-loader.c:676 +msgid "LibreOffice is required to view this document" +msgstr "LibreOffice is required to view this document" + +#. Translators: %s is the number of the page, already formatted +#. * as a string, for example "Page 5". +#. +#: ../src/lib/gd-places-bookmarks.c:312 +#, c-format +msgid "Page %s" +msgstr "Page %s" + +#: ../src/lib/gd-places-bookmarks.c:375 +msgid "No bookmarks" +msgstr "No bookmarks" + +#: ../src/lib/gd-places-bookmarks.c:647 +msgid "Bookmarks" +msgstr "Bookmarks" + +#: ../src/lib/gd-places-links.c:342 +msgid "No table of contents" +msgstr "No table of contents" + +#: ../src/lib/gd-places-links.c:518 +msgid "Contents" +msgstr "Contents" -#: ../src/mainToolbar.js:73 +#: ../src/mainToolbar.js:62 msgid "Search" msgstr "Search" -#: ../src/mainToolbar.js:158 -msgid "New and Recent" -msgstr "New and Recent" +#: ../src/mainToolbar.js:73 +msgid "Back" +msgstr "Back" -#: ../src/mainToolbar.js:165 +#: ../src/mainToolbar.js:153 #, c-format -msgid "Results for \"%s\"" -msgstr "Results for \"%s\"" - -#: ../src/mainToolbar.js:167 -msgid "filtered by title" -msgstr "filtered by title" - -#: ../src/mainToolbar.js:169 -msgid "filtered by author" -msgstr "filtered by author" +msgid "Results for “%s”" +msgstr "Results for “%s”" -#: ../src/mainToolbar.js:176 +#: ../src/mainToolbar.js:161 msgid "Click on items to select them" msgstr "Click on items to select them" -#: ../src/mainToolbar.js:178 +#: ../src/mainToolbar.js:163 #, c-format msgid "%d selected" msgid_plural "%d selected" msgstr[0] "%d selected" msgstr[1] "%d selected" -#: ../src/mainToolbar.js:208 ../src/properties.js:58 +#. Label for Done button in Sharing dialog +#: ../src/mainToolbar.js:192 ../src/properties.js:59 ../src/sharing.js:93 msgid "Done" msgstr "Done" -#: ../src/mainToolbar.js:226 -msgid "Back" -msgstr "Back" - -#: ../src/mainToolbar.js:248 +#: ../src/mainToolbar.js:233 msgid "Select Items" msgstr "Select Items" -#: ../src/mainWindow.js:204 +#: ../src/mainWindow.js:273 msgid "translator-credits" msgstr "Bruce Cowan " -#: ../src/mainWindow.js:206 +#: ../src/mainWindow.js:275 msgid "A document manager application" msgstr "A document manager application" -#: ../src/notifications.js:86 +#: ../src/notifications.js:87 #, c-format -msgid "Printing \"%s\": %s" -msgstr "Printing \"%s\": %s" +msgid "Printing “%s”: %s" +msgstr "Printing “%s”: %s" -#: ../src/notifications.js:151 +#: ../src/notifications.js:143 msgid "Your documents are being indexed" msgstr "Your documents are being indexed" -#: ../src/notifications.js:155 +#: ../src/notifications.js:144 msgid "Some documents might not be available during this process" msgstr "Some documents might not be available during this process" -#. Properties dialog heading -#: ../src/properties.js:73 ../src/selections.js:792 +#. Translators: %s refers to an online account provider, e.g. +#. "Google", or "Windows Live". +#: ../src/notifications.js:166 +#, c-format +msgid "Fetching documents from %s" +msgstr "Fetching documents from %s" + +#: ../src/notifications.js:168 +msgid "Fetching documents from online accounts" +msgstr "Fetching documents from online accounts" + +#: ../src/presentation.js:105 +msgid "Running in presentation mode" +msgstr "Running in presentation mode" + +#: ../src/presentation.js:158 +msgid "Present On" +msgstr "Present On" + +#: ../src/properties.js:57 ../src/resources/preview-menu.ui.h:9 +#: ../src/selections.js:781 msgid "Properties" msgstr "Properties" #. Title item -#: ../src/properties.js:81 ../src/searchbar.js:225 +#. Translators: "Title" is the label next to the document title +#. in the properties dialog +#. Translators: "Title" refers to "Match Title" when searching +#: ../src/properties.js:79 ../src/search.js:257 msgid "Title" msgstr "Title" -#: ../src/properties.js:88 ../src/searchbar.js:227 +#. Translators: "Author" is the label next to the document author +#. in the properties dialog +#. Translators: "Author" refers to "Match Author" when searching +#: ../src/properties.js:88 ../src/search.js:260 msgid "Author" msgstr "Author" @@ -227,186 +309,303 @@ msgstr "Date Created" #. Document type item -#: ../src/properties.js:115 ../src/searchbar.js:135 +#. Translators: "Type" is the label next to the document type +#. (PDF, spreadsheet, ...) in the properties dialog +#. Translators: "Type" refers to a search filter on the document type +#. (PDF, spreadsheet, ...) +#: ../src/properties.js:117 ../src/search.js:166 msgid "Type" msgstr "Type" -#: ../src/searchbar.js:83 +#: ../src/resources/app-menu.ui.h:2 +msgid "Grid" +msgstr "Grid" + +#: ../src/resources/app-menu.ui.h:3 +msgid "List" +msgstr "List" + +#: ../src/resources/app-menu.ui.h:4 +msgid "Fullscreen" +msgstr "Fullscreen" + +#: ../src/resources/app-menu.ui.h:5 +msgid "About Documents" +msgstr "About Documents" + +#: ../src/resources/app-menu.ui.h:6 +msgid "Help" +msgstr "Help" + +#: ../src/resources/app-menu.ui.h:7 +msgid "Quit" +msgstr "Quit" + +#. Translators: this is the Open action in a context menu +#: ../src/resources/preview-menu.ui.h:1 ../src/selections.js:877 +msgid "Open" +msgstr "Open" + +#: ../src/resources/preview-menu.ui.h:2 +msgid "Edit" +msgstr "Edit" + +#: ../src/resources/preview-menu.ui.h:3 +msgid "Print…" +msgstr "Print…" + +#: ../src/resources/preview-menu.ui.h:4 +msgid "Present" +msgstr "Present" + +#: ../src/resources/preview-menu.ui.h:5 +msgid "Zoom In" +msgstr "Zoom In" + +#: ../src/resources/preview-menu.ui.h:6 +msgid "Zoom Out" +msgstr "Zoom Out" + +#: ../src/resources/preview-menu.ui.h:7 +msgid "Rotate ↶" +msgstr "Rotate ↶" + +#: ../src/resources/preview-menu.ui.h:8 +msgid "Rotate ↷" +msgstr "Rotate ↷" + +#: ../src/resources/selection-menu.ui.h:1 +msgid "Select All" +msgstr "Select All" + +#: ../src/resources/selection-menu.ui.h:2 +msgid "Select None" +msgstr "Select None" + +#: ../src/search.js:112 msgid "Category" msgstr "Category" -#: ../src/searchbar.js:88 ../src/searchbar.js:138 ../src/searchbar.js:223 -#: ../src/sources.js:89 +#. Translators: this refers to new and recent documents +#. Translators: this refers to documents +#: ../src/search.js:117 ../src/search.js:169 ../src/search.js:254 +#: ../src/search.js:410 msgid "All" msgstr "All" -#: ../src/searchbar.js:94 +#. Translators: this refers to favorite documents +#: ../src/search.js:123 msgid "Favorites" msgstr "Favourites" -#: ../src/searchbar.js:99 +#. Translators: this refers to shared documents +#: ../src/search.js:128 msgid "Shared with you" msgstr "Shared with you" -#: ../src/searchbar.js:140 +#: ../src/search.js:171 msgid "Collections" msgstr "Collections" -#: ../src/searchbar.js:144 +#: ../src/search.js:175 msgid "PDF Documents" msgstr "PDF Documents" -#: ../src/searchbar.js:148 +#: ../src/search.js:179 msgid "Presentations" msgstr "Presentations" -#: ../src/searchbar.js:151 +#: ../src/search.js:182 msgid "Spreadsheets" msgstr "Spreadsheets" -#: ../src/searchbar.js:154 +#: ../src/search.js:185 msgid "Text Documents" msgstr "Text Documents" #. Translators: this is a verb that refers to "All", "Title" and "Author", #. as in "Match All", "Match Title" and "Match Author" -#: ../src/searchbar.js:220 +#: ../src/search.js:251 msgid "Match" msgstr "Match" -#: ../src/selections.js:761 +#: ../src/search.js:406 +msgid "Sources" +msgstr "Sources" + +#. Translators: "Organize" refers to documents in this context +#: ../src/selections.js:614 ../src/selections.js:773 +msgid "Organize" +msgstr "Organise" + +#: ../src/selections.js:749 msgid "Print" msgstr "Print" -#: ../src/selections.js:768 +#: ../src/selections.js:756 msgid "Delete" msgstr "Delete" -#: ../src/selections.js:784 -msgid "Organize" -msgstr "Organise" +#: ../src/selections.js:788 +msgid "Share" +msgstr "Share" #. Translators: this is the Open action in a context menu -#: ../src/selections.js:873 +#: ../src/selections.js:874 #, c-format msgid "Open with %s" msgstr "Open with %s" -#. Translators: this is the Open action in a context menu -#: ../src/selections.js:876 ../src/resources/preview-menu.ui.h:1 -msgid "Open" -msgstr "Open" +#: ../src/sharing.js:89 +msgid "Sharing Settings" +msgstr "Sharing Settings" + +#. Label for widget group for changing document permissions +#: ../src/sharing.js:126 +msgid "Document permissions" +msgstr "Document permissions" + +#. Label for permission change in Sharing dialog +#: ../src/sharing.js:133 ../src/sharing.js:311 +msgid "Change" +msgstr "Change" + +#. Label for radiobutton that sets doc permission to private +#: ../src/sharing.js:157 ../src/sharing.js:286 +msgid "Private" +msgstr "Private" + +#: ../src/sharing.js:167 ../src/sharing.js:279 +msgid "Public" +msgstr "Public" + +#. Label for checkbutton that sets doc permission to Can edit +#: ../src/sharing.js:171 ../src/sharing.js:281 +msgid "Everyone can edit" +msgstr "Everyone can edit" + +#. Label for widget group used for adding new contacts +#: ../src/sharing.js:178 +msgid "Add people" +msgstr "Add people" + +#. Editable text in entry field +#: ../src/sharing.js:185 +msgid "Enter an email address" +msgstr "Enter an e-mail address" + +#: ../src/sharing.js:200 ../src/sharing.js:367 +msgid "Can edit" +msgstr "Can edit" + +#: ../src/sharing.js:200 ../src/sharing.js:370 +msgid "Can view" +msgstr "Can view" + +#: ../src/sharing.js:207 +msgid "Add" +msgstr "Add" + +#: ../src/sharing.js:283 +msgid "Everyone can read" +msgstr "Everyone can read" + +#: ../src/sharing.js:298 +msgid "Save" +msgstr "Save" + +#: ../src/sharing.js:364 +msgid "Owner" +msgstr "Owner" + +#: ../src/sharing.js:433 +#, c-format +msgid "You can ask %s for access" +msgstr "You can ask %s for access" + +#: ../src/sharing.js:470 ../src/sharing.js:506 ../src/sharing.js:563 +#: ../src/sharing.js:580 ../src/sharing.js:599 +msgid "The document was not updated" +msgstr "The document was not updated" -#: ../src/shellSearchProvider.js:281 +#: ../src/shellSearchProvider.js:293 msgid "Untitled Document" msgstr "Untitled Document" -#: ../src/sources.js:85 -msgid "Sources" -msgstr "Sources" - -#: ../src/view.js:79 -#, c-format -msgid "Load %d more document" -msgid_plural "Load %d more documents" -msgstr[0] "Load %d more document" -msgstr[1] "Load %d more documents" +#. Translators: "more" refers to documents in this context +#: ../src/view.js:62 ../src/view.js:93 +msgid "Load More" +msgstr "Load More" -#: ../src/view.js:283 +#: ../src/view.js:294 msgid "Yesterday" msgstr "Yesterday" -#: ../src/view.js:285 +#: ../src/view.js:296 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d day ago" msgstr[1] "%d days ago" -#: ../src/view.js:289 +#: ../src/view.js:300 msgid "Last week" msgstr "Last week" -#: ../src/view.js:291 +#: ../src/view.js:302 #, c-format msgid "%d week ago" msgid_plural "%d weeks ago" msgstr[0] "%d week ago" msgstr[1] "%d weeks ago" -#: ../src/view.js:295 +#: ../src/view.js:306 msgid "Last month" msgstr "Last month" -#: ../src/view.js:297 +#: ../src/view.js:308 #, c-format msgid "%d month ago" msgid_plural "%d months ago" msgstr[0] "%d month ago" msgstr[1] "%d months ago" -#: ../src/view.js:301 +#: ../src/view.js:312 msgid "Last year" msgstr "Last year" -#: ../src/view.js:303 +#: ../src/view.js:314 #, c-format msgid "%d year ago" msgid_plural "%d years ago" msgstr[0] "%d year ago" msgstr[1] "%d years ago" -#: ../src/resources/app-menu.ui.h:2 -msgid "Grid" -msgstr "Grid" +#~ msgid "Unable to load \"%s\" for preview" +#~ msgstr "Unable to load \"%s\" for preview" -#: ../src/resources/app-menu.ui.h:3 -msgid "List" -msgstr "List" +#~ msgid "Cannot find \"unoconv\", please check your LibreOffice installation" +#~ msgstr "Cannot find \"unoconv\", please check your LibreOffice installation" -#: ../src/resources/app-menu.ui.h:4 -msgid "Fullscreen" -msgstr "Fullscreen" +#~ msgid "New and Recent" +#~ msgstr "New and Recent" -#: ../src/resources/app-menu.ui.h:5 -msgid "About Documents" -msgstr "About Documents" - -#: ../src/resources/app-menu.ui.h:6 -msgid "Help" -msgstr "Help" - -#: ../src/resources/app-menu.ui.h:7 -msgid "Quit" -msgstr "Quit" - -#: ../src/resources/preview-menu.ui.h:2 -msgid "Print..." -msgstr "Print…" - -#: ../src/resources/preview-menu.ui.h:3 -msgid "Zoom In" -msgstr "Zoom In" +#~ msgid "filtered by title" +#~ msgstr "filtered by title" -#: ../src/resources/preview-menu.ui.h:4 -msgid "Zoom Out" -msgstr "Zoom Out" +#~ msgid "filtered by author" +#~ msgstr "filtered by author" -#: ../src/resources/preview-menu.ui.h:5 -msgid "Rotate Left" -msgstr "Rotate Left" +#~ msgid "Load %d more document" +#~ msgid_plural "Load %d more documents" +#~ msgstr[0] "Load %d more document" +#~ msgstr[1] "Load %d more documents" -#: ../src/resources/preview-menu.ui.h:6 -msgid "Rotate Right" -msgstr "Rotate Right" +#~ msgid "Print..." +#~ msgstr "Print…" -#: ../src/resources/selection-menu.ui.h:1 -msgid "Select All" -msgstr "Select All" - -#: ../src/resources/selection-menu.ui.h:2 -msgid "Select None" -msgstr "Select None" +#~ msgid "Rotate Right" +#~ msgstr "Rotate Right" #~ msgid "The active source filter" #~ msgstr "The active source filter" diff -Nru gnome-documents-3.8.0/po/eu.po gnome-documents-3.8.3.1/po/eu.po --- gnome-documents-3.8.0/po/eu.po 2013-02-06 17:12:08.000000000 +0000 +++ gnome-documents-3.8.3.1/po/eu.po 2013-04-03 11:08:32.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: gnome-documents master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-03 17:42+0100\n" -"PO-Revision-Date: 2013-02-04 21:58+0100\n" +"POT-Creation-Date: 2013-03-26 10:34+0100\n" +"PO-Revision-Date: 2013-03-26 10:36+0100\n" "Last-Translator: Iñaki Larrañaga Murgoitio \n" "Language-Team: Basque \n" "Language: eu\n" @@ -19,8 +19,8 @@ "X-Generator: Lokalize 1.4\n" "X-Project-Style: gnome\n" -#: ../data/gnome-documents.desktop.in.in.h:1 ../src/application.js:102 -#: ../src/mainWindow.js:55 ../src/mainWindow.js:230 +#: ../data/gnome-documents.desktop.in.in.h:1 ../src/application.js:101 +#: ../src/mainWindow.js:53 ../src/mainWindow.js:274 msgid "Documents" msgstr "Dokumentuak" @@ -65,94 +65,102 @@ msgid "Window maximized state" msgstr "Leiho maximizatuaren egoera" -#: ../src/documents.js:590 ../src/search.js:407 +#. Translators: this refers to local documents +#: ../src/documents.js:590 ../src/search.js:416 msgid "Local" msgstr "Lokala" +#. Translators: Documents ships a "Getting Started with Documents" +#. tutorial PDF. The "GNOME" string below is displayed as the author name +#. of that document, and doesn't normally need to be translated. +#: ../src/documents.js:611 +msgid "GNOME" +msgstr "GNOME" + +#: ../src/documents.js:612 +msgid "Getting Started with Documents" +msgstr "Dokumentuen oinarrizko erabileraren xehetasunak" + #. overridden -#: ../src/documents.js:643 +#: ../src/documents.js:659 msgid "Google Docs" msgstr "Google Docs" -#: ../src/documents.js:644 +#: ../src/documents.js:660 msgid "Google" msgstr "Google" -#: ../src/documents.js:708 ../src/documents.js:807 +#: ../src/documents.js:724 ../src/documents.js:823 msgid "Spreadsheet" msgstr "Kalkulu-orria" -#: ../src/documents.js:710 ../src/documents.js:809 +#: ../src/documents.js:726 ../src/documents.js:825 ../src/presentation.js:48 msgid "Presentation" msgstr "Aurkezpena" -#: ../src/documents.js:712 ../src/documents.js:811 +#: ../src/documents.js:728 ../src/documents.js:827 msgid "Collection" msgstr "Bilduma" -#: ../src/documents.js:714 ../src/documents.js:813 +#: ../src/documents.js:730 ../src/documents.js:829 msgid "Document" msgstr "Dokumentua" #. overridden -#: ../src/documents.js:741 ../src/documents.js:742 +#: ../src/documents.js:757 ../src/documents.js:758 msgid "Skydrive" msgstr "Skydrive" -#: ../src/documents.js:926 +#: ../src/documents.js:942 msgid "Please check the network connection." msgstr "Egiaztatu sarearen konexioa." -#: ../src/documents.js:929 +#: ../src/documents.js:945 msgid "Please check the network proxy settings." msgstr "Egiaztatu sarearen proxyaren ezarpenak." -#: ../src/documents.js:932 +#: ../src/documents.js:948 msgid "Unable to sign in to the document service." msgstr "Ezin da dokumentuaren zerbitzuan sinatu." -#: ../src/documents.js:935 +#: ../src/documents.js:951 msgid "Unable to locate this document." msgstr "Ezin da dokumentu hau aurkitu." -#: ../src/documents.js:938 +#: ../src/documents.js:954 #, c-format msgid "Hmm, something is fishy (%d)." msgstr "Mmmm... Zerbait susmagarria dago (%d)." #. Translators: %s is the title of a document -#: ../src/documents.js:951 +#: ../src/documents.js:967 #, c-format msgid "Oops! Unable to load “%s”" msgstr "Ezin da '%s' kargatu" -#: ../src/edit.js:192 ../src/mainToolbar.js:219 -msgid "Back" -msgstr "Atzera" - -#: ../src/edit.js:199 +#: ../src/edit.js:191 msgid "View" msgstr "Ikusi" -#: ../src/embed.js:74 ../src/lib/gd-places-bookmarks.c:380 +#: ../src/embed.js:63 ../src/lib/gd-places-bookmarks.c:382 #: ../src/lib/gd-places-links.c:257 ../src/view.js:70 msgid "Loading…" msgstr "Kargatzen…" -#: ../src/embed.js:224 +#: ../src/embed.js:145 msgid "No Documents Found" msgstr "Ez da dokumenturik aurkitu" #. Translators: %s here is "System Settings", which is in a separate string #. due to markup, and should be translated only in the context of this sentence -#: ../src/embed.js:247 +#: ../src/embed.js:166 #, c-format msgid "You can add your online accounts in %s" msgstr "Zure lineako kontuak gehi ditzakezu %s(e)n" #. Translators: this should be translated in the context of the #. "You can add your online accounts in System Settings" sentence above -#: ../src/embed.js:251 +#: ../src/embed.js:170 msgid "System Settings" msgstr "Sistemaren ezarpenak" @@ -169,16 +177,19 @@ msgid "LibreOffice is required to view this document" msgstr "LibreOffice behar da dokumentu hau ikusteko" -#: ../src/lib/gd-places-bookmarks.c:309 +#. Translators: %s is the number of the page, already formatted +#. * as a string, for example "Page 5". +#. +#: ../src/lib/gd-places-bookmarks.c:312 #, c-format msgid "Page %s" msgstr "'%s' orrialdea" -#: ../src/lib/gd-places-bookmarks.c:373 +#: ../src/lib/gd-places-bookmarks.c:375 msgid "No bookmarks" msgstr "Laster-markarik ez" -#: ../src/lib/gd-places-bookmarks.c:645 +#: ../src/lib/gd-places-bookmarks.c:647 msgid "Bookmarks" msgstr "Laster-markak" @@ -190,28 +201,24 @@ msgid "Contents" msgstr "Edukia" -#: ../src/mainToolbar.js:73 +#: ../src/mainToolbar.js:62 msgid "Search" msgstr "Bilatu" -#: ../src/mainToolbar.js:158 +#: ../src/mainToolbar.js:73 +msgid "Back" +msgstr "Atzera" + +#: ../src/mainToolbar.js:153 #, c-format msgid "Results for “%s”" msgstr "'%s'(r)en emaitzak" -#: ../src/mainToolbar.js:160 -msgid "filtered by title" -msgstr "tituluaren arabera iragazita" - -#: ../src/mainToolbar.js:162 -msgid "filtered by author" -msgstr "egilearen arabera iragazita" - -#: ../src/mainToolbar.js:169 +#: ../src/mainToolbar.js:161 msgid "Click on items to select them" msgstr "Egin klik elementuetan hautatzeko" -#: ../src/mainToolbar.js:171 +#: ../src/mainToolbar.js:163 #, c-format msgid "%d selected" msgid_plural "%d selected" @@ -219,23 +226,23 @@ msgstr[1] "%d hautatuta" #. Label for Done button in Sharing dialog -#: ../src/mainToolbar.js:201 ../src/properties.js:59 ../src/sharing.js:93 +#: ../src/mainToolbar.js:192 ../src/properties.js:59 ../src/sharing.js:93 msgid "Done" msgstr "Eginda" -#: ../src/mainToolbar.js:241 +#: ../src/mainToolbar.js:233 msgid "Select Items" msgstr "Hautatu elementuak" -#: ../src/mainWindow.js:229 +#: ../src/mainWindow.js:273 msgid "translator-credits" msgstr "Iñaki Larrañaga Murgoitio " -#: ../src/mainWindow.js:231 +#: ../src/mainWindow.js:275 msgid "A document manager application" msgstr "Dokumentuak kudeatzeko aplikazio bat" -#: ../src/notifications.js:88 +#: ../src/notifications.js:87 #, c-format msgid "Printing “%s”: %s" msgstr "'%s' inprimatzen: %s" @@ -249,17 +256,25 @@ msgstr "" "Dokumentu batzuk ez dira erabilgarri egongo prozesuak irauten duen bitartean" -#: ../src/notifications.js:160 +#: ../src/notifications.js:164 #, c-format msgid "Fetching documents from %s" msgstr "%s(e)ndik dokumentuak eskuratzen" -#: ../src/notifications.js:162 +#: ../src/notifications.js:166 msgid "Fetching documents from online accounts" msgstr "Lineako kontuetatik dokumentuak eskuratzen" -#: ../src/properties.js:57 ../src/resources/preview-menu.ui.h:8 -#: ../src/selections.js:792 +#: ../src/presentation.js:105 +msgid "Running in presentation mode" +msgstr "Aurkezpen moduan exekutatzen" + +#: ../src/presentation.js:158 +msgid "Present On" +msgstr "Aurkezpena aktibatuta" + +#: ../src/properties.js:57 ../src/resources/preview-menu.ui.h:9 +#: ../src/selections.js:779 msgid "Properties" msgstr "Propietateak" @@ -267,28 +282,28 @@ #. Translators: "Title" is the label next to the document title #. in the properties dialog #. Translators: "Title" refers to "Match Title" when searching -#: ../src/properties.js:76 ../src/search.js:257 +#: ../src/properties.js:79 ../src/search.js:257 msgid "Title" msgstr "Titulua" #. Translators: "Author" is the label next to the document author #. in the properties dialog #. Translators: "Author" refers to "Match Author" when searching -#: ../src/properties.js:85 ../src/search.js:260 +#: ../src/properties.js:88 ../src/search.js:260 msgid "Author" msgstr "Egilea" #. Source item -#: ../src/properties.js:92 +#: ../src/properties.js:95 msgid "Source" msgstr "Iturburua" #. Date Modified item -#: ../src/properties.js:98 +#: ../src/properties.js:101 msgid "Date Modified" msgstr "Data aldatuta" -#: ../src/properties.js:105 +#: ../src/properties.js:108 msgid "Date Created" msgstr "Data sortuta" @@ -297,7 +312,7 @@ #. (PDF, spreadsheet, ...) in the properties dialog #. Translators: "Type" refers to a search filter on the document type #. (PDF, spreadsheet, ...) -#: ../src/properties.js:114 ../src/search.js:166 +#: ../src/properties.js:117 ../src/search.js:166 msgid "Type" msgstr "Mota" @@ -326,7 +341,7 @@ msgstr "Irten" #. Translators: this is the Open action in a context menu -#: ../src/resources/preview-menu.ui.h:1 ../src/selections.js:888 +#: ../src/resources/preview-menu.ui.h:1 ../src/selections.js:875 msgid "Open" msgstr "Ireki" @@ -339,18 +354,22 @@ msgstr "Inprimatu…" #: ../src/resources/preview-menu.ui.h:4 +msgid "Present" +msgstr "Aurkezpena" + +#: ../src/resources/preview-menu.ui.h:5 msgid "Zoom In" msgstr "Handiagotu" -#: ../src/resources/preview-menu.ui.h:5 +#: ../src/resources/preview-menu.ui.h:6 msgid "Zoom Out" msgstr "Txikiagotu" -#: ../src/resources/preview-menu.ui.h:6 +#: ../src/resources/preview-menu.ui.h:7 msgid "Rotate ↶" msgstr "Biratu ↶" -#: ../src/resources/preview-menu.ui.h:7 +#: ../src/resources/preview-menu.ui.h:8 msgid "Rotate ↷" msgstr "Biratu ↷" @@ -366,15 +385,19 @@ msgid "Category" msgstr "Kategoria" +#. Translators: this refers to new and recent documents +#. Translators: this refers to documents #: ../src/search.js:117 ../src/search.js:169 ../src/search.js:254 -#: ../src/search.js:401 +#: ../src/search.js:410 msgid "All" msgstr "Denak" +#. Translators: this refers to favorite documents #: ../src/search.js:123 msgid "Favorites" msgstr "Gogokoak" +#. Translators: this refers to shared documents #: ../src/search.js:128 msgid "Shared with you" msgstr "Zurekin partekatuak" @@ -405,28 +428,28 @@ msgid "Match" msgstr "Bat etorri" -#: ../src/search.js:397 +#: ../src/search.js:406 msgid "Sources" msgstr "Iturriak" -#: ../src/selections.js:615 ../src/selections.js:784 +#: ../src/selections.js:613 ../src/selections.js:771 msgid "Organize" msgstr "Antolatu" -#: ../src/selections.js:761 +#: ../src/selections.js:748 msgid "Print" msgstr "Inprimatu" -#: ../src/selections.js:768 +#: ../src/selections.js:755 msgid "Delete" msgstr "Ezabatu" -#: ../src/selections.js:799 +#: ../src/selections.js:786 msgid "Share" msgstr "Partekatu" #. Translators: this is the Open action in a context menu -#: ../src/selections.js:885 +#: ../src/selections.js:872 #, c-format msgid "Open with %s" msgstr "Ireki '%s'(r)ekin" @@ -555,6 +578,12 @@ msgstr[0] "duela urte %d" msgstr[1] "orain dela %d urte" +#~ msgid "filtered by title" +#~ msgstr "tituluaren arabera iragazita" + +#~ msgid "filtered by author" +#~ msgstr "egilearen arabera iragazita" + #~ msgid "Unable to load \"%s\" for preview" #~ msgstr "Ezin da \"%s\" kargatu aurrebistarako" diff -Nru gnome-documents-3.8.0/po/fi.po gnome-documents-3.8.3.1/po/fi.po --- gnome-documents-3.8.0/po/fi.po 2013-03-19 09:53:04.000000000 +0000 +++ gnome-documents-3.8.3.1/po/fi.po 2013-04-03 11:08:32.000000000 +0000 @@ -11,8 +11,8 @@ "Project-Id-Version: gnome-documents master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "documents&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-03-04 21:13+0000\n" -"PO-Revision-Date: 2013-03-09 20:16+0200\n" +"POT-Creation-Date: 2013-03-15 19:10+0000\n" +"PO-Revision-Date: 2013-03-26 20:20+0200\n" "Last-Translator: Jiri Grönroos \n" "Language-Team: Finnish \n" "Language: fi\n" @@ -120,12 +120,10 @@ msgstr "Tarkista verkkoyhteyden välityspalvelimen asetukset." #: ../src/documents.js:945 -#| msgid "Unable to load the document" msgid "Unable to sign in to the document service." msgstr "Asiakirjapalveluun kirjautuminen epäonnistui." #: ../src/documents.js:948 -#| msgid "Unable to load the document" msgid "Unable to locate this document." msgstr "Tämän asiakirjan paikantaminen epäonnistui." @@ -141,13 +139,11 @@ msgstr "Hups! Kohteen \"%s\" lataus epäonnistui" #: ../src/edit.js:191 -#| msgid "View as" msgid "View" msgstr "Näkymä" #: ../src/embed.js:63 ../src/lib/gd-places-bookmarks.c:379 #: ../src/lib/gd-places-links.c:257 ../src/view.js:70 -#| msgid "Loading..." msgid "Loading…" msgstr "Ladataan…" @@ -212,7 +208,6 @@ #: ../src/mainToolbar.js:153 #, c-format -#| msgid "Results for \"%s\"" msgid "Results for “%s”" msgstr "Tulokset haulle \"%s\"" @@ -246,7 +241,6 @@ #: ../src/notifications.js:87 #, c-format -#| msgid "Printing \"%s\": %s" msgid "Printing “%s”: %s" msgstr "Tulostetaan “%s”: %s" @@ -274,7 +268,6 @@ msgstr "Toimitaan esitystilassa" #: ../src/presentation.js:158 -#| msgid "Presentation" msgid "Present On" msgstr "Esitys näytöllä" @@ -335,7 +328,7 @@ #: ../src/resources/app-menu.ui.h:5 msgid "About Documents" -msgstr "Tietoja asiakirjoista" +msgstr "Tietoja - Asiakirjat" #: ../src/resources/app-menu.ui.h:6 msgid "Help" @@ -355,12 +348,10 @@ msgstr "Muokkaa" #: ../src/resources/preview-menu.ui.h:3 -#| msgid "Print" msgid "Print…" msgstr "Tulosta…" #: ../src/resources/preview-menu.ui.h:4 -#| msgid "Presentation" msgid "Present" msgstr "Esitys" @@ -373,12 +364,10 @@ msgstr "Loitonna" #: ../src/resources/preview-menu.ui.h:7 -#| msgid "Rotate Left" msgid "Rotate ↶" msgstr "Käännä ↶" #: ../src/resources/preview-menu.ui.h:8 -#| msgid "Rotate Left" msgid "Rotate ↷" msgstr "Käännä ↷" @@ -460,13 +449,11 @@ msgstr "Avaa sovelluksella %s" #: ../src/sharing.js:89 -#| msgid "System Settings" msgid "Sharing Settings" msgstr "Jakamisen asetukset" #. Label for widget group for changing document permissions #: ../src/sharing.js:126 -#| msgid "Documents" msgid "Document permissions" msgstr "Asiakirjan käyttöoikeudet" diff -Nru gnome-documents-3.8.0/po/he.po gnome-documents-3.8.3.1/po/he.po --- gnome-documents-3.8.0/po/he.po 2013-02-21 19:19:31.000000000 +0000 +++ gnome-documents-3.8.3.1/po/he.po 2013-06-14 15:36:05.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Gnome-Documents\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-21 19:31+0200\n" -"PO-Revision-Date: 2013-02-21 19:32+0200\n" +"POT-Creation-Date: 2013-03-28 14:02+0200\n" +"PO-Revision-Date: 2013-03-28 14:02+0200\n" "Last-Translator: Yaron Shahrabani \n" "Language-Team: Hebrew \n" "Language: he\n" @@ -21,9 +21,9 @@ "X-Poedit-SourceCharset: utf-8\n" #: ../data/gnome-documents.desktop.in.in.h:1 -#: ../src/application.js:99 +#: ../src/application.js:101 #: ../src/mainWindow.js:53 -#: ../src/mainWindow.js:229 +#: ../src/mainWindow.js:274 msgid "Documents" msgstr "מסמכים" @@ -68,87 +68,94 @@ msgid "Window maximized state" msgstr "Window maximized state" +#. Translators: this refers to local documents #: ../src/documents.js:590 -#: ../src/search.js:407 +#: ../src/search.js:416 msgid "Local" msgstr "מקומי" +#. Translators: Documents ships a "Getting Started with Documents" +#. tutorial PDF. The "GNOME" string below is displayed as the author name +#. of that document, and doesn't normally need to be translated. +#: ../src/documents.js:611 +msgid "GNOME" +msgstr "GNOME" + +#: ../src/documents.js:612 +msgid "Getting Started with Documents" +msgstr "צעדים ראשונים עם מסמכים" + #. overridden -#: ../src/documents.js:643 +#: ../src/documents.js:659 msgid "Google Docs" msgstr "Google Docs" -#: ../src/documents.js:644 +#: ../src/documents.js:660 msgid "Google" msgstr "Google" -#: ../src/documents.js:708 -#: ../src/documents.js:807 +#: ../src/documents.js:724 +#: ../src/documents.js:823 msgid "Spreadsheet" msgstr "גיליון אלקטרוני" -#: ../src/documents.js:710 -#: ../src/documents.js:809 +#: ../src/documents.js:726 +#: ../src/documents.js:825 #: ../src/presentation.js:48 msgid "Presentation" msgstr "מצגת" -#: ../src/documents.js:712 -#: ../src/documents.js:811 +#: ../src/documents.js:728 +#: ../src/documents.js:827 msgid "Collection" msgstr "אוסף" -#: ../src/documents.js:714 -#: ../src/documents.js:813 +#: ../src/documents.js:730 +#: ../src/documents.js:829 msgid "Document" msgstr "מסמך" #. overridden -#: ../src/documents.js:741 -#: ../src/documents.js:742 +#: ../src/documents.js:757 +#: ../src/documents.js:758 msgid "Skydrive" msgstr "Skydrive" -#: ../src/documents.js:926 +#: ../src/documents.js:942 msgid "Please check the network connection." msgstr "נא לבדוק את החיבור לרשת." -#: ../src/documents.js:929 +#: ../src/documents.js:945 msgid "Please check the network proxy settings." msgstr "נא לבדוק את הגדרות המתווך של הרשת." -#: ../src/documents.js:932 +#: ../src/documents.js:948 msgid "Unable to sign in to the document service." msgstr "לא ניתן להיכנס לשירות המסמכים." -#: ../src/documents.js:935 +#: ../src/documents.js:951 msgid "Unable to locate this document." msgstr "לא ניתן לאתר מסמך זה." -#: ../src/documents.js:938 +#: ../src/documents.js:954 #, c-format msgid "Hmm, something is fishy (%d)." msgstr "המממ, משהו פה מסריח (%d)." #. Translators: %s is the title of a document -#: ../src/documents.js:951 +#: ../src/documents.js:967 #, c-format msgid "Oops! Unable to load “%s”" msgstr "אופס! לא ניתן לטעון את „%s“" -#: ../src/edit.js:189 -#: ../src/mainToolbar.js:200 -msgid "Back" -msgstr "חזרה" - -#: ../src/edit.js:196 +#: ../src/edit.js:191 msgid "View" msgstr "צפייה" #: ../src/embed.js:63 -#: ../src/lib/gd-places-bookmarks.c:379 +#: ../src/lib/gd-places-bookmarks.c:382 #: ../src/lib/gd-places-links.c:257 -#: ../src/view.js:70 +#: ../src/view.js:71 msgid "Loading…" msgstr "בטעינה…" @@ -182,16 +189,19 @@ msgid "LibreOffice is required to view this document" msgstr "יש צורך ב־LibreOffice כדי לצפות במסמך זה" -#: ../src/lib/gd-places-bookmarks.c:309 +#. Translators: %s is the number of the page, already formatted +#. * as a string, for example "Page 5". +#. +#: ../src/lib/gd-places-bookmarks.c:312 #, c-format msgid "Page %s" msgstr "עמוד %s" -#: ../src/lib/gd-places-bookmarks.c:372 +#: ../src/lib/gd-places-bookmarks.c:375 msgid "No bookmarks" msgstr "אין סימניות" -#: ../src/lib/gd-places-bookmarks.c:644 +#: ../src/lib/gd-places-bookmarks.c:647 msgid "Bookmarks" msgstr "סימניות" @@ -207,16 +217,20 @@ msgid "Search" msgstr "חיפוש" -#: ../src/mainToolbar.js:142 +#: ../src/mainToolbar.js:73 +msgid "Back" +msgstr "חזרה" + +#: ../src/mainToolbar.js:153 #, c-format msgid "Results for “%s”" msgstr "תוצאות עבור „%s“" -#: ../src/mainToolbar.js:150 +#: ../src/mainToolbar.js:161 msgid "Click on items to select them" msgstr "יש ללחוץ על פריטים כדי לבחור אותם" -#: ../src/mainToolbar.js:152 +#: ../src/mainToolbar.js:163 #, c-format msgid "%d selected" msgid_plural "%d selected" @@ -225,21 +239,21 @@ msgstr[2] "נבחרו 2" #. Label for Done button in Sharing dialog -#: ../src/mainToolbar.js:181 +#: ../src/mainToolbar.js:192 #: ../src/properties.js:59 #: ../src/sharing.js:93 msgid "Done" msgstr "בוצע" -#: ../src/mainToolbar.js:224 +#: ../src/mainToolbar.js:233 msgid "Select Items" msgstr "בחירת פריטים" -#: ../src/mainWindow.js:228 +#: ../src/mainWindow.js:273 msgid "translator-credits" msgstr "ירון שהרבני " -#: ../src/mainWindow.js:230 +#: ../src/mainWindow.js:275 msgid "A document manager application" msgstr "יישום לניהול מסמכים" @@ -256,12 +270,14 @@ msgid "Some documents might not be available during this process" msgstr "יתכן שחלק מהמסמכים לא יהיו זמינים במשך תהליך זה" -#: ../src/notifications.js:164 +#. Translators: %s refers to an online account provider, e.g. +#. "Google", or "Windows Live". +#: ../src/notifications.js:166 #, c-format msgid "Fetching documents from %s" msgstr "מתקבל מסמך מ־%s" -#: ../src/notifications.js:166 +#: ../src/notifications.js:168 msgid "Fetching documents from online accounts" msgstr "מתקבלים מסמכים מחשבונות מקוונים" @@ -275,7 +291,7 @@ #: ../src/properties.js:57 #: ../src/resources/preview-menu.ui.h:9 -#: ../src/selections.js:779 +#: ../src/selections.js:781 msgid "Properties" msgstr "מאפיינים" @@ -283,7 +299,7 @@ #. Translators: "Title" is the label next to the document title #. in the properties dialog #. Translators: "Title" refers to "Match Title" when searching -#: ../src/properties.js:78 +#: ../src/properties.js:79 #: ../src/search.js:257 msgid "Title" msgstr "כותרת" @@ -291,22 +307,22 @@ #. Translators: "Author" is the label next to the document author #. in the properties dialog #. Translators: "Author" refers to "Match Author" when searching -#: ../src/properties.js:87 +#: ../src/properties.js:88 #: ../src/search.js:260 msgid "Author" msgstr "מאת" #. Source item -#: ../src/properties.js:94 +#: ../src/properties.js:95 msgid "Source" msgstr "מקור" #. Date Modified item -#: ../src/properties.js:100 +#: ../src/properties.js:101 msgid "Date Modified" msgstr "מועד השינוי" -#: ../src/properties.js:107 +#: ../src/properties.js:108 msgid "Date Created" msgstr "מועד היצירה" @@ -315,7 +331,7 @@ #. (PDF, spreadsheet, ...) in the properties dialog #. Translators: "Type" refers to a search filter on the document type #. (PDF, spreadsheet, ...) -#: ../src/properties.js:116 +#: ../src/properties.js:117 #: ../src/search.js:166 msgid "Type" msgstr "סוג" @@ -346,7 +362,7 @@ #. Translators: this is the Open action in a context menu #: ../src/resources/preview-menu.ui.h:1 -#: ../src/selections.js:875 +#: ../src/selections.js:877 msgid "Open" msgstr "פתיחה" @@ -390,17 +406,21 @@ msgid "Category" msgstr "קטגוריה" +#. Translators: this refers to new and recent documents +#. Translators: this refers to documents #: ../src/search.js:117 #: ../src/search.js:169 #: ../src/search.js:254 -#: ../src/search.js:401 +#: ../src/search.js:410 msgid "All" msgstr "הכול" +#. Translators: this refers to favorite documents #: ../src/search.js:123 msgid "Favorites" msgstr "מועדפים" +#. Translators: this refers to shared documents #: ../src/search.js:128 msgid "Shared with you" msgstr "משותף אתך" @@ -431,29 +451,30 @@ msgid "Match" msgstr "התאמה" -#: ../src/search.js:397 +#: ../src/search.js:406 msgid "Sources" msgstr "מקורות" -#: ../src/selections.js:613 -#: ../src/selections.js:771 +#. Translators: "Organize" refers to documents in this context +#: ../src/selections.js:614 +#: ../src/selections.js:773 msgid "Organize" msgstr "ארגון" -#: ../src/selections.js:748 +#: ../src/selections.js:749 msgid "Print" msgstr "הדפסה" -#: ../src/selections.js:755 +#: ../src/selections.js:756 msgid "Delete" msgstr "מחיקה" -#: ../src/selections.js:786 +#: ../src/selections.js:788 msgid "Share" msgstr "שיתוף" #. Translators: this is the Open action in a context menu -#: ../src/selections.js:872 +#: ../src/selections.js:874 #, c-format msgid "Open with %s" msgstr "פתיחה באמצעות %s" @@ -543,16 +564,17 @@ msgid "Untitled Document" msgstr "מסמך ללא שם" -#: ../src/view.js:61 -#: ../src/view.js:91 +#. Translators: "more" refers to documents in this context +#: ../src/view.js:62 +#: ../src/view.js:93 msgid "Load More" msgstr "טעינת נוספים" -#: ../src/view.js:292 +#: ../src/view.js:294 msgid "Yesterday" msgstr "אתמול" -#: ../src/view.js:294 +#: ../src/view.js:296 #, c-format msgid "%d day ago" msgid_plural "%d days ago" @@ -560,11 +582,11 @@ msgstr[1] "לפני %d ימים" msgstr[2] "שלשום" -#: ../src/view.js:298 +#: ../src/view.js:300 msgid "Last week" msgstr "שבוע שעבר" -#: ../src/view.js:300 +#: ../src/view.js:302 #, c-format msgid "%d week ago" msgid_plural "%d weeks ago" @@ -572,11 +594,11 @@ msgstr[1] "לפני %d שבועות" msgstr[2] "לפני שבועיים" -#: ../src/view.js:304 +#: ../src/view.js:306 msgid "Last month" msgstr "בחודש שעבר" -#: ../src/view.js:306 +#: ../src/view.js:308 #, c-format msgid "%d month ago" msgid_plural "%d months ago" @@ -584,11 +606,11 @@ msgstr[1] "לפני %d חודשים" msgstr[2] "לפני חודשיים" -#: ../src/view.js:310 +#: ../src/view.js:312 msgid "Last year" msgstr "שנה שעברה" -#: ../src/view.js:312 +#: ../src/view.js:314 #, c-format msgid "%d year ago" msgid_plural "%d years ago" diff -Nru gnome-documents-3.8.0/po/id.po gnome-documents-3.8.3.1/po/id.po --- gnome-documents-3.8.0/po/id.po 2012-10-01 13:36:54.000000000 +0000 +++ gnome-documents-3.8.3.1/po/id.po 2013-06-14 15:36:05.000000000 +0000 @@ -2,15 +2,15 @@ # Copyright (C) 2011 gnome-documents's COPYRIGHT HOLDER # This file is distributed under the same license as the gnome-documents package. # -# Andika Triwidada , 2011, 2012. +# Andika Triwidada , 2011, 2012, 2013. # Dirgita , 2012. msgid "" msgstr "" "Project-Id-Version: gnome-documents master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "documents&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-09-14 15:15+0000\n" -"PO-Revision-Date: 2012-09-15 18:00+0700\n" +"POT-Creation-Date: 2013-03-13 11:15+0000\n" +"PO-Revision-Date: 2013-03-15 17:17+0700\n" "Last-Translator: Andika Triwidada \n" "Language-Team: Indonesian \n" "Language: id\n" @@ -18,10 +18,10 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.5.3\n" +"X-Generator: Poedit 1.5.5\n" -#: ../data/gnome-documents.desktop.in.in.h:1 ../src/mainWindow.js:51 -#: ../src/mainWindow.js:205 +#: ../data/gnome-documents.desktop.in.in.h:1 ../src/application.js:101 +#: ../src/mainWindow.js:53 ../src/mainWindow.js:274 msgid "Documents" msgstr "Dokumen" @@ -31,7 +31,7 @@ #: ../data/gnome-documents.desktop.in.in.h:3 msgid "Docs;PDF;Document;" -msgstr "Docs;PDF;Document;" +msgstr "Dok;PDF;Dokumen;" #: ../data/org.gnome.documents.gschema.xml.in.h:1 #: ../src/resources/app-menu.ui.h:1 @@ -66,341 +66,500 @@ msgid "Window maximized state" msgstr "Jendela dalam keadaan dimaksimalkan" -#: ../src/documents.js:640 ../src/sources.js:95 +#: ../src/documents.js:590 ../src/search.js:416 msgid "Local" msgstr "Lokal" +#: ../src/documents.js:608 +msgid "GNOME" +msgstr "GNOME" + +#: ../src/documents.js:609 +msgid "Getting Started with Documents" +msgstr "Mulai Memakai Dokumen" + #. overridden -#: ../src/documents.js:693 +#: ../src/documents.js:656 msgid "Google Docs" msgstr "Google Docs" -#: ../src/documents.js:694 +#: ../src/documents.js:657 msgid "Google" msgstr "Google" -#: ../src/documents.js:758 ../src/documents.js:857 +#: ../src/documents.js:721 ../src/documents.js:820 msgid "Spreadsheet" msgstr "Spreadsheet" -#: ../src/documents.js:760 ../src/documents.js:859 +#: ../src/documents.js:723 ../src/documents.js:822 ../src/presentation.js:48 msgid "Presentation" msgstr "Presentasi" -#: ../src/documents.js:762 ../src/documents.js:861 +#: ../src/documents.js:725 ../src/documents.js:824 msgid "Collection" msgstr "Koleksi" -#: ../src/documents.js:764 ../src/documents.js:863 +#: ../src/documents.js:727 ../src/documents.js:826 msgid "Document" msgstr "Dokumen" #. overridden -#: ../src/documents.js:791 ../src/documents.js:792 +#: ../src/documents.js:754 ../src/documents.js:755 msgid "Skydrive" msgstr "Skydrive" +#: ../src/documents.js:939 +msgid "Please check the network connection." +msgstr "Harap periksa sambungan jaringan." + +#: ../src/documents.js:942 +msgid "Please check the network proxy settings." +msgstr "Harap periksa pengaturan proksi jaringan." + +#: ../src/documents.js:945 +msgid "Unable to sign in to the document service." +msgstr "Tak bisa masuk ke layanan dokumen." + +#: ../src/documents.js:948 +msgid "Unable to locate this document." +msgstr "Tak bisa menemukan dokumen ini." + +#: ../src/documents.js:951 +#, c-format +msgid "Hmm, something is fishy (%d)." +msgstr "Hm, ada sesuatu yang mencurigakan (%d)." + #. Translators: %s is the title of a document -#: ../src/documents.js:976 +#: ../src/documents.js:964 #, c-format -msgid "Unable to load \"%s\" for preview" -msgstr "Tak bisa memuat \"%s\" untuk pratilik" +msgid "Oops! Unable to load “%s”" +msgstr "Ups! Tak bisa memuat \"%s\"" + +#: ../src/edit.js:191 +msgid "View" +msgstr "Tilik" -#: ../src/embed.js:74 -msgid "Loading..." -msgstr "Memuat..." +#: ../src/embed.js:63 ../src/lib/gd-places-bookmarks.c:379 +#: ../src/lib/gd-places-links.c:257 ../src/view.js:70 +msgid "Loading…" +msgstr "Memuat…" -#: ../src/embed.js:220 +#: ../src/embed.js:145 msgid "No Documents Found" msgstr "Tidak Ada Dokumen" #. Translators: %s here is "System Settings", which is in a separate string #. due to markup, and should be translated only in the context of this sentence -#: ../src/embed.js:243 +#: ../src/embed.js:166 #, c-format -#| msgid "You can add your online accounts in" msgid "You can add your online accounts in %s" msgstr "Anda dapat menambahkan Akun daring Anda dalam %s" #. Translators: this should be translated in the context of the #. "You can add your online accounts in System Settings" sentence above -#: ../src/embed.js:247 +#: ../src/embed.js:170 msgid "System Settings" msgstr "Pengaturan Sistem" -#: ../src/lib/gd-pdf-loader.c:224 +#: ../src/lib/gd-nav-bar.c:235 +#, c-format +msgid "Page %u of %u" +msgstr "Halaman %u dari %u" + +#: ../src/lib/gd-pdf-loader.c:226 msgid "Unable to load the document" msgstr "Tak bisa memuat dokumen" -#: ../src/lib/gd-pdf-loader.c:673 -msgid "Cannot find \"unoconv\", please check your LibreOffice installation" -msgstr "Tak menemukan \"unoconv\", silakan periksa instalasi LibreOffice Anda" +#: ../src/lib/gd-pdf-loader.c:676 +msgid "LibreOffice is required to view this document" +msgstr "LibreOffice diperlukan untuk menilik dokumen ini" -#: ../src/mainToolbar.js:73 +#: ../src/lib/gd-places-bookmarks.c:309 +#, c-format +msgid "Page %s" +msgstr "Halaman %s" + +#: ../src/lib/gd-places-bookmarks.c:372 +msgid "No bookmarks" +msgstr "Tiada penanda taut" + +#: ../src/lib/gd-places-bookmarks.c:644 +msgid "Bookmarks" +msgstr "Penanda taut" + +#: ../src/lib/gd-places-links.c:342 +msgid "No table of contents" +msgstr "Tiada daftar isi" + +#: ../src/lib/gd-places-links.c:518 +msgid "Contents" +msgstr "Isi" + +#: ../src/mainToolbar.js:62 msgid "Search" msgstr "Cari" -#: ../src/mainToolbar.js:158 -msgid "New and Recent" -msgstr "Baru dan Baru-baru Ini" +#: ../src/mainToolbar.js:73 +msgid "Back" +msgstr "Mundur" -#: ../src/mainToolbar.js:165 +#: ../src/mainToolbar.js:153 #, c-format -msgid "Results for \"%s\"" -msgstr "Hasil bagi \"%s\"" - -#: ../src/mainToolbar.js:167 -msgid "filtered by title" -msgstr "disaring berdasarkan judul" +msgid "Results for “%s”" +msgstr "Hasil untuk \"%s\"" -#: ../src/mainToolbar.js:169 -msgid "filtered by author" -msgstr "disaring berdasarkan pengarang" - -#: ../src/mainToolbar.js:176 +#: ../src/mainToolbar.js:161 msgid "Click on items to select them" msgstr "Klik pada butir untuk memilihnya" -#: ../src/mainToolbar.js:178 +#: ../src/mainToolbar.js:163 #, c-format msgid "%d selected" msgid_plural "%d selected" msgstr[0] "%d dipilih" -#: ../src/mainToolbar.js:208 ../src/properties.js:58 +#. Label for Done button in Sharing dialog +#: ../src/mainToolbar.js:192 ../src/properties.js:59 ../src/sharing.js:93 msgid "Done" msgstr "Selesai" -#: ../src/mainToolbar.js:226 -msgid "Back" -msgstr "Mundur" - -#: ../src/mainToolbar.js:248 +#: ../src/mainToolbar.js:233 msgid "Select Items" msgstr "Pilih Item" -#: ../src/mainWindow.js:204 +#: ../src/mainWindow.js:273 msgid "translator-credits" -msgstr "Andika Triwidada , 2011, 2012" +msgstr "" +"Andika Triwidada , 2011, 2012, 2013.\n" +"Dirgita , 2012." -#: ../src/mainWindow.js:206 +#: ../src/mainWindow.js:275 msgid "A document manager application" msgstr "Aplikasi manajer dokumen" -#: ../src/notifications.js:86 +#: ../src/notifications.js:87 #, c-format -msgid "Printing \"%s\": %s" +msgid "Printing “%s”: %s" msgstr "Mencetak \"%s\": %s" -#: ../src/notifications.js:151 +#: ../src/notifications.js:143 msgid "Your documents are being indexed" msgstr "Dokumen milik Anda tengah diindeks" -#: ../src/notifications.js:155 +#: ../src/notifications.js:144 msgid "Some documents might not be available during this process" msgstr "Sejumlah dokumen mungkin tak tersedia selama proses ini berlangsung" -#. Properties dialog heading -#: ../src/properties.js:73 ../src/selections.js:792 +#: ../src/notifications.js:164 +#, c-format +msgid "Fetching documents from %s" +msgstr "Mengambil dokumen dari %s" + +#: ../src/notifications.js:166 +msgid "Fetching documents from online accounts" +msgstr "Mengambil dokumend dari akun daring" + +#: ../src/presentation.js:105 +msgid "Running in presentation mode" +msgstr "Berjalan dalam mode presentasi" + +#: ../src/presentation.js:158 +msgid "Present On" +msgstr "Dipresentasi Pada" + +#: ../src/properties.js:57 ../src/resources/preview-menu.ui.h:9 +#: ../src/selections.js:779 msgid "Properties" msgstr "Properti" #. Title item -#: ../src/properties.js:81 ../src/searchbar.js:225 +#. Translators: "Title" is the label next to the document title +#. in the properties dialog +#. Translators: "Title" refers to "Match Title" when searching +#: ../src/properties.js:78 ../src/search.js:257 msgid "Title" msgstr "Judul" -#: ../src/properties.js:88 ../src/searchbar.js:227 +#. Translators: "Author" is the label next to the document author +#. in the properties dialog +#. Translators: "Author" refers to "Match Author" when searching +#: ../src/properties.js:87 ../src/search.js:260 msgid "Author" msgstr "Pengarang" #. Source item -#: ../src/properties.js:95 +#: ../src/properties.js:94 msgid "Source" msgstr "Sumber" #. Date Modified item -#: ../src/properties.js:101 +#: ../src/properties.js:100 msgid "Date Modified" msgstr "Tanggal Diubah" -#: ../src/properties.js:108 +#: ../src/properties.js:107 msgid "Date Created" msgstr "Tanggal Dibuat" #. Document type item -#: ../src/properties.js:115 ../src/searchbar.js:135 +#. Translators: "Type" is the label next to the document type +#. (PDF, spreadsheet, ...) in the properties dialog +#. Translators: "Type" refers to a search filter on the document type +#. (PDF, spreadsheet, ...) +#: ../src/properties.js:116 ../src/search.js:166 msgid "Type" msgstr "Jenis" -#: ../src/searchbar.js:83 +#: ../src/resources/app-menu.ui.h:2 +msgid "Grid" +msgstr "Kisi" + +#: ../src/resources/app-menu.ui.h:3 +msgid "List" +msgstr "Daftar" + +#: ../src/resources/app-menu.ui.h:4 +msgid "Fullscreen" +msgstr "Layar penuh" + +#: ../src/resources/app-menu.ui.h:5 +msgid "About Documents" +msgstr "Tentang Dokumen" + +#: ../src/resources/app-menu.ui.h:6 +msgid "Help" +msgstr "Bantuan" + +#: ../src/resources/app-menu.ui.h:7 +msgid "Quit" +msgstr "Keluar" + +#. Translators: this is the Open action in a context menu +#: ../src/resources/preview-menu.ui.h:1 ../src/selections.js:875 +msgid "Open" +msgstr "Buka" + +#: ../src/resources/preview-menu.ui.h:2 +msgid "Edit" +msgstr "Sunting" + +#: ../src/resources/preview-menu.ui.h:3 +msgid "Print…" +msgstr "Cetak…" + +#: ../src/resources/preview-menu.ui.h:4 +msgid "Present" +msgstr "Sajikan" + +#: ../src/resources/preview-menu.ui.h:5 +msgid "Zoom In" +msgstr "Perbesar" + +#: ../src/resources/preview-menu.ui.h:6 +msgid "Zoom Out" +msgstr "Perkecil" + +#: ../src/resources/preview-menu.ui.h:7 +msgid "Rotate ↶" +msgstr "Putar ↶" + +#: ../src/resources/preview-menu.ui.h:8 +msgid "Rotate ↷" +msgstr "Putar ↷" + +#: ../src/resources/selection-menu.ui.h:1 +msgid "Select All" +msgstr "Pilih Semua" + +#: ../src/resources/selection-menu.ui.h:2 +msgid "Select None" +msgstr "Jangan Pilih" + +#: ../src/search.js:112 msgid "Category" msgstr "Kategori" -#: ../src/searchbar.js:88 ../src/searchbar.js:138 ../src/searchbar.js:223 -#: ../src/sources.js:89 +#: ../src/search.js:117 ../src/search.js:169 ../src/search.js:254 +#: ../src/search.js:410 msgid "All" msgstr "Semua" -#: ../src/searchbar.js:94 +#: ../src/search.js:123 msgid "Favorites" msgstr "Favorit" -#: ../src/searchbar.js:99 +#: ../src/search.js:128 msgid "Shared with you" msgstr "Berbagi dengan Anda" -#: ../src/searchbar.js:140 +#: ../src/search.js:171 msgid "Collections" msgstr "Koleksi" -#: ../src/searchbar.js:144 +#: ../src/search.js:175 msgid "PDF Documents" msgstr "Dokumen PDF" -#: ../src/searchbar.js:148 +#: ../src/search.js:179 msgid "Presentations" msgstr "Presentasi" -#: ../src/searchbar.js:151 +#: ../src/search.js:182 msgid "Spreadsheets" msgstr "Spreadsheet" -#: ../src/searchbar.js:154 +#: ../src/search.js:185 msgid "Text Documents" msgstr "Dokumen Teks" #. Translators: this is a verb that refers to "All", "Title" and "Author", #. as in "Match All", "Match Title" and "Match Author" -#: ../src/searchbar.js:220 +#: ../src/search.js:251 msgid "Match" msgstr "Cocok" -#: ../src/selections.js:761 +#: ../src/search.js:406 +msgid "Sources" +msgstr "Sumber" + +#: ../src/selections.js:613 ../src/selections.js:771 +msgid "Organize" +msgstr "Atur" + +#: ../src/selections.js:748 msgid "Print" msgstr "Cetak" -#: ../src/selections.js:768 +#: ../src/selections.js:755 msgid "Delete" msgstr "Hapus" -#: ../src/selections.js:784 -msgid "Organize" -msgstr "Atur" +#: ../src/selections.js:786 +msgid "Share" +msgstr "Berbagi" #. Translators: this is the Open action in a context menu -#: ../src/selections.js:873 +#: ../src/selections.js:872 #, c-format msgid "Open with %s" msgstr "Buka dengan %s" -#. Translators: this is the Open action in a context menu -#: ../src/selections.js:876 ../src/resources/preview-menu.ui.h:1 -msgid "Open" -msgstr "Buka" +#: ../src/sharing.js:89 +msgid "Sharing Settings" +msgstr "Pengaturan Berbagi" + +#. Label for widget group for changing document permissions +#: ../src/sharing.js:126 +msgid "Document permissions" +msgstr "Hak dokumen" + +#. Label for permission change in Sharing dialog +#: ../src/sharing.js:133 ../src/sharing.js:311 +msgid "Change" +msgstr "Ubah" + +#. Label for radiobutton that sets doc permission to private +#: ../src/sharing.js:157 ../src/sharing.js:286 +msgid "Private" +msgstr "Pribadi" + +#: ../src/sharing.js:167 ../src/sharing.js:279 +msgid "Public" +msgstr "Umum" + +#. Label for checkbutton that sets doc permission to Can edit +#: ../src/sharing.js:171 ../src/sharing.js:281 +msgid "Everyone can edit" +msgstr "Semua orang dapat menyunting" + +#. Label for widget group used for adding new contacts +#: ../src/sharing.js:178 +msgid "Add people" +msgstr "Tambah orang" + +#. Editable text in entry field +#: ../src/sharing.js:185 +msgid "Enter an email address" +msgstr "Masukkan alamat surel" + +#: ../src/sharing.js:200 ../src/sharing.js:367 +msgid "Can edit" +msgstr "Dapat menyunting" + +#: ../src/sharing.js:200 ../src/sharing.js:370 +msgid "Can view" +msgstr "Dapat menilik" + +#: ../src/sharing.js:207 +msgid "Add" +msgstr "Tambah" + +#: ../src/sharing.js:283 +msgid "Everyone can read" +msgstr "Semua bisa membaca" + +#: ../src/sharing.js:298 +msgid "Save" +msgstr "Simpan" + +#: ../src/sharing.js:364 +msgid "Owner" +msgstr "Pemilik" + +#: ../src/sharing.js:433 +#, c-format +msgid "You can ask %s for access" +msgstr "Anda dapat meminta akses ke %s" + +#: ../src/sharing.js:470 ../src/sharing.js:506 ../src/sharing.js:563 +#: ../src/sharing.js:580 ../src/sharing.js:599 +msgid "The document was not updated" +msgstr "Dokumen tak dimutakhirkan" -#: ../src/shellSearchProvider.js:281 +#: ../src/shellSearchProvider.js:293 msgid "Untitled Document" msgstr "Dokumen Tanpa Judul" -#: ../src/sources.js:85 -msgid "Sources" -msgstr "Sumber" +#: ../src/view.js:61 ../src/view.js:91 +msgid "Load More" +msgstr "Muat Lebih Banyak" -#: ../src/view.js:79 -#, c-format -msgid "Load %d more document" -msgid_plural "Load %d more documents" -msgstr[0] "Muat %d dokumen lagi" - -#: ../src/view.js:283 +#: ../src/view.js:292 msgid "Yesterday" msgstr "Kemarin" -#: ../src/view.js:285 +#: ../src/view.js:294 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d hari yang lalu" -#: ../src/view.js:289 +#: ../src/view.js:298 msgid "Last week" msgstr "Minggu lalu" -#: ../src/view.js:291 +#: ../src/view.js:300 #, c-format msgid "%d week ago" msgid_plural "%d weeks ago" msgstr[0] "%d minggu yang lalu" -#: ../src/view.js:295 +#: ../src/view.js:304 msgid "Last month" msgstr "Bulan lalu" -#: ../src/view.js:297 +#: ../src/view.js:306 #, c-format msgid "%d month ago" msgid_plural "%d months ago" msgstr[0] "%d bulan yang laly" -#: ../src/view.js:301 +#: ../src/view.js:310 msgid "Last year" msgstr "Tahun lalu" -#: ../src/view.js:303 +#: ../src/view.js:312 #, c-format msgid "%d year ago" msgid_plural "%d years ago" msgstr[0] "%d tahun yang lalu" - -#: ../src/resources/app-menu.ui.h:2 -msgid "Grid" -msgstr "Kisi" - -#: ../src/resources/app-menu.ui.h:3 -msgid "List" -msgstr "Daftar" - -#: ../src/resources/app-menu.ui.h:4 -msgid "Fullscreen" -msgstr "Layar penuh" - -#: ../src/resources/app-menu.ui.h:5 -msgid "About Documents" -msgstr "Tentang Dokumen" - -#: ../src/resources/app-menu.ui.h:6 -msgid "Help" -msgstr "Bantuan" - -#: ../src/resources/app-menu.ui.h:7 -msgid "Quit" -msgstr "Keluar" - -#: ../src/resources/preview-menu.ui.h:2 -msgid "Print..." -msgstr "Cetak..." - -#: ../src/resources/preview-menu.ui.h:3 -msgid "Zoom In" -msgstr "Perbesar" - -#: ../src/resources/preview-menu.ui.h:4 -msgid "Zoom Out" -msgstr "Perkecil" - -#: ../src/resources/preview-menu.ui.h:5 -msgid "Rotate Left" -msgstr "Putar ke Kiri" - -#: ../src/resources/preview-menu.ui.h:6 -msgid "Rotate Right" -msgstr "Putar ke Kanan" - -#: ../src/resources/selection-menu.ui.h:1 -msgid "Select All" -msgstr "Pilih Semua" - -#: ../src/resources/selection-menu.ui.h:2 -msgid "Select None" -msgstr "Jangan Pilih" diff -Nru gnome-documents-3.8.0/po/nb.po gnome-documents-3.8.3.1/po/nb.po --- gnome-documents-3.8.0/po/nb.po 2013-02-25 22:34:09.000000000 +0000 +++ gnome-documents-3.8.3.1/po/nb.po 2013-06-14 15:36:05.000000000 +0000 @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: gnome-documents 3.7.x\n" +"Project-Id-Version: gnome-documents 3.8.x\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-25 17:58+0100\n" -"PO-Revision-Date: 2013-02-25 17:59+0100\n" +"POT-Creation-Date: 2013-05-13 10:10+0200\n" +"PO-Revision-Date: 2013-05-13 10:11+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian bokmål \n" "Language: \n" @@ -17,7 +17,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../data/gnome-documents.desktop.in.in.h:1 ../src/application.js:99 +#: ../data/gnome-documents.desktop.in.in.h:1 ../src/application.js:102 #: ../src/mainWindow.js:53 ../src/mainWindow.js:274 msgid "Documents" msgstr "Dokumenter" @@ -63,63 +63,75 @@ msgid "Window maximized state" msgstr "Om vinduet er maksimert eller ikke" -#: ../src/documents.js:590 ../src/search.js:407 +#. Translators: this refers to local documents +#: ../src/documents.js:590 ../src/search.js:416 msgid "Local" msgstr "Lokalt" +#. Translators: Documents ships a "Getting Started with Documents" +#. tutorial PDF. The "GNOME" string below is displayed as the author name +#. of that document, and doesn't normally need to be translated. +#: ../src/documents.js:611 +msgid "GNOME" +msgstr "GNOME" + +#: ../src/documents.js:612 +msgid "Getting Started with Documents" +msgstr "Kom i gang med Dokumenter" + #. overridden -#: ../src/documents.js:643 +#: ../src/documents.js:659 msgid "Google Docs" msgstr "Google Docs" -#: ../src/documents.js:644 +#: ../src/documents.js:660 msgid "Google" msgstr "Google" -#: ../src/documents.js:708 ../src/documents.js:807 +#: ../src/documents.js:724 ../src/documents.js:823 msgid "Spreadsheet" msgstr "Regneark" -#: ../src/documents.js:710 ../src/documents.js:809 ../src/presentation.js:48 +#: ../src/documents.js:726 ../src/documents.js:825 ../src/presentation.js:48 msgid "Presentation" msgstr "Presentasjon" -#: ../src/documents.js:712 ../src/documents.js:811 +#: ../src/documents.js:728 ../src/documents.js:827 msgid "Collection" msgstr "Samling" -#: ../src/documents.js:714 ../src/documents.js:813 +#: ../src/documents.js:730 ../src/documents.js:829 msgid "Document" msgstr "Dokument" #. overridden -#: ../src/documents.js:741 ../src/documents.js:742 +#: ../src/documents.js:757 ../src/documents.js:758 msgid "Skydrive" msgstr "Skydrive" -#: ../src/documents.js:926 +#: ../src/documents.js:942 msgid "Please check the network connection." msgstr "Sjekk nettverkstilkoblingen." -#: ../src/documents.js:929 +#: ../src/documents.js:945 msgid "Please check the network proxy settings." msgstr "Sjekk proxyinnstillinger for nettverk." -#: ../src/documents.js:932 +#: ../src/documents.js:948 msgid "Unable to sign in to the document service." msgstr "Kan ikke logge inn på dokumenttjenesten." -#: ../src/documents.js:935 +#: ../src/documents.js:951 msgid "Unable to locate this document." msgstr "Kan ikke finne dette dokumentet." -#: ../src/documents.js:938 +#: ../src/documents.js:954 #, c-format msgid "Hmm, something is fishy (%d)." msgstr "Hmm, noe er galt (%d)." #. Translators: %s is the title of a document -#: ../src/documents.js:951 +#: ../src/documents.js:967 #, c-format msgid "Oops! Unable to load “%s”" msgstr "Opps! kan ikke laste «%s»" @@ -128,8 +140,8 @@ msgid "View" msgstr "Vis" -#: ../src/embed.js:63 ../src/lib/gd-places-bookmarks.c:379 -#: ../src/lib/gd-places-links.c:257 ../src/view.js:70 +#: ../src/embed.js:63 ../src/lib/gd-places-bookmarks.c:382 +#: ../src/lib/gd-places-links.c:257 ../src/view.js:71 msgid "Loading…" msgstr "Laster …" @@ -163,16 +175,19 @@ msgid "LibreOffice is required to view this document" msgstr "LibreOffice kreves for å vise dette dokumentet" -#: ../src/lib/gd-places-bookmarks.c:309 +#. Translators: %s is the number of the page, already formatted +#. * as a string, for example "Page 5". +#. +#: ../src/lib/gd-places-bookmarks.c:312 #, c-format msgid "Page %s" msgstr "Side %s" -#: ../src/lib/gd-places-bookmarks.c:372 +#: ../src/lib/gd-places-bookmarks.c:375 msgid "No bookmarks" msgstr "Ingen bokmerker" -#: ../src/lib/gd-places-bookmarks.c:644 +#: ../src/lib/gd-places-bookmarks.c:647 msgid "Bookmarks" msgstr "Bokmerker" @@ -239,12 +254,14 @@ msgstr "" "Noen dokumenter vil kanskje ikke være tilgjengelig under denne prosessen" -#: ../src/notifications.js:164 +#. Translators: %s refers to an online account provider, e.g. +#. "Google", or "Windows Live". +#: ../src/notifications.js:166 #, c-format msgid "Fetching documents from %s" msgstr "Henter dokumenter fra %s" -#: ../src/notifications.js:166 +#: ../src/notifications.js:168 msgid "Fetching documents from online accounts" msgstr "Henter dokumenter fra kontoer på nettet" @@ -257,7 +274,7 @@ msgstr "Presentasjonsmodus på" #: ../src/properties.js:57 ../src/resources/preview-menu.ui.h:9 -#: ../src/selections.js:779 +#: ../src/selections.js:781 msgid "Properties" msgstr "Egenskaper" @@ -265,28 +282,28 @@ #. Translators: "Title" is the label next to the document title #. in the properties dialog #. Translators: "Title" refers to "Match Title" when searching -#: ../src/properties.js:78 ../src/search.js:257 +#: ../src/properties.js:79 ../src/search.js:257 msgid "Title" msgstr "Tittel" #. Translators: "Author" is the label next to the document author #. in the properties dialog #. Translators: "Author" refers to "Match Author" when searching -#: ../src/properties.js:87 ../src/search.js:260 +#: ../src/properties.js:88 ../src/search.js:260 msgid "Author" msgstr "Forfatter" #. Source item -#: ../src/properties.js:94 +#: ../src/properties.js:95 msgid "Source" msgstr "Kilde" #. Date Modified item -#: ../src/properties.js:100 +#: ../src/properties.js:101 msgid "Date Modified" msgstr "Endringsdato" -#: ../src/properties.js:107 +#: ../src/properties.js:108 msgid "Date Created" msgstr "Opprettelsesdato" @@ -295,7 +312,7 @@ #. (PDF, spreadsheet, ...) in the properties dialog #. Translators: "Type" refers to a search filter on the document type #. (PDF, spreadsheet, ...) -#: ../src/properties.js:116 ../src/search.js:166 +#: ../src/properties.js:117 ../src/search.js:166 msgid "Type" msgstr "Skriv" @@ -324,7 +341,7 @@ msgstr "Avslutt" #. Translators: this is the Open action in a context menu -#: ../src/resources/preview-menu.ui.h:1 ../src/selections.js:875 +#: ../src/resources/preview-menu.ui.h:1 ../src/selections.js:877 msgid "Open" msgstr "Åpne" @@ -368,15 +385,19 @@ msgid "Category" msgstr "Kategori" +#. Translators: this refers to new and recent documents +#. Translators: this refers to documents #: ../src/search.js:117 ../src/search.js:169 ../src/search.js:254 -#: ../src/search.js:401 +#: ../src/search.js:410 msgid "All" msgstr "Alle" +#. Translators: this refers to favorite documents #: ../src/search.js:123 msgid "Favorites" msgstr "Favoritter" +#. Translators: this refers to shared documents #: ../src/search.js:128 msgid "Shared with you" msgstr "Delt med deg" @@ -407,28 +428,29 @@ msgid "Match" msgstr "Treff" -#: ../src/search.js:397 +#: ../src/search.js:406 msgid "Sources" msgstr "Kilder" -#: ../src/selections.js:613 ../src/selections.js:771 +#. Translators: "Organize" refers to documents in this context +#: ../src/selections.js:614 ../src/selections.js:773 msgid "Organize" msgstr "Organiser" -#: ../src/selections.js:748 +#: ../src/selections.js:749 msgid "Print" msgstr "Skriv ut" -#: ../src/selections.js:755 +#: ../src/selections.js:756 msgid "Delete" msgstr "Slett" -#: ../src/selections.js:786 +#: ../src/selections.js:788 msgid "Share" msgstr "Del" #. Translators: this is the Open action in a context menu -#: ../src/selections.js:872 +#: ../src/selections.js:874 #, c-format msgid "Open with %s" msgstr "Åpne med %s" @@ -509,48 +531,49 @@ msgid "Untitled Document" msgstr "Dokument uten navn" -#: ../src/view.js:61 ../src/view.js:91 +#. Translators: "more" refers to documents in this context +#: ../src/view.js:62 ../src/view.js:93 msgid "Load More" msgstr "Last flere" -#: ../src/view.js:292 +#: ../src/view.js:294 msgid "Yesterday" msgstr "I går" -#: ../src/view.js:294 +#: ../src/view.js:296 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d dag siden" msgstr[1] "%d dager siden" -#: ../src/view.js:298 +#: ../src/view.js:300 msgid "Last week" msgstr "Siste uke" -#: ../src/view.js:300 +#: ../src/view.js:302 #, c-format msgid "%d week ago" msgid_plural "%d weeks ago" msgstr[0] "%d uke siden" msgstr[1] "%d uker siden" -#: ../src/view.js:304 +#: ../src/view.js:306 msgid "Last month" msgstr "Siste måned" -#: ../src/view.js:306 +#: ../src/view.js:308 #, c-format msgid "%d month ago" msgid_plural "%d months ago" msgstr[0] "%d måned siden" msgstr[1] "%d måneder siden" -#: ../src/view.js:310 +#: ../src/view.js:312 msgid "Last year" msgstr "Siste år" -#: ../src/view.js:312 +#: ../src/view.js:314 #, c-format msgid "%d year ago" msgid_plural "%d years ago" diff -Nru gnome-documents-3.8.0/po/sk.po gnome-documents-3.8.3.1/po/sk.po --- gnome-documents-3.8.0/po/sk.po 2013-03-25 15:28:13.000000000 +0000 +++ gnome-documents-3.8.3.1/po/sk.po 2013-06-14 15:36:05.000000000 +0000 @@ -9,8 +9,8 @@ "Project-Id-Version: gnome-documents\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "documents&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-03-22 19:15+0000\n" -"PO-Revision-Date: 2013-03-23 12:11+0100\n" +"POT-Creation-Date: 2013-03-29 19:21+0000\n" +"PO-Revision-Date: 2013-03-29 10:33+0100\n" "Last-Translator: Dušan Kazik \n" "Language-Team: Slovak \n" "Language: sk\n" @@ -163,7 +163,7 @@ msgstr "Zobraziť" #: ../src/embed.js:63 ../src/lib/gd-places-bookmarks.c:382 -#: ../src/lib/gd-places-links.c:257 ../src/view.js:70 +#: ../src/lib/gd-places-links.c:257 ../src/view.js:71 msgid "Loading…" msgstr "Načítava sa…" @@ -284,12 +284,14 @@ msgstr "Niektoré dokumenty nemusia byť počas tohto procesu dostupné" # DK:https://bugzilla.gnome.org/show_bug.cgi?id=695555 -#: ../src/notifications.js:164 -#, fuzzy, c-format +#. Translators: %s refers to an online account provider, e.g. +#. "Google", or "Windows Live". +#: ../src/notifications.js:166 +#, c-format msgid "Fetching documents from %s" -msgstr "Získavajú sa dokumenty z %s" +msgstr "Získavajú sa dokumenty od poskytovateľa %s" -#: ../src/notifications.js:166 +#: ../src/notifications.js:168 msgid "Fetching documents from online accounts" msgstr "Získavajú sa dokumenty z online účtov" @@ -304,41 +306,36 @@ msgstr "Prezentácia" #: ../src/properties.js:57 ../src/resources/preview-menu.ui.h:9 -#: ../src/selections.js:779 +#: ../src/selections.js:781 msgid "Properties" msgstr "Vlastnosti" -# PM: potrebné rozdeliť - nahlas nový bug nech k tomu priradia msgctx a rozdelia reťazce -# *https://bugzilla.gnome.org/show_bug.cgi?id=685753 #. Title item #. Translators: "Title" is the label next to the document title #. in the properties dialog #. Translators: "Title" refers to "Match Title" when searching -#: ../src/properties.js:78 ../src/search.js:257 -#, fuzzy +#: ../src/properties.js:79 ../src/search.js:257 msgid "Title" -msgstr "Názvu" +msgstr "Názov" -# *https://bugzilla.gnome.org/show_bug.cgi?id=685753 #. Translators: "Author" is the label next to the document author #. in the properties dialog #. Translators: "Author" refers to "Match Author" when searching -#: ../src/properties.js:87 ../src/search.js:260 -#, fuzzy +#: ../src/properties.js:88 ../src/search.js:260 msgid "Author" -msgstr "Autora" +msgstr "Autor" #. Source item -#: ../src/properties.js:94 +#: ../src/properties.js:95 msgid "Source" msgstr "Zdroj" #. Date Modified item -#: ../src/properties.js:100 +#: ../src/properties.js:101 msgid "Date Modified" msgstr "Dátum zmeny" -#: ../src/properties.js:107 +#: ../src/properties.js:108 msgid "Date Created" msgstr "Dátum vytvorenia" @@ -347,7 +344,7 @@ #. (PDF, spreadsheet, ...) in the properties dialog #. Translators: "Type" refers to a search filter on the document type #. (PDF, spreadsheet, ...) -#: ../src/properties.js:116 ../src/search.js:166 +#: ../src/properties.js:117 ../src/search.js:166 msgid "Type" msgstr "Typ" @@ -376,7 +373,7 @@ msgstr "Ukončiť" #. Translators: this is the Open action in a context menu -#: ../src/resources/preview-menu.ui.h:1 ../src/selections.js:875 +#: ../src/resources/preview-menu.ui.h:1 ../src/selections.js:877 msgid "Open" msgstr "Otvoriť" @@ -468,31 +465,28 @@ msgid "Sources" msgstr "Zdroje" -# PM: treba rozdeliť prekladáme to iným štýlom - nahlás bug; a čo to robí? nebude lepšie usporiada? -# DK: https://bugzilla.gnome.org/show_bug.cgi?id=695554 -# GtkDialog title; button tooltip -#: ../src/selections.js:613 ../src/selections.js:771 -#, fuzzy +#. Translators: "Organize" refers to documents in this context +#: ../src/selections.js:614 ../src/selections.js:773 msgid "Organize" -msgstr "Organizovať" +msgstr "Usporiadanie" # button tooltip -#: ../src/selections.js:748 +#: ../src/selections.js:749 msgid "Print" msgstr "Uskutoční tlač" # button tooltip -#: ../src/selections.js:755 +#: ../src/selections.js:756 msgid "Delete" msgstr "Uskutoční odstránenie" # button tooltip -#: ../src/selections.js:786 +#: ../src/selections.js:788 msgid "Share" msgstr "Nastaví spoločné používanie" #. Translators: this is the Open action in a context menu -#: ../src/selections.js:872 +#: ../src/selections.js:874 #, c-format msgid "Open with %s" msgstr "Otvoriť pomocou %s" @@ -582,15 +576,16 @@ msgid "Untitled Document" msgstr "Nepomenovaný dokument" -#: ../src/view.js:61 ../src/view.js:91 +#. Translators: "more" refers to documents in this context +#: ../src/view.js:62 ../src/view.js:93 msgid "Load More" msgstr "Načítať viac" -#: ../src/view.js:292 +#: ../src/view.js:294 msgid "Yesterday" msgstr "Včera" -#: ../src/view.js:294 +#: ../src/view.js:296 #, c-format msgid "%d day ago" msgid_plural "%d days ago" @@ -598,11 +593,11 @@ msgstr[1] "Pred %d dňom" msgstr[2] "Pred %d dňami" -#: ../src/view.js:298 +#: ../src/view.js:300 msgid "Last week" msgstr "Minulý týždeň" -#: ../src/view.js:300 +#: ../src/view.js:302 #, c-format msgid "%d week ago" msgid_plural "%d weeks ago" @@ -610,11 +605,11 @@ msgstr[1] "Pred %d týždňom" msgstr[2] "Pred %d týždňami" -#: ../src/view.js:304 +#: ../src/view.js:306 msgid "Last month" msgstr "Minulý mesiac" -#: ../src/view.js:306 +#: ../src/view.js:308 #, c-format msgid "%d month ago" msgid_plural "%d months ago" @@ -622,11 +617,11 @@ msgstr[1] "Pred %d mesiacom" msgstr[2] "Pred %d mesiacmi" -#: ../src/view.js:310 +#: ../src/view.js:312 msgid "Last year" msgstr "Minulý rok" -#: ../src/view.js:312 +#: ../src/view.js:314 #, c-format msgid "%d year ago" msgid_plural "%d years ago" @@ -634,6 +629,22 @@ msgstr[1] "Pred %d rokom" msgstr[2] "Pred %d rokmi" +#~ msgctxt "Search Filter" +#~ msgid "Type" +#~ msgstr "Typu" + +#~ msgctxt "Search Filter" +#~ msgid "Title" +#~ msgstr "Názvu" + +#~ msgctxt "Search Filter" +#~ msgid "Author" +#~ msgstr "Autora" + +#~ msgctxt "Toolbar button tooltip" +#~ msgid "Organize" +#~ msgstr "Usporiada dokumenty" + #~ msgid "filtered by title" #~ msgstr "vyfiltrované podľa názvu" diff -Nru gnome-documents-3.8.0/po/te.po gnome-documents-3.8.3.1/po/te.po --- gnome-documents-3.8.0/po/te.po 2012-10-01 13:36:54.000000000 +0000 +++ gnome-documents-3.8.3.1/po/te.po 2013-06-14 15:36:05.000000000 +0000 @@ -2,27 +2,28 @@ # Copyright (C) 2011 e-telugu Localization Team # Copyright (C) 2012 Swecha Telugu Localisation Team # This file is distributed under the same license as the gnome-documents package. -# Sasi Bhushan Boddepalli , 2012 -# Praveen Illa , 2011, 2012. # +# Sasi Bhushan Boddepalli , 2012. +# Praveen Illa , 2011, 2012. +# Krishnababu Krothapalli , 2013. msgid "" msgstr "" "Project-Id-Version: gnome-documents master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "documents&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-09-14 16:55+0000\n" -"PO-Revision-Date: 2012-09-20 23:14+0530\n" -"Last-Translator: Praveen Illa \n" -"Language-Team: Telugu \n" -"Language: \n" +"POT-Creation-Date: 2013-03-04 21:13+0000\n" +"PO-Revision-Date: 2013-03-25 22:53+0530\n" +"Last-Translator: Krishnababu Krothapalli \n" +"Language-Team: Telugu \n" +"Language: te\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -"X-Generator: Gtranslator 2.91.5\n" +"X-Generator: Lokalize 1.5\n" -#: ../data/gnome-documents.desktop.in.in.h:1 ../src/mainWindow.js:51 -#: ../src/mainWindow.js:205 +#: ../data/gnome-documents.desktop.in.in.h:1 ../src/application.js:101 +#: ../src/mainWindow.js:53 ../src/mainWindow.js:274 msgid "Documents" msgstr "పత్రాలు" @@ -67,349 +68,545 @@ msgid "Window maximized state" msgstr "కిటికీ గరిష్ఠీకరణ స్థితి" -#: ../src/documents.js:640 ../src/sources.js:95 +#: ../src/documents.js:590 ../src/search.js:416 msgid "Local" msgstr "స్థానిక" +#: ../src/documents.js:608 +msgid "GNOME" +msgstr "గ్నోమ్" + +#: ../src/documents.js:609 +msgid "Getting Started with Documents" +msgstr "పత్రములతో ప్రారంభమౌతోంది" + #. overridden -#: ../src/documents.js:693 +#: ../src/documents.js:656 msgid "Google Docs" msgstr "గూగుల్ డాక్స్" -#: ../src/documents.js:694 +#: ../src/documents.js:657 msgid "Google" msgstr "గూగుల్" -#: ../src/documents.js:758 ../src/documents.js:857 +#: ../src/documents.js:721 ../src/documents.js:820 msgid "Spreadsheet" msgstr "స్ప్రెడ్‌షీట్" -#: ../src/documents.js:760 ../src/documents.js:859 +#: ../src/documents.js:723 ../src/documents.js:822 ../src/presentation.js:48 msgid "Presentation" msgstr "సమర్పణం" -#: ../src/documents.js:762 ../src/documents.js:861 +#: ../src/documents.js:725 ../src/documents.js:824 msgid "Collection" msgstr "సేకరణ" -#: ../src/documents.js:764 ../src/documents.js:863 +#: ../src/documents.js:727 ../src/documents.js:826 msgid "Document" msgstr "పత్రం" #. overridden -#: ../src/documents.js:791 ../src/documents.js:792 +#: ../src/documents.js:754 ../src/documents.js:755 msgid "Skydrive" msgstr "స్కైడ్రైవ్" +#: ../src/documents.js:939 +msgid "Please check the network connection." +msgstr "నెట్వర్కు అనుసంధానం పరిశీలించు." + +#: ../src/documents.js:942 +msgid "Please check the network proxy settings." +msgstr "నెట్వర్కు ప్రోక్సీ అమరికలు పరిశీలించు." + +#: ../src/documents.js:945 +#| msgid "Unable to load the document" +msgid "Unable to sign in to the document service." +msgstr "పత్ర సేవలోనికి ప్రవేశించలేక పోయింది." + +#: ../src/documents.js:948 +#| msgid "Unable to load the document" +msgid "Unable to locate this document." +msgstr "ఈ పత్రాన్ని గుర్తించలేక పోయింది." + +#: ../src/documents.js:951 +#, c-format +msgid "Hmm, something is fishy (%d)." +msgstr "ఏదో లోపాయికారీగా వుంది (%d)." + #. Translators: %s is the title of a document -#: ../src/documents.js:976 +#: ../src/documents.js:964 #, c-format -msgid "Unable to load \"%s\" for preview" -msgstr "మునుజూపుటకు \"%s\"ను నింపలేకపోతుంది" +msgid "Oops! Unable to load “%s”" +msgstr "అయ్యో! “%s” లోడ్ చేయలేదు" -#: ../src/embed.js:74 -msgid "Loading..." -msgstr "నింపుతున్నది..." +#: ../src/edit.js:191 +#| msgid "View as" +msgid "View" +msgstr "దర్శనం" + +#: ../src/embed.js:63 ../src/lib/gd-places-bookmarks.c:379 +#: ../src/lib/gd-places-links.c:257 ../src/view.js:70 +#| msgid "Loading..." +msgid "Loading…" +msgstr "లోడుచేస్తోంది..." -#: ../src/embed.js:220 +#: ../src/embed.js:145 msgid "No Documents Found" msgstr "ఎటువంటి పత్రాలు కనపడలేదు" #. Translators: %s here is "System Settings", which is in a separate string #. due to markup, and should be translated only in the context of this sentence -#: ../src/embed.js:243 +#: ../src/embed.js:166 #, c-format msgid "You can add your online accounts in %s" msgstr "%s లో మీ ఆన్‌లైను ఖాతాను జతచేయవచ్చు" #. Translators: this should be translated in the context of the #. "You can add your online accounts in System Settings" sentence above -#: ../src/embed.js:247 +#: ../src/embed.js:170 msgid "System Settings" msgstr "వ్యవస్థ అమరికలు" -#: ../src/lib/gd-pdf-loader.c:224 +#: ../src/lib/gd-nav-bar.c:235 +#, c-format +msgid "Page %u of %u" +msgstr "పేజీ %u మొత్తం %u లో" + +#: ../src/lib/gd-pdf-loader.c:226 msgid "Unable to load the document" msgstr "పత్రాన్ని లోడు చేయలేకపోతున్నాము" -#: ../src/lib/gd-pdf-loader.c:673 -msgid "Cannot find \"unoconv\", please check your LibreOffice installation" -msgstr "\"unoconv\" కనుగొనలేకపోయాము, దయచేసి మీ లిబ్రేఆఫీసు స్థాపనను సరిచూడండి" +#: ../src/lib/gd-pdf-loader.c:676 +msgid "LibreOffice is required to view this document" +msgstr "ఈ పత్రమును చూడుటకు లిబ్రేఆఫీస్ కావాలి" -#: ../src/mainToolbar.js:73 +#: ../src/lib/gd-places-bookmarks.c:309 +#, c-format +msgid "Page %s" +msgstr "పేజీ %s" + +#: ../src/lib/gd-places-bookmarks.c:372 +msgid "No bookmarks" +msgstr "ఇష్టాంశములు లేవు" + +#: ../src/lib/gd-places-bookmarks.c:644 +msgid "Bookmarks" +msgstr "ఇష్టాంశాలు" + +#: ../src/lib/gd-places-links.c:342 +msgid "No table of contents" +msgstr "విషయ పట్టిక లేదు" + +#: ../src/lib/gd-places-links.c:518 +msgid "Contents" +msgstr "విషయాలు" + +#: ../src/mainToolbar.js:62 msgid "Search" msgstr "వెతుకు" -#: ../src/mainToolbar.js:158 -msgid "New and Recent" -msgstr "కొత్తవి మరియు ఇటీవలివి" +#: ../src/mainToolbar.js:73 +msgid "Back" +msgstr "వెనక్కు " -#: ../src/mainToolbar.js:165 +#: ../src/mainToolbar.js:153 #, c-format -msgid "Results for \"%s\"" -msgstr "\"%s\" కొరకు ఫలితాలు" - -#: ../src/mainToolbar.js:167 -msgid "filtered by title" -msgstr "శీర్షిక ద్వారా వడబోయి" +#| msgid "Results for \"%s\"" +msgid "Results for “%s”" +msgstr "“%s” కొరకు ఫలితాలు" -#: ../src/mainToolbar.js:169 -msgid "filtered by author" -msgstr "రచయిత ద్వారా వడబోయి" - -#: ../src/mainToolbar.js:176 +#: ../src/mainToolbar.js:161 msgid "Click on items to select them" msgstr "ఎంచుకోదలచుకున్న అంశాలపై నొక్కండి" -#: ../src/mainToolbar.js:178 +#: ../src/mainToolbar.js:163 #, c-format msgid "%d selected" msgid_plural "%d selected" msgstr[0] "%d ఎంపికచేయబడింది" msgstr[1] "%d ఎంపికచేయబడ్డాయి" -#: ../src/mainToolbar.js:208 ../src/properties.js:58 +#. Label for Done button in Sharing dialog +#: ../src/mainToolbar.js:192 ../src/properties.js:59 ../src/sharing.js:93 msgid "Done" msgstr "అయినది" -#: ../src/mainToolbar.js:226 -msgid "Back" -msgstr "వెనక్కు " - -#: ../src/mainToolbar.js:248 +#: ../src/mainToolbar.js:233 msgid "Select Items" msgstr "అంశాల ఎంపిక " -#: ../src/mainWindow.js:204 +#: ../src/mainWindow.js:273 msgid "translator-credits" msgstr "Praveen Illa , 2011-12" -#: ../src/mainWindow.js:206 +#: ../src/mainWindow.js:275 msgid "A document manager application" msgstr "పత్ర నిర్వాహక అనువర్తనం" -#: ../src/notifications.js:86 +#: ../src/notifications.js:87 #, c-format -msgid "Printing \"%s\": %s" -msgstr "\"%s\" ముద్రిస్తున్నది: %s" +#| msgid "Printing \"%s\": %s" +msgid "Printing “%s”: %s" +msgstr "ముద్రిస్తోంది “%s”: %s" -#: ../src/notifications.js:151 +#: ../src/notifications.js:143 msgid "Your documents are being indexed" msgstr "మీ పత్రాలు సూచీలోకి చేరుస్తుంది" -#: ../src/notifications.js:155 +#: ../src/notifications.js:144 msgid "Some documents might not be available during this process" msgstr "ఈ ప్రక్రియ నడుస్తున్నప్పుడు కొన్ని పత్రాలు అందుబాటులోవుండకపోవచ్చు" -#. Properties dialog heading -#: ../src/properties.js:73 ../src/selections.js:792 +#: ../src/notifications.js:164 +#, c-format +msgid "Fetching documents from %s" +msgstr "%s నుండి పత్రము తెస్తోంది" + +#: ../src/notifications.js:166 +msgid "Fetching documents from online accounts" +msgstr "ఆన్‌లైన్ ఖాతాల నుండి పత్రములను తెస్తోంది" + +#: ../src/presentation.js:105 +msgid "Running in presentation mode" +msgstr "సమర్పణ రీతి నందు నడుస్తోంది" + +#: ../src/presentation.js:158 +#| msgid "Presentation" +msgid "Present On" +msgstr "సమర్పణం వుంది" + +#: ../src/properties.js:57 ../src/resources/preview-menu.ui.h:9 +#: ../src/selections.js:779 msgid "Properties" msgstr "లక్షణాలు" #. Title item -#: ../src/properties.js:81 ../src/searchbar.js:225 +#. Translators: "Title" is the label next to the document title +#. in the properties dialog +#. Translators: "Title" refers to "Match Title" when searching +#: ../src/properties.js:78 ../src/search.js:257 msgid "Title" msgstr "శీర్షిక" -#: ../src/properties.js:88 ../src/searchbar.js:227 +#. Translators: "Author" is the label next to the document author +#. in the properties dialog +#. Translators: "Author" refers to "Match Author" when searching +#: ../src/properties.js:87 ../src/search.js:260 msgid "Author" msgstr "రచయిత" #. Source item -#: ../src/properties.js:95 +#: ../src/properties.js:94 msgid "Source" msgstr "మూలం" #. Date Modified item -#: ../src/properties.js:101 +#: ../src/properties.js:100 msgid "Date Modified" msgstr "సవరించిన తేదీ" -#: ../src/properties.js:108 +#: ../src/properties.js:107 msgid "Date Created" msgstr "సృష్టించిన తేదీ" #. Document type item -#: ../src/properties.js:115 ../src/searchbar.js:135 +#. Translators: "Type" is the label next to the document type +#. (PDF, spreadsheet, ...) in the properties dialog +#. Translators: "Type" refers to a search filter on the document type +#. (PDF, spreadsheet, ...) +#: ../src/properties.js:116 ../src/search.js:166 msgid "Type" msgstr "రకం" -#: ../src/searchbar.js:83 +#: ../src/resources/app-menu.ui.h:2 +msgid "Grid" +msgstr "గడి" + +#: ../src/resources/app-menu.ui.h:3 +msgid "List" +msgstr "జాబితా" + +#: ../src/resources/app-menu.ui.h:4 +msgid "Fullscreen" +msgstr "పూర్తితెర" + +#: ../src/resources/app-menu.ui.h:5 +msgid "About Documents" +msgstr "పత్రాలు గురించి" + +#: ../src/resources/app-menu.ui.h:6 +msgid "Help" +msgstr "సహాయం" + +#: ../src/resources/app-menu.ui.h:7 +msgid "Quit" +msgstr "నిష్క్రమించు" + +#. Translators: this is the Open action in a context menu +#: ../src/resources/preview-menu.ui.h:1 ../src/selections.js:875 +msgid "Open" +msgstr "తెరువు" + +#: ../src/resources/preview-menu.ui.h:2 +msgid "Edit" +msgstr "సరిచేయి" + +#: ../src/resources/preview-menu.ui.h:3 +#| msgid "Print" +msgid "Print…" +msgstr "ముద్రించు…" + +#: ../src/resources/preview-menu.ui.h:4 +#| msgid "Presentation" +msgid "Present" +msgstr "సమర్పణం" + +#: ../src/resources/preview-menu.ui.h:5 +msgid "Zoom In" +msgstr "అతిరూపించు" + +#: ../src/resources/preview-menu.ui.h:6 +msgid "Zoom Out" +msgstr "అవరూపించు" + +#: ../src/resources/preview-menu.ui.h:7 +#| msgid "Rotate Left" +msgid "Rotate ↶" +msgstr "తిప్పు ↶" + +#: ../src/resources/preview-menu.ui.h:8 +#| msgid "Rotate Left" +msgid "Rotate ↷" +msgstr "తిప్పు ↷" + +#: ../src/resources/selection-menu.ui.h:1 +msgid "Select All" +msgstr "అన్నీ ఎంపికచేయి" + +#: ../src/resources/selection-menu.ui.h:2 +msgid "Select None" +msgstr "ఏమీ ఎంపికచేయవద్దు" + +#: ../src/search.js:112 msgid "Category" msgstr "వర్గము" -#: ../src/searchbar.js:88 ../src/searchbar.js:138 ../src/searchbar.js:223 -#: ../src/sources.js:89 +#: ../src/search.js:117 ../src/search.js:169 ../src/search.js:254 +#: ../src/search.js:410 msgid "All" msgstr "అన్ని" -#: ../src/searchbar.js:94 +#: ../src/search.js:123 msgid "Favorites" msgstr "ఇష్టాంశాలు" -#: ../src/searchbar.js:99 +#: ../src/search.js:128 msgid "Shared with you" msgstr "మీతో పంచుకొనబడినవి" -#: ../src/searchbar.js:140 +#: ../src/search.js:171 msgid "Collections" msgstr "సేకరణలు" -#: ../src/searchbar.js:144 +#: ../src/search.js:175 msgid "PDF Documents" msgstr "పిడియఫ్ పత్రాలు" -#: ../src/searchbar.js:148 +#: ../src/search.js:179 msgid "Presentations" msgstr "సమర్పణలు" -#: ../src/searchbar.js:151 +#: ../src/search.js:182 msgid "Spreadsheets" msgstr "స్ప్రెడ్‌షీట్లు" -#: ../src/searchbar.js:154 +#: ../src/search.js:185 msgid "Text Documents" msgstr "పాఠ్య పత్రాలు" #. Translators: this is a verb that refers to "All", "Title" and "Author", #. as in "Match All", "Match Title" and "Match Author" -#: ../src/searchbar.js:220 +#: ../src/search.js:251 msgid "Match" msgstr "సరిపోల్చు" -#: ../src/selections.js:761 +#: ../src/search.js:406 +msgid "Sources" +msgstr "వనరులు" + +#: ../src/selections.js:613 ../src/selections.js:771 +msgid "Organize" +msgstr "నిర్వహించు" + +#: ../src/selections.js:748 msgid "Print" msgstr "ముద్రణ " -#: ../src/selections.js:768 +#: ../src/selections.js:755 msgid "Delete" msgstr "తొలగించండి" -#: ../src/selections.js:784 -msgid "Organize" -msgstr "నిర్వహించు" +#: ../src/selections.js:786 +msgid "Share" +msgstr "పంచు" #. Translators: this is the Open action in a context menu -#: ../src/selections.js:873 +#: ../src/selections.js:872 #, c-format msgid "Open with %s" msgstr "%s‍తో తెరువు" -#. Translators: this is the Open action in a context menu -#: ../src/selections.js:876 ../src/resources/preview-menu.ui.h:1 -msgid "Open" -msgstr "తెరువు" +#: ../src/sharing.js:89 +#| msgid "System Settings" +msgid "Sharing Settings" +msgstr "అమరికలు పంచుకొనుట" + +#. Label for widget group for changing document permissions +#: ../src/sharing.js:126 +#| msgid "Documents" +msgid "Document permissions" +msgstr "పత్ర అనుమతులు" + +#. Label for permission change in Sharing dialog +#: ../src/sharing.js:133 ../src/sharing.js:311 +msgid "Change" +msgstr "మార్చు" + +#. Label for radiobutton that sets doc permission to private +#: ../src/sharing.js:157 ../src/sharing.js:286 +msgid "Private" +msgstr "వ్యక్తిగత" + +#: ../src/sharing.js:167 ../src/sharing.js:279 +msgid "Public" +msgstr "పబ్లిక్" + +#. Label for checkbutton that sets doc permission to Can edit +#: ../src/sharing.js:171 ../src/sharing.js:281 +msgid "Everyone can edit" +msgstr "ఏవరైనా సరిచేయవచ్చు" + +#. Label for widget group used for adding new contacts +#: ../src/sharing.js:178 +msgid "Add people" +msgstr "ప్రజలను చేర్చు" + +#. Editable text in entry field +#: ../src/sharing.js:185 +msgid "Enter an email address" +msgstr "ఈమెయిల్ చిరునామా చేర్చు" + +#: ../src/sharing.js:200 ../src/sharing.js:367 +msgid "Can edit" +msgstr "సరిచేయ గలరు" + +#: ../src/sharing.js:200 ../src/sharing.js:370 +msgid "Can view" +msgstr "దర్శించ గలరు" + +#: ../src/sharing.js:207 +msgid "Add" +msgstr "జతచేయి" + +#: ../src/sharing.js:283 +msgid "Everyone can read" +msgstr "ఏవరైనా చదువవచ్చు" + +#: ../src/sharing.js:298 +msgid "Save" +msgstr "దాయి" + +#: ../src/sharing.js:364 +msgid "Owner" +msgstr "యజమాని" + +#: ../src/sharing.js:433 +#, c-format +msgid "You can ask %s for access" +msgstr "ఏక్సెస్ కొరకు మీరు %sను అడుగవచ్చు" + +#: ../src/sharing.js:470 ../src/sharing.js:506 ../src/sharing.js:563 +#: ../src/sharing.js:580 ../src/sharing.js:599 +msgid "The document was not updated" +msgstr "పత్రము నవీకరించలేదు" -#: ../src/shellSearchProvider.js:281 +#: ../src/shellSearchProvider.js:293 msgid "Untitled Document" msgstr "శీర్షికలేని పత్రం" -#: ../src/sources.js:85 -msgid "Sources" -msgstr "వనరులు" - -#: ../src/view.js:79 -#, c-format -msgid "Load %d more document" -msgid_plural "Load %d more documents" -msgstr[0] "ఇంకా %d పత్రాన్ని నింపు" -msgstr[1] "ఇంకా %d పత్రాలను నింపు" +#: ../src/view.js:61 ../src/view.js:91 +msgid "Load More" +msgstr "మరిన్ని లోడ్‌చేయి" -#: ../src/view.js:283 +#: ../src/view.js:292 msgid "Yesterday" msgstr "నిన్న" -#: ../src/view.js:285 +#: ../src/view.js:294 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d రోజు క్రితం" msgstr[1] "%d రోజుల క్రితం" -#: ../src/view.js:289 +#: ../src/view.js:298 msgid "Last week" msgstr "గత వారం" -#: ../src/view.js:291 +#: ../src/view.js:300 #, c-format msgid "%d week ago" msgid_plural "%d weeks ago" msgstr[0] "%d వారం క్రితం" msgstr[1] "%d వారాల క్రితం" -#: ../src/view.js:295 +#: ../src/view.js:304 msgid "Last month" msgstr "గత నెల" -#: ../src/view.js:297 +#: ../src/view.js:306 #, c-format msgid "%d month ago" msgid_plural "%d months ago" msgstr[0] "%d నెల క్రితం" msgstr[1] "%d నెలల క్రితం" -#: ../src/view.js:301 +#: ../src/view.js:310 msgid "Last year" msgstr "గత సంవత్సరం" -#: ../src/view.js:303 +#: ../src/view.js:312 #, c-format msgid "%d year ago" msgid_plural "%d years ago" msgstr[0] "%d సంవత్సరం క్రితం" msgstr[1] "%d సంవత్సరాల క్రితం" -#: ../src/resources/app-menu.ui.h:2 -msgid "Grid" -msgstr "గడి" +#~ msgid "Unable to load \"%s\" for preview" +#~ msgstr "మునుజూపుటకు \"%s\"ను నింపలేకపోతుంది" -#: ../src/resources/app-menu.ui.h:3 -msgid "List" -msgstr "జాబితా" +#~ msgid "Cannot find \"unoconv\", please check your LibreOffice installation" +#~ msgstr "\"unoconv\" కనుగొనలేకపోయాము, దయచేసి మీ లిబ్రేఆఫీసు స్థాపనను సరిచూడండి" -#: ../src/resources/app-menu.ui.h:4 -msgid "Fullscreen" -msgstr "పూర్తితెర" - -#: ../src/resources/app-menu.ui.h:5 -msgid "About Documents" -msgstr "పత్రాలు గురించి" - -#: ../src/resources/app-menu.ui.h:6 -msgid "Help" -msgstr "సహాయం" - -#: ../src/resources/app-menu.ui.h:7 -msgid "Quit" -msgstr "నిష్క్రమించు" - -#: ../src/resources/preview-menu.ui.h:2 -msgid "Print..." -msgstr "ముద్రించు..." - -#: ../src/resources/preview-menu.ui.h:3 -msgid "Zoom In" -msgstr "అతిరూపించు" +#~ msgid "New and Recent" +#~ msgstr "కొత్తవి మరియు ఇటీవలివి" -#: ../src/resources/preview-menu.ui.h:4 -msgid "Zoom Out" -msgstr "అవరూపించు" +#~ msgid "filtered by title" +#~ msgstr "శీర్షిక ద్వారా వడబోయి" -#: ../src/resources/preview-menu.ui.h:5 -msgid "Rotate Left" -msgstr "ఎడమవైపు తిప్పు" +#~ msgid "filtered by author" +#~ msgstr "రచయిత ద్వారా వడబోయి" -#: ../src/resources/preview-menu.ui.h:6 -msgid "Rotate Right" -msgstr "కుడివైపు తిప్పు" +#~ msgid "Load %d more document" +#~ msgid_plural "Load %d more documents" +#~ msgstr[0] "ఇంకా %d పత్రాన్ని నింపు" +#~ msgstr[1] "ఇంకా %d పత్రాలను నింపు" -#: ../src/resources/selection-menu.ui.h:1 -msgid "Select All" -msgstr "అన్నీ ఎంపికచేయి" +#~ msgid "Print..." +#~ msgstr "ముద్రించు..." -#: ../src/resources/selection-menu.ui.h:2 -msgid "Select None" -msgstr "ఏమీ ఎంపికచేయవద్దు" +#~ msgid "Rotate Right" +#~ msgstr "కుడివైపు తిప్పు" #~ msgid "Remove from favorites" #~ msgstr "ఇష్టాంశాల నుండి తీసివేయి" diff -Nru gnome-documents-3.8.0/po/tr.po gnome-documents-3.8.3.1/po/tr.po --- gnome-documents-3.8.0/po/tr.po 2012-10-01 13:36:54.000000000 +0000 +++ gnome-documents-3.8.3.1/po/tr.po 2013-04-19 11:33:40.000000000 +0000 @@ -2,27 +2,27 @@ # Copyright (C) 2011 gnome-documents's COPYRIGHT HOLDER # This file is distributed under the same license as the gnome-documents package. # -# Osman Karagöz , 2012. -# Muhammet Kara , 2011, 2012. +# Osman Karagöz , 2012, 2013. +# Muhammet Kara , 2011, 2012, 2013. # msgid "" msgstr "" "Project-Id-Version: gnome-documents master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "documents&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-08-30 02:39+0000\n" -"PO-Revision-Date: 2012-08-15 08:57+0300\n" -"Last-Translator: Muhammet Kara \n" -"Language-Team: Türkçe \n" +"POT-Creation-Date: 2013-04-16 01:24+0000\n" +"PO-Revision-Date: 2013-04-14 10:48+0300\n" +"Last-Translator: Muhammet Kara \n" +"Language-Team: Turkish \n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Gtranslator 2.91.6\n" -#: ../data/gnome-documents.desktop.in.in.h:1 ../src/mainWindow.js:51 -#: ../src/mainWindow.js:205 +#: ../data/gnome-documents.desktop.in.in.h:1 ../src/application.js:102 +#: ../src/mainWindow.js:53 ../src/mainWindow.js:274 msgid "Documents" msgstr "Belgeler" @@ -67,147 +67,231 @@ msgid "Window maximized state" msgstr "Pencerenin büyütülmüş durumu" -#: ../src/documents.js:640 ../src/sources.js:95 +#. Translators: this refers to local documents +#: ../src/documents.js:590 ../src/search.js:416 msgid "Local" msgstr "Yerel" +#. Translators: Documents ships a "Getting Started with Documents" +#. tutorial PDF. The "GNOME" string below is displayed as the author name +#. of that document, and doesn't normally need to be translated. +#: ../src/documents.js:611 +msgid "GNOME" +msgstr "GNOME" + +#: ../src/documents.js:612 +msgid "Getting Started with Documents" +msgstr "Belgeler ile Çalışmaya Başlama" + #. overridden -#: ../src/documents.js:693 +#: ../src/documents.js:659 msgid "Google Docs" msgstr "Google Belgeleri" -#: ../src/documents.js:694 +#: ../src/documents.js:660 msgid "Google" msgstr "Google" -#: ../src/documents.js:758 ../src/documents.js:857 +#: ../src/documents.js:724 ../src/documents.js:823 msgid "Spreadsheet" msgstr "Hesap Tablosu" -#: ../src/documents.js:760 ../src/documents.js:859 +#: ../src/documents.js:726 ../src/documents.js:825 ../src/presentation.js:48 msgid "Presentation" msgstr "Sunum" -#: ../src/documents.js:762 ../src/documents.js:861 +#: ../src/documents.js:728 ../src/documents.js:827 msgid "Collection" msgstr "Koleksiyon" -#: ../src/documents.js:764 ../src/documents.js:863 +#: ../src/documents.js:730 ../src/documents.js:829 msgid "Document" msgstr "Belge" #. overridden -#: ../src/documents.js:791 ../src/documents.js:792 +#: ../src/documents.js:757 ../src/documents.js:758 msgid "Skydrive" msgstr "Skydrive" +#: ../src/documents.js:942 +msgid "Please check the network connection." +msgstr "Lütfen internet bağlantınızı kontrol edin." + +#: ../src/documents.js:945 +msgid "Please check the network proxy settings." +msgstr "Lütfen vekil sunucu ayarlarınızı kontrol edin." + +#: ../src/documents.js:948 +msgid "Unable to sign in to the document service." +msgstr "Belge servisinde oturum açılamadı." + +#: ../src/documents.js:951 +msgid "Unable to locate this document." +msgstr "Belge bulunamadı." + +#: ../src/documents.js:954 +#, c-format +msgid "Hmm, something is fishy (%d)." +msgstr "Hmm, şüpheli bir durum var (%d)." + #. Translators: %s is the title of a document -#: ../src/documents.js:972 +#: ../src/documents.js:967 #, c-format -msgid "Unable to load \"%s\" for preview" -msgstr "\"%s\" önizleme için yüklenemedi" +msgid "Oops! Unable to load “%s”" +msgstr "Ahh! “%s” yüklenemedi." -#: ../src/embed.js:74 -msgid "Loading..." +#: ../src/edit.js:191 +msgid "View" +msgstr "Görünüm" + +#: ../src/embed.js:63 ../src/lib/gd-places-bookmarks.c:382 +#: ../src/lib/gd-places-links.c:257 ../src/view.js:71 +msgid "Loading…" msgstr "Yükleniyor..." -#: ../src/embed.js:220 -#, fuzzy -#| msgid "About Documents" +#: ../src/embed.js:145 msgid "No Documents Found" -msgstr "Belgeler Hakkında" +msgstr "Hiç Belge Bulunamadı" -#: ../src/embed.js:226 -msgid "You can add your online accounts in" -msgstr "" +#. Translators: %s here is "System Settings", which is in a separate string +#. due to markup, and should be translated only in the context of this sentence +#: ../src/embed.js:166 +#, c-format +msgid "You can add your online accounts in %s" +msgstr "Çevrimiçi hesaplarınızı %s'ndan ekleyebilirsiniz" -#: ../src/embed.js:227 +#. Translators: this should be translated in the context of the +#. "You can add your online accounts in System Settings" sentence above +#: ../src/embed.js:170 msgid "System Settings" -msgstr "" +msgstr "Sistem Ayarları" -#: ../src/lib/gd-pdf-loader.c:224 +#: ../src/lib/gd-nav-bar.c:235 +#, c-format +msgid "Page %u of %u" +msgstr "Sayfa %u/%u" + +#: ../src/lib/gd-pdf-loader.c:226 msgid "Unable to load the document" msgstr "Belge yüklenemedi" -#: ../src/lib/gd-pdf-loader.c:673 -msgid "Cannot find \"unoconv\", please check your LibreOffice installation" -msgstr "\"unoconv\" bulunamıyor, lütfen LibreOffice kurulumunuzu kontrol edin" +#: ../src/lib/gd-pdf-loader.c:676 +msgid "LibreOffice is required to view this document" +msgstr "Bu belgeyi görüntülemek için LibreOffice gerekir" + +#. Translators: %s is the number of the page, already formatted +#. * as a string, for example "Page 5". +#. +#: ../src/lib/gd-places-bookmarks.c:312 +#, c-format +msgid "Page %s" +msgstr "Sayfa %s" -#: ../src/mainToolbar.js:73 +#: ../src/lib/gd-places-bookmarks.c:375 +msgid "No bookmarks" +msgstr "Yer imi yok" + +#: ../src/lib/gd-places-bookmarks.c:647 +msgid "Bookmarks" +msgstr "Yer İmleri" + +#: ../src/lib/gd-places-links.c:342 +msgid "No table of contents" +msgstr "İçerik tablosu yok" + +#: ../src/lib/gd-places-links.c:518 +msgid "Contents" +msgstr "İçerik" + +#: ../src/mainToolbar.js:62 msgid "Search" msgstr "Ara" -#: ../src/mainToolbar.js:158 -msgid "New and Recent" -msgstr "Yeni ve Güncel" +#: ../src/mainToolbar.js:73 +msgid "Back" +msgstr "Geri" -#: ../src/mainToolbar.js:165 +#: ../src/mainToolbar.js:153 #, c-format -msgid "Results for \"%s\"" -msgstr "\"%s\" için sonuçlar" +msgid "Results for “%s”" +msgstr "“%s” için sonuçlar" -#: ../src/mainToolbar.js:167 -msgid "filtered by title" -msgstr "başlığa göre süzüldü" - -#: ../src/mainToolbar.js:169 -msgid "filtered by author" -msgstr "yazara göre süzüldü" - -#: ../src/mainToolbar.js:176 +#: ../src/mainToolbar.js:161 msgid "Click on items to select them" msgstr "Seçmek için ögelerin üzerine tıklayın" -#: ../src/mainToolbar.js:178 +#: ../src/mainToolbar.js:163 #, c-format msgid "%d selected" msgid_plural "%d selected" msgstr[0] "%d seçildi" -#: ../src/mainToolbar.js:208 ../src/properties.js:58 +#. Label for Done button in Sharing dialog +#: ../src/mainToolbar.js:192 ../src/properties.js:59 ../src/sharing.js:93 msgid "Done" msgstr "Yapıldı" -#: ../src/mainToolbar.js:226 -msgid "Back" -msgstr "Geri" - -#: ../src/mainToolbar.js:244 +#: ../src/mainToolbar.js:233 msgid "Select Items" msgstr "Ögeleri Seç" -#: ../src/mainWindow.js:204 +#: ../src/mainWindow.js:273 msgid "translator-credits" msgstr "GNOME Türkiye Çeviri Takımı " -#: ../src/mainWindow.js:206 +#: ../src/mainWindow.js:275 msgid "A document manager application" msgstr "Belge yönetimi uygulaması" -#: ../src/notifications.js:86 +#: ../src/notifications.js:87 #, c-format -msgid "Printing \"%s\": %s" -msgstr "\"%s\" yazdırılıyor: %s" +msgid "Printing “%s”: %s" +msgstr "“%s” yazdırılıyor: %s" -#: ../src/notifications.js:151 +#: ../src/notifications.js:143 msgid "Your documents are being indexed" -msgstr "" +msgstr "Belgeleriniz dizine ekleniyor" -#: ../src/notifications.js:155 +#: ../src/notifications.js:144 msgid "Some documents might not be available during this process" -msgstr "" +msgstr "Bazı belgeler bu işlem sırasında kullanım dışı olabilir" + +#. Translators: %s refers to an online account provider, e.g. +#. "Google", or "Windows Live". +#: ../src/notifications.js:166 +#, c-format +msgid "Fetching documents from %s" +msgstr "Belgeler %s konumundan getiriliyor" -#. Properties dialog heading -#: ../src/properties.js:73 ../src/selections.js:792 +#: ../src/notifications.js:168 +msgid "Fetching documents from online accounts" +msgstr "Belgeler çevrimiçi hesaplardan getiriliyor" + +#: ../src/presentation.js:105 +msgid "Running in presentation mode" +msgstr "Sunum kipinde çalışıyor" + +#: ../src/presentation.js:158 +msgid "Present On" +msgstr "Sunum" + +#: ../src/properties.js:57 ../src/resources/preview-menu.ui.h:9 +#: ../src/selections.js:781 msgid "Properties" msgstr "Özellikler" #. Title item -#: ../src/properties.js:81 ../src/searchbar.js:225 +#. Translators: "Title" is the label next to the document title +#. in the properties dialog +#. Translators: "Title" refers to "Match Title" when searching +#: ../src/properties.js:79 ../src/search.js:257 msgid "Title" msgstr "Başlık" -#: ../src/properties.js:88 ../src/searchbar.js:227 +#. Translators: "Author" is the label next to the document author +#. in the properties dialog +#. Translators: "Author" refers to "Match Author" when searching +#: ../src/properties.js:88 ../src/search.js:260 msgid "Author" msgstr "Yazar" @@ -226,181 +310,299 @@ msgstr "Oluşturulma Tarihi" #. Document type item -#: ../src/properties.js:115 ../src/searchbar.js:135 +#. Translators: "Type" is the label next to the document type +#. (PDF, spreadsheet, ...) in the properties dialog +#. Translators: "Type" refers to a search filter on the document type +#. (PDF, spreadsheet, ...) +#: ../src/properties.js:117 ../src/search.js:166 msgid "Type" msgstr "Tür" -#: ../src/searchbar.js:83 +#: ../src/resources/app-menu.ui.h:2 +msgid "Grid" +msgstr "Izgara" + +#: ../src/resources/app-menu.ui.h:3 +msgid "List" +msgstr "Liste" + +#: ../src/resources/app-menu.ui.h:4 +msgid "Fullscreen" +msgstr "Tam ekran" + +#: ../src/resources/app-menu.ui.h:5 +msgid "About Documents" +msgstr "Belgeler Hakkında" + +#: ../src/resources/app-menu.ui.h:6 +msgid "Help" +msgstr "Yardım" + +#: ../src/resources/app-menu.ui.h:7 +msgid "Quit" +msgstr "Çıkış" + +#. Translators: this is the Open action in a context menu +#: ../src/resources/preview-menu.ui.h:1 ../src/selections.js:877 +msgid "Open" +msgstr "Aç" + +#: ../src/resources/preview-menu.ui.h:2 +msgid "Edit" +msgstr "Düzenle" + +#: ../src/resources/preview-menu.ui.h:3 +msgid "Print…" +msgstr "Yazdır..." + +#: ../src/resources/preview-menu.ui.h:4 +msgid "Present" +msgstr "Sunum" + +#: ../src/resources/preview-menu.ui.h:5 +msgid "Zoom In" +msgstr "Yakınlaştır" + +#: ../src/resources/preview-menu.ui.h:6 +msgid "Zoom Out" +msgstr "Uzaklaştır" + +#: ../src/resources/preview-menu.ui.h:7 +msgid "Rotate ↶" +msgstr "↶ döndür" + +#: ../src/resources/preview-menu.ui.h:8 +msgid "Rotate ↷" +msgstr "↷ döndür" + +#: ../src/resources/selection-menu.ui.h:1 +msgid "Select All" +msgstr "Tümünü Seç" + +#: ../src/resources/selection-menu.ui.h:2 +msgid "Select None" +msgstr "Hiçbirini Seçme" + +#: ../src/search.js:112 msgid "Category" msgstr "Kategori" -#: ../src/searchbar.js:88 ../src/searchbar.js:138 ../src/searchbar.js:223 -#: ../src/sources.js:89 +#. Translators: this refers to new and recent documents +#. Translators: this refers to documents +#: ../src/search.js:117 ../src/search.js:169 ../src/search.js:254 +#: ../src/search.js:410 msgid "All" msgstr "Tümü" -#: ../src/searchbar.js:94 +#. Translators: this refers to favorite documents +#: ../src/search.js:123 msgid "Favorites" msgstr "Sık Kullanılanlar" -#: ../src/searchbar.js:99 +#. Translators: this refers to shared documents +#: ../src/search.js:128 msgid "Shared with you" msgstr "Seninle Paylaşılan" -#: ../src/searchbar.js:140 +#: ../src/search.js:171 msgid "Collections" msgstr "Koleksiyonlar" -#: ../src/searchbar.js:144 +#: ../src/search.js:175 msgid "PDF Documents" msgstr "PDF Belgeleri" -#: ../src/searchbar.js:148 +#: ../src/search.js:179 msgid "Presentations" msgstr "Sunumlar" -#: ../src/searchbar.js:151 +#: ../src/search.js:182 msgid "Spreadsheets" msgstr "Hesap Tabloları" -#: ../src/searchbar.js:154 +#: ../src/search.js:185 msgid "Text Documents" msgstr "Metin Belgeleri" #. Translators: this is a verb that refers to "All", "Title" and "Author", #. as in "Match All", "Match Title" and "Match Author" -#: ../src/searchbar.js:220 +#: ../src/search.js:251 msgid "Match" msgstr "Eşleştir" -#: ../src/selections.js:761 +#: ../src/search.js:406 +msgid "Sources" +msgstr "Kaynaklar" + +#. Translators: "Organize" refers to documents in this context +#: ../src/selections.js:614 ../src/selections.js:773 +msgid "Organize" +msgstr "Düzenle" + +#: ../src/selections.js:749 msgid "Print" msgstr "Yazdır" -#: ../src/selections.js:768 +#: ../src/selections.js:756 msgid "Delete" msgstr "Sil" -#: ../src/selections.js:784 -msgid "Organize" -msgstr "Düzenle" +#: ../src/selections.js:788 +msgid "Share" +msgstr "Paylaş" #. Translators: this is the Open action in a context menu -#: ../src/selections.js:873 +#: ../src/selections.js:874 #, c-format msgid "Open with %s" msgstr "%s ile Aç" -#. Translators: this is the Open action in a context menu -#: ../src/selections.js:876 ../src/resources/preview-menu.ui.h:1 -msgid "Open" -msgstr "Aç" +#: ../src/sharing.js:89 +msgid "Sharing Settings" +msgstr "Paylaşım Ayarları" + +#. Label for widget group for changing document permissions +#: ../src/sharing.js:126 +msgid "Document permissions" +msgstr "Belge izinleri" + +#. Label for permission change in Sharing dialog +#: ../src/sharing.js:133 ../src/sharing.js:311 +msgid "Change" +msgstr "Değiştir" + +#. Label for radiobutton that sets doc permission to private +#: ../src/sharing.js:157 ../src/sharing.js:286 +msgid "Private" +msgstr "Özel" + +#: ../src/sharing.js:167 ../src/sharing.js:279 +msgid "Public" +msgstr "Genel" + +#. Label for checkbutton that sets doc permission to Can edit +#: ../src/sharing.js:171 ../src/sharing.js:281 +msgid "Everyone can edit" +msgstr "Herkes düzenleyebilir" + +#. Label for widget group used for adding new contacts +#: ../src/sharing.js:178 +msgid "Add people" +msgstr "Kişi ekle" + +#. Editable text in entry field +#: ../src/sharing.js:185 +msgid "Enter an email address" +msgstr "E-posta adresi gir" + +#: ../src/sharing.js:200 ../src/sharing.js:367 +msgid "Can edit" +msgstr "Düzenlenebilir" + +#: ../src/sharing.js:200 ../src/sharing.js:370 +msgid "Can view" +msgstr "Görüntülenebilir" + +#: ../src/sharing.js:207 +msgid "Add" +msgstr "Ekle" + +#: ../src/sharing.js:283 +msgid "Everyone can read" +msgstr "Herkes okuyabilir" + +#: ../src/sharing.js:298 +msgid "Save" +msgstr "Kaydet" + +#: ../src/sharing.js:364 +msgid "Owner" +msgstr "Sahip" + +#: ../src/sharing.js:433 +#, c-format +msgid "You can ask %s for access" +msgstr "Erişim için %s'den izin isteyebilirsiniz" + +#: ../src/sharing.js:470 ../src/sharing.js:506 ../src/sharing.js:563 +#: ../src/sharing.js:580 ../src/sharing.js:599 +msgid "The document was not updated" +msgstr "Belge güncellenmedi" -#: ../src/shellSearchProvider.js:281 +#: ../src/shellSearchProvider.js:293 msgid "Untitled Document" msgstr "Adsız Belge" -#: ../src/sources.js:85 -msgid "Sources" -msgstr "Kaynaklar" - -#: ../src/view.js:79 -#, c-format -msgid "Load %d more document" -msgid_plural "Load %d more documents" -msgstr[0] "%d belge daha yükle" +#. Translators: "more" refers to documents in this context +#: ../src/view.js:62 ../src/view.js:93 +msgid "Load More" +msgstr "Daha Fazla" -#: ../src/view.js:283 +#: ../src/view.js:294 msgid "Yesterday" msgstr "Dün" -#: ../src/view.js:285 +#: ../src/view.js:296 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d gün önce" -#: ../src/view.js:289 +#: ../src/view.js:300 msgid "Last week" msgstr "Geçen hafta" -#: ../src/view.js:291 +#: ../src/view.js:302 #, c-format msgid "%d week ago" msgid_plural "%d weeks ago" msgstr[0] "%d hafta önce" -#: ../src/view.js:295 +#: ../src/view.js:306 msgid "Last month" msgstr "Geçen ay" -#: ../src/view.js:297 +#: ../src/view.js:308 #, c-format msgid "%d month ago" msgid_plural "%d months ago" msgstr[0] "%d ay önce" -#: ../src/view.js:301 +#: ../src/view.js:312 msgid "Last year" msgstr "Geçen sene" -#: ../src/view.js:303 +#: ../src/view.js:314 #, c-format msgid "%d year ago" msgid_plural "%d years ago" msgstr[0] "%d yıl önce" -#: ../src/resources/app-menu.ui.h:2 -msgid "Grid" -msgstr "Izgara" - -#: ../src/resources/app-menu.ui.h:3 -msgid "List" -msgstr "Liste" +#~ msgid "Unable to load \"%s\" for preview" +#~ msgstr "\"%s\" önizleme için yüklenemedi" -#: ../src/resources/app-menu.ui.h:4 -msgid "Fullscreen" -msgstr "Tam ekran" +#~ msgid "Cannot find \"unoconv\", please check your LibreOffice installation" +#~ msgstr "" +#~ "\"unoconv\" bulunamıyor, lütfen LibreOffice kurulumunuzu kontrol edin" -#: ../src/resources/app-menu.ui.h:5 -msgid "About Documents" -msgstr "Belgeler Hakkında" +#~ msgid "New and Recent" +#~ msgstr "Yeni ve Güncel" -#: ../src/resources/app-menu.ui.h:6 -msgid "Quit" -msgstr "Çıkış" +#~ msgid "filtered by title" +#~ msgstr "başlığa göre süzüldü" -#: ../src/resources/preview-menu.ui.h:2 -msgid "Print..." -msgstr "Yazdır..." +#~ msgid "filtered by author" +#~ msgstr "yazara göre süzüldü" -#: ../src/resources/preview-menu.ui.h:3 -msgid "Zoom In" -msgstr "Yakınlaştır" +#~ msgid "Load %d more document" +#~ msgid_plural "Load %d more documents" +#~ msgstr[0] "%d belge daha yükle" -#: ../src/resources/preview-menu.ui.h:4 -msgid "Zoom Out" -msgstr "Uzaklaştır" - -#: ../src/resources/preview-menu.ui.h:5 -msgid "Rotate Left" -msgstr "Sola Döndür" - -#: ../src/resources/preview-menu.ui.h:6 -msgid "Rotate Right" -msgstr "Sağa Döndür" - -#: ../src/resources/selection-menu.ui.h:1 -#, fuzzy -#| msgid "Select Items" -msgid "Select All" -msgstr "Ögeleri Seç" +#~ msgid "Print..." +#~ msgstr "Yazdır..." -#: ../src/resources/selection-menu.ui.h:2 -#, fuzzy -#| msgid "Select Items" -msgid "Select None" -msgstr "Ögeleri Seç" +#~ msgid "Rotate Right" +#~ msgstr "Sağa Döndür" #~ msgid "Remove from favorites" #~ msgstr "Sık Kullanılanlardan Çıkart" diff -Nru gnome-documents-3.8.0/po/uk.po gnome-documents-3.8.3.1/po/uk.po --- gnome-documents-3.8.0/po/uk.po 2012-10-01 13:36:54.000000000 +0000 +++ gnome-documents-3.8.3.1/po/uk.po 2013-04-03 11:08:32.000000000 +0000 @@ -4,13 +4,14 @@ # Korostil Daniel , 2011, 2012. # Alexandr Toorchyn , 2011 # Re. , 2012. +# Daniel Korostil , 2013. msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-26 08:23+0300\n" -"PO-Revision-Date: 2012-09-26 08:27+0300\n" -"Last-Translator: Re. \n" +"POT-Creation-Date: 2013-03-26 20:38+0200\n" +"PO-Revision-Date: 2013-03-26 20:52+0300\n" +"Last-Translator: Daniel Korostil \n" "Language-Team: linux.org.ua\n" "Language: uk\n" "MIME-Version: 1.0\n" @@ -21,8 +22,8 @@ "X-Generator: Virtaal 0.7.1\n" "X-Project-Style: gnome\n" -#: ../data/gnome-documents.desktop.in.in.h:1 ../src/mainWindow.js:51 -#: ../src/mainWindow.js:205 +#: ../data/gnome-documents.desktop.in.in.h:1 ../src/application.js:101 +#: ../src/mainWindow.js:53 ../src/mainWindow.js:274 msgid "Documents" msgstr "Документи" @@ -67,101 +68,160 @@ msgid "Window maximized state" msgstr "Стан розгорнутого вікна" -#: ../src/documents.js:640 ../src/sources.js:95 +#. Translators: this refers to local documents +#: ../src/documents.js:590 ../src/search.js:416 msgid "Local" msgstr "Локальне" +#. Translators: Documents ships a "Getting Started with Documents" +#. tutorial PDF. The "GNOME" string below is displayed as the author name +#. of that document, and doesn't normally need to be translated. +#: ../src/documents.js:611 +msgid "GNOME" +msgstr "GNOME" + +#: ../src/documents.js:612 +msgid "Getting Started with Documents" +msgstr "Вступ" + #. overridden -#: ../src/documents.js:693 +#: ../src/documents.js:659 msgid "Google Docs" msgstr "Google Docs" -#: ../src/documents.js:694 +#: ../src/documents.js:660 msgid "Google" msgstr "Google" -#: ../src/documents.js:758 ../src/documents.js:857 +#: ../src/documents.js:724 ../src/documents.js:823 msgid "Spreadsheet" msgstr "Електронна таблиця" -#: ../src/documents.js:760 ../src/documents.js:859 +#: ../src/documents.js:726 ../src/documents.js:825 ../src/presentation.js:48 msgid "Presentation" msgstr "Презентація" -#: ../src/documents.js:762 ../src/documents.js:861 +#: ../src/documents.js:728 ../src/documents.js:827 msgid "Collection" msgstr "Колекція" -#: ../src/documents.js:764 ../src/documents.js:863 +#: ../src/documents.js:730 ../src/documents.js:829 msgid "Document" msgstr "Документ" #. overridden -#: ../src/documents.js:791 ../src/documents.js:792 +#: ../src/documents.js:757 ../src/documents.js:758 msgid "Skydrive" msgstr "Skydrive" +#: ../src/documents.js:942 +msgid "Please check the network connection." +msgstr "Перевірте мережевий зв'язок." + +#: ../src/documents.js:945 +msgid "Please check the network proxy settings." +msgstr "Перевірте параметри мережевого проксі." + +#: ../src/documents.js:948 +msgid "Unable to sign in to the document service." +msgstr "Неможливо ввійти в службу документів." + +#: ../src/documents.js:951 +msgid "Unable to locate this document." +msgstr "Неможливо розмістити цей документ." + +#: ../src/documents.js:954 +#, c-format +msgid "Hmm, something is fishy (%d)." +msgstr "Гмм, в'ялою рибою запахло (%d)." + #. Translators: %s is the title of a document -#: ../src/documents.js:976 +#: ../src/documents.js:967 #, c-format -msgid "Unable to load \"%s\" for preview" -msgstr "Неможливо завантажити «%s» для перегляду" +msgid "Oops! Unable to load “%s”" +msgstr "Отакої! Неможливо завантажити «%s»" -#: ../src/embed.js:73 -msgid "Loading..." +#: ../src/edit.js:191 +msgid "View" +msgstr "Переглянути" + +#: ../src/embed.js:63 ../src/lib/gd-places-bookmarks.c:382 +#: ../src/lib/gd-places-links.c:257 ../src/view.js:70 +msgid "Loading…" msgstr "Завантаження…" -#: ../src/embed.js:223 +#: ../src/embed.js:145 msgid "No Documents Found" msgstr "Не знайдено жодного документа" #. Translators: %s here is "System Settings", which is in a separate string #. due to markup, and should be translated only in the context of this sentence -#: ../src/embed.js:246 +#: ../src/embed.js:166 #, c-format msgid "You can add your online accounts in %s" msgstr "Можете додати ваші мережеві облікові записи у %s" #. Translators: this should be translated in the context of the #. "You can add your online accounts in System Settings" sentence above -#: ../src/embed.js:250 +#: ../src/embed.js:170 msgid "System Settings" msgstr "Системні параметри" -#: ../src/lib/gd-pdf-loader.c:224 +#: ../src/lib/gd-nav-bar.c:235 +#, c-format +msgid "Page %u of %u" +msgstr "Сторінка %u з %u" + +#: ../src/lib/gd-pdf-loader.c:226 msgid "Unable to load the document" msgstr "Не вдалось завантажити документ" -#: ../src/lib/gd-pdf-loader.c:673 -msgid "Cannot find \"unoconv\", please check your LibreOffice installation" -msgstr "Неможливо знайти «unoconv», перевірте, чи встановлено LibreOffice" +#: ../src/lib/gd-pdf-loader.c:676 +msgid "LibreOffice is required to view this document" +msgstr "Потрібно LibreOffice, щоб переглянути цей документ" + +#. Translators: %s is the number of the page, already formatted +#. * as a string, for example "Page 5". +#. +#: ../src/lib/gd-places-bookmarks.c:312 +#, c-format +msgid "Page %s" +msgstr "Сторінка %s" + +#: ../src/lib/gd-places-bookmarks.c:375 +msgid "No bookmarks" +msgstr "Немає закладок" + +#: ../src/lib/gd-places-bookmarks.c:647 +msgid "Bookmarks" +msgstr "Закладки" + +#: ../src/lib/gd-places-links.c:342 +msgid "No table of contents" +msgstr "Немає змісту" + +#: ../src/lib/gd-places-links.c:518 +msgid "Contents" +msgstr "Зміст" -#: ../src/mainToolbar.js:73 +#: ../src/mainToolbar.js:62 msgid "Search" msgstr "Пошук" -#: ../src/mainToolbar.js:158 -msgid "New and Recent" -msgstr "Нове і нещодавнє" +#: ../src/mainToolbar.js:73 +msgid "Back" +msgstr "Назад" -#: ../src/mainToolbar.js:165 +#: ../src/mainToolbar.js:153 #, c-format -msgid "Results for \"%s\"" +msgid "Results for “%s”" msgstr "Результати на «%s»" -#: ../src/mainToolbar.js:167 -msgid "filtered by title" -msgstr "відсіяно за назвою" - -#: ../src/mainToolbar.js:169 -msgid "filtered by author" -msgstr "відсіяно за автором" - -#: ../src/mainToolbar.js:176 +#: ../src/mainToolbar.js:161 msgid "Click on items to select them" msgstr "Натисніть на об'єкти, щоб вибрати їх" -#: ../src/mainToolbar.js:178 +#: ../src/mainToolbar.js:163 #, c-format msgid "%d selected" msgid_plural "%d selected" @@ -169,50 +229,70 @@ msgstr[1] "%d вибрано" msgstr[2] "%d вибрано" -#: ../src/mainToolbar.js:208 ../src/properties.js:58 +#. Label for Done button in Sharing dialog +#: ../src/mainToolbar.js:192 ../src/properties.js:59 ../src/sharing.js:93 msgid "Done" msgstr "Завершено" -#: ../src/mainToolbar.js:226 -msgid "Back" -msgstr "Назад" - -#: ../src/mainToolbar.js:248 +#: ../src/mainToolbar.js:233 msgid "Select Items" msgstr "Вибрати об'єкти" -#: ../src/mainWindow.js:204 +#: ../src/mainWindow.js:273 msgid "translator-credits" msgstr "Daniel Korostil " -#: ../src/mainWindow.js:206 +#: ../src/mainWindow.js:275 msgid "A document manager application" msgstr "Організатор документів " -#: ../src/notifications.js:86 +#: ../src/notifications.js:87 #, c-format -msgid "Printing \"%s\": %s" +msgid "Printing “%s”: %s" msgstr "Друкування «%s»: %s" -#: ../src/notifications.js:151 +#: ../src/notifications.js:143 msgid "Your documents are being indexed" msgstr "Ваші документи індексуються" -#: ../src/notifications.js:155 +#: ../src/notifications.js:144 msgid "Some documents might not be available during this process" msgstr "Деякі документи можуть бути недоступними протягом цього процесу" -#. Properties dialog heading -#: ../src/properties.js:73 ../src/selections.js:792 +#: ../src/notifications.js:164 +#, c-format +msgid "Fetching documents from %s" +msgstr "Одержання документів з %s" + +#: ../src/notifications.js:166 +msgid "Fetching documents from online accounts" +msgstr "Одержання документів з мережевих облікових записів" + +#: ../src/presentation.js:105 +msgid "Running in presentation mode" +msgstr "Запущено презентаційний режим" + +#: ../src/presentation.js:158 +msgid "Present On" +msgstr "Презентувати" + +#: ../src/properties.js:57 ../src/resources/preview-menu.ui.h:9 +#: ../src/selections.js:779 msgid "Properties" msgstr "Властивості" #. Title item -#: ../src/properties.js:81 ../src/searchbar.js:225 +#. Translators: "Title" is the label next to the document title +#. in the properties dialog +#. Translators: "Title" refers to "Match Title" when searching +#: ../src/properties.js:79 ../src/search.js:257 msgid "Title" msgstr "Заголовок" -#: ../src/properties.js:88 ../src/searchbar.js:227 +#. Translators: "Author" is the label next to the document author +#. in the properties dialog +#. Translators: "Author" refers to "Match Author" when searching +#: ../src/properties.js:88 ../src/search.js:260 msgid "Author" msgstr "Автор" @@ -231,97 +311,237 @@ msgstr "Дата створення" #. Document type item -#: ../src/properties.js:115 ../src/searchbar.js:135 +#. Translators: "Type" is the label next to the document type +#. (PDF, spreadsheet, ...) in the properties dialog +#. Translators: "Type" refers to a search filter on the document type +#. (PDF, spreadsheet, ...) +#: ../src/properties.js:117 ../src/search.js:166 msgid "Type" msgstr "Тип" -#: ../src/searchbar.js:83 +#: ../src/resources/app-menu.ui.h:2 +msgid "Grid" +msgstr "Сітка" + +#: ../src/resources/app-menu.ui.h:3 +msgid "List" +msgstr "Список" + +#: ../src/resources/app-menu.ui.h:4 +msgid "Fullscreen" +msgstr "На весь екран" + +#: ../src/resources/app-menu.ui.h:5 +msgid "About Documents" +msgstr "Про програму" + +#: ../src/resources/app-menu.ui.h:6 +msgid "Help" +msgstr "Довідка" + +#: ../src/resources/app-menu.ui.h:7 +msgid "Quit" +msgstr "Вийти" + +#. Translators: this is the Open action in a context menu +#: ../src/resources/preview-menu.ui.h:1 ../src/selections.js:875 +msgid "Open" +msgstr "Відкрити" + +#: ../src/resources/preview-menu.ui.h:2 +msgid "Edit" +msgstr "Редагувати" + +#: ../src/resources/preview-menu.ui.h:3 +msgid "Print…" +msgstr "Надрукувати…" + +#: ../src/resources/preview-menu.ui.h:4 +msgid "Present" +msgstr "Презентувати" + +#: ../src/resources/preview-menu.ui.h:5 +msgid "Zoom In" +msgstr "Зблизити" + +#: ../src/resources/preview-menu.ui.h:6 +msgid "Zoom Out" +msgstr "Віддалити" + +#: ../src/resources/preview-menu.ui.h:7 +msgid "Rotate ↶" +msgstr "Обернути ↶" + +#: ../src/resources/preview-menu.ui.h:8 +msgid "Rotate ↷" +msgstr "Обернути ↷" + +#: ../src/resources/selection-menu.ui.h:1 +msgid "Select All" +msgstr "Вибрати все" + +#: ../src/resources/selection-menu.ui.h:2 +msgid "Select None" +msgstr "Нічого не вибирати" + +#: ../src/search.js:112 msgid "Category" msgstr "Категорія" -#: ../src/searchbar.js:88 ../src/searchbar.js:138 ../src/searchbar.js:223 -#: ../src/sources.js:89 +#. Translators: this refers to new and recent documents +#. Translators: this refers to documents +#: ../src/search.js:117 ../src/search.js:169 ../src/search.js:254 +#: ../src/search.js:410 msgid "All" msgstr "Все" -#: ../src/searchbar.js:94 +#. Translators: this refers to favorite documents +#: ../src/search.js:123 msgid "Favorites" msgstr "Улюблене" -#: ../src/searchbar.js:99 +#. Translators: this refers to shared documents +#: ../src/search.js:128 msgid "Shared with you" msgstr "Спільне з вами" -#: ../src/searchbar.js:140 +#: ../src/search.js:171 msgid "Collections" msgstr "Колекції" -#: ../src/searchbar.js:144 +#: ../src/search.js:175 msgid "PDF Documents" msgstr "Документи PDF" -#: ../src/searchbar.js:148 +#: ../src/search.js:179 msgid "Presentations" msgstr "Презентації" -#: ../src/searchbar.js:151 +#: ../src/search.js:182 msgid "Spreadsheets" msgstr "Електронні таблиці" -#: ../src/searchbar.js:154 +#: ../src/search.js:185 msgid "Text Documents" msgstr "Текстові документи" #. Translators: this is a verb that refers to "All", "Title" and "Author", #. as in "Match All", "Match Title" and "Match Author" -#: ../src/searchbar.js:220 +#: ../src/search.js:251 msgid "Match" msgstr "Збіги" -#: ../src/selections.js:761 +#: ../src/search.js:406 +msgid "Sources" +msgstr "Джерела" + +#: ../src/selections.js:613 ../src/selections.js:771 +msgid "Organize" +msgstr "Організація" + +#: ../src/selections.js:748 msgid "Print" msgstr "Надрукувати" -#: ../src/selections.js:768 +#: ../src/selections.js:755 msgid "Delete" msgstr "Вилучити" -#: ../src/selections.js:784 -msgid "Organize" -msgstr "Організація" +#: ../src/selections.js:786 +msgid "Share" +msgstr "Оприлюднити" #. Translators: this is the Open action in a context menu -#: ../src/selections.js:873 +#: ../src/selections.js:872 #, c-format msgid "Open with %s" msgstr "Відкрити через %s" -#. Translators: this is the Open action in a context menu -#: ../src/selections.js:876 ../src/resources/preview-menu.ui.h:1 -msgid "Open" -msgstr "Відкрити" +#: ../src/sharing.js:89 +msgid "Sharing Settings" +msgstr "Параметри оприлюднення" + +#. Label for widget group for changing document permissions +#: ../src/sharing.js:126 +msgid "Document permissions" +msgstr "Права на документ" + +#. Label for permission change in Sharing dialog +#: ../src/sharing.js:133 ../src/sharing.js:311 +msgid "Change" +msgstr "Змінити" + +#. Label for radiobutton that sets doc permission to private +#: ../src/sharing.js:157 ../src/sharing.js:286 +msgid "Private" +msgstr "Особисте" + +#: ../src/sharing.js:167 ../src/sharing.js:279 +msgid "Public" +msgstr "Загальне" + +#. Label for checkbutton that sets doc permission to Can edit +#: ../src/sharing.js:171 ../src/sharing.js:281 +msgid "Everyone can edit" +msgstr "Усі можуть редагувати" + +#. Label for widget group used for adding new contacts +#: ../src/sharing.js:178 +msgid "Add people" +msgstr "Додати особу" + +#. Editable text in entry field +#: ../src/sharing.js:185 +msgid "Enter an email address" +msgstr "Введіть електронну пошту" + +#: ../src/sharing.js:200 ../src/sharing.js:367 +msgid "Can edit" +msgstr "Може редагувати" + +#: ../src/sharing.js:200 ../src/sharing.js:370 +msgid "Can view" +msgstr "Може переглядати" + +#: ../src/sharing.js:207 +msgid "Add" +msgstr "Додати" + +#: ../src/sharing.js:283 +msgid "Everyone can read" +msgstr "Усі можуть читати" + +#: ../src/sharing.js:298 +msgid "Save" +msgstr "Зберегти" + +#: ../src/sharing.js:364 +msgid "Owner" +msgstr "Власник" + +#: ../src/sharing.js:433 +#, c-format +msgid "You can ask %s for access" +msgstr "Можете попрохати %s про доступ" + +#: ../src/sharing.js:470 ../src/sharing.js:506 ../src/sharing.js:563 +#: ../src/sharing.js:580 ../src/sharing.js:599 +msgid "The document was not updated" +msgstr "Документ не оновлено" -#: ../src/shellSearchProvider.js:281 +#: ../src/shellSearchProvider.js:293 msgid "Untitled Document" msgstr "Неназваний документ" -#: ../src/sources.js:85 -msgid "Sources" -msgstr "Джерела" - -#: ../src/view.js:79 -#, c-format -msgid "Load %d more document" -msgid_plural "Load %d more documents" -msgstr[0] "Завантажити ще %d документ" -msgstr[1] "Завантажити ще %d документа" -msgstr[2] "Завантажити ще %d документів" +#: ../src/view.js:61 ../src/view.js:91 +msgid "Load More" +msgstr "Завантажити ще" -#: ../src/view.js:283 +#: ../src/view.js:292 msgid "Yesterday" msgstr "Учора" -#: ../src/view.js:285 +#: ../src/view.js:294 #, c-format msgid "%d day ago" msgid_plural "%d days ago" @@ -329,11 +549,11 @@ msgstr[1] "%d дні тому" msgstr[2] "%d днів тому" -#: ../src/view.js:289 +#: ../src/view.js:298 msgid "Last week" msgstr "Минулого тижня" -#: ../src/view.js:291 +#: ../src/view.js:300 #, c-format msgid "%d week ago" msgid_plural "%d weeks ago" @@ -341,11 +561,11 @@ msgstr[1] "%d тижні тому" msgstr[2] "%d тижнів тому" -#: ../src/view.js:295 +#: ../src/view.js:304 msgid "Last month" msgstr "Минулого місяця" -#: ../src/view.js:297 +#: ../src/view.js:306 #, c-format msgid "%d month ago" msgid_plural "%d months ago" @@ -353,11 +573,11 @@ msgstr[1] "%d місяці тому" msgstr[2] "%d місяців тому" -#: ../src/view.js:301 +#: ../src/view.js:310 msgid "Last year" msgstr "Минулого року" -#: ../src/view.js:303 +#: ../src/view.js:312 #, c-format msgid "%d year ago" msgid_plural "%d years ago" @@ -365,57 +585,32 @@ msgstr[1] "%d роки тому" msgstr[2] "%d років тому" -#: ../src/resources/app-menu.ui.h:2 -msgid "Grid" -msgstr "Сітка" - -#: ../src/resources/app-menu.ui.h:3 -msgid "List" -msgstr "Список" - -#: ../src/resources/app-menu.ui.h:4 -msgid "Fullscreen" -msgstr "На весь екран" +#~ msgid "Unable to load \"%s\" for preview" +#~ msgstr "Неможливо завантажити «%s» для перегляду" -#: ../src/resources/app-menu.ui.h:5 -msgid "About Documents" -msgstr "Про програму" +#~ msgid "Cannot find \"unoconv\", please check your LibreOffice installation" +#~ msgstr "Неможливо знайти «unoconv», перевірте, чи встановлено LibreOffice" -#: ../src/resources/app-menu.ui.h:6 -msgid "Help" -msgstr "Довідка" +#~ msgid "New and Recent" +#~ msgstr "Нове і нещодавнє" -#: ../src/resources/app-menu.ui.h:7 -msgid "Quit" -msgstr "Вийти" +#~ msgid "filtered by title" +#~ msgstr "відсіяно за назвою" -#: ../src/resources/preview-menu.ui.h:2 -msgid "Print..." -msgstr "Надрукувати…" +#~ msgid "filtered by author" +#~ msgstr "відсіяно за автором" -#: ../src/resources/preview-menu.ui.h:3 -msgid "Zoom In" -msgstr "Зблизити" - -#: ../src/resources/preview-menu.ui.h:4 -msgid "Zoom Out" -msgstr "Віддалити" - -#: ../src/resources/preview-menu.ui.h:5 -msgid "Rotate Left" -msgstr "Обернути ліворуч" +#~ msgid "Load %d more document" +#~ msgid_plural "Load %d more documents" +#~ msgstr[0] "Завантажити ще %d документ" +#~ msgstr[1] "Завантажити ще %d документа" +#~ msgstr[2] "Завантажити ще %d документів" -#: ../src/resources/preview-menu.ui.h:6 -msgid "Rotate Right" -msgstr "Обернути праворуч" +#~ msgid "Print..." +#~ msgstr "Надрукувати…" -#: ../src/resources/selection-menu.ui.h:1 -msgid "Select All" -msgstr "Вибрати все" - -#: ../src/resources/selection-menu.ui.h:2 -msgid "Select None" -msgstr "Нічого не вибирати" +#~ msgid "Rotate Right" +#~ msgstr "Обернути праворуч" #~ msgid "The active source filter" #~ msgstr "Увімкнутий фільтр джерел" diff -Nru gnome-documents-3.8.0/src/Makefile.in gnome-documents-3.8.3.1/src/Makefile.in --- gnome-documents-3.8.0/src/Makefile.in 2013-03-25 15:35:52.000000000 +0000 +++ gnome-documents-3.8.3.1/src/Makefile.in 2013-06-14 15:43:51.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.1 from Makefile.am. +# Makefile.in generated by automake 1.13.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -18,23 +18,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -359,6 +387,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ +XSLTPROC = @XSLTPROC@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -709,8 +738,10 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libgdminer-1.0.la: $(libgdminer_1_0_la_OBJECTS) $(libgdminer_1_0_la_DEPENDENCIES) $(EXTRA_libgdminer_1_0_la_DEPENDENCIES) $(AM_V_CCLD)$(libgdminer_1_0_la_LINK) -rpath $(pkglibdir) $(libgdminer_1_0_la_OBJECTS) $(libgdminer_1_0_la_LIBADD) $(LIBS) + libgdprivate-1.0.la: $(libgdprivate_1_0_la_OBJECTS) $(libgdprivate_1_0_la_DEPENDENCIES) $(EXTRA_libgdprivate_1_0_la_DEPENDENCIES) $(AM_V_CCLD)$(libgdprivate_1_0_la_LINK) -rpath $(pkglibdir) $(libgdprivate_1_0_la_OBJECTS) $(libgdprivate_1_0_la_LIBADD) $(LIBS) install-libexecPROGRAMS: $(libexec_PROGRAMS) @@ -762,9 +793,11 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + gd-tracker-gdata-miner$(EXEEXT): $(gd_tracker_gdata_miner_OBJECTS) $(gd_tracker_gdata_miner_DEPENDENCIES) $(EXTRA_gd_tracker_gdata_miner_DEPENDENCIES) @rm -f gd-tracker-gdata-miner$(EXEEXT) $(AM_V_CCLD)$(gd_tracker_gdata_miner_LINK) $(gd_tracker_gdata_miner_OBJECTS) $(gd_tracker_gdata_miner_LDADD) $(LIBS) + gd-tracker-zpj-miner$(EXEEXT): $(gd_tracker_zpj_miner_OBJECTS) $(gd_tracker_zpj_miner_DEPENDENCIES) $(EXTRA_gd_tracker_zpj_miner_DEPENDENCIES) @rm -f gd-tracker-zpj-miner$(EXEEXT) $(AM_V_CCLD)$(gd_tracker_zpj_miner_LINK) $(gd_tracker_zpj_miner_OBJECTS) $(gd_tracker_zpj_miner_LDADD) $(LIBS) diff -Nru gnome-documents-3.8.0/src/application.js gnome-documents-3.8.3.1/src/application.js --- gnome-documents-3.8.0/src/application.js 2013-03-04 21:07:28.000000000 +0000 +++ gnome-documents-3.8.3.1/src/application.js 2013-06-14 15:36:05.000000000 +0000 @@ -94,6 +94,7 @@ _init: function() { this.minersRunning = []; + this._activationTimestamp = Gdk.CURRENT_TIME; Gettext.bindtextdomain('gnome-documents', Path.LOCALE_DIR); Gettext.textdomain('gnome-documents'); @@ -284,7 +285,9 @@ this.emitJS('miners-changed', this.minersRunning); if (error) { - log('Error updating the cache: ' + error.toString()); + if (!error.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED)) + log('Error updating the cache: ' + error.toString()); + return; } @@ -379,9 +382,9 @@ changeMonitor = new ChangeMonitor.TrackerChangeMonitor(); documentManager = new Documents.DocumentManager(); + modeController = new WindowMode.ModeController(); trackerController = new TrackerController.TrackerController(); selectionController = new Selections.SelectionController(); - modeController = new WindowMode.ModeController(); this._actionEntries = [ { name: 'quit', @@ -481,16 +484,19 @@ }, vfunc_activate: function() { - if (this._mainWindow) - this._mainWindow.window.present(); + if (this._mainWindow) { + this._mainWindow.window.present_with_time(this._activationTimestamp); + this._activationTimestamp = Gdk.CURRENT_TIME; + } }, vfunc_command_line: function(cmdline) { let args = cmdline.get_arguments(); - if (args.indexOf('--no-default-window') == -1) + if (args.indexOf('--no-default-window') == -1) { this._createWindow(); + modeController.setWindowMode(WindowMode.WindowMode.OVERVIEW); + } - modeController.setWindowMode(WindowMode.WindowMode.OVERVIEW); this.activate(); return 0; }, @@ -521,35 +527,51 @@ Mainloop.idle_add(Lang.bind(this, this._clearState)); }, - _onActivateResult: function(provider, urn, terms) { + _onActivateResult: function(provider, urn, terms, timestamp) { this._createWindow(); modeController.setWindowMode(WindowMode.WindowMode.PREVIEW); - this.activate(); - - searchController.setString(terms.join(' ')); let doc = documentManager.getItemById(urn); if (doc) { - documentManager.setActiveItem(doc); + doActivate.apply(this, [doc]); } else { let job = new TrackerUtils.SingleItemJob(urn, queryBuilder); job.run(Query.QueryFlags.UNFILTERED, Lang.bind(this, function(cursor) { - if (!cursor) + if (cursor) + doc = documentManager.addDocumentFromCursor(cursor); + + doActivate.apply(this, [doc]); + })); + } + + function doActivate(doc) { + documentManager.setActiveItem(doc); + + this._activationTimestamp = timestamp; + this.activate(); + + // forward the search terms next time we enter the overview + let modeChangeId = modeController.connect('window-mode-changed', Lang.bind(this, + function(object, newMode) { + if (newMode != WindowMode.WindowMode.OVERVIEW) return; - let doc = documentManager.addDocumentFromCursor(cursor); - documentManager.setActiveItem(doc); + modeController.disconnect(modeChangeId); + + searchController.setString(terms.join(' ')); + this.change_action_state('search', GLib.Variant.new('b', true)); })); } }, - _onLaunchSearch: function(provider, terms) { + _onLaunchSearch: function(provider, terms, timestamp) { this._createWindow(); modeController.setWindowMode(WindowMode.WindowMode.OVERVIEW); searchController.setString(terms.join(' ')); this.change_action_state('search', GLib.Variant.new('b', true)); + this._activationTimestamp = timestamp; this.activate(); } }); diff -Nru gnome-documents-3.8.0/src/documents.js gnome-documents-3.8.3.1/src/documents.js --- gnome-documents-3.8.0/src/documents.js 2013-03-20 19:35:46.000000000 +0000 +++ gnome-documents-3.8.3.1/src/documents.js 2013-06-14 15:37:32.000000000 +0000 @@ -357,6 +357,10 @@ } }, + createThumbnail: function(callback) { + log('Error: DocCommon implementations must override createThumbnail'); + }, + refreshIcon: function() { if (this._thumbPath) { this._refreshThumbPath(); @@ -373,9 +377,6 @@ if (this._failedThumbnailing) return; - if (!this._triedThumbnailing) - this._triedThumbnailing = true; - this._file = Gio.file_new_for_uri(this.uri); this._file.query_info_async(Gio.FILE_ATTRIBUTE_THUMBNAIL_PATH, 0, 0, null, @@ -399,16 +400,11 @@ this._refreshThumbPath(); } else { this.thumbnailed = false; - - // try to create the thumbnail - GdPrivate.queue_thumbnail_job_for_file_async(this._file, - Lang.bind(this, this._onQueueThumbnailJob)); + this.createThumbnail(Lang.bind(this, this._onCreateThumbnail)); } }, - _onQueueThumbnailJob: function(object, res) { - let thumbnailed = GdPrivate.queue_thumbnail_job_for_file_finish(res); - + _onCreateThumbnail: function(thumbnailed) { if (!thumbnailed) { this._failedThumbnailing = true; return; @@ -583,7 +579,6 @@ _init: function(cursor) { this._failedThumbnailing = false; - this._triedThumbnailing = false; this.parent(cursor); @@ -613,6 +608,14 @@ } }, + createThumbnail: function(callback) { + GdPrivate.queue_thumbnail_job_for_file_async(this._file, Lang.bind(this, + function(object, res) { + let thumbnailed = GdPrivate.queue_thumbnail_job_for_file_finish(res); + callback(thumbnailed); + })); + }, + updateTypeDescription: function() { if (this.mimeType) this.typeDescription = Gio.content_type_get_description(this.mimeType); @@ -650,8 +653,7 @@ Extends: DocCommon, _init: function(cursor) { - this._triedThumbnailing = true; - this._failedThumbnailing = true; + this._failedThumbnailing = false; this.parent(cursor); @@ -717,6 +719,60 @@ })); }, + createThumbnail: function(callback) { + this._createGDataEntry(null, Lang.bind(this, + function(entry, service, exception) { + if (exception) { + callback(false); + return; + } + + let uri = entry.get_thumbnail_uri(); + if (!uri) { + callback(false); + return; + } + + let authorizationDomain = service.get_primary_authorization_domain(); + let inputStream = new GData.DownloadStream({ service: service, + authorization_domain: authorizationDomain, + download_uri: uri }); + + let checksum = new GLib.Checksum(GLib.ChecksumType.MD5); + checksum.update(this.uri, -1); + let basename = checksum.get_string() + '.png'; + let path = GLib.build_filenamev([GLib.get_user_cache_dir(), "thumbnails", "normal", basename]); + + let downloadFile = Gio.File.new_for_path(path); + downloadFile.replace_async + (null, false, Gio.FileCreateFlags.PRIVATE, GLib.PRIORITY_DEFAULT, null, Lang.bind(this, + function(source, res) { + let outputStream; + + try { + outputStream = downloadFile.replace_finish(res); + } catch (e) { + callback(false); + return; + } + + outputStream.splice_async(inputStream, + Gio.OutputStreamSpliceFlags.CLOSE_SOURCE | Gio.OutputStreamSpliceFlags.CLOSE_TARGET, + GLib.PRIORITY_DEFAULT, null, Lang.bind(this, + function(source, res) { + try { + outputStream.splice_finish(res); + } catch (e) { + callback(false); + return; + } + + callback(true); + })); + })); + })); + }, + updateTypeDescription: function() { let description; @@ -748,7 +804,6 @@ Extends: DocCommon, _init: function(cursor) { - this._triedThumbnailing = true; this._failedThumbnailing = true; this.parent(cursor); diff -Nru gnome-documents-3.8.0/src/embed.js gnome-documents-3.8.3.1/src/embed.js --- gnome-documents-3.8.0/src/embed.js 2013-03-04 20:05:20.000000000 +0000 +++ gnome-documents-3.8.3.1/src/embed.js 2013-06-14 15:36:05.000000000 +0000 @@ -303,6 +303,10 @@ }, _onItemCountChanged: function() { + let windowMode = Application.modeController.getWindowMode(); + if (windowMode != WindowMode.WindowMode.OVERVIEW) + return; + let itemCount = Application.offsetController.getItemCount(); if (itemCount == 0) { diff -Nru gnome-documents-3.8.0/src/lib/gd-nav-bar.c gnome-documents-3.8.3.1/src/lib/gd-nav-bar.c --- gnome-documents-3.8.0/src/lib/gd-nav-bar.c 2013-03-04 20:05:20.000000000 +0000 +++ gnome-documents-3.8.3.1/src/lib/gd-nav-bar.c 2013-04-03 11:08:32.000000000 +0000 @@ -279,6 +279,18 @@ } static void +preview_item_clear_thumbnail_job (GdNavBar *self, + PreviewItem *item) +{ + if (item->job != NULL) { + g_signal_handlers_disconnect_by_func (item->job, thumbnail_job_completed_cb, self); + ev_job_cancel (item->job); + } + + g_clear_object (&item->job); +} + +static void previews_clear_range (GdNavBar *self, int start_page, int end_page) @@ -290,10 +302,8 @@ for (i = start_page; i < end_page; i++) { PreviewItem *item = &self->priv->previews[i]; - if (item != NULL && item->job != NULL) { - g_signal_handlers_disconnect_by_func (item->job, thumbnail_job_completed_cb, self); - ev_job_cancel (item->job); - g_clear_object (&item->job); + if (item != NULL) { + preview_item_clear_thumbnail_job (self, item); } } } @@ -395,15 +405,6 @@ } static void -preview_item_clear (PreviewItem *item) -{ - g_clear_object (&item->job); - g_clear_object (&item->pixbuf); - g_free (item->label); - item->label = NULL; -} - -static void previews_clear (GdNavBar *self) { int i; @@ -415,7 +416,11 @@ for (i = 0; i < self->priv->n_pages; i++) { PreviewItem *item = &self->priv->previews[i]; - preview_item_clear (item); + preview_item_clear_thumbnail_job (self, item); + + g_clear_object (&item->pixbuf); + g_free (item->label); + item->label = NULL; } g_free (self->priv->previews); diff -Nru gnome-documents-3.8.0/src/lib/gd-pdf-loader.c gnome-documents-3.8.3.1/src/lib/gd-pdf-loader.c --- gnome-documents-3.8.0/src/lib/gd-pdf-loader.c 2013-02-18 22:48:09.000000000 +0000 +++ gnome-documents-3.8.3.1/src/lib/gd-pdf-loader.c 2013-06-14 15:36:05.000000000 +0000 @@ -34,6 +34,7 @@ typedef struct { GSimpleAsyncResult *result; GCancellable *cancellable; + gulong cancelled_id; EvDocument *document; gchar *uri; @@ -118,6 +119,11 @@ static void pdf_load_job_free (PdfLoadJob *job) { + if (job->cancellable != NULL) { + g_cancellable_disconnect (job->cancellable, job->cancelled_id); + job->cancelled_id = 0; + } + g_clear_object (&job->document); g_clear_object (&job->result); g_clear_object (&job->cancellable); @@ -627,12 +633,28 @@ } static void +unoconv_cancelled_cb (GCancellable *cancellable, + gpointer user_data) +{ + PdfLoadJob *job = user_data; + + /* job->unoconv_pid will be reset by unoconv_child_watch_cb */ + if (job->unoconv_pid != -1) + kill (job->unoconv_pid, SIGKILL); +} + +static void unoconv_child_watch_cb (GPid pid, gint status, gpointer user_data) { PdfLoadJob *job = user_data; + if (job->cancellable != NULL) { + g_cancellable_disconnect (job->cancellable, job->cancelled_id); + job->cancelled_id = 0; + } + g_spawn_close_pid (pid); job->unoconv_pid = -1; @@ -774,6 +796,9 @@ /* now watch when the unoconv child process dies */ g_child_watch_add (pid, unoconv_child_watch_cb, job); job->unoconv_pid = pid; + + if (job->cancellable != NULL) + job->cancelled_id = g_cancellable_connect (job->cancellable, G_CALLBACK (unoconv_cancelled_cb), job, NULL); } static void diff -Nru gnome-documents-3.8.0/src/lib/gd-places-bookmarks.c gnome-documents-3.8.3.1/src/lib/gd-places-bookmarks.c --- gnome-documents-3.8.0/src/lib/gd-places-bookmarks.c 2013-03-20 19:24:02.000000000 +0000 +++ gnome-documents-3.8.3.1/src/lib/gd-places-bookmarks.c 2013-06-07 14:26:02.000000000 +0000 @@ -376,7 +376,8 @@ COLUMN_PAGE_LABEL, NULL, COLUMN_BOOKMARK, NULL, -1); - } else if (ev_document_links_has_document_links (EV_DOCUMENT_LINKS (document))) { + } else if (EV_IS_DOCUMENT_LINKS (document) && + ev_document_links_has_document_links (EV_DOCUMENT_LINKS (document))) { gtk_list_store_append (model, &iter); gtk_list_store_set (model, &iter, COLUMN_MARKUP, _("Loading…"), diff -Nru gnome-documents-3.8.0/src/mainToolbar.js gnome-documents-3.8.3.1/src/mainToolbar.js --- gnome-documents-3.8.0/src/mainToolbar.js 2013-02-22 18:14:54.000000000 +0000 +++ gnome-documents-3.8.3.1/src/mainToolbar.js 2013-06-14 15:36:05.000000000 +0000 @@ -39,6 +39,7 @@ _init: function() { this._model = null; + this._handleEvent = true; this.widget = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL }); this.widget.show(); @@ -50,9 +51,23 @@ this._searchbar = this.createSearchbar(); if (this._searchbar) this.widget.add(this._searchbar.widget); + + Application.documentManager.connect('load-started', Lang.bind(this, + function() { + this._handleEvent = true; + })); + + Application.documentManager.connect('load-error', Lang.bind(this, this._onLoadErrorOrPassword)); + }, + + _onLoadErrorOrPassword: function() { + this._handleEvent = false; }, handleEvent: function(event) { + if (!this._handleEvent) + return false; + let res = this._searchbar.handleEvent(event); return res; }, diff -Nru gnome-documents-3.8.0/src/miner/gd-gdata-miner.c gnome-documents-3.8.3.1/src/miner/gd-gdata-miner.c --- gnome-documents-3.8.0/src/miner/gd-gdata-miner.c 2013-02-17 01:03:05.000000000 +0000 +++ gnome-documents-3.8.3.1/src/miner/gd-gdata-miner.c 2013-04-03 11:08:32.000000000 +0000 @@ -39,6 +39,7 @@ gchar *resource = NULL; gchar *date, *resource_url, *identifier; const gchar *class = NULL; + const gchar *mimetype_override = NULL; gboolean mtime_changed, resource_exists; gint64 new_mtime; @@ -131,6 +132,21 @@ if (*error != NULL) goto out; + /* fake a drawing mimetype, so Documents can get the correct icon */ + if (GDATA_IS_DOCUMENTS_DRAWING (doc_entry)) + mimetype_override = "application/vnd.sun.xml.draw"; + else if (GDATA_IS_DOCUMENTS_PDF (doc_entry)) + mimetype_override = "application/pdf"; + + gd_miner_tracker_sparql_connection_insert_or_replace_triple + (job->connection, + job->cancellable, error, + identifier, resource, + "nie:mimeType", mimetype_override); + + if (*error != NULL) + goto out; + parents = gdata_entry_look_up_links (entry, PARENT_LINK_REL); for (l = parents; l != NULL; l = l->next) { @@ -353,6 +369,7 @@ miner_class->goa_provider_type = "google"; miner_class->miner_identifier = MINER_IDENTIFIER; + miner_class->version = 2; miner_class->create_service = create_service; miner_class->query = query_gdata; diff -Nru gnome-documents-3.8.0/src/miner/gd-miner-tracker.c gnome-documents-3.8.3.1/src/miner/gd-miner-tracker.c --- gnome-documents-3.8.0/src/miner/gd-miner-tracker.c 2012-10-15 20:34:00.000000000 +0000 +++ gnome-documents-3.8.3.1/src/miner/gd-miner-tracker.c 2013-06-14 15:36:05.000000000 +0000 @@ -192,16 +192,23 @@ const gchar *property_value) { GString *insert; - gchar *graph_str; + gchar *graph_str, *quoted; gboolean retval = TRUE; graph_str = _tracker_utils_format_into_graph (graph); + /* the "null" value must not be quoted */ + if (property_value == NULL) + quoted = g_strdup ("null"); + else + quoted = g_strdup_printf ("\"%s\"", property_value); + insert = g_string_new (NULL); g_string_append_printf (insert, - "INSERT OR REPLACE %s { <%s> a nie:InformationElement ; %s \"%s\" }", - graph_str, resource, property_name, property_value); + "INSERT OR REPLACE %s { <%s> a nie:InformationElement ; %s %s }", + graph_str, resource, property_name, quoted); + g_free (quoted); g_debug ("Insert or replace triple: query %s", insert->str); diff -Nru gnome-documents-3.8.0/src/miner/gd-miner.c gnome-documents-3.8.3.1/src/miner/gd-miner.c --- gnome-documents-3.8.0/src/miner/gd-miner.c 2013-02-08 21:37:51.000000000 +0000 +++ gnome-documents-3.8.3.1/src/miner/gd-miner.c 2013-06-14 15:36:05.000000000 +0000 @@ -53,6 +53,9 @@ g_clear_object (&job->account); g_clear_object (&job->async_result); + g_free (job->datasource_urn); + g_free (job->root_element_urn); + g_hash_table_unref (job->previous_resources); g_slice_free (GdAccountMinerJob, job); @@ -170,15 +173,17 @@ GError **error) { GString *datasource_insert; + GdMinerClass *klass = GD_MINER_GET_CLASS (job->miner); datasource_insert = g_string_new (NULL); g_string_append_printf (datasource_insert, "INSERT OR REPLACE INTO <%s> {" - " <%s> a nie:DataSource ; nao:identifier \"%s\"" + " <%s> a nie:DataSource ; nao:identifier \"%s\" . " + " <%s> a nie:InformationElement ; nie:rootElementOf <%s> ; nie:version \"%d\"" "}", job->datasource_urn, - job->datasource_urn, - GD_MINER_GET_CLASS (job->miner)->miner_identifier); + job->datasource_urn, klass->miner_identifier, + job->root_element_urn, job->datasource_urn, klass->version); tracker_sparql_connection_update (job->connection, datasource_insert->str, @@ -374,6 +379,8 @@ retval->service = miner_class->create_service (self, object); retval->datasource_urn = g_strdup_printf ("gd:goa-account:%s", goa_account_get_id (retval->account)); + retval->root_element_urn = g_strdup_printf ("gd:goa-account:%s:root-element", + goa_account_get_id (retval->account)); return retval; } @@ -490,9 +497,7 @@ "DELETE {" " ?u a rdfs:Resource" "} WHERE {" - " GRAPH <%s> {" - " ?u a rdfs:Resource" - " }" + " ?u nie:dataSource <%s>" "}", resource); } @@ -541,16 +546,20 @@ GString *select; GError *error = NULL; TrackerSparqlCursor *cursor; - const gchar *datasource; + const gchar *datasource, *old_version_str; + gint old_version; GList *element; CleanupJob *job = user_data; GdMiner *self = job->self; + GdMinerClass *klass = GD_MINER_GET_CLASS (self); /* find all our datasources in the tracker DB */ select = g_string_new (NULL); - g_string_append_printf (select, "SELECT ?datasource WHERE { ?datasource a nie:DataSource . " - "?datasource nao:identifier \"%s\" }", - GD_MINER_GET_CLASS (self)->miner_identifier); + g_string_append_printf (select, "SELECT ?datasource nie:version(?root) WHERE { " + "?datasource a nie:DataSource . " + "?datasource nao:identifier \"%s\" . " + "OPTIONAL { ?root nie:rootElementOf ?datasource } }", + klass->miner_identifier); cursor = tracker_sparql_connection_query (self->priv->connection, select->str, @@ -572,6 +581,8 @@ * documents, in case the switch has been disabled in System Settings. * In fact, we only remove all the account data in case the account * is really removed from the panel. + * + * Also, cleanup sources for which the version has increased. */ datasource = tracker_sparql_cursor_get_string (cursor, 0, NULL); element = g_list_find_custom (job->acc_objects, datasource, @@ -580,6 +591,20 @@ if (element == NULL) job->old_datasources = g_list_prepend (job->old_datasources, g_strdup (datasource)); + + old_version_str = tracker_sparql_cursor_get_string (cursor, 1, NULL); + if (old_version_str == NULL) + old_version = 1; + else + sscanf (old_version_str, "%d", &old_version); + + g_debug ("Stored version: %d - new version %d", old_version, klass->version); + + if ((element == NULL) || (old_version < klass->version)) + { + job->old_datasources = g_list_prepend (job->old_datasources, + g_strdup (datasource)); + } } g_object_unref (cursor); diff -Nru gnome-documents-3.8.0/src/miner/gd-miner.h gnome-documents-3.8.3.1/src/miner/gd-miner.h --- gnome-documents-3.8.0/src/miner/gd-miner.h 2012-12-12 17:58:45.000000000 +0000 +++ gnome-documents-3.8.3.1/src/miner/gd-miner.h 2013-04-03 11:08:32.000000000 +0000 @@ -57,6 +57,7 @@ GHashTable *previous_resources; gchar *datasource_urn; + gchar *root_element_urn; } GdAccountMinerJob; struct _GdMiner @@ -72,6 +73,7 @@ char *goa_provider_type; char *miner_identifier; + gint version; GObject * (*create_service) (GdMiner *self, GoaObject *object); diff -Nru gnome-documents-3.8.0/src/miner/gd-zpj-miner.c gnome-documents-3.8.3.1/src/miner/gd-zpj-miner.c --- gnome-documents-3.8.0/src/miner/gd-zpj-miner.c 2012-12-10 23:38:01.000000000 +0000 +++ gnome-documents-3.8.3.1/src/miner/gd-zpj-miner.c 2013-04-03 11:08:32.000000000 +0000 @@ -281,6 +281,7 @@ miner_class->goa_provider_type = "windows_live"; miner_class->miner_identifier = MINER_IDENTIFIER; + miner_class->version = 1; miner_class->create_service = create_service; miner_class->query = query_zpj; diff -Nru gnome-documents-3.8.0/src/notifications.js gnome-documents-3.8.3.1/src/notifications.js --- gnome-documents-3.8.0/src/notifications.js 2013-02-08 21:37:28.000000000 +0000 +++ gnome-documents-3.8.3.1/src/notifications.js 2013-04-03 11:08:32.000000000 +0000 @@ -161,6 +161,8 @@ } if (miner && miner.DisplayName) { + // Translators: %s refers to an online account provider, e.g. + // "Google", or "Windows Live". primary = _("Fetching documents from %s").format(miner.DisplayName); } else { primary = _("Fetching documents from online accounts"); diff -Nru gnome-documents-3.8.0/src/path.js gnome-documents-3.8.3.1/src/path.js --- gnome-documents-3.8.0/src/path.js 2013-03-25 15:36:05.000000000 +0000 +++ gnome-documents-3.8.3.1/src/path.js 2013-06-14 15:44:05.000000000 +0000 @@ -1,4 +1,4 @@ -let LOCALE_DIR = "/opt/jhbuild/share/locale"; -let STYLE_DIR = "/opt/jhbuild/share/gnome-documents/style/"; -let ICONS_DIR = "/opt/jhbuild/share/gnome-documents/icons/"; -let RESOURCE_DIR = "/opt/jhbuild/share/gnome-documents"; +let LOCALE_DIR = "/opt/share/locale"; +let STYLE_DIR = "/opt/share/gnome-documents/style/"; +let ICONS_DIR = "/opt/share/gnome-documents/icons/"; +let RESOURCE_DIR = "/opt/share/gnome-documents"; diff -Nru gnome-documents-3.8.0/src/preview.js gnome-documents-3.8.3.1/src/preview.js --- gnome-documents-3.8.0/src/preview.js 2013-03-04 20:05:20.000000000 +0000 +++ gnome-documents-3.8.3.1/src/preview.js 2013-06-14 15:36:05.000000000 +0000 @@ -80,7 +80,7 @@ this._overlay.add_overlay(this._navBar.widget); // create page nav buttons - this._navButtons = new PreviewNavButtons(this._model, this._overlay); + this._navButtons = new PreviewNavButtons(this, this._overlay); this.widget.show_all(); @@ -611,18 +611,25 @@ const PreviewNavButtons = new Lang.Class({ Name: 'PreviewNavButtons', - _init: function(model, overlay) { - this._model = model; + _init: function(previewView, overlay) { + this._previewView = previewView; + this._model = previewView.getModel(); this._overlay = overlay; + this._visible = false; this._pageChangedId = 0; this._autoHideId = 0; this._motionId = 0; this._hover = false; - this.prev_widget = new Gtk.Button({ child: new Gtk.Image ({ icon_name: 'go-previous-symbolic', + let isRtl = (this._previewView.widget.get_direction() == Gtk.TextDirection.RTL); + let prevIconName = isRtl ? 'go-next-symbolic' : 'go-previous-symbolic'; + let nextIconName = isRtl ? 'go-previous-symbolic' : 'go-next-symbolic'; + + this.prev_widget = new Gtk.Button({ child: new Gtk.Image ({ icon_name: prevIconName, pixel_size: 16 }), margin_left: _PREVIEW_NAVBAR_MARGIN, + margin_right: _PREVIEW_NAVBAR_MARGIN, halign: Gtk.Align.START, valign: Gtk.Align.CENTER }); this.prev_widget.get_style_context().add_class('osd'); @@ -631,8 +638,9 @@ this.prev_widget.connect('enter-notify-event', Lang.bind(this, this._onEnterNotify)); this.prev_widget.connect('leave-notify-event', Lang.bind(this, this._onLeaveNotify)); - this.next_widget = new Gtk.Button({ child: new Gtk.Image ({ icon_name: 'go-next-symbolic', + this.next_widget = new Gtk.Button({ child: new Gtk.Image ({ icon_name: nextIconName, pixel_size: 16 }), + margin_left: _PREVIEW_NAVBAR_MARGIN, margin_right: _PREVIEW_NAVBAR_MARGIN, halign: Gtk.Align.END, valign: Gtk.Align.CENTER }); @@ -674,14 +682,11 @@ }, _onPrevClicked: function() { - if (this._model.page > 0) - this._model.page--; + this._previewView.view.previous_page(); }, _onNextClicked: function() { - let doc = this._model.document; - if (doc.get_n_pages() > this._model.page + 1) - this._model.page++; + this._previewView.view.next_page(); }, _autoHide: function() { @@ -824,9 +829,24 @@ this._searchAction.enabled = false; }, - _onLoadFinished: function() { + _onLoadFinished: function(manager, doc, docModel) { this._gearMenu.enabled = true; - this._searchAction.enabled = true; + + let evDoc = docModel.get_document(); + let hasPages = (evDoc.get_n_pages() > 0); + let isFind = true; + + try { + // This is a hack to find out if evDoc implements the + // EvDocument.DocumentFind interface or not. We don't expect + // the following invocation to work. + evDoc.find_text(); + } catch (e if e instanceof TypeError) { + isFind = false; + } catch (e) { + } + + this._searchAction.enabled = (hasPages && isFind); }, _getPreviewMenu: function() { diff -Nru gnome-documents-3.8.0/src/properties.js gnome-documents-3.8.3.1/src/properties.js --- gnome-documents-3.8.0/src/properties.js 2013-02-17 01:03:05.000000000 +0000 +++ gnome-documents-3.8.3.1/src/properties.js 2013-06-14 15:36:05.000000000 +0000 @@ -57,6 +57,7 @@ title: _("Properties"), hexpand: true }); this.widget.add_button(_("Done"), Gtk.ResponseType.OK); + this.widget.set_default_response(Gtk.ResponseType.OK); let grid = new Gtk.Grid ({ orientation: Gtk.Orientation.VERTICAL, row_homogeneous: true, @@ -120,7 +121,8 @@ // Title value if (doc instanceof Documents.LocalDocument) { - this._titleEntry = new Gtk.Entry({ text: doc.name, + this._titleEntry = new Gtk.Entry({ activates_default: true, + text: doc.name, editable: true, hexpand: true, width_chars: 40, diff -Nru gnome-documents-3.8.0/src/searchbar.js gnome-documents-3.8.3.1/src/searchbar.js --- gnome-documents-3.8.0/src/searchbar.js 2013-02-22 21:56:01.000000000 +0000 +++ gnome-documents-3.8.3.1/src/searchbar.js 2013-06-14 15:36:05.000000000 +0000 @@ -272,6 +272,7 @@ _init: function(dropdown) { this._dropdown = dropdown; + this._selectAll = Application.application.lookup_action('select-all'); this.parent(); @@ -298,15 +299,13 @@ Lang.bind(this, this._onTagClicked)); // connect to search string changes in the controller - let searchChangedId = Application.searchController.connect('search-string-changed', Lang.bind(this, - function(controller, string) { - this._searchEntry.set_text(string); - })); + this._searchChangedId = Application.searchController.connect('search-string-changed', + Lang.bind(this, this._onSearchStringChanged)); this._searchEntry.connect('destroy', Lang.bind(this, function() { this._dropdown.widget.reveal_child = false; - Application.searchController.disconnect(searchChangedId); + Application.searchController.disconnect(this._searchChangedId); })); // create the dropdown button @@ -335,7 +334,17 @@ entryChanged: function() { let currentText = this._searchEntry.get_text().toLowerCase(); + + Application.searchController.disconnect(this._searchChangedId); Application.searchController.setString(currentText); + + // connect to search string changes in the controller + this._searchChangedId = Application.searchController.connect('search-string-changed', + Lang.bind(this, this._onSearchStringChanged)); + }, + + _onSearchStringChanged: function(controller, string) { + this._searchEntry.set_text(string); }, _onActiveCollectionChanged: function() { @@ -407,8 +416,14 @@ this.parent(); }, + show: function() { + this._selectAll.enabled = false; + this.parent(); + }, + hide: function() { this._dropdownButton.set_active(false); + this._selectAll.enabled = true; Application.searchTypeManager.setActiveItemById('all'); Application.searchMatchManager.setActiveItemById('all'); diff -Nru gnome-documents-3.8.0/src/selections.js gnome-documents-3.8.3.1/src/selections.js --- gnome-documents-3.8.0/src/selections.js 2013-02-19 20:25:23.000000000 +0000 +++ gnome-documents-3.8.3.1/src/selections.js 2013-06-14 15:36:05.000000000 +0000 @@ -610,6 +610,7 @@ destroy_with_parent: true, default_width: 400, default_height: 250, + // Translators: "Organize" refers to documents in this context title: _("Organize") }); this.widget.add_button('gtk-add', OrganizeCollectionDialogResponse.ADD); @@ -768,6 +769,7 @@ // organize button this._toolbarCollection = new Gtk.Button({ child: new Gtk.Image ({ icon_name: 'list-add-symbolic', pixel_size: 16 })}); + // Translators: "Organize" refers to documents in this context this._toolbarCollection.set_tooltip_text(_("Organize")); this._rightBox.add(this._toolbarCollection); this._toolbarCollection.connect('clicked', Lang.bind(this, this._onToolbarCollection)); diff -Nru gnome-documents-3.8.0/src/shellSearchProvider.js gnome-documents-3.8.3.1/src/shellSearchProvider.js --- gnome-documents-3.8.0/src/shellSearchProvider.js 2012-12-12 17:58:45.000000000 +0000 +++ gnome-documents-3.8.3.1/src/shellSearchProvider.js 2013-06-14 15:36:05.000000000 +0000 @@ -461,11 +461,11 @@ }, ActivateResult: function(id, terms, timestamp) { - this.emit('activate-result', id, terms); + this.emit('activate-result', id, terms, timestamp); }, LaunchSearch: function(terms, timestamp) { - this.emit('launch-search', terms); + this.emit('launch-search', terms, timestamp); } }); Signals.addSignalMethods(ShellSearchProvider.prototype); diff -Nru gnome-documents-3.8.0/src/trackerController.js gnome-documents-3.8.3.1/src/trackerController.js --- gnome-documents-3.8.0/src/trackerController.js 2012-12-12 17:58:45.000000000 +0000 +++ gnome-documents-3.8.3.1/src/trackerController.js 2013-06-04 16:06:59.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 Red Hat, Inc. + * Copyright (c) 2011, 2013 Red Hat, Inc. * * Gnome Documents is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by the @@ -25,6 +25,7 @@ const Application = imports.application; const Query = imports.query; const Utils = imports.utils; +const WindowMode = imports.windowMode; const Gio = imports.gi.Gio; const GLib = imports.gi.GLib; @@ -117,6 +118,7 @@ this._queryQueuedFlags = RefreshFlags.NONE; this._querying = false; this._isStarted = false; + this._refreshPending = false; // useful for debugging this._lastQueryTime = 0; @@ -125,6 +127,12 @@ Application.sourceManager.connect('item-removed', Lang.bind(this, this._onSourceAddedRemoved)); Application.sourceManager.connect('active-changed', Lang.bind(this, this._refreshForObject)); + Application.modeController.connect('window-mode-changed', Lang.bind(this, + function(object, newMode) { + if (this._refreshPending && newMode == WindowMode.WindowMode.OVERVIEW) + this._refreshForSource(); + })); + Application.offsetController.connect('offset-changed', Lang.bind(this, this._performCurrentQuery)); Application.collectionManager.connect('active-changed', Lang.bind(this, this._refreshForObject)); @@ -243,6 +251,18 @@ this._refreshInternal(RefreshFlags.RESET_OFFSET); }, + _refreshForSource: function() { + // When a source is added or removed, refresh the model only if + // the current source is All. + // If it was the current source to be removed, we will get an + // 'active-changed' signal, so avoid refreshing twice + if (this._currentQuery.activeSource && + this._currentQuery.activeSource.id == 'all') + this._refreshInternal(RefreshFlags.NONE); + + this._refreshPending = false; + }, + _onSearchMatchChanged: function() { // when the "match" search setting changes, refresh only if // the search string is not empty @@ -251,13 +271,12 @@ }, _onSourceAddedRemoved: function(manager, item) { - // When a source is added or removed, refresh the model only if - // the current source is All. - // If it was the current source to be removed, we will get an - // 'active-changed' signal, so avoid refreshing twice - if (this._currentQuery.activeSource && - this._currentQuery.activeSource.id == 'all') - this._refreshInternal(RefreshFlags.NONE); + let mode = Application.modeController.getWindowMode(); + + if (mode == WindowMode.WindowMode.OVERVIEW) + this._refreshForSource(); + else + this._refreshPending = true; }, start: function() { diff -Nru gnome-documents-3.8.0/src/view.js gnome-documents-3.8.3.1/src/view.js --- gnome-documents-3.8.0/src/view.js 2013-02-22 15:35:28.000000000 +0000 +++ gnome-documents-3.8.3.1/src/view.js 2013-06-04 15:17:06.000000000 +0000 @@ -58,6 +58,7 @@ this._spinner.set_size_request(16, 16); child.add(this._spinner); + // Translators: "more" refers to documents in this context this._label = new Gtk.Label({ label: _("Load More"), visible: true }); child.add(this._label); @@ -88,6 +89,7 @@ this.widget.set_visible(visible); if (!visible) { + // Translators: "more" refers to documents in this context this._label.label = _("Load More"); this._spinner.stop(); this._spinner.hide();