updated chromium script

2025-07-25 01:19:03 +00:00 · 2017-07-11 16:22:57 +01:00
parent 45e7759e46
commit 4b5df3b082
11 changed files with 164 additions and 254 deletions
--- a/LFSPkgBuildScripts/desktop/ImageMagick/ImageMagick.LFSBuild
+++ b/LFSPkgBuildScripts/desktop/ImageMagick/ImageMagick.LFSBuild
@ -31,21 +31,21 @@ tar -xvf "${SOURCEARCHIVES}/${SECTION}/${TARBALL}"
 pushd "${TARNAME}-${LATESTVERSION}"
 	CFLAGS="$LFSFLAGS" CXXFLAGS="$LFSFLAGS" ./configure ${CONFIGOPTIONS} -with-modules --with-perl  --with-rsvg --enable-hdri --with-autotrace --with-wmf --with-gvc
 	make $MAKEFLAGS||make|| exit 1
-	make DOCUMENTATION_PATH=/usr/share/doc/imagemagick-${VERSION} install DESTDIR=$PKG || exit 1
+	make DOCUMENTATION_PATH=/usr/share/doc/imagemagick-${LATESTVERSION} install DESTDIR=$PKG || exit 1
 popd

 checketc $PKG

 pushd "$PKG"
-	/usr/bin/lfspkg -n "$PKGNAME" -p "$VERSION" -d $SECTION -b $BUILD -s $SUFFIX -m
+	/usr/bin/lfspkg -n "$PKGNAME" -p "$LATESTVERSION" -d $SECTION -b $BUILD -s $SUFFIX -m
 popd

 case $DOWHAT in
 	up*)
-		lfspkg "^${PKGNAME}-[0-9][0-9]*" "${OUTPUT}/${SECTION}/${PKGNAME}-${VERSION}-${BUILD}_${SECTION}_${SUFFIX}.tar.gz" -u
+		lfspkg "^${PKGNAME}-[0-9][0-9]*" "${OUTPUT}/${SECTION}/${PKGNAME}-${LATESTVERSION}-${BUILD}_${SECTION}_${SUFFIX}.tar.gz" -u
 		;;
 	"install")
-		lfspkg "${OUTPUT}/${SECTION}/${PKGNAME}-${VERSION}-${BUILD}_${SECTION}_${SUFFIX}.tar.gz" -i
+		lfspkg "${OUTPUT}/${SECTION}/${PKGNAME}-${LATESTVERSION}-${BUILD}_${SECTION}_${SUFFIX}.tar.gz" -i
 		;;
 	"build")
 		echo "Just built"
@ -55,4 +55,4 @@ case $DOWHAT in
 		exit 1
 esac

-rm -r "$PKG" "${TARNAME}-${VERSION}"
+rm -r "$PKG" "${TARNAME}-${LATESTVERSION}"
--- a/LFSPkgBuildScripts/desktop/chromium/chromium.LFSBuild
+++ b/LFSPkgBuildScripts/desktop/chromium/chromium.LFSBuild
@ -30,89 +30,91 @@ DOWHAT=${1:-"build"}
 rm -rf "$PKG" || true
 mkdir -p "$PKG"

-tar -xvf "${SOURCEARCHIVES}/${SECTION}/${TARBALL}"
-pushd "${TARNAME}-${VERSION}"
-	sed 's/#include <sys\/mman\.h>/&\n\n#if defined(MADV_FREE)\n#undef MADV_FREE\n#endif\n/' -i third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp
-	sed "s/^config(\"compiler\") {/&\ncflags_cc = [ \"-fno-delete-null-pointer-checks\" ]/" -i build/config/linux/BUILD.gn
-	sed "s/WIDEVINE_CDM_AVAILABLE/&\n\n#define WIDEVINE_CDM_VERSION_STRING \"Pinkie Pie\"/" -i third_party/widevine/cdm/stub/widevine_cdm_version.h
+pushd $COMPILEAT 2>/dev/null||true

