Skip to content

Commit 5163240

Browse files
committed
Update README to use new android-dummy package under MSYS2
1 parent 8553693 commit 5163240

File tree

1 file changed

+18
-14
lines changed

1 file changed

+18
-14
lines changed

README.md

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -534,6 +534,11 @@ To install additional libraries via MSYS2, add my Arch Linux repository to
534534
`/etc/pacman.conf`:
535535

536536
```
537+
[ownstuff-msys2]
538+
SigLevel = Required DatabaseOptional
539+
Server = https://ftp.f3l.de/~martchus/$repo/os/$arch
540+
Server = https://martchus.dyn.f3l.de/repo/arch/$repo/os/$arch
541+
537542
[ownstuff]
538543
SigLevel = Required DatabaseOptional
539544
Server = https://ftp.f3l.de/~martchus/$repo/os/$arch
@@ -544,28 +549,27 @@ After following the [instructions for importing my GPG key](https://martchus.dyn
544549
can install Android packages, e.g.:
545550

546551
```
547-
pacman -Syu --assume-installed=android-{sdk,ndk} \
548-
android-cmake android-{x86-64,aarch64}-{boost,libiconv,openssl,cppunit,sqlite}
552+
pacman -Syu android-cmake android-{x86-64,aarch64}-{boost,libiconv,openssl,cppunit,sqlite}
549553
````
550554
551-
You may even install a few KDE libraries, like Kirigami:
552-
```
553-
pacman -S --assume-installed=android-{aarch64,x86-64}-qt6-{base,declarative,shadertools,svg,5compat} \
554-
android-{aarch64,x86-64}-kirigami
555-
```
556-
557-
You may also install Qt itself from my repo instead of relying on official Qt builds:
555+
You may also install Qt from my repo instead of relying on official Qt builds:
558556
```
559-
pacman -S --assume-installed={ant,java-runtime-headless-openjdk=17} --assume-installed=android-{ndk,sdk,sdk-build-tools,sdk-platform-tools,platform-35} \
560-
android-{x86-64,aarch64}-qt6-{base,declarative,tools,svg,translations}
557+
pacman -S android-{x86-64,aarch64}-qt6-{base,declarative,tools,svg,translations}
561558
```
562559
563560
Note that when using Qt for Android from my repo, you also need to install a matching version of Qt for
564561
Windows from the MSYS2 mingw-w64 repos for host tooling.
565562
566-
When just using KDE libraries from my repo but Qt from the official installer, you need to make sure that
567-
the installed version of Qt is at least as new as the version the KDE libraries from my repo have been
568-
linked against.
563+
You may also install a few KDE libraries, like Kirigami:
564+
```
565+
pacman -S --assume-installed=android-{aarch64,x86-64}-qt6-{base,declarative,shadertools,svg,5compat} \
566+
android-{aarch64,x86-64}-kirigami
567+
```
568+
569+
You can leave out `--assme-installed=…` when you have installed Qt via `pacman` (instead of relying on
570+
official Qt builds). When just using KDE libraries from my repo but Qt from the official installer, you
571+
need to make sure that the installed version of Qt is at least as new as the version the KDE libraries
572+
from my repo have been linked against.
569573
570574
The libraries will end up under `/opt/android-libs` within your MSYS2 installation. Do not install any non
571575
`android-*-` packages, though. They will have file conflicts with packages provided by MSYS2 and are not usable

0 commit comments

Comments
 (0)