Skip to content

Commit 1fd2d95

Browse files
authored
Merge branch 'c0re100:v5_0_x' into v5_0_x
2 parents be4fd43 + fce6849 commit 1fd2d95

File tree

137 files changed

+7977
-7892
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+7977
-7892
lines changed

.github/workflows/build_appimage.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ prepare_ssl() {
187187
touch "/usr/src/openssl-${openssl_ver}/.unpack_ok"
188188
fi
189189
cd "/usr/src/openssl-${openssl_ver}"
190-
./Configure --openssldir=/etc/ssl
190+
./Configure no-tests --openssldir=/etc/ssl
191191
make -j$(nproc)
192192
make install_sw
193193
ldconfig
@@ -270,7 +270,8 @@ prepare_qt() {
270270

271271
preapare_libboost() {
272272
# build latest boost
273-
boost_ver="$(retry curl -ksSfL --compressed https://www.boost.org/users/download/ \| grep "'>Version\s*'" \| sed -r "'s/.*Version\s*([^<]+).*/\1/'" \| head -1)"
273+
# boost_ver="$(retry curl -ksSfL --compressed https://www.boost.org/users/download/ \| grep "'>Version\s*'" \| sed -r "'s/.*Version\s*([^<]+).*/\1/'" \| head -1)"
274+
boost_ver="1.86.0"
274275
echo "boost version ${boost_ver}"
275276
mkdir -p "/usr/src/boost-${boost_ver}"
276277
if [ ! -f "/usr/src/boost-${boost_ver}/.unpack_ok" ]; then

.github/workflows/cross_build.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ prepare_ssl() {
244244
touch "/usr/src/openssl-${openssl_ver}/.unpack_ok"
245245
fi
246246
cd "/usr/src/openssl-${openssl_ver}/"
247-
./Configure -static --openssldir=/etc/ssl --cross-compile-prefix="${CROSS_HOST}-" --prefix="${CROSS_PREFIX}" "${OPENSSL_COMPILER}"
247+
./Configure -static no-tests --openssldir=/etc/ssl --cross-compile-prefix="${CROSS_HOST}-" --prefix="${CROSS_PREFIX}" "${OPENSSL_COMPILER}"
248248
make -j$(nproc)
249249
make install_sw
250250
if [ -f "${CROSS_PREFIX}/lib64/libssl.a" ]; then
@@ -256,7 +256,8 @@ prepare_ssl() {
256256
}
257257

258258
prepare_boost() {
259-
boost_ver="$(retry curl -ksSL --compressed https://www.boost.org/users/download/ \| grep "'>Version\s*'" \| sed -r "'s/.*Version\s*([^<]+).*/\1/'" \| head -1)"
259+
# boost_ver="$(retry curl -ksSL --compressed https://www.boost.org/users/download/ \| grep "'>Version\s*'" \| sed -r "'s/.*Version\s*([^<]+).*/\1/'" \| head -1)"
260+
boost_ver="1.86.0"
260261
echo "Boost version ${boost_ver}"
261262
if [ ! -f "/usr/src/boost-${boost_ver}/.unpack_ok" ]; then
262263
boost_latest_url="https://sourceforge.net/projects/boost/files/boost/${boost_ver}/boost_${boost_ver//./_}.tar.bz2/download"

Changelog

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
Mon Dec 16th 2024 - sledgehammer999 <[email protected]> - v5.0.3
2+
- BUGFIX: Discard obsolete "state update" events after torrent is reloaded (glassez)
3+
- BUGFIX: Fix incorrect SQL column definition (glassez)
4+
- BUGFIX: Avoid redundant requests of announce entries from libtorrent (glassez)
5+
- WEBUI: Fix removing tracker URL with '|' character (Thomas Piccirello)
6+
- WEBUI: Fix reloading page after login (Evgenii Ryshkov)
7+
- WEBAPI: Fix incorrect key in torrent creator (Bartu Özen)
8+
- RSS: Don't add duplicate episodes to previously matched (wavygecko)
9+
- RSS: Use cached current time when parsing RSS feed (glassez)
10+
- WINDOWS: Don't follow symlink when creating torrents on Windows (Chocobo1)
11+
- WINDOWS: NSIS: Update Italian translation (Giacomo411)
12+
113
Sun Nov 17th 2024 - sledgehammer999 <[email protected]> - v5.0.2
214
- BUGFIX: Remove trackers from previous category when moved to new one (glassez)
315
- BUGFIX: Fix `.torrent` file could not be deleted when torrent is canceled (glassez)

README.md

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,11 @@ Latest AppImage download: [qBittorrent-Enhanced-Edition-x86_64.AppImage](https:/
4141

4242
#### Debian (Maintainer: [Kolcha](https://github.com/Kolcha))
4343

44-
##### Qt5 variants (Debian 11 and above):
45-
4644
[GUI](https://software.opensuse.org//download.html?project=home%3Anikoneko%3Atest&package=qbittorrent-enhanced)
4745

4846
[nox](https://software.opensuse.org//download.html?project=home%3Anikoneko%3Atest&package=qbittorrent-enhanced-nox)
4947

50-
##### Qt6 variants (Debian Testing and above):
51-
52-
[GUI](https://software.opensuse.org//download.html?project=home%3Anikoneko%3Atest&package=qbittorrent-enhanced-qt6)
53-
54-
[nox](https://software.opensuse.org//download.html?project=home%3Anikoneko%3Atest&package=qbittorrent-enhanced-nox-qt6)
55-
56-
The one [repository](https://build.opensuse.org/project/show/home:nikoneko:test) contains all 4 variants listed above, links to specific packages are provided for convenience.
48+
The one [repository](https://build.opensuse.org/project/show/home:nikoneko:test) contains all variants, links to specific packages are provided for convenience.
5749

5850
#### openSUSE (Maintainer: [openSUSE Chinese Community](https://github.com/openSUSE-zh))
5951

dist/mac/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<key>CFBundlePackageType</key>
5656
<string>APPL</string>
5757
<key>CFBundleShortVersionString</key>
58-
<string>5.0.2</string>
58+
<string>5.0.3</string>
5959
<key>CFBundleExecutable</key>
6060
<string>${EXECUTABLE_NAME}</string>
6161
<key>CFBundleIdentifier</key>

dist/unix/org.qbittorrent.qBittorrent.desktop

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ Name[ta]=qBittorrent
161161
GenericName[te]=క్యు బిట్ టొరెంట్ క్లయింట్
162162
Comment[te]=క్యు బిట్ టొరెంట్ తో ఫైల్స్ దిగుమతి చేసుకోండి , పంచుకోండి
163163
Name[te]=qBittorrent
164-
GenericName[th]=โปรแกรมบิตทอร์เรนต์
164+
GenericName[th]=ไคลเอนต์บิททอร์เรนต์
165165
Comment[th]=ดาวน์โหลดและแชร์ไฟล์ผ่านบิตทอร์เรนต์
166166
Name[th]=qBittorrent
167167
GenericName[tr]=BitTorrent istemcisi

dist/unix/org.qbittorrent.qBittorrent.metainfo.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,6 @@
6262
<url type="contribute">https://github.com/qbittorrent/qBittorrent/blob/master/CONTRIBUTING.md</url>
6363
<content_rating type="oars-1.1"/>
6464
<releases>
65-
<release version="5.0.2" date="2024-11-17"/>
65+
<release version="5.0.3" date="2024-12-16"/>
6666
</releases>
6767
</component>

dist/windows/config.nsh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
; 4.5.1.3 -> good
1515
; 4.5.1.3.2 -> bad
1616
; 4.5.0beta -> bad
17-
!define /ifndef QBT_VERSION "5.0.2.10"
17+
!define /ifndef QBT_VERSION "5.0.3.10"
1818

1919
; Option that controls the installer's window name
2020
; If set, its value will be used like this:

dist/windows/installer-translations/italian.nsh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ LangString launch_qbt ${LANG_ITALIAN} "Esegui qBittorrent."
2929
;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
3030
LangString inst_requires_64bit ${LANG_ITALIAN} "Questo installer funziona solo con versioni di Windows a 64bit."
3131
;LangString inst_requires_win10 ${LANG_ENGLISH} "This installer requires at least Windows 10 (1809) / Windows Server 2019."
32-
LangString inst_requires_win10 ${LANG_ITALIAN} "This installer requires at least Windows 10 (1809) / Windows Server 2019."
32+
LangString inst_requires_win10 ${LANG_ITALIAN} "Questo installer richiede almeno Windows 10 (1809) / Windows Server 2019."
3333
;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
3434
LangString inst_uninstall_link_description ${LANG_ITALIAN} "Disinstalla qBittorrent"
3535

src/base/bittorrent/dbresumedatastorage.cpp

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ namespace
6767
{
6868
const QString DB_CONNECTION_NAME = u"ResumeDataStorage"_s;
6969

70-
const int DB_VERSION = 7;
70+
const int DB_VERSION = 8;
7171

7272
const QString DB_TABLE_META = u"meta"_s;
7373
const QString DB_TABLE_TORRENTS = u"torrents"_s;
@@ -628,7 +628,31 @@ void BitTorrent::DBResumeDataStorage::updateDB(const int fromVersion) const
628628
}
629629

630630
if (fromVersion <= 6)
631-
addColumn(DB_TABLE_TORRENTS, DB_COLUMN_SHARE_LIMIT_ACTION, "TEXTNOT NULL DEFAULT `Default`");
631+
addColumn(DB_TABLE_TORRENTS, DB_COLUMN_SHARE_LIMIT_ACTION, "TEXT NOT NULL DEFAULT `Default`");
632+
633+
if (fromVersion == 7)
634+
{
635+
const QString TEMP_COLUMN_NAME = DB_COLUMN_SHARE_LIMIT_ACTION.name + u"_temp";
636+
637+
auto queryStr = u"ALTER TABLE %1 ADD %2 %3"_s
638+
.arg(quoted(DB_TABLE_TORRENTS), TEMP_COLUMN_NAME, u"TEXT NOT NULL DEFAULT `Default`");
639+
if (!query.exec(queryStr))
640+
throw RuntimeError(query.lastError().text());
641+
642+
queryStr = u"UPDATE %1 SET %2 = %3"_s
643+
.arg(quoted(DB_TABLE_TORRENTS), quoted(TEMP_COLUMN_NAME), quoted(DB_COLUMN_SHARE_LIMIT_ACTION.name));
644+
if (!query.exec(queryStr))
645+
throw RuntimeError(query.lastError().text());
646+
647+
queryStr = u"ALTER TABLE %1 DROP %2"_s.arg(quoted(DB_TABLE_TORRENTS), quoted(DB_COLUMN_SHARE_LIMIT_ACTION.name));
648+
if (!query.exec(queryStr))
649+
throw RuntimeError(query.lastError().text());
650+
651+
queryStr = u"ALTER TABLE %1 RENAME %2 TO %3"_s
652+
.arg(quoted(DB_TABLE_TORRENTS), quoted(TEMP_COLUMN_NAME), quoted(DB_COLUMN_SHARE_LIMIT_ACTION.name));
653+
if (!query.exec(queryStr))
654+
throw RuntimeError(query.lastError().text());
655+
}
632656

633657
const QString updateMetaVersionQuery = makeUpdateStatement(DB_TABLE_META, {DB_COLUMN_NAME, DB_COLUMN_VALUE});
634658
if (!query.prepare(updateMetaVersionQuery))

0 commit comments

Comments
 (0)