-	for LIB in flac harfbuzz-ng libwebp libxslt yasm
-		do
-			find -type f -path "*third_party/$LIB/*" \! -path "*third_party/$LIB/chromium/*" \! -path "*third_party/$LIB/google/*" \! -regex '.*\.\(gn\|gni\|isolate\|py\)' -delete
-		done
+	tar -xvf "${SOURCEARCHIVES}/${SECTION}/${TARBALL}"
+	pushd "${TARNAME}-${VERSION}"
+		sed 's/#include <sys/mman.h>/&nn#if defined(MADV_FREE)n#undef MADV_FREEn#endifn/' -i third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp
+		sed "s/^config("compiler") {/&ncflags_cc = [ "-fno-delete-null-pointer-checks" ]/" -i build/config/linux/BUILD.gn
+		sed "s/WIDEVINE_CDM_AVAILABLE/&nn#define WIDEVINE_CDM_VERSION_STRING "Pinkie Pie"/" -i third_party/widevine/cdm/stub/widevine_cdm_version.h

-	python build/linux/unbundle/replace_gn_files.py --system-libraries flac harfbuzz-ng libwebp libxslt yasm
+		for LIB in flac harfbuzz-ng libwebp libxslt yasm
+			do
+				find -type f -path "*third_party/$LIB/*" ! -path "*third_party/$LIB/chromium/*" ! -path "*third_party/$LIB/google/*" ! -regex '.*.(gn|gni|isolate|py)' -delete
+			done

-	GN_CONFIG=("google_api_key=\"$GOOGLE_API_KEY\""
-"google_default_client_id=\"$GOOGLE_DEFAULT_CLIENT_ID\""
-"google_default_client_secret=\"$GOOGLE_DEFAULT_CLIENT_SECRET\""
-'clang_use_chrome_plugins=false'
-'enable_hangout_services_extension=true'
-'enable_nacl=false'
-'enable_nacl_nonsfi=false'
-'enable_widevine=true'
-'fatal_linker_warnings=false'
-'ffmpeg_branding="Chrome"'
-'fieldtrial_testing_like_official_build=true'
-'is_debug=false'
-'is_clang=false'
-'link_pulseaudio=true'
-'linux_use_bundled_binutils=false'
-'proprietary_codecs=true'
-'remove_webcore_debug_symbols=true'
-'symbol_level=0'
-'treat_warnings_as_errors=false'
-'use_allocator="none"'
-'use_cups=true'
-'use_gconf=false'
-'use_gnome_keyring=false'
-'use_gold=false'
-'use_gtk3=false'
-'use_kerberos=true'
-'use_pulseaudio=true'
-'use_sysroot=false')
+		python build/linux/unbundle/replace_gn_files.py --system-libraries flac harfbuzz-ng libwebp libxslt yasm

-	python tools/gn/bootstrap/bootstrap.py --gn-gen-args "${GN_CONFIG[*]}"
-	out/Release/gn gen out/Release --args="${GN_CONFIG[*]}"
+		GN_CONFIG=("google_api_key="$GOOGLE_API_KEY""
+		"google_default_client_id="$GOOGLE_DEFAULT_CLIENT_ID""
+		"google_default_client_secret="$GOOGLE_DEFAULT_CLIENT_SECRET""
+		'clang_use_chrome_plugins=false'
+		'enable_hangout_services_extension=true'
+		'enable_nacl=false'
+		'enable_nacl_nonsfi=false'
+		'enable_widevine=true'
+		'fatal_linker_warnings=false'
+		'ffmpeg_branding="Chrome"'
+		'fieldtrial_testing_like_official_build=true'
+		'is_debug=false'
+		'is_clang=false'
+		'link_pulseaudio=true'
+		'linux_use_bundled_binutils=false'
+		'proprietary_codecs=true'
+		'remove_webcore_debug_symbols=true'
+		'symbol_level=0'
+		'treat_warnings_as_errors=false'
+		'use_allocator="none"'
+		'use_cups=true'
+		'use_gconf=false'
+		'use_gnome_keyring=false'
+		'use_gold=false'
+		'use_gtk3=false'
+		'use_kerberos=true'
+		'use_pulseaudio=true'
+		'use_sysroot=false')

