Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

qgnomeplatform: version is different #95

Closed
github-actions bot opened this issue Dec 30, 2023 · 3 comments
Closed

qgnomeplatform: version is different #95

github-actions bot opened this issue Dec 30, 2023 · 3 comments

Comments

@github-actions
Copy link
Contributor

Version is different for qgnomeplatform.

CachyOS: 0.9.1-9
Upstream:0.9.2

Please update the package.

Bip bop, I'm a bot.

@lseman
Copy link
Contributor

lseman commented Dec 30, 2023

#capybara:diff:qgnomeplatform

Copy link
Contributor Author

--- file_a	2023-12-30 04:24:08.488433760 +0000
+++ file_b	2023-12-30 04:24:08.488433760 +0000
@@ -9,7 +9,7 @@
 _pkgname=QGnomePlatform
 pkgname=(qgnomeplatform-qt5 qgnomeplatform-qt6 adwaita-color-schemes)
 pkgver=0.9.1
-pkgrel=8
+pkgrel=9
 pkgdesc='QPlatformTheme for a better Qt application inclusion in GNOME'
 arch=(x86_64)
 url='https://github.com/FedoraQt/QGnomePlatform'

Copy link
Contributor Author

--- file_a	2023-12-30 04:24:10.108422923 +0000
+++ file_b	2023-12-30 04:24:10.108422923 +0000
@@ -1,44 +1,61 @@
-# Maintainer: j.r <[email protected]>
+# Maintainer: Antonio Rojas <[email protected]>
+# Contributor: j.r <[email protected]>
 # Contributor: Jonathan Chasteen <jonathan dot chasteen at live dot com>
 # Contributor: Mohammadreza Abdollahzadeh <morealaz at gmail dot com>
 # Contributor: aimileus <me at aimileus dot nl>
 # Contributor: spider-mario <[email protected]>
 
-pkgname=('qgnomeplatform' 'qgnomeplatform-qt6')
 pkgbase=qgnomeplatform
 _pkgname=QGnomePlatform
-pkgver=0.8.4
-pkgrel=1
-pkgdesc="QPlatformTheme for a better Qt application inclusion in GNOME"
-arch=('x86_64')
-url="https://github.com/FedoraQt/QGnomePlatform"
-license=('LGPL2.1')
-makedepends=('cmake' 'gtk3' 'qt5-wayland' 'qt6-wayland' 'adwaita-qt6>=1.4.1' 'adwaita-qt>=1.4.1')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/FedoraQt/QGnomePlatform/archive/$pkgver.tar.gz")
-sha256sums=('c648331f47b095d90594fc986a6c0bc885b846e0e9f5c10b6a1ba6a58d004686')
+pkgname=(qgnomeplatform-qt5 qgnomeplatform-qt6 adwaita-color-schemes)
+pkgver=0.9.1
+pkgrel=9
+pkgdesc='QPlatformTheme for a better Qt application inclusion in GNOME'
+arch=(x86_64)
+url='https://github.com/FedoraQt/QGnomePlatform'
+license=(LGPL2.1)
+makedepends=(cmake gtk3 qt5-wayland qt5-quickcontrols2 qt6-wayland adwaita-qt5 adwaita-qt6)
+source=(https://github.com/FedoraQt/QGnomePlatform/archive/$pkgver/$_pkgname-$pkgver.tar.gz
+        https://github.com/FedoraQt/QGnomePlatform/commit/1344b7f2.patch)
+sha256sums=('f85e0aa521c3e2f7f59a0fe98360fae30acd02b6940af9e86b4db9c17e02e807'
+            '1ccde430dcbef5db42897dd49390253aec8b7afb569ec7036db096572345d2e0')
 
-build() {
-	cd "$srcdir"
-  cmake -B build-qt5 -S "$_pkgname-$pkgver" -DCMAKE_BUILD_TYPE=None -DCMAKE_INSTALL_PREFIX=/usr -DUSE_QT6=false -Wno-dev
-	make -C build-qt5
+prepare() {
+  patch -d $_pkgname-$pkgver -p1 < 1344b7f2.patch # Don't use desktop style on Qt6
+}
 
-  cmake -B build-qt6 -S "$_pkgname-$pkgver" -DCMAKE_BUILD_TYPE=None -DCMAKE_INSTALL_PREFIX=/usr -DUSE_QT6=true -Wno-dev
-	make -C build-qt6
+build() {
+  cmake -B build-qt5 -S $_pkgname-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DUSE_QT6=OFF
+  cmake --build build-qt5
+
+  cmake -B build-qt6 -S $_pkgname-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DUSE_QT6=ON
+  cmake --build build-qt6
 }
 
-package_qgnomeplatform() {
-  pkgdesc="QPlatformTheme for a better Qt5 application inclusion in GNOME"
-  depends=('gtk3' 'qt5-wayland' 'adwaita-qt>=1.4.1')
+package_qgnomeplatform-qt5() {
+  pkgdesc='QPlatformTheme for a better Qt5 application inclusion in GNOME'
+  depends=(gtk3 qt5-wayland qt5-quickcontrols2 adwaita-qt5 adwaita-color-schemes)
+  optdepends=('qqc2-desktop-style: For styling QtQuick applications')
+  replaces=(qgnomeplatform)
 
-	cd "$srcdir"
-	make -C build-qt5 DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" cmake --install build-qt5
+  rm -r "$pkgdir"/usr/share
 }
 
 package_qgnomeplatform-qt6() {
-  pkgdesc="QPlatformTheme for a better Qt6 application inclusion in GNOME"
-  depends=('gtk3' 'qt6-wayland' 'adwaita-qt6>=1.4.1')
+  pkgdesc='QPlatformTheme for a better Qt6 application inclusion in GNOME'
+  depends=(gtk3 qt6-wayland adwaita-qt6 adwaita-color-schemes)
+
+  DESTDIR="$pkgdir" cmake --install build-qt6
+  rm -r "$pkgdir"/usr/share
+}
+
+package_adwaita-color-schemes() {
+  pkgdesc='Adwaita color schemes for KDE applications'
 
-	cd "$srcdir"
-	make -C build-qt6 DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" cmake --install build-qt5/src/color-schemes
 }
-# vim:set ts=2 sw=2 et:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant