diff -u evince-2.20.0/debian/changelog evince-2.20.0/debian/changelog --- evince-2.20.0/debian/changelog +++ evince-2.20.0/debian/changelog @@ -1,3 +1,35 @@ +evince (2.20.0-0ubuntu2) gutsy; urgency=low + + * debian/patches/03_hildon_interface.patch + Adds support for Hildon interface with including: + - Registration of the program into the hildon enviromment. + - D-bus processing via ossolib. + - Changed selection and button event handling to match Hildon model. + - Changes in accelerators handling Zoom, Fullscreen and Presentation + modes. + - Uses Hildon chooser dialog. + - Selects the Hildon interface definition file when in Hildon mode. + - If the arch is not lpia, the standard gtk interface is used. + - Fixes interface rendering problem when compiled for lpia. + - Adjusted the Makefile.am files to include the Hildon interface + options and interface file evince-hildon-ui.xml. + * shell/evince-hildon-ui.xml + Modified interface file. + - This file is selected for instalation at build time only if the + package is built for lpia, if not, the usual evince-hildon-ui.xml + is installed. + * debian/control: + - Build-Depends update. + * debian/rules + - Added configuration for lpia arch. + * Moved configure.ac patch to 03_hildon_interface.patch. + * Moved new changes in autoconf result to 90_autoreconf.patch. + * debian/patches/90_autoreconf.patch + - Result of autoconf and automake, necessary to adjust the Makefile.in + files after the changes done in 03_hildon_interface.patch. + + -- Adilson Oliveira Tue, 25 Sep 2007 09:38:38 -0300 + evince (2.20.0-0ubuntu1) gutsy; urgency=low * New upstream version diff -u evince-2.20.0/debian/rules evince-2.20.0/debian/rules --- evince-2.20.0/debian/rules +++ evince-2.20.0/debian/rules @@ -20,6 +20,11 @@ DEB_DH_MAKESHLIBS_ARGS += --exclude=libevince-properties-page.so DEB_DH_INSTALL_SOURCEDIR := debian/tmp +# If compiling for lpia, enable Hildon interface +ifeq ($(DEB_BUILD_ARCH), lpia) +DEB_CONFIGURE_EXTRA_FLAGS += --enable-hildon +endif + #cdbs should do this, but doesn't (see #424636) clean:: rm -rf $(DEB_BUILDDIR) $(DEB_BUILDDIR_evince-gtk) $(DEB_DESTDIR_evince-gtk) diff -u evince-2.20.0/debian/control.in evince-2.20.0/debian/control.in --- evince-2.20.0/debian/control.in +++ evince-2.20.0/debian/control.in @@ -28,6 +28,9 @@ libkpathsea-dev, libtiff4-dev, zlib1g-dev, + libhildon-1-dev [lpia], + libosso-dev [lpia], + libhildonfm2-dev [lpia], liblaunchpad-integration-dev Standards-Version: 3.7.2 diff -u evince-2.20.0/debian/control evince-2.20.0/debian/control --- evince-2.20.0/debian/control +++ evince-2.20.0/debian/control @@ -28,6 +28,9 @@ libkpathsea-dev, libtiff4-dev, zlib1g-dev, + libhildon-1-dev [lpia], + libosso-dev [lpia], + libhildonfm2-dev [lpia], liblaunchpad-integration-dev Standards-Version: 3.7.2 only in patch2: unchanged: --- evince-2.20.0.orig/debian/patches/90_autoreconf.patch +++ evince-2.20.0/debian/patches/90_autoreconf.patch @@ -0,0 +1,1117 @@ +diff -Nur evince-2.20.0/backend/comics/Makefile.in evince-2.20.0.new/backend/comics/Makefile.in +--- evince-2.20.0/backend/comics/Makefile.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/backend/comics/Makefile.in 2007-09-24 14:53:02.000000000 -0300 +@@ -132,6 +132,8 @@ + GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@ + GTK_RECENT_LIBS = @GTK_RECENT_LIBS@ + HELP_DIR = @HELP_DIR@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -Nur evince-2.20.0/backend/djvu/Makefile.in evince-2.20.0.new/backend/djvu/Makefile.in +--- evince-2.20.0/backend/djvu/Makefile.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/backend/djvu/Makefile.in 2007-09-24 14:53:02.000000000 -0300 +@@ -133,6 +133,8 @@ + GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@ + GTK_RECENT_LIBS = @GTK_RECENT_LIBS@ + HELP_DIR = @HELP_DIR@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -Nur evince-2.20.0/backend/dvi/Makefile.in evince-2.20.0.new/backend/dvi/Makefile.in +--- evince-2.20.0/backend/dvi/Makefile.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/backend/dvi/Makefile.in 2007-09-24 14:53:02.000000000 -0300 +@@ -142,6 +142,8 @@ + GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@ + GTK_RECENT_LIBS = @GTK_RECENT_LIBS@ + HELP_DIR = @HELP_DIR@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -Nur evince-2.20.0/backend/dvi/mdvi-lib/Makefile.in evince-2.20.0.new/backend/dvi/mdvi-lib/Makefile.in +--- evince-2.20.0/backend/dvi/mdvi-lib/Makefile.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/backend/dvi/mdvi-lib/Makefile.in 2007-09-24 14:53:02.000000000 -0300 +@@ -135,6 +135,8 @@ + GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@ + GTK_RECENT_LIBS = @GTK_RECENT_LIBS@ + HELP_DIR = @HELP_DIR@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -Nur evince-2.20.0/backend/impress/Makefile.in evince-2.20.0.new/backend/impress/Makefile.in +--- evince-2.20.0/backend/impress/Makefile.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/backend/impress/Makefile.in 2007-09-24 14:53:02.000000000 -0300 +@@ -137,6 +137,8 @@ + GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@ + GTK_RECENT_LIBS = @GTK_RECENT_LIBS@ + HELP_DIR = @HELP_DIR@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -Nur evince-2.20.0/backend/Makefile.in evince-2.20.0.new/backend/Makefile.in +--- evince-2.20.0/backend/Makefile.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/backend/Makefile.in 2007-09-24 14:53:02.000000000 -0300 +@@ -135,6 +135,8 @@ + GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@ + GTK_RECENT_LIBS = @GTK_RECENT_LIBS@ + HELP_DIR = @HELP_DIR@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -Nur evince-2.20.0/backend/pdf/Makefile.in evince-2.20.0.new/backend/pdf/Makefile.in +--- evince-2.20.0/backend/pdf/Makefile.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/backend/pdf/Makefile.in 2007-09-24 14:53:02.000000000 -0300 +@@ -141,6 +141,8 @@ + GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@ + GTK_RECENT_LIBS = @GTK_RECENT_LIBS@ + HELP_DIR = @HELP_DIR@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -Nur evince-2.20.0/backend/pixbuf/Makefile.in evince-2.20.0.new/backend/pixbuf/Makefile.in +--- evince-2.20.0/backend/pixbuf/Makefile.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/backend/pixbuf/Makefile.in 2007-09-24 14:53:02.000000000 -0300 +@@ -132,6 +132,8 @@ + GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@ + GTK_RECENT_LIBS = @GTK_RECENT_LIBS@ + HELP_DIR = @HELP_DIR@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -Nur evince-2.20.0/backend/ps/Makefile.in evince-2.20.0.new/backend/ps/Makefile.in +--- evince-2.20.0/backend/ps/Makefile.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/backend/ps/Makefile.in 2007-09-24 14:53:02.000000000 -0300 +@@ -133,6 +133,8 @@ + GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@ + GTK_RECENT_LIBS = @GTK_RECENT_LIBS@ + HELP_DIR = @HELP_DIR@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -Nur evince-2.20.0/backend/tiff/Makefile.in evince-2.20.0.new/backend/tiff/Makefile.in +--- evince-2.20.0/backend/tiff/Makefile.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/backend/tiff/Makefile.in 2007-09-24 14:53:02.000000000 -0300 +@@ -132,6 +132,8 @@ + GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@ + GTK_RECENT_LIBS = @GTK_RECENT_LIBS@ + HELP_DIR = @HELP_DIR@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -Nur evince-2.20.0/config.h.in evince-2.20.0.new/config.h.in +--- evince-2.20.0/config.h.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/config.h.in 2007-09-24 14:53:02.000000000 -0300 +@@ -141,6 +141,9 @@ + /* Define to 1 if you have the ANSI C header files. */ + #undef STDC_HEADERS + ++/* Build with Maemo/Hildon support */ ++#undef USE_HILDON ++ + /* Version number of package */ + #undef VERSION + +diff -Nur evince-2.20.0/configure evince-2.20.0.new/configure +--- evince-2.20.0/configure 2007-09-24 14:53:01.000000000 -0300 ++++ evince-2.20.0.new/configure 2007-09-24 14:53:02.000000000 -0300 +@@ -944,6 +944,10 @@ + FRONTEND_CORE_LIBS + SHELL_CORE_CFLAGS + SHELL_CORE_LIBS ++HILDON_CFLAGS ++HILDON_LIBS ++USE_HILDON_TRUE ++USE_HILDON_FALSE + WITH_GNOME_TRUE + WITH_GNOME_FALSE + GNOME_CFLAGS +@@ -1038,6 +1042,8 @@ + FRONTEND_CORE_LIBS + SHELL_CORE_CFLAGS + SHELL_CORE_LIBS ++HILDON_CFLAGS ++HILDON_LIBS + GNOME_CFLAGS + GNOME_LIBS + GNOMEUI_CFLAGS +@@ -1658,6 +1664,7 @@ + --enable-iso-cxx Try to warn if code is not ISO C++ + --enable-debug turn on debugging + --enable-gtk-doc use gtk-doc to build documentation default=no ++ --enable-hildon Build with Maemo/Hildon support + --enable-nautilus compile the nautilus plugin + --disable-thumbnailer disable the GNOME thumbnailer + --disable-schemas-install Disable the schemas installation +@@ -1719,6 +1726,9 @@ + C compiler flags for SHELL_CORE, overriding pkg-config + SHELL_CORE_LIBS + linker flags for SHELL_CORE, overriding pkg-config ++ HILDON_CFLAGS ++ C compiler flags for HILDON, overriding pkg-config ++ HILDON_LIBS linker flags for HILDON, overriding pkg-config + GNOME_CFLAGS + C compiler flags for GNOME, overriding pkg-config + GNOME_LIBS linker flags for GNOME, overriding pkg-config +@@ -4587,7 +4597,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 4590 "configure"' > conftest.$ac_ext ++ echo '#line 4600 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -7318,11 +7328,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:7321: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7331: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:7325: \$? = $ac_status" >&5 ++ echo "$as_me:7335: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -7586,11 +7596,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:7589: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7599: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:7593: \$? = $ac_status" >&5 ++ echo "$as_me:7603: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -7690,11 +7700,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:7693: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7703: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:7697: \$? = $ac_status" >&5 ++ echo "$as_me:7707: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -9155,7 +9165,7 @@ + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) +- echo '#line 9158 "configure"' > conftest.$ac_ext ++ echo '#line 9168 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -10019,7 +10029,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < conftest.$ac_ext <&5) ++ (eval echo "\"\$as_me:12468: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:12462: \$? = $ac_status" >&5 ++ echo "$as_me:12472: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -12559,11 +12569,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:12562: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:12572: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:12566: \$? = $ac_status" >&5 ++ echo "$as_me:12576: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -13095,7 +13105,7 @@ + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) +- echo '#line 13098 "configure"' > conftest.$ac_ext ++ echo '#line 13108 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -14150,11 +14160,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:14153: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14163: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:14157: \$? = $ac_status" >&5 ++ echo "$as_me:14167: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -14254,11 +14264,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:14257: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14267: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:14261: \$? = $ac_status" >&5 ++ echo "$as_me:14271: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -15699,7 +15709,7 @@ + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) +- echo '#line 15702 "configure"' > conftest.$ac_ext ++ echo '#line 15712 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -16473,11 +16483,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16476: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16486: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:16480: \$? = $ac_status" >&5 ++ echo "$as_me:16490: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -16741,11 +16751,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16744: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16754: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:16748: \$? = $ac_status" >&5 ++ echo "$as_me:16758: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -16845,11 +16855,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16848: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16858: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:16852: \$? = $ac_status" >&5 ++ echo "$as_me:16862: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -18310,7 +18320,7 @@ + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) +- echo '#line 18313 "configure"' > conftest.$ac_ext ++ echo '#line 18323 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -24904,6 +24914,111 @@ + fi + + ++# Check whether --enable-hildon was given. ++if test "${enable_hildon+set}" = set; then ++ enableval=$enable_hildon; enable_hildon="$enableval" ++else ++ enable_hildon=no ++fi ++ ++ ++if test "x$enable_hildon" = "xyes" ; then ++ ++pkg_failed=no ++{ echo "$as_me:$LINENO: checking for HILDON" >&5 ++echo $ECHO_N "checking for HILDON... $ECHO_C" >&6; } ++ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$HILDON_CFLAGS"; then ++ pkg_cv_HILDON_CFLAGS="$HILDON_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-1 hildon-fm-2 libosso\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "hildon-1 hildon-fm-2 libosso") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_HILDON_CFLAGS=`$PKG_CONFIG --cflags "hildon-1 hildon-fm-2 libosso" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ fi ++else ++ pkg_failed=untried ++fi ++if test -n "$PKG_CONFIG"; then ++ if test -n "$HILDON_LIBS"; then ++ pkg_cv_HILDON_LIBS="$HILDON_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-1 hildon-fm-2 libosso\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "hildon-1 hildon-fm-2 libosso") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_HILDON_LIBS=`$PKG_CONFIG --libs "hildon-1 hildon-fm-2 libosso" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ fi ++else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ HILDON_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "hildon-1 hildon-fm-2 libosso"` ++ else ++ HILDON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "hildon-1 hildon-fm-2 libosso"` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$HILDON_PKG_ERRORS" >&5 ++ ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ HAVE_HILDON=no ++elif test $pkg_failed = untried; then ++ HAVE_HILDON=no ++else ++ HILDON_CFLAGS=$pkg_cv_HILDON_CFLAGS ++ HILDON_LIBS=$pkg_cv_HILDON_LIBS ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ HAVE_HILDON=yes ++fi ++fi ++ ++if test "x$HAVE_HILDON" = "xyes" ; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define USE_HILDON 1 ++_ACEOF ++ ++fi ++ ++ if test "x$HAVE_HILDON" = "xyes"; then ++ USE_HILDON_TRUE= ++ USE_HILDON_FALSE='#' ++else ++ USE_HILDON_TRUE='#' ++ USE_HILDON_FALSE= ++fi ++ ++ ++HILDON_CFLAGS="$HILDON_CFLAGS -DUSE_STABLE_LIBGNOMEUI" ++ ++ ++ ++ ++ + # Check whether --with-libgnome was given. + if test "${with_libgnome+set}" = set; then + withval=$with_libgnome; case "${withval}" in +@@ -29260,6 +29375,13 @@ + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi ++if test -z "${USE_HILDON_TRUE}" && test -z "${USE_HILDON_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"USE_HILDON\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"USE_HILDON\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi + if test -z "${WITH_GNOME_TRUE}" && test -z "${WITH_GNOME_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"WITH_GNOME\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +@@ -30187,6 +30309,10 @@ + FRONTEND_CORE_LIBS!$FRONTEND_CORE_LIBS$ac_delim + SHELL_CORE_CFLAGS!$SHELL_CORE_CFLAGS$ac_delim + SHELL_CORE_LIBS!$SHELL_CORE_LIBS$ac_delim ++HILDON_CFLAGS!$HILDON_CFLAGS$ac_delim ++HILDON_LIBS!$HILDON_LIBS$ac_delim ++USE_HILDON_TRUE!$USE_HILDON_TRUE$ac_delim ++USE_HILDON_FALSE!$USE_HILDON_FALSE$ac_delim + WITH_GNOME_TRUE!$WITH_GNOME_TRUE$ac_delim + WITH_GNOME_FALSE!$WITH_GNOME_FALSE$ac_delim + GNOME_CFLAGS!$GNOME_CFLAGS$ac_delim +@@ -30201,10 +30327,6 @@ + WITH_GNOME_PRINT_FALSE!$WITH_GNOME_PRINT_FALSE$ac_delim + WITH_GTK_PRINT_TRUE!$WITH_GTK_PRINT_TRUE$ac_delim + WITH_GTK_PRINT_FALSE!$WITH_GTK_PRINT_FALSE$ac_delim +-DBUS_CFLAGS!$DBUS_CFLAGS$ac_delim +-DBUS_LIBS!$DBUS_LIBS$ac_delim +-DBUS_BINDING_TOOL!$DBUS_BINDING_TOOL$ac_delim +-SHELL_CFLAGS!$SHELL_CFLAGS$ac_delim + _ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then +@@ -30246,6 +30368,10 @@ + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF ++DBUS_CFLAGS!$DBUS_CFLAGS$ac_delim ++DBUS_LIBS!$DBUS_LIBS$ac_delim ++DBUS_BINDING_TOOL!$DBUS_BINDING_TOOL$ac_delim ++SHELL_CFLAGS!$SHELL_CFLAGS$ac_delim + SHELL_LIBS!$SHELL_LIBS$ac_delim + FRONTEND_CFLAGS!$FRONTEND_CFLAGS$ac_delim + FRONTEND_LIBS!$FRONTEND_LIBS$ac_delim +@@ -30299,7 +30425,7 @@ + LTLIBOBJS!$LTLIBOBJS$ac_delim + _ACEOF + +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 51; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 55; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +@@ -30948,6 +31074,7 @@ + echo " + Configure summary: + GNOME Support......: $WITH_GNOME ++ Hildon Support.....: $HAVE_HILDON + Print Support......: $enable_print + DBUS Support.......: $enable_dbus + Nautilus Plugin....: $HAVE_NAUTILUS +diff -Nur evince-2.20.0/cut-n-paste/Makefile.in evince-2.20.0.new/cut-n-paste/Makefile.in +--- evince-2.20.0/cut-n-paste/Makefile.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/cut-n-paste/Makefile.in 2007-09-24 14:53:02.000000000 -0300 +@@ -128,6 +128,8 @@ + GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@ + GTK_RECENT_LIBS = @GTK_RECENT_LIBS@ + HELP_DIR = @HELP_DIR@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -Nur evince-2.20.0/cut-n-paste/recent-files/Makefile.in evince-2.20.0.new/cut-n-paste/recent-files/Makefile.in +--- evince-2.20.0/cut-n-paste/recent-files/Makefile.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/cut-n-paste/recent-files/Makefile.in 2007-09-24 14:53:02.000000000 -0300 +@@ -135,6 +135,8 @@ + GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@ + GTK_RECENT_LIBS = @GTK_RECENT_LIBS@ + HELP_DIR = @HELP_DIR@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -Nur evince-2.20.0/cut-n-paste/toolbar-editor/Makefile.in evince-2.20.0.new/cut-n-paste/toolbar-editor/Makefile.in +--- evince-2.20.0/cut-n-paste/toolbar-editor/Makefile.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/cut-n-paste/toolbar-editor/Makefile.in 2007-09-24 14:53:02.000000000 -0300 +@@ -146,6 +146,8 @@ + GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@ + GTK_RECENT_LIBS = @GTK_RECENT_LIBS@ + HELP_DIR = @HELP_DIR@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -Nur evince-2.20.0/cut-n-paste/totem-screensaver/Makefile.in evince-2.20.0.new/cut-n-paste/totem-screensaver/Makefile.in +--- evince-2.20.0/cut-n-paste/totem-screensaver/Makefile.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/cut-n-paste/totem-screensaver/Makefile.in 2007-09-24 14:53:02.000000000 -0300 +@@ -137,6 +137,8 @@ + GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@ + GTK_RECENT_LIBS = @GTK_RECENT_LIBS@ + HELP_DIR = @HELP_DIR@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -Nur evince-2.20.0/cut-n-paste/zoom-control/Makefile.in evince-2.20.0.new/cut-n-paste/zoom-control/Makefile.in +--- evince-2.20.0/cut-n-paste/zoom-control/Makefile.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/cut-n-paste/zoom-control/Makefile.in 2007-09-24 14:53:02.000000000 -0300 +@@ -137,6 +137,8 @@ + GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@ + GTK_RECENT_LIBS = @GTK_RECENT_LIBS@ + HELP_DIR = @HELP_DIR@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -Nur evince-2.20.0/data/icons/16x16/actions/Makefile.in evince-2.20.0.new/data/icons/16x16/actions/Makefile.in +--- evince-2.20.0/data/icons/16x16/actions/Makefile.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/data/icons/16x16/actions/Makefile.in 2007-09-24 14:53:02.000000000 -0300 +@@ -123,6 +123,8 @@ + GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@ + GTK_RECENT_LIBS = @GTK_RECENT_LIBS@ + HELP_DIR = @HELP_DIR@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -Nur evince-2.20.0/data/icons/16x16/apps/Makefile.in evince-2.20.0.new/data/icons/16x16/apps/Makefile.in +--- evince-2.20.0/data/icons/16x16/apps/Makefile.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/data/icons/16x16/apps/Makefile.in 2007-09-24 14:53:02.000000000 -0300 +@@ -123,6 +123,8 @@ + GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@ + GTK_RECENT_LIBS = @GTK_RECENT_LIBS@ + HELP_DIR = @HELP_DIR@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -Nur evince-2.20.0/data/icons/16x16/Makefile.in evince-2.20.0.new/data/icons/16x16/Makefile.in +--- evince-2.20.0/data/icons/16x16/Makefile.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/data/icons/16x16/Makefile.in 2007-09-24 14:53:02.000000000 -0300 +@@ -125,6 +125,8 @@ + GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@ + GTK_RECENT_LIBS = @GTK_RECENT_LIBS@ + HELP_DIR = @HELP_DIR@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -Nur evince-2.20.0/data/icons/22x22/actions/Makefile.in evince-2.20.0.new/data/icons/22x22/actions/Makefile.in +--- evince-2.20.0/data/icons/22x22/actions/Makefile.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/data/icons/22x22/actions/Makefile.in 2007-09-24 14:53:02.000000000 -0300 +@@ -123,6 +123,8 @@ + GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@ + GTK_RECENT_LIBS = @GTK_RECENT_LIBS@ + HELP_DIR = @HELP_DIR@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -Nur evince-2.20.0/data/icons/22x22/apps/Makefile.in evince-2.20.0.new/data/icons/22x22/apps/Makefile.in +--- evince-2.20.0/data/icons/22x22/apps/Makefile.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/data/icons/22x22/apps/Makefile.in 2007-09-24 14:53:02.000000000 -0300 +@@ -123,6 +123,8 @@ + GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@ + GTK_RECENT_LIBS = @GTK_RECENT_LIBS@ + HELP_DIR = @HELP_DIR@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -Nur evince-2.20.0/data/icons/22x22/Makefile.in evince-2.20.0.new/data/icons/22x22/Makefile.in +--- evince-2.20.0/data/icons/22x22/Makefile.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/data/icons/22x22/Makefile.in 2007-09-24 14:53:02.000000000 -0300 +@@ -125,6 +125,8 @@ + GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@ + GTK_RECENT_LIBS = @GTK_RECENT_LIBS@ + HELP_DIR = @HELP_DIR@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -Nur evince-2.20.0/data/icons/24x24/actions/Makefile.in evince-2.20.0.new/data/icons/24x24/actions/Makefile.in +--- evince-2.20.0/data/icons/24x24/actions/Makefile.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/data/icons/24x24/actions/Makefile.in 2007-09-24 14:53:02.000000000 -0300 +@@ -123,6 +123,8 @@ + GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@ + GTK_RECENT_LIBS = @GTK_RECENT_LIBS@ + HELP_DIR = @HELP_DIR@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -Nur evince-2.20.0/data/icons/24x24/apps/Makefile.in evince-2.20.0.new/data/icons/24x24/apps/Makefile.in +--- evince-2.20.0/data/icons/24x24/apps/Makefile.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/data/icons/24x24/apps/Makefile.in 2007-09-24 14:53:02.000000000 -0300 +@@ -123,6 +123,8 @@ + GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@ + GTK_RECENT_LIBS = @GTK_RECENT_LIBS@ + HELP_DIR = @HELP_DIR@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -Nur evince-2.20.0/data/icons/24x24/Makefile.in evince-2.20.0.new/data/icons/24x24/Makefile.in +--- evince-2.20.0/data/icons/24x24/Makefile.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/data/icons/24x24/Makefile.in 2007-09-24 14:53:02.000000000 -0300 +@@ -125,6 +125,8 @@ + GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@ + GTK_RECENT_LIBS = @GTK_RECENT_LIBS@ + HELP_DIR = @HELP_DIR@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -Nur evince-2.20.0/data/icons/32x32/actions/Makefile.in evince-2.20.0.new/data/icons/32x32/actions/Makefile.in +--- evince-2.20.0/data/icons/32x32/actions/Makefile.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/data/icons/32x32/actions/Makefile.in 2007-09-24 14:53:02.000000000 -0300 +@@ -123,6 +123,8 @@ + GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@ + GTK_RECENT_LIBS = @GTK_RECENT_LIBS@ + HELP_DIR = @HELP_DIR@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -Nur evince-2.20.0/data/icons/32x32/Makefile.in evince-2.20.0.new/data/icons/32x32/Makefile.in +--- evince-2.20.0/data/icons/32x32/Makefile.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/data/icons/32x32/Makefile.in 2007-09-24 14:53:02.000000000 -0300 +@@ -125,6 +125,8 @@ + GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@ + GTK_RECENT_LIBS = @GTK_RECENT_LIBS@ + HELP_DIR = @HELP_DIR@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -Nur evince-2.20.0/data/icons/48x48/actions/Makefile.in evince-2.20.0.new/data/icons/48x48/actions/Makefile.in +--- evince-2.20.0/data/icons/48x48/actions/Makefile.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/data/icons/48x48/actions/Makefile.in 2007-09-24 14:53:02.000000000 -0300 +@@ -123,6 +123,8 @@ + GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@ + GTK_RECENT_LIBS = @GTK_RECENT_LIBS@ + HELP_DIR = @HELP_DIR@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -Nur evince-2.20.0/data/icons/48x48/apps/Makefile.in evince-2.20.0.new/data/icons/48x48/apps/Makefile.in +--- evince-2.20.0/data/icons/48x48/apps/Makefile.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/data/icons/48x48/apps/Makefile.in 2007-09-24 14:53:02.000000000 -0300 +@@ -123,6 +123,8 @@ + GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@ + GTK_RECENT_LIBS = @GTK_RECENT_LIBS@ + HELP_DIR = @HELP_DIR@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -Nur evince-2.20.0/data/icons/48x48/Makefile.in evince-2.20.0.new/data/icons/48x48/Makefile.in +--- evince-2.20.0/data/icons/48x48/Makefile.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/data/icons/48x48/Makefile.in 2007-09-24 14:53:02.000000000 -0300 +@@ -125,6 +125,8 @@ + GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@ + GTK_RECENT_LIBS = @GTK_RECENT_LIBS@ + HELP_DIR = @HELP_DIR@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -Nur evince-2.20.0/data/icons/Makefile.in evince-2.20.0.new/data/icons/Makefile.in +--- evince-2.20.0/data/icons/Makefile.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/data/icons/Makefile.in 2007-09-24 14:53:02.000000000 -0300 +@@ -125,6 +125,8 @@ + GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@ + GTK_RECENT_LIBS = @GTK_RECENT_LIBS@ + HELP_DIR = @HELP_DIR@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -Nur evince-2.20.0/data/icons/scalable/apps/Makefile.in evince-2.20.0.new/data/icons/scalable/apps/Makefile.in +--- evince-2.20.0/data/icons/scalable/apps/Makefile.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/data/icons/scalable/apps/Makefile.in 2007-09-24 14:53:02.000000000 -0300 +@@ -123,6 +123,8 @@ + GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@ + GTK_RECENT_LIBS = @GTK_RECENT_LIBS@ + HELP_DIR = @HELP_DIR@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -Nur evince-2.20.0/data/icons/scalable/Makefile.in evince-2.20.0.new/data/icons/scalable/Makefile.in +--- evince-2.20.0/data/icons/scalable/Makefile.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/data/icons/scalable/Makefile.in 2007-09-24 14:53:02.000000000 -0300 +@@ -125,6 +125,8 @@ + GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@ + GTK_RECENT_LIBS = @GTK_RECENT_LIBS@ + HELP_DIR = @HELP_DIR@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -Nur evince-2.20.0/data/Makefile.in evince-2.20.0.new/data/Makefile.in +--- evince-2.20.0/data/Makefile.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/data/Makefile.in 2007-09-24 14:53:02.000000000 -0300 +@@ -52,7 +52,8 @@ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive + man1dir = $(mandir)/man1 +-am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(desktopdir)" \ ++am__installdirs = "$(DESTDIR)$(man1dir)" \ ++ "$(DESTDIR)$(dbus_servicedir)" "$(DESTDIR)$(desktopdir)" \ + "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(schemadir)" \ + "$(DESTDIR)$(uidir)" + NROFF = nroff +@@ -63,11 +64,13 @@ + *) f=$$p;; \ + esac; + am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++dbus_serviceDATA_INSTALL = $(INSTALL_DATA) + desktopDATA_INSTALL = $(INSTALL_DATA) + gladeDATA_INSTALL = $(INSTALL_DATA) + schemaDATA_INSTALL = $(INSTALL_DATA) + uiDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(desktop_DATA) $(glade_DATA) $(schema_DATA) $(ui_DATA) ++DATA = $(dbus_service_DATA) $(desktop_DATA) $(glade_DATA) \ ++ $(schema_DATA) $(ui_DATA) + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive + ETAGS = etags +@@ -144,6 +147,8 @@ + GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@ + GTK_RECENT_LIBS = @GTK_RECENT_LIBS@ + HELP_DIR = @HELP_DIR@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +@@ -287,11 +292,17 @@ + # UI descriptions + # + uidir = $(pkgdatadir) +-ui_DATA = \ +- evince-ui.xml \ +- evince-toolbar.xml \ +- hand-open.png \ +- $(NULL) ++@USE_HILDON_FALSE@ui_DATA = \ ++@USE_HILDON_FALSE@ evince-ui.xml \ ++@USE_HILDON_FALSE@ evince-toolbar.xml \ ++@USE_HILDON_FALSE@ hand-open.png \ ++@USE_HILDON_FALSE@ $(NULL) ++ ++@USE_HILDON_TRUE@ui_DATA = \ ++@USE_HILDON_TRUE@ evince-hildon-ui.xml \ ++@USE_HILDON_TRUE@ evince-toolbar.xml \ ++@USE_HILDON_TRUE@ hand-open.png \ ++@USE_HILDON_TRUE@ $(NULL) + + + # +@@ -304,9 +315,15 @@ + $(NULL) + + DESKTOP_IN_FILES = evince.desktop.in.in +-DESKTOP_FILES = $(DESKTOP_IN_FILES:.desktop.in.in=.desktop) + desktopdir = $(datadir)/applications ++DESKTOP_FILES = $(DESKTOP_IN_FILES:.desktop.in.in=.desktop) + desktop_DATA = $(DESKTOP_FILES) ++ ++# ++# D-Bus service (Maemo) ++# ++@USE_HILDON_TRUE@dbus_servicedir = $(datadir)/dbus-1/services ++@USE_HILDON_TRUE@dbus_service_DATA = evince.service + schema_in_files = evince.schemas.in + schemadir = $(GCONF_SCHEMA_FILE_DIR) + schema_DATA = $(schema_in_files:.schemas.in=.schemas) +@@ -325,6 +342,7 @@ + $(DESKTOP_IN_FILES) \ + $(schema_in_files) \ + $(man_MANS) \ ++ $(dbus_service_DATA) \ + $(NULL) + + +@@ -420,6 +438,23 @@ + echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ + done ++install-dbus_serviceDATA: $(dbus_service_DATA) ++ @$(NORMAL_INSTALL) ++ test -z "$(dbus_servicedir)" || $(MKDIR_P) "$(DESTDIR)$(dbus_servicedir)" ++ @list='$(dbus_service_DATA)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ f=$(am__strip_dir) \ ++ echo " $(dbus_serviceDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(dbus_servicedir)/$$f'"; \ ++ $(dbus_serviceDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(dbus_servicedir)/$$f"; \ ++ done ++ ++uninstall-dbus_serviceDATA: ++ @$(NORMAL_UNINSTALL) ++ @list='$(dbus_service_DATA)'; for p in $$list; do \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(dbus_servicedir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(dbus_servicedir)/$$f"; \ ++ done + install-desktopDATA: $(desktop_DATA) + @$(NORMAL_INSTALL) + test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)" +@@ -668,7 +703,7 @@ + all-am: Makefile $(MANS) $(DATA) + installdirs: installdirs-recursive + installdirs-am: +- for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(schemadir)" "$(DESTDIR)$(uidir)"; do \ ++ for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(dbus_servicedir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(schemadir)" "$(DESTDIR)$(uidir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-recursive +@@ -714,9 +749,9 @@ + + info-am: + +-install-data-am: install-data-local install-desktopDATA \ +- install-gladeDATA install-man install-schemaDATA \ +- install-uiDATA ++install-data-am: install-data-local install-dbus_serviceDATA \ ++ install-desktopDATA install-gladeDATA install-man \ ++ install-schemaDATA install-uiDATA + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook + +@@ -752,9 +787,9 @@ + + ps-am: + +-uninstall-am: uninstall-desktopDATA uninstall-gladeDATA \ +- uninstall-local uninstall-man uninstall-schemaDATA \ +- uninstall-uiDATA ++uninstall-am: uninstall-dbus_serviceDATA uninstall-desktopDATA \ ++ uninstall-gladeDATA uninstall-local uninstall-man \ ++ uninstall-schemaDATA uninstall-uiDATA + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) uninstall-hook + +@@ -769,15 +804,16 @@ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-data-hook install-data-local \ +- install-desktopDATA install-dvi install-dvi-am install-exec \ +- install-exec-am install-gladeDATA 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-schemaDATA install-strip install-uiDATA installcheck \ +- installcheck-am installdirs installdirs-am maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic \ +- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ +- uninstall uninstall-am uninstall-desktopDATA \ ++ install-dbus_serviceDATA install-desktopDATA install-dvi \ ++ install-dvi-am install-exec install-exec-am install-gladeDATA \ ++ 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-schemaDATA install-strip install-uiDATA \ ++ installcheck installcheck-am installdirs installdirs-am \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-recursive uninstall uninstall-am \ ++ uninstall-dbus_serviceDATA uninstall-desktopDATA \ + uninstall-gladeDATA uninstall-hook uninstall-local \ + uninstall-man uninstall-man1 uninstall-schemaDATA \ + uninstall-uiDATA +diff -Nur evince-2.20.0/help/Makefile.in evince-2.20.0.new/help/Makefile.in +--- evince-2.20.0/help/Makefile.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/help/Makefile.in 2007-09-24 14:53:02.000000000 -0300 +@@ -150,6 +150,8 @@ + GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@ + GTK_RECENT_LIBS = @GTK_RECENT_LIBS@ + HELP_DIR = @HELP_DIR@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -Nur evince-2.20.0/help/reference/Makefile.in evince-2.20.0.new/help/reference/Makefile.in +--- evince-2.20.0/help/reference/Makefile.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/help/reference/Makefile.in 2007-09-24 14:53:02.000000000 -0300 +@@ -125,6 +125,8 @@ + GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@ + GTK_RECENT_LIBS = @GTK_RECENT_LIBS@ + HELP_DIR = @HELP_DIR@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -Nur evince-2.20.0/libdocument/Makefile.in evince-2.20.0.new/libdocument/Makefile.in +--- evince-2.20.0/libdocument/Makefile.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/libdocument/Makefile.in 2007-09-24 14:53:02.000000000 -0300 +@@ -170,6 +170,8 @@ + GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@ + GTK_RECENT_LIBS = @GTK_RECENT_LIBS@ + HELP_DIR = @HELP_DIR@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -Nur evince-2.20.0/Makefile.in evince-2.20.0.new/Makefile.in +--- evince-2.20.0/Makefile.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/Makefile.in 2007-09-24 14:53:02.000000000 -0300 +@@ -142,6 +142,8 @@ + GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@ + GTK_RECENT_LIBS = @GTK_RECENT_LIBS@ + HELP_DIR = @HELP_DIR@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -Nur evince-2.20.0/properties/Makefile.in evince-2.20.0.new/properties/Makefile.in +--- evince-2.20.0/properties/Makefile.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/properties/Makefile.in 2007-09-24 14:53:02.000000000 -0300 +@@ -162,6 +162,8 @@ + GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@ + GTK_RECENT_LIBS = @GTK_RECENT_LIBS@ + HELP_DIR = @HELP_DIR@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -Nur evince-2.20.0/shell/Makefile.in evince-2.20.0.new/shell/Makefile.in +--- evince-2.20.0/shell/Makefile.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/shell/Makefile.in 2007-09-24 14:53:02.000000000 -0300 +@@ -105,8 +105,9 @@ + $(top_builddir)/properties/libevproperties.la \ + $(top_builddir)/libdocument/libevbackend.la \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +- $(am__DEPENDENCIES_1) $(am__append_5) $(am__DEPENDENCIES_2) \ +- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) ++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) $(am__append_5) \ ++ $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_1) + DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +@@ -194,6 +195,8 @@ + GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@ + GTK_RECENT_LIBS = @GTK_RECENT_LIBS@ + HELP_DIR = @HELP_DIR@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +@@ -333,7 +336,8 @@ + -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ + -DGNOMEICONDIR=\""$(datadir)/pixmaps"\" $(SHELL_CFLAGS) \ + $(WARN_CFLAGS) $(DISABLE_DEPRECATED) $(GNOME_PRINT_CFLAGS) \ +- $(GTK_PRINT_CFLAGS) $(am__append_1) $(am__append_2) ++ $(GTK_PRINT_CFLAGS) $(HILDON_CFLAGS) $(am__append_1) \ ++ $(am__append_2) + evince_SOURCES = eggfindbar.c eggfindbar.h ev-application.c \ + ev-application.h ev-job-queue.h ev-job-queue.c ev-jobs.h \ + ev-jobs.c ev-history.c ev-history.h ev-marshal.c ev-marshal.h \ +@@ -361,8 +365,9 @@ + $(top_builddir)/cut-n-paste/totem-screensaver/libtotemscrsaver.la \ + $(top_builddir)/properties/libevproperties.la \ + $(top_builddir)/libdocument/libevbackend.la $(SHELL_LIBS) \ +- $(GNOME_PRINT_LIBS) $(am__append_4) $(am__append_5) \ +- $(am__append_6) $(am__append_7) $(am__append_8) ++ $(GNOME_PRINT_LIBS) $(HILDON_LIBS) $(am__append_4) \ ++ $(am__append_5) $(am__append_6) $(am__append_7) \ ++ $(am__append_8) + BUILT_SOURCES = ev-marshal.h ev-marshal.c $(am__append_9) + EXTRA_DIST = ev-marshal.list \ + ev-application-service.xml +diff -Nur evince-2.20.0/test/Makefile.in evince-2.20.0.new/test/Makefile.in +--- evince-2.20.0/test/Makefile.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/test/Makefile.in 2007-09-24 14:53:02.000000000 -0300 +@@ -114,6 +114,8 @@ + GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@ + GTK_RECENT_LIBS = @GTK_RECENT_LIBS@ + HELP_DIR = @HELP_DIR@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -Nur evince-2.20.0/thumbnailer/Makefile.in evince-2.20.0.new/thumbnailer/Makefile.in +--- evince-2.20.0/thumbnailer/Makefile.in 2007-09-24 14:50:56.000000000 -0300 ++++ evince-2.20.0.new/thumbnailer/Makefile.in 2007-09-24 14:53:02.000000000 -0300 +@@ -158,6 +158,8 @@ + GTK_RECENT_CFLAGS = @GTK_RECENT_CFLAGS@ + GTK_RECENT_LIBS = @GTK_RECENT_LIBS@ + HELP_DIR = @HELP_DIR@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ only in patch2: unchanged: --- evince-2.20.0.orig/debian/patches/03_hildon_interface.patch +++ evince-2.20.0/debian/patches/03_hildon_interface.patch @@ -0,0 +1,672 @@ +diff -Nur evince-2.20.0/data/evince-hildon-ui.xml evince-2.20.0.new/data/evince-hildon-ui.xml +--- evince-2.20.0/data/evince-hildon-ui.xml 1969-12-31 21:00:00.000000000 -0300 ++++ evince-2.20.0.new/data/evince-hildon-ui.xml 2007-09-18 22:28:49.000000000 -0300 +@@ -0,0 +1,103 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff -Nur evince-2.20.0/data/evince.service evince-2.20.0.new/data/evince.service +--- evince-2.20.0/data/evince.service 1969-12-31 21:00:00.000000000 -0300 ++++ evince-2.20.0.new/data/evince.service 2007-09-18 22:28:49.000000000 -0300 +@@ -0,0 +1,3 @@ ++[D-BUS Service] ++Name=com.nokia.evince ++Exec=/usr/bin/evince +diff -Nur evince-2.20.0/shell/ev-application.c evince-2.20.0.new/shell/ev-application.c +--- evince-2.20.0/shell/ev-application.c 2007-09-17 13:19:25.000000000 -0300 ++++ evince-2.20.0.new/shell/ev-application.c 2007-09-18 22:28:49.000000000 -0300 +@@ -399,7 +399,7 @@ + } + ev_application_add_icon_path_for_screen (screen); + +- gtk_widget_show (new_window); ++ gtk_widget_show_all (new_window); + + gtk_window_present_with_time (GTK_WINDOW (new_window), + timestamp); +diff -Nur evince-2.20.0/shell/ev-view.c evince-2.20.0.new/shell/ev-view.c +--- evince-2.20.0/shell/ev-view.c 2007-09-17 13:19:25.000000000 -0300 ++++ evince-2.20.0.new/shell/ev-view.c 2007-09-18 22:28:49.000000000 -0300 +@@ -113,6 +113,14 @@ + + #define SCROLL_TIME 150 + ++#ifdef USE_HILDON ++#define SCROLL_BUTTON 1 ++#define SELECT_BUTTON 2 ++#else ++#define SCROLL_BUTTON 2 ++#define SELECT_BUTTON 1 ++#endif ++ + /*** Scrolling ***/ + static void scroll_to_current_page (EvView *view, + GtkOrientation orientation); +@@ -2643,7 +2651,7 @@ + view->selection_info.in_drag = FALSE; + + switch (event->button) { +- case 1: { ++ case SELECT_BUTTON: { + EvImage *image; + EvFormField *field; + +@@ -2679,7 +2687,7 @@ + } + } + return TRUE; +- case 2: ++ case SCROLL_BUTTON: + /* use root coordinates as reference point because + * scrolling changes window relative coordinates */ + view->drag_info.start.x = event->x_root; +@@ -2916,7 +2924,7 @@ + /* For the Evince 0.4.x release, we limit selection to un-rotated + * documents only. + */ +- if (view->pressed_button == 1 && view->rotation == 0) { ++ if (view->pressed_button == SELECT_BUTTON && view->rotation == 0) { + + /* Schedule timeout to scroll during selection and additionally + * scroll once to allow arbitrary speed. */ +@@ -2938,7 +2946,7 @@ + view->selection_update_id = g_idle_add ((GSourceFunc)selection_update_idle_cb, view); + + return TRUE; +- } else if (view->pressed_button == 2) { ++ } else if (view->pressed_button == SCROLL_BUTTON) { + if (!view->drag_info.in_drag) { + gboolean start; + +@@ -2992,7 +3000,7 @@ + view->drag_info.in_drag = FALSE; + view->image_dnd_info.in_drag = FALSE; + +- if (view->pressed_button == 2) { ++ if (view->pressed_button == SCROLL_BUTTON) { + ev_view_handle_cursor_over_xy (view, event->x, event->y); + } + +diff -Nur evince-2.20.0/shell/ev-window.c evince-2.20.0.new/shell/ev-window.c +--- evince-2.20.0/shell/ev-window.c 2007-09-18 22:28:48.000000000 -0300 ++++ evince-2.20.0.new/shell/ev-window.c 2007-09-18 22:28:49.000000000 -0300 +@@ -87,6 +87,12 @@ + #include + #include + #include ++ ++#ifdef USE_HILDON ++#include ++#include ++#endif ++ + #include + #include + #include +@@ -99,6 +105,12 @@ + #include + #include + ++#ifdef USE_HILDON ++#define UI_FILE "evince-hildon-ui.xml" ++#else ++#define UI_FILE "evince-ui.xml" ++#endif ++ + #if !GLIB_CHECK_VERSION (2, 13, 3) + char *xdg_user_dir_lookup (char *type); + #endif +@@ -204,6 +216,9 @@ + GtkPrintSettings *print_settings; + GtkPageSetup *print_page_setup; + #endif ++#ifdef USE_HILDON ++ HildonProgram *hildon_program; ++#endif + }; + + #define EV_WINDOW_GET_PRIVATE(object) \ +@@ -281,8 +296,11 @@ + static void find_bar_search_changed_cb (EggFindBar *find_bar, + GParamSpec *param, + EvWindow *ev_window); +- ++#ifdef USE_HILDON ++G_DEFINE_TYPE (EvWindow, ev_window, HILDON_TYPE_WINDOW) ++#else + G_DEFINE_TYPE (EvWindow, ev_window, GTK_TYPE_WINDOW) ++#endif + + static void + ev_window_set_action_sensitive (EvWindow *ev_window, +@@ -491,12 +509,14 @@ + static void + set_widget_visibility (GtkWidget *widget, gboolean visible) + { +- g_assert (GTK_IS_WIDGET (widget)); +- +- if (visible) +- gtk_widget_show (widget); +- else +- gtk_widget_hide (widget); ++ if (widget) { ++ g_assert (GTK_IS_WIDGET (widget)); ++ ++ if (visible) ++ gtk_widget_show (widget); ++ else ++ gtk_widget_hide (widget); ++ } + } + + static void +@@ -1557,6 +1577,12 @@ + ev_window_cmd_file_open (GtkAction *action, EvWindow *window) + { + GtkWidget *chooser; ++ gboolean select_multiple = TRUE; ++ ++#ifdef USE_HILDON ++ chooser = hildon_file_chooser_dialog_new (GTK_WINDOW (window), GTK_FILE_CHOOSER_ACTION_OPEN); ++ select_multiple = FALSE; ++#else + + chooser = gtk_file_chooser_dialog_new (_("Open Document"), + GTK_WINDOW (window), +@@ -1565,9 +1591,10 @@ + GTK_RESPONSE_CANCEL, + GTK_STOCK_OPEN, GTK_RESPONSE_OK, + NULL); ++#endif + + ev_document_factory_add_filters (chooser, NULL); +- gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (chooser), TRUE); ++ gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (chooser), select_multiple); + gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (chooser), FALSE); + if (ev_application_get_chooser_uri (EV_APP) != NULL) { + gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (chooser), +@@ -2059,12 +2086,16 @@ + gchar *folder; + #endif + ++#ifdef USE_HILDON ++ fc = hildon_file_chooser_dialog_new (GTK_WINDOW (ev_window), GTK_FILE_CHOOSER_ACTION_SAVE); ++#else + fc = gtk_file_chooser_dialog_new ( + _("Save a Copy"), + GTK_WINDOW (ev_window), GTK_FILE_CHOOSER_ACTION_SAVE, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_SAVE, GTK_RESPONSE_OK, + NULL); ++#endif + + ev_document_factory_add_filters (fc, ev_window->priv->document); + gtk_dialog_set_default_response (GTK_DIALOG (fc), GTK_RESPONSE_OK); +@@ -4238,6 +4269,13 @@ + priv->presentation_timeout_id = 0; + } + ++#ifdef USE_HILDON ++ if (window->priv->hildon_program != NULL) { ++ g_object_unref (window->priv->hildon_program); ++ window->priv->hildon_program = NULL; ++ } ++#endif ++ + G_OBJECT_CLASS (ev_window_parent_class)->dispose (object); + } + +@@ -4255,6 +4293,18 @@ + g_type_class_add_private (g_object_class, sizeof (EvWindowPrivate)); + } + ++#ifdef USE_HILDON ++#define ZOOM_IN_ACCEL "F7" ++#define ZOOM_OUT_ACCEL "F8" ++#define FULLSCREEN_ACCEL "F6" ++#define PRESENTATION_ACCEL NULL ++#else ++#define ZOOM_IN_ACCEL "plus" ++#define ZOOM_OUT_ACCEL "minus" ++#define FULLSCREEN_ACCEL "F11" ++#define PRESENTATION_ACCEL "F5" ++#endif ++ + /* Normal items */ + static const GtkActionEntry entries[] = { + { "File", NULL, N_("_File") }, +@@ -4308,10 +4358,10 @@ + G_CALLBACK (ev_window_cmd_edit_rotate_right) }, + + /* View menu */ +- { "ViewZoomIn", GTK_STOCK_ZOOM_IN, NULL, "plus", ++ { "ViewZoomIn", GTK_STOCK_ZOOM_IN, NULL, "ZOOM_IN_ACCEL", + N_("Enlarge the document"), + G_CALLBACK (ev_window_cmd_view_zoom_in) }, +- { "ViewZoomOut", GTK_STOCK_ZOOM_OUT, NULL, "minus", ++ { "ViewZoomOut", GTK_STOCK_ZOOM_OUT, NULL, "ZOOM_OUT_ACCEL", + N_("Shrink the document"), + G_CALLBACK (ev_window_cmd_view_zoom_out) }, + { "ViewReload", GTK_STOCK_REFRESH, N_("_Reload"), "R", +@@ -4410,10 +4460,10 @@ + { "ViewDual", EV_STOCK_VIEW_DUAL, N_("_Dual"), NULL, + N_("Show two pages at once"), + G_CALLBACK (ev_window_cmd_dual), FALSE }, +- { "ViewFullscreen", GTK_STOCK_FULLSCREEN, N_("_Fullscreen"), "F11", ++ { "ViewFullscreen", GTK_STOCK_FULLSCREEN, N_("_Fullscreen"), "FULLSCREEN_ACCEL", + N_("Expand the window to fill the screen"), + G_CALLBACK (ev_window_cmd_view_fullscreen) }, +- { "ViewPresentation", EV_STOCK_RUN_PRESENTATION, N_("_Presentation"), "F5", ++ { "ViewPresentation", EV_STOCK_RUN_PRESENTATION, N_("_Presentation"), "PRESENTATION_ACCEL", + N_("Run document as a presentation"), + G_CALLBACK (ev_window_cmd_view_presentation) }, + { "ViewBestFit", EV_STOCK_ZOOM_PAGE, N_("_Best Fit"), NULL, +@@ -4936,6 +4986,9 @@ + if (!window->priv->image) + return; + ++#ifdef USE_HILDON ++ fc = hildon_file_chooser_dialog_new (GTK_WINDOW (window), GTK_FILE_CHOOSER_ACTION_SAVE); ++#else + fc = gtk_file_chooser_dialog_new (_("Save Image"), + GTK_WINDOW (window), + GTK_FILE_CHOOSER_ACTION_SAVE, +@@ -4943,6 +4996,7 @@ + GTK_RESPONSE_CANCEL, + GTK_STOCK_SAVE, GTK_RESPONSE_OK, + NULL); ++#endif + + gtk_dialog_set_default_response (GTK_DIALOG (fc), GTK_RESPONSE_OK); + gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (fc), FALSE); +@@ -5096,6 +5150,9 @@ + if (g_list_length (window->priv->attach_list) == 1) + attachment = (EvAttachment *) window->priv->attach_list->data; + ++#ifdef USE_HILDON ++ fc = hildon_file_chooser_dialog_new (GTK_WINDOW (window), attachment ? GTK_FILE_CHOOSER_ACTION_SAVE : GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER); ++#else + fc = gtk_file_chooser_dialog_new ( + _("Save Attachment"), + GTK_WINDOW (window), +@@ -5104,6 +5161,7 @@ + GTK_RESPONSE_CANCEL, + GTK_STOCK_SAVE, GTK_RESPONSE_OK, + NULL); ++#endif + + gtk_dialog_set_default_response (GTK_DIALOG (fc), GTK_RESPONSE_OK); + gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (fc), TRUE); +@@ -5127,6 +5185,10 @@ + GtkAccelGroup *accel_group; + GError *error = NULL; + GtkWidget *sidebar_widget; ++ gchar *ui_file = NULL; ++#ifdef USE_HILDON ++ static HildonProgram * hildon_prog = NULL; ++#endif + + g_signal_connect (ev_window, "configure_event", + G_CALLBACK (window_configure_event_cb), NULL); +@@ -5135,6 +5197,17 @@ + + ev_window->priv = EV_WINDOW_GET_PRIVATE (ev_window); + ++#ifdef USE_HILDON ++ if (hildon_prog == NULL) { ++ hildon_prog = HILDON_PROGRAM (hildon_program_get_instance ()); ++ } else { ++ g_object_ref (hildon_prog); ++ } ++ ++ ev_window->priv->hildon_program = hildon_prog; ++ hildon_program_add_window (ev_window->priv->hildon_program, HILDON_WINDOW (ev_window)); ++#endif ++ + ev_window->priv->page_mode = PAGE_MODE_DOCUMENT; + ev_window->priv->title = ev_window_title_new (ev_window); + +@@ -5181,13 +5254,16 @@ + gtk_ui_manager_insert_action_group (ev_window->priv->ui_manager, + action_group, 0); + ++ ui_file = g_build_filename (DATADIR, UI_FILE, NULL); + if (!gtk_ui_manager_add_ui_from_file (ev_window->priv->ui_manager, +- DATADIR"/evince-ui.xml", ++ ui_file, + &error)) { + g_warning ("building menus failed: %s", error->message); + g_error_free (error); + } + ++ g_free (ui_file); ++ + #ifdef HAVE_GTK_RECENT + #if GTK_CHECK_VERSION(2,11,4) + ev_window->priv->recent_manager = gtk_recent_manager_get_default (); +@@ -5207,6 +5283,13 @@ + launchpad_integration_add_ui (ev_window->priv->ui_manager, + "/MainMenu/HelpMenu/LaunchpadItems"); + ++#ifdef USE_HILDON ++ hildon_window_set_menu (HILDON_WINDOW (ev_window), ++ GTK_MENU (gtk_ui_manager_get_widget (ev_window->priv->ui_manager, "/MainMenu"))); ++ ev_window->priv->toolbar = gtk_ui_manager_get_widget (ev_window->priv->ui_manager, "/DefaultToolBar"); ++ hildon_window_add_toolbar (HILDON_WINDOW (ev_window), GTK_TOOLBAR (ev_window->priv->toolbar)); ++ gtk_widget_show (ev_window->priv->toolbar); ++#else + ev_window->priv->menubar = + gtk_ui_manager_get_widget (ev_window->priv->ui_manager, + "/MainMenu"); +@@ -5227,6 +5310,7 @@ + gtk_box_pack_start (GTK_BOX (ev_window->priv->main_box), + ev_window->priv->toolbar, + FALSE, FALSE, 0); ++#endif + gtk_widget_show (ev_window->priv->toolbar); + + /* Add the main area */ +diff -Nur evince-2.20.0/shell/ev-window.h evince-2.20.0.new/shell/ev-window.h +--- evince-2.20.0/shell/ev-window.h 2007-09-17 13:19:25.000000000 -0300 ++++ evince-2.20.0.new/shell/ev-window.h 2007-09-18 22:28:49.000000000 -0300 +@@ -27,6 +27,10 @@ + #include + #include + ++#ifdef USE_HILDON ++#include ++#endif ++ + #include "ev-link.h" + #include "ev-page-cache.h" + +@@ -63,12 +67,20 @@ + + + struct _EvWindow { ++#ifdef USE_HILDON ++ HildonWindow base_instance; ++#else + GtkWindow base_instance; ++#endif + EvWindowPrivate *priv; + }; + + struct _EvWindowClass { ++#ifdef USE_HILDON ++ HildonWindowClass base_class; ++#else + GtkWindowClass base_class; ++#endif + }; + + GType ev_window_get_type (void); +diff -Nur evince-2.20.0/shell/main.c evince-2.20.0.new/shell/main.c +--- evince-2.20.0/shell/main.c 2007-09-17 13:19:25.000000000 -0300 ++++ evince-2.20.0.new/shell/main.c 2007-09-18 22:28:49.000000000 -0300 +@@ -42,6 +42,10 @@ + #include + #endif + ++#ifdef USE_HILDON ++#include ++#endif ++ + #include "ev-stock-icons.h" + #include "ev-job-queue.h" + #include "ev-file-helpers.h" +@@ -310,6 +314,9 @@ + char *accel_filename; + GError *error = NULL; + #endif ++#ifdef USE_HILDON ++ osso_context_t *osso_context = NULL; ++#endif + + context = g_option_context_new (_("GNOME Document Viewer")); + +@@ -324,6 +331,10 @@ + g_option_context_add_main_entries (context, goption_options, NULL); + #endif + ++#ifdef USE_HILDON ++ osso_context = osso_initialize (PACKAGE, VERSION, TRUE, NULL); ++#endif ++ + #if WITH_GNOME + program = gnome_program_init (PACKAGE, VERSION, + LIBGNOMEUI_MODULE, argc, argv, +@@ -382,6 +393,13 @@ + + gtk_main (); + ++#ifdef USE_HILDON ++ if (osso_context != NULL) { ++ osso_deinitialize (osso_context); ++ } ++#endif ++ ++ + #if WITH_GNOME + gnome_accelerators_sync (); + #else +diff -Nur evince-2.20.0/configure.ac evince-2.20.0.new/configure.ac +--- evince-2.20.0/configure.ac 2007-09-18 22:49:25.000000000 -0300 ++++ evince-2.20.0.new/configure.ac 2007-09-18 22:49:26.000000000 -0300 +@@ -59,6 +59,33 @@ + PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-2.0 >= $GTK_REQUIRED libglade-2.0 gnome-vfs-2.0) + PKG_CHECK_MODULES(SHELL_CORE, libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED launchpad-integration gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gnome-vfs-2.0 libglade-2.0 gconf-2.0 gnome-keyring-1 >= $KEYRING_REQUIRED) + ++dnl ============================================== ++dnl Maemo/Hildon based User Interface ++ ++AC_ARG_ENABLE(hildon, ++ AC_HELP_STRING([--enable-hildon],[Build with Maemo/Hildon support]), ++ enable_hildon="$enableval", ++ enable_hildon=no) ++ ++if test "x$enable_hildon" = "xyes" ; then ++ PKG_CHECK_MODULES(HILDON, ++ hildon-1 hildon-fm-2 libosso, ++ HAVE_HILDON=yes, HAVE_HILDON=no) ++fi ++ ++if test "x$HAVE_HILDON" = "xyes" ; then ++ AC_DEFINE(USE_HILDON, 1, [Build with Maemo/Hildon support]) ++fi ++ ++AM_CONDITIONAL(USE_HILDON, test "x$HAVE_HILDON" = "xyes") ++ ++HILDON_CFLAGS="$HILDON_CFLAGS -DUSE_STABLE_LIBGNOMEUI" ++AC_SUBST(HILDON_CFLAGS) ++AC_SUBST(HILDON_LIBS) ++ ++dnl ============================================== ++dnl GNOME libs ++ + AC_ARG_WITH(libgnome, + AC_HELP_STRING([--without-libgnome],[disable the use of libgnome]), + [case "${withval}" in +@@ -498,6 +525,7 @@ + echo " + Configure summary: + GNOME Support......: $WITH_GNOME ++ Hildon Support.....: $HAVE_HILDON + Print Support......: $enable_print + DBUS Support.......: $enable_dbus + Nautilus Plugin....: $HAVE_NAUTILUS +diff -Nur evince-2.20.0/shell/Makefile.am evince-2.20.0.new/shell/Makefile.am +--- evince-2.20.0/shell/Makefile.am 2007-09-24 14:23:16.000000000 -0300 ++++ evince-2.20.0.new/shell/Makefile.am 2007-09-24 14:28:40.000000000 -0300 +@@ -12,7 +12,8 @@ + $(WARN_CFLAGS) \ + $(DISABLE_DEPRECATED) \ + $(GNOME_PRINT_CFLAGS) \ +- $(GTK_PRINT_CFLAGS) ++ $(GTK_PRINT_CFLAGS) \ ++ $(HILDON_CFLAGS) + + if HAVE_GTK_RECENT + INCLUDES += +@@ -100,7 +101,8 @@ + $(top_builddir)/properties/libevproperties.la \ + $(top_builddir)/libdocument/libevbackend.la \ + $(SHELL_LIBS) \ +- $(GNOME_PRINT_LIBS) ++ $(GNOME_PRINT_LIBS) \ ++ $(HILDON_LIBS) + + if HAVE_GTK_RECENT + evince_LDADD += +diff -Nur evince-2.20.0/data/Makefile.am evince-2.20.0.new/data/Makefile.am +--- evince-2.20.0/data/Makefile.am 2007-09-18 22:48:36.000000000 -0300 ++++ evince-2.20.0.new/data/Makefile.am 2007-09-18 22:50:54.000000000 -0300 +@@ -15,11 +15,19 @@ + # + + uidir = $(pkgdatadir) ++if USE_HILDON ++ui_DATA = \ ++ evince-hildon-ui.xml \ ++ evince-toolbar.xml \ ++ hand-open.png \ ++ $(NULL) ++else + ui_DATA = \ + evince-ui.xml \ + evince-toolbar.xml \ + hand-open.png \ + $(NULL) ++endif + + # + # Glade +@@ -38,11 +46,18 @@ + @INTLTOOL_DESKTOP_RULE@ + + DESKTOP_IN_FILES= evince.desktop.in.in +-DESKTOP_FILES= $(DESKTOP_IN_FILES:.desktop.in.in=.desktop) +- + desktopdir = $(datadir)/applications ++ ++DESKTOP_FILES= $(DESKTOP_IN_FILES:.desktop.in.in=.desktop) + desktop_DATA = $(DESKTOP_FILES) + ++# ++# D-Bus service (Maemo) ++# ++if USE_HILDON ++dbus_servicedir = $(datadir)/dbus-1/services ++dbus_service_DATA = evince.service ++endif + + # + # GConf schema +@@ -107,6 +122,7 @@ + $(DESKTOP_IN_FILES) \ + $(schema_in_files) \ + $(man_MANS) \ ++ $(dbus_service_DATA) \ + $(NULL) + + #