-	ninja -C out/Release chrome chrome_sandbox chromedriver widevinecdmadapter
+		python tools/gn/bootstrap/bootstrap.py --gn-gen-args "${GN_CONFIG[*]}"
+		out/Release/gn gen out/Release --args="${GN_CONFIG[*]}"

-	install -vDm755  out/Release/chrome $PKG/usr/lib${LIBDIRSUFFIX}/chromium/chromium
-	install -vDm4755 out/Release/chrome_sandbox $PKG/usr/lib${LIBDIRSUFFIX}/chromium/chrome-sandbox
-	install -vDm755  out/Release/chromedriver $PKG/usr/lib${LIBDIRSUFFIX}/chromium/chromedriver
+		ninja -C out/Release chrome chrome_sandbox chromedriver widevinecdmadapter

-	mkdir -vp $PKG/usr/bin||true
-	ln -svf /usr/lib${LIBDIRSUFFIX}/chromium/chromium $PKG/usr/bin
-	ln -svf /usr/lib${LIBDIRSUFFIX}/chromium/chromedriver $PKG/usr/bin
+		install -vDm755  out/Release/chrome $PKG/usr/lib${LIBDIRSUFFIX}/chromium/chromium
+		install -vDm4755 out/Release/chrome_sandbox $PKG/usr/lib${LIBDIRSUFFIX}/chromium/chrome-sandbox
+		install -vDm755  out/Release/chromedriver $PKG/usr/lib${LIBDIRSUFFIX}/chromium/chromedriver

-	install -vm755 out/Release/libwidevinecdmadapter.so $PKG/usr/lib${LIBDIRSUFFIX}/chromium
-	install -vDm644 out/Release/icudtl.dat $PKG/usr/lib${LIBDIRSUFFIX}/chromium
-	install -vDm644 out/Release/gen/content/content_resources.pak $PKG/usr/lib${LIBDIRSUFFIX}/chromium
-	install -vm644 out/Release/{*.pak,*.bin} $PKG/usr/lib${LIBDIRSUFFIX}/chromium
+		mkdir -vp $PKG/usr/bin||true
+		ln -svf /usr/lib${LIBDIRSUFFIX}/chromium/chromium $PKG/usr/bin
+		ln -svf /usr/lib${LIBDIRSUFFIX}/chromium/chromedriver $PKG/usr/bin

-	cp -av out/Release/locales $PKG/usr/lib${LIBDIRSUFFIX}/chromium
-	chown -Rv root:root $PKG/usr/lib${LIBDIRSUFFIX}/chromium/locales
+		install -vm755 out/Release/libwidevinecdmadapter.so $PKG/usr/lib${LIBDIRSUFFIX}/chromium
+		install -vDm644 out/Release/icudtl.dat $PKG/usr/lib${LIBDIRSUFFIX}/chromium
+		install -vDm644 out/Release/gen/content/content_resources.pak $PKG/usr/lib${LIBDIRSUFFIX}/chromium
+		install -vm644 out/Release/{*.pak,*.bin} $PKG/usr/lib${LIBDIRSUFFIX}/chromium

-	install -vDm644 out/Release/chrome.1 $PKG/usr/share/man/man1/chromium.1
+		cp -av out/Release/locales $PKG/usr/lib${LIBDIRSUFFIX}/chromium
+		chown -Rv root:root $PKG/usr/lib${LIBDIRSUFFIX}/chromium/locales

-	for size in 16 32
-		do
-			install -vDm644 "chrome/app/theme/default_100_percent/chromium/product_logo_$size.png" "$PKG/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png"
-		done
+		install -vDm644 out/Release/chrome.1 $PKG/usr/share/man/man1/chromium.1

-	for size in 22 24 48 64 128 256
-		do
-			install -vDm644 "chrome/app/theme/chromium/product_logo_$size.png" "$PKG/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png"
-		done
+		for size in 16 32
+			do
+				install -vDm644 "chrome/app/theme/default_100_percent/chromium/product_logo_$size.png" "$PKG/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png"
+			done

