Updating to current GCC Linux Kernel Version (5.7.12) Compatibility.

4 files changed, 85 insertions, 92 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 69d89c765d37..5b7b21b44c5a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,9 @@
-# Generated by mksrcinfo v8
-# Wed Oct 19 21:30:43 UTC 2016
 pkgbase = fbsplash
-	pkgdesc = Userspace splash screen implementation (formerly 'gensplash') (deprecated, see: Plymouth)
+	pkgdesc = A userspace implementation of a splash screen for Linux (formerly known as gensplash)
 	pkgver = 1.5.4.4
-	pkgrel = 17
-	url = http://sourceforge.net/projects/fbsplash.berlios/
+	pkgrel = 16
+	url = http://fbsplash.alanhaggai.org
 	install = fbsplash.install
-	arch = i686
 	arch = x86_64
 	license = GPL
 	depends = miscsplashutils
@@ -21,11 +18,11 @@ pkgbase = fbsplash
 	optdepends = uswsusp-fbsplash: suspend to disk with fbsplash
 	optdepends = python: convert themes from splashy to fbsplash
 	conflicts = fbsplash-scripts
-	conflicts = initscripts-extras-fbsplash
+	conflicts = initscripts-fork
 	options = !makeflags
 	backup = etc/conf.d/fbcondecor
 	backup = etc/conf.d/splash
-	source = http://heanet.dl.sourceforge.net/project/fbsplash.berlios/splashutils-1.5.4.4.tar.bz2
+	source = https://master.dl.sourceforge.net/project/fbsplash.berlios/splashutils-lite-1.5.4.4.tar.bz2
 	source = splash_start_initcpio.patch
 	source = splash.conf
 	source = fbsplash-basic.sh
@@ -33,16 +30,16 @@ pkgbase = fbsplash
 	source = fbsplash.initcpio_hook
 	source = fbcondecor.daemon
 	source = fbcondecor.conf
-	source = freetype2.patch
-	md5sums = 2a16704c4adde97b58812cd89e3f2342
+	source = fbsplash-freetype-fix.patch
+	md5sums = 29bbb355919a2f27c40dbfc8075c4a8d
 	md5sums = 4045e315c52f5a576fca4f7e634eeb91
 	md5sums = 90708a96038d7d7921c2e9fde938c058
 	md5sums = b5e6c08bbe7645a1c035565ea7d66437
 	md5sums = 2860cc29d5da2ea65c810de068bcc262
 	md5sums = f65cf94d4d4959bb44cda5fa634ab405
-	md5sums = 631b10db2f7c4b70062e79b60541ddbb
+	md5sums = 4b1bc27908fd763c57d8137035418d5c
 	md5sums = b3db9d4fd902b62ac9e38589677e2d16
-	md5sums = b3da198e805a988b62d70a2dd6895384
+	md5sums = 64cf5c9a86b595733e8f2f428a183419
 
 pkgname = fbsplash
 
diff --git a/PKGBUILD b/PKGBUILD
index 577d65c61e08..37b854db4e2a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,94 +1,75 @@
-# Maintainer: Det
-# Contributors: Tom Kwok, Heiko Baums, Kurt J. Bosch
+# Maintainer: Heiko Baums <heiko@baums-on-web.de>
+# Contributor: Kurt J. Bosch <kjb-temp-2009 at alpenjodel.de>
 
 pkgname=fbsplash
 pkgver=1.5.4.4
-pkgrel=17
-pkgdesc="Userspace splash screen implementation (formerly 'gensplash') (deprecated, see: Plymouth)"
-arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/fbsplash.berlios/"
+pkgrel=16
+pkgdesc="A userspace implementation of a splash screen for Linux (formerly known as gensplash)"
+arch=('x86_64')
+url="http://fbsplash.alanhaggai.org"
 license=('GPL')
 depends=('miscsplashutils' 'freetype2' 'libjpeg' 'libpng' 'libmng' 'lcms' 'gpm') 
 optdepends=('linux-fbcondecor: enable console background images'
             'fbsplash-extras: additional functionality like daemon icons'
             'uswsusp-fbsplash: suspend to disk with fbsplash'
             'python: convert themes from splashy to fbsplash')
