Skip to content

Commit b56f01d

Browse files
committed
#3353 archlinux: migrate build from Qt5 to Qt6
Signed-off-by: Patrizio Bekerle <patrizio@bekerle.com>
1 parent f260a93 commit b56f01d

File tree

3 files changed

+20
-14
lines changed

3 files changed

+20
-14
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# QOwnNotes Changelog
22

3+
## 25.8.8
4+
5+
- The build process for Arch Linux was brought from Qt5 to Qt6 for OBS and the AUR
6+
(for [#3353](https://github.com/pbek/QOwnNotes/issues/3353))
7+
38
## 25.8.7
49

510
- In the link dialog, you can now also do relative links to files and directories

build-systems/aur/PKGBUILD

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Maintainer: Patrizio Bekerle <patrizio at bekerle dot com>
2+
# https://wiki.archlinux.org/title/PKGBUILD
23

34
pkgname=qownnotes
45
pkgver=VERSION-STRING
@@ -9,8 +10,8 @@ arch=('i686' 'x86_64' 'armv7h' 'aarch64')
910
url='https://www.qownnotes.org/'
1011
license=('GPL2')
1112
groups=('qownnotes')
12-
depends=('qt5-base' 'qt5-svg' 'qt5-declarative' 'openssl' 'qt5-websockets' 'qt5-x11extras' 'aspell')
13-
makedepends=('qt5-tools')
13+
depends=('qt6-base' 'qt6-svg' 'qt6-declarative' 'qt6-websockets' 'aspell')
14+
makedepends=('qt6-tools')
1415
source=("https://github.com/pbek/QOwnNotes/releases/download/v${pkgver}/qownnotes-${pkgver}.tar.xz")
1516
sha256sums=('ARCHIVE-SHA256')
1617

@@ -21,7 +22,7 @@ prepare() {
2122

2223
build() {
2324
cd "${pkgname}-${pkgver}"
24-
qmake QMAKE_CFLAGS_RELEASE="${CFLAGS}" QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" QMAKE_LFLAGS_RELEASE="${LDFLAGS}"
25+
qmake6 QMAKE_CFLAGS_RELEASE="${CFLAGS}" QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" QMAKE_LFLAGS_RELEASE="${LDFLAGS}"
2526
make
2627
}
2728

@@ -39,6 +40,6 @@ package() {
3940
install -D -m644 "images/icons/scalable/apps/QOwnNotes.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/QOwnNotes.svg"
4041

4142
# install languages
42-
install -d "${pkgdir}/usr/share/qt5/translations/"
43-
install -D -m644 languages/*.qm "${pkgdir}/usr/share/qt5/translations/"
43+
install -d "${pkgdir}/usr/share/qt6/translations/"
44+
install -D -m644 languages/*.qm "${pkgdir}/usr/share/qt6/translations/"
4445
}

obs/PKGBUILD

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
# Maintainer: Patrizio Bekerle <patrizio at bekerle dot com>
2-
# see: https://wiki.archlinux.org/index.php/PKGBUILD
2+
# https://wiki.archlinux.org/title/PKGBUILD
33

44
pkgname=qownnotes
55
pkgver=VERSION-STRING
66
pkgrel=1
7-
pkgdesc="Note-taking app and todo list manager with ownCloud/Nextcloud integration"
8-
arch=('i686' 'x86_64')
7+
pkgdesc="Plain-text file markdown note taking with Nextcloud/ownCloud integration"
8+
arch=('i686' 'x86_64' 'armv7h' 'aarch64')
99
url='https://www.qownnotes.org/'
1010
license=('GPL2')
1111
groups=('qownnotes')
12-
depends=('qt5-base' 'qt5-svg' 'qt5-declarative' 'openssl' 'qt5-websockets' 'qt5-x11extras' 'aspell')
13-
makedepends=('git' 'qt5-tools')
12+
depends=('qt6-base' 'qt6-svg' 'qt6-declarative' 'qt6-websockets' 'aspell')
13+
makedepends=('qt6-tools')
1414
provides=("${pkgname%-*}")
1515
conflicts=("${pkgname%-*}")
1616
source=("${pkgname}-${pkgver}.tar.xz")
1717
md5sums=('SKIP')
1818

1919
build() {
2020
cd "${pkgname}-${pkgver}"
21-
qmake
22-
make
21+
qmake6 QMAKE_CFLAGS_RELEASE="${CFLAGS}" QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" QMAKE_LFLAGS_RELEASE="${LDFLAGS}"
22+
make
2323
}
2424

2525
package() {
@@ -36,6 +36,6 @@ package() {
3636
install -D -m644 "images/icons/scalable/apps/QOwnNotes.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/QOwnNotes.svg"
3737

3838
# install languages
39-
install -d "${pkgdir}/usr/share/qt5/translations/"
40-
install -D -m644 languages/*.qm "${pkgdir}/usr/share/qt5/translations/"
39+
install -d "${pkgdir}/usr/share/qt6/translations/"
40+
install -D -m644 languages/*.qm "${pkgdir}/usr/share/qt6/translations/"
4141
}

0 commit comments

Comments
 (0)