-	mkdir -vp $PKG/usr/share/applications||true
-	cat > $PKG/usr/share/applications/chromium.desktop << "EOF"
+		for size in 22 24 48 64 128 256
+			do
+				install -vDm644 "chrome/app/theme/chromium/product_logo_$size.png" "$PKG/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png"
+			done
+
+		mkdir -vp $PKG/usr/share/applications||true
+		cat > $PKG/usr/share/applications/chromium.desktop << "EOF"
 [Desktop Entry]
 Encoding=UTF-8
 Name=Chromium Web Browser
 Comment=Access the Internet
 GenericName=Web Browser
-Exec=chromium %u
+Exec=chromium --disable-gpu %u
 Terminal=false
 Type=Application
 Icon=chromium
@ -120,51 +122,51 @@ Categories=GTK;Network;WebBrowser;
 MimeType=application/xhtml+xml;text/xml;application/xhtml+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
 EOF

-	tar -xf ${SOURCEARCHIVES}/${SECTION}/chromium-launcher-3.tar.gz
-	cd chromium-launcher-3
-	make PREFIX=/usr
-	rm -f $PKG/usr/bin/chromium
-	make PREFIX=/usr install-strip DESTDIR=$PKG||exit 1
-	cd ..
+		tar -xf ${SOURCEARCHIVES}/${SECTION}/chromium-launcher-3.tar.gz
+		cd chromium-launcher-3
+		make PREFIX=/usr
+		rm -f $PKG/usr/bin/chromium
+		make PREFIX=/usr install-strip DESTDIR=$PKG||exit 1
+		#cd ..

-	mkdir temp||true
-	cd temp
-#	case $(uname -m) in
-#		x86_64) ar -x ${SOURCEARCHIVES}/${SECTION}/google-chrome-stable_58.0.3029.96-1_amd64.deb
-#		;;
-#		x86) ar -x ${SOURCEARCHIVES}/${SECTION}/google-chrome-stable_48.0.2564.116-1_i386.deb
-#		;;
-#	esac
-#
-#	tar -xf data.tar.xz
-#	mkdir -vp $PKG/usr/lib${LIBDIRSUFFIX}/chromium/popd
-#	install -vm755 ../out/Release/libwidevinecdmadapter.so $PKG/usr/lib${LIBDIRSUFFIX}/chromium
-#	install -vm755 opt/google/chrome/libwidevinecdm.so $PKG/usr/lib${LIBDIRSUFFIX}/chromium/popd
-popd
+			#mkdir temp||true
+			#cd temp
+			#	case $(uname -m) in
+			#		x86_64) ar -x ${SOURCEARCHIVES}/${SECTION}/google-chrome-stable_58.0.3029.96-1_amd64.deb
+			#		;;
+			#		x86) ar -x ${SOURCEARCHIVES}/${SECTION}/google-chrome-stable_48.0.2564.116-1_i386.deb
+			#		;;
+			#	esac
+			#
+			#	tar -xf data.tar.xz
+			#	mkdir -vp $PKG/usr/lib${LIBDIRSUFFIX}/chromium/popd
+			#	install -vm755 ../out/Release/libwidevinecdmadapter.so $PKG/usr/lib${LIBDIRSUFFIX}/chromium
+			#	install -vm755 opt/google/chrome/libwidevinecdm.so $PKG/usr/lib${LIBDIRSUFFIX}/chromium/popd
+	popd

-checketc $PKG
-packageclean "$PKG"
+	checketc $PKG
+	packageclean "$PKG"

-pushd "$PKG"
-	/usr/bin/lfspkg -n "$PKGNAME" -p "$VERSION" -d $SECTION -b $BUILD -s $SUFFIX -m
-popd
+	pushd "$PKG"
+		/usr/bin/lfspkg -n "$PKGNAME" -p "$VERSION" -d $SECTION -b $BUILD -s $SUFFIX -m
+	popd

