[gimp-help] Issue #299 Remove unmaintained ODF support



commit acda7073b23f8f69b5a2af1d430acffa655fbc41
Author: Jacob Boerema <jgboerema gmail com>
Date:   Tue Feb 8 21:42:54 2022 -0500

    Issue #299 Remove unmaintained  ODF support
    
    We have optional support for converting our help from docbook to
    OpenDocument format (ODF).
    For this support we need package docbook2odf which has been
    unmaintained for a long time and was removed from Debian in 2019.
    
    For this reason we are removing ODF support for now. If a well
    maintained package appears and someone comes along to support it
    for gimp-help, then we can reconsider including ODF support again.

 .gitignore     |  1 -
 Makefile.GNU   | 41 +----------------------------------------
 Makefile.am    | 43 -------------------------------------------
 README.md      | 29 +----------------------------
 configure.ac   | 12 ------------
 make.help      |  5 ++---
 omf/gimp-C.omf | 33 ---------------------------------
 7 files changed, 4 insertions(+), 160 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 53ad372ed..3a02a6567 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,7 +19,6 @@ xml
 log
 html
 pdf
-odf
 *.tar.gz
 *.tar.bz2
 *.zip
diff --git a/Makefile.GNU b/Makefile.GNU
index b0433d423..911b251f7 100644
--- a/Makefile.GNU
+++ b/Makefile.GNU
@@ -53,8 +53,6 @@ MSGMERGEFLAGS = --quiet --width=$(MSGWIDTH)
 
 DBLATEX          = dblatex
 DBLATEXFLAGS     = --verbose
-DOCBOOK2ODF      = docbook2odf
-DOCBOOK2ODFFLAGS =
 
 SED = sed
 
@@ -740,43 +738,6 @@ pdf $(foreach lang,$(LANGUAGES),pdf-$(lang)):
 endif
 
 
-########################################################################
-####            Make ODF files:  XML --> ODF                        ####
-########################################################################
-
-ifneq ($(DOCBOOK2ODF),)
-
-odf: $(foreach lang,$(LANGUAGES),odf-$(lang)) ;
-odf-%: odf/%/gimp.odt ;
-
-# TODO?: images
-odf/%/gimp.odt: xml/%/gimp-alldocs.xml xml/%/images
-       $(cmd) if test -f odf/%.odt; then rm -f odf/%.odt; fi
-       $(cmd) test -d odf/$* || $(mkdir_p) odf/$*
-       $(msg) "*** Making ODF ($*) ..."
-       $(cmd) $(DOCBOOK2ODF) $(DOCBOOK2ODFFLAGS) \
-           --debug -v \
-           --output-dir=`pwd` \
-           --output-file=$@ \
-           $<
-
-# make temporary XML source file with all Xincludes resolved
-# TODO: find out how to avoid this
-xml/%/gimp-alldocs.xml: xml/%/gimp.xml
-       $(msg) "*** Merging XML ..."
-       $(cmd) $(XMLLINT) $(XMLLINTFLAGS) --xinclude --output $@ $<
-
-.PRECIOUS: odf/%/gimp.odt
-
-else
-
-odf $(foreach lang,$(LANGUAGES),odf-$(lang)):
-       @echo "*** Cannot build ODFs because DOCBOOK2ODF was not defined ***"
-       @exit 69
-
-endif
-
-
 ########################################################################
 ####            Make language-specific HTML tarballs                ####
 ########################################################################
@@ -824,7 +785,7 @@ $(tarball_prefix)-%.zip: $(tarball_prefix)-%.tar
 ########################################################################
 
 clean:
-       $(cmd) for dir in pot xml log html pdf odf; do \
+       $(cmd) for dir in pot xml log html pdf; do \
                test -d $${dir} || continue; \
                echo "Removing  $${dir} ..."; \
                rm -rf $${dir}; \
diff --git a/Makefile.am b/Makefile.am
index 62c2bb149..877d13213 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,7 +45,6 @@ DOC_LINGUAS = $(LINGUAS)
 ## MSGFMT, MSGFMTFLAGS
 ## MSGMERGE, MSGMERGEFLAGS
 ## DBLATEX, DBLATEXFLAGS
-## DOCBOOK2ODF, DOCBOOK2ODFFLAGS
 
 # HIDE FROM AUTOMAKE #ifneq ($(srcdir),$(builddir))
 # HIDE FROM AUTOMAKE #XSLTFLAGS += --path $(builddir)
@@ -790,46 +789,6 @@ pdf-local $(foreach lang,$(LANGUAGES),pdf-$(lang)):
 endif
 
 
