Skip to content

Commit a5a3816

Browse files
CatenersCateners
committed
Update code to v1.0.19
hangover, wechat, termux x11 xfce fix, locale.gen fix...
1 parent a911efd commit a5a3816

File tree

14 files changed

+299
-520
lines changed

14 files changed

+299
-520
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ lib目录：
6161
`split -b 98M debian.tar.xz`
6262

6363
还需要对flutter的一些默认配置作修改，因为其与项目中build.gradle的一些设置冲突。
64-
- 删除`flutter\packages\flutter_tools\gradle\src\main\flutter.groovy`路径下与`ShrinkResources`相关的`if`代码块。
64+
- 删除`flutter\packages\flutter_tools\gradle\src\main\groovy\flutter.groovy`路径下与`ShrinkResources`相关的`if`代码块。
6565

6666
接下来就可以编译了。我使用的命令如下：
6767

‎android/app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ android {
7070
// TODO: Add your own signing config for the release build.
7171
// Signing with the debug keys for now, so `flutter run --release` works.
7272
signingConfig signingConfigs.debug
73-
// remove flutter's default ShrinkResources settings at flutter\packages\flutter_tools\gradle\src\main\flutter.groovy
73+
// remove flutter's default ShrinkResources settings at flutter\packages\flutter_tools\gradle\src\main\groovy\flutter.groovy
7474
postprocessing {
7575
removeUnusedCode true
7676
removeUnusedResources true

‎android/app/src/main/AndroidManifest.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
android:name=".MainApplication"
2222
android:icon="@mipmap/ic_launcher"
2323
android:usesCleartextTraffic="true"
24-
24+
android:launchMode="singleInstance"
2525
android:theme="@style/App.Theme">
2626
<activity
2727
android:name=".MainActivity"
@@ -73,19 +73,18 @@
7373
<activity android:name="com.gaurav.avnc.ui.about.AboutActivity" />
7474
<activity
7575
android:name="com.termux.x11.MainActivity"
76-
android:taskAffinity="com.termux.x11.MainActivity"
77-
android:launchMode="singleInstance"
7876
android:supportsPictureInPicture="true"
7977
android:configChanges="fontScale|orientation|screenSize|keyboard|keyboardHidden|layoutDirection|locale|mcc|mnc|navigation|screenLayout|touchscreen|uiMode|smallestScreenSize|density"
8078
android:resizeableActivity="true"
8179
android:windowSoftInputMode="stateHidden"
8280
android:process=":x11">
81+
<!-- android:taskAffinity="com.termux.x11.MainActivity" -->
82+
<!-- android:launchMode="singleInstance" -->
8383
</activity>
8484
<activity
8585
android:name="com.termux.x11.XrActivity"
8686
android:configChanges="density|orientation|screenSize|keyboard|keyboardHidden|uiMode"
8787
android:exported="true"
88-
android:launchMode="singleTask"
8988
android:resizeableActivity="false"
9089
android:screenOrientation="landscape"
9190
android:process=":vr_process">
@@ -94,19 +93,20 @@
9493
<category android:name="com.oculus.intent.category.VR" />
9594
<category android:name="android.intent.category.LAUNCHER" />
9695
</intent-filter>
96+
<!-- android:launchMode="singleTask" -->
9797
</activity>
9898
<activity
9999
android:theme="@style/Theme.AppCompat.DayNight"
100-
android:excludeFromRecents="true"
101100
android:name="com.termux.x11.LoriePreferences"
102-
android:taskAffinity="com.termux.x11.LoriePreferences"
103101
android:supportsPictureInPicture="false"
104102
android:resizeableActivity="true"
105103
android:process=":x11">
106104
<intent-filter>
107105
<action android:name="android.intent.action.APPLICATION_PREFERENCES" />
108106
<action android:name="android.intent.action.MAIN" />
109107
</intent-filter>
108+
<!-- android:excludeFromRecents="true" -->
109+
<!-- android:taskAffinity="com.termux.x11.LoriePreferences" -->
110110
</activity>
111111
<meta-data android:name="com.samsung.android.multidisplay.keep_process_alive" android:value="false"/>
112112
<meta-data android:name="android.allow_multiple_resumed_activities" android:value="true" />

‎assets/patch.tar.gz‎

-1.33 MB
Binary file not shown.

‎extra/cross/install-box‎

Lines changed: 0 additions & 77 deletions
This file was deleted.

‎extra/cross/install-dxvk‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎extra/cross/install-hangover‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
#!/bin/bash
2+
3+
echo "正在更新软件包..."
4+
sudo apt update
5+
sudo apt upgrade -y
6+
7+
8+
REPO="AndreRH/hangover"
9+
API_URL="https://api.github.com/repos/$REPO/releases/latest"
10+
11+
# 获取最新release的版本号并储存在变量中
12+
latest_version=$(wget -qO- $API_URL | grep -oP '"tag_name": "\Khangover-\K([^"]+)' )
13+
14+
# 检查是否成功获取版本号
15+
if [ -z "$latest_version" ]; then
16+
echo "无法获取到最新版本号。"
17+
exit 1
18+
fi
19+
20+
echo "最新版本: $latest_version"
21+
22+
hangover_url="https://github.com/AndreRH/hangover/releases/download/hangover-${latest_version}/hangover_${latest_version}_debian12_bookworm_arm64.tar"
23+
24+
mirror_sites=(
25+
"https://github.moeyy.xyz/"
26+
"https://mirror.ghproxy.com/"
27+
""
28+
)
29+
30+
mkdir -p /tmp/hangover
31+
cd /tmp/hangover
32+
33+
for mirror in "${mirror_sites[@]}"; do
34+
url="${mirror}${hangover_url}"
35+
echo "尝试从 $url 下载Hangover..."
36+
wget "${url}" -O hangover.tar
37+
if [ $? -eq 0 ]; then
38+
echo "成功下载Hangover"
39+
break
40+
fi
41+
if [ -z "$mirror" ]; then
42+
cd /tmp
43+
rm -rf /tmp/hangover
44+
echo "下载失败...退出安装..."
45+
exit
46+
fi
47+
done
48+
49+
echo "正在安装Hangover..."
50+
tar xvf hangover.tar
51+
sudo apt install -y ./hangover-wine_${latest_version}~bookworm_arm64.deb ./hangover-libarm64ecfex_${latest_version}_arm64.deb
52+
if [ $? -ne 0 ]; then
53+
cd /tmp
54+
rm -rf /tmp/hangover
55+
echo "安装失败...退出安装..."
56+
exit 1
57+
fi
58+
59+
echo "正在初始化Wine..."
60+
wineboot --init
61+
62+
echo "正在修复字体..."
63+
regedit "Z:\\home\\tiny\\.local\\share\\tiny\\extra\\chn_fonts.reg" && wine reg delete "HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Windows NT\\CurrentVersion\\FontSubstitutes" /va /f
64+
65+
cd /tmp
66+
rm -rf /tmp/hangover
67+
echo "安装完成"

‎extra/cross/install-hangover-stable‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
#!/bin/bash
2+
3+
echo "正在更新软件包..."
4+
sudo apt update
5+
sudo apt upgrade -y
6+
7+
hangover_url="https://github.com/AndreRH/hangover/releases/download/hangover-9.20.1/hangover_9.20.1_debian12_bookworm_arm64.tar"
8+
latest_version="9.20.1"
9+
10+
mirror_sites=(
11+
"https://github.moeyy.xyz/"
12+
"https://mirror.ghproxy.com/"
13+
""
14+
)
15+
16+
mkdir -p /tmp/hangover
17+
cd /tmp/hangover
18+
19+
for mirror in "${mirror_sites[@]}"; do
20+
url="${mirror}${hangover_url}"
21+
echo "尝试从 $url 下载Hangover..."
22+
wget "${url}" -O hangover.tar
23+
if [ $? -eq 0 ]; then
24+
echo "成功下载Hangover"
25+
break
26+
fi
27+
if [ -z "$mirror" ]; then
28+
cd /tmp
29+
rm -rf /tmp/hangover
30+
echo "下载失败...退出安装..."
31+
exit
32+
fi
33+
done
34+
35+
echo "正在安装Hangover..."
36+
tar xvf hangover.tar
37+
sudo apt install -y ./hangover-wine_${latest_version}~bookworm_arm64.deb ./hangover-libarm64ecfex_${latest_version}_arm64.deb
38+
if [ $? -ne 0 ]; then
39+
cd /tmp
40+
rm -rf /tmp/hangover
41+
echo "安装失败...退出安装..."
42+
exit 1
43+
fi
44+
45+
echo "正在初始化Wine..."
46+
wineboot --init
47+
48+
echo "正在修复字体..."
49+
regedit "Z:\\home\\tiny\\.local\\share\\tiny\\extra\\chn_fonts.reg" && wine reg delete "HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Windows NT\\CurrentVersion\\FontSubstitutes" /va /f
50+
51+
echo "安装完成"

‎extra/cross/install-wine‎

Lines changed: 0 additions & 80 deletions
This file was deleted.

0 commit comments

Comments
 (0)