summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoão Figueiredo2021-06-03 22:44:39 +0100
committerJoão Figueiredo2021-06-03 22:44:39 +0100
commit54beeb83e6cab6e595d116830ad2d7c28f7068aa (patch)
treebd9d74336d78f185b1ff5a0958640b8261d9461f
parent412c6b90618631a98063ee4aad85507d9f4bcc6c (diff)
downloadaur-falkon-git.tar.gz
Merged with official ABS falkon PKGBUILD
-rw-r--r--.SRCINFO40
-rw-r--r--PKGBUILD57
2 files changed, 41 insertions, 56 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0ed27bf9e17..e19ce410832 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,39 +1,29 @@
pkgbase = falkon-git
- pkgdesc = Cross-platform Qt Web Browser
- pkgver = 3.1.0.72.g2098d69a
+ pkgdesc = Cross-platform QtWebEngine browser
+ pkgver = 3.1.99_r5703.g9bebc144
pkgrel = 1
- url = http://www.qupzilla.com
- arch = i686
+ url = https://www.falkon.org/
arch = x86_64
- license = GPL
+ license = GPL3
makedepends = git
- makedepends = libgnome-keyring
+ makedepends = extra-cmake-modules-git
makedepends = qt5-tools
- makedepends = kwallet
- makedepends = shiboken2
- makedepends = pyside2-tools
- makedepends = kio
- makedepends = extra-cmake-modules
- makedepends = shiboken2
- makedepends = pyside2-tools
+ makedepends = kio-git
+ makedepends = purpose-git
makedepends = libgnome-keyring
+ makedepends = pyside2
+ makedepends = shiboken2
depends = qt5-webengine
- depends = pyside2
depends = qt5-x11extras
depends = qt5-svg
- depends = openssl>=1.1.0
- depends = purpose
- optdepends = bash-completion: bash completion support
- optdepends = kwallet: kf5 kwallet integration
+ optdepends = kio-git: KDE integration
+ optdepends = purpose-git: KDE integration
optdepends = libgnome-keyring: gnome keyring integration
- optdepends = pyside2: python plugins for falkon
- optdepends = shiboken2: qml plugins for falkon
- conflicts = qupzilla
- conflicts = qupzilla-qt5
- conflicts = qupzilla-qt5-git
+ optdepends = pyside2: Python plugins
+ provides = falkon
conflicts = falkon
- source = git+https://anongit.kde.org/falkon.git
+ replaces = qupzilla
+ source = git+https://github.com/KDE/falkon.git
sha256sums = SKIP
pkgname = falkon-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 99ed3b5a852..d25529d8be8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,38 @@
-# Maintainer: pavbaranov <pavbaranov at gmail dot com>
-# Maintainer: Piotr Gorski <lucjan.lucjanov@gmail.com>
-# Maintainer : Solomon Choina <shlomochoina@gmail.com>
+# Merged with official ABS falkon PKGBUILD by João, 2021/06/03 (all respective contributors apply herein)
+# Maintainer: João Figueiredo & chaotic-aur <islandc0der@chaotic.cx>
+# Contributor: pavbaranov <pavbaranov at gmail dot com>
+# Contributor: Piotr Gorski <lucjan.lucjanov@gmail.com>
+# Maintainer: Solomon Choina <shlomochoina@gmail.com>
+
pkgname=falkon-git
-pkgver=3.1.0.72.g2098d69a
+pkgver=3.1.99_r5703.g9bebc144
pkgrel=1
-pkgdesc="Cross-platform Qt Web Browser"
-arch=('i686' 'x86_64')
-url="http://www.qupzilla.com"
-license=('GPL')
-depends=('qt5-webengine' 'pyside2' 'qt5-x11extras' 'qt5-svg' 'openssl>=1.1.0' 'purpose')
-makedepends=('git' 'libgnome-keyring' 'qt5-tools' 'kwallet' 'shiboken2' 'pyside2-tools' 'kio' 'extra-cmake-modules' 'shiboken2' 'pyside2-tools' 'libgnome-keyring')
-
-conflicts=('qupzilla' 'qupzilla-qt5' 'qupzilla-qt5-git' 'falkon')
-optdepends=(
- 'bash-completion: bash completion support'
- 'kwallet: kf5 kwallet integration'
- 'libgnome-keyring: gnome keyring integration'
- 'pyside2: python plugins for falkon'
- 'shiboken2: qml plugins for falkon'
- )
-source=("git+https://anongit.kde.org/falkon.git")
+pkgdesc="Cross-platform QtWebEngine browser"
+arch=($CARCH)
+url="https://www.falkon.org/"
+license=(GPL3)
+depends=(qt5-webengine qt5-x11extras qt5-svg)
+makedepends=(git extra-cmake-modules-git qt5-tools kio-git purpose-git libgnome-keyring pyside2 shiboken2)
+conflicts=(${pkgname%-git})
+provides=(${pkgname%-git})
+optdepends=('kio-git: KDE integration' 'purpose-git: KDE integration' 'libgnome-keyring: gnome keyring integration'
+ 'pyside2: Python plugins')
+replaces=(qupzilla)
+source=("git+https://github.com/KDE/${pkgname%-git}.git")
sha256sums=('SKIP')
pkgver() {
- cd "${pkgname%-*}"
- git describe --long --tags | sed 's/^v//;s/-/./g'
+ cd ${pkgname%-git}
+ _ver="$(grep -m1 'project(Falkon' CMakeLists.txt | cut -d ' ' -f3 | tr -d ')' | tr - .)"
+ echo "${_ver}_r$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)"
}
build() {
- mkdir build
- cd build
- cmake ../"${pkgname%-*}" \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DKDE_INSTALL_LIBDIR=lib \
- -DCMAKE_BUILD_TYPE=Release
- make
+ cmake -B build -S ${pkgname%-git} \
+ -DBUILD_TESTING=OFF
+ cmake --build build
}
package() {
- cd build
- make DESTDIR="$pkgdir/" install
+ DESTDIR="$pkgdir" cmake --install build
}