-########################################################################
-####            Make ODF files:  XML --> ODF                        ####
-########################################################################
-if HAVE_DOCBOOK2ODF
-
-odf: $(foreach lang,$(LANGUAGES),odf-$(lang)) ;
-odf-%: odf/%/gimp.odt ;
-
-# TODO: images; prerequisites
-odf/%/gimp.odt: xml/%/gimp-alldocs.xml xml/%/images
-       $(cmd) if test -f odf/%.odt; then rm -f odf/%.odt; fi
-       $(cmd) test -d odf/$* || $(MKDIR_P) odf/$*
-       $(msg) "*** Making ODF ($*) ..."
-       $(cmd) $(DOCBOOK2ODF) $(DOCBOOK2ODFFLAGS) \
-           --debug -v \
-           --output-dir=`pwd` \
-           --output-file=$@ \
-           $<
-
-if HAVE_XMLLINT
-# make temporary XML source file with all Xincludes resolved
-xml/%/gimp-alldocs.xml: xml/%/gimp.xml
-       $(XMLLINT) $(XMLLINTFLAGS) --xinclude --output $@ $<
-else
-# TODO: use xsltproc and a simple stylesheet?
-xml/%/gimp-alldocs.xml: xml/%/gimp.xml
-       @echo "*** WARNING: Cannot resolve xincludes ***"; \
-       echo  "*** because xmllint(1) was not found. ***"; \
-       cp -v $< $@
-endif
-
-else
-
-odf $(foreach lang,$(LANGUAGES),odf-$(lang)):
-       @echo "*** Cannot build ODFs because docbook2odf(1) was not found ***"
-       @exit 69
-
-endif
-
-
 ########################################################################
 ####            Make language-specific HTML tarballs                ####
 ########################################################################
@@ -996,7 +955,6 @@ clean-local: mostlyclean-local
 # Like `clean-local', but may refrain from deleting a few files that people
 # normally don't want to recompile.
 mostlyclean-local:
-       $(cmd) rm -rf odf
        $(cmd) rm -rf pdf
        $(cmd) rm -rf xml
        $(cmd) rm -rf pot
@@ -1057,7 +1015,6 @@ SUFFIXES =
        xml/%/gimp.xml \
        xml/%/images \
        pdf/%/gimp.pdf \
-       odf/%/gimp.odt \
        html/%/index.html \
        html/%/gimp-xrefs.xml \
        html/%/gimp-help.xml \
diff --git a/README.md b/README.md
index 82efba1e7..b83292c75 100644
--- a/README.md
+++ b/README.md
@@ -18,8 +18,7 @@ called `gimp-help-2-10`.
 3. [Documentation issues](#documentation-issues)
 4. [Creating a Release](#creating-a-release)
 5. [Updating supported languages](#updating-supported-languages)
-6. [ODF Files](#odf-files)
-7. [History of the gimp-help module](#history-of-the-gimp-help-module)
+6. [History of the gimp-help module](#history-of-the-gimp-help-module)
 
 
 ## Published manuals
@@ -225,32 +224,6 @@ of languages needs to be updated in the following files:
     - Update my %Languages
 
 
-## ODF Files
-
-**Note:** this section needs to be updated and info about creating PDF files
-should probably be added too.
-
-You need docbook2odf installed to create ODF files. Although the
-transformation process is very slow (because every picture is copied to
-a temp directory), you can start the transformation by typing:
-
-    make odf
-
-Hint: Set the ALL_LINGUAS environment variable to create ODF files only
-for a particular language.
-Docbook2ODF can be obtained from the following website:
-
-    http://open.comsultia.com/docbook2odf/
-
-HINT: If you get an error opening the created ODT files, open
-docbook2odf (probably installed in /usr/bin/) in a text editor.
-Uncomment the line:
-
-    #use encoding 'utf-8';
-
-and rerun 'make odf'.
-
-
 ## History of the gimp-help module
 
 The development on the original gimp-help modules came pretty much to a
diff --git a/configure.ac b/configure.ac
index 3c0d70c5f..61e5ba1fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -139,18 +139,6 @@ DBLATEXFLAGS="--backend=xetex --style=db2latex --verbose"
 AC_SUBST(DBLATEXFLAGS)
 
 
-#  Search for docbook2odf
-
-AC_PATH_PROG(DOCBOOK2ODF, docbook2odf)
-if test -z "$DOCBOOK2ODF"; then
-  AC_MSG_NOTICE([cannot find docbook2odf(1), ODF generation disabled])
-fi
-
-AM_CONDITIONAL(HAVE_DOCBOOK2ODF, test -n "$DOCBOOK2ODF")
-DOCBOOK2ODFFLAGS=
-AC_SUBST(DOCBOOK2ODFFLAGS)
-
-
 #  Use our customized xml2po
 
 AM_PATH_PYTHON3(python3_required_version, libxml2, ,)
diff --git a/make.help b/make.help
index 4b88fcb92..d47c29f4f 100644
--- a/make.help
+++ b/make.help
@@ -19,12 +19,11 @@ Default (main) targets:
 Language-specific targets for making the GIMP-manual:
   html-LANG        Build HTML for language LANG (implies xml-LANG)
   pdf-LANG         Build  PDF for language LANG (implies xml-LANG)
-  odf-LANG         Build  ODF for language LANG (implies xml-LANG)
-
+ 
   Omitting LANG (e.g."make [..] html") is equivalent to making target
   for all languages: %LANGUAGES%
 
-  WARNING: Making HTML (or PDF, ODF, XML) will automatically update
+  WARNING: Making HTML (or PDF, XML) will automatically update
   -------  po files if necessary. This may lead to unintended commits
            when working directly on a GIT sandbox.
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]