summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Gonciarz2023-02-06 22:45:44 +0100
committerRobert Gonciarz2023-02-06 22:45:44 +0100
commitf315e30a39ecc232a450f1a7ce5fe41460ddd1c2 (patch)
treef797a55f5f7c1d3e46ec9a2187a5e93a9baec8f6
parent58e75260db9023b7e707abb286b46e91afdc03f9 (diff)
downloadaur-f315e30a39ecc232a450f1a7ce5fe41460ddd1c2.tar.gz
Switched to QT6
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD12
-rw-r--r--project.patch13
3 files changed, 25 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d3a993ab01e6..c61f0ed59e6d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
pkgbase = libreelec-usb-sd-creator-git
pkgdesc = A simple GUI for creating LibreELEC USB/SD card installation media
pkgver = r1.d5922e2
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/LibreELEC/usb-sd-creator
arch = i686
arch = x86_64
license = GPLv2
makedepends = git
- makedepends = qt5-tools
- makedepends = qt5-base
+ makedepends = qt6-tools
+ makedepends = qt6-base
source = git+https://github.com/LibreELEC/usb-sd-creator
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index fbe8d538e720..552b7e17d741 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,12 +5,12 @@ pkgbase=libreelec-usb-sd-creator-git
pkgname=('libreelec-usb-sd-creator-git')
_gitname=('usb-sd-creator')
pkgver=r1.d5922e2
-pkgrel=1
+pkgrel=2
pkgdesc="A simple GUI for creating LibreELEC USB/SD card installation media"
arch=('i686' 'x86_64')
url="https://github.com/LibreELEC/usb-sd-creator"
license=('GPLv2')
-makedepends=('git' 'qt5-tools' 'qt5-base')
+makedepends=('git' 'qt6-tools' 'qt6-base')
source=("git+https://github.com/LibreELEC/usb-sd-creator")
md5sums=('SKIP')
@@ -19,8 +19,15 @@ pkgver() {
printf "r%s.%s" $(git rev-list --count HEAD) $(git rev-parse --short HEAD)
}
+prepare() {
+ cd "${_gitname%-git}"
+ patch --forward --strip=1 --input="${srcdir}/../project.patch"
+}
+
build() {
cd "${_gitname%-git}"
+ QT_PATH=/usr/lib/qt6
+ export PATH=$QT_PATH/bin:$PATH
lrelease creator.pro
qmake creator.pro
make -j4
@@ -28,7 +35,6 @@ build() {
package() {
cd "${_gitname%-git}"
- make INSTALL_ROOT="$pkgdir" install
install -Dm755 LibreELEC.USB-SD.Creator.Linux-bit.bin "${pkgdir}"/usr/bin/libreelec-usb-sd-creator
}
diff --git a/project.patch b/project.patch
new file mode 100644
index 000000000000..3a52bb129dba
--- /dev/null
+++ b/project.patch
@@ -0,0 +1,13 @@
+diff --git a/creator.pro b/creator.pro
+index 8c99fa5..6871e4a 100644
+--- a/creator.pro
++++ b/creator.pro
+@@ -165,7 +165,7 @@ linux* {
+ SOURCES += privileges_unix.cpp
+ HEADERS += privileges_unix.h
+
+- QMAKE_CXXFLAGS += -std=c++11
++ QMAKE_CXXFLAGS += -std=c++17
+
+ LIBS += -lblkid
+ }