summaryrefslogtreecommitdiffstats
path: root/desktop/rss-guard
diff options
context:
space:
mode:
Diffstat (limited to 'desktop/rss-guard')
-rw-r--r--desktop/rss-guard/01_min_qt_required_is_5.9.patch56
-rw-r--r--desktop/rss-guard/02_fix_random_class_name.patch24
-rw-r--r--desktop/rss-guard/README30
-rw-r--r--desktop/rss-guard/doinst.sh6
-rw-r--r--desktop/rss-guard/rss-guard.SlackBuild49
-rw-r--r--desktop/rss-guard/rss-guard.info10
-rw-r--r--desktop/rss-guard/slack-desc12
7 files changed, 81 insertions, 106 deletions
diff --git a/desktop/rss-guard/01_min_qt_required_is_5.9.patch b/desktop/rss-guard/01_min_qt_required_is_5.9.patch
deleted file mode 100644
index e54b533774..0000000000
--- a/desktop/rss-guard/01_min_qt_required_is_5.9.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff --git a/rssguard.pro b/rssguard.pro
-index 21a897c7..f8eb8d28 100755
---- a/rssguard.pro
-+++ b/rssguard.pro
-@@ -41,8 +41,8 @@ TARGET = rssguard
-
- message(rssguard: Welcome RSS Guard qmake script.)
-
--lessThan(QT_MAJOR_VERSION, 5)|lessThan(QT_MINOR_VERSION, 7) {
-- warning(rssguard: At least Qt \"5.7.0\" is required!!!)
-+lessThan(QT_MAJOR_VERSION, 5)|lessThan(QT_MINOR_VERSION, 9) {
-+ warning(rssguard: At least Qt \"5.9.0\" is required!!!)
- }
-
- APP_NAME = "RSS Guard"
-diff --git a/src/miscellaneous/textfactory.cpp b/src/miscellaneous/textfactory.cpp
-index 53451d63..f371d02d 100755
---- a/src/miscellaneous/textfactory.cpp
-+++ b/src/miscellaneous/textfactory.cpp
-@@ -10,10 +10,11 @@
-
- #include <QDir>
- #include <QLocale>
--#include <QRandomGenerator>
- #include <QString>
- #include <QStringList>
-
-+#include <random>
-+
- quint64 TextFactory::s_encryptionKey = 0x0;
-
- TextFactory::TextFactory() = default;
-@@ -128,7 +129,10 @@ quint64 TextFactory::initializeSecretEncryptionKey() {
- QString encryption_file_path = qApp->settings()->pathName() + QDir::separator() + ENCRYPTION_FILE_NAME;
-
- try {
-- s_encryptionKey = quint64(QString(IOFactory::readFile(encryption_file_path)).toLongLong());
-+ s_encryptionKey = quint64(QString(IOFactory::readFile(encryption_file_path)).toULongLong());
-+
-+ auto aa = s_encryptionKey;
-+ auto bb = false;
- }
- catch (ApplicationException&) {
- // Well, key does not exist or is invalid, generate and save one.
-@@ -148,5 +152,10 @@ quint64 TextFactory::initializeSecretEncryptionKey() {
- }
-
- quint64 TextFactory::generateSecretEncryptionKey() {
-- return QRandomGenerator().generate64();
-+ std::random_device rd;
-+ std::mt19937 mt(rd());
-+ std::uniform_int<quint64> dist(std::numeric_limits<quint64>().min() + 1000000UL,
-+ std::numeric_limits<quint64>().max());
-+
-+ return dist(mt);
- }
diff --git a/desktop/rss-guard/02_fix_random_class_name.patch b/desktop/rss-guard/02_fix_random_class_name.patch
deleted file mode 100644
index 06c49f7aba..0000000000
--- a/desktop/rss-guard/02_fix_random_class_name.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From d347ba63072ab13c0dbc1792d1a2b837af997a46 Mon Sep 17 00:00:00 2001
-From: Martin Rotter <rotter@praktik.cz>
-Date: Thu, 6 Jun 2019 11:35:25 +0200
-Subject: [PATCH] Fix random class name
-
----
- src/miscellaneous/textfactory.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/miscellaneous/textfactory.cpp b/src/miscellaneous/textfactory.cpp
-index 48597235..1ac6f049 100755
---- a/src/miscellaneous/textfactory.cpp
-+++ b/src/miscellaneous/textfactory.cpp
-@@ -151,8 +151,8 @@ quint64 TextFactory::initializeSecretEncryptionKey() {
- quint64 TextFactory::generateSecretEncryptionKey() {
- std::random_device rd;
- std::mt19937 mt(rd());
-- std::uniform_int<quint64> dist(std::numeric_limits<quint64>().min() + 1000000UL,
-- std::numeric_limits<quint64>().max());
-+ std::uniform_int_distribution<quint64> dist(std::numeric_limits<quint64>().min() + 1000000UL,
-+ std::numeric_limits<quint64>().max());
-
- return dist(mt);
- }
diff --git a/desktop/rss-guard/README b/desktop/rss-guard/README
index 6f6b2f6888..a726d5d2c2 100644
--- a/desktop/rss-guard/README
+++ b/desktop/rss-guard/README
@@ -1,4 +1,26 @@
-RSS Guard is useful and (very) tiny RSS 0.92/1.0/2.0 & ATOM 1.0
-feed reader for Qt-5.x. It can keep feeds organized in categories,
-update informations from them automatically and notice the user
-if there is any new message.
+RSS Guard is a simple RSS/ATOM feed reader which can work with
+RSS/ATOM/JSON/Sitemap feeds as well as many online feed services:
+* Feedly
+* Gmail
+* Google Reader API (Bazqux, FreshRSS, Inoreader, Miniflux, Reedah,
+ The Old Reader and more)
+* Nextcloud News
+* Tiny Tiny RSS
+
+RSS Guard is also podcast player as it can play everything via its
+built-in mpv-based (or ffmpeg-based) media player.
+
+This Slackbuild will detect automatically the presence of Qt6 via
+the QT6DIR environment variable. You may need to relog if you just
+installed Qt6.
+However that can be forced with BUILD_WITH_QT6=ON or OFF, allowing
+to build for Qt5 when Qt6 is installed, or to fail building with
+Qt6 if it is not present, should you want to try that.
+
+There are also other parameters:
+NO_LITE=ON : heavier version, able to display HTML through QT
+NO_UPDATE_CHECK=ON : Don't check for updates, this is the job of SBo
+ENABLE_COMPRESSED_SITEMAP=ON : allows understanding sitemap.xml.gz
+And at most one multimedia backend:
+ENABLE_MEDIAPLAYER_QTMULTIMEDIA=ON : Uses Slackware's ffmpeg
+ENABLE_MEDIAPLAYER_LIBMPV=OFF : Requires the mpv packages from Sbo.
diff --git a/desktop/rss-guard/doinst.sh b/desktop/rss-guard/doinst.sh
index 5fb28930db..65c7e2eeb9 100644
--- a/desktop/rss-guard/doinst.sh
+++ b/desktop/rss-guard/doinst.sh
@@ -1,3 +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/desktop/rss-guard/rss-guard.SlackBuild b/desktop/rss-guard/rss-guard.SlackBuild
index 146cc05e7e..fe3780676f 100644
--- a/desktop/rss-guard/rss-guard.SlackBuild
+++ b/desktop/rss-guard/rss-guard.SlackBuild
@@ -2,6 +2,7 @@
# Slackware build script for rss-guard
#
+# Yth <yth@ythogtha.org>
# Copyright 2012-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
# All rights reserved.
#
@@ -26,10 +27,21 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=rss-guard
SRCNAM=rssguard
-VERSION=${VERSION:-3.5.9}
+VERSION=${VERSION:-4.6.6}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
+# Building by default with QT6 if available
+# Can be forced with env BUILD_WITH_QT6=ON/OFF
+# Detection of QT6 depends on environment variable QT6DIR setup in
+# /etc/profile.d/qt6.sh, hence detection will work only if it has been sourced
+[ -z "$QT6DIR" ] && QT6=OFF || QT6=ON
+BUILD_WITH_QT6=${BUILD_WITH_QT6:-$QT6}
+NO_LITE=${NO_LITE:-ON}
+NO_UPDATE_CHECK=${NO_UPDATE_CHECK:-ON}
+ENABLE_COMPRESSED_SITEMAP=${ENABLE_COMPRESSED_SITEMAP:-ON}
+ENABLE_MEDIAPLAYER_QTMULTIMEDIA=${ENABLE_MEDIAPLAYER_QTMULTIMEDIA:-ON}
+ENABLE_MEDIAPLAYER_LIBMPV=${ENABLE_MEDIAPLAYER_LIBMPV:-OFF}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -39,9 +51,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -51,8 +60,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i386" ]; then
- SLKCFLAGS="-O2 -march=i386 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -60,6 +69,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
else
SLKCFLAGS="-O2"
LIBDIRSUFFIX=""
@@ -73,6 +85,14 @@ cd $TMP
rm -rf $SRCNAM-$VERSION
tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || tar xvf $CWD/$VERSION.tar.?z*
cd $SRCNAM-$VERSION
+echo "Build parameters:"
+echo "BUILD_WITH_QT6=$BUILD_WITH_QT6"
+echo "NO_LITE=$NO_LITE"
+echo "NO_UPDATE_CHECK=$NO_UPDATE_CHECK"
+echo "ENABLE_COMPRESSED_SITEMAP=$ENABLE_COMPRESSED_SITEMAP"
+echo "ENABLE_MEDIAPLAYER_QTMULTIMEDIA=$ENABLE_MEDIAPLAYER_QTMULTIMEDIA"
+echo "ENABLE_MEDIAPLAYER_LIBMPV=$ENABLE_MEDIAPLAYER_LIBMPV"
+
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -80,14 +100,21 @@ 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 {} \;
-patch -p1 < $CWD/01_min_qt_required_is_5.9.patch
-patch -p1 < $CWD/02_fix_random_class_name.patch
-
mkdir -p build
cd build
- qmake-qt5 PREFIX=/usr ..
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DBUILD_WITH_QT6=$BUILD_WITH_QT6 \
+ -DNO_LITE=$NO_LITE \
+ -DNO_UPDATE_CHECK=$NO_UPDATE_CHECK \
+ -DENABLE_COMPRESSED_SITEMAP=$ENABLE_COMPRESSED_SITEMAP \
+ -DENABLE_MEDIAPLAYER_QTMULTIMEDIA=$ENABLE_MEDIAPLAYER_QTMULTIMEDIA \
+ -DENABLE_MEDIAPLAYER_LIBMPV=$ENABLE_MEDIAPLAYER_LIBMPV \
+ ..
make
- make install INSTALL_ROOT=$PKG
+ make install/strip DESTDIR=$PKG
cd ..
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/desktop/rss-guard/rss-guard.info b/desktop/rss-guard/rss-guard.info
index 490a6f6a9d..ac57ec4e99 100644
--- a/desktop/rss-guard/rss-guard.info
+++ b/desktop/rss-guard/rss-guard.info
@@ -1,10 +1,10 @@
PRGNAM="rss-guard"
-VERSION="3.5.9"
+VERSION="4.6.6"
HOMEPAGE="https://github.com/martinrotter/rssguard"
-DOWNLOAD="https://github.com/martinrotter/rssguard/archive/3.5.9/rssguard-3.5.9.tar.gz"
-MD5SUM="fb9b713a18a2bb85e7a4f7ce40a054b0"
+DOWNLOAD="https://github.com/martinrotter/rssguard/archive/4.6.6/rssguard-4.6.6.tar.gz"
+MD5SUM="23756b759864d92867b00dc8bcef5815"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
-MAINTAINER="Matteo Bernardini"
-EMAIL="ponce@slackbuilds.org"
+MAINTAINER="Yth - Arnaud"
+EMAIL="yth@ythogtha.org"
diff --git a/desktop/rss-guard/slack-desc b/desktop/rss-guard/slack-desc
index 189790aa10..4634d582ac 100644
--- a/desktop/rss-guard/slack-desc
+++ b/desktop/rss-guard/slack-desc
@@ -8,12 +8,12 @@
|-----handy-ruler------------------------------------------------------|
rss-guard: rss-guard (tiny feed reader)
rss-guard:
-rss-guard: RSS Guard is useful and (very) tiny RSS 0.92/1.0/2.0 & ATOM 1.0
-rss-guard: feed reader for Qt-5.x. It can keep feeds organized in categories,
-rss-guard: update informations from them automatically and notice the user
-rss-guard: if there is any new message.
+rss-guard: RSS Guard is a simple RSS/ATOM/JSON/Sitemap feed reader for Qt-5 or 6
+rss-guard: It can keep feeds organized in categories, update informations from
+rss-guard: them automatically and notice the user if there is any new message.
+rss-guard: RSS Guard is also podcast player as it can play everything via its
+rss-guard: built-in mpv-based (or ffmpeg-based) media player.
rss-guard:
rss-guard: homepage: https://github.com/martinrotter/rssguard
rss-guard:
-rss-guard:
-rss-guard:
+rss-guard: See README for Qt5/Qt6 informations.
generated by cgit v1.2.3 (git 2.32.0) at 2024-05-22 03:19:32 +0200