Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

rssguard: update to 4.8.5 (#24730)

Browse Source
This commit is contained in:
Raed Rizqie 2025-07-05 03:36:34 +08:00 committed by GitHub
parent 3e33ccfbd4
commit 6bfcb54d0c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 4 additions and 262 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
mingw-w64-rssguard/001-cmake-update.patch
View File

@ -1,73 +0,0 @@
diff --git a/src/cmake_plugins.cmake b/src/cmake_plugins.cmake
index a441711..189dbec 100644
--- a/src/cmake_plugins.cmake
+++ b/src/cmake_plugins.cmake
@@ -28,8 +28,12 @@ function(prepare_rssguard_plugin plugin_target_name)
${LIBRSSGUARD_SOURCE_PATH}
)
- if(WIN32 OR OS2)
+ if(MSVC OR OS2)
install(TARGETS ${plugin_target_name} DESTINATION plugins)
+ elseif(MINGW)
+ include (GNUInstallDirs)
+ install(TARGETS ${plugin_target_name}
+ DESTINATION ${CMAKE_INSTALL_DATADIR}/rssguard/plugins)
elseif(UNIX AND NOT APPLE AND NOT ANDROID)
include (GNUInstallDirs)
install(TARGETS ${plugin_target_name}
diff --git a/src/librssguard/CMakeLists.txt b/src/librssguard/CMakeLists.txt
index 9f37a15..c11c02c 100644
--- a/src/librssguard/CMakeLists.txt
+++ b/src/librssguard/CMakeLists.txt
@@ -618,14 +618,19 @@ if(APPLE)
)
elseif(WIN32)
target_link_libraries(rssguard PUBLIC
- Shell32.lib
+ shell32
odbc32
)
endif()
-if(WIN32 OR OS2)
+if(MSVC OR OS2)
install(TARGETS rssguard DESTINATION .)
set(HEADERS_FOLDER "include/librssguard")
+elseif(MINGW)
+ include (GNUInstallDirs)
+ install(TARGETS rssguard DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ set(HEADERS_FOLDER "${CMAKE_INSTALL_INCLUDEDIR}/librssguard")
elseif(UNIX AND NOT APPLE AND NOT ANDROID)
include (GNUInstallDirs)
install(TARGETS rssguard DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/src/rssguard/CMakeLists.txt b/src/rssguard/CMakeLists.txt
index a51ba43..fa48a7d 100644
--- a/src/rssguard/CMakeLists.txt
+++ b/src/rssguard/CMakeLists.txt
@@ -36,12 +36,12 @@ if(APPLE)
)
elseif(WIN32)
target_link_libraries(app PUBLIC
- Shell32.lib
- odbc32.lib
+ shell32
+ odbc32
)
endif()
-if(WIN32)
+if(MSVC)
install(TARGETS app DESTINATION .)
install(FILES ${CMAKE_SOURCE_DIR}/resources/graphics/${CMAKE_PROJECT_NAME}.ico
DESTINATION .
@@ -55,6 +55,8 @@ if(WIN32)
)
elseif(OS2)
install(TARGETS app DESTINATION .)
+elseif(MINGW)
+ install(TARGETS app DESTINATION ${CMAKE_INSTALL_BINDIR})
elseif(UNIX AND NOT APPLE AND NOT ANDROID)
include (GNUInstallDirs)
install(TARGETS app

34
mingw-w64-rssguard/002-comply-to-fhs.patch
View File

@ -1,34 +0,0 @@
diff --git a/src/librssguard/miscellaneous/application.cpp b/src/librssguard/miscellaneous/application.cpp
index ceca2d0..111e9ba 100644
--- a/src/librssguard/miscellaneous/application.cpp
+++ b/src/librssguard/miscellaneous/application.cpp
@@ -572,7 +572,12 @@ QString Application::userDataAppFolder() const {
// In "app" folder, we would like to separate all user data into own subfolder,
// therefore stick to "data" folder in this mode.
+#ifdef _MSC_VER
return QDir::toNativeSeparators(applicationDirPath() + QDir::separator() + QSL("data%1").arg(major_version));
+#else
+ return QDir::toNativeSeparators(applicationDirPath() + QDir::separator() + QSL("..") + QDir::separator() +
+ QSL("share") + QDir::separator() + QSL(APP_LOW_NAME) + QDir::separator() + QSL("data%1").arg(major_version));
+#endif
}
QString Application::userDataFolder() {
diff --git a/src/librssguard/miscellaneous/pluginfactory.cpp b/src/librssguard/miscellaneous/pluginfactory.cpp
index 055b85a..d566080 100644
--- a/src/librssguard/miscellaneous/pluginfactory.cpp
+++ b/src/librssguard/miscellaneous/pluginfactory.cpp
@@ -77,7 +77,12 @@ QStringList PluginFactory::pluginPaths() const {
paths << QCoreApplication::applicationDirPath() + QDir::separator() + QL1S("..") + QDir::separator() +
QL1S(RSSGUARD_LIBDIR) + QDir::separator() + QL1S(APP_LOW_NAME);
#elif defined(Q_OS_WIN)
+#ifdef _MSC_VER
paths << QCoreApplication::applicationDirPath() + QDir::separator() + QL1S("plugins");
+#else
+ paths << QCoreApplication::applicationDirPath() + QDir::separator() + QL1S("..") + QDir::separator() +
+ QL1S("share") + QDir::separator() + QL1S(APP_LOW_NAME) + QDir::separator() + QL1S("plugins");
+#endif
#else
paths << QCoreApplication::applicationDirPath();
#endif

22
mingw-w64-rssguard/003-fix-default-setting.patch
View File

@ -1,22 +0,0 @@
diff --git a/src/librssguard/miscellaneous/settings.cpp b/src/librssguard/miscellaneous/settings.cpp
index b0ae74c..049d431 100644
--- a/src/librssguard/miscellaneous/settings.cpp
+++ b/src/librssguard/miscellaneous/settings.cpp
@@ -31,7 +31,7 @@ DKEY Node::ID = "nodejs";
DKEY Node::NodeJsExecutable = QSL("nodejs_executable_") + OS_ID;
-#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
+#if (defined(Q_OS_WIN) && defined(_MSC_VER)) || defined(Q_OS_OS2)
DVALUE(QString) Node::NodeJsExecutableDef = "node.exe";
#else
DVALUE(QString) Node::NodeJsExecutableDef = "node";
@@ -39,7 +39,7 @@ DVALUE(QString) Node::NodeJsExecutableDef = "node";
DKEY Node::NpmExecutable = QSL("npm_executable_") + OS_ID;
-#if defined(Q_OS_WIN)
+#if defined(Q_OS_WIN) && defined(_MSC_VER)
DVALUE(QString) Node::NpmExecutableDef = "npm.cmd";
#elif defined(Q_OS_OS2)
DVALUE(QString) Node::NpmExecutableDef = "npm.exe";

104
mingw-w64-rssguard/004-misc-fixes.patch
View File

@ -1,104 +0,0 @@
diff --git a/resources/rssguard.rc.in b/resources/rssguard.rc.in
index b15e3e5..af8028f 100644
--- a/resources/rssguard.rc.in
+++ b/resources/rssguard.rc.in
@@ -1,9 +1,11 @@
#include <windows.h>
+#ifdef _MSC_VER
#define VS_FF_DEBUG 0x00000001L
#define VOS__WINDOWS32 0x00000004L
#define VFT_UNKNOWN 0x00000000L
#define VFT2_UNKNOWN 0x00000000L
+#endif
IDI_ICON1 ICON "@CMAKE_PROJECT_NAME@.ico"
diff --git a/src/librssguard-gmail/src/3rd-party/mimesis/mimesis.cpp b/src/librssguard-gmail/src/3rd-party/mimesis/mimesis.cpp
index c0cf257..f425dcc 100644
--- a/src/librssguard-gmail/src/3rd-party/mimesis/mimesis.cpp
+++ b/src/librssguard-gmail/src/3rd-party/mimesis/mimesis.cpp
@@ -865,16 +865,16 @@ namespace Mimesis {
Part part;
- part.preamble = move(preamble);
- part.epilogue = move(epilogue);
- part.parts = move(parts);
- part.boundary = move(boundary);
+ part.preamble = std::move(preamble);
+ part.epilogue = std::move(epilogue);
+ part.parts = std::move(parts);
+ part.boundary = std::move(boundary);
part.multipart = true;
part.set_header("Content-Type", get_header("Content-Type"));
part.set_header("Content-Disposition", get_header("Content-Disposition"));
erase_header("Content-Disposition");
part.crlf = crlf;
- parts.emplace_back(move(part));
+ parts.emplace_back(std::move(part));
}
else {
multipart = true;
@@ -888,7 +888,7 @@ namespace Mimesis {
part.set_header("Content-Type", get_header("Content-Type"));
part.set_header("Content-Disposition", get_header("Content-Disposition"));
erase_header("Content-Disposition");
- part.body = move(body);
+ part.body = std::move(body);
}
}
@@ -919,7 +919,7 @@ namespace Mimesis {
set_header("Content-Disposition", part.get_header("Content-Disposition"));
if (part.multipart) {
- parts = move(part.parts);
+ parts = std::move(part.parts);
}
else {
multipart = false;
diff --git a/src/librssguard-reddit/src/3rd-party/mimesis/mimesis.cpp b/src/librssguard-reddit/src/3rd-party/mimesis/mimesis.cpp
index c0cf257..f425dcc 100644
--- a/src/librssguard-reddit/src/3rd-party/mimesis/mimesis.cpp
+++ b/src/librssguard-reddit/src/3rd-party/mimesis/mimesis.cpp
@@ -865,16 +865,16 @@ namespace Mimesis {
Part part;
- part.preamble = move(preamble);
- part.epilogue = move(epilogue);
- part.parts = move(parts);
- part.boundary = move(boundary);
+ part.preamble = std::move(preamble);
+ part.epilogue = std::move(epilogue);
+ part.parts = std::move(parts);
+ part.boundary = std::move(boundary);
part.multipart = true;
part.set_header("Content-Type", get_header("Content-Type"));
part.set_header("Content-Disposition", get_header("Content-Disposition"));
erase_header("Content-Disposition");
part.crlf = crlf;
- parts.emplace_back(move(part));
+ parts.emplace_back(std::move(part));
}
else {
multipart = true;
@@ -888,7 +888,7 @@ namespace Mimesis {
part.set_header("Content-Type", get_header("Content-Type"));
part.set_header("Content-Disposition", get_header("Content-Disposition"));
erase_header("Content-Disposition");
- part.body = move(body);
+ part.body = std::move(body);
}
}
@@ -919,7 +919,7 @@ namespace Mimesis {
set_header("Content-Disposition", part.get_header("Content-Disposition"));
if (part.multipart) {
- parts = move(part.parts);
+ parts = std::move(part.parts);
}
else {
multipart = false;

33
mingw-w64-rssguard/PKGBUILD
View File

@ -3,7 +3,7 @@
_realname=rssguard
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=4.7.4
pkgver=4.8.5
pkgrel=1
pkgdesc='Feed reader and podcast player which supports RSS/ATOM/JSON (mingw-w64)'
arch=(any)
@ -26,34 +26,8 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
"${MINGW_PACKAGE_PREFIX}-cmake"
"${MINGW_PACKAGE_PREFIX}-ninja"
"${MINGW_PACKAGE_PREFIX}-qt6-tools")
source=("https://github.com/martinrotter/${_realname}/archive/${pkgver}/${_realname}-${pkgver}.tar.gz"
001-cmake-update.patch
002-comply-to-fhs.patch
003-fix-default-setting.patch
004-misc-fixes.patch)
sha256sums=('2230f80a800171f8ef9f4085046b9a277eed0b059f13f194408a88df900306d4'
'a3a37152bb4dada9f241b2057c07758faf4d809be6ff22118e8161507bf007af'
'a57a05c0e21fc587c478b20f393434e0a31495b51c31367729d14dea03f2773e'
'e4828f6f9efecce3a5055df5dbb93fb3f07e4e89d17049b6cd64b94c64c6384f'
'f3a7cbe333ace5caff7bbad5a2868e0b5e74939e1738740c54d1b0271a42ff07')
apply_patch_with_msg() {
for _patch in "$@"
do
msg2 "Applying ${_patch}"
patch -Np1 -i "${srcdir}/${_patch}"
done
}
prepare() {
cd ${_realname}-${pkgver}
apply_patch_with_msg \
001-cmake-update.patch \
002-comply-to-fhs.patch \
003-fix-default-setting.patch \
004-misc-fixes.patch
}
source=("https://github.com/martinrotter/${_realname}/archive/${pkgver}/${_realname}-${pkgver}.tar.gz")
sha256sums=('e3d5cd31d24c92cd4b85eae6e961b19093fb965b6b34bff39dd030089f314598')
build() {
CXXFLAGS+=" -Wno-deprecated-declarations -Wno-ignored-attributes"
@ -62,6 +36,7 @@ build() {
-GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-DBUILD_MSYS2=ON \
-DBUILD_WITH_QT6=ON \
-DREVISION_FROM_GIT=OFF \
-DNO_UPDATE_CHECK=ON \