-case $DOWHAT in
-	up*)
-		lfspkg "^${PKGNAME}-[0-9][0-9]*" "${OUTPUT}/${SECTION}/${PKGNAME}-${VERSION}-${BUILD}_${SECTION}_${SUFFIX}.tar.gz" -u
-		;;
-	"install")
-		lfspkg "${OUTPUT}/${SECTION}/${PKGNAME}-${VERSION}-${BUILD}_${SECTION}_${SUFFIX}.tar.gz" -i
-		;;
-	"build")
-		echo "Just built"
-		;;
-	*)
-		echo "*** Unknown command ***"
-		exit 1
-esac
+	case $DOWHAT in
+		up*)
+			lfspkg "^${PKGNAME}-[0-9][0-9]*" "${OUTPUT}/${SECTION}/${PKGNAME}-${VERSION}-${BUILD}_${SECTION}_${SUFFIX}.tar.gz" -u
+			;;
+		"install")
+			lfspkg "${OUTPUT}/${SECTION}/${PKGNAME}-${VERSION}-${BUILD}_${SECTION}_${SUFFIX}.tar.gz" -i
+			;;
+		"build")
+			echo "Just built"
+			;;
+		*)
+			echo "*** Unknown command ***"
+			exit 1
+	esac

-echo "Removing source folder, please wait ..."
-rm -r "$PKG" "${TARNAME}-${VERSION}"
+	echo "Removing source folder, please wait ..."
+	rm -r "$PKG" "${TARNAME}-${VERSION}"
+popd 2>/dev/null||true

-exit 0
--- a/LFSPkgBuildScripts/desktop/chromium/chromium.desktop
+++ b/LFSPkgBuildScripts/desktop/chromium/chromium.desktop
@ -1,75 +0,0 @@
-[Desktop Entry]
-Exec=/usr/bin/chromium %U
-Icon=chromium
-Type=Application
-Categories=Network;
-Name=Chromium
-GenericName=Web Browser
-GenericName[af]=Web Blaaier
-GenericName[ar]=متصفح ويب
-GenericName[az]=Veb Səyyahı
-GenericName[bg]=Браузър
-GenericName[bn]=ওয়েব ব্রাউজার
-GenericName[br]=Furcher ar Gwiad
-GenericName[bs]=WWW Preglednik
-GenericName[ca]=Fullejador web
-GenericName[cs]=WWW prohlížeč
-GenericName[cy]=Porydd Gwe
-GenericName[da]=Browser
-GenericName[de]=Web-Browser
-GenericName[el]=Περιηγητής Ιστού
-GenericName[eo]=TTT-legilo
-GenericName[es]=Navegador web
-GenericName[et]=Veebilehitseja
-GenericName[eu]=Web arakatzailea
-GenericName[fa]=مرورگر وب
-GenericName[fi]=WWW-selain
-GenericName[fo]=Alnótsfar
-GenericName[fr]=Navigateur web
-GenericName[gl]=Navegador Web
-GenericName[he]=דפדפן אינטרנט
-GenericName[hi]=वेब ब्राउज़र
-GenericName[hr]=Web preglednik
-GenericName[hu]=Webböngésző
-GenericName[is]=Vafri
-GenericName[it]=Browser Web
-GenericName[ja]=ウェブブラウザ
-GenericName[ko]=웹 브라우저
-GenericName[lo]=ເວັບບຣາວເຊີ
-GenericName[lt]=Žiniatinklio naršyklė
-GenericName[lv]=Web Pārlūks
-GenericName[mk]=Прелистувач на Интернет
-GenericName[mn]=Веб-Хөтөч
-GenericName[nb]=Nettleser
-GenericName[nds]=Nettkieker
-GenericName[nl]=Webbrowser
-GenericName[nn]=Nettlesar
-GenericName[nso]=Seinyakisi sa Web
-GenericName[pa]=ਵੈਬ ਝਲਕਾਰਾ
-GenericName[pl]=Przeglądarka WWW
-GenericName[pt]=Navegador Web
-GenericName[pt_BR]=Navegador Web
-GenericName[ro]=Navigator de web
-GenericName[ru]=Веб-браузер
-GenericName[se]=Fierpmádatlogan
-GenericName[sk]=Webový prehliadač
-GenericName[sl]=Spletni brskalnik
-GenericName[sr]=Веб претраживач
-GenericName[sr@Latn]=Veb pretraživač
-GenericName[ss]=Ibrawuza yeWeb
-GenericName[sv]=Webbläsare
-GenericName[ta]=வலை உலாவி
-GenericName[tg]=Тафсиргари вэб
-GenericName[th]=เว็บบราวเซอร์
-GenericName[tr]=Web Tarayıcı
-GenericName[uk]=Навігатор Тенет
-GenericName[uz]=Веб-браузер
-GenericName[ven]=Buronza ya Webu
-GenericName[vi]=Trình duyệt Web
-GenericName[wa]=Betchteu waibe
-GenericName[xh]=Umkhangeli zincwadi we Web
-GenericName[zh_CN]=网页浏览器
-GenericName[zh_TW]=網頁瀏覽器
-GenericName[zu]=Umcingi we-Web
-MimeType=text/html;
-X-KDE-StartupNotify=true
--- a/LFSPkgBuildScripts/desktop/chromium/chromium.png
+++ b/LFSPkgBuildScripts/desktop/chromium/chromium.png
--- a/LFSPkgBuildScripts/desktop/chromium/chromium.sh
+++ b/LFSPkgBuildScripts/desktop/chromium/chromium.sh
@ -1,18 +0,0 @@
-#!/bin/bash
-
-#©keithhedger Wed 18 Mar 18:28:45 GMT 2015 kdhedger68713@gmail.com
-
-# Allow users to override command-line options
-# Based on Gentoo's chromium package (and by extension, Debian's)
-if [[ -f /etc/default/chromium.default ]]; then
-	. /etc/default/chromium.default
-fi
-
-# Prefer user defined CHROMIUM_USER_FLAGS (from env) over system
-# default CHROMIUM_FLAGS (from /etc/chromium/default)
-CHROMIUM_FLAGS=${CHROMIUM_USER_FLAGS:-$CHROMIUM_FLAGS}
-
-export CHROME_WRAPPER=$(readlink -f "$0")
-export CHROME_DESKTOP=chromium.desktop
-
-exec /usr/lib64/chromium/chromium $CHROMIUM_FLAGS "$@"
--- a/LFSPkgBuildScripts/desktop/firefox/firefox.LFSBuild
+++ b/LFSPkgBuildScripts/desktop/firefox/firefox.LFSBuild
@ -23,44 +23,50 @@ PKG="${OUTPUT}/${PKGNAME}"
 DOWHAT=${1:-"build"}
 rm -rf "$PKG" || true
 mkdir -p "$PKG"
