Felix Yan pushed to branch main at Arch Linux / Packaging / Packages /
deepin-session
Commits:
1b022723 by Felix Yan at 2024-11-24T19:10:24+08:00
upgpkg: 1.2.10-1
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- − fix-dtk6-theme.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,6 +1,6 @@
pkgbase = deepin-session
pkgdesc = New deepin session, based on systemd and existing projects
- pkgver = 1.2.9
+ pkgver = 1.2.10
pkgrel = 1
url = https://github.com/linuxdeepin/dde-session
arch = x86_64
@@ -27,9 +27,7 @@ pkgbase = deepin-session
depends = deepin-qt5integration
depends = deepin-qt6platform-plugins
depends = deepin-qt6integration
- source = git+https://github.com/linuxdeepin/dde-session.git#tag=1.2.9
- source = fix-dtk6-theme.patch
- sha512sums =
e3c07db03570ce8d2d41a238fa5e7c1949babc92d3849ec1e86a5bf64000b96c4f33bc73c4e764628be6f44fb292745cf2229079d208ff22f4889451eb1cacfa
- sha512sums =
e0a164009493927a3ceeb497e978d31daa0c3022f57e609b7b3784520635c31405f1f734652cc5c50f5a1915195b45cf4f7d147f6accbcdfcd8be897368f0c24
+ source = git+https://github.com/linuxdeepin/dde-session.git#tag=1.2.10
+ sha512sums =
ae970bfc812fa638ee067ae352f86348b2e119d0b5bf2e7cf8af0bf96602fa59aafa4df9eb5d12bbf874f3c51febef3856e3cb4bed63c3b153b5efb5beb76688
pkgname = deepin-session
=====================================
PKGBUILD
=====================================
@@ -1,7 +1,7 @@
# Maintainer: Felix Yan <[email protected]>
pkgname=deepin-session
-pkgver=1.2.9
+pkgver=1.2.10
pkgrel=1
pkgdesc='New deepin session, based on systemd and existing projects'
arch=('x86_64')
@@ -17,16 +17,14 @@ depends=('glibc' 'gcc-libs' 'glib2' 'libx11' 'libsecret'
'qt5-base' 'gsettings-q
'deepin-qt6platform-plugins' 'deepin-qt6integration')
makedepends=('git' 'cmake' 'ninja')
groups=('deepin')
-source=("git+https://github.com/linuxdeepin/dde-session.git#tag=$pkgver";
- fix-dtk6-theme.patch)
-sha512sums=('e3c07db03570ce8d2d41a238fa5e7c1949babc92d3849ec1e86a5bf64000b96c4f33bc73c4e764628be6f44fb292745cf2229079d208ff22f4889451eb1cacfa'
-
'e0a164009493927a3ceeb497e978d31daa0c3022f57e609b7b3784520635c31405f1f734652cc5c50f5a1915195b45cf4f7d147f6accbcdfcd8be897368f0c24')
+source=("git+https://github.com/linuxdeepin/dde-session.git#tag=$pkgver";)
+sha512sums=('ae970bfc812fa638ee067ae352f86348b2e119d0b5bf2e7cf8af0bf96602fa59aafa4df9eb5d12bbf874f3c51febef3856e3cb4bed63c3b153b5efb5beb76688')
prepare(){
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
+ git cherry-pick -n 26f7836591cbd9992526b24d42d6198a20c153a7
sed -i 's|/etc/os-version|/etc/uos-version|' misc/Xsession.d/00deepin-dde-env
}
=====================================
fix-dtk6-theme.patch deleted
=====================================
@@ -1,19 +0,0 @@
-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/1b0227231115348cb6dfb0f5fc57be1b2da8a845
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/deepin-session/-/commit/1b0227231115348cb6dfb0f5fc57be1b2da8a845
You're receiving this email because of your account on gitlab.archlinux.org.
