From 69ea460e38e6bb7df642c5f4f98c7eb39d237243 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sat, 18 Sep 2010 11:15:53 +0200 Subject: evince : moved unused files to obsolete dir Signed-off-by: Frans Meulenbroeks --- recipes/evince/evince/more-no-doc.patch | 16 -- recipes/evince/evince/no-doc.patch | 245 ---------------------- recipes/evince/evince/no-help-dir.patch | 12 -- recipes/evince/evince/no-icon-theme.diff | 13 -- recipes/obsolete/evince/evince/more-no-doc.patch | 16 ++ recipes/obsolete/evince/evince/no-doc.patch | 245 ++++++++++++++++++++++ recipes/obsolete/evince/evince/no-help-dir.patch | 12 ++ recipes/obsolete/evince/evince/no-icon-theme.diff | 13 ++ 8 files changed, 286 insertions(+), 286 deletions(-) delete mode 100644 recipes/evince/evince/more-no-doc.patch delete mode 100644 recipes/evince/evince/no-doc.patch delete mode 100644 recipes/evince/evince/no-help-dir.patch delete mode 100644 recipes/evince/evince/no-icon-theme.diff create mode 100644 recipes/obsolete/evince/evince/more-no-doc.patch create mode 100644 recipes/obsolete/evince/evince/no-doc.patch create mode 100644 recipes/obsolete/evince/evince/no-help-dir.patch create mode 100644 recipes/obsolete/evince/evince/no-icon-theme.diff diff --git a/recipes/evince/evince/more-no-doc.patch b/recipes/evince/evince/more-no-doc.patch deleted file mode 100644 index ed8b6c3032..0000000000 --- a/recipes/evince/evince/more-no-doc.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- evince-0.5.0/Makefile.am.orig 2006-01-29 00:32:34.000000000 +0000 -+++ evince-0.5.0/Makefile.am 2006-01-29 00:32:45.000000000 +0000 -@@ -1,4 +1,4 @@ --SUBDIRS = cut-n-paste po help data -+SUBDIRS = cut-n-paste po data - - # Backends - ---- evince-0.5.0/help/Makefile.am.orig 2006-01-29 00:33:03.000000000 +0000 -+++ evince-0.5.0/help/Makefile.am 2006-01-29 00:33:16.000000000 +0000 -@@ -1,4 +1,4 @@ --include $(top_srcdir)/gnome-doc-utils.make -+#include $(top_srcdir)/gnome-doc-utils.make - dist-hook: doc-dist-hook - - DOC_MODULE = evince diff --git a/recipes/evince/evince/no-doc.patch b/recipes/evince/evince/no-doc.patch deleted file mode 100644 index 3d17447c98..0000000000 --- a/recipes/evince/evince/no-doc.patch +++ /dev/null @@ -1,245 +0,0 @@ ---- /tmp/Makefile.in 2005-06-25 12:19:41.760928864 +0200 -+++ evince-0.3.2/help/C/Makefile.in 2005-06-25 12:27:49.210825216 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.9.3 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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. -@@ -75,6 +75,7 @@ - # http://scrollkeeper.sourceforge.net/ - # Version: 0.1.2 (last updated: March 20, 2002) - # -+ - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ - VPATH = @srcdir@ -@@ -82,6 +83,7 @@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = ../.. -+ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd - INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 -@@ -95,21 +97,7 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -- $(top_srcdir)/help/omf.make $(top_srcdir)/help/xmldocs.make --subdir = help/C --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/configure.ac --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --DIST_SOURCES = --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ - AMDEP_FALSE = @AMDEP_FALSE@ -@@ -176,9 +164,12 @@ - INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ - INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ - INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -+INTLTOOL_ICONV = @INTLTOOL_ICONV@ - INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ - INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ - INTLTOOL_MERGE = @INTLTOOL_MERGE@ -+INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ -+INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ - INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ - INTLTOOL_PERL = @INTLTOOL_PERL@ - INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -@@ -191,6 +182,8 @@ - INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ - INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ - INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -+INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ -+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ - INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ - LDFLAGS = @LDFLAGS@ - LIBEVPRIVATE_CFLAGS = @LIBEVPRIVATE_CFLAGS@ -@@ -230,7 +223,6 @@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ - SHELL_LIBS = @SHELL_LIBS@ --SIZE = @SIZE@ - STRIP = @STRIP@ - THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@ - THUMBNAILER_LIBS = @THUMBNAILER_LIBS@ -@@ -248,8 +240,8 @@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ - ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_SIZE = @ac_ct_SIZE@ - ac_ct_STRIP = @ac_ct_STRIP@ -+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ - am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ - am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -@@ -257,8 +249,6 @@ - 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@ -@@ -301,43 +291,30 @@ - - # ************** You should not have to edit below this line ******************* - xml_files = $(entities) $(docname).xml -+ - EXTRA_DIST = $(xml_files) $(omffile) - CLEANFILES = omf_timestamp -+ - omf_dest_dir = $(datadir)/omf/@PACKAGE@ - scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper -+ - DISTCLEANFILES = evince-C.omf.out -+subdir = help/C -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/help/omf.make \ -+ $(top_srcdir)/help/xmldocs.make Makefile.am - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/help/xmldocs.make $(top_srcdir)/help/omf.make $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign help/C/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/help/xmldocs.make $(top_srcdir)/help/omf.make $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign help/C/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 -+ $(AUTOMAKE) --gnu help/C/Makefile -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo -@@ -354,9 +331,13 @@ - ctags: CTAGS - CTAGS: - -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- $(mkdir_p) $(distdir)/../../help -+ $(mkinstalldirs) $(distdir)/../../help - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ -@@ -368,7 +349,7 @@ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ -- $(mkdir_p) "$(distdir)$$dir"; \ -+ $(mkinstalldirs) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ -@@ -389,6 +370,7 @@ - check-am: all-am - check: check-am - all-am: Makefile -+ - installdirs: - install: install-am - install-exec: install-exec-am -@@ -410,7 +392,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) - - maintainer-clean-generic: -@@ -428,8 +410,6 @@ - - dvi-am: - --html: html-am -- - info: info-am - - info-am: -@@ -465,12 +445,11 @@ - uninstall-am: uninstall-info-am uninstall-local - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ -- dist-hook distclean distclean-generic distclean-libtool \ -- 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-exec install-exec-am install-info \ -- install-info-am install-man install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -+ distclean distclean-generic distclean-libtool distdir dvi \ -+ dvi-am info info-am install install-am install-data \ -+ install-data-am install-data-local install-exec install-exec-am \ -+ install-info install-info-am install-man install-strip \ -+ installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am uninstall-local -@@ -480,14 +459,14 @@ - - omf_timestamp: $(omffile) - -for file in $(omffile); do \ -- scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \ -+ true; \ - done - touch omf_timestamp - - install-data-hook-omf: - $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir) - for file in $(omffile); do \ -- $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ -+ true ; \ - done - -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) - diff --git a/recipes/evince/evince/no-help-dir.patch b/recipes/evince/evince/no-help-dir.patch deleted file mode 100644 index b242b65f76..0000000000 --- a/recipes/evince/evince/no-help-dir.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: evince-0.9.0/Makefile.am -=================================================================== ---- evince-0.9.0.orig/Makefile.am 2007-05-30 21:17:51.000000000 +0100 -+++ evince-0.9.0/Makefile.am 2007-05-30 21:17:58.000000000 +0100 -@@ -6,7 +6,6 @@ - properties \ - shell \ - po \ -- help \ - test - - if ENABLE_THUMBNAILER diff --git a/recipes/evince/evince/no-icon-theme.diff b/recipes/evince/evince/no-icon-theme.diff deleted file mode 100644 index 7b7771ba06..0000000000 --- a/recipes/evince/evince/no-icon-theme.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: configure.ac -=================================================================== ---- configure.ac (revision 2436) -+++ configure.ac (working copy) -@@ -57,7 +57,7 @@ - PKG_CHECK_MODULES(LIB, gtk+-2.0 >= $GTK_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED) - PKG_CHECK_MODULES(BACKEND, gtk+-2.0 >= $GTK_REQUIRED gnome-vfs-2.0) - 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 gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gnome-vfs-2.0 libglade-2.0 gconf-2.0 gnome-keyring-1 >= $KEYRING_REQUIRED) -+PKG_CHECK_MODULES(SHELL_CORE, libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gnome-vfs-2.0 libglade-2.0 gconf-2.0 gnome-keyring-1 >= $KEYRING_REQUIRED) - - AC_ARG_WITH(libgnome, - AC_HELP_STRING([--without-libgnome],[disable the use of libgnome]), diff --git a/recipes/obsolete/evince/evince/more-no-doc.patch b/recipes/obsolete/evince/evince/more-no-doc.patch new file mode 100644 index 0000000000..ed8b6c3032 --- /dev/null +++ b/recipes/obsolete/evince/evince/more-no-doc.patch @@ -0,0 +1,16 @@ +--- evince-0.5.0/Makefile.am.orig 2006-01-29 00:32:34.000000000 +0000 ++++ evince-0.5.0/Makefile.am 2006-01-29 00:32:45.000000000 +0000 +@@ -1,4 +1,4 @@ +-SUBDIRS = cut-n-paste po help data ++SUBDIRS = cut-n-paste po data + + # Backends + +--- evince-0.5.0/help/Makefile.am.orig 2006-01-29 00:33:03.000000000 +0000 ++++ evince-0.5.0/help/Makefile.am 2006-01-29 00:33:16.000000000 +0000 +@@ -1,4 +1,4 @@ +-include $(top_srcdir)/gnome-doc-utils.make ++#include $(top_srcdir)/gnome-doc-utils.make + dist-hook: doc-dist-hook + + DOC_MODULE = evince diff --git a/recipes/obsolete/evince/evince/no-doc.patch b/recipes/obsolete/evince/evince/no-doc.patch new file mode 100644 index 0000000000..3d17447c98 --- /dev/null +++ b/recipes/obsolete/evince/evince/no-doc.patch @@ -0,0 +1,245 @@ +--- /tmp/Makefile.in 2005-06-25 12:19:41.760928864 +0200 ++++ evince-0.3.2/help/C/Makefile.in 2005-06-25 12:27:49.210825216 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.3 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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. +@@ -75,6 +75,7 @@ + # http://scrollkeeper.sourceforge.net/ + # Version: 0.1.2 (last updated: March 20, 2002) + # ++ + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ +@@ -82,6 +83,7 @@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + top_builddir = ../.. ++ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 +@@ -95,21 +97,7 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +- $(top_srcdir)/help/omf.make $(top_srcdir)/help/xmldocs.make +-subdir = help/C +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + AMDEP_FALSE = @AMDEP_FALSE@ +@@ -176,9 +164,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ ++INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ ++INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ ++INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ +@@ -191,6 +182,8 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ ++INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ ++INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ + LIBEVPRIVATE_CFLAGS = @LIBEVPRIVATE_CFLAGS@ +@@ -230,7 +223,6 @@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ + SHELL_LIBS = @SHELL_LIBS@ +-SIZE = @SIZE@ + STRIP = @STRIP@ + THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@ + THUMBNAILER_LIBS = @THUMBNAILER_LIBS@ +@@ -248,8 +240,8 @@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ + ac_ct_RANLIB = @ac_ct_RANLIB@ +-ac_ct_SIZE = @ac_ct_SIZE@ + ac_ct_STRIP = @ac_ct_STRIP@ ++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ + am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +@@ -257,8 +249,6 @@ + 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@ +@@ -301,43 +291,30 @@ + + # ************** You should not have to edit below this line ******************* + xml_files = $(entities) $(docname).xml ++ + EXTRA_DIST = $(xml_files) $(omffile) + CLEANFILES = omf_timestamp ++ + omf_dest_dir = $(datadir)/omf/@PACKAGE@ + scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper ++ + DISTCLEANFILES = evince-C.omf.out ++subdir = help/C ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/help/omf.make \ ++ $(top_srcdir)/help/xmldocs.make Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/help/xmldocs.make $(top_srcdir)/help/omf.make $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign help/C/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/help/xmldocs.make $(top_srcdir)/help/omf.make $(top_srcdir)/configure.ac $(ACLOCAL_M4) + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign help/C/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 ++ $(AUTOMAKE) --gnu help/C/Makefile ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo +@@ -354,9 +331,13 @@ + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkdir_p) $(distdir)/../../help ++ $(mkinstalldirs) $(distdir)/../../help + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ +@@ -368,7 +349,7 @@ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ ++ $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ +@@ -389,6 +370,7 @@ + check-am: all-am + check: check-am + all-am: Makefile ++ + installdirs: + install: install-am + install-exec: install-exec-am +@@ -410,7 +392,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + + maintainer-clean-generic: +@@ -428,8 +410,6 @@ + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: +@@ -465,12 +445,11 @@ + uninstall-am: uninstall-info-am uninstall-local + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- dist-hook distclean distclean-generic distclean-libtool \ +- 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-exec install-exec-am install-info \ +- install-info-am install-man install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ ++ distclean distclean-generic distclean-libtool distdir dvi \ ++ dvi-am info info-am install install-am install-data \ ++ install-data-am install-data-local install-exec install-exec-am \ ++ install-info install-info-am install-man install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-info-am uninstall-local +@@ -480,14 +459,14 @@ + + omf_timestamp: $(omffile) + -for file in $(omffile); do \ +- scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \ ++ true; \ + done + touch omf_timestamp + + install-data-hook-omf: + $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir) + for file in $(omffile); do \ +- $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ ++ true ; \ + done + -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) + diff --git a/recipes/obsolete/evince/evince/no-help-dir.patch b/recipes/obsolete/evince/evince/no-help-dir.patch new file mode 100644 index 0000000000..b242b65f76 --- /dev/null +++ b/recipes/obsolete/evince/evince/no-help-dir.patch @@ -0,0 +1,12 @@ +Index: evince-0.9.0/Makefile.am +=================================================================== +--- evince-0.9.0.orig/Makefile.am 2007-05-30 21:17:51.000000000 +0100 ++++ evince-0.9.0/Makefile.am 2007-05-30 21:17:58.000000000 +0100 +@@ -6,7 +6,6 @@ + properties \ + shell \ + po \ +- help \ + test + + if ENABLE_THUMBNAILER diff --git a/recipes/obsolete/evince/evince/no-icon-theme.diff b/recipes/obsolete/evince/evince/no-icon-theme.diff new file mode 100644 index 0000000000..7b7771ba06 --- /dev/null +++ b/recipes/obsolete/evince/evince/no-icon-theme.diff @@ -0,0 +1,13 @@ +Index: configure.ac +=================================================================== +--- configure.ac (revision 2436) ++++ configure.ac (working copy) +@@ -57,7 +57,7 @@ + PKG_CHECK_MODULES(LIB, gtk+-2.0 >= $GTK_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED) + PKG_CHECK_MODULES(BACKEND, gtk+-2.0 >= $GTK_REQUIRED gnome-vfs-2.0) + 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 gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gnome-vfs-2.0 libglade-2.0 gconf-2.0 gnome-keyring-1 >= $KEYRING_REQUIRED) ++PKG_CHECK_MODULES(SHELL_CORE, libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gnome-vfs-2.0 libglade-2.0 gconf-2.0 gnome-keyring-1 >= $KEYRING_REQUIRED) + + AC_ARG_WITH(libgnome, + AC_HELP_STRING([--without-libgnome],[disable the use of libgnome]), -- cgit v1.2.3