-tar -xvf "${SOURCEARCHIVES}/${SECTION}/${TARBALL}"

-pushd "${TARNAME}-${VERSION}"
+MOZCONFIGFILE="$(pwd)/mozconfig.firefox"

-	mkdir -pv $PKG/usr/share/applications $PKG/usr/share/pixmaps $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins
+pushd $COMPILEAT 2>/dev/null||true
+	tar -xvf "${SOURCEARCHIVES}/${SECTION}/${TARBALL}"

-	cp ../mozconfig.firefox mozconfig
-#set the lib suffix in the config file
-	sed -i "s/libLIBDIRSUFFIX/lib${LIBDIRSUFFIX}/" mozconfig
-	sed -e s/_EVENT_SIZEOF/EVENT__SIZEOF/ -i ipc/chromium/src/base/message_pump_libevent.cc
+	pushd "${TARNAME}-${VERSION}"

-	export SHELL=/bin/sh
-	make -f client.mk|| exit 1
-	make -f client.mk install INSTALL_SDK= DESTDIR=$PKG|| exit 1
+		mkdir -pv $PKG/usr/share/applications $PKG/usr/share/pixmaps $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins

-	ln -sfv ../../../usr/lib${LIBDIRSUFFIX}/${PKGNAME}-${VERSION}/browser/icons/mozicon128.png $PKG/usr/share/pixmaps/firefox.png
-	ln -sfv ../mozilla/plugins $PKG/usr/lib${LIBDIRSUFFIX}/${PKGNAME}-${VERSION}
-popd
-checketc $PKG
-packageclean "$PKG"
+		cp "$MOZCONFIGFILE" mozconfig
+		#set the lib suffix in the config file
+		sed -i "s/libLIBDIRSUFFIX/lib${LIBDIRSUFFIX}/" mozconfig
+		sed -e s/_EVENT_SIZEOF/EVENT__SIZEOF/ -i ipc/chromium/src/base/message_pump_libevent.cc

