Merge remote-tracking branch 'upstream/2.6'

Author: daschuer

.github/workflows/build.yml

@@ -22,11 +22,15 @@ jobs:
     - name: Setup Graphviz
       run: sudo apt update && sudo apt install -y graphviz
     - name: Setup Python
-      uses: actions/setup-python@v6
+      uses: actions/setup-python@v7
       with:
         python-version: '3.10'
     - name: Install Python dependencies
       run: pip install --upgrade -r requirements.txt
+    - name: Patch linuxdoc
+      run: >
+        python -c "import linuxdoc; print(linuxdoc.__path__[0])"
+        | xargs -I{} patch -d {} -p1 -N -i patches/linuxdoc-rstFlatTable.patch || true
     - name: Build versioned HTML manual
       run: sh build_html.sh
     - name: Deploy to Netlify
@@ -58,11 +62,15 @@ jobs:
         latexmk
         xindy
     - name: Setup Python
-      uses: actions/setup-python@v6
+      uses: actions/setup-python@v7
       with:
         python-version: '3.10'
     - name: Install Python dependencies
       run: pip install --upgrade -r requirements.txt
+    - name: Patch linuxdoc
+      run: >
+        python -c "import linuxdoc; print(linuxdoc.__path__[0])"
+        | xargs -I{} patch -d {} -p1 -N -i patches/linuxdoc-rstFlatTable.patch || true
     - name: Set up SSH Agent
       if: (github.event_name == 'push' || github.event_name == 'repository_dispatch') && env.SSH_PRIVATE_KEY != null
       env:

.github/workflows/changelog.yml

@@ -25,7 +25,7 @@ jobs:
       with:
         ref: ${{ github.event.client_payload.branch }}
     - name: Set up Python
-      uses: actions/setup-python@v6
+      uses: actions/setup-python@v7
       with:
         python-version: 3.10
     - name: Install Python dependencies

.github/workflows/mixxx-controls-ts.yml

@@ -32,6 +32,7 @@ jobs:
         working-directory: manual
         run: |
           pip install -r requirements.txt
+          python -c "import linuxdoc; print(linuxdoc.__path__[0])" | xargs -I{} patch -d {} -p1 -N -i patches/linuxdoc-rstFlatTable.patch || true
           pip install pre-commit
           make html
 

.github/workflows/sphinx.yml

@@ -12,13 +12,17 @@ jobs:
     - name: Clone repository
       uses: actions/checkout@v7
     - name: Set up Python
-      uses: actions/setup-python@v6
+      uses: actions/setup-python@v7
       with:
         python-version: '3.13'
     - name: Install Python dependencies
       run: |
         python -m pip install --upgrade pip
         python -m pip install -r requirements.txt
+    - name: Patch linuxdoc
+      run: >
+        python -c "import linuxdoc; print(linuxdoc.__path__[0])"
+        | xargs -I{} patch -d {} -p1 -N -i patches/linuxdoc-rstFlatTable.patch || true
     - name: Check for broken links
       run: sphinx-build -q --color -b linkcheck source build
 
@@ -31,13 +35,17 @@ jobs:
     - name: Set up Graphviz
       run: sudo apt update && sudo apt install -y graphviz
     - name: Set up Python
-      uses: actions/setup-python@v6
+      uses: actions/setup-python@v7
       with:
         python-version: '3.13'
     - name: Install Python dependencies
       run: |
         python -m pip install --upgrade pip
         python -m pip install -r requirements.txt
+    - name: Patch linuxdoc
+      run: >
+        python -c "import linuxdoc; print(linuxdoc.__path__[0])"
+        | xargs -I{} patch -d {} -p1 -N -i patches/linuxdoc-rstFlatTable.patch || true
     - name: Load problem matcher
       uses: ammaraskar/sphinx-problem-matcher@master
     - name: Check for build issues

.pre-commit-config.yaml

@@ -60,7 +60,7 @@ repos:
   - id: rstcheck
     name: "Check RST syntax"
     args: [
-      --ignore-messages=(Hyperlink target.*not referenced)\.$,
+      --ignore-messages=(Hyperlink target.*not referenced|File referenced in "include" directive not found:.*)\.$,
     ]
     additional_dependencies:
     - sphinx

