no longer enable Lefty in Autotools builds

1a4ad00b59cc1e1e9302fcbd1a205495ee59cab5 made the Autotools build system default
to disabling Lefty as a step towards its deprecation. As three months have
passed, the present commit takes the next step and removes Lefty support from
the portable tarball and stops building it in CI. Users who still want Lefty can
build from source and re-enable it. If we hear from no such users in the next
three months, build system support for Lefty will be removed altogether. If a
further three months go by with no complaints, Lefty will then be deleted from
the repository.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6c702ec93c8c211f09276ae96527ae0d8f1d288e..2e85825b7f155d77184c18ba1b343221f38b933a 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,7 +21,7 @@ portable-source:
         - export CPLUS_INCLUDE_PATH="/usr/include/python3.6m"
     script:
         - ./autogen.sh
-        - ./configure --enable-lefty --enable-man-pdfs
+        - ./configure --enable-man-pdfs
         - make dist
         - make dist-xz
     artifacts:

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63841cb7b8b703de29311ff24859be60dea1b25a..c099133a66b259dff0209398a0a863b86839a361 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -73,6 +73,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - CentOS 7 packages now include libmingle and the `mingle` program.
 - The tclpkg Makefile no longer suppresses `-fstack-clash-protection` nor
   other compiler options containing `-x`
+- Lefty is no longer enabled in the portable source tarball.
 
 ### Fixed
 

diff --git a/ci/build.sh b/ci/build.sh
index 22893b3bcedadecabbb2e58fd144ccd626c2d94c..075901a4ff8818ca0aea73369c3381d451fc21e7 100755 (executable)
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -63,14 +63,14 @@ elif [[ "${CONFIGURE_OPTIONS:-}" =~ "--enable-static" ]]; then
     GV_VERSION=$( cat GRAPHVIZ_VERSION )
     if [ "${use_autogen:-no}" = "yes" ]; then
         ./autogen.sh
-        ./configure --enable-lefty ${CONFIGURE_OPTIONS:-} --prefix=$( pwd )/build | tee >(./ci/extract-configure-log.sh >${META_DATA_DIR}/configure.log)
+        ./configure ${CONFIGURE_OPTIONS:-} --prefix=$( pwd )/build | tee >(./ci/extract-configure-log.sh >${META_DATA_DIR}/configure.log)
         make
         make install
         tar cf - -C build . | xz -9 -c - > ${DIR}/graphviz-${GV_VERSION}-${ARCH}.tar.xz
     else
         tar xfz graphviz-${GV_VERSION}.tar.gz
         pushd graphviz-${GV_VERSION}
-        ./configure --enable-lefty $CONFIGURE_OPTIONS --prefix=$( pwd )/build | tee >(../ci/extract-configure-log.sh >../${META_DATA_DIR}/configure.log)
+        ./configure $CONFIGURE_OPTIONS --prefix=$( pwd )/build | tee >(../ci/extract-configure-log.sh >../${META_DATA_DIR}/configure.log)
         make
         make install
         popd
@@ -92,7 +92,7 @@ else
         fi
     elif [[ "${OSTYPE}" =~ "darwin" ]]; then
         ./autogen.sh
-        ./configure --enable-lefty --prefix=$( pwd )/build --with-quartz=yes
+        ./configure --prefix=$( pwd )/build --with-quartz=yes
         make
         make install
         tar cfz ${DIR}/graphviz-${GV_VERSION}-${ARCH}.tar.gz --options gzip:compression-level=9 build

diff --git a/ci/out-of-source-build.sh b/ci/out-of-source-build.sh
index ebd24ea4bc4c0ebf57753f57e81fd63f611ca1c5..b5ba793b09f6e19b6b5200f36c8f1c5935102133 100755 (executable)
--- a/ci/out-of-source-build.sh
+++ b/ci/out-of-source-build.sh
@@ -20,7 +20,7 @@ tar xfz graphviz-${GV_VERSION}.tar.gz
 # setup a directory for building in
 mkdir build
 cd build
