Update 0.6.4

2 files changed, 74 insertions, 108 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 60bc65b36831..c9a121372a2b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xguipro-git
 	pkgdesc = xGUI (the X Graphics User Interface) Pro is a modern, cross-platform, and advanced HVML renderer which is based on tailored WebKit.
-	pkgver = 0.6.3
+	pkgver = 0.6.4.r1.g8d895f8
 	pkgrel = 1
 	url = https://github.com/HVML/xGUI-Pro
 	arch = x86_64
@@ -10,26 +10,27 @@ pkgbase = xguipro-git
 	arch = powerpc64le
 	groups = hvml-git
 	license = LGPL-3.0
-	makedepends = git
-	makedepends = cmake
-	makedepends = ninja
 	makedepends = ccache
+	makedepends = cmake
+	makedepends = curl
+	makedepends = enchant
+	makedepends = glib2
+	makedepends = git
 	makedepends = gcc
-	makedepends = python
+	makedepends = gtk3
+	makedepends = gperf
+	makedepends = libsoup
 	makedepends = libxml2
-	makedepends = ruby
-	makedepends = curl
+	makedepends = ninja
+	makedepends = icu
 	makedepends = openssl
-	makedepends = sqlite
 	makedepends = pkgconf
+	makedepends = purc
+	makedepends = python
+	makedepends = ruby
+	makedepends = sqlite
 	makedepends = zlib
-	makedepends = icu
-	makedepends = webkit2gtk-hvml
-	depends = glib2
-	depends = gperf
-	depends = enchant
-	optdepends = purc: The prime HVML interpreter for C Language.
-	optdepends = purc-midnight-commander: A generic HVML renderer in text mode for development and debugging.
+	depends = webkit2gtk
 	optdepends = webkit2gtk-hvml: Web content engine for GTK (HVML)
 	provides = xguipro
 	provides = xGUI-Pro
@@ -40,18 +41,5 @@ pkgbase = xguipro-git
 
 pkgname = xguipro-gtk3-git
 	pkgdesc = xGUI (the X Graphics User Interface) Pro is a modern, cross-platform, and advanced HVML renderer which is based on tailored WebKit. (gtk3)
-	depends = glib2
-	depends = gperf
-	depends = enchant
-	depends = gtk3
-	depends = libsoup
-	conflicts = xguipro
-
-pkgname = xguipro-gtk4-git
-	pkgdesc = xGUI (the X Graphics User Interface) Pro is a modern, cross-platform, and advanced HVML renderer which is based on tailored WebKit. (gtk4)
-	depends = glib2
-	depends = gperf
-	depends = enchant
-	depends = gtk4
-	depends = libsoup3
 	conflicts = xguipro
+	conflicts = xguipro-gtk3
diff --git a/PKGBUILD b/PKGBUILD
index fb3f5324d8b7..72d37ceff5d5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,43 @@
 # Maintainer: taotieren <admin@taotieren.com>
 
 pkgbase=xguipro-git
-pkgname=(xguipro-gtk3-git xguipro-gtk4-git)
-pkgver=0.6.3
+pkgname=(xguipro-gtk3-git)
+pkgver=0.6.4.r1.g8d895f8
 pkgrel=1
 pkgdesc="xGUI (the X Graphics User Interface) Pro is a modern, cross-platform, and advanced HVML renderer which is based on tailored WebKit."
-arch=('x86_64' 'aarch64' 'mips64' 'powerpc' 'powerpc64le')
+arch=(x86_64
+    aarch64
+    mips64
+    powerpc
+    powerpc64le)
 url="https://github.com/HVML/xGUI-Pro"
 license=('LGPL-3.0')
 groups=('hvml-git')
 provides=(${pkgbase%-git}  'xGUI-Pro')
 conflicts=(${pkgbase%-git})
 replaces=()
-depends=('glib2' 'gperf' 'enchant')
-makedepends=('git' 'cmake' 'ninja' 'ccache' 'gcc' 'python' 'libxml2' 'ruby' 'curl' 'openssl' 'sqlite' 'pkgconf' 'zlib' 'icu' 'webkit2gtk-hvml')
-optdepends=('purc: The prime HVML interpreter for C Language.'
-            'purc-midnight-commander: A generic HVML renderer in text mode for development and debugging.'
-            'webkit2gtk-hvml: Web content engine for GTK (HVML)')
+depends=(webkit2gtk)
+makedepends=(ccache
+            cmake
+            curl
+            enchant
+            glib2
+            git
+            gcc
+            gtk3
+            gperf
+            libsoup
+            libxml2
+            ninja
+            icu
+            openssl
+            pkgconf
+            purc
+            python
+            ruby
+            sqlite
+            zlib)
+optdepends=('webkit2gtk-hvml: Web content engine for GTK (HVML)')
 backup=()
 options=('!strip')
 install=
