new release for scidb r1153

6 files changed, 160 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 99edf06c2b81..7cec73e55b54 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,29 +1,35 @@
-# Generated by mksrcinfo v8
-# Mon Nov  7 18:18:54 UTC 2016
 pkgbase = scidb-svn
-	pkgdesc = Scidb is a Chess Information Data Base SVN-Checkout
-	pkgver = 1.0.beta.r1111
+	pkgdesc = Scidb is a Chess Information Data Base; includes 2 engines, imports from Chess Base files
+	pkgver = 1.0.beta.r1531
 	pkgrel = 1
-	epoch = 2
-	url = http://scidb.sourceforge.net/
+	url = https://scidb.sourceforge.net/
 	install = scidb-svn.install
 	arch = x86_64
 	arch = i686
 	license = GPL2
+	makedepends = patch
 	depends = tk
-	depends = zziplib
 	depends = shared-mime-info
-	depends = minizip
-	depends = libxcursor
 	depends = libsm
-	depends = hicolor-icon-theme
+	depends = libxcursor
+	depends = minizip
+	depends = tcl
+	depends = gdbm
+	depends = zziplib
 	depends = desktop-file-utils
+	depends = hicolor-icon-theme
+	depends = shared-mime-info
+	depends = xdg-utils
 	conflicts = scidb
-	options = !buildflags
-	options = !makeflags
-	options = !debug
 	source = scidb-svn::svn://svn.code.sf.net/p/scidb/code/trunk
+	source = configure.patch
+	source = dump_eco.cpp.patch
+	source = engines.Sjeng.Makefile.patch
+	source = sys_info.cpp.patch
 	md5sums = SKIP
+	md5sums = 3dd938a3a7f744813ccb76fe4826d167
+	md5sums = 47f44f0eec5d9e0a9e7e1bb25adea3b4
+	md5sums = 68c9d47e5af84ac25c87045e3388c6f1
+	md5sums = ef91ffeceab48c260bb1c2af7d02cd9c
 
 pkgname = scidb-svn
-
diff --git a/PKGBUILD b/PKGBUILD
index 74b9cc8e6f77..5068a848b20b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,112 @@
-# Maintainer: q9 <qqqqqqqqq9 at web dot de>
+# Maintainer: 2022-04-04 blacktav <blacktav at gmail dot com>
+# Contributor: Original submitter q9 <qqqqqqqqq9 at web dot de>
 pkgname=scidb-svn
-pkgver=1.0.beta.r1111
+pkgver=1.0.beta.r1531
 pkgrel=1
-epoch=2
-pkgdesc="Scidb is a Chess Information Data Base SVN-Checkout"
+# epoch=2
+pkgdesc="Scidb is a Chess Information Data Base; includes 2 engines, imports from Chess Base files"
 arch=('x86_64' 'i686')
-url="http://scidb.sourceforge.net/"
+url="https://scidb.sourceforge.net/"
 license=('GPL2')
-depends=('tk' 'zziplib' 'shared-mime-info'  'minizip' 'libxcursor' 'libsm' 'hicolor-icon-theme' 'desktop-file-utils')
+depends=('tk'
+         'shared-mime-info'
+         'libsm'
+         'libxcursor'
+         'minizip'
+         'tcl'
+         # recommended
+         'gdbm'
+         'zziplib'
+         # recommended for KDE, GTK & XFCE
+         'desktop-file-utils'
+         'hicolor-icon-theme'
+         'shared-mime-info'
+         'xdg-utils'
+         )
+makedepends=(
+           # needed for build purposes
+           'patch'
+            )
 conflicts=('scidb')
-options=('!buildflags' '!makeflags' '!debug' )
+#options=('!buildflags' '!makeflags' '!debug' )
 install=$pkgname.install
