Merge branch 'dev' into release

# Conflicts:
#	CMakeLists.txt
#	res/about/version.gmi

Author: skyjake

CMakeLists.txt

@@ -18,15 +18,15 @@
 cmake_minimum_required (VERSION 3.10)
 
 project (Lagrange
-    VERSION 1.18.5
+    VERSION 1.18.6
     DESCRIPTION "A Beautiful Gemini Client"
     LANGUAGES C
 )
 set (COPYRIGHT_YEAR 2025)
 if (IOS)
     set (PROJECT_VERSION 1.18)
-    set (IOS_BUNDLE_VERSION 9)
-    set (IOS_BUILD_DATE "2025-03-09")
+    set (IOS_BUNDLE_VERSION 10)
+    set (IOS_BUILD_DATE "2025-06-04")
 endif ()
 if (ANDROID)
     set (PROJECT_VERSION 1.18)
@@ -111,6 +111,7 @@ set (RESOURCES
     res/lang/nl.bin
     res/lang/pl.bin
     res/lang/ru.bin
+    res/lang/sgs.bin
     res/lang/sk.bin
     res/lang/sr.bin
     res/lang/tok.bin
@@ -149,7 +150,7 @@ else ()
         res/arg-help.txt
     )
 endif ()
-if ((UNIX AND NOT APPLE) OR MSYS)
+if ((UNIX AND NOT APPLE) OR MSYS OR MINGW)
     list (APPEND RESOURCES res/lagrange-64.png)
 endif ()
 set (EMB_BIN ${CMAKE_CURRENT_BINARY_DIR}/resources.lgr)
@@ -362,14 +363,14 @@ elseif (APPLE)
     list (APPEND RESOURCES "res/Lagrange.icns")
     set_source_files_properties ("res/Lagrange.icns" PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
 endif ()
-if (MSYS)
+if (MSYS OR MINGW)
     set (WINRC_FILE_VERSION ${PROJECT_VERSION_MAJOR},${PROJECT_VERSION_MINOR},${PROJECT_VERSION_PATCH},0)
     set (WINRC_PRODUCT_VERSION ${PROJECT_VERSION_MAJOR},${PROJECT_VERSION_MINOR},0,0)
     configure_file (res/lagrange.rc.in ${CMAKE_CURRENT_BINARY_DIR}/lagrange.rc NEWLINE_STYLE WIN32)
     list (APPEND SOURCES src/win32.c src/win32.h ${CMAKE_CURRENT_BINARY_DIR}/lagrange.rc)
     list (APPEND TUI_SOURCES src/win32.c src/win32.h)
 endif ()
-if (MSYS OR (UNIX AND NOT MOBILE AND NOT APPLE))
+if (MSYS OR MINGW OR (UNIX AND NOT MOBILE AND NOT APPLE))
     add_definitions (-DiPlatformPcDesktop=1)
 endif ()
 if (MOBILE)
@@ -449,7 +450,7 @@ if (ENABLE_GUI)
     if (APPLE AND NOT MOBILE)
         target_compile_definitions (app PUBLIC -DiPlatformAppleDesktop=1)
     endif ()
-    if (ENABLE_CUSTOM_FRAME AND MSYS)
+    if (ENABLE_CUSTOM_FRAME AND (MSYS OR MINGW))
         target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_CUSTOM_FRAME=1)
     endif ()
     if (ENABLE_KERNING)
@@ -570,7 +571,7 @@ if (ENABLE_GUI)
             LAGRANGE_ANDROID_BUILD_DATE="${ANDROID_BUILD_DATE}"
         )
     endif ()
-    if (MSYS)
+    if (MSYS OR MINGW)
         target_link_libraries (app PUBLIC d2d1 uuid dwmapi) # querying DPI
         if (ENABLE_WINSPARKLE)
             target_link_libraries (app PUBLIC winsparkle)
@@ -614,6 +615,16 @@ if (MSYS)
     if (INSTALL_THE_FOUNDATION)
         install (PROGRAMS $<TARGET_FILE:the_Foundation::the_Foundation> DESTINATION .)
     endif ()
+elseif (MINGW)
+    if (TARGET app)
+        install (TARGETS app DESTINATION .)
+        install (PROGRAMS ${SDL2_LIBDIR}/SDL2.dll DESTINATION .)
+    endif ()
+    install (FILES ${EMB_BIN} DESTINATION .)
+    install (PROGRAMS res/urlopen.bat DESTINATION .)
+    if (INSTALL_THE_FOUNDATION)
+        install (PROGRAMS $<TARGET_FILE:the_Foundation::the_Foundation> DESTINATION .)
+    endif ()
 elseif (HAIKU)
     if (TARGET app)
         install (TARGETS app DESTINATION .)

cmake/Depends.cmake

@@ -73,7 +73,7 @@ if (ENABLE_HARFBUZZ)
             ExternalProject_Add (harfbuzz-ext
                 PREFIX              ${CMAKE_BINARY_DIR}/harfbuzz-ext
                 SOURCE_DIR          ${CMAKE_SOURCE_DIR}/lib/harfbuzz
-                CONFIGURE_COMMAND   NINJA=${NINJA_EXECUTABLE} ${MESON_EXECUTABLE}
+                CONFIGURE_COMMAND   ${MESON_EXECUTABLE}
                                         ${CMAKE_SOURCE_DIR}/lib/harfbuzz
                                         -Dbuildtype=release
                                         -Ddefault_library=both
@@ -85,6 +85,7 @@ if (ENABLE_HARFBUZZ)
                                         --prefix ${_dst}
                 BUILD_COMMAND       ${NINJA_EXECUTABLE} install
                 INSTALL_COMMAND     ""
+                BUILD_BYPRODUCTS    ${_dst}/lib/libharfbuzz.a
             )
             list (APPEND _dependsToBuild harfbuzz-ext)
             add_library (harfbuzz-lib INTERFACE)