-conflicts=('fbsplash-scripts' 'initscripts-extras-fbsplash')
+conflicts=('fbsplash-scripts' 'initscripts-fork')
 options=('!makeflags')
-backup=('etc/conf.d/fbcondecor'
-        'etc/conf.d/splash')
-install=$pkgname.install
-source=("http://heanet.dl.sourceforge.net/project/fbsplash.berlios/splashutils-1.5.4.4.tar.bz2"
-        'splash_start_initcpio.patch'
-        'splash.conf'
-        'fbsplash-basic.sh'
-        'fbsplash.initcpio_install'
-        'fbsplash.initcpio_hook'
-        'fbcondecor.daemon'
-        'fbcondecor.conf'
-	'freetype2.patch')
-md5sums=('2a16704c4adde97b58812cd89e3f2342'
-         '4045e315c52f5a576fca4f7e634eeb91'
-         '90708a96038d7d7921c2e9fde938c058'
-         'b5e6c08bbe7645a1c035565ea7d66437'
-         '2860cc29d5da2ea65c810de068bcc262'
-         'f65cf94d4d4959bb44cda5fa634ab405'
-         '631b10db2f7c4b70062e79b60541ddbb'
-         'b3db9d4fd902b62ac9e38589677e2d16'
-         'b3da198e805a988b62d70a2dd6895384')
+backup=('etc/conf.d/fbcondecor' 'etc/conf.d/splash')
+install=fbsplash.install
+source=(https://master.dl.sourceforge.net/project/fbsplash.berlios/splashutils-lite-${pkgver}.tar.bz2
+        splash_start_initcpio.patch
+        splash.conf
+        fbsplash-basic.sh
+        fbsplash.initcpio_install
+        fbsplash.initcpio_hook
+        fbcondecor.daemon
+        fbcondecor.conf
+	fbsplash-freetype-fix.patch)
 
 build() {
-  cd splashutils-$pkgver
+  cd "$srcdir/splashutils-$pkgver"
 
-  msg2 "Running 'autoreconf'.."
   autoreconf -i
 
   # fix fbcondecor_ctl splash type
-  sed -i 's|fbsplash_lib_init(fbspl_bootup)|fbsplash_lib_init(fbspl_undef)|' src/fbcon_decor_ctl.c
+  sed -e 's,fbsplash_lib_init(fbspl_bootup),fbsplash_lib_init(fbspl_undef),' -i src/fbcon_decor_ctl.c
 
   # fix libdir
-  sed -i "s|/lib/splash/cache|/usr/lib/splash/cache|g" debian/splashutils.dirs
-  sed -i "s|/lib/splash/tmp|/usr/lib/splash/tmp|g" debian/splashutils.dirs
-  sed -i "s|/lib/splash/cache|/usr/lib/splash/cache|g" debian/splash.conf
-  sed -i "s|/lib/splash/cache|/usr/lib/splash/cache|g" debian/changelog
-  sed -i "s|/lib/splash/tmp|/usr/lib/splash/tmp|g" debian/changelog
-  sed -i "s|/lib/splash/cache|/usr/lib/splash/cache|g" docs/daemon
-  sed -i "s|@libdir@/splash/cache|/usr/lib/splash/cache|g" scripts/splash-functions.sh.in
-  sed -i "s|@libdir@/splash/tmp|/usr/lib/splash/tmp|g" scripts/splash-functions.sh.in
-  sed -i "s|@libdir@/splash/bin|/usr/lib/splash/bin|g" scripts/splash-functions.sh.in
-  sed -i "s|/lib/splash/cache|/usr/lib/splash/cache|g" src/daemon_cmd.c
-  sed -i "s|@libdir@/splash/sys|/usr/lib/splash/sys|g" scripts/splash_geninitramfs.in
-  sed -i "s|@libdir@/splash|/usr/lib/splash|g" scripts/splash_manager.in
-  sed -i "s|@libdir@/splash|/usr/lib/splash|g" src/fbsplash.h.in
-
-  #Fix freetype => freetype2
-  sed -i 's|\(#include <freetype\)/|\12/|' src/libfbsplashrender.c
-
-  patch -Np2 -i "$srcdir/freetype2.patch"
-#  sed -i 's|\(#include <freetype\)/|\12/|' src/ttf.h
-#  sed -i 's|\(#include <freetype\)/|\12/|' src/ttf.c
+  sed -i "s:/lib/splash/cache:/usr/lib/splash/cache:g" debian/splashutils.dirs
+  sed -i "s:/lib/splash/tmp:/usr/lib/splash/tmp:g" debian/splashutils.dirs
+  sed -i "s:/lib/splash/cache:/usr/lib/splash/cache:g" debian/splash.conf
+  sed -i "s:/lib/splash/cache:/usr/lib/splash/cache:g" debian/changelog
+  sed -i "s:/lib/splash/tmp:/usr/lib/splash/tmp:g" debian/changelog
+  sed -i "s:/lib/splash/cache:/usr/lib/splash/cache:g" docs/daemon
+  sed -i "s:@libdir@/splash/cache:/usr/lib/splash/cache:g" scripts/splash-functions.sh.in
+  sed -i "s:@libdir@/splash/tmp:/usr/lib/splash/tmp:g" scripts/splash-functions.sh.in
+  sed -i "s:@libdir@/splash/bin:/usr/lib/splash/bin:g" scripts/splash-functions.sh.in
+  sed -i "s:/lib/splash/cache:/usr/lib/splash/cache:g" src/daemon_cmd.c
+  sed -i "s:@libdir@/splash/sys:/usr/lib/splash/sys:g" scripts/splash_geninitramfs.in
+  sed -i "s:@libdir@/splash:/usr/lib/splash:g" scripts/splash_manager.in
+  sed -i "s:@libdir@/splash:/usr/lib/splash:g" src/fbsplash.h.in
+
+  sed -i '17 a #include <sys/sysmacros.h>' src/common.c
 
   # fix set_event_dev call for initcpio usage (if evdev module is there)
-  #patch -Np2 -i "$srcdir/splash_start_initcpio.patch"
+  patch -Np2 -i "$srcdir/splash_start_initcpio.patch"
+
+  # patch to fix freetype error when compiling.
+  patch -Np1 -i "$srcdir/fbsplash-freetype-fix.patch"
 
   export LIBS="-lbz2"
-  
-  msg2 "Running './configure'.."
+  export LDFLAGS+=" -z muldefs"
+  export LIBTOOL="/usr/bin/libtool/"
+
   ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --without-klibc --enable-fbcondecor --with-gpm --with-mng --with-png --with-ttf --with-ttf-kernel
-  
-  msg2 "Running 'make'.."
-  make
+  make 
 }
 
 package() {
-  cd splashutils-$pkgver
+  cd "$srcdir/splashutils-$pkgver"
 
-  msg2 "Running 'make install'.."
-  make DESTDIR="$pkgdir" \
-       sbindir="/usr/bin" \
-	   eexecbindir="/usr/bin" \
-	   eexecsbindir="/usr/bin" \
-	 install
+  make  DESTDIR="$pkgdir" sbindir="/usr/bin" eexecbindir="/usr/bin" eexecsbindir="/usr/bin" install
 
   cd "$pkgdir"
 
@@ -99,16 +80,29 @@ package() {
   sed -r -e 's|sbin|usr/bin|g' -i usr/bin/splash{-functions.sh,_{geninitramfs,manager}} usr/share/doc/splashutils/{porting,early_bootup} usr/include/fbsplash.h
 
   # provide the mountpoint needed by splash-functions.sh
-  install -dm755 usr/lib/splash/{cache,tmp}
-  install -dm700 usr/lib/splash/sys
+  install -m755 -d usr/lib/splash/{cache,tmp}
+  install -m700 -d usr/lib/splash/sys
 
   # Install fbsplash scripts and config file
-  install -Dm644 "$srcdir"/splash.conf etc/conf.d/splash
-  install -Dm644 "$srcdir"/fbsplash-basic.sh etc/rc.d/functions.d/fbsplash-basic.sh
-  install -Dm644 "$srcdir"/fbsplash.initcpio_install usr/lib/initcpio/install/fbsplash
-  install -Dm644 "$srcdir"/fbsplash.initcpio_hook usr/lib/initcpio/hooks/fbsplash
+  install -D -m644 "$srcdir/splash.conf" "etc/conf.d/splash"
+  install -D -m644 "$srcdir/fbsplash-basic.sh" "etc/rc.d/functions.d/fbsplash-basic.sh"
+  install -D -m644 "$srcdir/fbsplash.initcpio_install" "usr/lib/initcpio/install/fbsplash"
+  install -D -m644 "$srcdir/fbsplash.initcpio_hook" "usr/lib/initcpio/hooks/fbsplash"
 
   # Install fbcodecor script and config file
-  install -Dm644 "$srcdir"/fbcondecor.conf etc/conf.d/fbcondecor
-  install -Dm755 "$srcdir"/fbcondecor.daemon etc/rc.d/fbcondecor
+  install -D -m644 "$srcdir/fbcondecor.conf" "etc/conf.d/fbcondecor"
+  install -D -m755 "$srcdir/fbcondecor.daemon" "etc/rc.d/fbcondecor"
+
+  #Finish libtool setup.
+
+  /usr/bin/libtool --finish "/usr/lib"
 }
+md5sums=('29bbb355919a2f27c40dbfc8075c4a8d'
+         '4045e315c52f5a576fca4f7e634eeb91'
+         '90708a96038d7d7921c2e9fde938c058'
+         'b5e6c08bbe7645a1c035565ea7d66437'
+         '2860cc29d5da2ea65c810de068bcc262'
+         'f65cf94d4d4959bb44cda5fa634ab405'
+         '4b1bc27908fd763c57d8137035418d5c'
+         'b3db9d4fd902b62ac9e38589677e2d16'
+         '64cf5c9a86b595733e8f2f428a183419')
diff --git a/fbcondecor.daemon b/fbcondecor.daemon
index 882c05fa835d..39a441d61a9b 100644
--- a/fbcondecor.daemon
+++ b/fbcondecor.daemon
@@ -6,7 +6,7 @@
 #
 
 . /etc/rc.conf
-. /etc/rc.d/functions
+. /etc/rc.d/functions.d/fbsplash-basic.sh
 . /etc/conf.d/fbcondecor
 . /usr/bin/splash-functions.sh
 
diff --git a/freetype2.patch b/fbsplash-freetype-fix.patch
index c073c2dcc7cd..55ad203da2eb 100644..100755
--- a/freetype2.patch
+++ b/fbsplash-freetype-fix.patch
@@ -1,6 +1,7 @@
---- a/splashutils-1.5.4.4/src/ttf.c
-+++ b/splashutils-1.5.4.4/src/ttf.c
-@@ -27,8 +27,8 @@
+diff -ruN a/src/ttf.c b/src/ttf.c
+--- a/src/ttf.c	2011-06-12 17:43:39.000000000 -0400
++++ b/src/ttf.c	2014-09-11 12:20:14.076012078 -0400
+@@ -25,8 +25,8 @@
  #include <assert.h>
  
  #include <ft2build.h>
@@ -9,10 +10,11 @@
 +#include FT_OUTLINE_H
 +#include FT_TRUETYPE_IDS_H
  
- #include "splash.h"
- 
---- a/splashutils-1.5.4.4/src/ttf.h
-+++ b/splashutils-1.5.4.4/src/ttf.h
+ #include "common.h"
+ #include "render.h"
+diff -ruN a/src/ttf.h b/src/ttf.h
+--- a/src/ttf.h	2011-06-12 17:43:39.000000000 -0400
++++ b/src/ttf.h	2014-09-11 12:20:14.069012078 -0400
 @@ -1,8 +1,8 @@
  #ifndef _TTF_H
  #define _TTF_H