Merge branch 'devel'

jcorporation · Dec 20, 2023 · 579bc73 · 579bc73
2 parents 6c13f88 + beb920a
commit 579bc73
Show file tree

Hide file tree

Showing 20 changed files with 272 additions and 190 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,18 @@ https://github.com/jcorporation/myMPD/
 
 ***
 
+## myMPD v13.0.6 (2023-12-20)
+
+This is a small bugfix release.
+
+### Changelog
+
+- Fix: detection of Safari browsers #1185
+- Upd: translations
+- Upd: utf8 and utest dependencies
+
+***
+
 ## myMPD v13.0.5 (2023-11-19)
 
 This is a small bugfix release.

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,7 +9,7 @@ cmake_policy(SET CMP0003 NEW)
 # myMPD is written in C
 # supported compilers: gcc, clang
 project(mympd
-  VERSION 13.0.5
+  VERSION 13.0.6
   LANGUAGES C
 )
 

diff --git a/build.sh b/build.sh
@@ -1386,7 +1386,7 @@ create_doc() {
 
 translation_import() {
   #shellcheck disable=SC1091
-  . secrets
+  . "$STARTPATH/.secrets"
   if [ -z "${POEDITOR_TOKEN+x}" ]
   then
     echo_error "POEDITOR_TOKEN variable not set."
@@ -1419,7 +1419,7 @@ translation_import() {
 
 translation_import_all() {
   #shellcheck disable=SC1091
-  . secrets
+  . "$STARTPATH/.secrets"
   if [ -z "${POEDITOR_TOKEN+x}" ]
   then
     echo_error "POEDITOR_TOKEN variable not set."
@@ -1435,7 +1435,7 @@ translation_import_all() {
 
 terms_export() {
   #shellcheck disable=SC1091
-  . secrets
+  . "$STARTPATH/.secrets"
   if [ -z "${POEDITOR_TOKEN+x}" ]
   then
     echo_error "POEDITOR_TOKEN variable not set."
@@ -1452,7 +1452,7 @@ terms_export() {
 
 translation_export() {
   #shellcheck disable=SC1091
-  . secrets
+  . "$STARTPATH/.secrets"
   if [ -z "${POEDITOR_TOKEN+x}" ]
   then
     echo_error "POEDITOR_TOKEN variable not set."

diff --git a/contrib/man/mympd-script.1 b/contrib/man/mympd-script.1
@@ -1,6 +1,6 @@
 .\" Manpage for mympd-script.
 .\" Contact <mail@jcgames.de> to correct errors or typos.
-.TH man 1 "19 Nov 2023" "13.0.5" "mympd-script man page"
+.TH man 1 "20 Dec 2023" "13.0.6" "mympd-script man page"
 
 .SH NAME
 mympd-script \- mympd command line tool to execute scripts

diff --git a/contrib/man/mympd.1 b/contrib/man/mympd.1
@@ -1,6 +1,6 @@
 .\" Manpage for mympd.
 .\" Contact <mail@jcgames.de> to correct errors or typos.
-.TH man 1 "19 Nov 2023" "13.0.5" "mympd man page"
+.TH man 1 "20 Dec 2023" "13.0.6" "mympd man page"
 
 .SH NAME
 myMPD \- standalone and mobile friendly web mpd client

diff --git a/contrib/packaging/alpine/APKBUILD b/contrib/packaging/alpine/APKBUILD
@@ -6,7 +6,7 @@
 # Maintainer: Juergen Mang <mail@jcgames.de>
 #
 pkgname=mympd
-pkgver=13.0.5
+pkgver=13.0.6
 pkgrel=0
 pkgdesc="myMPD is a standalone and mobile friendly web-based MPD client."
 url="https://jcorporation.github.io/myMPD/"

diff --git a/contrib/packaging/arch/PKGBUILD b/contrib/packaging/arch/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Juergen Mang <mail@jcgames.de>
 
 pkgname=mympd
-pkgver=13.0.5
+pkgver=13.0.6
 pkgrel=1
 pkgdesc="A standalone and mobile friendly web-based MPD client."
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')

diff --git a/contrib/packaging/debian/changelog b/contrib/packaging/debian/changelog
@@ -1,5 +1,5 @@
-mympd (13.0.5-1) unstable; urgency=medium
+mympd (13.0.6-1) unstable; urgency=medium
 
   * Release from master
 
- -- Juergen Mang <mail@jcgames.de>  Sun, 19 Nov 2023 16:11:34 +0100
+ -- Juergen Mang <mail@jcgames.de>  Wed, 20 Dec 2023 20:12:55 +0100
diff --git a/contrib/packaging/freebsd/multimedia/mympd/Makefile b/contrib/packaging/freebsd/multimedia/mympd/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	myMPD
 DISTVERSIONPREFIX= v
-DISTVERSION=	13.0.5
+DISTVERSION=	13.0.6
 CATEGORIES=	multimedia
 
 MAINTAINER=	robert.david@posteo.net

diff --git a/...too/media-sound/mympd/mympd-13.0.5.ebuild → ...too/media-sound/mympd/mympd-13.0.6.ebuild b/...too/media-sound/mympd/mympd-13.0.5.ebuild → ...too/media-sound/mympd/mympd-13.0.6.ebuild
diff --git a/contrib/packaging/openwrt/Makefile b/contrib/packaging/openwrt/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME := mympd
-PKG_VERSION := 13.0.5
+PKG_VERSION := 13.0.6
 PKG_RELEASE := 1
 
 PKG_SOURCE := $(PKG_NAME)-$(PKG_VERSION).tar.gz

diff --git a/contrib/packaging/rpm/mympd.spec b/contrib/packaging/rpm/mympd.spec
@@ -4,7 +4,7 @@
 # (c) 2018-2023 Juergen Mang <mail@jcgames.de>
 
 Name:           mympd
-Version:        13.0.5
+Version:        13.0.6
 Release:        0
 License:        GPL-3.0-or-later
 Group:          Productivity/Multimedia/Sound/Players
@@ -66,5 +66,5 @@ fi
 %license LICENSE.md
 
 %changelog
-* Sun Nov 19 2023 Juergen Mang <mail@jcgames.de> 13.0.5-0
+* Wed Dec 20 2023 Juergen Mang <mail@jcgames.de> 13.0.6-0
 - Version from master
diff --git a/dist/utest/utest.h b/dist/utest/utest.h
diff --git a/dist/utf8/utf8.h b/dist/utf8/utf8.h
@@ -61,6 +61,10 @@ typedef int32_t utf8_int32_t;
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wold-style-cast"
 #pragma clang diagnostic ignored "-Wcast-qual"
+
+#if __has_warning("-Wunsafe-buffer-usage")
+#pragma clang diagnostic ignored "-Wunsafe-buffer-usage"
+#endif
 #endif
 
 #ifdef __cplusplus
@@ -784,14 +788,18 @@ utf8_constexpr14_impl utf8_int8_t *utf8rchr(const utf8_int8_t *src, int chr) {
   while ('\0' != *src) {
     size_t offset = 0;
 
-    while (src[offset] == c[offset]) {
+    while ((src[offset] == c[offset]) && ('\0' != src[offset])) {
       offset++;
     }
 
     if ('\0' == c[offset]) {
       /* we found a matching utf8 code point */
       match = (utf8_int8_t *)src;
       src += offset;
+
+      if ('\0' == *src) {
+        break;
+      }
     } else {
       src += offset;
 

diff --git a/docs/_includes/version b/docs/_includes/version
@@ -1 +1 @@
-13.0.5
+13.0.6
diff --git a/htdocs/js/globales.js b/htdocs/js/globales.js
@@ -1119,7 +1119,7 @@ function setUserAgentData() {
                 ? false
                 : /iPhone|iPad|iPod|Android|Mobile/i.test(navigator.userAgent);
         /** @type {boolean} */
-        userAgentData.isSafari = /Safari/i.test(navigator.userAgent);
+        userAgentData.isSafari = /Safari/i.test(navigator.userAgent) && ! /Chrome/i.test(navigator.userAgent);
     }
 }
 setUserAgentData();

diff --git a/htdocs/js/version.js b/htdocs/js/version.js
@@ -1,2 +1,2 @@
-const myMPDversion = '13.0.5';
-const myMPDbuild = 'e168fdbae90a87893bee735b2111dfe6084c3df6';
+const myMPDversion = '13.0.6';
+const myMPDbuild = '245a34b690d7d27a47619120022f8fb778537ba4';
diff --git a/src/i18n/json/fr-FR.json b/src/i18n/json/fr-FR.json
@@ -1114,4 +1114,4 @@
     "url_resolved": "url_résolue",
     "votes": "votes",
     "wasapi": "Windows Audio Session API"
-}
+}
diff --git a/src/i18n/json/ja-JP.json b/src/i18n/json/ja-JP.json
@@ -835,7 +835,7 @@
     "Timer saved successfully": "タイマーを正常に保存しました",
     "Timer with given id not found": "与えられたIDのタイマーが見つかりません",
     "Timerange (days)": "時間範囲 (日付)",
-    "Timers are not supported by platform": "",
+    "Timers are not supported by platform": "タイマーはこのプラットフォームには対応していません",
     "Timestamp": "タイムスタンプ",
     "Title": "タイトル",
     "To": "変更後",
@@ -881,7 +881,7 @@
     "Updating smart playlist %{playlist} failed": "スマートプレイリスト %{playlist} の更新に失敗しました",
     "Uri": "URI",
     "Uri not found in WebradioDB": "WebradioDBにURIが見つかりません",
-    "Use different MPD host for sticker database": "ステッカーデータベースを使用するには別のMPDホストを使用してください",
+    "Use different MPD host for sticker database": "ステッカーのデータベースに別のMPDホストを使用する",
     "Use ligature": "リガチャーを使用",
     "Validate": "検証",
     "Validate and deduplicate playlist": "プレイリストの検証と重複項目の削除",