.tx/config

@@ -271,6 +271,15 @@ resource_name          = chapters--preferences--library
 replace_edited_strings = false
 keep_translations      = false
 
+[o:mixxx-dj-software:p:mixxx-dj-manual-27:r:chapters--preferences--mixer]
+file_filter            = source/locale/<lang>/LC_MESSAGES/chapters/preferences/mixer.po
+source_file            = source/locale/pot/chapters/preferences/mixer.pot
+type                   = PO
+minimum_perc           = 0
+resource_name          = chapters--preferences--mixer
+replace_edited_strings = false
+keep_translations      = false
+
 [o:mixxx-dj-software:p:mixxx-dj-manual-27:r:chapters--preferences--sound_hardware]
 file_filter            = source/locale/<lang>/LC_MESSAGES/chapters/preferences/sound_hardware.po
 source_file            = source/locale/pot/chapters/preferences/sound_hardware.pot
@@ -873,6 +882,15 @@ resource_name          = hardware--controllers--icon_p1_nano
 replace_edited_strings = false
 keep_translations      = false
 
+[o:mixxx-dj-software:p:mixxx-dj-manual-27:r:hardware--controllers--intech_TEK2]
+file_filter            = source/locale/<lang>/LC_MESSAGES/hardware/controllers/intech_TEK2.po
+source_file            = source/locale/pot/hardware/controllers/intech_TEK2.pot
+type                   = PO
+minimum_perc           = 0
+resource_name          = hardware--controllers--intech_TEK2
+replace_edited_strings = false
+keep_translations      = false
+
 [o:mixxx-dj-software:p:mixxx-dj-manual-27:r:hardware--controllers--ion_discover_dj]
 file_filter            = source/locale/<lang>/LC_MESSAGES/hardware/controllers/ion_discover_dj.po
 source_file            = source/locale/pot/hardware/controllers/ion_discover_dj.pot
@@ -1110,6 +1128,15 @@ resource_name          = hardware--controllers--native_instruments_traktor_kontr
 replace_edited_strings = false
 keep_translations      = false
 
+[o:mixxx-dj-software:p:mixxx-dj-manual-27:r:hardware--controllers--native_instruments_traktor_mx2]
+file_filter            = source/locale/<lang>/LC_MESSAGES/hardware/controllers/native_instruments_traktor_mx2.po
+source_file            = source/locale/pot/hardware/controllers/native_instruments_traktor_mx2.pot
+type                   = PO
+minimum_perc           = 0
+resource_name          = hardware--controllers--native_instruments_traktor_mx2
+replace_edited_strings = false
+keep_translations      = false
+
 [o:mixxx-dj-software:p:mixxx-dj-manual-27:r:hardware--controllers--nintendo_wiimote]
 file_filter            = source/locale/<lang>/LC_MESSAGES/hardware/controllers/nintendo_wiimote.po
 source_file            = source/locale/pot/hardware/controllers/nintendo_wiimote.pot
@@ -1200,6 +1227,15 @@ resource_name          = hardware--controllers--numark_idj_live_ii
 replace_edited_strings = false
 keep_translations      = false
 
+[o:mixxx-dj-software:p:mixxx-dj-manual-27:r:hardware--controllers--numark_mixstream_pro]
+file_filter            = source/locale/<lang>/LC_MESSAGES/hardware/controllers/numark_mixstream_pro.po
+source_file            = source/locale/pot/hardware/controllers/numark_mixstream_pro.pot
+type                   = PO
+minimum_perc           = 0
+resource_name          = hardware--controllers--numark_mixstream_pro
+replace_edited_strings = false
+keep_translations      = false
+
 [o:mixxx-dj-software:p:mixxx-dj-manual-27:r:hardware--controllers--numark_mixtrack]
 file_filter            = source/locale/<lang>/LC_MESSAGES/hardware/controllers/numark_mixtrack.po
 source_file            = source/locale/pot/hardware/controllers/numark_mixtrack.pot
@@ -1279,6 +1315,15 @@ resource_name          = hardware--controllers--numark_n4
 replace_edited_strings = false
 keep_translations      = false
 
