Felix Yan pushed to branch main at Arch Linux / Packaging / Packages /
deepin-session
Commits:
9ec203e0 by Felix Yan at 2024-11-22T01:57:47+08:00
upgpkg: 1.2.9-1: add fix from openSUSE
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- + fix-dtk6-theme.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,11 +1,12 @@
pkgbase = deepin-session
pkgdesc = New deepin session, based on systemd and existing projects
- pkgver = 1.2.8
+ pkgver = 1.2.9
pkgrel = 1
url = https://github.com/linuxdeepin/dde-session
arch = x86_64
groups = deepin
license = GPL3
+ makedepends = git
makedepends = cmake
makedepends = ninja
depends = glibc
@@ -26,7 +27,9 @@ pkgbase = deepin-session
depends = deepin-qt5integration
depends = deepin-qt6platform-plugins
depends = deepin-qt6integration
- source =
https://github.com/linuxdeepin/dde-session/archive/1.2.8/deepin-session-1.2.8.tar.gz
- sha512sums =
228dd41d867748d8b00ca1cfac46d40166e7d58f6e191e1d571574b25ce1c982e319148be89c0a9056c4ecd50c5edebc10c18e26815c4aafb5570b64ee3041ac
+ source = git+https://github.com/linuxdeepin/dde-session.git#tag=1.2.9
+ source = fix-dtk6-theme.patch
+ sha512sums =
e3c07db03570ce8d2d41a238fa5e7c1949babc92d3849ec1e86a5bf64000b96c4f33bc73c4e764628be6f44fb292745cf2229079d208ff22f4889451eb1cacfa
+ sha512sums =
e0a164009493927a3ceeb497e978d31daa0c3022f57e609b7b3784520635c31405f1f734652cc5c50f5a1915195b45cf4f7d147f6accbcdfcd8be897368f0c24
pkgname = deepin-session
=====================================
PKGBUILD
=====================================
@@ -1,7 +1,7 @@
# Maintainer: Felix Yan <[email protected]>
pkgname=deepin-session
-pkgver=1.2.8
+pkgver=1.2.9
pkgrel=1
pkgdesc='New deepin session, based on systemd and existing projects'
arch=('x86_64')
@@ -15,23 +15,28 @@ depends=('glibc' 'gcc-libs' 'glib2' 'libx11' 'libsecret'
'qt5-base' 'gsettings-q
'libxcursor' 'libxfixes' 'systemd-libs' 'deepin-session-ui'
'deepin-kwin' 'deepin-shell'
'deepin-qt5platform-plugins' 'deepin-qt5integration'
'deepin-qt6platform-plugins' 'deepin-qt6integration')
-makedepends=('cmake' 'ninja')
+makedepends=('git' 'cmake' 'ninja')
groups=('deepin')
-source=("https://github.com/linuxdeepin/dde-session/archive/$pkgver/$pkgname-$pkgver.tar.gz";)
-sha512sums=('228dd41d867748d8b00ca1cfac46d40166e7d58f6e191e1d571574b25ce1c982e319148be89c0a9056c4ecd50c5edebc10c18e26815c4aafb5570b64ee3041ac')
+source=("git+https://github.com/linuxdeepin/dde-session.git#tag=$pkgver";
+ fix-dtk6-theme.patch)
+sha512sums=('e3c07db03570ce8d2d41a238fa5e7c1949babc92d3849ec1e86a5bf64000b96c4f33bc73c4e764628be6f44fb292745cf2229079d208ff22f4889451eb1cacfa'
+
'e0a164009493927a3ceeb497e978d31daa0c3022f57e609b7b3784520635c31405f1f734652cc5c50f5a1915195b45cf4f7d147f6accbcdfcd8be897368f0c24')
prepare(){
- cd dde-session-$pkgver
+ cd dde-session
+ # DDE sets these envvars in /etc/X11/Xsession.d, which is Debian-specific
+ # Patch from openSUSE
+ patch -Np1 -i ../fix-dtk6-theme.patch
sed -i 's|/etc/os-version|/etc/uos-version|' misc/Xsession.d/00deepin-dde-env
}
build() {
- cd dde-session-$pkgver
+ cd dde-session
cmake . -GNinja -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc
-DCMAKE_INSTALL_LIBEXECDIR=lib
ninja
}
package() {
- cd dde-session-$pkgver
+ cd dde-session
DESTDIR="$pkgdir" ninja install
}
=====================================
fix-dtk6-theme.patch
=====================================
@@ -0,0 +1,19 @@
+diff -Nur dde-session-1.2.9/src/dde-session/environmentsmanager.cpp
dde-session-1.2.9-new/src/dde-session/environmentsmanager.cpp
+--- dde-session-1.2.9/src/dde-session/environmentsmanager.cpp 2024-05-16
17:21:37.000000000 +0800
++++ dde-session-1.2.9-new/src/dde-session/environmentsmanager.cpp
2024-07-20 20:51:47.125907148 +0800
+@@ -85,6 +85,15 @@
+ m_envMap.insert("XDG_CURRENT_DESKTOP", "DDE");
+ m_envMap.insert("QT_DBL_CLICK_DIST", QString::number(15 * scaleFactor));
+ m_envMap.insert("QT_LINUX_ACCESSIBILITY_ALWAYS_ON", "1");
++
++ QByteArray sessionType = qgetenv("XDG_SESSION_TYPE");
++ if (sessionType == "x11") {
++ m_envMap.insert("QT_QPA_PLATFORM", "dxcb:xcb");
++ } else if (sessionType == "wayland") {
++ m_envMap.insert("QT_QPA_PLATFORM", "wayland");
++ m_envMap.insert("QT_WAYLAND_SHELL_INTEGRATION",
"xdg-shell;wl-shell;ivi-shell;qt-shell;");
++ }
++
+
+ // 浮点数相等
+ if (qFuzzyIsNull(scaleFactor - 1.0)) {
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/deepin-session/-/commit/9ec203e0e6c2a9417b1c40328a9b726b09f0c6b7
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/deepin-session/-/commit/9ec203e0e6c2a9417b1c40328a9b726b09f0c6b7
You're receiving this email because of your account on gitlab.archlinux.org.