-pushd "$PKG"
-	/usr/bin/lfspkg -n "$PKGNAME" -p "$VERSION" -d $SECTION -b $BUILD -s $SUFFIX -m
-popd
+		export SHELL=/bin/sh
+		make -f client.mk|| exit 1
+		make -f client.mk install INSTALL_SDK= DESTDIR=$PKG|| exit 1

-case $DOWHAT in
-	up*)
-		lfspkg "^${PKGNAME}-[0-9][0-9]*" "${OUTPUT}/${SECTION}/${PKGNAME}-${VERSION}-${BUILD}_${SECTION}_${SUFFIX}.tar.gz" -u
-		;;
-	"install")
-		lfspkg "${OUTPUT}/${SECTION}/${PKGNAME}-${VERSION}-${BUILD}_${SECTION}_${SUFFIX}.tar.gz" -i
-		;;
-	"build")
-		echo "Just built"
-		;;
-	*)
-		echo "*** Unknown command ***"
-		exit 1
-esac
+		ln -sfv ../../../usr/lib${LIBDIRSUFFIX}/${PKGNAME}-${VERSION}/browser/icons/mozicon128.png $PKG/usr/share/pixmaps/firefox.png
+		ln -sfv ../mozilla/plugins $PKG/usr/lib${LIBDIRSUFFIX}/${PKGNAME}-${VERSION}
+	popd

-rm -r "$PKG" "${TARNAME}-${VERSION}"
+	checketc $PKG
+	packageclean "$PKG"
+
+	pushd "$PKG"
+		/usr/bin/lfspkg -n "$PKGNAME" -p "$VERSION" -d $SECTION -b $BUILD -s $SUFFIX -m
+	popd
+
+	case $DOWHAT in
+		up*)
+			lfspkg "^${PKGNAME}-[0-9][0-9]*" "${OUTPUT}/${SECTION}/${PKGNAME}-${VERSION}-${BUILD}_${SECTION}_${SUFFIX}.tar.gz" -u
+			;;
+		"install")
+			lfspkg "${OUTPUT}/${SECTION}/${PKGNAME}-${VERSION}-${BUILD}_${SECTION}_${SUFFIX}.tar.gz" -i
+			;;
+		"build")
+			echo "Just built"
+			;;
+		*)
+			echo "*** Unknown command ***"
+			exit 1
+	esac
+
+	rm -r "$PKG" "${TARNAME}-${VERSION}"
+popd 2>/dev/null||true
--- a/LFSPkgBuildScripts/desktop/firefox/mozconfig.firefox
+++ b/LFSPkgBuildScripts/desktop/firefox/mozconfig.firefox
@ -1,7 +1,7 @@
 # If you have a multicore machine, firefox will now use all the cores by
 # default. Exceptionally, you can reduce the number of cores, e.g. to 1,
 # by uncommenting the next line and setting a valid number of CPU cores.
-#mk_add_options MOZ_MAKE_FLAGS="-j4"
+#mk_add_options MOZ_MAKE_FLAGS="-j2"

 # If you have installed DBus-Glib comment out this line:
 #ac_add_options --disable-dbus
--- a/LFSPkgBuildScripts/devel/OpenJDK/openjdk.LFSBuild
+++ b/LFSPkgBuildScripts/devel/OpenJDK/openjdk.LFSBuild
@ -34,6 +34,8 @@ DOWHAT=${1:-"build"}
 rm -rf "$PKG" || true
 mkdir -p "$PKG"

+IMAGEPATH=$(pwd)/javaws.png
+
 pushd $COMPILEAT 2>/dev/null||true
 	tar -xvf "${SOURCEARCHIVES}/${SECTION}/${TARROOTPKGNAME}${TARROOTPKGVERSION}.tar.bz2"
 	pushd "${TARROOTPKGNAME}-${TARROOTPKGNAME}${TARROOTPKGVERSION}"