+[o:mixxx-dj-software:p:mixxx-dj-manual-27:r:hardware--controllers--numark_ns4fx]
+file_filter            = source/locale/<lang>/LC_MESSAGES/hardware/controllers/numark_ns4fx.po
+source_file            = source/locale/pot/hardware/controllers/numark_ns4fx.pot
+type                   = PO
+minimum_perc           = 0
+resource_name          = hardware--controllers--numark_ns4fx
+replace_edited_strings = false
+keep_translations      = false
+
 [o:mixxx-dj-software:p:mixxx-dj-manual-27:r:hardware--controllers--numark_ns6ii]
 file_filter            = source/locale/<lang>/LC_MESSAGES/hardware/controllers/numark_ns6ii.po
 source_file            = source/locale/pot/hardware/controllers/numark_ns6ii.pot

Makefile

@@ -116,10 +116,10 @@ latex:
 	      "(use \`make latexpdf' here to do that automatically)."
 
 latexpdf:
-	$(SPHINXBUILD) source $(BUILDDIR)/latex -b latex $(ALLSPHINXOPTS)
-	@echo "Running LaTeX files through pdflatex..."
-	$(MAKE) -C $(BUILDDIR)/latex all-pdf
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+	$(SPHINXBUILD) source $(BUILDDIR)/latex -b latex $(ALLSPHINXOPTS) -Dlatex_engine=xelatex
+	@echo "Running LaTeX files through xelatex..."
+	$(MAKE) -C $(BUILDDIR)/latex LATEXMKOPTS="-f -interaction=nonstopmode -pdf -xelatex" all-pdf
+	@echo "xelatex finished; the PDF files are in $(BUILDDIR)/latex."
 
 latexpdfja:
 	$(SPHINXBUILD) source $(BUILDDIR)/latex -b latex $(ALLSPHINXOPTS)

patches/linuxdoc-rstFlatTable.patch

@@ -0,0 +1,11 @@
+--- a/linuxdoc/rstFlatTable.py
++++ b/linuxdoc/rstFlatTable.py
+@@ -327,7 +327,7 @@ def parseCellItem(self, cellItem):
+         cspan = rspan = 0
+         if not len(cellItem):  # pylint: disable=len-as-condition
+             return cspan, rspan, []
+-        for elem in cellItem[0]:
++        for elem in list(cellItem.findall(lambda n: isinstance(n, (colSpan, rowSpan)))):
+             if isinstance(elem, colSpan):
+                 cspan = elem.get("span")
+                 elem.parent.remove(elem)

requirements.txt

@@ -9,4 +9,5 @@ transifex-client
 sphinxcontrib-svg2pdfconverter
 sphinx-rtd-theme
 sphinx-multiversion
+linuxdoc
 ./sphinx-mixxx

source/chapters/advanced_topics.rst

@@ -236,7 +236,7 @@ Effects via JACK Rack on GNU/Linux
    The Jack routing for external effects on GNU/Linux
 
 Use `Jack <https://en.wikipedia.org/wiki/JACK_Audio_Connection_Kit>`_ to route
-each deck directly through `JACK Rack <http://jack-rack.sourceforge.net/>`_
+each deck directly through `JACK Rack <https://jack-rack.sourceforge.net/>`_
 effect racks, or for more control you can use Ardour (or another :term:`DAW`)
 using sends for effects. This gives Mixxx access to the extensive collection of
 :term:`LADSPA` plugins.
@@ -291,7 +291,6 @@ Migrate your Mixxx library and settings to Flatpak
 Since version 2.5 Mixxx is also provided as Flatpak.
 
 If you do want to switch from a distribution package or Mixxx built from source code to the Flatpak, a little setup is required. Flatpak stores Mixxx's database, settings, and custom controller mappings in a different location than the `~/.mixxx` directory that Mixxx has always used before. Flatpak uses `~/.var/app/org.mixxx.Mixxx/.mixxx` instead. To copy your database, settings, and controller mappings into the Flatpak sandbox, run:
-::
 
   mkdir -p ~/.var/app/org.mixxx.Mixxx
   cp -r ~/.mixxx ~/.var/app/org.mixxx.Mixxx