-../graphviz-${GV_VERSION}/configure --enable-lefty
+../graphviz-${GV_VERSION}/configure
 
 # build Graphviz
 make

diff --git a/debian/graphviz-doc.install b/debian/graphviz-doc.install
index 6ca4de588968d39003f133e0ae26c3714da62862..7a0a280a6c32f076562ea2969c02d649263a16c0 100644 (file)
--- a/debian/graphviz-doc.install
+++ b/debian/graphviz-doc.install
@@ -1,4 +1,3 @@
-usr/share/graphviz/lefty    usr/share/doc/graphviz/examples
 usr/share/graphviz/graphs   usr/share/doc/graphviz/examples
 usr/share/graphviz/demo     usr/share/doc/graphviz/examples
 usr/share/graphviz/doc/pdf  usr/share/doc/graphviz

diff --git a/debian/graphviz.install b/debian/graphviz.install
index c9bdfea4aa7efd684c037bc24bbc3f1d3307f4cd..4a5585dc576abbf50bb9736508b6b1ee5e966ce6 100644 (file)
--- a/debian/graphviz.install
+++ b/debian/graphviz.install
@@ -1,5 +1,4 @@
 usr/bin
 usr/share/man/man1
 usr/share/man/man7
-usr/share/graphviz/lefty
 usr/share/graphviz/smyrna

diff --git a/debian/graphviz.menu b/debian/graphviz.menu
index daed710409aab85cd96d8319ac1ea04b66e0b4e8..db3cb6e7c2764fc70d148a0700be45522d391942 100644 (file)
--- a/debian/graphviz.menu
+++ b/debian/graphviz.menu
@@ -1,4 +1,2 @@
 ?package(graphviz):needs="X11" section="Applications/Graphics" \
   title="dotty" command="/usr/bin/dotty"
-?package(graphviz):needs="X11" section="Applications/Graphics" \
-  title="lefty" command="/usr/bin/lefty"

diff --git a/debian/rules b/debian/rules
index 374f4e3e6c88fa49807ad271a481b3aa6fdbef5a..09d33d4eb8c6a76582de5bb6e932450724d787ea 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -85,7 +85,6 @@ configure-stamp:
        --disable-r \
        --enable-ruby \
        --enable-tcl \
-       --enable-lefty \
        LDFLAGS="-Wl,--as-needed"
        touch configure-stamp
 

diff --git a/redhat/graphviz.spec.fedora.in b/redhat/graphviz.spec.fedora.in
index b137dbebc2a8a10fad7b508c1c101c58cecb7345..7f4c240e0f32b492a532a363c10b070bed08587e 100644 (file)
--- a/redhat/graphviz.spec.fedora.in
+++ b/redhat/graphviz.spec.fedora.in
@@ -320,15 +320,12 @@ Graphviz commands with X11 dependencies
 %license COPYING
 %endif
 %doc COPYING AUTHORS CHANGELOG.md NEWS README
-%{_bindir}/lefty
 %{_bindir}/lneato
 %{_bindir}/dotty
 %{_bindir}/vimdot
-%{_mandir}/man1/lefty.1*
 %{_mandir}/man1/lneato.1*
 %{_mandir}/man1/dotty.1*
 %{_mandir}/man1/vimdot.1*
-%{_datadir}/graphviz/lefty
 %if %{GTK}
 %{_bindir}/smyrna
 %{_datadir}/graphviz/smyrna
@@ -897,7 +894,6 @@ CFLAGS="$RPM_OPT_FLAGS" \
         --with-ghostscript \
         --without-glitz \
         --with-ipsepcola \
-        --enable-lefty \
         --disable-python \
 %if ! %{PYTHON3}
         --disable-python3 \
@@ -961,7 +957,6 @@ make DESTDIR=%{buildroot} \
         pkgconfigdir=%{_libdir}/pkgconfig \
         install
 find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
-chmod -x %{buildroot}%{_datadir}/%{name}/lefty/*
 cp -a %{buildroot}%{_datadir}/%{name}/doc __doc
 rm -rf %{buildroot}%{_datadir}/%{name}/doc