From cb9abe5f252b17ac98e34f9e173668abd96edffe Mon Sep 17 00:00:00 2001 From: Andrew Clemons Date: Sun, 12 Dec 2021 15:51:55 +1300 Subject: [PATCH] system/tagainijisho: Updated for version gita84d46b. This is a qt5 version. Signed-off-by: Andrew Clemons Signed-off-by: Willy Sudiarto Raharjo --- system/tagainijisho/slack-desc | 2 +- .../tagainijisho-1.0.3-fts3_tokenizer.patch | 14 ------ system/tagainijisho/tagainijisho.SlackBuild | 50 +++++++++---------- system/tagainijisho/tagainijisho.info | 14 ++++-- 4 files changed, 36 insertions(+), 44 deletions(-) delete mode 100644 system/tagainijisho/tagainijisho-1.0.3-fts3_tokenizer.patch diff --git a/system/tagainijisho/slack-desc b/system/tagainijisho/slack-desc index ef0e3b44fb..1fc3d94e3c 100644 --- a/system/tagainijisho/slack-desc +++ b/system/tagainijisho/slack-desc @@ -16,4 +16,4 @@ tagainijisho: you tag and annote them, in addition to providing easy navigation tagainijisho: between related entries. A powerful search engine also allows you tagainijisho: to search for entries very precisely. Finally, Tagaini let you tagainijisho: produce printed material. -tagainijisho: Homepage: http://tagaini.net +tagainijisho: Homepage: https://www.tagaini.net/ diff --git a/system/tagainijisho/tagainijisho-1.0.3-fts3_tokenizer.patch b/system/tagainijisho/tagainijisho-1.0.3-fts3_tokenizer.patch deleted file mode 100644 index adae7c8862..0000000000 --- a/system/tagainijisho/tagainijisho-1.0.3-fts3_tokenizer.patch +++ /dev/null @@ -1,14 +0,0 @@ -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 1c6402b937..0d7620f2c0 100644 --- a/system/tagainijisho/tagainijisho.SlackBuild +++ b/system/tagainijisho/tagainijisho.SlackBuild @@ -4,7 +4,7 @@ # originally written by Alex-P. Natsios -# Copyright 2019 Andrew Clemons, Wellington New Zealand +# Copyright 2019,2021 Andrew Clemons, Wellington New Zealand # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,7 +27,11 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=tagainijisho -VERSION=${VERSION:-1.0.3} +GITREV=${GITREV:-a84d46be05fd2c25c53289a6759142a902c9afd0} +VERSION=${VERSION:-git$(echo "$GITREV" | sed 's/^\(.\{7\}\).*$/\1/')} +VERSION_JMDICT=${VERSION_JMDICT:-2021-10-01} +VERSION_KANJIDIC2=${VERSION_KANJIDIC2:-2021-10-01} +VERSION_KANJIVG=${VERSION_KANJIVG:-20160426} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -71,9 +75,13 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +rm -rf $PRGNAM-$GITREV +tar xvf $CWD/$PRGNAM-$GITREV.tar.gz +cd $PRGNAM-$GITREV +mkdir -p 3rdparty +zcat $CWD/kanjivg-$VERSION_KANJIVG.xml.gz > 3rdparty/kanjivg.xml +zcat $CWD/JMdict-$VERSION_JMDICT.gz > 3rdparty/JMdict +zcat $CWD/kanjidic2-$VERSION_KANJIDIC2.xml.gz > 3rdparty/kanjidic2.xml chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -81,38 +89,30 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# thanks to fedora -patch -p1 < $CWD/tagainijisho-1.0.3-fts3_tokenizer.patch - -cd $TMP/$PRGNAM-$VERSION - cmake . \ +mkdir -p build +cd build + cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_TESTS=OFF \ - -DDEBUG_DETAILED_VIEW=OFF \ - -DDEBUG_ENTRIES_CACHE=OFF \ - -DDEBUG_LISTS=OFF \ - -DDEBUG_PATHS=OFF \ - -DDEBUG_QUERIES=OFF \ - -DDEBUG_TRANSACTIONS=OFF \ - -DDICT_LANG="fr;de;es;ru;it;pt;th;tr" \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DDICT_LANG="ar;cs;de;en;es;fa;fi;fr;hu;id;it;ja;nb;nl;pl;pt;ru;sv;tr;uk;vi;zh" \ -DEMBED_SQLITE=OFF \ - -DGUNZIP=/usr/bin/gunzip \ - -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake \ - -DSQLITE_INCLUDE_DIR=/usr/include \ - -DSQLITE_LIBRARY=/usr/lib${LIBDIRSUFFIX}/libsqlite3.so - + -DMAN_INSTALL_DIR=/usr/man \ + -DCMAKE_BUILD_TYPE=Release .. make - make install DESTDIR=$PKG + make install/strip DESTDIR=$PKG cd .. +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - $TMP/$PRGNAM-$VERSION/doc \ + doc COPYING.txt Changelog README.md \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/tagainijisho/tagainijisho.info b/system/tagainijisho/tagainijisho.info index cb96e001b9..8fe73ec1fd 100644 --- a/system/tagainijisho/tagainijisho.info +++ b/system/tagainijisho/tagainijisho.info @@ -1,8 +1,14 @@ PRGNAM="tagainijisho" -VERSION="1.0.3" -HOMEPAGE="http://tagaini.net/" -DOWNLOAD="https://github.com/Gnurou/tagainijisho/releases/download/1.0.3/tagainijisho-1.0.3.tar.gz" -MD5SUM="e3aef7b1a3e4a38e0f144dd98fdcb680" +VERSION="gita84d46b" +HOMEPAGE="https://www.tagaini.net/" +DOWNLOAD="https://github.com/Gnurou/tagainijisho/archive/a84d46be05fd2c25c53289a6759142a902c9afd0/tagainijisho-a84d46be05fd2c25c53289a6759142a902c9afd0.tar.gz \ + https://github.com/KanjiVG/kanjivg/releases/download/r20160426/kanjivg-20160426.xml.gz \ + https://home.apache.org/~arfrever/distfiles/JMdict-2021-10-01.gz \ + https://home.apache.org/~arfrever/distfiles/kanjidic2-2021-10-01.xml.gz" +MD5SUM="a3de58ba7beacaf7de0276dd7ca4a621 \ + d02a2b3e6680bc4687d93951da8d1664 \ + 337da17ab2af98c207ad1a78358f14e9 \ + 01a110003f67e5d9a60d8decd43ef7f3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES=""