@@ -93,6 +94,8 @@ if (ENABLE_HARFBUZZ)
                 # Link dynamically.
                 target_link_libraries (harfbuzz-lib INTERFACE -L${_dst}/lib harfbuzz)
                 install (PROGRAMS ${_dst}/bin/msys-harfbuzz-0.dll DESTINATION .)
+            elseif (MINGW)
+                target_link_libraries (harfbuzz-lib INTERFACE ${_dst}/lib/libharfbuzz.a)
             else ()
                 if (APPLE)
                     target_link_libraries (harfbuzz-lib INTERFACE ${_dst}/lib/libharfbuzz.0.dylib)
@@ -139,7 +142,7 @@ if (ENABLE_FRIBIDI)
             ExternalProject_Add (fribidi-ext
                 PREFIX              ${CMAKE_BINARY_DIR}/fribidi-ext
                 SOURCE_DIR          ${CMAKE_SOURCE_DIR}/lib/fribidi
-                CONFIGURE_COMMAND   NINJA=${NINJA_EXECUTABLE} ${MESON_EXECUTABLE}
+                CONFIGURE_COMMAND   ${MESON_EXECUTABLE}
                                         ${CMAKE_SOURCE_DIR}/lib/fribidi
                                         -Dbuildtype=release
                                         -Ddefault_library=static
@@ -160,6 +163,7 @@ if (ENABLE_FRIBIDI)
         add_library (fribidi-lib INTERFACE)
         target_include_directories (fribidi-lib INTERFACE ${_dst}/include)
         target_link_libraries (fribidi-lib INTERFACE ${_dst}/lib/libfribidi.a)
+        target_compile_definitions (fribidi-lib INTERFACE FRIBIDI_LIB_STATIC=1)
         set (FRIBIDI_FOUND YES)
     endif ()
 endif ()

lib/the_Foundation

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Parses all the .po files and generates binary language strings to be loaded 
+# Parses all the .po files and generates binary language strings to be loaded
 # at runtime via embedded data.
 
 import os, sys
@@ -23,6 +23,7 @@
     'nl',
     'pl',
     'ru',
+    'sgs',
     'sk',
     'sr',
     'tok',
@@ -64,9 +65,9 @@ def unquote(string):
             is_escape = True
         else:
             out += c
-    return out        
-    
-    
+    return out
+
+
 def parse_po(src):
     messages = []
     is_multi = False  # string is multiple lines
@@ -87,7 +88,7 @@ def parse_po(src):
         elif line.startswith('msgid'):
             msg_id = unquote(line[6:])
             is_plural = False
-        elif line.startswith('msgstr'):            
+        elif line.startswith('msgstr'):
             if line[6] == '[':
                 msg_index = int(line[7])
                 line = line[9:]
@@ -111,15 +112,15 @@ def parse_po(src):
         pluralized.append((msg_id, msg_str))
         #print(msg_id, '=>', msg_str)
     return pluralized
-    
-    
+
+
 def compile_string(msg_id, msg_str):
     return msg_id.encode('utf-8') + bytes([0]) + \
            msg_str.encode('utf-8') + bytes([0])
-    
+
 
 os.chdir(os.path.dirname(__file__))
-    
+
 if MODE == 'compile':
     BASE_STRINGS = {}
     PLURALS = set()
@@ -156,4 +157,4 @@ def compile_string(msg_id, msg_str):
     for msg_id, _ in messages:
         print(f'\nmsgid "{msg_id}"\nmsgstr ""\n', file=f)
 
-    
+

po/compile.py

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: [email protected]\n"
-"PO-Revision-Date: 2024-10-06 10:28+0000\n"
+"PO-Revision-Date: 2025-06-26 16:44+0000\n"
 "Last-Translator: xabi <[email protected]>\n"
 "Language-Team: Basque <http://weblate.skyjake.fi/projects/lagrange/ui/eu/>\n"
 "Language: eu\n"
@@ -2890,3 +2890,7 @@ msgstr "Bidali kopia bat nire buruari"
 
 msgid "upload.type"
 msgstr "Edukia"
+
+#, fuzzy
+msgid "prefs.expandline"
+msgstr "Hedatu lerro luzeetara:"

po/eu.po

@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
 "POT-Creation-Date: 2023-01-25 09:20+0000\n"
-"PO-Revision-Date: 2024-10-06 10:28+0000\n"
+"PO-Revision-Date: 2025-07-07 06:44+0000\n"
 "Last-Translator: Xosé M. <[email protected]>\n"
 "Language-Team: Galician <http://weblate.skyjake.fi/projects/lagrange/ui/gl/>"
 "\n"
@@ -2859,3 +2859,6 @@ msgstr "Envíame unha copia"
 
 msgid "upload.type"
 msgstr "Contido"
+
+msgid "prefs.expandline"
+msgstr "Despregar en liñas longas:"