binfilter.die.die.die

Change-Id: Ia3c103e4343d309b997ed37e33a382ffdfbddac3
Reviewed-on: https://gerrit.libreoffice.org/1014
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>

.gitmodules

@@ -1,7 +1,3 @@
-[submodule "binfilter"]
-	path = binfilter
-	url = git://gerrit.libreoffice.org/binfilter
-	branch = .
 [submodule "dictionaries"]
 	path = dictionaries
 	url = git://gerrit.libreoffice.org/dictionaries

bin/distro-install-desktop-integration

@@ -169,7 +169,6 @@ add_wrapper loffice        soffice ""            "libreoffice" ""
 add_wrapper unopkg         unopkg  ""            "unopkg"      ""                                "gid_Module_Root_Brand"
 
 # there are two more desktop files for optional filters
-test -f $DESTDIR/gid_Module_Optional_Binfilter && echo "$PREFIXDIR/share/applications/libreoffice-binfilter.desktop" >>"$DESTDIR/gid_Module_Optional_Binfilter"
 test -f $DESTDIR/gid_Module_Optional_Xsltfiltersamples && echo "$PREFIXDIR/share/applications/libreoffice-xsltfilter.desktop" >>"$DESTDIR/gid_Module_Optional_Xsltfiltersamples"
 
 # $PREFIXDIR/bin/ooffice symlink is necessary by java UNO components to find

bin/distro-install-file-lists

@@ -133,16 +133,13 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
 
     if test "$SPLIT_OPT_FEATURES" = "YES" ; then
         if test "z$OOO_VENDOR" = "zMandriva" ; then
-            merge_flists gid_Module_Optional_Binfilter         $FILELISTSDIR/filter-binfilter_list.txt
-            merge_flists gid_Module_Langpack_Binfilter_en_US   $FILELISTSDIR/filter-binfilter_list.txt
             merge_flists gid_Module_Optional_Grfflt            $FILELISTSDIR/draw_list.txt
             merge_flists gid_Module_Optional_Headless          $FILELISTSDIR/common_list.txt
             merge_flists gid_Module_Optional_Javafilter        $FILELISTSDIR/common_list.txt
             merge_flists gid_Module_Optional_Pymailmerge       $FILELISTSDIR/pyuno_list.txt
             merge_flists gid_Module_Optional_Pyuno             $FILELISTSDIR/pyuno_list.txt
             merge_flists gid_Module_Optional_Xsltfiltersamples $FILELISTSDIR/common_list.txt
         else
-            merge_flists gid_Module_Optional_Binfilter         $FILELISTSDIR/filters_list.txt
             merge_flists gid_Module_Optional_Grfflt            $FILELISTSDIR/common_list.txt
             merge_flists gid_Module_Optional_Headless          $FILELISTSDIR/common_list.txt
             merge_flists gid_Module_Optional_Javafilter        $FILELISTSDIR/filters_list.txt
@@ -151,8 +148,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
             merge_flists gid_Module_Optional_Xsltfiltersamples $FILELISTSDIR/filters_list.txt
         fi
     else
-        merge_flists gid_Module_Optional_Binfilter         $FILELISTSDIR/common_list.txt
-        merge_flists gid_Module_Langpack_Binfilter         $FILELISTSDIR/common_list.txt
         merge_flists gid_Module_Optional_Grfflt            $FILELISTSDIR/common_list.txt
         merge_flists gid_Module_Optional_Headless          $FILELISTSDIR/common_list.txt
         merge_flists gid_Module_Optional_Javafilter        $FILELISTSDIR/common_list.txt
@@ -174,7 +169,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
             test -f gid_Module_Langpack_Calc_$lang      && lang_lists="$lang_lists gid_Module_Langpack_Calc_$lang" || :
             test -f gid_Module_Langpack_Base_$lang      && lang_lists="$lang_lists gid_Module_Langpack_Base_$lang" || :
             test -f gid_Module_Langpack_Writer_$lang    && lang_lists="$lang_lists gid_Module_Langpack_Writer_$lang" || :
-            test -f gid_Module_Langpack_Binfilter_$lang && lang_lists="$lang_lists gid_Module_Langpack_Binfilter_$lang" || :
             # Place helps on dedicated packages.
             test -f gid_Module_Helppack_Help_$lang      && sort -u gid_Module_Helppack_Help_$lang > $FILELISTSDIR/help_${lang}_list.txt || :
         else
@@ -187,7 +181,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
             test -f gid_Module_Langpack_Calc_$lang      && lang_lists="$lang_lists gid_Module_Langpack_Calc_$lang" || :
             test -f gid_Module_Langpack_Base_$lang      && lang_lists="$lang_lists gid_Module_Langpack_Base_$lang" || :
             test -f gid_Module_Langpack_Writer_$lang    && lang_lists="$lang_lists gid_Module_Langpack_Writer_$lang" || :
