system/tagainijisho: Updated for version 1.0.3.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

5 files changed, 55 insertions, 78 deletions

diff --git a/system/tagainijisho/doinst.sh b/system/tagainijisho/doinst.sh
new file mode 100644
index 0000000000..65c7e2eeb9
--- /dev/null
+++ b/system/tagainijisho/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/tagainijisho/embed-sqlite.patch b/system/tagainijisho/embed-sqlite.patch
deleted file mode 100644
index 14ef270a0e..0000000000
--- a/system/tagainijisho/embed-sqlite.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -u -r tagainijisho-1.0.1/src/sqlite/CMakeLists.txt tagainijisho-1.0.1-patched/src/sqlite/CMakeLists.txt
---- tagainijisho-1.0.1/src/sqlite/CMakeLists.txt	2013-11-18 23:32:01.000000000 +0000
-+++ tagainijisho-1.0.1-patched/src/sqlite/CMakeLists.txt	2016-04-11 15:44:13.408359228 +0100
-@@ -3,19 +3,15 @@
- 
- set(SQLITE_MIN_VERSION "3007004")
- set(SQLITE_BLACKLIST "3007007;3007008;3008000")
--set(SQLITE_DOWNLOAD_VERSION "3080100")
-+set(SQLITE_DOWNLOAD_VERSION "3110100")
- 
--set(SQLITE_SOURCE http://www.sqlite.org/2013/sqlite-amalgamation-${SQLITE_DOWNLOAD_VERSION}.zip)
-+set(SQLITE_SOURCE http://www.sqlite.org/2016/sqlite-amalgamation-${SQLITE_DOWNLOAD_VERSION}.zip)
- 
- option(SHARED_SQLITE_LIBRARY "Build the SQLite library as a shared library (loadable by SQLite's interpreter)" OFF)
- 
- # Embed SQLite even if the system version looks good?
--option(EMBED_SQLITE "Embed SQLite even if a system version is present and valid" OFF)
--
--# Force embedded version on Apple
--if (APPLE)
--	set (EMBED_SQLITE "ON")  
--endif(APPLE)
-+# This should be enabled by default as we require features (e.g. FTS3 tokenizer) that may not be enabled on the system
-+option(EMBED_SQLITE "Embed SQLite even if a system version is present and valid" ON)
- 
- # Look for system SQLite
- find_path(SQLITE_INCLUDE_DIR sqlite3.h)
-@@ -89,7 +85,7 @@
- endif()
- 
- include_directories(${QT_INCLUDE_DIR})
--add_definitions(-DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_OMIT_DEPRECATED)
-+add_definitions(-DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_FTS3_TOKENIZER)
- 
- if(SHARED_SQLITE_LIBRARY)
- 	add_library(tagaini_sqlite SHARED ${tagainijisho_sqlite_SRCS} ${tagainijisho_sqlite_MOC_SRCS})
-diff -u -r tagainijisho-1.0.1/src/sqlite/sqlite3ext.cc tagainijisho-1.0.1-patched/src/sqlite/sqlite3ext.cc
---- tagainijisho-1.0.1/src/sqlite/sqlite3ext.cc	2013-11-18 23:32:01.000000000 +0000
-+++ tagainijisho-1.0.1-patched/src/sqlite/sqlite3ext.cc	2016-04-11 15:44:10.505347246 +0100
-@@ -118,6 +118,10 @@
- 	sqlite3_stmt *pStmt;
- 	const char *zSql = "SELECT fts3_tokenizer(?, ?)";
- 
-+#ifdef SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER
-+	sqlite3_db_config(db, SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, NULL);
-+#endif
-+
- 	rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, 0);
- 	if( rc!=SQLITE_OK ){
- 		return rc;
diff --git a/system/tagainijisho/tagainijisho-1.0.3-fts3_tokenizer.patch b/system/tagainijisho/tagainijisho-1.0.3-fts3_tokenizer.patch
new file mode 100644
index 0000000000..adae7c8862
--- /dev/null
+++ b/system/tagainijisho/tagainijisho-1.0.3-fts3_tokenizer.patch
@@ -0,0 +1,14 @@
+diff -up tagainijisho-1.0.3/src/sqlite/sqlite3ext.cc.fts3_tokenizer tagainijisho-1.0.3/src/sqlite/sqlite3ext.cc
+--- tagainijisho-1.0.3/src/sqlite/sqlite3ext.cc.fts3_tokenizer	2018-07-22 14:22:31.597931031 +0200
++++ tagainijisho-1.0.3/src/sqlite/sqlite3ext.cc	2018-07-22 14:22:35.858945041 +0200
+@@ -118,6 +118,10 @@ int register_tokenizer(sqlite3 *db, cons
+ 	sqlite3_stmt *pStmt;
+ 	const char *zSql = "SELECT fts3_tokenizer(?, ?)";
+ 
++#ifdef SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER
++	sqlite3_db_config(db, SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, NULL);
++#endif
++
+ 	rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, 0);
+ 	if( rc!=SQLITE_OK ){
+ 		return rc;
diff --git a/system/tagainijisho/tagainijisho.SlackBuild b/system/tagainijisho/tagainijisho.SlackBuild
index 39193deba1..950586963a 100644
--- a/system/tagainijisho/tagainijisho.SlackBuild
+++ b/system/tagainijisho/tagainijisho.SlackBuild
@@ -1,32 +1,37 @@
 #!/bin/sh
 
-# Slackware build script for Tagaini Jisho
+# Slackware build script for tagainijisho
 
-# written by Alex-P. Natsios <drakevr@2f30.org>
+# originally written by Alex-P. Natsios <drakevr@2f30.org>
 
-# Permission to use, copy, modify, and distribute this software for any purpose
-# with or without fee is hereby granted, provided that the above copyright
-# notice and this permission notice appear in all copies.
+# Copyright 2019 Andrew Clemons, Wellington New Zealand
+# All rights reserved.
 #
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
-# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# AUTHORS AND COPYRIGHT HOLDERS AND THEIR CONTRIBUTORS BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=tagainijisho
-VERSION=${VERSION:-1.0.1}
+VERSION=${VERSION:-1.0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -37,8 +42,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -60,16 +65,14 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Fix build with sqlite-3.11 onwards
-# https://github.com/Gnurou/tagainijisho/issues/163
-patch -p1 < $CWD/embed-sqlite.patch
+# thanks to fedora
+patch -p1 < $CWD/tagainijisho-1.0.3-fts3_tokenizer.patch
 
 cd $TMP/$PRGNAM-$VERSION
   cmake . \
@@ -105,6 +108,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/tagainijisho/tagainijisho.info b/system/tagainijisho/tagainijisho.info
index f8d6355d4d..cb96e001b9 100644
--- a/system/tagainijisho/tagainijisho.info
+++ b/system/tagainijisho/tagainijisho.info
@@ -1,10 +1,10 @@
 PRGNAM="tagainijisho"
-VERSION="1.0.1"
+VERSION="1.0.3"
 HOMEPAGE="http://tagaini.net/"
-DOWNLOAD="https://github.com/Gnurou/tagainijisho/releases/download/1.0.1/tagainijisho-1.0.1.tar.gz"
-MD5SUM="73c5b2fe03d40d20208119b37e3da0e9"
+DOWNLOAD="https://github.com/Gnurou/tagainijisho/releases/download/1.0.3/tagainijisho-1.0.3.tar.gz"
+MD5SUM="e3aef7b1a3e4a38e0f144dd98fdcb680"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Alex-P. Natsios"
-EMAIL="drakevr@2f30.org"
+MAINTAINER="Andrew Clemons"
+EMAIL="andrew.clemons@gmail.com"