@ -44,23 +46,23 @@ pushd $COMPILEAT 2>/dev/null||true
 			done
 		unset JAVA_HOME
 		PATH="${PATH}:/opt/jdk/bin"
-		
+
 		sh ./configure --with-update-version=${TARROOTPKGVERSION} --with-build-number=${TARROOTPKGSUBVERSION} --with-milestone=BLFS --enable-unlimited-crypto --with-zlib=system --with-giflib=system --with-extra-cflags="-std=c++98 -Wno-error -fno-delete-null-pointer-checks -fno-lifetime-dse" --with-extra-cxxflags="-std=c++98 -fno-delete-null-pointer-checks -fno-lifetime-dse"
 		make DEBUG_BINARIES=true SCTP_WERROR= all
 		find build/*/images/j2sdk-image -iname *.diz -delete
 		mkdir -vp $PKG/opt/${PKGNAME}-${VERSION} $PKG/opt/jdk $PKG/usr/share/pixmaps||true
 		cp -RT build/*/images/j2sdk-image $PKG/opt/${PKGNAME}-${VERSION}
 		chown -R root:root $PKG/opt/${PKGNAME}-${VERSION}
-		cp ../javaws.png $PKG/usr/share/pixmaps
+		cp "$IMAGEPATH" $PKG/usr/share/pixmaps
 	popd
-	
+
 	checketc $PKG
 	packageclean "$PKG"
-	
+
 	pushd "$PKG"
 		/usr/bin/lfspkg -n "$PKGNAME" -p "$VERSION" -d $SECTION -b $BUILD -s $SUFFIX -m
 	popd
-	
+
 	case $DOWHAT in
 		up*)
 			lfspkg "^${PKGNAME}-[0-9][0-9]*" "${OUTPUT}/${SECTION}/${PKGNAME}-${VERSION}-${BUILD}_${SECTION}_${SUFFIX}.tar.gz" -u
@ -75,7 +77,7 @@ pushd $COMPILEAT 2>/dev/null||true
 			echo "*** Unknown command ***"
 			exit 1
 	esac
-	
+
 	rm -r "$PKG" "${TARROOTPKGNAME}-${TARROOTPKGNAME}${TARROOTPKGVERSION}"
 popd 2>/dev/null||true

--- a/LFSPkgBuildScripts/lfsdesktop/LFSDesktop-meta/LFSDesktop-meta.LFSBuild
+++ b/LFSPkgBuildScripts/lfsdesktop/LFSDesktop-meta/LFSDesktop-meta.LFSBuild
@ -45,7 +45,7 @@ Thunderbird-45.7.1
 spacefm-1.0.5
 ManPageEditor-0.1.2
 AspellGUI-0.0.8
-KKEdit-0.2.11
+KKEdit-0.4.2
 xarchiver-0.5.4
 ClipboardViewer-2.2.1
 GtkSu-0.1.6"
--- a/LFSPkgBuildScripts/mm/mm-meta/mm-meta.LFSBuild
+++ b/LFSPkgBuildScripts/mm/mm-meta/mm-meta.LFSBuild
@ -41,13 +41,6 @@ gst-libav1.0-1.10.3
 dvdauthor-0.7.1
 gtkpod-1.0.0"

-#GStreamer-0.10.36
-#gst-plugins-base-0.10.36 
-#gst-plugins-good-0.10.31
-#gst-plugins-bad-0.10.23
-#gst-plugins-ugly-0.10.19
-#gst-ffmpeg-0.10.13
-
 if ! lfspkg -B "$DEPENDS";then
 	exit 100
 fi
--- a/Updating/UpdateScript1
+++ b/Updating/UpdateScript1
@ -60,7 +60,6 @@ while read
 				;;
 			"esac")
 				indent=$caseindent
-#				((indent--))
 				printLine $indent "$REPLY"
 				;;
 			*)
@ -70,4 +69,5 @@ while read
 				
 	done< <(cat /tmp/txt) >/tmp/clean.txt

+sed -i 's/^[\s\t]*$//g' /tmp/clean.txt
 cp /tmp/clean.txt "$1"