-            test -f gid_Module_Langpack_Binfilter_$lang && lang_lists="$lang_lists gid_Module_Langpack_Binfilter_$lang" || :
             test -f gid_Module_Helppack_Help_$lang      && lang_lists="$lang_lists gid_Module_Helppack_Help_$lang" || :
         fi
         if test -n "$lang_lists" ; then
@@ -320,9 +313,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
         mv_file_between_flists java_common_list.txt common_list.txt "$INSTALLDIR/program/classes.*"
         mv_file_between_flists java_common_list.txt common_list.txt $INSTALLDIR/program/libofficebean.so
         mv_file_between_flists java_common_list.txt common_list.txt "$INSTALLDIR/share/Scripts/java.*"
-        mv_file_between_flists java_common_list.txt filter-binfilter_list.txt $INSTALLDIR/program/classes/aportisdoc.jar
-        mv_file_between_flists java_common_list.txt filter-binfilter_list.txt $INSTALLDIR/program/classes/pocketword.jar
-        mv_file_between_flists java_common_list.txt filter-binfilter_list.txt $INSTALLDIR/program/classes/pexcel.jar
         mv_file_between_flists java_common_list.txt writer_list.txt $INSTALLDIR/program/classes/writer2latex.jar
 
         # Move arch-dependent/dup files from common to core
@@ -409,9 +399,6 @@ else
     create_package_directory gid_Module_Oo_Linguistic               pkg/libreoffice-common
     create_package_directory gid_Module_Optional_Xsltfiltersamples  pkg/libreoffice-common
     create_package_directory gid_Module_Optional_Javafilter         pkg/libreoffice-common
-    if [ -f gid_Module_Optional_Binfilter ]; then
-        create_package_directory gid_Module_Optional_Binfilter      pkg/libreoffice-filter-binfilter
-    fi
     create_package_directory gid_Module_Optional_Grfflt             pkg/libreoffice-draw
     create_package_directory gid_Module_Prg_Calc_Bin                pkg/libreoffice-calc
     create_package_directory gid_Module_Prg_Math_Bin                pkg/libreoffice-math
@@ -455,13 +442,7 @@ else
         create_package_directory gid_Module_Langpack_Brand_`echo $l | sed -e s/-/_/g`     pkg/libreoffice-l10n-$l
         create_package_directory gid_Module_Langpack_Resource_`echo $l | sed -e s/-/_/g`  pkg/libreoffice-l10n-$l
         create_package_directory gid_Module_Helppack_Help_`echo $l | sed -e s/-/_/g`      pkg/libreoffice-help-$l
-        if [ -f gid_Module_Optional_Binfilter ]; then
-            if [ "$l" = "en-US" ]; then
-                create_package_directory gid_Module_Langpack_Binfilter_en_US    pkg/libreoffice-filter-binfilter
-            else
-                create_package_directory gid_Module_Langpack_Binfilter_`echo $l | sed -e s/-/_/g`    pkg/libreoffice-l10n-$l
-            fi
-        fi
+
         # some help files are in _Langpack_{Writer,Impress,...}_<lang>
         # move them from -l10n to -help
         if [ "$l" = "en-US" ]; then d=en; else d=$l; fi

bin/lo-commit-stat

@@ -8,7 +8,7 @@ use LWP::UserAgent;
 use utf8;
 
 my $main_repo="core";
-my @pieces=("binfilter", "dictionaries", "help", "translations");
+my @pieces=("dictionaries", "help", "translations");
 
 my %bugzillas = (
     fdo  => "https://bugs.freedesktop.org/show_bug.cgi?id=",

bin/lo-pack-sources

@@ -340,7 +340,7 @@ my $lo_core_tempdir;
 my $force;
 my $verbose=1;
 my $is_lo_core_dir=0;
-my @pieces=("binfilter", "dictionaries", "help", "translations");
+my @pieces=("dictionaries", "help", "translations");
 my %piece_tarball_name;
 
 ###################

config_host.mk.in

@@ -673,7 +673,6 @@ export WINEGCC=@WINEGCC@
 export WITHOUT_AFMS=@WITHOUT_AFMS@
 export WITHOUT_PPDS=@WITHOUT_PPDS@
 #export WITH_AGFA_MONOTYPE_FONTS=@WITH_AGFA_MONOTYPE_FONTS@
-export WITH_BINFILTER=@WITH_BINFILTER@
 export WITH_COMPAT_OOWRAPPERS=@WITH_COMPAT_OOWRAPPERS@
 export WITH_EXTENSION_INTEGRATION=@WITH_EXTENSION_INTEGRATION@
 export WITH_EXTRA_EXTENSIONS=@WITH_EXTRA_EXTENSIONS@

configure.ac

@@ -943,12 +943,6 @@ AC_ARG_ENABLE(unix-qstart-libpng,
          enabling this is a good idea (ie. for Linux Distro packaging).]),
 ,enable_unix_qstart_libpng=yes)
 
