updated chromium script

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}"

LFSPkgBuildScripts/desktop/chromium/chromium.LFSBuild

@@ -30,22 +30,24 @@ DOWHAT=${1:-"build"}
 rm -rf "$PKG" || true
 mkdir -p "$PKG"
 
+pushd $COMPILEAT 2>/dev/null||true
+
 	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
+		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
 
 		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
+				find -type f -path "*third_party/$LIB/*" ! -path "*third_party/$LIB/chromium/*" ! -path "*third_party/$LIB/google/*" ! -regex '.*.(gn|gni|isolate|py)' -delete
 			done
 
 		python build/linux/unbundle/replace_gn_files.py --system-libraries flac harfbuzz-ng libwebp libxslt yasm
 
-	GN_CONFIG=("google_api_key=\"$GOOGLE_API_KEY\""
-"google_default_client_id=\"$GOOGLE_DEFAULT_CLIENT_ID\""
-"google_default_client_secret=\"$GOOGLE_DEFAULT_CLIENT_SECRET\""
+		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'
@@ -112,7 +114,7 @@ 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
@@ -125,10 +127,10 @@ EOF
 		make PREFIX=/usr
 		rm -f $PKG/usr/bin/chromium
 		make PREFIX=/usr install-strip DESTDIR=$PKG||exit 1
-	cd ..
+		#cd ..
 
-	mkdir temp||true
-	cd temp
+			#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
 			#		;;
@@ -166,5 +168,5 @@ esac
 
 	echo "Removing source folder, please wait ..."
 	rm -r "$PKG" "${TARNAME}-${VERSION}"
+popd 2>/dev/null||true
 
-exit 0

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

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 "$@"

LFSPkgBuildScripts/desktop/firefox/firefox.LFSBuild

@@ -23,13 +23,17 @@ PKG="${OUTPUT}/${PKGNAME}"
 DOWHAT=${1:-"build"}
 rm -rf "$PKG" || true
 mkdir -p "$PKG"
+
+MOZCONFIGFILE="$(pwd)/mozconfig.firefox"
+
+pushd $COMPILEAT 2>/dev/null||true
 	tar -xvf "${SOURCEARCHIVES}/${SECTION}/${TARBALL}"
 
 	pushd "${TARNAME}-${VERSION}"
 
 		mkdir -pv $PKG/usr/share/applications $PKG/usr/share/pixmaps $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins
 
-	cp ../mozconfig.firefox mozconfig
+		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
@@ -41,6 +45,7 @@ pushd "${TARNAME}-${VERSION}"
 		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"
 
@@ -64,3 +69,4 @@ case $DOWHAT in
 	esac
 
 	rm -r "$PKG" "${TARNAME}-${VERSION}"
+popd 2>/dev/null||true

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

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}"
@@ -51,7 +53,7 @@ pushd $COMPILEAT 2>/dev/null||true
 		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

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"

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

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"