@@ -25,96 +46,53 @@ sha256sums=('SKIP')
 
 pkgver() {
     cd "${srcdir}/${pkgbase%-git}/"
-#     git describe --long --tags | sed 's/ver.//g;s/\([^-]*-g\)/r\1/;s/-/./g'
-    git describe --always --tags | sed 's/ver.//g;s/\([^-]*-g\)/r\1/;s/-/./g'
+    git describe --long --tags | sed 's/ver.//g;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
+prepare() {
+
+    install -Dm644 /dev/stdin ${srcdir}/xguipro.csh <<EOF
+if (! \$?WEBKIT_WEBEXT_DIR ) then
+    set WEBKIT_WEBEXT_DIR=/bin/xguipro
+    if ( "\$WEBKIT_WEBEXT_DIR" != "" ) then
+        setenv WEBKIT_WEBEXT_DIR "\$WEBKIT_WEBEXT_DIR"
+    else
+        unset WEBKIT_WEBEXT_DIR
+    endif
+endif
+EOF
+    install -Dm644 /dev/stdin ${srcdir}/xguipro.sh <<EOF
+if [ -z "\$WEBKIT_WEBEXT_DIR" ]; then
+    WEBKIT_WEBEXT_DIR=/bin/xguipro
+    [ -n "\$WEBKIT_WEBEXT_DIR" ] && export WEBKIT_WEBEXT_DIR || unset WEBKIT_WEBEXT_DIR
+fi
+EOF
+}
 package_xguipro-gtk3-git() {
     pkgdesc+=" (gtk3)"
-    depends+=('gtk3' 'libsoup')
-    conflicts=(${pkgbase%-git})
+    conflicts+=(${pkgname%-git})
 
     cd "${srcdir}/${pkgbase%-git}"
 
-# CMake build
-#     cmake -DCMAKE_BUILD_TYPE=Release \
-#         -DPORT=GTK \
-#         -DCMAKE_INSTALL_PREFIX=/usr \
-#         -DCMAKE_INSTALL_LIBDIR=lib \
-#         -DCMAKE_INSTALL_LIBEXECDIR=lib \
-#         -DENABLE_GAMEPAD=OFF \
-#         -DENABLE_INTROSPECTION=OFF \
-#         -DUSE_SOUP2=ON \
-#         -DUSE_WPE_RENDERER=OFF \
-#         -DUSE_LCMS=OFF \
-#         -B build-gtk3 \
-
-#     cmake --build build-gtk3
-
 # Ninja build
-    cmake -DCMAKE_BUILD_TYPE=Release \
+# see：https://wiki.archlinux.org/title/CMake_package_guidelines
+#     cmake -DCMAKE_BUILD_TYPE=Release \
+    cmake -DCMAKE_BUILD_TYPE=None \
         -DPORT=GTK \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DCMAKE_INSTALL_LIBDIR=lib \
         -DCMAKE_INSTALL_LIBEXECDIR=lib \
-        -DENABLE_GAMEPAD=OFF \
-        -DENABLE_INTROSPECTION=OFF \
+        -DUSE_GTK4=OFF \
         -DUSE_SOUP2=ON \
-        -DUSE_WPE_RENDERER=OFF \
-        -DUSE_LCMS=OFF \
         -B build-gtk3 \
         -G Ninja
 
     ninja -C build-gtk3
 
-# make install
-#     make -C "${srcdir}"/${pkgbase%-git}/build install DESTDIR="${pkgdir}"
-
 # ninja install
     DESTDIR="${pkgdir}" ninja -C "${srcdir}"/${pkgbase%-git}/build-gtk3 install
-}
-
-package_xguipro-gtk4-git() {
-    pkgdesc+=" (gtk4)"
-    depends+=('gtk4' 'libsoup3')
-    conflicts=(${pkgbase%-git})
-
-    cd "${srcdir}/${pkgbase%-git}"
-
-# CMake build
-#     cmake -DCMAKE_BUILD_TYPE=Release \
-#         -DPORT=GTK \
-#         -DCMAKE_INSTALL_PREFIX=/usr \
-#         -DCMAKE_INSTALL_LIBDIR=lib \
-#         -DCMAKE_INSTALL_LIBEXECDIR=lib \
-#         -DENABLE_GAMEPAD=OFF \
-#         -DENABLE_INTROSPECTION=OFF \
-#         -DUSE_SOUP3=ON \
-#         -DUSE_WPE_RENDERER=OFF \
-#         -DUSE_LCMS=OFF \
-#         -B build-gtk4 \
 
-#     cmake --build build-gtk4
-
-# Ninja build
-    cmake -DCMAKE_BUILD_TYPE=Release \
-        -DPORT=GTK \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_INSTALL_LIBDIR=lib \
-        -DCMAKE_INSTALL_LIBEXECDIR=lib \
-        -DENABLE_GAMEPAD=OFF \
-        -DENABLE_INTROSPECTION=OFF \
-        -DUSE_SOUP3=ON \
-        -DUSE_WPE_RENDERER=OFF \
-        -DUSE_LCMS=OFF \
-        -B build-gtk4 \
-        -G Ninja
-
-    ninja -C build-gtk4
-
-# make install
-#     make -C "${srcdir}"/${pkgbase%-git}/build install DESTDIR="${pkgdir}"
-
-# ninja install
-    DESTDIR="${pkgdir}" ninja -C "${srcdir}"/${pkgbase%-git}/build-gtk4 install
+    install -Dm644 ${srcdir}/xguipro.csh ${pkgdir}/etc/profile.d/xguipro.csh
+    install -Dm644 ${srcdir}/xguipro.sh ${pkgdir}/etc/profile.d/xguipro.sh
 }
+