-AC_ARG_ENABLE(binfilter,
-    AS_HELP_STRING([--enable-binfilter],
-        [Enable legacy binary file formats filters build.]),
-,enable_binfilter=no
-)
-
 AC_ARG_ENABLE(rpath,
     AS_HELP_STRING([--disable-rpath],
         [Disable the use of relative paths in shared libraries.]),
@@ -4351,21 +4345,6 @@ else
 fi
 AC_SUBST(DO_FETCH_TARBALLS)
 
-
-dnl Disable legacy binary file formats filters
-dnl ===================================================================
-AC_MSG_CHECKING([whether to enable filters for legacy binary file formats (StarOffice 5.2)])
-if test "$enable_binfilter" = "no"; then
-    WITH_BINFILTER="NO"
-    AC_MSG_RESULT([no])
-else
-    WITH_BINFILTER="YES"
-    BUILD_TYPE="$BUILD_TYPE BINFILTER"
-    GIT_NEEDED_SUBMODULES="binfilter $GIT_NEEDED_SUBMODULES"
-    AC_MSG_RESULT([yes])
-fi
-AC_SUBST(WITH_BINFILTER)
-
 AC_MSG_CHECKING([whether to build help])
 if test "$with_help" != "no" -a $_os != iOS -a $_os != Android; then
     AC_MSG_RESULT([yes])
@@ -12358,16 +12337,11 @@ fi
 AC_MSG_CHECKING([whether to create huge library])
 MERGELIBS=
 if test "$enable_mergelibs" = "yes" ; then
-    if test $WITH_BINFILTER = YES; then
-        add_warning "--enable-mergelibs conflicts with --enable-binfilter. Disabling mergelibs."
-        AC_MSG_RESULT([no])
-    else
-        if test $_os != Linux -a $_os != Android -a $_os != WINNT; then
-            add_warning "--enable-mergelibs is not tested for this platform"
-        fi
-        MERGELIBS="TRUE"
-        AC_MSG_RESULT([yes])
+    if test $_os != Linux -a $_os != Android -a $_os != WINNT; then
+        add_warning "--enable-mergelibs is not tested for this platform"
     fi
+    MERGELIBS="TRUE"
+    AC_MSG_RESULT([yes])
 else
     AC_MSG_RESULT([no])
 fi

distro-configs/LibreOfficeLinux.conf

@@ -37,7 +37,6 @@
 --enable-ext-pdfimport
 --enable-ext-nlpsolver
 --enable-epm
---enable-binfilter
 --enable-python=internal
 --enable-online-update
 --disable-unix-qstart-libpng

distro-configs/LibreOfficeMacOSX.conf

@@ -1,6 +1,5 @@
 --with-vendor=The Document Foundation
 --enable-epm
---enable-binfilter
 --with-java-target-version=1.5
 --enable-scripting-beanshell
 --enable-scripting-javascript

distro-configs/LibreOfficeMinGW.conf

@@ -22,7 +22,6 @@
 --without-junit
 --without-myspell-dicts
 --disable-activex
---disable-binfilter
 --disable-cairo-canvas
 --disable-build-mozilla
 --disable-directx

distro-configs/LibreOfficeOpenBSD.conf

@@ -10,7 +10,6 @@
 --disable-opengl
 --disable-randr-link
 --disable-unix-qstart-libpng
---enable-binfilter
 --enable-gstreamer-0-10
 --enable-lockdown
 --enable-ext-presenter-minimizer

distro-configs/LibreOfficeWin32.conf

@@ -7,7 +7,6 @@
 --enable-extension-integration
 --with-java-target-version=1.5
 --disable-gtk
---enable-binfilter
 --enable-scripting-beanshell
 --enable-scripting-javascript
 --enable-ext-wiki-publisher

distro-configs/OxygenOfficeLinux.conf

@@ -5,7 +5,6 @@
 --with-intro-progressbar-size=430,5
 --with-intro-progressbar-position=5,210
 --with-intro-progressbar-frame-color=138,156,190
---enable-binfilter
 --enable-vba
 --enable-mozilla
 --enable-build-mozilla

distro-configs/OxygenOfficeWin32.conf

@@ -2,7 +2,6 @@
 --with-build-version=OxygenOffice Professional Beta 3.4.0 M000 - OxygenOffice Build 0
 --with-intro-bitmap=$TARFILE_LOCATION/openintro_ooop.png
 --with-about-bitmap=$TARFILE_LOCATION/openabout_ooop.png
---enable-binfilter
 --enable-vba
 --disable-build-mozilla
 --disable-symbols