-source=('scidb-svn::svn://svn.code.sf.net/p/scidb/code/trunk')
-md5sums=('SKIP')
+source=('scidb-svn::svn://svn.code.sf.net/p/scidb/code/trunk'
+        'configure.patch'
+        'dump_eco.cpp.patch'
+        'engines.Sjeng.Makefile.patch'
+        'sys_info.cpp.patch'
+        )
+md5sums=('SKIP'
+         '3dd938a3a7f744813ccb76fe4826d167'
+         '47f44f0eec5d9e0a9e7e1bb25adea3b4'
+         '68c9d47e5af84ac25c87045e3388c6f1'
+         'ef91ffeceab48c260bb1c2af7d02cd9c'
+        )
 pkgver() {
-  cd "$srcdir/$pkgname"
-      local ver="$(svnversion)"
-        printf "%s" "1.0.beta.r${ver//[[:alpha:]]}"
+  cd $srcdir/$pkgname
+  local ver="$(svnversion)"
+  printf "%s" "1.0.beta.r${ver//[[:alpha:]]}"
 }
 
 prepare() {
-  mkdir -p  $srcdir/$pkgname-build/
-  cp -r $srcdir/$pkgname/*  $srcdir/$pkgname-build/
+  echo " - prepare starting"
+#  mkdir -p  $srcdir/$pkgname-build/
+#  cp -r $srcdir/$pkgname/*  $srcdir/$pkgname-build/
+#  cp *.patch $srcdir/$pkgname
+#  cd $srcdir
+#  patch -u $srcdir/$pkgname/configure -i configure.patch
+#  patch -u $srcdir/$pkgname/src/dump_eco.cpp -i dump_eco.cpp.patch
+#  patch -u $srcdir/$pkgname/src/sys/sys_info.cpp -i sys_info.cpp.patch
+#  patch -u $srcdir/$pkgname/engines/Sjeng/Makefile -i engines.Sjeng.Makefile.patch
+  echo " - prepare complete"
 }
 
 build() {
-	cd "$srcdir/$pkgname-build"
-   ./configure --prefix="/usr" --exec-prefix="/usr" --enginesdir=/usr/bin --destdir=$pkgdir  --enable-debug-si4=no --enable-freedesktop=no  
+  echo " - patching files"
+  patch -u $srcdir/$pkgname/configure -i configure.patch
+  patch -u $srcdir/$pkgname/src/dump_eco.cpp -i dump_eco.cpp.patch
+  patch -u $srcdir/$pkgname/src/sys/sys_info.cpp -i sys_info.cpp.patch
+  patch -u $srcdir/$pkgname/engines/Sjeng/Makefile -i engines.Sjeng.Makefile.patch
+
+  echo " - configure project"
+  cd $srcdir/$pkgname
+  # Set switches for configure script
+  # Default switches had debugging turned on
+  #     deployment is below /usr/local/bin
+  # this version has debugging off and small code
+  SWITCHES=()
+  SWITCHES+=("--destdir=${pkgdir}")             # so we can create a build file
+  SWITCHES+=("--prefix=/usr")                   # defaults to /usr/local/
+  SWITCHES+=("--exec-prefix=/usr")              # defaults to /usr/local/
+#  SWITCHES+=("--bindir=/usr/bin")               # defaults to EPREFIX/bin
+#  SWITCHES+=("--enginesdir=/usr/bin")           # defaults to EPREFIX/games
+#  SWITCHES+=("--datadir=/usr/bin")              # defaults to PREFIX/share
+#  SWITCHES+=("--libdir=/usr/lib")               # defaults to EPREFIX/lib
+  SWITCHES+=("--mandir=/usr/share/man")         # defaults to EPREFIX/man
+#  SWITCHES+=("--fontdir=/usr/")                 # defaults to PREFIX/share/fonts
+  SWITCHES+=("--enable-freedesktop=no")         # default=yes
+#  SWITCHES+=("--enable-fam=yes")                # default=no
+  SWITCHES+=("--enable-symbols=no")             # default=yes
+  SWITCHES+=("--enable-assertions=no")          # default=yes
+#  SWITCHES+=("--enable-sse2=yes")               # default=no
+#  SWITCHES+=("--enable-gprof-profiling=yes")    # default=no
+#  SWITCHES+=("--enable-gcov-coverage=yes")      # default=no
+#  SWITCHES+=("--enable-inline-text=no")         # default=yes
+  SWITCHES+=("--suppress-insane-message")
+#  SWITCHES+=("")
+#  SWITCHES+=("")
+  SWITCHSTRING=""
+  for SWITCH in "${SWITCHES[@]}" ; do
+    SWITCHSTRING="${SWITCHSTRING} ${SWITCH}"
+  done
+  export CFLAGS="-fcommon" CXXFLAGS="-fcommon" ; ./configure ${SWITCHSTRING}
+  echo " - ready for build"
   make clean
-	make
+  make
+  echo " - build complete"
 }
 
 package() {
-	cd "$srcdir/$pkgname-build"
+  cd $srcdir/$pkgname
   make install
 }
diff --git a/configure.patch b/configure.patch
new file mode 100644
index 000000000000..a5014bc76234
--- /dev/null
+++ b/configure.patch
@@ -0,0 +1,11 @@
+--- configure	2022-04-03 15:14:50.811110517 +0200
++++ configure.new	2022-04-03 15:14:42.167777711 +0200
+@@ -274,7 +274,7 @@
+ set instableTkLibrary ""
+ set x11Libraries " -lX11 -lSM -lICE"
+ 
+-set MinGCCVersion "3.4"
++set MinGCCVersion "10.0"
+ set MinClangVersion "3.1"
+ 
+ 
diff --git a/dump_eco.cpp.patch b/dump_eco.cpp.patch
new file mode 100644
index 000000000000..b16982508932
--- /dev/null
+++ b/dump_eco.cpp.patch
@@ -0,0 +1,14 @@
+--- src/dump_eco.cpp	2022-04-03 14:45:16.651218909 +0200
++++ src/dump_eco.cpp.new	2022-04-03 14:09:13.464684405 +0200
+@@ -116,8 +116,9 @@
+ static void
+ throwInvalidEco(unsigned lineNo, char const* eco)
+ {
+-	M_RAISE(	"invalid ECO code '%s' (line %u)",
+-				mstl::string(eco, eco + mstl::min(7u, strlen(eco))).c_str(), lineNo);
++// 	M_RAISE(	"invalid ECO code '%s' (line %u)",
++//				mstl::string(eco, eco + mstl::min(7u, strlen(eco))).c_str(), lineNo);
++	M_RAISE(	"invalid ECO code '%s' (line %u)", mstl::string(eco, eco).c_str(), lineNo);
+ }
+ 
+ 
diff --git a/engines.Sjeng.Makefile.patch b/engines.Sjeng.Makefile.patch
new file mode 100644
index 000000000000..ebec99765e26
--- /dev/null
+++ b/engines.Sjeng.Makefile.patch
@@ -0,0 +1,11 @@
+--- engines/Sjeng/Makefile	2022-04-03 15:11:06.947790861 +0200
++++ engines/Sjeng/Makefile.new	2022-04-03 15:09:57.431128441 +0200
+@@ -6,7 +6,7 @@
+ 
+ EXE = sjeng-scidb
+ 
+-CFLAGS = $(SYS_CFLAGS) -O2 -Wall -Wno-uninitialized -fomit-frame-pointer $(NO_UNUSED_RESULT) -DSCIDB_VERSION=1 # -DHAVE_GETTIMEOFDAY -DHAVE_SELECT -DHAVE_SYS_TIMEB_H -DHAVE_LIBGDBM -DVERSION=\"11.2\"
++CFLAGS = $(SYS_CFLAGS) -O2 -fcommon -Wno-uninitialized -fomit-frame-pointer $(NO_UNUSED_RESULT) -DSCIDB_VERSION=1 # -DHAVE_GETTIMEOFDAY -DHAVE_SELECT -DHAVE_SYS_TIMEB_H -DHAVE_LIBGDBM -DVERSION=\"11.2\"
+ LDFLAGS += $(SYS_LDFLAGS)
+ 
+ SRC = attacks.c crazy.c epd.c learn.c partner.c seval.c ttable.c book.c ecache.c eval.c \
diff --git a/sys_info.cpp.patch b/sys_info.cpp.patch
new file mode 100644
index 000000000000..e664041125d1
--- /dev/null
+++ b/sys_info.cpp.patch
@@ -0,0 +1,11 @@
+--- src/sys/sys_info.cpp	2022-04-03 15:18:40.964429789 +0200
++++ src/sys/sys_info.cpp.new	2022-04-03 14:32:24.271266099 +0200
+@@ -27,7 +27,7 @@
+ # include <stdlib.h>
+ # include <unistd.h>
+ # include <sys/types.h>
+-# include <sys/sysctl.h>
++// # include <sys/sysctl.h>
+ 
+ #ifdef __hpux
+ # include <sys/pstat.h>