Merge branch 'Ryubing:master' into master

infra: Update to LLVM 17 (#519 )
This fixes macos builds not building correctly because of a missing LLVM 14 package.
2025-01-13 15:30:57 +01:00 · 2025-01-12 14:57:57 -06:00 · 2025-01-11 13:32:56 +01:00 · 2025-01-11 13:29:12 +01:00 · 2025-01-11 13:25:07 +01:00 · 2025-01-11 12:22:20 +01:00
9 changed files with 77 additions and 23 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -129,11 +129,11 @@ jobs:
        with:
          global-json-file: global.json

-      - name: Setup LLVM 14
+      - name: Setup LLVM 17
        run: |
          wget https://apt.llvm.org/llvm.sh
          chmod +x llvm.sh
-          sudo ./llvm.sh 14
+          sudo ./llvm.sh 17

      - name: Install rcodesign
        run: |
--- a/.github/workflows/canary.yml
+++ b/.github/workflows/canary.yml
@@ -210,11 +210,11 @@ jobs:
        with:
          global-json-file: global.json

-      - name: Setup LLVM 15
+      - name: Setup LLVM 17
        run: |
          wget https://apt.llvm.org/llvm.sh
          chmod +x llvm.sh
-          sudo ./llvm.sh 15
+          sudo ./llvm.sh 17

      - name: Install rcodesign
        run: |
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -191,11 +191,11 @@ jobs:
        with:
          global-json-file: global.json

-      - name: Setup LLVM 15
+      - name: Setup LLVM 17
        run: |
          wget https://apt.llvm.org/llvm.sh
          chmod +x llvm.sh
-          sudo ./llvm.sh 15
+          sudo ./llvm.sh 17

      - name: Install rcodesign
        run: |
--- a/distribution/macos/bundle_fix_up.py
+++ b/distribution/macos/bundle_fix_up.py
@@ -19,7 +19,7 @@ if platform.system() == "Darwin":
 else:
    OTOOL = shutil.which("llvm-otool")
    if OTOOL is None:
-        for llvm_ver in [15, 14, 13]:
+        for llvm_ver in [17, 16, 15, 14, 13]:
            otool_path = shutil.which(f"llvm-otool-{llvm_ver}")
            if otool_path is not None:
                OTOOL = otool_path
--- a/distribution/macos/construct_universal_dylib.py
+++ b/distribution/macos/construct_universal_dylib.py
@@ -26,7 +26,7 @@ else:
    LIPO = shutil.which("llvm-lipo")

    if LIPO is None:
-        for llvm_ver in [15, 14, 13]:
+        for llvm_ver in [17, 16, 15, 14, 13]:
            lipo_path = shutil.which(f"llvm-lipo-{llvm_ver}")
            if lipo_path is not None:
                LIPO = lipo_path
--- a/distribution/macos/create_macos_build_ava.sh
+++ b/distribution/macos/create_macos_build_ava.sh
@@ -67,11 +67,11 @@ python3 "$BASE_DIR/distribution/macos/construct_universal_dylib.py" "$ARM64_APP_

 if ! [ -x "$(command -v lipo)" ];
 then
-    if ! [ -x "$(command -v llvm-lipo-14)" ];
+    if ! [ -x "$(command -v llvm-lipo-17)" ];
    then
        LIPO=llvm-lipo
    else
-        LIPO=llvm-lipo-14
+        LIPO=llvm-lipo-17
    fi
 else
    LIPO=lipo
--- a/distribution/macos/create_macos_build_headless.sh
+++ b/distribution/macos/create_macos_build_headless.sh
@@ -62,11 +62,11 @@ python3 "$BASE_DIR/distribution/macos/construct_universal_dylib.py" "$ARM64_OUTP

 if ! [ -x "$(command -v lipo)" ];
 then
-    if ! [ -x "$(command -v llvm-lipo-14)" ];
+    if ! [ -x "$(command -v llvm-lipo-17)" ];
    then
        LIPO=llvm-lipo
    else
-        LIPO=llvm-lipo-14
+        LIPO=llvm-lipo-17
    fi
 else
    LIPO=lipo
--- a/src/Ryujinx/Assets/locales.json
+++ b/src/Ryujinx/Assets/locales.json
@@ -3946,6 +3946,54 @@
        "zh_CN": "繁体中文（推荐）",
        "zh_TW": "正體中文 (建議)"
      }
+    },    {
+      "ID": "SettingsTabSystemSystemLanguageSwedish",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Swedish",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "Svenska",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },    {
+      "ID": "SettingsTabSystemSystemLanguageNorwegian",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Norwegian",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "Norsk",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "Norska",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
    },
    {
      "ID": "SettingsTabSystemSystemTimeZone",
@@ -22614,7 +22662,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "",
-        "sv_SE": "",
+        "sv_SE": "Senast uppdaterad: {0}",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -22639,7 +22687,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "",
-        "sv_SE": "",
+        "sv_SE": "Denna kompatibilitetslista kan innehålla utdaterade poster.\nTesta gärna spelen som listas med \"Spelproblem\"-status.",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -22664,7 +22712,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "",
-        "sv_SE": "",
+        "sv_SE": "Sök i kompatibilitetsposter...",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -22689,7 +22737,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "",
-        "sv_SE": "",
+        "sv_SE": "Öppna kompatibilitetslistan",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -22714,7 +22762,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "",
-        "sv_SE": "",
+        "sv_SE": "Visa endast ägda spel",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -22739,7 +22787,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "",
-        "sv_SE": "",
+        "sv_SE": "Spelbart",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -22764,7 +22812,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "",
-        "sv_SE": "",
+        "sv_SE": "Spelproblem",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -22789,7 +22837,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "",
-        "sv_SE": "",
+        "sv_SE": "Menyer",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -22814,7 +22862,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "",
-        "sv_SE": "",
+        "sv_SE": "Startar",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -22839,7 +22887,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "",
-        "sv_SE": "",
+        "sv_SE": "Ingenting",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -22848,4 +22896,4 @@
      }
    }
  ]
-}
+}
--- a/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
@@ -136,6 +136,12 @@
                            <ComboBoxItem>
                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageBrazilianPortuguese}" />
                            </ComboBoxItem>
+                            <ComboBoxItem>
+                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageSwedish}" />
+                            </ComboBoxItem>
+                            <ComboBoxItem>
+                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageNorwegian}" />
+                            </ComboBoxItem>
                        </ComboBox>
                    </StackPanel>
                    <StackPanel
Author	SHA1	Message	Date
Daniel Nylander	ebeac1f4aa	Merge branch 'Ryubing:master' into master	2025-01-13 15:30:57 +01:00
GabCoolGuy	f1dee50275	infra: Update to LLVM 17 (#519 ) This fixes macos builds not building correctly because of a missing LLVM 14 package.	2025-01-12 14:57:57 -06:00
Daniel Nylander	92b6756d24	Update locales.json with Swedish and Norwegian Adding SettingsTabSystemSystemLanguageSwedish SettingsTabSystemSystemLanguageNorwegian	2025-01-11 13:32:56 +01:00
Daniel Nylander	a93adad50b	Update SettingsSystemView.axaml adding Swedish and Norwegian This list should be in alphabetical order?	2025-01-11 13:29:12 +01:00
Daniel Nylander	8ff24506fb	Merge branch 'Ryubing:master' into master	2025-01-11 13:25:07 +01:00
Daniel Nylander	f05b3cdd53	Updated sv_SE in locales.json	2025-01-11 12:22:20 +01:00