From a716a7e4701a96598f92a962cf647dc22cd84bb6 Mon Sep 17 00:00:00 2001
From: Colin Clark <colin.clark@cclark.uk>
Date: Sun, 11 Aug 2019 10:46:33 +0100
Subject: [PATCH] Remove references to .xcf files

The .xcf loader referenced decodes only up to v002, which is too old to
be of value.
---
 doc/docbook/GuideReferencePixbufLoaders.xml |  6 --
 web/geeqie-install-debian.sh                | 85 +--------------------
 2 files changed, 2 insertions(+), 89 deletions(-)

diff --git a/doc/docbook/GuideReferencePixbufLoaders.xml b/doc/docbook/GuideReferencePixbufLoaders.xml
index 88eadae7..3b0d3e3d 100644
--- a/doc/docbook/GuideReferencePixbufLoaders.xml
+++ b/doc/docbook/GuideReferencePixbufLoaders.xml
@@ -11,12 +11,6 @@
     <title>wmf</title>
     <para>libwmf0.2-7-gtk</para>
   </section>
-  <section id="xcf">
-    <title>xcf</title>
-    <para>
-      <programlisting>https://gitorious.org/xcf-pixbuf-loader/mainline?p=xcf-pixbuf-loader:mainline.git;a=summary</programlisting>
-    </para>
-  </section>
   <section id="jp2">
     <title>JP2/JPC/JPX/J2K/JPF</title>
     <para>If your distribution has the libpixbufloader-jasper.so loader, these file formats will also be displayed.</para>
diff --git a/web/geeqie-install-debian.sh b/web/geeqie-install-debian.sh
index 74bfa2b2..91b9ae0e 100755
--- a/web/geeqie-install-debian.sh
+++ b/web/geeqie-install-debian.sh
@@ -1,12 +1,11 @@
 #!/bin/bash
-version="2019-08-10"
+version="2019-08-11"
 description=$'
 Geeqie is an image viewer.
 This script will download, compile, and install Geeqie on Debian-based systems.
 If run from a folder that already contains the Geeqie sources, the source
 code will be updated from the repository.
-Dialogs allow the user to install additional features, including
-additional pixbuf loaders.
+Dialogs allow the user to install additional features.
 
 Command line options are:
 -v --version The version of this file
@@ -79,12 +78,6 @@ optional_gtk3_array=(
 "libpoppler-glib-dev"
 )
 
-# Optional pixbuf loaders
-optional_loaders_array=(
-".xcf Gimp files"
-"xcf"
-)
-
 ####################################################################
 # Get System Info
 # Derived from: https://github.com/coto/server-easy-install (GPL)
@@ -205,54 +198,6 @@ install_options()
 	fi
 }
 
-install_xcf()
-{
-	rm -rf xcf-pixbuf-loader
-	package_install libbz2-dev
-	git clone https://github.com/StephaneDelcroix/xcf-pixbuf-loader.git
-	cd xcf-pixbuf-loader
-	./autogen.sh
-	make
-
-	# There must be a better way...
-	loader_locn=$(gdk-pixbuf-query-loaders | grep "LoaderDir" | tr -d '#[:space:]')
-
-	OLDIFS=$IFS
-	IFS='='
-	set $loader_locn
-	OLDIFS=$IFS
-
-	if [ -d $2 ]
-	then
-		sudo --askpass cp .libs/libioxcf.so $2
-		sudo --askpass gdk-pixbuf-query-loaders --update-cache
-	fi
-	cd -
-	rm -rf xcf-pixbuf-loader
-}
-
-install_extra_loaders()
-{
-	if [ -n "$extra_loaders" ]
-	then
-		OLDIFS=$IFS
-		IFS='|'
-		set $extra_loaders
-		while [ $# -gt 0 ];
-		do
-			case $1 in
-			"xcf" )
-				install_xcf
-			;;
-			esac
-
-			shift
-		done
-		IFS=$OLDIFS
-	fi
-	return
-}
-
 uninstall()
 {
 	current_dir=$(basename $PWD)
@@ -506,19 +451,6 @@ then
 	done
 fi
 
-# Get the optional loaders not yet installed
-((i=0))
-gdk-pixbuf-query-loaders | grep xcf >/dev/null
-if [[ $? == 1 ]]
-then
-	if [ -z "$loaders_string" ]
-	then
-		loaders_string=$'FALSE\n'"${optional_loaders_array[$i]}"$'\n'"${optional_loaders_array[$i+1]}"
-	else
-		loaders_string="$loaders_string"$'\nFALSE\n'"${optional_loaders_array[$i]}"$'\n'"${optional_loaders_array[$i+1]}"
-	fi
-fi
-
 kill $zen_pid 2>/dev/null
 
 # Ask the user which options to install
@@ -532,17 +464,6 @@ then
 	fi
 fi
 
-# Ask the user which extra loaders to install
-if [ -n "$loaders_string" ]
-then
-	extra_loaders=$(echo "$loaders_string" | zenity --title="$title" --width=370 --height=400 --list --checklist --text 'These loaders are not part of the main repository,\nbut are known to work to some extent.' --column='Select' --column='Library files' --column='Library' --hide-column=3 --print-column=3 2>/dev/null)
-
-	if [[ $? == 1 ]]
-	then
-		exit_install
-	fi
-fi
-
 # Start of Zenity progress section
 zen_pipe=$(mktemp --dry-run --tmpdir geeqie_install_pipe_XXXXXX)
 mkfifo $zen_pipe
@@ -561,8 +482,6 @@ install_options
 echo "6" > $zen_pipe
 echo "#Installing extra loaders..." > $zen_pipe
 
-install_extra_loaders
-
 echo "10" > $zen_pipe
 echo "#Getting new sources from server..." > $zen_pipe
 
-- 
2.20.1