pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:martinrotter/rssguard

Browse source
This commit is contained in:
Martin Rotter 2023-09-12 09:02:06 +02:00
commit 31612e90b2
5 changed files with 265 additions and 261 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
localization/rssguard_en_GB.ts
View file

@ -7119,7 +7119,7 @@ Post-processing script: %3</translation>
<message> <message>
<location filename="../src/librssguard/services/standard/standardfeed.cpp" line="204"/> <location filename="../src/librssguard/services/standard/standardfeed.cpp" line="204"/>
<source>Cannot save feed data</source> <source>Cannot save feed data</source>
<translation>Can&apos;t save feed data</translation> <translation>Can&apos;t fetch feed metadata</translation>
</message> </message>
<message> <message>
<location filename="../src/librssguard/services/standard/standardfeed.cpp" line="476"/> <location filename="../src/librssguard/services/standard/standardfeed.cpp" line="476"/>

2
localization/rssguard_fr.ts
View file

@ -7144,7 +7144,7 @@ Script de post-traitement: %3</translation>
<message> <message>
<location filename="../src/librssguard/services/standard/standardfeed.cpp" line="204"/> <location filename="../src/librssguard/services/standard/standardfeed.cpp" line="204"/>
<source>Cannot save feed data</source> <source>Cannot save feed data</source>
<translation>Impossible de sauvegarder les données du flux</translation> <translation>Impossible d'obtenir les métadonnées de flux</translation>
</message> </message>
<message> <message>
<location filename="../src/librssguard/services/standard/standardfeed.cpp" line="476"/> <location filename="../src/librssguard/services/standard/standardfeed.cpp" line="476"/>

508
localization/rssguard_ja.ts
View file

File diff suppressed because it is too large Load diff

2
resources/scripts/github-actions/build-windows.ps1
View file

@ -90,7 +90,7 @@ cd "$old_pwd"
mkdir "rssguard-build" mkdir "rssguard-build"
cd "rssguard-build" cd "rssguard-build"
& "$cmake_path" ".." -G Ninja -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_WITH_QT6="$with_qt6" -DREVISION_FROM_GIT=ON -DUSE_WEBENGINE="$use_webengine" -DFEEDLY_CLIENT_ID="$env:FEEDLY_CLIENT_ID" -DFEEDLY_CLIENT_SECRET="$env:FEEDLY_CLIENT_SECRET" -DGMAIL_CLIENT_ID="$env:GMAIL_CLIENT_ID" -DGMAIL_CLIENT_SECRET="$env:GMAIL_CLIENT_SECRET" & "$cmake_path" ".." -G Ninja -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_WITH_QT6="$with_qt6" -DREVISION_FROM_GIT=ON -DUSE_SYSTEM_SQLITE=OFF -DUSE_WEBENGINE="$use_webengine" -DFEEDLY_CLIENT_ID="$env:FEEDLY_CLIENT_ID" -DFEEDLY_CLIENT_SECRET="$env:FEEDLY_CLIENT_SECRET" -DGMAIL_CLIENT_ID="$env:GMAIL_CLIENT_ID" -DGMAIL_CLIENT_SECRET="$env:GMAIL_CLIENT_SECRET"
& "$cmake_path" --build . & "$cmake_path" --build .
& "$cmake_path" --install . --prefix app & "$cmake_path" --install . --prefix app

12
src/librssguard/CMakeLists.txt
View file

@ -528,11 +528,13 @@ list(APPEND SOURCES
# Add sqlite. # Add sqlite.
if(USE_SYSTEM_SQLITE) if(USE_SYSTEM_SQLITE)
find_package(SQLite3) find_package(SQLite3)
endif()
if(SQLite3_FOUND) if(SQLite3_FOUND)
# Include directory and library are linked to below. # Include directory and library are linked to below.
message(STATUS "Using system SQLite3 ${SQLite3_VERSION}.") message(STATUS "Using system SQLite3 ${SQLite3_VERSION}.")
else()
message(FATAL_ERROR "System SQLite3 not detected. Set USE_SYSTEM_SQLITE=OFF if you want to build with bundled SQLite3.")
endif()
else() else()
message(STATUS "Using bundled SQLite3.") message(STATUS "Using bundled SQLite3.")
@ -540,6 +542,8 @@ else()
3rd-party/sqlite/sqlite3.c 3rd-party/sqlite/sqlite3.c
3rd-party/sqlite/sqlite3.h 3rd-party/sqlite/sqlite3.h
) )
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DSQLITE_THREADSAFE=1 -DSQLITE_ENABLE_COLUMN_METADATA=1")
endif() endif()
# Add SimpleCrypt. # Add SimpleCrypt.