[lilac] updated to 5.1.5.r0.gcc77e32-2

2 files changed, 50 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 01035e3980ed..ea0abde23942 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
 pkgbase = fcitx5-qt-git
 	pkgdesc = Fcitx Qt Library
-	pkgver = 5.1.3.r0.g94c8644
+	pkgver = 5.1.5.r0.gcc77e32
 	pkgrel = 2
 	url = https://github.com/fcitx/fcitx5-qt
 	arch = x86_64
-	license = GPL
+	license = LGPL-2.1-or-later
 	makedepends = extra-cmake-modules
 	makedepends = git
 	makedepends = qt4
@@ -20,15 +20,21 @@ pkgname = fcitx5-qt5-git
 	pkgdesc = Fcitx Qt Library, for Qt5
 	depends = fcitx5-git
 	depends = qt5-base
+	depends = libxkbcommon
+	depends = gcc-libs
+	depends = libxcb
+	depends = glibc
 	provides = fcitx5-qt5
-	provides = fcitx5-qt
 	conflicts = fcitx5-qt5
-	conflicts = fcitx5-qt
 
 pkgname = fcitx5-qt4-git
 	pkgdesc = Fcitx Qt Library, for Qt4
 	depends = fcitx5-git
 	depends = qt4
+	depends = libxkbcommon
+	depends = gcc-libs
+	depends = libx11
+	depends = glibc
 	provides = fcitx5-qt4
 	conflicts = fcitx5-qt4
 
@@ -37,5 +43,12 @@ pkgname = fcitx5-qt6-git
 	depends = fcitx5-git
 	depends = qt6-base
 	depends = qt6-wayland
+	depends = libxkbcommon
+	depends = gcc-libs
+	depends = wayland
+	depends = glibc
+	depends = libxcb
 	provides = fcitx5-qt6
+	provides = fcitx5-qt
 	conflicts = fcitx5-qt6
+	conflicts = fcitx5-qt
diff --git a/PKGBUILD b/PKGBUILD
index 501ba89d2af9..14d973c169f7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,12 +5,12 @@
 _pkgname=fcitx5-qt
 pkgbase=$_pkgname-git
 pkgname=(fcitx5-qt5-git fcitx5-qt4-git fcitx5-qt6-git)
-pkgver=5.1.3.r0.g94c8644
+pkgver=5.1.5.r0.gcc77e32
 pkgrel=2
 pkgdesc="Fcitx Qt Library"
 arch=('x86_64')
 url="https://github.com/fcitx/fcitx5-qt"
-license=('GPL')
+license=('LGPL-2.1-or-later')
 depends=('fcitx5-git')
 makedepends=('extra-cmake-modules' 'git' 'qt4' 'qt5-base' 'qt6-base' 'qt6-wayland' 'ninja')
 source=("git+$url.git")
@@ -29,7 +29,10 @@ build(){
       -DCMAKE_BUILD_TYPE=Release \
       -DCMAKE_INSTALL_LIBDIR=/usr/lib \
       -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib \
+      -DENABLE_QT4=On \
+      -DENABLE_QT5=On \
       -DENABLE_QT6=On
+
   ninja
 
   # install into /tmp and split the package
@@ -41,45 +44,52 @@ _mv_pkg(){
   mv "$@" "$pkgdir/$(dirname $1)"
 }
 
+package_fcitx5-qt6-git(){
+  depends=('fcitx5-git' 'qt6-base' 'qt6-wayland' 'libxkbcommon' 'gcc-libs' 'wayland' 'glibc' 'libxcb')
+  provides=('fcitx5-qt6' 'fcitx5-qt')
+  conflicts=('fcitx5-qt6' 'fcitx5-qt')
+  pkgdesc="Fcitx Qt Library, for Qt6"
+
+  cd /tmp/$_pkgname
+  _mv_pkg usr/bin/fcitx5-qt6-immodule-probing
+  _mv_pkg usr/share/applications/org.fcitx.fcitx5-qt6-gui-wrapper.desktop
+  _mv_pkg usr/share/locale
+  _mv_pkg usr/lib/qt6
+  _mv_pkg usr/lib/libFcitx5Qt6*
+  _mv_pkg usr/lib/fcitx5-qt6*
+  _mv_pkg usr/lib/fcitx5/qt6
+  _mv_pkg usr/lib/cmake/Fcitx5Qt6*
+  _mv_pkg usr/include/Fcitx5Qt6
+}
+
 package_fcitx5-qt5-git(){
-  depends=('fcitx5-git' 'qt5-base')
-  provides=('fcitx5-qt5' 'fcitx5-qt')
-  conflicts=('fcitx5-qt5' 'fcitx5-qt')
+  depends=('fcitx5-git' 'qt5-base' 'libxkbcommon' 'gcc-libs' 'libxcb' 'glibc')
+  provides=('fcitx5-qt5')
+  conflicts=('fcitx5-qt5')
   pkgdesc="Fcitx Qt Library, for Qt5"
 
   cd /tmp/$_pkgname
-  _mv_pkg usr/share
+  _mv_pkg usr/bin/fcitx5-qt5-immodule-probing
   _mv_pkg usr/lib/qt
   _mv_pkg usr/lib/libFcitx5Qt5*
-  _mv_pkg usr/lib/fcitx5*
-  _mv_pkg usr/lib/cmake/Fcitx5Qt5DBusAddons
-  _mv_pkg usr/lib/cmake/Fcitx5Qt5WidgetsAddons
+  _mv_pkg usr/lib/fcitx5-qt5*
+  _mv_pkg usr/lib/fcitx5/qt5
+  _mv_pkg usr/lib/cmake/Fcitx5Qt5*
   _mv_pkg usr/include/Fcitx5Qt5
 }
 
 package_fcitx5-qt4-git(){
-  depends=('fcitx5-git' 'qt4')
+  depends=('fcitx5-git' 'qt4' 'libxkbcommon' 'gcc-libs' 'libx11' 'glibc')
   provides=('fcitx5-qt4')
   conflicts=('fcitx5-qt4')
   pkgdesc="Fcitx Qt Library, for Qt4"
 
   cd /tmp/$_pkgname
+  _mv_pkg usr/share/applications/org.fcitx.fcitx5-qt5-gui-wrapper.desktop
   _mv_pkg usr/lib/qt4
   _mv_pkg usr/lib/libFcitx5Qt4*
-  _mv_pkg usr/lib/cmake/Fcitx5Qt4DBusAddons
+  _mv_pkg usr/lib/cmake/Fcitx5Qt4*
   _mv_pkg usr/include/Fcitx5Qt4
 }
 
 
-package_fcitx5-qt6-git(){
-  depends=('fcitx5-git' 'qt6-base' 'qt6-wayland')
-  provides=('fcitx5-qt6')
-  conflicts=('fcitx5-qt6')
-  pkgdesc="Fcitx Qt Library, for Qt6"
-
-  cd /tmp/$_pkgname
-  _mv_pkg usr/lib/qt6
-  _mv_pkg usr/lib/libFcitx5Qt6*
-  _mv_pkg usr/lib/cmake/Fcitx5Qt6DBusAddons
-  _mv_pkg usr/include/Fcitx5Qt6
-}