upgpkg: midori-git 10.0.2.r99.ea22c22-1

use new build process and repo
add .gitignore, wrapper script, .desktop
remove provides/conflicts

Signed-off-by: éclairevoyant <848000+eclairevoyant@users.noreply.github.com>

5 files changed, 68 insertions, 70 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 83620ce3c2b9..768587bd6e8e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,34 +1,22 @@
 pkgbase = midori-git
-	pkgdesc = Lightweight web browser based on WebKit and GTK3. Git development version.
-	pkgver = 0.6.0.r8628.7b765721
+	pkgdesc = Lightweight Electron- and React-based web browser
+	pkgver = 10.0.2.r99.ea22c22
 	pkgrel = 1
-	url = https://midori-browser.org/
-	arch = x86_64
-	arch = i686
-	license = LGPL
-	makedepends = bzr
-	makedepends = cmake
+	url = https://astian.org/en/midori-browser-desktop
+	arch = any
+	license = LGPL3
 	makedepends = git
-	makedepends = gobject-introspection
-	makedepends = intltool
-	makedepends = ninja
-	makedepends = vala
-	depends = aria2
-	depends = gcr
-	depends = gobject-introspection-runtime
-	depends = libpeas
-	depends = libxss
-	depends = webkit2gtk
-	depends = zeitgeist
-	optdepends = gst-plugins-base: HTML5 OGG videos support
-	optdepends = gst-plugins-good: HTML5 H264 and WebM videos support
-	optdepends = gst-libav: HTML5 H264 videos support
-	provides = midori
-	conflicts = midori
-	conflicts = midori-gtk2-git
-	options = !emptydirs
-	source = git+https://github.com/midori-browser/core
-	sha256sums = SKIP
+	makedepends = jq
+	makedepends = libxcrypt-compat
+	makedepends = npm
+	makedepends = yarn
+	depends = electron17
+	depends = hicolor-icon-theme
+	source = git+https://gitlab.com/midori-web/midori-desktop.git
+	source = midori-git.sh
+	source = midori-git.desktop
+	b2sums = SKIP
+	b2sums = ed8e942ad985f6f8b501c3b7a7cc38e715481f9c9c8eeab429f960a1fad308194a09b2649d4274bdb42956804424000d2ea25585d2f0e40e5e8f87f910683294
+	b2sums = ba608913f8e279fafbfc7503ebf5bd41cb40455357caad15d6bb9bd70c9fdfaa8513d1efdc400adba6c00584c6508bdb0aa6f88e5f63d16e9d6f1835d9606262
 
 pkgname = midori-git
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..6d41467897d0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+*
+!.gitignore
+!.SRCINFO
+!midori-git.desktop
+!midori-git.sh
+!PKGBUILD
diff --git a/PKGBUILD b/PKGBUILD
index 88e8c31e7b93..84bf3e48a4cf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,54 +1,47 @@
-# Maintainer: Solomon Choina <shlomochoina@gmail.com>
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Arkham <arkham at archlinux dot us>
-# Contributor: hybraries <macwolf@archlinux.de>
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
-# Contributor: Navi <navitwo.at.gmail.dot.com>
-# Contributor: rabyte <rabyte.at.gmail.dot.com>
-# Contributor: Johannes Krampf <wuischke.at.amule.dot.org>
+# Maintainer: éclairevoyant
 
-pkgname=midori-git
-pkgver=v9.0.r0.gf6b3b1e0
+_electron=electron17
+_pkgname=midori
+pkgname="$_pkgname-git"
+pkgver=10.0.2.r99.ea22c22
 pkgrel=1
-pkgdesc='Lightweight web browser based on WebKit and GTK3. Git development version.'
-arch=('x86_64' 'i686')
-url='https://midori-browser.org/'
-license=('LGPL')
-depends=('aria2' 'gcr' 'gobject-introspection-runtime' 'libpeas' 'libxss' 'webkit2gtk' 'zeitgeist')
-makedepends=('bzr' 'cmake' 'git' 'gobject-introspection' 'intltool' 'ninja' 'vala')
-optdepends=('gst-plugins-base: HTML5 OGG videos support'
-            'gst-plugins-good: HTML5 H264 and WebM videos support'
-            'gst-libav: HTML5 H264 videos support')
-provides=('midori')
-conflicts=('midori' 'midori-gtk2-git')
-options=('!emptydirs')
-source=("git+https://github.com/midori-browser/core#tag=v9.0")
-sha256sums=('SKIP')
+pkgdesc='Lightweight Electron- and React-based web browser'
+arch=('any')
+url='https://astian.org/en/midori-browser-desktop'
+license=('LGPL3')
+depends=("$_electron" 'hicolor-icon-theme')
+makedepends=('git' 'jq' 'libxcrypt-compat' 'npm' 'yarn')
+_gitname='midori-desktop'
+source=("git+https://gitlab.com/midori-web/$_gitname.git"
+        $pkgname.sh
+        $pkgname.desktop)
+b2sums=('SKIP'
+        'ed8e942ad985f6f8b501c3b7a7cc38e715481f9c9c8eeab429f960a1fad308194a09b2649d4274bdb42956804424000d2ea25585d2f0e40e5e8f87f910683294'
+        'ba608913f8e279fafbfc7503ebf5bd41cb40455357caad15d6bb9bd70c9fdfaa8513d1efdc400adba6c00584c6508bdb0aa6f88e5f63d16e9d6f1835d9606262')
 
 pkgver() {
-  cd "$srcdir/core"
-  printf "%s" "$(git describe --tags --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g')"
+	cd $_gitname
+	printf "%s.r%s.%s" "$(jq '.version' <package.json | tr -d '"')" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
+
+prepare() {
+	sed -i "s/@ELECTRON@/$_electron/g" $pkgname.sh
 
+	cd $_gitname
+	yarn install --no-fund
 }
 
 build() {
-  cd "$srcdir/core"
-  mkdir -p build
-  cd build
-  cmake "../" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -DCMAKE_C_FLAGS="$CFLAGS -fPIC -w" \
-    -DVALA_CFLAGS="$CFLAGS -fPIC -w" \
-    -G Ninja
-  ninja
-
+	cd $_gitname
+	yarn run build
+	npx --no-install electron-builder --linux --publish never
 }
 
 package() {
-  cd "$srcdir/core"
+	install -Dm755 $pkgname.sh "$pkgdir/usr/bin/$pkgname"
+	install -Dm644 $pkgname.desktop -t "$pkgdir/usr/share/applications/"
 
-  DESTDIR="$pkgdir" ninja -C build  install
+	cd $_gitname
+	install -Dm644 dist/linux-unpacked/resources/app.asar -t "$pkgdir/usr/lib/$pkgname/"
+	install -Dm644 static/icons/icon.png "$pkgdir/usr/share/icons/hicolor/$pkgname.png"
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/midori-git.desktop b/midori-git.desktop
new file mode 100644
index 000000000000..747b5dd2211b
--- /dev/null
+++ b/midori-git.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Midori Browser
+Comment=Lightweight Electron- and React-based browser
+Exec=/usr/bin/midori-git %u
+Terminal=false
+Type=Application
+Icon=midori-git
+Categories=Network;WebBrowser;
+MimeType=application/xhtml+xml;application/xhtml_xml;application/xml;text/html;text/xml;x-scheme-handler/http;x-scheme-handler/https;
diff --git a/midori-git.sh b/midori-git.sh
new file mode 100644
index 000000000000..450e7e644dfb
--- /dev/null
+++ b/midori-git.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+exec @ELECTRON@ /usr/lib/midori-git/app.asar "$@"