openSUSE Commits
Threads by month
- ----- 2024 -----
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
September 2022
- 1 participants
- 2391 discussions
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package deepin-launcher for openSUSE:Factory checked in at 2022-09-01 22:10:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/deepin-launcher (Old)
and /work/SRC/openSUSE:Factory/.deepin-launcher.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-launcher"
Thu Sep 1 22:10:12 2022 rev:7 rq:1000243 version:5.5.31
Changes:
--------
--- /work/SRC/openSUSE:Factory/deepin-launcher/deepin-launcher.changes 2022-04-22 21:54:38.506832491 +0200
+++ /work/SRC/openSUSE:Factory/.deepin-launcher.new.2083/deepin-launcher.changes 2022-09-01 22:11:03.044224408 +0200
@@ -1,0 +2,13 @@
+Wed Aug 24 11:56:50 UTC 2022 - Hillwood Yang <hillwood(a)opensuse.org>
+
+- Update version to 5.5.31
+ * Fix bugs
+ * Feature: hide main window after losting active point
+
+-------------------------------------------------------------------
+Tue Jun 28 12:21:02 UTC 2022 - Hillwood Yang <hillwood(a)opensuse.org>
+
+- Update version to 5.5.19
+ * Fix bugs
+
+-------------------------------------------------------------------
Old:
----
dde-launcher-5.5.11.tar.gz
New:
----
dde-launcher-5.5.31.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deepin-launcher.spec ++++++
--- /var/tmp/diff_new_pack.VbFvR3/_old 2022-09-01 22:11:03.668226115 +0200
+++ /var/tmp/diff_new_pack.VbFvR3/_new 2022-09-01 22:11:03.672226126 +0200
@@ -19,7 +19,7 @@
%define _name dde-launcher
Name: deepin-launcher
-Version: 5.5.11
+Version: 5.5.31
Release: 0
Summary: Deepin Launcher
License: GPL-3.0-or-later
@@ -49,16 +49,6 @@
%description
Deepin desktop-environment - Launcher module
-%package devel
-Summary: Development tools for deepin-launchers
-Group: Development/Libraries/C and C++
-
-%description devel
-Deepin desktop-environment - Launcher module
-
-The deepin-launcher-devel package contains the header files and developer
-docs for deepin-launcher.
-
%lang_package
%prep
@@ -86,11 +76,9 @@
%dir %{_datadir}/%{_name}/translations
%{_datadir}/%{_name}/translations/dde-launcher.qm
%dir %{_datadir}/dsg
-%dir %{_datadir}/dsg/apps
-%{_datadir}/dsg/apps/dde-launcher
-
-%files devel
-# %{_includedir}/%{_name}
+%dir %{_datadir}/dsg/configs
+%dir %{_datadir}/dsg/configs/org.deepin.dde.launcher
+%{_datadir}/dsg/configs/org.deepin.dde.launcher/org.deepin.dde.launcher.json
%files lang -f %{_name}.lang
%if 0%{?suse_version} <= 1500
++++++ dde-launcher-5.5.11.tar.gz -> dde-launcher-5.5.31.tar.gz ++++++
++++ 3059 lines of diff (skipped)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package deepin-pw-check for openSUSE:Factory checked in at 2022-09-01 22:10:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/deepin-pw-check (Old)
and /work/SRC/openSUSE:Factory/.deepin-pw-check.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-pw-check"
Thu Sep 1 22:10:09 2022 rev:8 rq:1000242 version:5.1.16
Changes:
--------
--- /work/SRC/openSUSE:Factory/deepin-pw-check/deepin-pw-check.changes 2022-04-22 21:54:41.874836328 +0200
+++ /work/SRC/openSUSE:Factory/.deepin-pw-check.new.2083/deepin-pw-check.changes 2022-09-01 22:11:01.696220722 +0200
@@ -1,0 +2,8 @@
+Wed Aug 24 13:57:25 UTC 2022 - Hillwood Yang <hillwood(a)opensuse.org>
+
+- Update version to 5.1.16
+ * Fix bugs
+ * Update translations
+ * Update some apis
+
+-------------------------------------------------------------------
Old:
----
deepin-pw-check-5.1.8.tar.gz
New:
----
deepin-pw-check-5.1.16.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deepin-pw-check.spec ++++++
--- /var/tmp/diff_new_pack.veszyg/_old 2022-09-01 22:11:02.608223216 +0200
+++ /var/tmp/diff_new_pack.veszyg/_new 2022-09-01 22:11:02.616223238 +0200
@@ -27,7 +27,7 @@
%define import_path %{provider_prefix}
Name: deepin-pw-check
-Version: 5.1.8
+Version: 5.1.16
Release: 0
License: GPL-3.0+
Summary: Deepin Password Check tool
++++++ deepin-pw-check-5.1.8.tar.gz -> deepin-pw-check-5.1.16.tar.gz ++++++
++++ 4000 lines of diff (skipped)
++++++ disable-gobuild-in-makefile.patch ++++++
--- /var/tmp/diff_new_pack.veszyg/_old 2022-09-01 22:11:02.720223522 +0200
+++ /var/tmp/diff_new_pack.veszyg/_new 2022-09-01 22:11:02.724223533 +0200
@@ -1,27 +1,18 @@
-diff -Nur deepin-pw-check-5.1.8/Makefile deepin-pw-check-5.1.8-new/Makefile
---- deepin-pw-check-5.1.8/Makefile 2022-01-13 16:48:23.000000000 +0800
-+++ deepin-pw-check-5.1.8-new/Makefile 2022-04-03 22:54:58.432709730 +0800
-@@ -6,7 +6,7 @@
- PAM_MODULE_DIR := /etc/pam.d
- endif
- ifeq (${PKG_FILE_DIR},)
--PKG_FILE_DIR := /usr/local/lib/pkgconfig
-+PKG_FILE_DIR := /usr/lib/pkgconfig
- endif
- BINARIES = deepin-pw-check
- LIBRARIES = libdeepin_pw_check.so.1.1
-@@ -25,7 +25,7 @@
+diff -Nurp deepin-pw-check-5.1.16/Makefile deepin-pw-check-5.1.16-new/Makefile
+--- deepin-pw-check-5.1.16/Makefile 2022-08-15 11:11:11.000000000 +0800
++++ deepin-pw-check-5.1.16-new/Makefile 2022-08-24 21:55:43.659287279 +0800
+@@ -25,7 +25,7 @@ prepare:
@mkdir -p out/bin
out/bin/%: prepare
-- env GOPATH="${GOPATH}" ${GOBUILD} -o $@ ${GOPKG_PREFIX}/*.go
-+# env GOPATH="${GOPATH}" ${GOBUILD} -o $@ ${GOPKG_PREFIX}/*.go
+- env GOPATH="${GOPATH}" ${GOBUILD} -o $@ ${GOBUILD_OPTIONS} ${GOPKG_PREFIX}/*.go
++# env GOPATH="${GOPATH}" ${GOBUILD} -o $@ ${GOBUILD_OPTIONS} ${GOPKG_PREFIX}/*.go
out/${LIBRARIES}:
gcc lib/*.c ${SECURITY_BUILD_OPTIONS} -shared -DIN_CRACKLIB -W -Wall -Wl,-soname,libdeepin_pw_check.so.1 -o $@ $^ -lcrypt -lcrack -liniparser
-@@ -48,13 +48,13 @@
+@@ -48,13 +48,13 @@ out/${PAM_MODULE}: out/${LIBRARIES}
build_tool: prepare
- gcc tool/*.c -liniparser -W -Wall -o out/${TOOL_BINARAY}
+ gcc tool/*.c -liniparser -W -Wall ${SECURITY_BUILD_OPTIONS} -o out/${TOOL_BINARAY}
-build: prepare $(addprefix out/bin/, ${BINARIES}) out/${LIBRARIES} static_lib out/${PAM_MODULE} build_tool ts_to_policy
+build: prepare out/${LIBRARIES} static_lib out/${PAM_MODULE} build_tool ts_to_policy
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package deepin-dock for openSUSE:Factory checked in at 2022-09-01 22:10:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/deepin-dock (Old)
and /work/SRC/openSUSE:Factory/.deepin-dock.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-dock"
Thu Sep 1 22:10:08 2022 rev:8 rq:1000241 version:5.5.65
Changes:
--------
--- /work/SRC/openSUSE:Factory/deepin-dock/deepin-dock.changes 2022-04-22 21:54:31.654824683 +0200
+++ /work/SRC/openSUSE:Factory/.deepin-dock.new.2083/deepin-dock.changes 2022-09-01 22:11:00.712218031 +0200
@@ -1,0 +2,15 @@
+Wed Aug 24 12:34:49 UTC 2022 - Hillwood Yang <hillwood(a)opensuse.org>
+
+- Update version to 5.5.65
+ * Always show airplane mode
+ * Add sort format for date
+ * Fix bugs
+
+-------------------------------------------------------------------
+Tue Jun 28 12:07:01 UTC 2022 - Hillwood Yang <hillwood(a)opensuse.org>
+
+- Update version to 5.5.51
+ * Fix bugs
+ * Optimize wayland support
+
+-------------------------------------------------------------------
@@ -6,0 +22 @@
+- Drop deepin-dock-link-libraries.patch, merged by upstream
Old:
----
dde-dock-5.5.12.tar.gz
deepin-dock-link-libraries.patch
New:
----
dde-dock-5.5.65.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deepin-dock.spec ++++++
--- /var/tmp/diff_new_pack.TrgujH/_old 2022-09-01 22:11:01.356219793 +0200
+++ /var/tmp/diff_new_pack.TrgujH/_new 2022-09-01 22:11:01.360219803 +0200
@@ -20,15 +20,13 @@
%define _name dde-dock
Name: deepin-dock
-Version: 5.5.12
+Version: 5.5.65
Release: 0
Summary: Deepin dock
License: LGPL-3.0-or-later
Group: System/GUI/Other
URL: https://github.com/linuxdeepin/dde-dock
Source0: https://github.com/linuxdeepin/dde-dock/archive/%{version}/%{_name}-%{versi…
-# PATCH-FIX-UPSTREAM deepin-dock-link-libraries.patch hillwood(a)opensuse.org - link some libraries to fix build
-Patch0: %{name}-link-libraries.patch
BuildRequires: cmake
BuildRequires: dtkcommon >= 5.5.20
BuildRequires: dtkcore >= 5.0.0
@@ -117,9 +115,11 @@
%dir %{_sysconfdir}/dde-dock/indicator
%config %{_sysconfdir}/dde-dock/indicator/keybord_layout.json
%dir %{_datadir}/dsg
-%dir %{_datadir}/dsg/apps
-%{_datadir}/dsg/apps/%{_name}
-%{_datadir}/dsg/apps/dde-control-center
+%dir %{_datadir}/dsg/configs
+%dir %{_datadir}/dsg/configs/org.deepin.dde.control-center
+%dir %{_datadir}/dsg/configs/org.deepin.dde.dock
+%{_datadir}/dsg/configs/org.deepin.dde.control-center/*.json
+%{_datadir}/dsg/configs/org.deepin.dde.dock/*.json
%dir %{_libdir}/dde-control-center
%dir %{_libdir}/dde-control-center/modules
%{_libdir}/dde-control-center/modules/libdcc-dock-plugin.so
++++++ dde-dock-5.5.12.tar.gz -> dde-dock-5.5.65.tar.gz ++++++
++++ 12280 lines of diff (skipped)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qt5integration for openSUSE:Factory checked in at 2022-09-01 22:10:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt5integration (Old)
and /work/SRC/openSUSE:Factory/.qt5integration.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt5integration"
Thu Sep 1 22:10:07 2022 rev:5 rq:1000240 version:5.5.24
Changes:
--------
--- /work/SRC/openSUSE:Factory/qt5integration/qt5integration.changes 2022-03-19 22:23:02.128960444 +0100
+++ /work/SRC/openSUSE:Factory/.qt5integration.new.2083/qt5integration.changes 2022-09-01 22:10:59.664215165 +0200
@@ -1,0 +2,16 @@
+Wed Aug 24 12:14:06 UTC 2022 - Hillwood Yang <hillwood(a)opensuse.org>
+
+- Update version to 5.5.24
+ * configurable proxy icon engine
+ * optimize ui
+ * Fix bugs
+
+-------------------------------------------------------------------
+Sun Jul 3 07:38:53 UTC 2022 - Hillwood Yang <hillwood(a)opensuse.org>
+
+- Update version to 5.5.23.1
+ * Optimize performance
+ * Optimize ui
+ * Fix bugs
+
+-------------------------------------------------------------------
Old:
----
qt5integration-5.5.17.tar.gz
New:
----
qt5integration-5.5.24.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt5integration.spec ++++++
--- /var/tmp/diff_new_pack.gwJGPA/_old 2022-09-01 22:11:00.128216434 +0200
+++ /var/tmp/diff_new_pack.gwJGPA/_new 2022-09-01 22:11:00.132216445 +0200
@@ -17,7 +17,7 @@
Name: qt5integration
-Version: 5.5.17
+Version: 5.5.24
Release: 0
License: GPL-3.0-or-later
Summary: Qt platform theme integration plugins
++++++ qt5integration-5.5.17.tar.gz -> qt5integration-5.5.24.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5integration-5.5.17/.github/workflows/backup-to-gitlab.yml new/qt5integration-5.5.24/.github/workflows/backup-to-gitlab.yml
--- old/qt5integration-5.5.17/.github/workflows/backup-to-gitlab.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/qt5integration-5.5.24/.github/workflows/backup-to-gitlab.yml 2022-07-19 08:56:58.000000000 +0200
@@ -0,0 +1,52 @@
+name: backup to gitlab
+on: [push]
+
+concurrency:
+ group: ${{ github.workflow }}
+ cancel-in-progress: true
+
+jobs:
+ backup-to-gitlab:
+ if: github.repository_owner == 'linuxdeepin'
+ name: backup-to-gitlab
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ with:
+ repository: "linuxdeepin/jenkins-bridge-client"
+ path: jenkins-bridge-client
+
+ - name: Install Client
+ run: |
+ cd $GITHUB_WORKSPACE/jenkins-bridge-client
+ go build .
+ sudo install -Dvm755 jenkins-bridge-client -t /usr/bin/
+ - name: Trigger sync
+ id: generate-runid
+ run: |
+ echo "::set-output name=RUN_ID::$(jenkins-bridge-client -triggerSync -token '${{ secrets.BRIDGETOKEN }}')"
+ - name: Print log
+ run: |
+ jenkins-bridge-client -printlog -token "${{ secrets.BRIDGETOKEN }}" -runid "${{ steps.generate-runid.outputs.RUN_ID }}"
+
+ backup-to-gitee:
+ if: github.repository_owner == 'linuxdeepin'
+ runs-on: ubuntu-latest
+ steps:
+ - name: create-repo
+ run: |
+ repo=${{ github.event.repository.name }}
+ homepage="https://github.com/linuxdeepin/${repo}"
+ description="mirror of ${homepage}"
+ # remove '.' prefix
+ repo=${repo#"."}
+ curl -X POST --header 'Content-Type: application/json;charset=UTF-8' 'https://gitee.com/api/v5/enterprises/linuxdeepin/repos' -d '{"private": 1,"access_token":"${{ secrets.GITEE_SYNC_TOKEN }}","name":"'"$repo"'","description":"'"$description"'","homepage":"'"$homepage"'","has_issues":"false","has_wiki":"false","can_comment":"false"}' || true
+ - name: push
+ run: |
+ git clone --bare https://github.com/linuxdeepin/${{ github.event.repository.name }}.git .git
+ repo=${{ github.event.repository.name }}
+ # remove '.' prefix
+ repo=${repo#"."}
+ git remote set-url origin https://myml:${{ secrets.GITEE_SYNC_TOKEN }}(a)gitee.com/linuxdeepin/${repo}.git
+ git push -f --all --prune origin
+ git push --tags origin
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5integration-5.5.17/.github/workflows/call-build-deb.yml new/qt5integration-5.5.24/.github/workflows/call-build-deb.yml
--- old/qt5integration-5.5.17/.github/workflows/call-build-deb.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/qt5integration-5.5.24/.github/workflows/call-build-deb.yml 2022-07-19 08:56:58.000000000 +0200
@@ -0,0 +1,15 @@
+name: Call build-deb
+on:
+ pull_request_target:
+ paths-ignore:
+ - ".github/workflows/**"
+
+concurrency:
+ group: ${{ github.workflow }}-pull/${{ github.event.number }}
+ cancel-in-progress: true
+
+jobs:
+ check_job:
+ uses: linuxdeepin/.github/.github/workflows/build-deb.yml@master
+ secrets:
+ BridgeToken: ${{ secrets.BridgeToken }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5integration-5.5.17/.github/workflows/call-build-distribution.yml new/qt5integration-5.5.24/.github/workflows/call-build-distribution.yml
--- old/qt5integration-5.5.17/.github/workflows/call-build-distribution.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/qt5integration-5.5.24/.github/workflows/call-build-distribution.yml 2022-07-19 08:56:58.000000000 +0200
@@ -0,0 +1,17 @@
+name: Call build-distribution
+on:
+ push:
+ paths-ignore:
+ - ".github/workflows/**"
+ pull_request_target:
+ paths-ignore:
+ - ".github/workflows/**"
+
+jobs:
+ check_job:
+ uses: linuxdeepin/.github/.github/workflows/build-distribution.yml@master
+ secrets:
+ BUILD_GPG_PRIVATE_KEY: ${{ secrets.BUILD_GPG_PRIVATE_KEY }}
+ BUILD_SSH_PRIVATE_KEY: ${{ secrets.BUILD_SSH_PRIVATE_KEY }}
+ WEBDAV_PASSWD: ${{ secrets.WEBDAV_PASSWD }}
+ WEBDAV_USER: ${{ secrets.WEBDAV_USER }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5integration-5.5.17/.github/workflows/call-chatOps.yml new/qt5integration-5.5.24/.github/workflows/call-chatOps.yml
--- old/qt5integration-5.5.17/.github/workflows/call-chatOps.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/qt5integration-5.5.24/.github/workflows/call-chatOps.yml 2022-07-19 08:56:58.000000000 +0200
@@ -0,0 +1,10 @@
+name: chatOps
+on:
+ issue_comment:
+ types: [created]
+
+jobs:
+ chatopt:
+ uses: linuxdeepin/.github/.github/workflows/chatOps.yml@master
+ secrets:
+ APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5integration-5.5.17/.github/workflows/call-clacheck.yml new/qt5integration-5.5.24/.github/workflows/call-clacheck.yml
--- old/qt5integration-5.5.17/.github/workflows/call-clacheck.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/qt5integration-5.5.24/.github/workflows/call-clacheck.yml 2022-07-19 08:56:58.000000000 +0200
@@ -0,0 +1,16 @@
+name: Call CLA check
+on:
+ issue_comment:
+ types: [created]
+ pull_request_target:
+ types: [opened, closed, synchronize]
+
+concurrency:
+ group: ${{ github.workflow }}-pull/${{ github.event.number }}
+ cancel-in-progress: true
+
+jobs:
+ clacheck:
+ uses: linuxdeepin/.github/.github/workflows/cla-check.yml@master
+ secrets:
+ APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5integration-5.5.17/.github/workflows/call-commitlint.yml new/qt5integration-5.5.24/.github/workflows/call-commitlint.yml
--- old/qt5integration-5.5.17/.github/workflows/call-commitlint.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/qt5integration-5.5.24/.github/workflows/call-commitlint.yml 2022-07-19 08:56:58.000000000 +0200
@@ -0,0 +1,11 @@
+name: Call commitlint
+on:
+ pull_request_target:
+
+concurrency:
+ group: ${{ github.workflow }}-pull/${{ github.event.number }}
+ cancel-in-progress: true
+
+jobs:
+ check_job:
+ uses: linuxdeepin/.github/.github/workflows/commitlint.yml@master
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5integration-5.5.17/.github/workflows/cppcheck.yml new/qt5integration-5.5.24/.github/workflows/cppcheck.yml
--- old/qt5integration-5.5.17/.github/workflows/cppcheck.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/qt5integration-5.5.24/.github/workflows/cppcheck.yml 2022-07-19 08:56:58.000000000 +0200
@@ -0,0 +1,26 @@
+name: cppcheck
+on:
+ pull_request_target:
+ paths-ignore:
+ - ".github/workflows/**"
+
+concurrency:
+ group: ${{ github.workflow }}-pull/${{ github.event.number }}
+ cancel-in-progress: true
+
+jobs:
+ cppchceck:
+ name: cppcheck
+ runs-on: ubuntu-latest
+ steps:
+ - run: export
+ - uses: actions/checkout@v2
+ with:
+ ref: ${{ github.event.pull_request.head.sha }}
+ persist-credentials: false
+ - uses: linuxdeepin/action-cppcheck@main
+ with:
+ github_token: ${{ secrets.GITHUB_TOKEN }}
+ repository: ${{ github.repository }}
+ pull_request_id: ${{ github.event.pull_request.number }}
+ allow_approve: false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5integration-5.5.17/archlinux/PKGBUILD new/qt5integration-5.5.24/archlinux/PKGBUILD
--- old/qt5integration-5.5.17/archlinux/PKGBUILD 1970-01-01 01:00:00.000000000 +0100
+++ new/qt5integration-5.5.24/archlinux/PKGBUILD 2022-07-19 08:56:58.000000000 +0200
@@ -0,0 +1,30 @@
+# Maintainer: justforlxz <justforlxz(a)gmail.com>
+pkgname=deepin-qt5integration-git
+pkgver=5.1.12.r54.g732a237
+pkgrel=1
+pkgdesc='Qt platform theme integration plugins for DDE'
+arch=('x86_64' 'aarch64')
+url="https://github.com/linuxdeepin/qt5integration"
+license=('GPL3')
+depends=('dtkwidget-git' 'libqtxdg' 'deepin-qt5platform-plugins-git')
+makedepends=('git' 'qt5-tools' 'xcb-util-renderutil' 'gtest')
+conflicts=('deepin-qt5integration')
+provides=('deepin-qt5integration')
+groups=('deepin-git')
+source=('source.tar.gz')
+sha512sums=('SKIP')
+
+prepare() {
+ cd $deepin_source_name
+}
+
+build() {
+ cd $deepin_source_name
+ qmake-qt5 PREFIX=/usr
+ make
+}
+
+package() {
+ cd $deepin_source_name
+ make INSTALL_ROOT="$pkgdir" install
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5integration-5.5.17/debian/control new/qt5integration-5.5.24/debian/control
--- old/qt5integration-5.5.17/debian/control 2021-12-06 07:39:37.000000000 +0100
+++ new/qt5integration-5.5.24/debian/control 2022-07-19 08:56:58.000000000 +0200
@@ -26,7 +26,8 @@
Package: dde-qt5integration
Architecture: any
Provides: libqt5deepintheme-plugin
-Conflicts: libqt5deepintheme-plugin
+Conflicts: libqt5deepintheme-plugin, dde-qt5integration5.5
+Replaces: dde-qt5integration5.5
Depends: ${shlibs:Depends}, ${misc:Depends}, dde-qt5xcb-plugin, dde-qt5integration5
Description: Qt platform theme integration plugin choosers for DDE
Multiple Qt plugin choosers for DDE is included.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5integration-5.5.17/platformthemeplugin/qdeepinfiledialoghelper.cpp new/qt5integration-5.5.24/platformthemeplugin/qdeepinfiledialoghelper.cpp
--- old/qt5integration-5.5.17/platformthemeplugin/qdeepinfiledialoghelper.cpp 2021-12-06 07:39:37.000000000 +0100
+++ new/qt5integration-5.5.24/platformthemeplugin/qdeepinfiledialoghelper.cpp 2022-07-19 08:56:58.000000000 +0200
@@ -29,25 +29,18 @@
#include <QX11Info>
#include <QDebug>
#include <QApplication>
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
-#include <private/qwidgetwindow_qpa_p.h>
-#else
-#include <private/qwidgetwindow_p.h>
-#endif
#include <private/qguiapplication_p.h>
#include <X11/Xlib.h>
QT_BEGIN_NAMESPACE
#define DIALOG_SERVICE "com.deepin.filemanager.filedialog"
-#define DIALOG_CALL(Fun) ({if(nativeDialog) nativeDialog->Fun; else qtDialog->Fun;})
QList<QUrl> stringList2UrlList(const QStringList &list)
{
QList<QUrl> urlList;
- for (const QString str : list)
+ for (const QString &str : list)
urlList << str;
return urlList;
@@ -68,9 +61,9 @@
QDeepinFileDialogHelper::QDeepinFileDialogHelper()
{
connect(this, &QDeepinFileDialogHelper::accept, this, [this] {
- if (sourceDialog && nativeDialog) {
- const QMap<QString, QVariant> &map_lineedit = nativeDialog->allCustomWidgetsValue(LineEditType);
- const QMap<QString, QVariant> &map_combobox = nativeDialog->allCustomWidgetsValue(ComboBoxType);
+ if (sourceDialog && filedlgInterface) {
+ const QMap<QString, QVariant> &map_lineedit = filedlgInterface->allCustomWidgetsValue(LineEditType);
+ const QMap<QString, QVariant> &map_combobox = filedlgInterface->allCustomWidgetsValue(ComboBoxType);
auto map_eidt_begin = map_lineedit.constBegin();
@@ -93,13 +86,39 @@
QDeepinFileDialogHelper::~QDeepinFileDialogHelper()
{
- DIALOG_CALL(deleteLater());
-
if (auxiliaryWindow)
auxiliaryWindow->deleteLater();
- if (nativeDialog)
- nativeDialog->deleteLater();
+ if (filedlgInterface) {
+ filedlgInterface->deleteLater(); // dbus
+ filedlgInterface->QObject::deleteLater();
+ }
+}
+
+void QDeepinFileDialogHelper::onApplicationStateChanged(Qt::ApplicationState state)
+{
+ if (state == Qt::ApplicationActive && filedlgInterface)
+ filedlgInterface->activateWindow();
+}
+
+void QDeepinFileDialogHelper::onWindowActiveChanged()
+{
+ if (qApp->platformName() != "dxcb" && !qApp->property("_d_isDxcb").toBool())
+ return;
+
+ QWindow *focus_window = qApp->focusWindow();
+ if (!focus_window)
+ return;
+
+ if (focus_window->type() != Qt::Widget
+ && focus_window->type() != Qt::Window
+ && focus_window->type() != Qt::Dialog) {
+ return;
+ }
+
+ if (filedlgInterface && !filedlgInterface->windowActive() && qApp->applicationState() == Qt::ApplicationActive) {
+ filedlgInterface->activateWindow();
+ }
}
bool QDeepinFileDialogHelper::show(Qt::WindowFlags flags, Qt::WindowModality modality, QWindow *parent)
@@ -107,15 +126,15 @@
ensureDialog();
applyOptions();
- if (nativeDialog) {
+ if (filedlgInterface) {
if (parent)
activeWindow = parent;
else
activeWindow = QGuiApplication::focusWindow();
- nativeDialog->setParent(parent);
+ filedlgInterface->setParent(parent);
- Qt::WindowFlags nd_flags = static_cast<Qt::WindowFlags>(nativeDialog->windowFlags());
+ Qt::WindowFlags nd_flags = static_cast<Qt::WindowFlags>(filedlgInterface->windowFlags());
Qt::WindowFlags need_flags = Qt::WindowTitleHint | Qt::WindowSystemMenuHint
| Qt::WindowMinMaxButtonsHint | Qt::WindowContextHelpButtonHint
| Qt::WindowStaysOnTopHint | Qt::WindowTransparentForInput
@@ -123,12 +142,12 @@
| Qt::WindowCloseButtonHint | Qt::BypassWindowManagerHint;
if (flags & need_flags)
- nativeDialog->setWindowFlags(nd_flags | (flags & need_flags));
+ filedlgInterface->setWindowFlags(nd_flags | (flags & need_flags));
static bool i_am_dbus_server = iAmFileDialogDBusServer();
if (i_am_dbus_server) {
- WId native_dialog_winId = nativeDialog->winId();
+ WId native_dialog_winId = filedlgInterface->winId();
QWindow *real_native_dialog = nullptr;
for (QWindow *window : qGuiApp->topLevelWindows()) {
@@ -142,7 +161,7 @@
real_native_dialog->setTransientParent(parent);
real_native_dialog->setModality(modality);
// call later
- QMetaObject::invokeMethod(nativeDialog.data(), "show", Qt::QueuedConnection);
+ QMetaObject::invokeMethod(filedlgInterface.data(), "show", Qt::QueuedConnection);
return true;
}
@@ -156,59 +175,25 @@
QGuiApplicationPrivate::showModalWindow(auxiliaryWindow);
if (modality == Qt::ApplicationModal) {
- connect(qApp, &QGuiApplication::applicationStateChanged,
- this, [this] (Qt::ApplicationState state) {
- if (state == Qt::ApplicationActive)
- nativeDialog->activateWindow();
- });
- connect(nativeDialog, &DFileDialogHandle::windowActiveChanged, this, [this] {
- if (qApp->platformName() != "dxcb" && !qApp->property("_d_isDxcb").toBool())
- return;
-
- QWindow *focus_window = qApp->focusWindow();
-
- if (!focus_window)
- return;
-
- if (focus_window->type() != Qt::Widget
- && focus_window->type() != Qt::Window
- && focus_window->type() != Qt::Dialog) {
- return;
- }
-
- if (!nativeDialog->windowActive() && qApp->applicationState() == Qt::ApplicationActive) {
- nativeDialog->activateWindow();
- }
- });
+ connect(qApp, &QGuiApplication::applicationStateChanged, this, &QDeepinFileDialogHelper::onApplicationStateChanged);
+ connect(filedlgInterface, &DFileDialogHandle::windowActiveChanged, this, &QDeepinFileDialogHelper::onWindowActiveChanged);
}
}
- } else {
- qtDialog->setAttribute(Qt::WA_NativeWindow);
-
- if (parent) {
- if (parent->inherits("QWidgetWindow")) {
- qtDialog->setParent(static_cast<QWidgetWindow*>(parent)->widget());
- } else {
- qtDialog->windowHandle()->setParent(parent);
- }
- }
-
- qtDialog->setWindowModality(modality);
- qtDialog->setWindowFlags(flags | qtDialog->windowFlags());
}
- DIALOG_CALL(show());
+ if (filedlgInterface)
+ filedlgInterface->show();
- if (nativeDialog && parent) {
+ if (filedlgInterface && parent) {
// ������������������wayland������display ������ XSetTransientForHint(wayland_dispaly
// ������������������������������������������������������task-view-31919.
if (qApp->platformName() != "dxcb" && !qApp->property("_d_isDxcb").toBool())
return true;
- XSetTransientForHint(QX11Info::display(), nativeDialog->winId(), parent->winId());
+ XSetTransientForHint(QX11Info::display(), filedlgInterface->winId(), parent->winId());
}
-
- return true;
+ // ������������dbus������ return false ������������������������������������������������
+ return filedlgInterface;
}
void QDeepinFileDialogHelper::exec()
@@ -217,22 +202,16 @@
ensureDialog();
- if (nativeDialog) {
- // block input to the window, allow input to other GTK dialogs
- QEventLoop loop;
- connect(this, SIGNAL(accept()), &loop, SLOT(quit()));
- connect(this, SIGNAL(reject()), &loop, SLOT(quit()));
- loop.exec();
- } else {
- QWindow *modalWindow = qApp->modalWindow();
-
- if (Q_LIKELY(modalWindow->inherits("QWidgetWindow")
- && qobject_cast<QFileDialog*>(static_cast<QWidgetWindow*>(modalWindow)->widget()))) {
- QGuiApplicationPrivate::hideModalWindow(modalWindow);
- }
-
- qtDialog->exec();
- }
+ // ��������������������������������������������������������� show ���������,��������� show
+ // ������exec���������������������
+ if (filedlgInterface)
+ filedlgInterface->show();
+
+ // block input to the window, allow input to other GTK dialogs
+ QEventLoop loop;
+ connect(this, SIGNAL(accept()), &loop, SLOT(quit()));
+ connect(this, SIGNAL(reject()), &loop, SLOT(quit()));
+ loop.exec();
}
void QDeepinFileDialogHelper::hide()
@@ -241,7 +220,8 @@
ensureDialog();
- DIALOG_CALL(hide());
+ if (filedlgInterface)
+ filedlgInterface->hide();
if (auxiliaryWindow) {
QGuiApplicationPrivate::hideModalWindow(auxiliaryWindow);
@@ -270,7 +250,10 @@
ensureDialog();
- DIALOG_CALL(setDirectoryUrl(directory.toString()));
+ if (filedlgInterface)
+ filedlgInterface->setDirectoryUrl(directory.toString());
+ else
+ options()->setInitialDirectory(directory);
}
QUrl QDeepinFileDialogHelper::directory() const
@@ -279,10 +262,10 @@
ensureDialog();
- if (nativeDialog)
- return QUrl(nativeDialog->directoryUrl());
+ if (filedlgInterface)
+ return QUrl(filedlgInterface->directoryUrl());
- return qtDialog->directoryUrl();
+ return options()->initialDirectory();
}
void QDeepinFileDialogHelper::selectFile(const QUrl &fileUrl)
@@ -291,10 +274,10 @@
ensureDialog();
- if (nativeDialog)
- nativeDialog->selectUrl(fileUrl.toString());
+ if (filedlgInterface)
+ filedlgInterface->selectUrl(fileUrl.toString());
else
- qtDialog->selectUrl(fileUrl);
+ options()->setInitiallySelectedFiles({fileUrl});
}
QList<QUrl> QDeepinFileDialogHelper::selectedFiles() const
@@ -303,10 +286,10 @@
ensureDialog();
- if (nativeDialog)
- return stringList2UrlList(nativeDialog->selectedUrls());
+ if (filedlgInterface)
+ return stringList2UrlList(filedlgInterface->selectedUrls());
- return qtDialog->selectedUrls();
+ return options()->initiallySelectedFiles();
}
void QDeepinFileDialogHelper::setFilter()
@@ -315,7 +298,8 @@
ensureDialog();
- DIALOG_CALL(setFilter(options()->filter()));
+ if (filedlgInterface)
+ filedlgInterface->setFilter(options()->filter());
}
void QDeepinFileDialogHelper::selectNameFilter(const QString &filter)
@@ -324,7 +308,10 @@
ensureDialog();
- DIALOG_CALL(selectNameFilter(filter));
+ if (filedlgInterface)
+ filedlgInterface->selectNameFilter(filter);
+ else
+ options()->setInitiallySelectedNameFilter(filter);
}
QString QDeepinFileDialogHelper::selectedNameFilter() const
@@ -333,10 +320,10 @@
ensureDialog();
- if (nativeDialog)
- return nativeDialog->selectedNameFilter();
+ if (filedlgInterface)
+ return filedlgInterface->selectedNameFilter();
- return qtDialog->selectedNameFilter();
+ return options()->initiallySelectedNameFilter();
}
void QDeepinFileDialogHelper::initDBusFileDialogManager()
@@ -359,7 +346,7 @@
void QDeepinFileDialogHelper::ensureDialog() const
{
- if (nativeDialog || qtDialog)
+ if (filedlgInterface)
return;
if (manager) {
@@ -370,20 +357,30 @@
if (path.isEmpty()) {
qWarning("Can not create native dialog, Will be use QFileDialog");
} else {
- nativeDialog = new DFileDialogHandle(DIALOG_SERVICE, path, QDBusConnection::sessionBus());
+ filedlgInterface = new DFileDialogHandle(DIALOG_SERVICE, path, QDBusConnection::sessionBus());
auxiliaryWindow = new QWindow();
+ auxiliaryWindow->setObjectName("QDeepinFileDialogHelper_auxiliaryWindow");
+
+ connect(filedlgInterface, &QObject::destroyed, auxiliaryWindow, &QWindow::deleteLater);
+ connect(filedlgInterface, &QObject::destroyed, filedlgInterface, &DFileDialogHandle::deleteLater);
+ connect(filedlgInterface, &DFileDialogHandle::accepted, this, &QDeepinFileDialogHelper::accept);
+ connect(filedlgInterface, &DFileDialogHandle::rejected, this, &QDeepinFileDialogHelper::reject);
+ connect(filedlgInterface, &DFileDialogHandle::destroyed, this, &QDeepinFileDialogHelper::reject);
+ connect(filedlgInterface, &DFileDialogHandle::destroyed, this, [this](){
+ qWarning("filedialog dbus service destroyed.");
+ if (filedlgInterface) {
+ filedlgInterface->QObject::deleteLater();
+ filedlgInterface = nullptr;
+ }
- connect(nativeDialog, &QObject::destroyed, auxiliaryWindow, &QWindow::deleteLater);
- connect(nativeDialog, &QObject::destroyed, nativeDialog, &DFileDialogHandle::deleteLater);
- connect(nativeDialog, &DFileDialogHandle::destroyed, nativeDialog, &QObject::deleteLater);
- connect(nativeDialog, &DFileDialogHandle::accepted, this, &QDeepinFileDialogHelper::accept);
- connect(nativeDialog, &DFileDialogHandle::rejected, this, &QDeepinFileDialogHelper::reject);
- connect(nativeDialog, &DFileDialogHandle::destroyed, this, &QDeepinFileDialogHelper::reject);
+ if (auxiliaryWindow && auxiliaryWindow->isModal() && qApp->modalWindow() == auxiliaryWindow)
+ QGuiApplicationPrivate::hideModalWindow(auxiliaryWindow);
+ });
- QTimer *heartbeatTimer = new QTimer(nativeDialog);
+ QTimer *heartbeatTimer = new QTimer(filedlgInterface);
connect(heartbeatTimer, &QTimer::timeout, this, [this, heartbeatTimer] {
- QDBusPendingReply<> reply = nativeDialog->makeHeartbeat();
+ QDBusPendingReply<> reply = filedlgInterface->makeHeartbeat();
reply.waitForFinished();
@@ -397,23 +394,18 @@
return;
}
- nativeDialog->QObject::deleteLater();
+ filedlgInterface->QObject::deleteLater();
const_cast<QDeepinFileDialogHelper*>(this)->reject();
}
});
- int heartbeatInterval = nativeDialog->heartbeatInterval();
+ int heartbeatInterval = filedlgInterface->heartbeatInterval();
heartbeatTimer->setInterval(qMax(1 * 1000, qMin(int(heartbeatInterval / 1.5), heartbeatInterval - 5 * 1000)));
heartbeatTimer->start();
}
}
- if (!nativeDialog && qobject_cast<QApplication*>(qGuiApp)) {
+ if (!filedlgInterface && qobject_cast<QApplication*>(qGuiApp)) {
QDeepinTheme::m_usePlatformNativeDialog = false;
- qtDialog = new QFileDialog();
- QDeepinTheme::m_usePlatformNativeDialog = true;
-
- connect(qtDialog, &QFileDialog::accepted, this, &QDeepinFileDialogHelper::accept);
- connect(qtDialog, &QFileDialog::rejected, this, &QDeepinFileDialogHelper::reject);
}
}
@@ -423,20 +415,23 @@
for (int i = 0; i < QFileDialogOptions::DialogLabelCount; ++i) {
if (options->isLabelExplicitlySet((QFileDialogOptions::DialogLabel)i)) {
- if (nativeDialog)
- nativeDialog->setLabelText(i, options->labelText((QFileDialogOptions::DialogLabel)i));
+ if (filedlgInterface)
+ filedlgInterface->setLabelText(i, options->labelText((QFileDialogOptions::DialogLabel)i));
else
- qtDialog->setLabelText((QFileDialog::DialogLabel)i, options->labelText((QFileDialogOptions::DialogLabel)i));
+ qWarning() << "DFileDialogHandle invalid!!";
+
}
}
+ if (filedlgInterface) {
+ filedlgInterface->setOptions(int(options->options()));
+ filedlgInterface->setFilter(int(options->filter()));
+ filedlgInterface->setWindowTitle(options->windowTitle());
+ filedlgInterface->setViewMode(int(options->viewMode()));
+ filedlgInterface->setFileMode(int(options->fileMode()));
+ filedlgInterface->setAcceptMode(int(options->acceptMode()));
+ filedlgInterface->setNameFilters(options->nameFilters());
+ }
- DIALOG_CALL(setOptions((QFileDialog::Options)(int)options->options()));
- DIALOG_CALL(setFilter(options->filter()));
- DIALOG_CALL(setWindowTitle(options->windowTitle()));
- DIALOG_CALL(setViewMode((QFileDialog::ViewMode)options->viewMode()));
- DIALOG_CALL(setFileMode((QFileDialog::FileMode)options->fileMode()));
- DIALOG_CALL(setAcceptMode((QFileDialog::AcceptMode)options->acceptMode()));
- DIALOG_CALL(setNameFilters(options->nameFilters()));
if (options->initialDirectory().isLocalFile())
setDirectory(options->initialDirectory());
@@ -447,25 +442,25 @@
selectNameFilter(options->initiallySelectedNameFilter());
if (!sourceDialog) {
- sourceDialog = reinterpret_cast<QFileDialog*>(qvariant_cast<quintptr>(property("_dtk_widget_QFileDialog")));
+ sourceDialog = reinterpret_cast<QObject*>(qvariant_cast<quintptr>(property("_dtk_widget_QFileDialog")));
- if (sourceDialog && nativeDialog) {
+ if (sourceDialog && filedlgInterface) {
const QStringList lineedit_list = sourceDialog->property("_dtk_widget_custom_lineedit_list").toStringList();
const QStringList combobox_list = sourceDialog->property("_dtk_widget_custom_combobox_list").toStringList();
- nativeDialog->beginAddCustomWidget();
+ filedlgInterface->beginAddCustomWidget();
for (const QString &i : lineedit_list)
- nativeDialog->addCustomWidget(LineEditType, i);
+ filedlgInterface->addCustomWidget(LineEditType, i);
for (const QString &i : combobox_list)
- nativeDialog->addCustomWidget(ComboBoxType, i);
+ filedlgInterface->addCustomWidget(ComboBoxType, i);
- nativeDialog->endAddCustomWidget();
+ filedlgInterface->endAddCustomWidget();
const QVariant & mixedSelection = sourceDialog->property("_dtk_widget_filedialog_mixed_selection");
if (mixedSelection.isValid()) {
- nativeDialog->setAllowMixedSelection(mixedSelection.toBool());
+ filedlgInterface->setAllowMixedSelection(mixedSelection.toBool());
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5integration-5.5.17/platformthemeplugin/qdeepinfiledialoghelper.h new/qt5integration-5.5.24/platformthemeplugin/qdeepinfiledialoghelper.h
--- old/qt5integration-5.5.17/platformthemeplugin/qdeepinfiledialoghelper.h 2021-12-06 07:39:37.000000000 +0100
+++ new/qt5integration-5.5.24/platformthemeplugin/qdeepinfiledialoghelper.h 2022-07-19 08:56:58.000000000 +0200
@@ -24,7 +24,6 @@
QT_BEGIN_NAMESPACE
-class QFileDialog;
class ComDeepinFilemanagerFiledialogInterface;
typedef ComDeepinFilemanagerFiledialogInterface DFileDialogHandle;
class ComDeepinFilemanagerFiledialogmanagerInterface;
@@ -55,13 +54,14 @@
static void initDBusFileDialogManager();
static bool iAmFileDialogDBusServer();
-
+protected:
+ void onApplicationStateChanged(Qt::ApplicationState state);
+ void onWindowActiveChanged();
private:
- mutable QPointer<DFileDialogHandle> nativeDialog;
+ mutable QPointer<DFileDialogHandle> filedlgInterface;
mutable QPointer<QWindow> auxiliaryWindow;
- mutable QPointer<QFileDialog> qtDialog;
QPointer<QWindow> activeWindow;
- QPointer<QFileDialog> sourceDialog;
+ QPointer<QObject> sourceDialog;
static DFileDialogManager *manager;
void ensureDialog() const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5integration-5.5.17/platformthemeplugin/qdeepintheme.cpp new/qt5integration-5.5.24/platformthemeplugin/qdeepintheme.cpp
--- old/qt5integration-5.5.17/platformthemeplugin/qdeepintheme.cpp 2021-12-06 07:39:37.000000000 +0100
+++ new/qt5integration-5.5.24/platformthemeplugin/qdeepintheme.cpp 2022-07-19 08:56:58.000000000 +0200
@@ -506,9 +506,17 @@
return plugin ? plugin->create(iconName) : nullptr;
}
+inline QString dgetenv(const char * varname, const QString & defaultValue) {
+ if (Q_UNLIKELY(qEnvironmentVariableIsSet(varname))) {
+ return qgetenv(varname);
+ }
+
+ return defaultValue;
+}
+
static QIconEngine *createXdgProxyIconEngine(const QString &iconName)
{
- static QIconEnginePlugin *plugin = getIconEngineFactory(QStringLiteral("XdgIconProxyEngine"));
+ static QIconEnginePlugin *plugin = getIconEngineFactory(dgetenv("D_PROXY_ICON_ENGINE", QStringLiteral("XdgIconProxyEngine")));
return plugin ? plugin->create(iconName) : nullptr;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5integration-5.5.17/platformthemeplugin/qt5deepintheme-plugin.pro new/qt5integration-5.5.24/platformthemeplugin/qt5deepintheme-plugin.pro
--- old/qt5integration-5.5.17/platformthemeplugin/qt5deepintheme-plugin.pro 2021-12-06 07:39:37.000000000 +0100
+++ new/qt5integration-5.5.24/platformthemeplugin/qt5deepintheme-plugin.pro 2022-07-19 08:56:58.000000000 +0200
@@ -6,7 +6,6 @@
QT += dbus x11extras dtkgui$${DTK_VERSION}
QT += core-private gui-private
greaterThan(QT_MAJOR_VERSION, 4) {
- QT += widgets widgets-private
# Qt >= 5.8
greaterThan(QT_MAJOR_VERSION, 5)|greaterThan(QT_MINOR_VERSION, 7): QT += theme_support-private
else: QT += platformsupport-private
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5integration-5.5.17/qt5integration.pro new/qt5integration-5.5.24/qt5integration.pro
--- old/qt5integration-5.5.17/qt5integration.pro 2021-12-06 07:39:37.000000000 +0100
+++ new/qt5integration-5.5.24/qt5integration.pro 2022-07-19 08:56:58.000000000 +0200
@@ -1,12 +1,15 @@
TEMPLATE = subdirs
SUBDIRS += \
- src \
styleplugins\
platformthemeplugin/qt5deepintheme-plugin.pro \
iconengineplugins/iconengines.pro \
imageformatplugins/imageformats.pro \
tests
+!isEmpty(BASED_DTK_DIR) {
+ SUBDIRS += src
+}
+
CONFIG(debug, debug|release) {
SUBDIRS += styles
styles.depends += styleplugins
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5integration-5.5.17/src/dpluginloader.h new/qt5integration-5.5.24/src/dpluginloader.h
--- old/qt5integration-5.5.17/src/dpluginloader.h 2021-12-06 07:39:37.000000000 +0100
+++ new/qt5integration-5.5.24/src/dpluginloader.h 2022-07-19 08:56:58.000000000 +0200
@@ -112,7 +112,7 @@
QRegularExpressionMatch rem = reg.match(versionStr);
if (rem.hasMatch())
pluginName += rem.captured();
- else
+ else if (!versionStr.isEmpty())
qCDebug(lcDPlugin) << versionStr << "is invalid";
} else {
qCDebug(lcDPlugin) << VERSION_STR_SYMBOL << "resolve failed, trying to read self maps";
@@ -155,7 +155,7 @@
pluginLoader.unload();
}
} else {
- qCWarning(lcDPlugin) << pluginLoader.errorString();
+ qCCritical(lcDPlugin) << pluginLoader.errorString() << realTargetPath << "loaded failed";
}
return infc;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5integration-5.5.17/src/platformthemes/platformthemechooser/platformthemechooser.pro new/qt5integration-5.5.24/src/platformthemes/platformthemechooser/platformthemechooser.pro
--- old/qt5integration-5.5.17/src/platformthemes/platformthemechooser/platformthemechooser.pro 2021-12-06 07:39:37.000000000 +0100
+++ new/qt5integration-5.5.24/src/platformthemes/platformthemechooser/platformthemechooser.pro 2022-07-19 08:56:58.000000000 +0200
@@ -1,5 +1,5 @@
greaterThan(QT_MAJOR_VERSION, 4) {
- QT += widgets widgets-private
+ QT += gui-private
}
LIBS += -ldl
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5integration-5.5.17/styleplugins/chameleon/chameleonstyle.cpp new/qt5integration-5.5.24/styleplugins/chameleon/chameleonstyle.cpp
--- old/qt5integration-5.5.17/styleplugins/chameleon/chameleonstyle.cpp 2021-12-06 07:39:37.000000000 +0100
+++ new/qt5integration-5.5.24/styleplugins/chameleon/chameleonstyle.cpp 2022-07-19 08:56:58.000000000 +0200
@@ -27,6 +27,7 @@
#include <DPlatformWindowHandle>
#include <DApplicationHelper>
#include <DWindowManagerHelper>
+#include <DPlatformTheme>
#include <DSlider>
#include <DTabBar>
#include <DSearchEdit>
@@ -83,6 +84,20 @@
|| shape == QTabBar::TriangularEast;
}
+static QWidget *getSbarParentWidget(QScrollBar *sbar)
+{
+ if (!sbar)
+ return nullptr;
+ QWidget *pw = sbar->parentWidget();
+ if (!pw)
+ return nullptr;
+
+ bool isContainer = !pw->objectName().compare(QLatin1String("qt_scrollarea_vcontainer")) ||
+ !pw->objectName().compare(QLatin1String("qt_scrollarea_hcontainer")) ;
+
+ return isContainer ? pw->parentWidget() : pw;
+}
+
ChameleonStyle::ChameleonStyle()
: DStyle()
{
@@ -507,13 +522,8 @@
return;
}
case PE_PanelItemViewRow: {
- //������������Saturday���Sunday���������������������������
+ // ������������������item������������������������������������
if (w && qobject_cast<QCalendarWidget *>(w->parentWidget())) {
- QTextCharFormat fmt;
- QCalendarWidget *calend = qobject_cast<QCalendarWidget *>(w->parentWidget());
- fmt.setForeground(QBrush(getColor(opt, DPalette::Highlight)));
- calend->setWeekdayTextFormat(Qt::Saturday, fmt);
- calend->setWeekdayTextFormat(Qt::Sunday, fmt);
return;
}
//������QTreeView������������������QCommonStyle������������������������������������,hover���������
@@ -594,7 +604,7 @@
return false;
// ScrollBarAlwaysOn ���������������������������
- QAbstractScrollArea *sa = qobject_cast<QAbstractScrollArea *>(sbar->parentWidget());
+ QAbstractScrollArea *sa = qobject_cast<QAbstractScrollArea *>(getSbarParentWidget(sbar));
if (sa) {
const QScrollBar *hsb = sa->horizontalScrollBar();
const bool hsbAlwaysOn = sa->horizontalScrollBarPolicy() == Qt::ScrollBarAlwaysOn;
@@ -612,8 +622,10 @@
styleAnimation = new dstyle::DScrollbarStyleAnimation(dstyle::DScrollbarStyleAnimation::Deactivating, sbar);
styleAnimation->setDeletePolicy(QAbstractAnimation::KeepWhenStopped);
- // ������������������������
- this->startAnimation(styleAnimation);
+ connect(styleAnimation, &dstyle::DStyleAnimation::destroyed,
+ this, &ChameleonStyle::_q_removeAnimation, Qt::UniqueConnection);
+
+ animations.insert(styleAnimation->target(), styleAnimation);
// ���������������������������������������������������������������������
QObject::connect(sbar, &QAbstractSlider::valueChanged, styleAnimation, &dstyle::DScrollbarStyleAnimation::restart);
@@ -650,12 +662,6 @@
sbar->setProperty("_d_dtk_slider_visible", on);
}
-static bool isContainer (QWidget *w)
-{
- return !w->objectName().compare(QLatin1String("qt_scrollarea_vcontainer")) ||
- !w->objectName().compare(QLatin1String("qt_scrollarea_hcontainer")) ;
-}
-
bool ChameleonStyle::eventFilter(QObject *watched, QEvent *event)
{
QScrollBar *sbar = qobject_cast<QScrollBar *>(watched);
@@ -669,31 +675,42 @@
bool on = sbar->property("_d_dtk_slider_visible").toBool();
// ��������������������������������� parent
- QWidget *p = sbar->parentWidget();
- QWidget *pp = isContainer(p) ? p->parentWidget() : p;
-
- // ������ QAbstractItemView ������ item ��������� viewport ���
- QAbstractItemView *itemView = qobject_cast<QAbstractItemView *>(pp);
+ QWidget *pp = getSbarParentWidget(sbar);
+ // ������ QAbstractScrollArea ������ item ��������� viewport ���
+ QAbstractScrollArea *itemView = qobject_cast<QAbstractScrollArea *>(pp);
pp = itemView ? itemView->viewport() : pp;
if (!pp)
return false;
- // scrollbar right click
+ // (`(!cme && !me)` is True) && (`cme` is False) ==> `me` is True, `me` can't be False.
+ const QPoint viewportPos = pp->mapFromGlobal(cme ? cme->globalPos() : me->globalPos());
+ QWidget *target = pp;
+ QPoint localPos = viewportPos;
+ if (qobject_cast<QScrollArea *>(itemView)) {
+ if (target = pp->childAt(viewportPos)) {
+ localPos = target->mapFrom(pp, viewportPos);
+ }
+ }
+ // scrollbar right click
if (cme) {
- QContextMenuEvent menuEvent(cme->reason(), pp->mapFromGlobal(cme->globalPos()), cme->globalPos(), cme->modifiers());
- return !on ? false : QApplication::sendEvent(pp, &menuEvent);
+ if (target) {
+ QContextMenuEvent menuEvent(cme->reason(), localPos, cme->globalPos(), cme->modifiers());
+ return !on ? false : QApplication::sendEvent(target, &menuEvent);
+ }
} else {
// ���������������������������������������(������)������
if (!me || !on)
return false;
- QMouseEvent mevent = *me;
- mevent.setLocalPos(pp->mapFromGlobal(mevent.globalPos()));
-
- // ������������������������������ widget
- return QApplication::sendEvent(pp, &mevent);
+ if (target) {
+ QMouseEvent mevent = *me;
+ mevent.setLocalPos(localPos);
+ // ������������������������������ widget
+ return QApplication::sendEvent(target, &mevent);
+ }
}
+ return false;
}
void ChameleonStyle::drawControl(QStyle::ControlElement element, const QStyleOption *opt,
@@ -1420,6 +1437,41 @@
if (toolbutton->state & (State_MouseOver | State_Sunken)) //hover������ ���press������
p->setBrush(getBrush(toolbutton, DPalette::Button));
+ // ������������
+ if (toolbutton->state & State_Enabled) {
+ if ((toolbutton->features & QStyleOptionToolButton::MenuButtonPopup) &&
+ (toolbutton->state & (QStyle::State_MouseOver | QStyle::State_Sunken))) {
+
+ // ���������������������
+ int menuButtonIndicatorMargin = 4;
+ auto btn = *toolbutton;
+ if (btn.state & (QStyle::State_MouseOver))
+ btn.state &= ~ QStyle::State_MouseOver;
+ if (btn.state & (QStyle::State_Sunken))
+ btn.state &= ~ QStyle::State_Sunken;
+ p->setPen(getColor(&btn, DPalette::Button));
+ p->setBrush(getBrush(&btn, DPalette::Button));
+ QRect tmp = rect;
+ tmp.adjust(0, 0, proxy()->pixelMetric(PM_MenuButtonIndicator, toolbutton, w) + 2 * menuButtonIndicatorMargin, 0);
+ p->drawRoundedRect(tmp, radius, radius);
+
+ // ������������������������
+ p->setPen(getColor(toolbutton, DPalette::Button));
+ p->setBrush(getBrush(toolbutton, DPalette::Button));
+ if (toolbutton->activeSubControls & QStyle::SC_ToolButton) {
+ DDrawUtils::drawRoundedRect(p, rect, radius, radius,
+ DDrawUtils::TopLeftCorner | DDrawUtils::BottomLeftCorner);
+ } else if (toolbutton->activeSubControls & QStyle::SC_ToolButtonMenu) {
+ QRect r = rect;
+ r.adjust(r.width(), 0, proxy()->pixelMetric(PM_MenuButtonIndicator , toolbutton, w) + 2 * menuButtonIndicatorMargin, 0);
+ DDrawUtils::drawRoundedRect(p, r, radius, radius,
+ DDrawUtils::TopRightCorner | DDrawUtils::BottomRightCorner);
+ }
+ } else {
+ p->drawRoundedRect(rect, radius, radius);
+ }
+ }
+
// Arrow type always overrules and is always shown
bool hasArrow = toolbutton->features & QStyleOptionToolButton::Arrow;
if (((!hasArrow && toolbutton->icon.isNull()) && !toolbutton->text.isEmpty())
@@ -1428,8 +1480,6 @@
if (!proxy()->styleHint(SH_UnderlineShortcut, opt, w))
alignment |= Qt::TextHideMnemonic;
p->setFont(toolbutton->font);
- p->drawRoundedRect(rect, radius, radius);
-
if (toolbutton->state & State_On) {
p->setPen(getColor(toolbutton, DPalette::Highlight));
} else {
@@ -1459,7 +1509,6 @@
break;
}
- int radius = DStyle::pixelMetric(PM_FrameRadius, opt, w); //���������icon���text������,������������������������������������������
p->setRenderHint(QPainter::Antialiasing);
p->setPen(Qt::NoPen);
p->setBrush(Qt::NoBrush);
@@ -1475,8 +1524,7 @@
p->setBrush(getColor(toolbutton, DPalette::Button));
}
- if (toolbutton->state & State_Enabled)
- p->drawRoundedRect(rect, radius, radius);
+
// pr������������������
QRect pr = rect;
@@ -1547,6 +1595,10 @@
p->drawText(tr, alignment, toolbutton->text);
} else { //���������icon������
+ if (toolbutton->features & QStyleOptionToolButton::HasMenu &&
+ !(toolbutton->features & QStyleOptionToolButton::MenuButtonPopup)) {
+ rect.adjust(0, 0, - (proxy()->pixelMetric(PM_MenuButtonIndicator , toolbutton, w) + 4), 0);
+ }
pr.moveCenter(rect.center());
drawIcon(toolbutton, p, pr, icon);
}
@@ -2237,11 +2289,22 @@
painter->setPen(Qt::NoPen);
painter->setRenderHint(QPainter::Antialiasing);
- if (comboBox->editable)
- painter->setBrush(getThemTypeColor(QColor(0, 0, 0, 255* 0.08),
- QColor(255, 255, 255, 255 * 0.15)));
- else
+ if (comboBox->editable) {
+ QBrush brush = getThemTypeColor(QColor(0, 0, 0, 255 * 0.08),
+ QColor(255, 255, 255, 255 * 0.15));
+ if (widget->testAttribute(Qt::WA_SetPalette)) {
+ brush = comboBox->palette.button();
+ } else if (const QComboBox *combobox = qobject_cast<const QComboBox *>(widget)) {
+ if (auto lineEdit = combobox->lineEdit()) {
+ if (lineEdit->testAttribute(Qt::WA_SetPalette)) {
+ brush = lineEdit->palette().button();
+ }
+ }
+ }
+ painter->setBrush(brush);
+ } else {
painter->setBrush(Qt::transparent);
+ }
DDrawUtils::drawRoundedRect(painter, comboBoxCopy.rect, frameRadius, frameRadius,
DDrawUtils::Corner::TopLeftCorner
@@ -2362,8 +2425,9 @@
const int contentLeftPadding = flat ? (contentsRect.width() - contentsWidth) / 2 : Metrics::ComboBox_ContentLeftMargin;
iconRect = QRect(QPoint(contentsRect.left() + contentLeftPadding,
contentsRect.top() + (contentsRect.height() - iconSize.height()) / 2), iconSize);
+ const int availableTextWidth = contentsRect.width() - contentLeftPadding - iconSize.width() - Metrics::Icon_Margins - downArrowRect.width();
textRect = QRect(QPoint(iconRect.right() + Metrics::Icon_Margins + 1,
- contentsRect.top() + (contentsRect.height() - textSize.height()) / 2), textSize);
+ contentsRect.top() + (contentsRect.height() - textSize.height()) / 2), QSize(availableTextWidth, textSize.height()));
}
// handle right to left
@@ -2888,7 +2952,7 @@
int xpos = menuRect.x(); //1.������������ 2.��������������������� ���xpos������������������������
if (iconSize.width() > 0) {
- xpos += realMargins + smallIconSize + frameRadius;
+ xpos += realMargins + frameRadius + iconSize.width();
} else {
xpos += realMargins;
}
@@ -3128,8 +3192,14 @@
mflags |= State_Sunken;
}
+
+ int menuButtonIndicatorMargin = 4; // ���������������������
QStyleOption tool = *toolbutton;
- if (toolbutton->subControls & SC_ToolButton) {
+ if (toolbutton->features & QStyleOptionToolButton::MenuButtonPopup) {
+ if (w && !w->property("_d_calendarToolBtn").toBool()) {
+ button.adjust(0, 0, -2 * menuButtonIndicatorMargin, 0);
+ menuarea.adjust(-2 * menuButtonIndicatorMargin, 0, 0, 0);
+ }
if (bflags & (State_Sunken | State_On | State_Raised)) {
tool.rect = button;
tool.state = bflags;
@@ -3145,7 +3215,6 @@
if (w && w->property("_d_calendarToolBtn").toBool()) {
label.palette = DGuiApplicationHelper::instance()->applicationPalette();
}
-
proxy()->drawControl(CE_ToolButtonLabel, &label, p, w);
if (toolbutton->state & State_HasFocus) {
@@ -3154,29 +3223,33 @@
//fr.rect.adjust(3, 3, -3, -3);
if (toolbutton->features & QStyleOptionToolButton::MenuButtonPopup)
fr.rect.adjust(0, 0, -proxy()->pixelMetric(QStyle::PM_MenuButtonIndicator,
- toolbutton, w), 0);
+ toolbutton , w) - 2 * menuButtonIndicatorMargin, 0);
proxy()->drawPrimitive(PE_FrameFocusRect, &fr, p, w);
}
if (toolbutton->subControls & SC_ToolButtonMenu) {
tool.rect = menuarea;
tool.state = mflags;
- if (mflags & (State_Sunken | State_On | State_Raised))
- proxy()->drawPrimitive(PE_IndicatorButtonDropDown, &tool, p, w);
+ tool.rect.adjust(menuButtonIndicatorMargin, 0, -menuButtonIndicatorMargin, 0);
+ if ((toolbutton->state & (QStyle::State_Sunken)) && (toolbutton->activeSubControls & QStyle::SC_ToolButton)) {
+ p->setPen(Qt::NoPen);
+ }
+ if((toolbutton->state & (QStyle::State_Sunken)) && toolbutton->activeSubControls & QStyle::SC_ToolButtonMenu) {
+ p->setPen(getColor(toolbutton, DPalette::Highlight));
+ }
proxy()->drawPrimitive(PE_IndicatorArrowDown, &tool, p, w);
} else if (toolbutton->features & QStyleOptionToolButton::HasMenu) {
int mbi = proxy()->pixelMetric(PM_MenuButtonIndicator, toolbutton, w);
QRect ir = toolbutton->rect;
QStyleOptionToolButton newBtn = *toolbutton;
- newBtn.rect = QRect(ir.right() + 5 - mbi, ir.y() + ir.height() - mbi + 4, mbi - 6, mbi - 6);
+ newBtn.rect = QRect(ir.right() - mbi - menuButtonIndicatorMargin, (ir.height() - mbi) / 2, mbi, mbi);
newBtn.rect = visualRect(toolbutton->direction, button, newBtn.rect);
//DelayedPopup ������������������������, ��������������� ���������������������
- if (toolbutton->features & QStyleOptionToolButton::PopupDelay || (w && w->objectName() == "qt_calendar_monthbutton")) {
+ if (w && w->objectName() == "qt_calendar_monthbutton") {
newBtn.rect = QRect(ir.right() + 5 - mbi, ir.y() + ir.height() / 2, mbi - 4, mbi - 4);
newBtn.rect = visualRect(toolbutton->direction, button, newBtn.rect);
}
-
proxy()->drawPrimitive(PE_IndicatorArrowDown, &newBtn, p, w);
}
@@ -3883,7 +3956,7 @@
m_width += (textWidth + frameRadius);
if (!menuItem->icon.isNull())
- m_width += (smallIconSize + + frameRadius);
+ m_width += (smallIconSize + frameRadius);
m_width += (smallIconSize + frameRadius);
size.setWidth(m_width);
@@ -3923,7 +3996,21 @@
}
case CT_ToolButton: {
qreal radius = DStyle::pixelMetric(DStyle::PM_FrameRadius);
- return QSize(size.width() + radius, size.height() + radius);
+ if (widget && widget->property("_d_calendarToolBtn").toBool()) {
+ return QSize(size.width() + radius, size.height() + radius);
+ }
+ int fw = proxy()->pixelMetric(PM_DefaultFrameWidth, opt, widget);
+ int menuButtonIndicatorWidth = 0;
+ if (const QStyleOptionToolButton *toolbutton
+ = qstyleoption_cast<const QStyleOptionToolButton *>(opt)) {
+ if ((toolbutton->features & QStyleOptionToolButton::HasMenu) &&
+ (!(toolbutton->features & QStyleOptionToolButton::MenuButtonPopup))) {
+ menuButtonIndicatorWidth = proxy()->pixelMetric(QStyle::PM_MenuButtonIndicator, opt, widget);
+ }
+ }
+ int menuButtonIndicatorMargin = 4;
+ return QSize(size.width() + radius + 2 * menuButtonIndicatorMargin + 2 * fw + menuButtonIndicatorWidth,
+ size.height() + radius + 2 * fw);
}
case CT_ProgressBar: {
if (const QStyleOptionProgressBar *pbo = qstyleoption_cast<const QStyleOptionProgressBar*>(opt)) {
@@ -3994,7 +4081,7 @@
//������������������ menu border ��� 1
return DWindowManagerHelper::instance()->hasComposite() ? 0 : 1;
case PM_SubMenuOverlap:
- return -1;
+ return 0;
case PM_ComboBoxFrameWidth: { //������ComboBox VMargin
const QStyleOptionComboBox *comboBoxOption(qstyleoption_cast< const QStyleOptionComboBox *>(opt));
return comboBoxOption && comboBoxOption->editable ? Metrics::ComboBox_FrameWidth : Metrics::LineEdit_FrameWidth ;
@@ -4077,6 +4164,17 @@
}
}
+static void updateWeekendTextFormat(QCalendarWidget *calendar, QColor)
+{
+ if (!calendar)
+ return ;
+
+ QTextCharFormat fmt;
+ fmt.setForeground(QBrush(calendar->palette().highlight()));
+ calendar->setWeekdayTextFormat(Qt::Saturday, fmt);
+ calendar->setWeekdayTextFormat(Qt::Sunday, fmt);
+}
+
void ChameleonStyle::polish(QWidget *w)
{
DStyle::polish(w);
@@ -4120,11 +4218,20 @@
if (auto calendar = qobject_cast<QCalendarWidget* >(w)) {
int radius = DStyle::pixelMetric(PM_TopLevelWindowRadius);
- DPlatformWindowHandle handle(calendar);
+ // ������dtk���������������������������������
+ if (dynamic_cast<DApplication *>(QCoreApplication::instance())) {
+ DPlatformWindowHandle handle(calendar);
+ handle.setWindowRadius(radius);
+ }
- handle.setWindowRadius(radius);
calendar->setVerticalHeaderFormat(QCalendarWidget::NoVerticalHeader);
+ // ������������Saturday���Sunday���������������������������
+ DPlatformTheme *theme = DGuiApplicationHelper::instance()->applicationTheme();
+ updateWeekendTextFormat(calendar, QColor());
+ connect(theme, &DPlatformTheme::activeColorChanged, calendar,
+ std::bind(&updateWeekendTextFormat, calendar, std::placeholders::_1));
+
auto topWidget = calendar->findChild<QWidget *>("qt_calendar_navigationbar");
topWidget->setBackgroundRole(QPalette::Base);
@@ -4158,7 +4265,7 @@
view->setItemDelegate(new QStyledItemDelegate);
}
- if (DApplication::isDXcbPlatform()) {
+ if (DApplication::isDXcbPlatform() || (qApp->platformName() == "dwayland" || qApp->property("_d_isDwayland").toBool())) {
bool is_menu = qobject_cast<QMenu *>(w);
bool is_tip = w->inherits("QTipLabel");
@@ -4180,7 +4287,10 @@
if (DPlatformWindowHandle::isEnabledDXcb(w)) {
handle.setEnableBlurWindow(true);
- handle.setWindowRadius(8);
+ // ������������8, 18���������������������������8
+ auto theme = DGuiApplicationHelper::instance()->applicationTheme();
+ int wradius = theme->windowRadius();
+ handle.setWindowRadius(qMax(0, qMin(wradius, 8)));
w->setAttribute(Qt::WA_TranslucentBackground);
connect(DWindowManagerHelper::instance(), SIGNAL(hasCompositeChanged()), w, SLOT(update()));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5integration-5.5.17/styles/widgetgallery.cpp new/qt5integration-5.5.24/styles/widgetgallery.cpp
--- old/qt5integration-5.5.17/styles/widgetgallery.cpp 2021-12-06 07:39:37.000000000 +0100
+++ new/qt5integration-5.5.24/styles/widgetgallery.cpp 2022-07-19 08:56:58.000000000 +0200
@@ -319,9 +319,15 @@
listModel->appendRow(item);
}
+ QWidget *toolbtns = new QWidget;
+ QVBoxLayout *tbVLayout = new QVBoxLayout(toolbtns);
+ tbVLayout->addWidget(createToolButtons(nullptr, false));
+ tbVLayout->addWidget(createToolButtons(nullptr, true));
+ QScrollArea *toolArea = new QScrollArea;
+ toolArea->setWidget(toolbtns);
bottomLeftTabWidget->addTab(pTreeViewWidget, "&TreeView");
bottomLeftTabWidget->addTab(pListViewWidget, "&ListView");
- bottomLeftTabWidget->addTab(new QWidget(), "tab 2");
+ bottomLeftTabWidget->addTab(toolArea, "toolbuttons");
bottomLeftTabWidget->addTab(new QWidget(), "tab 3");
bottomLeftTabWidget->addTab(new QWidget(), "tab 4");
}
@@ -415,3 +421,76 @@
timer->start(1000);
}
//! [13]
+
+QToolButton* WidgetGallery::toolBtn(QToolButton::ToolButtonPopupMode mode, const QString &text, bool hasMenu, bool hasIcon, Qt::ToolButtonStyle style)
+{
+ QToolButton *btn = new QToolButton;
+ QMenu *menu = new QMenu;
+ menu->addAction("action1");
+ menu->addAction("action2");
+ if (hasMenu)
+ btn->setMenu(menu);
+ if (hasIcon)
+ btn->setIcon(QIcon::fromTheme("edit"));
+ btn->setIconSize({16, 16});
+ btn->setPopupMode(mode);
+ if (!text.isEmpty()) {
+ btn->setText(text);
+ btn->setToolButtonStyle(style);
+ }
+
+ return btn;
+}
+
+QWidget* WidgetGallery::createToolButtons(QWidget *parent, bool hasMenu)
+{
+ QWidget *holder = new QWidget(parent);
+ holder->resize(300, 500);
+ QGridLayout *gridLayout = new QGridLayout(holder);
+ gridLayout->addWidget(new QLabel(QString("ToolButtonPopupMode")), 0, 0);
+ gridLayout->addWidget(new QLabel("IconOnly"), 0, 1);
+ gridLayout->addWidget(new QLabel(" TextOnly"), 0, 2);
+ gridLayout->addWidget(new QLabel("TextBesideIcon"), 0, 3);
+ gridLayout->addWidget(new QLabel("TextUnderIcon"), 0, 4);
+ gridLayout->addWidget(new QLabel("FollowStyle"), 0, 5);
+ QString tmp = + hasMenu ? QString("(hasMenu)") : QString("(NoMenu)");
+ for (int i = 0; i < 3; ++i) {
+ auto mode = static_cast<QToolButton::ToolButtonPopupMode>(i);
+ QMetaEnum metaEnum = QMetaEnum::fromType<QToolButton::ToolButtonPopupMode>();
+
+ gridLayout->addWidget(new QLabel(metaEnum.valueToKey(mode) + tmp), i + 1, 0);
+
+ if (hasMenu) {
+ QToolButton *menuTextIconBtnUnderIconOnly = toolBtn(mode, "ToolButton", true, true, Qt::ToolButtonStyle::ToolButtonIconOnly);
+ gridLayout->addWidget(menuTextIconBtnUnderIconOnly, i + 1, 1);
+
+ QToolButton *menuTextIconBtnUnderTextOnly = toolBtn(mode, "ToolButton", true, true, Qt::ToolButtonStyle::ToolButtonTextOnly);
+ gridLayout->addWidget(menuTextIconBtnUnderTextOnly, i + 1, 2);
+
+ QToolButton *menuTextIconBtn = toolBtn(mode, "ToolButton", true, true, Qt::ToolButtonStyle::ToolButtonTextBesideIcon);
+ gridLayout->addWidget(menuTextIconBtn, i + 1, 3);
+
+ QToolButton *menuTextIconBtnUnder = toolBtn(mode, "ToolButton", true, true, Qt::ToolButtonStyle::ToolButtonTextUnderIcon);
+ gridLayout->addWidget(menuTextIconBtnUnder, i + 1, 4);
+
+ QToolButton *menuTextIconBtnUnderFollow = toolBtn(mode, "ToolButton", true, true, Qt::ToolButtonStyle::ToolButtonFollowStyle);
+ gridLayout->addWidget(menuTextIconBtnUnderFollow, i + 1, 5);
+ } else {
+ QToolButton *noMenuTextIconBtnIconOnly = toolBtn(mode, "ToolButton", false, true, Qt::ToolButtonStyle::ToolButtonIconOnly);
+ gridLayout->addWidget(noMenuTextIconBtnIconOnly, i + 1, 1);
+
+ QToolButton *noMenuTextIconBtnTextOnly = toolBtn(mode, "ToolButton", false, true, Qt::ToolButtonStyle::ToolButtonTextOnly);
+ gridLayout->addWidget(noMenuTextIconBtnTextOnly, i + 1, 2);
+
+ QToolButton *noMenuTextIconBtn = toolBtn(mode, "ToolButton", false, true, Qt::ToolButtonStyle::ToolButtonTextBesideIcon);
+ gridLayout->addWidget(noMenuTextIconBtn, i + 1, 3);
+
+ QToolButton *noMenuTextIconBtnUnder = toolBtn(mode, "ToolButton", false, true, Qt::ToolButtonStyle::ToolButtonTextUnderIcon);
+ gridLayout->addWidget(noMenuTextIconBtnUnder, i + 1, 4);
+
+ QToolButton *noMenuTextIconBtnFollow = toolBtn(mode, "ToolButton", false, true, Qt::ToolButtonStyle::ToolButtonFollowStyle);
+ gridLayout->addWidget(noMenuTextIconBtnFollow, i + 1, 5);
+ }
+ }
+ return holder;
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5integration-5.5.17/styles/widgetgallery.h new/qt5integration-5.5.24/styles/widgetgallery.h
--- old/qt5integration-5.5.17/styles/widgetgallery.h 2021-12-06 07:39:37.000000000 +0100
+++ new/qt5integration-5.5.24/styles/widgetgallery.h 2022-07-19 08:56:58.000000000 +0200
@@ -42,6 +42,7 @@
#define WIDGETGALLERY_H
#include <QMainWindow>
+#include <QToolButton>
QT_BEGIN_NAMESPACE
class QCheckBox;
@@ -81,6 +82,8 @@
void createBottomLeftTabWidget();
void createBottomRightGroupBox();
void createProgressBar();
+ QToolButton* toolBtn(QToolButton::ToolButtonPopupMode mode, const QString &text = QString(), bool hasMenu = true, bool hasIcon = true, Qt::ToolButtonStyle style = Qt::ToolButtonStyle::ToolButtonTextBesideIcon);
+ QWidget* createToolButtons(QWidget *parent = nullptr, bool hasMenu = true);
QPalette originalPalette;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5integration-5.5.17/tests/styleplugins/chameleon/ut_chameleonstyle.cpp new/qt5integration-5.5.24/tests/styleplugins/chameleon/ut_chameleonstyle.cpp
--- old/qt5integration-5.5.17/tests/styleplugins/chameleon/ut_chameleonstyle.cpp 2021-12-06 07:39:37.000000000 +0100
+++ new/qt5integration-5.5.24/tests/styleplugins/chameleon/ut_chameleonstyle.cpp 2022-07-19 08:56:58.000000000 +0200
@@ -1882,6 +1882,10 @@
INIT_TESTWIDGET(QScrollBar);
TestScrollBarSliderDrawUtil drawUtilInstance(this);
+
+ QScrollBar *bar = qobject_cast<QScrollBar*> (drawUtilInstance.testWidget());
+ bar->setProperty("_d_dtk_slider_always_show", true);
+
ASSERT_DrawFuncHasData(drawUtilInstance.testDrawNormalScrollBarSlider);
ASSERT_DrawFuncHasData(drawUtilInstance.testDrawNormalVerticalScrollBarSlider);
ASSERT_DrawFuncHasData(drawUtilInstance.testDrawHorizontalSliderWithSpaceProperty);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5integration-5.5.17/tests/test-recoverage-qmake.sh new/qt5integration-5.5.24/tests/test-recoverage-qmake.sh
--- old/qt5integration-5.5.17/tests/test-recoverage-qmake.sh 2021-12-06 07:39:37.000000000 +0100
+++ new/qt5integration-5.5.24/tests/test-recoverage-qmake.sh 2022-07-19 08:56:58.000000000 +0200
@@ -1,8 +1,9 @@
#!/bin/bash
set -e
-BUILD_DIR=build
-REPORT_DIR=report
+BUILD_DIR=`pwd`/../build-ut
+HTML_DIR=${BUILD_DIR}/html
+XML_DIR=${BUILD_DIR}/report
cd ../
rm -rf $BUILD_DIR
mkdir $BUILD_DIR
@@ -16,15 +17,15 @@
cd $BUILD_DIR
qmake ../ CONFIG+=debug BASED_DTK_DIR=based-dtk
export ASAN_OPTIONS=halt_on_error=0
-TESTARGS="--gtest_output=xml:dde_test_report_qt5integration.xml" make check -j$(nproc)
+TESTARGS="--gtest_output=xml:${XML_DIR}/report_qt5integration.xml" make check -j$(nproc)
lcov -d ./ -c -o coverage_all.info
#lcov --extract coverage_all.info $EXTRACT_ARGS --output-file coverage.info
-lcov --remove coverage_all.info "*/tests/*" "*/usr/include*" "*build/src*" --output-file coverage.info
+lcov --remove coverage_all.info "*/tests/*" "*/usr/include*" "*build-ut/src*" --output-file coverage.info
cd ..
-genhtml -o $REPORT_DIR $BUILD_DIR/coverage.info
+genhtml -o $HTML_DIR $BUILD_DIR/coverage.info && mv ${BUILD_DIR}/html/index.html ${BUILD_DIR}/html/cov_qt5integration.html
-test -e ./build/asan.log* && mv ./build/asan.log* ./build/asan_qt5integration.log || touch ./build/asan.log
+test -e ${BUILD_DIR}/asan.log* && mv ${BUILD_DIR}/asan.log* ${BUILD_DIR}/asan_qt5integration.log || touch ${BUILD_DIR}/asan_qt5integration.log
#rm -rf $BUILD_DIR
#rm -rf ../$BUILD_DIR
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qt5platform-plugins for openSUSE:Factory checked in at 2022-09-01 22:10:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt5platform-plugins (Old)
and /work/SRC/openSUSE:Factory/.qt5platform-plugins.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt5platform-plugins"
Thu Sep 1 22:10:06 2022 rev:7 rq:1000239 version:5.0.68
Changes:
--------
--- /work/SRC/openSUSE:Factory/qt5platform-plugins/qt5platform-plugins.changes 2022-07-06 15:42:27.946558442 +0200
+++ /work/SRC/openSUSE:Factory/.qt5platform-plugins.new.2083/qt5platform-plugins.changes 2022-09-01 22:10:57.364208875 +0200
@@ -1,0 +2,7 @@
+Wed Aug 24 12:07:38 UTC 2022 - Hillwood Yang <hillwood(a)opensuse.org>
+
+- Update version to 5.0.68
+ * Support Qt 5.15.5
+ * Fix bugs
+
+-------------------------------------------------------------------
Old:
----
qt5platform-plugins-5.0.65.tar.gz
New:
----
qt5platform-plugins-5.0.68.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt5platform-plugins.spec ++++++
--- /var/tmp/diff_new_pack.NAdooD/_old 2022-09-01 22:10:59.228213972 +0200
+++ /var/tmp/diff_new_pack.NAdooD/_new 2022-09-01 22:10:59.236213994 +0200
@@ -21,7 +21,7 @@
# %define qt_version 5.15.5
Name: qt5platform-plugins
-Version: 5.0.65
+Version: 5.0.68
Release: 0
Summary: Qt platform integration plugins
License: GPL-3.0-or-later
@@ -104,9 +104,6 @@
# elif [ "`rpm -q --queryformat '%%{VERSION}' libQt5Core5`" = "5.15.5+kde165" ]; then
# cp -r xcb/libqt5xcbqpa-dev/5.15.1 xcb/libqt5xcbqpa-dev/5.15.5
fi
-%if 0%{?suse_version} > 1500
- cp -r xcb/libqt5xcbqpa-dev/5.15.1 xcb/libqt5xcbqpa-dev/5.15.5
-%endif
# Disable wayland for now: https://github.com/linuxdeepin/qt5platform-plugins/issues/47
sed -i '/wayland/d' qt5platform-plugins.pro
++++++ qt5platform-plugins-5.0.65.tar.gz -> qt5platform-plugins-5.0.68.tar.gz ++++++
++++ 4095 lines of diff (skipped)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package disomaster for openSUSE:Factory checked in at 2022-09-01 22:10:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/disomaster (Old)
and /work/SRC/openSUSE:Factory/.disomaster.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "disomaster"
Thu Sep 1 22:10:05 2022 rev:3 rq:1000238 version:5.0.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/disomaster/disomaster.changes 2021-06-02 22:11:12.724124193 +0200
+++ /work/SRC/openSUSE:Factory/.disomaster.new.2083/disomaster.changes 2022-09-01 22:10:56.540206621 +0200
@@ -1,0 +2,7 @@
+Sun Aug 28 11:54:08 UTC 2022 - Hillwood Yang <hillwood(a)opensuse.org>
+
+- Update version to 5.0.8
+ * impl 'dumpISO'
+ * Fix bugs
+
+-------------------------------------------------------------------
Old:
----
disomaster-5.0.7.tar.gz
New:
----
disomaster-5.0.8.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ disomaster.spec ++++++
--- /var/tmp/diff_new_pack.eO8Sqd/_old 2022-09-01 22:10:57.024207945 +0200
+++ /var/tmp/diff_new_pack.eO8Sqd/_new 2022-09-01 22:10:57.028207956 +0200
@@ -1,7 +1,7 @@
#
# spec file for package disomaster
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%define sover 1
Name: disomaster
-Version: 5.0.7
+Version: 5.0.8
Release: 0
License: GPL-3.0-or-later
Summary: A libisoburn wrapper
++++++ disomaster-5.0.7.tar.gz -> disomaster-5.0.8.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/disomaster-5.0.7/.github/workflows/backup-to-gitlab.yml new/disomaster-5.0.8/.github/workflows/backup-to-gitlab.yml
--- old/disomaster-5.0.7/.github/workflows/backup-to-gitlab.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/disomaster-5.0.8/.github/workflows/backup-to-gitlab.yml 2022-08-16 10:23:54.000000000 +0200
@@ -0,0 +1,52 @@
+name: backup to gitlab
+on: [push]
+
+concurrency:
+ group: ${{ github.workflow }}
+ cancel-in-progress: true
+
+jobs:
+ backup-to-gitlab:
+ if: github.repository_owner == 'linuxdeepin'
+ name: backup-to-gitlab
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ with:
+ repository: "linuxdeepin/jenkins-bridge-client"
+ path: jenkins-bridge-client
+
+ - name: Install Client
+ run: |
+ cd $GITHUB_WORKSPACE/jenkins-bridge-client
+ go build .
+ sudo install -Dvm755 jenkins-bridge-client -t /usr/bin/
+ - name: Trigger sync
+ id: generate-runid
+ run: |
+ echo "::set-output name=RUN_ID::$(jenkins-bridge-client -triggerSync -token '${{ secrets.BRIDGETOKEN }}')"
+ - name: Print log
+ run: |
+ jenkins-bridge-client -printlog -token "${{ secrets.BRIDGETOKEN }}" -runid "${{ steps.generate-runid.outputs.RUN_ID }}"
+
+ backup-to-gitee:
+ if: github.repository_owner == 'linuxdeepin'
+ runs-on: ubuntu-latest
+ steps:
+ - name: create-repo
+ run: |
+ repo=${{ github.event.repository.name }}
+ homepage="https://github.com/linuxdeepin/${repo}"
+ description="mirror of ${homepage}"
+ # remove '.' prefix
+ repo=${repo#"."}
+ curl -X POST --header 'Content-Type: application/json;charset=UTF-8' 'https://gitee.com/api/v5/enterprises/linuxdeepin/repos' -d '{"private": 1,"access_token":"${{ secrets.GITEE_SYNC_TOKEN }}","name":"'"$repo"'","description":"'"$description"'","homepage":"'"$homepage"'","has_issues":"false","has_wiki":"false","can_comment":"false"}' || true
+ - name: push
+ run: |
+ git clone --bare https://github.com/linuxdeepin/${{ github.event.repository.name }}.git .git
+ repo=${{ github.event.repository.name }}
+ # remove '.' prefix
+ repo=${repo#"."}
+ git remote set-url origin https://myml:${{ secrets.GITEE_SYNC_TOKEN }}(a)gitee.com/linuxdeepin/${repo}.git
+ git push -f --all --prune origin
+ git push --tags origin
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/disomaster-5.0.7/.github/workflows/call-build-deb.yml new/disomaster-5.0.8/.github/workflows/call-build-deb.yml
--- old/disomaster-5.0.7/.github/workflows/call-build-deb.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/disomaster-5.0.8/.github/workflows/call-build-deb.yml 2022-08-16 10:23:54.000000000 +0200
@@ -0,0 +1,17 @@
+name: Call build-deb
+on:
+ pull_request_target:
+ paths-ignore:
+ - ".github/workflows/**"
+ types: [ opened, closed, synchronize ]
+
+concurrency:
+ group: ${{ github.workflow }}-pull/${{ github.event.number }}
+ cancel-in-progress: true
+
+jobs:
+ check_job:
+ if: github.event.action != 'closed' || github.event.pull_request.merged
+ uses: linuxdeepin/.github/.github/workflows/build-deb.yml@master
+ secrets:
+ BridgeToken: ${{ secrets.BridgeToken }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/disomaster-5.0.7/.github/workflows/call-chatOps.yml new/disomaster-5.0.8/.github/workflows/call-chatOps.yml
--- old/disomaster-5.0.7/.github/workflows/call-chatOps.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/disomaster-5.0.8/.github/workflows/call-chatOps.yml 2022-08-16 10:23:54.000000000 +0200
@@ -0,0 +1,10 @@
+name: chatOps
+on:
+ issue_comment:
+ types: [created]
+
+jobs:
+ chatopt:
+ uses: linuxdeepin/.github/.github/workflows/chatOps.yml@master
+ secrets:
+ APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/disomaster-5.0.7/.github/workflows/call-clacheck.yml new/disomaster-5.0.8/.github/workflows/call-clacheck.yml
--- old/disomaster-5.0.7/.github/workflows/call-clacheck.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/disomaster-5.0.8/.github/workflows/call-clacheck.yml 2022-08-16 10:23:54.000000000 +0200
@@ -0,0 +1,16 @@
+name: Call CLA check
+on:
+ issue_comment:
+ types: [created]
+ pull_request_target:
+ types: [opened, closed, synchronize]
+
+concurrency:
+ group: ${{ github.workflow }}-pull/${{ github.event.number }}
+ cancel-in-progress: true
+
+jobs:
+ clacheck:
+ uses: linuxdeepin/.github/.github/workflows/cla-check.yml@master
+ secrets:
+ APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/disomaster-5.0.7/.github/workflows/call-commitlint.yml new/disomaster-5.0.8/.github/workflows/call-commitlint.yml
--- old/disomaster-5.0.7/.github/workflows/call-commitlint.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/disomaster-5.0.8/.github/workflows/call-commitlint.yml 2022-08-16 10:23:54.000000000 +0200
@@ -0,0 +1,11 @@
+name: Call commitlint
+on:
+ pull_request_target:
+
+concurrency:
+ group: ${{ github.workflow }}-pull/${{ github.event.number }}
+ cancel-in-progress: true
+
+jobs:
+ check_job:
+ uses: linuxdeepin/.github/.github/workflows/commitlint.yml@master
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/disomaster-5.0.7/.github/workflows/call-license-check.yml new/disomaster-5.0.8/.github/workflows/call-license-check.yml
--- old/disomaster-5.0.7/.github/workflows/call-license-check.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/disomaster-5.0.8/.github/workflows/call-license-check.yml 2022-08-16 10:23:54.000000000 +0200
@@ -0,0 +1,16 @@
+name: Call License and README Check
+on:
+ pull_request_target:
+ types: [opened, synchronize, reopened]
+
+permissions:
+ pull-requests: write
+ contents: read
+
+concurrency:
+ group: ${{ github.workflow }}-pull/${{ github.event.number }}
+ cancel-in-progress: true
+
+jobs:
+ license-check:
+ uses: linuxdeepin/.github/.github/workflows/license-check.yml@master
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/disomaster-5.0.7/.github/workflows/cppcheck.yml new/disomaster-5.0.8/.github/workflows/cppcheck.yml
--- old/disomaster-5.0.7/.github/workflows/cppcheck.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/disomaster-5.0.8/.github/workflows/cppcheck.yml 2022-08-16 10:23:54.000000000 +0200
@@ -0,0 +1,26 @@
+name: cppcheck
+on:
+ pull_request_target:
+ paths-ignore:
+ - ".github/workflows/**"
+
+concurrency:
+ group: ${{ github.workflow }}-pull/${{ github.event.number }}
+ cancel-in-progress: true
+
+jobs:
+ cppchceck:
+ name: cppcheck
+ runs-on: ubuntu-latest
+ steps:
+ - run: export
+ - uses: actions/checkout@v2
+ with:
+ ref: ${{ github.event.pull_request.head.sha }}
+ persist-credentials: false
+ - uses: linuxdeepin/action-cppcheck@main
+ with:
+ github_token: ${{ secrets.GITHUB_TOKEN }}
+ repository: ${{ github.repository }}
+ pull_request_id: ${{ github.event.pull_request.number }}
+ allow_approve: false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/disomaster-5.0.7/archlinux/PKGBUILD new/disomaster-5.0.8/archlinux/PKGBUILD
--- old/disomaster-5.0.7/archlinux/PKGBUILD 1970-01-01 01:00:00.000000000 +0100
+++ new/disomaster-5.0.8/archlinux/PKGBUILD 2022-08-16 10:23:54.000000000 +0200
@@ -0,0 +1,32 @@
+# Maintainer: justforlxz <justforlxz(a)gmail.com>
+pkgname=disomaster-git
+pkgver=5.0.7.r2.g157dd8f
+pkgrel=1
+pkgdesc='Library to manipulate DISC burning.'
+arch=('x86_64' 'aarch64')
+url="https://github.com/linuxdeepin/disomaster"
+license=('GPL3')
+depends=('libisoburn')
+makedepends=('git' 'qt5-tools')
+groups=('deepin-git')
+provides=('disomaster')
+conflicts=('disomaster')
+source=('source.tar.gz')
+sha512sums=('SKIP')
+
+prepare() {
+ cd $deepin_source_name
+}
+
+build() {
+ cd $deepin_source_name
+
+ qmake-qt5 PREFIX=/usr
+ make
+}
+
+package() {
+ cd $deepin_source_name
+
+ make INSTALL_ROOT="$pkgdir" install
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/disomaster-5.0.7/libdisomaster/disomaster.cpp new/disomaster-5.0.8/libdisomaster/disomaster.cpp
--- old/disomaster-5.0.7/libdisomaster/disomaster.cpp 2020-12-08 04:28:44.000000000 +0100
+++ new/disomaster-5.0.8/libdisomaster/disomaster.cpp 2022-08-16 10:23:54.000000000 +0200
@@ -22,18 +22,18 @@
#include "xorriso.h"
#include <QRegularExpression>
-#define PCHAR(s) (char*)(s)
+#define PCHAR(s) (char *)(s)
-#define XORRISO_OPT(opt, x, ...) \
+#define XORRISO_OPT(opt, x, ...) \
Xorriso_set_problem_status(x, PCHAR(""), 0); \
- r = Xorriso_option_##opt(x, __VA_ARGS__); \
+ r = Xorriso_option_##opt(x, __VA_ARGS__); \
r = Xorriso_eval_problem_status(x, r, 0);
-#define JOBFAILED_IF(r, x) \
- if (r <= 0) { \
- Xorriso_option_end(x, 1); \
+#define JOBFAILED_IF(r, x) \
+ if (r <= 0) { \
+ Xorriso_option_end(x, 1); \
Q_EMIT jobStatusChanged(JobStatus::Failed, -1); \
- return false; \
+ return false; \
}
int XorrisoResultHandler(void *handle, char *text);
@@ -44,7 +44,8 @@
class DISOMasterPrivate
{
private:
- DISOMasterPrivate(DISOMaster *q): q_ptr(q) {}
+ DISOMasterPrivate(DISOMaster *q)
+ : q_ptr(q) {}
XorrisO *xorriso;
QHash<QUrl, QUrl> files;
QHash<QString, DeviceProperty> dev;
@@ -71,9 +72,9 @@
* return until the operation completes. Note the signal is emitted
* from a separate thread (while the job is actually running).
*/
-DISOMaster::DISOMaster(QObject *parent):
- QObject(parent),
- d_ptr(new DISOMasterPrivate(this))
+DISOMaster::DISOMaster(QObject *parent)
+ : QObject(parent),
+ d_ptr(new DISOMasterPrivate(this))
{
Q_D(DISOMaster);
int r = Xorriso_new(&d->xorriso, PCHAR("xorriso"), 0);
@@ -279,7 +280,7 @@
* \param volId volume name of the disc
* \return true on success, false on failure
*/
-bool DISOMaster::commit(const BurnOptions &opts, int speed/* = 0*/, QString volId/* = "ISOIMAGE"*/)
+bool DISOMaster::commit(const BurnOptions &opts, int speed /* = 0*/, QString volId /* = "ISOIMAGE"*/)
{
Q_D(DISOMaster);
Q_EMIT jobStatusChanged(JobStatus::Stalled, 0);
@@ -309,11 +310,10 @@
for (auto it = d->files.begin(); it != d->files.end(); ++it) {
XORRISO_OPT(
- map, d->xorriso,
- it.key().toString().toUtf8().data(),
- it.value().toString().toUtf8().data(),
- 0
- );
+ map, d->xorriso,
+ it.key().toString().toUtf8().data(),
+ it.value().toString().toUtf8().data(),
+ 0);
JOBFAILED_IF(r, d->xorriso);
}
@@ -326,7 +326,6 @@
return true;
}
-
/*!
* \brief Burn all staged files to the disc.
* \param speed desired writing speed in kilobytes per second
@@ -367,11 +366,10 @@
for (auto it = d->files.begin(); it != d->files.end(); ++it) {
XORRISO_OPT(
- map, d->xorriso,
- it.key().toString().toUtf8().data(),
- it.value().toString().toUtf8().data(),
- 0
- );
+ map, d->xorriso,
+ it.key().toString().toUtf8().data(),
+ it.value().toString().toUtf8().data(),
+ 0);
JOBFAILED_IF(r, d->xorriso);
}
@@ -466,13 +464,34 @@
}
/*!
- * \brief Dump the content of the disc to a file. (unimplemented)
+ * \brief Dump the content of the disc to a file
+ * xorriso -outdev /dev/sr[?] -check_media use=outdev data_to=[path]
+ * \param isopath the image file to be dumped
+ * \return true on success, false on failure
*/
-void DISOMaster::dumpISO(const QUrl isopath)
+bool DISOMaster::dumpISO(const QUrl isopath)
{
Q_D(DISOMaster);
- //use osirrox
- //unimplemented
+ Q_EMIT jobStatusChanged(JobStatus::Running, 0);
+ d->xorrisomsg.clear();
+
+ Q_ASSERT(!isopath.isEmpty());
+ Q_ASSERT(isopath.isValid());
+
+ int r;
+ char **av = new char *[2];
+ int dummy = 0;
+ av[0] = strdup((QString("use=outdev")).toUtf8().data());
+ av[1] = strdup((QString("data_to=") + isopath.path()).toUtf8().data());
+ XORRISO_OPT(check_media, d->xorriso, 2, av, &dummy, 0);
+
+ for (int i = 0; i < 2; ++i)
+ free(av[i]);
+ delete[] av;
+
+ JOBFAILED_IF(r, d->xorriso);
+
+ return true;
}
/*!
@@ -511,7 +530,7 @@
for (int i = 0; i < 6; ++i) {
free(av[i]);
}
- delete []av;
+ delete[] av;
return true;
}
@@ -528,24 +547,24 @@
char **av;
Xorriso_sieve_get_result(xorriso, PCHAR("Media current:"), &ac, &av, &avail, 0);
if (ac < 1) {
- Xorriso__dispose_words(&ac, &av);
+ Xorriso__dispose_words(&ac, &av);
return;
}
QString mt = av[0];
const static QHash<QString, MediaType> typemap = {
- {"CD-ROM", MediaType::CD_ROM},
- {"CD-R", MediaType::CD_R},
- {"CD-RW", MediaType::CD_RW},
- {"DVD-ROM", MediaType::DVD_ROM},
- {"DVD-R", MediaType::DVD_R},
- {"DVD-RW", MediaType::DVD_RW},
- {"DVD+R", MediaType::DVD_PLUS_R},
- {"DVD+R/DL", MediaType::DVD_PLUS_R_DL},
- {"DVD-RAM", MediaType::DVD_RAM},
- {"DVD+RW", MediaType::DVD_PLUS_RW},
- {"BD-ROM", MediaType::BD_ROM},
- {"BD-R", MediaType::BD_R},
- {"BD-RE", MediaType::BD_RE}
+ { "CD-ROM", MediaType::CD_ROM },
+ { "CD-R", MediaType::CD_R },
+ { "CD-RW", MediaType::CD_RW },
+ { "DVD-ROM", MediaType::DVD_ROM },
+ { "DVD-R", MediaType::DVD_R },
+ { "DVD-RW", MediaType::DVD_RW },
+ { "DVD+R", MediaType::DVD_PLUS_R },
+ { "DVD+R/DL", MediaType::DVD_PLUS_R_DL },
+ { "DVD-RAM", MediaType::DVD_RAM },
+ { "DVD+RW", MediaType::DVD_PLUS_RW },
+ { "BD-ROM", MediaType::BD_ROM },
+ { "BD-R", MediaType::BD_R },
+ { "BD-RE", MediaType::BD_RE }
};
mt = mt.left(mt.indexOf(' '));
if (typemap.find(mt) != typemap.end()) {
@@ -554,7 +573,7 @@
dev[curdev].media = MediaType::NoMedia;
}
Xorriso__dispose_words(&ac, &av);
-
+
Xorriso_sieve_get_result(xorriso, PCHAR("Media summary:"), &ac, &av, &avail, 0);
if (ac == 4) {
const QString units = "kmg";
@@ -634,7 +653,7 @@
//check media
r = QRegularExpression("([0-9]*) blocks read in ([0-9]*) seconds , ([0-9.]*)x");
m = r.match(msg);
- if (m.hasMatch()) {
+ if (m.hasMatch() && dev[curdev].datablocks != 0) {
double percentage = 100. * m.captured(1).toDouble() / dev[curdev].datablocks;
Q_EMIT q->jobStatusChanged(DISOMaster::JobStatus::Running, percentage);
}
@@ -649,8 +668,7 @@
}
//operation complete
- if (msg.contains("Blanking done") ||
- msg.contains(QRegularExpression("Writing to .* completed successfully."))) {
+ if (msg.contains("Blanking done") || msg.contains(QRegularExpression("Writing to .* completed successfully."))) {
Q_EMIT q->jobStatusChanged(DISOMaster::JobStatus::Finished, 0);
}
}
@@ -659,7 +677,7 @@
int XorrisoResultHandler(void *handle, char *text)
{
- ((DISOMasterNS::DISOMasterPrivate*)handle)->messageReceived(0, text);
+ ((DISOMasterNS::DISOMasterPrivate *)handle)->messageReceived(0, text);
return 1;
}
int XorrisoInfoHandler(void *handle, char *text)
@@ -668,7 +686,7 @@
if (strstr(text, "DEBUG : Concurrent message watcher")) {
return 1;
}
- ((DISOMasterNS::DISOMasterPrivate*)handle)->messageReceived(1, text);
+ ((DISOMasterNS::DISOMasterPrivate *)handle)->messageReceived(1, text);
return 1;
}
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/disomaster-5.0.7/libdisomaster/disomaster.h new/disomaster-5.0.8/libdisomaster/disomaster.h
--- old/disomaster-5.0.7/libdisomaster/disomaster.h 2020-12-08 04:28:44.000000000 +0100
+++ new/disomaster-5.0.8/libdisomaster/disomaster.h 2022-08-16 10:23:54.000000000 +0200
@@ -114,8 +114,7 @@
Q_DECL_DEPRECATED_X("Suggest use commit with BurnOptions instead") bool commit(int speed = 0, bool closeSession = false, QString volId = "ISOIMAGE");
bool erase();
bool checkmedia(double *qgood, double *qslow, double *qbad);
-
- void dumpISO(const QUrl isopath);
+ bool dumpISO(const QUrl isopath);
bool writeISO(const QUrl isopath, int speed = 0);
Q_SIGNALS:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/disomaster-5.0.7/tests/testdisomaster.cpp new/disomaster-5.0.8/tests/testdisomaster.cpp
--- old/disomaster-5.0.7/tests/testdisomaster.cpp 2020-12-08 04:28:44.000000000 +0100
+++ new/disomaster-5.0.8/tests/testdisomaster.cpp 2022-08-16 10:23:54.000000000 +0200
@@ -150,4 +150,27 @@
delete x;
}
+void TestDISOMaster::test_dumpISO()
+{
+ Q_ASSUME(qEnvironmentVariableIsSet("DISOMASTERTEST_DEVICE"));
+ Q_ASSUME(qEnvironmentVariableIsSet("DISOMASTERTEST_DEVICE"));
+ const QString dev = QString(qgetenv("DISOMASTERTEST_DEVICE"));
+ const QString iso = QString(qgetenv("DISOMASTERTEST_ISOFILE"));
+
+ DISOMaster *x = new DISOMaster;
+ TestSignalReceiver *r = new TestSignalReceiver(x, this);
+ connect(x, &DISOMaster::jobStatusChanged, r, &TestSignalReceiver::updateJobStatus);
+
+ QFuture<void> f = QtConcurrent::run([=] {
+ x->acquireDevice(dev);
+ x->dumpISO(QUrl::fromLocalFile(iso));
+ x->releaseDevice();
+ });
+
+ QTRY_VERIFY_WITH_TIMEOUT(st == DISOMaster::JobStatus::Finished, 300000);
+ f.waitForFinished();
+ delete r;
+ delete x;
+}
+
QTEST_MAIN(TestDISOMaster)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/disomaster-5.0.7/tests/testdisomaster.h new/disomaster-5.0.8/tests/testdisomaster.h
--- old/disomaster-5.0.7/tests/testdisomaster.h 2020-12-08 04:28:44.000000000 +0100
+++ new/disomaster-5.0.8/tests/testdisomaster.h 2022-08-16 10:23:54.000000000 +0200
@@ -53,6 +53,7 @@
void test_erase();
void test_isoWrite();
void test_checkMedia();
+ void test_dumpISO();
};
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package deepin-desktop-base for openSUSE:Factory checked in at 2022-09-01 22:10:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/deepin-desktop-base (Old)
and /work/SRC/openSUSE:Factory/.deepin-desktop-base.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-desktop-base"
Thu Sep 1 22:10:04 2022 rev:9 rq:1000236 version:20.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/deepin-desktop-base/deepin-desktop-base.changes 2022-04-22 21:54:29.914822701 +0200
+++ /work/SRC/openSUSE:Factory/.deepin-desktop-base.new.2083/deepin-desktop-base.changes 2022-09-01 22:10:55.644204171 +0200
@@ -1,0 +2,5 @@
+Mon Aug 29 03:50:45 UTC 2022 - Hillwood Yang <hillwood(a)opensuse.org>
+
+- Update version to 2022.07.26, Deepin version is 20.6
+
+-------------------------------------------------------------------
Old:
----
deepin-desktop-base-2022.03.07.tar.gz
New:
----
deepin-desktop-base-2022.07.26.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deepin-desktop-base.spec ++++++
--- /var/tmp/diff_new_pack.bTfzWN/_old 2022-09-01 22:10:56.308205987 +0200
+++ /var/tmp/diff_new_pack.bTfzWN/_new 2022-09-01 22:10:56.312205998 +0200
@@ -16,10 +16,10 @@
#
-%define _version 2022.03.07
+%define _version 2022.07.26
Name: deepin-desktop-base
-Version: 20.5
+Version: 20.6
Release: 0
Summary: Base component for Deepin
License: GPL-3.0-or-later
++++++ deepin-desktop-base-2022.03.07.tar.gz -> deepin-desktop-base-2022.07.26.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/deepin-desktop-base-2022.03.07/.github/workflows/backup-to-gitlab.yml new/deepin-desktop-base-2022.07.26/.github/workflows/backup-to-gitlab.yml
--- old/deepin-desktop-base-2022.03.07/.github/workflows/backup-to-gitlab.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/deepin-desktop-base-2022.07.26/.github/workflows/backup-to-gitlab.yml 2022-08-01 05:20:35.000000000 +0200
@@ -0,0 +1,52 @@
+name: backup to gitlab
+on: [push]
+
+concurrency:
+ group: ${{ github.workflow }}
+ cancel-in-progress: true
+
+jobs:
+ backup-to-gitlab:
+ if: github.repository_owner == 'linuxdeepin'
+ name: backup-to-gitlab
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ with:
+ repository: "linuxdeepin/jenkins-bridge-client"
+ path: jenkins-bridge-client
+
+ - name: Install Client
+ run: |
+ cd $GITHUB_WORKSPACE/jenkins-bridge-client
+ go build .
+ sudo install -Dvm755 jenkins-bridge-client -t /usr/bin/
+ - name: Trigger sync
+ id: generate-runid
+ run: |
+ echo "::set-output name=RUN_ID::$(jenkins-bridge-client -triggerSync -token '${{ secrets.BRIDGETOKEN }}')"
+ - name: Print log
+ run: |
+ jenkins-bridge-client -printlog -token "${{ secrets.BRIDGETOKEN }}" -runid "${{ steps.generate-runid.outputs.RUN_ID }}"
+
+ backup-to-gitee:
+ if: github.repository_owner == 'linuxdeepin'
+ runs-on: ubuntu-latest
+ steps:
+ - name: create-repo
+ run: |
+ repo=${{ github.event.repository.name }}
+ homepage="https://github.com/linuxdeepin/${repo}"
+ description="mirror of ${homepage}"
+ # remove '.' prefix
+ repo=${repo#"."}
+ curl -X POST --header 'Content-Type: application/json;charset=UTF-8' 'https://gitee.com/api/v5/enterprises/linuxdeepin/repos' -d '{"private": 1,"access_token":"${{ secrets.GITEE_SYNC_TOKEN }}","name":"'"$repo"'","description":"'"$description"'","homepage":"'"$homepage"'","has_issues":"false","has_wiki":"false","can_comment":"false"}' || true
+ - name: push
+ run: |
+ git clone --bare https://github.com/linuxdeepin/${{ github.event.repository.name }}.git .git
+ repo=${{ github.event.repository.name }}
+ # remove '.' prefix
+ repo=${repo#"."}
+ git remote set-url origin https://myml:${{ secrets.GITEE_SYNC_TOKEN }}(a)gitee.com/linuxdeepin/${repo}.git
+ git push -f --all --prune origin
+ git push --tags origin
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/deepin-desktop-base-2022.03.07/.github/workflows/call-build-deb.yml new/deepin-desktop-base-2022.07.26/.github/workflows/call-build-deb.yml
--- old/deepin-desktop-base-2022.03.07/.github/workflows/call-build-deb.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/deepin-desktop-base-2022.07.26/.github/workflows/call-build-deb.yml 2022-08-01 05:20:35.000000000 +0200
@@ -0,0 +1,17 @@
+name: Call build-deb
+on:
+ pull_request_target:
+ paths-ignore:
+ - ".github/workflows/**"
+ types: [ opened, closed, synchronize ]
+
+concurrency:
+ group: ${{ github.workflow }}-pull/${{ github.event.number }}
+ cancel-in-progress: true
+
+jobs:
+ check_job:
+ if: github.event.action != 'closed' || github.event.pull_request.merged
+ uses: linuxdeepin/.github/.github/workflows/build-deb.yml@master
+ secrets:
+ BridgeToken: ${{ secrets.BridgeToken }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/deepin-desktop-base-2022.03.07/.github/workflows/call-build-distribution.yml new/deepin-desktop-base-2022.07.26/.github/workflows/call-build-distribution.yml
--- old/deepin-desktop-base-2022.03.07/.github/workflows/call-build-distribution.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/deepin-desktop-base-2022.07.26/.github/workflows/call-build-distribution.yml 2022-08-01 05:20:35.000000000 +0200
@@ -0,0 +1,17 @@
+name: Call build-distribution
+on:
+ push:
+ paths-ignore:
+ - ".github/workflows/**"
+ pull_request_target:
+ paths-ignore:
+ - ".github/workflows/**"
+
+jobs:
+ check_job:
+ uses: linuxdeepin/.github/.github/workflows/build-distribution.yml@master
+ secrets:
+ BUILD_GPG_PRIVATE_KEY: ${{ secrets.BUILD_GPG_PRIVATE_KEY }}
+ BUILD_SSH_PRIVATE_KEY: ${{ secrets.BUILD_SSH_PRIVATE_KEY }}
+ WEBDAV_PASSWD: ${{ secrets.WEBDAV_PASSWD }}
+ WEBDAV_USER: ${{ secrets.WEBDAV_USER }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/deepin-desktop-base-2022.03.07/.github/workflows/call-chatOps.yml new/deepin-desktop-base-2022.07.26/.github/workflows/call-chatOps.yml
--- old/deepin-desktop-base-2022.03.07/.github/workflows/call-chatOps.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/deepin-desktop-base-2022.07.26/.github/workflows/call-chatOps.yml 2022-08-01 05:20:35.000000000 +0200
@@ -0,0 +1,10 @@
+name: chatOps
+on:
+ issue_comment:
+ types: [created]
+
+jobs:
+ chatopt:
+ uses: linuxdeepin/.github/.github/workflows/chatOps.yml@master
+ secrets:
+ APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/deepin-desktop-base-2022.03.07/.github/workflows/call-clacheck.yml new/deepin-desktop-base-2022.07.26/.github/workflows/call-clacheck.yml
--- old/deepin-desktop-base-2022.03.07/.github/workflows/call-clacheck.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/deepin-desktop-base-2022.07.26/.github/workflows/call-clacheck.yml 2022-08-01 05:20:35.000000000 +0200
@@ -0,0 +1,16 @@
+name: Call CLA check
+on:
+ issue_comment:
+ types: [created]
+ pull_request_target:
+ types: [opened, closed, synchronize]
+
+concurrency:
+ group: ${{ github.workflow }}-pull/${{ github.event.number }}
+ cancel-in-progress: true
+
+jobs:
+ clacheck:
+ uses: linuxdeepin/.github/.github/workflows/cla-check.yml@master
+ secrets:
+ APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/deepin-desktop-base-2022.03.07/.github/workflows/call-commitlint.yml new/deepin-desktop-base-2022.07.26/.github/workflows/call-commitlint.yml
--- old/deepin-desktop-base-2022.03.07/.github/workflows/call-commitlint.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/deepin-desktop-base-2022.07.26/.github/workflows/call-commitlint.yml 2022-08-01 05:20:35.000000000 +0200
@@ -0,0 +1,11 @@
+name: Call commitlint
+on:
+ pull_request_target:
+
+concurrency:
+ group: ${{ github.workflow }}-pull/${{ github.event.number }}
+ cancel-in-progress: true
+
+jobs:
+ check_job:
+ uses: linuxdeepin/.github/.github/workflows/commitlint.yml@master
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/deepin-desktop-base-2022.03.07/.github/workflows/cppcheck.yml new/deepin-desktop-base-2022.07.26/.github/workflows/cppcheck.yml
--- old/deepin-desktop-base-2022.03.07/.github/workflows/cppcheck.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/deepin-desktop-base-2022.07.26/.github/workflows/cppcheck.yml 2022-08-01 05:20:35.000000000 +0200
@@ -0,0 +1,26 @@
+name: cppcheck
+on:
+ pull_request_target:
+ paths-ignore:
+ - ".github/workflows/**"
+
+concurrency:
+ group: ${{ github.workflow }}-pull/${{ github.event.number }}
+ cancel-in-progress: true
+
+jobs:
+ cppchceck:
+ name: cppcheck
+ runs-on: ubuntu-latest
+ steps:
+ - run: export
+ - uses: actions/checkout@v2
+ with:
+ ref: ${{ github.event.pull_request.head.sha }}
+ persist-credentials: false
+ - uses: linuxdeepin/action-cppcheck@main
+ with:
+ github_token: ${{ secrets.GITHUB_TOKEN }}
+ repository: ${{ github.repository }}
+ pull_request_id: ${{ github.event.pull_request.number }}
+ allow_approve: false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/deepin-desktop-base-2022.03.07/Makefile new/deepin-desktop-base-2022.07.26/Makefile
--- old/deepin-desktop-base-2022.03.07/Makefile 2022-03-07 02:13:58.000000000 +0100
+++ new/deepin-desktop-base-2022.07.26/Makefile 2022-08-01 05:20:35.000000000 +0200
@@ -1,4 +1,4 @@
-VERSION := 20.5
+VERSION := 20.6
RELEASE :=
ARCH_BUILD :=$(shell uname -m)
@@ -15,7 +15,7 @@
ifeq (${ARCH_BUILD}, x86_64)
sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version.in > files/desktop-version
sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-amd > files/os-version
- else ifeq (${ARCH_BUILD}, x86_32)
+ else ifeq (${ARCH_BUILD}, i686)
sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version.in > files/desktop-version
sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-amd > files/os-version
else ifeq (${ARCH_BUILD}, mipsel)
@@ -29,6 +29,10 @@
else ifeq (${ARCH_BUILD}, aarch64)
sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-arm.in > files/desktop-version
sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-arm > files/os-version
+ else ifeq (${ARCH_BUILD}, riscv64)
+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-riscv.in > files/desktop-version
+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-riscv-server.in > files/desktop-version-server
+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-riscv > files/os-version
endif
sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/lsb-release.in > files/lsb-release
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/deepin-desktop-base-2022.03.07/README.md new/deepin-desktop-base-2022.07.26/README.md
--- old/deepin-desktop-base-2022.03.07/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/deepin-desktop-base-2022.07.26/README.md 2022-08-01 05:20:35.000000000 +0200
@@ -0,0 +1 @@
+# deepin-desktop-base
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/deepin-desktop-base-2022.03.07/archlinux/PKGBUILD new/deepin-desktop-base-2022.07.26/archlinux/PKGBUILD
--- old/deepin-desktop-base-2022.03.07/archlinux/PKGBUILD 1970-01-01 01:00:00.000000000 +0100
+++ new/deepin-desktop-base-2022.07.26/archlinux/PKGBUILD 2022-08-01 05:20:35.000000000 +0200
@@ -0,0 +1,40 @@
+# Maintainer: justforlxz <justforlxz(a)gmail.com>
+pkgname=deepin-desktop-base-git
+pkgver=2021.1.25.r0.g2388ac2
+pkgrel=1
+pkgdesc='Base component for Deepin'
+arch=('any')
+url="https://github.com/linuxdeepin/deepin-desktop-base"
+license=('GPL3')
+groups=('deepin-git')
+conflicts=('deepin-desktop-base')
+provides=('deepin-desktop-base')
+groups=('deepin-git')
+makedepends=('git')
+source=("source.tar.gz"
+ distribution.info)
+sha512sums=('SKIP'
+ '27625e6d0786b8adacdb7c52806d4faa28d2ab6b319a593b3ea9bcb69f0cc18ea19b258d629e3a0069ef9a69503589b0285289caef39a1e85bbd99e915c7cd7d')
+
+prepare() {
+ cd $deepin_source_name
+}
+
+build() {
+ cd $deepin_source_name
+ make
+}
+
+package() {
+ cd $deepin_source_name
+ make DESTDIR="$pkgdir" install
+ install -Dm644 "$srcdir"/distribution.info -t "$pkgdir"/usr/share/deepin/
+ # Remove Deepin distro's lsb-release
+ rm "$pkgdir"/etc/lsb-release
+ # Don't override systemd timeouts
+ rm -r "$pkgdir"/etc/systemd
+ # Make a symlink for deepin-version
+ ln -s ../usr/lib/deepin/desktop-version "$pkgdir"/etc/deepin-version
+ # Remove apt-specific templates
+ rm -r "$pkgdir"/usr/share/python-apt
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/deepin-desktop-base-2022.03.07/archlinux/distribution.info new/deepin-desktop-base-2022.07.26/archlinux/distribution.info
--- old/deepin-desktop-base-2022.03.07/archlinux/distribution.info 1970-01-01 01:00:00.000000000 +0100
+++ new/deepin-desktop-base-2022.07.26/archlinux/distribution.info 2022-08-01 05:20:35.000000000 +0200
@@ -0,0 +1,7 @@
+[Distribution]
+Name=Arch
+WebsiteName=www.archlinux.org
+Website=https://www.archlinux.org
+Logo=/usr/share/pixmaps/archlinux.svg
+LogoLight=/usr/share/pixmaps/archlinux.svg
+LogoTransparent=/usr/share/pixmaps/archlinux.svg
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/deepin-desktop-base-2022.03.07/debian/changelog new/deepin-desktop-base-2022.07.26/debian/changelog
--- old/deepin-desktop-base-2022.03.07/debian/changelog 2022-03-07 02:13:58.000000000 +0100
+++ new/deepin-desktop-base-2022.07.26/debian/changelog 2022-08-01 05:20:35.000000000 +0200
@@ -1,3 +1,39 @@
+deepin-desktop-base (2022.07.26-apricot) unstable; urgency=medium
+
+ * update
+
+ -- LiChengGang <lichenggang(a)uniontech.com> Tue, 26 Jul 2022 19:55:26 +0800
+
+deepin-desktop-base (2022.06.29-apricot) unstable; urgency=medium
+
+ * update
+
+ -- LiChengGang <lichenggang(a)uniontech.com> Wed, 29 Jun 2022 16:06:49 +0800
+
+deepin-desktop-base (2022.06.28-apricot) unstable; urgency=medium
+
+ * update
+
+ -- LiChengGang <lichenggang(a)uniontech.com> Tue, 28 Jun 2022 09:57:23 +0800
+
+deepin-desktop-base (2022.06.15-apricot) unstable; urgency=medium
+
+ * update
+
+ -- LiChengGang <lichenggang(a)uniontech.com> Wed, 15 Jun 2022 19:24:57 +0800
+
+deepin-desktop-base (2022.06.13-apricot) unstable; urgency=medium
+
+ * update
+
+ -- LiChengGang <lichenggang(a)uniontech.com> Mon, 13 Jun 2022 19:31:25 +0800
+
+deepin-desktop-base (2022.05.17-apricot) unstable; urgency=medium
+
+ * update os-version 20.6
+
+ -- LiChengGang <lichenggang(a)uniontech.com> Tue, 17 May 2022 10:34:58 +0800
+
deepin-desktop-base (2022.03.07-apricot) unstable; urgency=medium
* update os-version 20.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/deepin-desktop-base-2022.03.07/files/desktop-version-riscv-server.in new/deepin-desktop-base-2022.07.26/files/desktop-version-riscv-server.in
--- old/deepin-desktop-base-2022.03.07/files/desktop-version-riscv-server.in 1970-01-01 01:00:00.000000000 +0100
+++ new/deepin-desktop-base-2022.07.26/files/desktop-version-riscv-server.in 2022-08-01 05:20:35.000000000 +0200
@@ -0,0 +1,9 @@
+[Release]
+Version=@@VERSION@@
+Type=Server
+Type[zh_CN]=������������
+Edition=Y2020E0002
+Copyright=Y2020CR002
+[Addition]
+Milestone=@@RELEASE@@
+Buildid=build1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/deepin-desktop-base-2022.03.07/files/desktop-version-riscv.in new/deepin-desktop-base-2022.07.26/files/desktop-version-riscv.in
--- old/deepin-desktop-base-2022.03.07/files/desktop-version-riscv.in 1970-01-01 01:00:00.000000000 +0100
+++ new/deepin-desktop-base-2022.07.26/files/desktop-version-riscv.in 2022-08-01 05:20:35.000000000 +0200
@@ -0,0 +1,9 @@
+[Release]
+Version=@@VERSION@@
+Type=Desktop
+Type[zh_CN]=���������
+Edition=Y2020E0001
+Copyright=Y2020CR001
+[Addition]
+Milestone=@@RELEASE@@
+Buildid=build1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/deepin-desktop-base-2022.03.07/files/os-version-amd new/deepin-desktop-base-2022.07.26/files/os-version-amd
--- old/deepin-desktop-base-2022.03.07/files/os-version-amd 2022-03-07 02:13:58.000000000 +0100
+++ new/deepin-desktop-base-2022.07.26/files/os-version-amd 2022-08-01 05:20:35.000000000 +0200
@@ -6,5 +6,5 @@
EditionName=Community
EditionName[zh_CN]=���������
MajorVersion=20
-MinorVersion=20.5
-OsBuild=11038.005
+MinorVersion=20.6
+OsBuild=11038.007
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/deepin-desktop-base-2022.03.07/files/os-version-arm new/deepin-desktop-base-2022.07.26/files/os-version-arm
--- old/deepin-desktop-base-2022.03.07/files/os-version-arm 2022-03-07 02:13:58.000000000 +0100
+++ new/deepin-desktop-base-2022.07.26/files/os-version-arm 2022-08-01 05:20:35.000000000 +0200
@@ -6,5 +6,5 @@
EditionName=Community
EditionName[zh_CN]=���������
MajorVersion=20
-MinorVersion=20.5
+MinorVersion=20.6
OsBuild=11038.005
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/deepin-desktop-base-2022.03.07/files/os-version-riscv new/deepin-desktop-base-2022.07.26/files/os-version-riscv
--- old/deepin-desktop-base-2022.03.07/files/os-version-riscv 1970-01-01 01:00:00.000000000 +0100
+++ new/deepin-desktop-base-2022.07.26/files/os-version-riscv 2022-08-01 05:20:35.000000000 +0200
@@ -0,0 +1,10 @@
+[Version]
+SystemName=deepin
+SystemName[zh_CN]=������������������
+ProductType=Desktop
+ProductType[zh_CN]=������
+EditionName=Community
+EditionName[zh_CN]=���������
+MajorVersion=20.1
+MinorVersion=1030
+OsBuild=11031.002
++++++ desktop-version-fallback.patch ++++++
--- /var/tmp/diff_new_pack.bTfzWN/_old 2022-09-01 22:10:56.404206249 +0200
+++ /var/tmp/diff_new_pack.bTfzWN/_new 2022-09-01 22:10:56.408206260 +0200
@@ -1,13 +1,13 @@
-diff -Nur deepin-desktop-base-2021.06.16/Makefile deepin-desktop-base-2021.06.16-new/Makefile
---- deepin-desktop-base-2021.06.16/Makefile 2021-08-08 15:28:37.342881513 +0800
-+++ deepin-desktop-base-2021.06.16-new/Makefile 2021-08-08 15:27:23.042763773 +0800
-@@ -35,6 +35,9 @@
- else ifeq (${ARCH_BUILD}, aarch64)
- sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-arm.in > files/desktop-version
- sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-amd > files/os-version
+diff -Nur deepin-desktop-base-2022.07.26/Makefile deepin-desktop-base-2022.07.26-new/Makefile
+--- deepin-desktop-base-2022.07.26/Makefile 2022-08-29 11:06:18.020875805 +0800
++++ deepin-desktop-base-2022.07.26-new/Makefile 2022-08-29 11:31:13.313767107 +0800
+@@ -39,6 +39,9 @@
+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-riscv.in > files/desktop-version
+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-riscv-server.in > files/desktop-version-server
+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-riscv > files/os-version
+ else
+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version.in > files/desktop-version
-+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-amd > files/os-versio
++ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-amd > files/os-version
endif
install:
++++++ do-not-installl-os-version.patch ++++++
--- /var/tmp/diff_new_pack.bTfzWN/_old 2022-09-01 22:10:56.420206293 +0200
+++ /var/tmp/diff_new_pack.bTfzWN/_new 2022-09-01 22:10:56.424206304 +0200
@@ -1,33 +1,28 @@
-diff -Nur deepin-desktop-base-2021.06.16/Makefile deepin-desktop-base-2021.06.16-new/Makefile
---- deepin-desktop-base-2021.06.16/Makefile 2021-06-16 15:23:10.000000000 +0800
-+++ deepin-desktop-base-2021.06.16-new/Makefile 2021-07-29 21:39:52.803600181 +0800
-@@ -15,7 +15,13 @@
- ifeq (${ARCH_BUILD}, x86_64)
+diff -Nur deepin-desktop-base-2022.07.26/Makefile deepin-desktop-base-2022.07.26-new/Makefile
+--- deepin-desktop-base-2022.07.26/Makefile 2022-08-01 11:20:35.000000000 +0800
++++ deepin-desktop-base-2022.07.26-new/Makefile 2022-08-29 11:06:18.020875805 +0800
+@@ -18,6 +18,12 @@
+ else ifeq (${ARCH_BUILD}, i686)
sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version.in > files/desktop-version
sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-amd > files/os-version
-- else ifeq (${ARCH_BUILD}, x86_32)
-+ else ifeq (${ARCH_BUILD}, i686)
-+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version.in > files/desktop-version
-+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-amd > files/os-version
+ else ifeq (${ARCH_BUILD}, ppc64)
+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version.in > files/desktop-version
+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-amd > files/os-version
+ else ifeq (${ARCH_BUILD}, ppc64le)
- sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version.in > files/desktop-version
- sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-amd > files/os-version
- else ifeq (${ARCH_BUILD}, mipsel)
-@@ -28,9 +34,8 @@
- sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-sw > files/os-version
- else ifeq (${ARCH_BUILD}, aarch64)
- sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-arm.in > files/desktop-version
-- sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-arm > files/os-version
++ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version.in > files/desktop-version
+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-amd > files/os-version
+ else ifeq (${ARCH_BUILD}, mipsel)
+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-loongson.in > files/desktop-version
+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-loongson > files/os-version
+@@ -34,7 +40,6 @@
+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-riscv-server.in > files/desktop-version-server
+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-riscv > files/os-version
endif
- sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/lsb-release.in > files/lsb-release
install:
mkdir -p ${DESTDIR}/etc
-@@ -44,7 +49,6 @@
+@@ -48,7 +53,6 @@
install -Dm644 files/desktop-version ${DESTDIR}/usr/lib/deepin/desktop-version
install -Dm644 files/lsb-release ${DESTDIR}/etc/lsb-release
install -Dm644 files/appstore.json ${DESTDIR}/etc/appstore.json
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package deepin-session-ui for openSUSE:Factory checked in at 2022-09-01 22:10:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/deepin-session-ui (Old)
and /work/SRC/openSUSE:Factory/.deepin-session-ui.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-session-ui"
Thu Sep 1 22:10:03 2022 rev:8 rq:999756 version:5.5.24
Changes:
--------
--- /work/SRC/openSUSE:Factory/deepin-session-ui/deepin-session-ui.changes 2022-04-22 21:55:22.894883070 +0200
+++ /work/SRC/openSUSE:Factory/.deepin-session-ui.new.2083/deepin-session-ui.changes 2022-09-01 22:10:54.432200857 +0200
@@ -1,0 +2,12 @@
+Tue Jun 28 12:36:17 UTC 2022 - Hillwood Yang <hillwood(a)opensuse.org>
+
+- Update version to 5.5.24
+ * Fix a crash bug on wayland
+
+-------------------------------------------------------------------
+Sat May 7 08:12:18 UTC 2022 - Hillwood Yang <hillwood(a)opensuse.org>
+
+- Update version to 5.5.23
+ * Fix bugs
+
+-------------------------------------------------------------------
Old:
----
dde-session-ui-5.5.10.tar.gz
New:
----
dde-session-ui-5.5.24.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deepin-session-ui.spec ++++++
--- /var/tmp/diff_new_pack.XNXfKO/_old 2022-09-01 22:10:55.324203297 +0200
+++ /var/tmp/diff_new_pack.XNXfKO/_new 2022-09-01 22:10:55.324203297 +0200
@@ -19,7 +19,7 @@
%define _name dde-session-ui
Name: deepin-session-ui
-Version: 5.5.10
+Version: 5.5.24
Release: 0
Summary: Deepin desktop-environment - Session UI module
License: GPL-3.0-or-later
++++++ dde-session-ui-5.5.10.tar.gz -> dde-session-ui-5.5.24.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-session-ui-5.5.10/CMakeLists.txt new/dde-session-ui-5.5.24/CMakeLists.txt
--- old/dde-session-ui-5.5.10/CMakeLists.txt 2022-02-14 02:42:24.000000000 +0100
+++ new/dde-session-ui-5.5.24/CMakeLists.txt 2022-05-12 10:37:06.000000000 +0200
@@ -10,7 +10,9 @@
set(CMAKE_CXX_FLAGS "-g -Wall")
# ������������������������
-ADD_DEFINITIONS("-fstack-protector-strong -D_FORTITY_SOURCE=1 -z noexecstack -pie -fPIC -z lazy")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-all -fPIC")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-all -fPIC")
+set(CMAKE_EXE_LINKER_FLAGS "-z relro -z now -z noexecstack -pie")
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -fsanitize=address -O2")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-session-ui-5.5.10/dde-osd/container.cpp new/dde-session-ui-5.5.24/dde-osd/container.cpp
--- old/dde-session-ui-5.5.10/dde-osd/container.cpp 2022-02-14 02:42:24.000000000 +0100
+++ new/dde-session-ui-5.5.24/dde-osd/container.cpp 2022-05-12 10:37:06.000000000 +0200
@@ -34,12 +34,13 @@
#include <QScreen>
#include <DPlatformWindowHandle>
+#include <com_deepin_dde_daemon_dock.h>
#include <com_deepin_daemon_display.h>
#include <com_deepin_daemon_display_monitor.h>
-#include "notification/dbusdockinterface.h"
using DisplayInter = com::deepin::daemon::Display;
using MonitorInter = com::deepin::daemon::display::Monitor;
+using DockInter = com::deepin::dde::daemon::Dock;
DGUI_USE_NAMESPACE
@@ -92,18 +93,17 @@
void Container::moveToCenter()
{
QRect displayRect;
- qreal ratio = qApp->primaryScreen()->devicePixelRatio();
DisplayInter displayInter("com.deepin.daemon.Display", "/com/deepin/daemon/Display", QDBusConnection::sessionBus());
QList<QDBusObjectPath> screenList = displayInter.monitors();
- for (const auto &screen : screenList) {
- MonitorInter monitor("com.deepin.daemon.Display", screen.path(), QDBusConnection::sessionBus());
- QRect monitorRect(monitor.x(), monitor.y(), monitor.width(), monitor.height());
- DBusDockInterface dockInter;
- if (monitor.enabled() && monitorRect.contains(dockInter.geometry())) {
- qDebug() << " screen display : " << screen.path();
- displayRect = QRect(monitorRect.x(), monitorRect.y(),
- monitorRect.width() / ratio, monitorRect.height() / ratio);
+ DockInter dockInter("com.deepin.dde.daemon.Dock", "/com/deepin/dde/daemon/Dock", QDBusConnection::sessionBus(), this);
+ QRect dockRect = dockInter.frontendWindowRect();
+ for (auto *screen : qApp->screens()) {
+ const QRect &screenRect = screen->geometry();
+ const QRect &rect = QRect(screenRect.topLeft(), screenRect.size());
+
+ if (rect.contains(dockRect.topLeft())) {
+ displayRect = rect;
break;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-session-ui-5.5.10/dde-osd/manager.cpp new/dde-session-ui-5.5.24/dde-osd/manager.cpp
--- old/dde-session-ui-5.5.10/dde-osd/manager.cpp 2022-02-14 02:42:24.000000000 +0100
+++ new/dde-session-ui-5.5.24/dde-osd/manager.cpp 2022-05-12 10:37:06.000000000 +0200
@@ -173,29 +173,25 @@
void Manager::updateUI()
{
- if (!m_currentProvider) return;
+ if (!m_currentProvider)
+ return;
- if (m_model->provider() != m_currentProvider) {
- m_model->setProvider(m_currentProvider);
- m_delegate->setProvider(m_currentProvider);
- m_listview->setFlow(m_currentProvider->flow());
- m_listview->setCurrentIndex(m_listview->model()->index(m_currentProvider->currentRow(), 0));
- m_container->setContentsMargins(m_currentProvider->contentMargins());
- m_container->setFixedSize(m_currentProvider->contentSize());
- m_container->moveToCenter();
- }
- if (!m_container->isVisible()) { // ������������������osd���������������������������OSD������������������������������������������������������������������
- m_model->setProvider(m_currentProvider);
- m_listview->setCurrentIndex(m_listview->model()->index(m_currentProvider->currentRow(), 0));
- m_container->setFixedSize(m_currentProvider->contentSize());
- m_container->moveToCenter();
- }
+ m_model->setProvider(m_currentProvider);
+ m_delegate->setProvider(m_currentProvider);
+ m_listview->setFlow(m_currentProvider->flow());
+ m_listview->setCurrentIndex(m_listview->model()->index(m_currentProvider->currentRow(), 0));
+ m_container->setContentsMargins(m_currentProvider->contentMargins());
+ m_container->setFixedSize(m_currentProvider->contentSize());
+ m_container->moveToCenter();
}
void Manager::doneSetting()
{
- if (qApp->queryKeyboardModifiers().testFlag(Qt::MetaModifier)) {
- return m_timer->start();
+ // wayland���meta������MetaModifier������������������������������������������������������������������������Modifier���������������������������
+ if (!QGuiApplication::platformName().startsWith("wayland", Qt::CaseInsensitive)) {
+ if (qApp->queryKeyboardModifiers().testFlag(Qt::MetaModifier)) {
+ return m_timer->start();
+ }
}
m_container->hide();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-session-ui-5.5.10/dde-osd/notification/bubblemanager.cpp new/dde-session-ui-5.5.24/dde-osd/notification/bubblemanager.cpp
--- old/dde-session-ui-5.5.10/dde-osd/notification/bubblemanager.cpp 2022-02-14 02:42:24.000000000 +0100
+++ new/dde-session-ui-5.5.24/dde-osd/notification/bubblemanager.cpp 2022-05-12 10:37:06.000000000 +0200
@@ -70,7 +70,6 @@
, "/com/deepin/daemon/Gesture"
, QDBusConnection::systemBus()
, this))
- , m_dockInter(new DBusDockInterface(this))
, m_trickTimer(new QTimer(this))
{
m_trickTimer->setInterval(300);
@@ -461,8 +460,7 @@
for (const auto &screen : screenList) {
MonitorInter monitor("com.deepin.daemon.Display", screen.path(), QDBusConnection::sessionBus());
QRect monitorRect(monitor.x(), monitor.y(), monitor.width(), monitor.height());
- QRect dockRect(m_dockInter->geometry());
- if (monitor.enabled() && monitorRect.contains(dockRect.center())) {
+ if (monitor.enabled() && monitorRect.contains(m_currentDockRect.center())) {
displayRect = QRect(monitorRect.x(), monitorRect.y(),
monitorRect.width() / ratio, monitorRect.height() / ratio);
break;
@@ -674,7 +672,7 @@
this, SLOT(onPrepareForSleep(bool)));
connect(m_displayInter, &DisplayInter::PrimaryRectChanged, this, &BubbleManager::geometryChanged, Qt::QueuedConnection);
- connect(m_dockInter, &DBusDockInterface::geometryChanged, this, &BubbleManager::geometryChanged, Qt::UniqueConnection);
+ connect(m_dockDeamonInter, &DockInter::FrontendWindowRectChanged, this, &BubbleManager::geometryChanged, Qt::UniqueConnection);
connect(m_dockDeamonInter, &DockInter::serviceValidChanged, this, &BubbleManager::geometryChanged, Qt::UniqueConnection);
connect(qApp, &QApplication::primaryScreenChanged, this, [ = ] {
@@ -722,11 +720,8 @@
void BubbleManager::geometryChanged()
{
+ m_currentDockRect = m_dockDeamonInter->frontendWindowRect();
m_currentDisplayRect = calcDisplayRect();
- // dock������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������
- if (m_dockInter->isValid()) {
- m_currentDockRect = m_dockInter->geometry();
- }
m_dockPos = static_cast<OSD::DockPosition>(m_dockDeamonInter->position());
m_dockMode = m_dockDeamonInter->displayMode();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-session-ui-5.5.10/dde-osd/notification/bubblemanager.h new/dde-session-ui-5.5.24/dde-osd/notification/bubblemanager.h
--- old/dde-session-ui-5.5.10/dde-osd/notification/bubblemanager.h 2022-02-14 02:42:24.000000000 +0100
+++ new/dde-session-ui-5.5.24/dde-osd/notification/bubblemanager.h 2022-05-12 10:37:06.000000000 +0200
@@ -294,7 +294,6 @@
// ���������������������������������������������������������������������������100���������������������������������0������
int m_slideWidth;
GestureInter *m_gestureInter;
- DBusDockInterface *m_dockInter;
QTimer* m_trickTimer; // ������300ms���������������
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-session-ui-5.5.10/dde-osd/notification-center/notifycenterwidget.cpp new/dde-session-ui-5.5.24/dde-osd/notification-center/notifycenterwidget.cpp
--- old/dde-session-ui-5.5.10/dde-osd/notification-center/notifycenterwidget.cpp 2022-02-14 02:42:24.000000000 +0100
+++ new/dde-session-ui-5.5.24/dde-osd/notification-center/notifycenterwidget.cpp 2022-05-12 10:37:06.000000000 +0200
@@ -70,7 +70,7 @@
void NotifyCenterWidget::initUI()
{
m_notifyWidget->setAccessibleName("NotifyWidget");
- setWindowFlags(Qt::FramelessWindowHint | Qt::Tool | Qt::MSWindowsFixedSizeDialogHint | Qt::WindowStaysOnTopHint | Qt::X11BypassWindowManagerHint);
+ setWindowFlags(Qt::FramelessWindowHint | Qt::Tool | Qt::MSWindowsFixedSizeDialogHint | Qt::WindowStaysOnTopHint);
setAttribute(Qt::WA_TranslucentBackground);
setContentsMargins(0, 0, 0, 0);
@@ -171,33 +171,33 @@
int height = screen.height() - Notify::CenterMargin * 2;
if (pos == OSD::DockPosition::Top || pos == OSD::DockPosition::Bottom) {
if(mode == OSD::DockModel::Fashion) {
- height = screen.height() - Notify::CenterMargin * 2 - dock.height();
+ height = screen.height() - Notify::CenterMargin * 2 - dock.height() / m_scale;
if (dock.height() != 0) {
height -= OSD::DockMargin * 2;
}
} else {
- height = screen.height() - Notify::CenterMargin * 2 - dock.height();
+ height = screen.height() - Notify::CenterMargin * 2 - dock.height() / m_scale;
}
}
int x = screen.x() + screen.width() - Notify::CenterWidth - Notify::CenterMargin;
if (pos == OSD::DockPosition::Right) {
if(mode == OSD::DockModel::Fashion) {
- x = screen.x() + screen.width() - (Notify::CenterWidth + dock.width() + OSD::DockMargin * 2 + Notify::CenterMargin);
+ x = screen.x() + screen.width() - (Notify::CenterWidth + dock.width() / m_scale + OSD::DockMargin * 2 + Notify::CenterMargin);
if (dock.width() == 0) {
x += OSD::DockMargin * 2;
}
} else {
- x = screen.x() + screen.width() - (Notify::CenterWidth + dock.width() + Notify::CenterMargin);
+ x = screen.x() + screen.width() - (Notify::CenterWidth + dock.width() / m_scale + Notify::CenterMargin);
}
}
int y = screen.y() + Notify::CenterMargin;
if (pos == OSD::DockPosition::Top) {
if(mode == OSD::DockModel::Fashion) {
- y = screen.y() + Notify::CenterMargin + dock.height() + OSD::DockMargin * 2;
+ y = screen.y() + Notify::CenterMargin + dock.height() / m_scale + OSD::DockMargin * 2;
} else {
- y = screen.y() + Notify::CenterMargin + dock.height();
+ y = screen.y() + Notify::CenterMargin + dock.height() / m_scale;
}
}
@@ -217,7 +217,7 @@
void NotifyCenterWidget::mouseMoveEvent(QMouseEvent *event)
{
Q_UNUSED(event);
- return;
+ return;
}
void NotifyCenterWidget::hideEvent(QHideEvent *event)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-session-ui-5.5.10/dde-touchscreen-dialog/main.cpp new/dde-session-ui-5.5.24/dde-touchscreen-dialog/main.cpp
--- old/dde-session-ui-5.5.10/dde-touchscreen-dialog/main.cpp 2022-02-14 02:42:24.000000000 +0100
+++ new/dde-session-ui-5.5.24/dde-touchscreen-dialog/main.cpp 2022-05-12 10:37:06.000000000 +0200
@@ -4,6 +4,7 @@
#endif
#include <DApplication>
+#include <DLog>
#include <QCommandLineParser>
#include <QDebug>
@@ -12,6 +13,7 @@
#include <com_deepin_daemon_display.h>
DWIDGET_USE_NAMESPACE
+DCORE_USE_NAMESPACE
using namespace com::deepin::daemon;
int main(int argc, char *argv[])
@@ -20,6 +22,10 @@
app.setQuitOnLastWindowClosed(false);
app.setAttribute(Qt::AA_UseHighDpiPixmaps);
app.setQuitOnLastWindowClosed(true);
+ app.setApplicationName("dde-touchscreen-dialog");
+
+ DLogManager::registerConsoleAppender();
+ DLogManager::registerFileAppender();
QTranslator translator;
translator.load("/usr/share/dde-session-ui/translations/dde-session-ui_" +
@@ -35,8 +41,9 @@
const QStringList &posArguments = parser.positionalArguments();
+ qInfo() << posArguments;
if (posArguments.isEmpty()) {
- qDebug() << "empty touchscreen serial number";
+ qDebug() << "empty touchscreen UUID";
return -1;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-session-ui-5.5.10/dde-touchscreen-dialog/monitorindicator.cpp new/dde-session-ui-5.5.24/dde-touchscreen-dialog/monitorindicator.cpp
--- old/dde-session-ui-5.5.10/dde-touchscreen-dialog/monitorindicator.cpp 2022-02-14 02:42:24.000000000 +0100
+++ new/dde-session-ui-5.5.24/dde-touchscreen-dialog/monitorindicator.cpp 2022-05-12 10:37:06.000000000 +0200
@@ -26,38 +26,64 @@
#include "monitorindicator.h"
#include <QPainter>
-#include <QPainterPath>
-#include <QResizeEvent>
-#include <QX11Info>
+#include <QApplication>
+#include <QDebug>
-#include <X11/extensions/shape.h>
-#include <X11/Xregion.h>
+#define LINE_WIDTH 10
MonitorIndicator::MonitorIndicator(QWidget *parent)
- : QFrame(parent)
+ : QFrame(nullptr)
+ , m_topLine(new QFrame(nullptr))
+ , m_bottomLine(new QFrame(nullptr))
+ , m_leftLine(new QFrame(nullptr))
+ , m_rightLine(new QFrame(nullptr))
{
- setAccessibleName("MonitorIndicator");
- setWindowFlags(Qt::SplashScreen | Qt::X11BypassWindowManagerHint);
- setStyleSheet("background-color: #2ca7f8;");
+ Q_UNUSED(parent)
+ QFrame::setVisible(false);
+
+ QPalette pal = QPalette();
+ pal.setColor(QPalette::Window, QColor("#2ca7f8"));
+
+ m_topLine->setWindowFlags(Qt::CoverWindow | Qt::WindowStaysOnTopHint | Qt::SplashScreen | Qt::FramelessWindowHint | Qt::X11BypassWindowManagerHint);
+ m_topLine->setAutoFillBackground(true);
+ m_topLine->setPalette(pal);
+
+ m_bottomLine->setWindowFlags(Qt::CoverWindow | Qt::WindowStaysOnTopHint | Qt::SplashScreen | Qt::FramelessWindowHint | Qt::X11BypassWindowManagerHint);
+ m_bottomLine->setAutoFillBackground(true);
+ m_bottomLine->setPalette(pal);
+
+ m_leftLine->setWindowFlags(Qt::CoverWindow | Qt::WindowStaysOnTopHint | Qt::SplashScreen | Qt::FramelessWindowHint | Qt::X11BypassWindowManagerHint);
+ m_leftLine->setAutoFillBackground(true);
+ m_leftLine->setPalette(pal);
+
+ m_rightLine->setWindowFlags(Qt::CoverWindow | Qt::WindowStaysOnTopHint | Qt::SplashScreen | Qt::FramelessWindowHint | Qt::X11BypassWindowManagerHint);
+ m_rightLine->setAutoFillBackground(true);
+ m_rightLine->setPalette(pal);
}
-void MonitorIndicator::resizeEvent(QResizeEvent *e)
+MonitorIndicator::~MonitorIndicator()
{
- QFrame::resizeEvent(e);
+ delete m_topLine;
+ delete m_bottomLine;
+ delete m_leftLine;
+ delete m_rightLine;
+}
- XRectangle rectangle;
- rectangle.x = 0;
- rectangle.y = 0;
- rectangle.width = static_cast<ushort>(e->size().width());
- rectangle.height = static_cast<ushort>(e->size().height());
-
- // need to restore the cut area, if not,cut out will be repeated.
- XShapeCombineRectangles(QX11Info::display(), winId(), ShapeBounding, 0, 0, &rectangle, 1, ShapeSet, YXBanded);
-
- rectangle.x = 10;
- rectangle.y = 10;
- rectangle.width = static_cast<ushort>(e->size().width()) - 20;
- rectangle.height = static_cast<ushort>(e->size().height()) - 20;
+void MonitorIndicator::setVisible(bool visible)
+{
+ updateGeometry();
+ m_topLine->setVisible(visible);
+ m_bottomLine->setVisible(visible);
+ m_leftLine->setVisible(visible);
+ m_rightLine->setVisible(visible);
+}
- XShapeCombineRectangles(QX11Info::display(), winId(), ShapeBounding, 0, 0, &rectangle, 1, ShapeSubtract, YXBanded);
+void MonitorIndicator::updateGeometry()
+{
+ QPoint topLeft = mapToGlobal(QPoint(0,0));
+ int lineWidth = static_cast<int>(LINE_WIDTH / qApp->devicePixelRatio());
+ m_topLine->setGeometry(topLeft.x(), topLeft.y(), width(), lineWidth);
+ m_bottomLine->setGeometry(topLeft.x(), topLeft.y() + height() - lineWidth, width(), lineWidth);
+ m_rightLine->setGeometry(topLeft.x() + width() - lineWidth, topLeft.y(), lineWidth, height());
+ m_leftLine->setGeometry(topLeft.x(), topLeft.y(), lineWidth, height());
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-session-ui-5.5.10/dde-touchscreen-dialog/monitorindicator.h new/dde-session-ui-5.5.24/dde-touchscreen-dialog/monitorindicator.h
--- old/dde-session-ui-5.5.10/dde-touchscreen-dialog/monitorindicator.h 2022-02-14 02:42:24.000000000 +0100
+++ new/dde-session-ui-5.5.24/dde-touchscreen-dialog/monitorindicator.h 2022-05-12 10:37:06.000000000 +0200
@@ -27,7 +27,6 @@
#define MONITORFULLWIDGET_H
#include <DPlatformWindowHandle>
-#include <DWindowManagerHelper>
#include <QFrame>
DWIDGET_USE_NAMESPACE
@@ -38,9 +37,20 @@
public:
explicit MonitorIndicator(QWidget *parent = 0);
+ ~MonitorIndicator() override;
-protected:
- void resizeEvent(QResizeEvent *e);
+public Q_SLOTS:
+
+ virtual void setVisible(bool visible);
+
+private:
+ void updateGeometry();
+
+private:
+ QFrame *m_topLine;
+ QFrame *m_bottomLine;
+ QFrame *m_leftLine;
+ QFrame *m_rightLine;
};
#endif // MONITORFULLWIDGET_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-session-ui-5.5.10/dde-touchscreen-dialog/touchscreensetting.cpp new/dde-session-ui-5.5.24/dde-touchscreen-dialog/touchscreensetting.cpp
--- old/dde-session-ui-5.5.10/dde-touchscreen-dialog/touchscreensetting.cpp 2022-02-14 02:42:24.000000000 +0100
+++ new/dde-session-ui-5.5.24/dde-touchscreen-dialog/touchscreensetting.cpp 2022-05-12 10:37:06.000000000 +0200
@@ -57,7 +57,7 @@
connect(m_displayInter, &Display::MonitorsChanged, this, &TouchscreenSetting::onMonitorChanged);
connect(this, &DDialog::buttonClicked, this, &TouchscreenSetting::onButtonClicked);
- connect(this, &TouchscreenSetting::requestAssociateTouch, m_displayInter, &Display::AssociateTouch);
+ connect(this, &TouchscreenSetting::requestAssociateTouch, m_displayInter, &Display::AssociateTouchByUUID);
connect(m_listCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(markDisplay(int)));
onMonitorChanged();
@@ -132,9 +132,15 @@
void TouchscreenSetting::markDisplay(int index)
{
- m_monitorIndicator->setGeometry(QRect(m_monitors[index]->x(), m_monitors[index]->y(), m_monitors[index]->width(), m_monitors[0]->height()));
- m_monitorIndicator->show();
+ Monitor *currentMonitor = m_monitors[index];
+ if (!currentMonitor) {
+ qWarning() << "current monitor is null: " << index;
+ return;
+ }
+
+ m_monitorIndicator->setGeometry(QRect(currentMonitor->x(), currentMonitor->y(), currentMonitor->width(), currentMonitor->height()));
+ m_monitorIndicator->setVisible(true);
QTimer::singleShot(300, this, [ = ] {
- m_monitorIndicator->hide();
+ m_monitorIndicator->setVisible(false);
});
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-session-ui-5.5.10/dnetwork-secret-dialog/networksecretdialog.cpp new/dde-session-ui-5.5.24/dnetwork-secret-dialog/networksecretdialog.cpp
--- old/dde-session-ui-5.5.10/dnetwork-secret-dialog/networksecretdialog.cpp 2022-02-14 02:42:24.000000000 +0100
+++ new/dde-session-ui-5.5.24/dnetwork-secret-dialog/networksecretdialog.cpp 2022-05-12 10:37:06.000000000 +0200
@@ -39,30 +39,28 @@
{"pppoe", "network-wired"},
};
-const QMap<QString, QString> SECRET_KEY_STR_MAP = {
- {"psk", QObject::tr("Password")},
- {"wep-key0", QObject::tr("Key")},
- {"wep-key1", QObject::tr("Key")},
- {"wep-key2", QObject::tr("Key")},
- {"wep-key3", QObject::tr("key")},
- {"leap-password", "unknown"},
- {"password", QObject::tr("Password")},
- {"password-raw", "unknown"},
- {"ca-cert-password", "unknown"},
- {"client-cert-password", "unknown"},
- {"phase2-ca-cert-password", "unknown"},
- {"phase2-client-cert-password", "unknown"},
- {"private-key-password", QObject::tr("Private Pwd")},
- {"phase2-private-key-password", "unknown"},
- {"pin", "unknown"},
- {"proxy-password", QObject::tr("Proxy Password")},
- {"IPSec secret", QObject::tr("Password")},
- {"Xauth password", QObject::tr("Group Password")},
-};
-
NetworkSecretDialog::NetworkSecretDialog(QJsonDocument jsonDoc, QWidget *parent)
: DDialog(parent)
- , m_secretKeyStrMap(SECRET_KEY_STR_MAP)
+ , m_secretKeyStrMap({
+ { "psk", tr("Password") },
+ { "wep-key0", tr("Key") },
+ { "wep-key1", tr("Key") },
+ { "wep-key2", tr("Key") },
+ { "wep-key3", tr("key") },
+ { "leap-password", "unknown" },
+ { "password", tr("Password") },
+ { "password-raw", "unknown" },
+ { "ca-cert-password", "unknown" },
+ { "client-cert-password", "unknown" },
+ { "phase2-ca-cert-password", "unknown" },
+ { "phase2-client-cert-password", "unknown" },
+ { "private-key-password", tr("Private Pwd") },
+ { "phase2-private-key-password", "unknown" },
+ { "pin", "unknown" },
+ { "proxy-password", tr("Proxy Password") },
+ { "IPSec secret", tr("Password") },
+ { "Xauth password", tr("Group Password") },
+ })
{
m_allInputValid = false;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-session-ui-5.5.10/dnetwork-secret-dialog/networksecretdialog.h new/dde-session-ui-5.5.24/dnetwork-secret-dialog/networksecretdialog.h
--- old/dde-session-ui-5.5.10/dnetwork-secret-dialog/networksecretdialog.h 2022-02-14 02:42:24.000000000 +0100
+++ new/dde-session-ui-5.5.24/dnetwork-secret-dialog/networksecretdialog.h 2022-05-12 10:37:06.000000000 +0200
@@ -53,7 +53,7 @@
private:
QJsonObject m_jsonObj;
- QMap<QString, QString> m_secretKeyStrMap;
+ const QMap<QString, QString> m_secretKeyStrMap;
QString m_connName;
QString m_connType;
QString m_connSettingName;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-session-ui-5.5.10/rpm/dde-session-ui.spec new/dde-session-ui-5.5.24/rpm/dde-session-ui.spec
--- old/dde-session-ui-5.5.10/rpm/dde-session-ui.spec 2022-02-14 02:42:24.000000000 +0100
+++ new/dde-session-ui-5.5.24/rpm/dde-session-ui.spec 2022-05-12 10:37:06.000000000 +0200
@@ -6,6 +6,7 @@
URL: https://github.com/linuxdeepin/%{name}
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: deepin-gettext-tools
BuildRequires: pkgconfig(dtkwidget) >= 5.1
@@ -66,7 +67,7 @@
%build
export PATH=%{_qt5_bindir}:$PATH
-%qmake_qt5 PREFIX=%{_prefix} PKGTYPE=rpm
+%cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=%{_arch} .
%make_build
%install
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-session-ui-5.5.10/tests/test-recoverage.sh new/dde-session-ui-5.5.24/tests/test-recoverage.sh
--- old/dde-session-ui-5.5.10/tests/test-recoverage.sh 2022-02-14 02:42:24.000000000 +0100
+++ new/dde-session-ui-5.5.24/tests/test-recoverage.sh 2022-05-12 10:37:06.000000000 +0200
@@ -1,6 +1,7 @@
#!/bin/bash
-BUILD_DIR=build
+BUILD_DIR=build-ut
+HTML_DIR=html
REPORT_DIR=report
# ������������
@@ -30,7 +31,7 @@
for target in ${targets[*]}; do
# ������������������������
- ./ut-${target} --gtest_output=xml:test_report_${target}.xml
+ ./ut-${target} --gtest_output=xml:./$REPORT_DIR/ut-report_${target}.xml
mv asan_${target}.log* asan_${target}.log
done
@@ -39,5 +40,6 @@
lcov --remove ./coverage.info "*/tests/*" "*/usr/include*" "*build/src*" "*persistence.cpp*" "*notifications_dbus_adaptor.cpp*" "*notifysettings.cpp*" "*dbuslogin1manager.cpp*" "*persistence.h*" "*notifysettings.h*" "*dbuslogin1manager.h*" "*dbusdockinterface.h*" "*dbus_daemon_interface.h*" "*dbus_daemon_interface.cpp*" "*/global_util/dbus/*" "*/global_util/xkbparser*" "*icondata.h*" "*icondata.cpp*" "*kblayoutindicator.h*" "*kblayoutindicator.cpp*" -o ./coverage.info
# ������html
-cd .. || return
-genhtml -o tests/$REPORT_DIR $BUILD_DIR/coverage.info
+genhtml -o ./$HTML_DIR ./coverage.info
+
+mv ./$HTML_DIR/index.html $HTML_DIR/cov_dde-session-ui.html
\ No newline at end of file
++++++ fix-library-path.patch ++++++
--- /var/tmp/diff_new_pack.XNXfKO/_old 2022-09-01 22:10:55.512203810 +0200
+++ /var/tmp/diff_new_pack.XNXfKO/_new 2022-09-01 22:10:55.516203821 +0200
@@ -1,6 +1,6 @@
-diff -Nur dde-session-ui-5.5.10/CMakeLists.txt dde-session-ui-5.5.10-new/CMakeLists.txt
---- dde-session-ui-5.5.10/CMakeLists.txt 2022-02-14 09:42:24.000000000 +0800
-+++ dde-session-ui-5.5.10-new/CMakeLists.txt 2022-04-06 20:35:26.242567752 +0800
+diff -Nur dde-session-ui-5.5.23/CMakeLists.txt dde-session-ui-5.5.23-new/CMakeLists.txt
+--- dde-session-ui-5.5.23/CMakeLists.txt 2022-04-22 18:40:04.000000000 +0800
++++ dde-session-ui-5.5.23-new/CMakeLists.txt 2022-05-07 09:43:31.098553885 +0800
@@ -9,6 +9,8 @@
set(CMAKE_AUTORCC ON)
set(CMAKE_CXX_FLAGS "-g -Wall")
@@ -8,9 +8,9 @@
+link_directories(${LIBRARY_OUTPUT_PATH})
+
# ������������������������
- ADD_DEFINITIONS("-fstack-protector-strong -D_FORTITY_SOURCE=1 -z noexecstack -pie -fPIC -z lazy")
-
-@@ -329,7 +331,7 @@
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-all -fPIC")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-all -fPIC")
+@@ -331,7 +333,7 @@
)
## bin
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package deepin-session-shell for openSUSE:Factory checked in at 2022-09-01 22:10:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/deepin-session-shell (Old)
and /work/SRC/openSUSE:Factory/.deepin-session-shell.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-session-shell"
Thu Sep 1 22:10:03 2022 rev:6 rq:999755 version:5.5.48
Changes:
--------
--- /work/SRC/openSUSE:Factory/deepin-session-shell/deepin-session-shell.changes 2022-04-22 21:54:44.458839273 +0200
+++ /work/SRC/openSUSE:Factory/.deepin-session-shell.new.2083/deepin-session-shell.changes 2022-09-01 22:10:53.156197367 +0200
@@ -1,0 +2,17 @@
+Wed Jun 29 09:03:08 UTC 2022 - Hillwood Yang <hillwood(a)opensuse.org>
+
+- Update version to 5.5.48
+ * Fix bugs
+- Add remove-invalid-dependence.patch
+
+-------------------------------------------------------------------
+Sun May 8 11:28:48 UTC 2022 - Hillwood Yang <hillwood(a)opensuse.org>
+
+- Update version to 5.5.31
+ * Optimize wayland support
+ * Fix bugs
+ * Add info log
+ * Support disable logout button
+ * Add configuration of screen keyboard
+
+-------------------------------------------------------------------
Old:
----
dde-session-shell-5.5.24.tar.gz
New:
----
dde-session-shell-5.5.48.tar.gz
remove-invalid-dependence.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deepin-session-shell.spec ++++++
--- /var/tmp/diff_new_pack.7bpzDb/_old 2022-09-01 22:10:54.060199839 +0200
+++ /var/tmp/diff_new_pack.7bpzDb/_new 2022-09-01 22:10:54.064199850 +0200
@@ -1,8 +1,8 @@
#
# spec file for package deepin-session-shell
#
-# Copyright (c) 2021 SUSE LINUX GmbH, Nuernberg, Germany.
-# Copyright (c) 2021 Hillwood Yang <hillwood(a)opensuse.org>
+# Copyright (c) 2022 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2022 Hillwood Yang <hillwood(a)opensuse.org>
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,13 +19,16 @@
%define _name dde-session-shell
Name: deepin-session-shell
-Version: 5.5.24
+Version: 5.5.48
Release: 0
Summary: Deepin desktop-environment - Session UI Shell
License: GPL-3.0+
URL: https://github.com/linuxdeepin/dde-session-shell
Source0: https://github.com/linuxdeepin/dde-session-shell/archive/%{version}/%{_name…
Source1: https://github.com/linuxdeepin/startdde/raw/master/misc/lightdm.conf
+# PATCH-FOR-OPENSUSE remove-invalid-dependence.patch hillwood(a)opensuse.org
+# https://github.com/linuxdeepin/developer-center/issues/3266
+Patch0: remove-invalid-dependence.patch
Group: System/GUI/Other
BuildRequires: gtest
BuildRequires: update-desktop-files
@@ -39,6 +42,7 @@
%endif
BuildRequires: pkgconfig(dtkwidget) >= 5.5.0
BuildRequires: libdframeworkdbus-devel >= 5.4.20
+BuildRequires: cmake(KF5Wayland)
BuildRequires: pkgconfig(dde-dock)
BuildRequires: pkgconfig(gsettings-qt)
BuildRequires: pkgconfig(gtk+-2.0)
@@ -106,6 +110,9 @@
sed -i 's|backgrounds/deepin/desktop.jpg|wallpapers/openSUSEdefault/contents/images/1920x1080.jpg|g' \
src/session-widgets/lockcontent.cpp
cp %{_datadir}/icons/hicolor/scalable/apps/openSUSE-distributor-logo.svg src/widgets/img/logo.svg
+sed -i "/PIXMAP_WIDTH/s|128|284|" src/widgets/logowidget.cpp
+sed -i "/PIXMAP_HEIGHT/s|132|396|" src/widgets/logowidget.cpp
+sed -i "s|KF5/KWayland/Client|KF5/KWayland/KWayland/Client|g" src/global_util/keyboardmonitor/keyboardplantform_wayland.cpp
%build
%cmake
@@ -131,8 +138,11 @@
%dir %{_datadir}/deepin-authentication/privileges
%{_datadir}/deepin-authentication/privileges/lightdm-deepin-greeter.conf
%dir %{_datadir}/dsg
-%dir %{_datadir}/dsg/apps/
-%{_datadir}/dsg/apps/dde-lock
+%dir %{_datadir}/dsg/configs
+%dir %{_datadir}/dsg/configs/org.deepin.dde.lightdm-deepin-greeter
+%dir %{_datadir}/dsg/configs/org.deepin.dde.lock
+%{_datadir}/dsg/configs/org.deepin.dde.lightdm-deepin-greeter/org.deepin.dde.lightdm-deepin-greeter.json
+%{_datadir}/dsg/configs/org.deepin.dde.lock/org.deepin.dde.lock.json
%files -n lightdm-deepin-greeter
%license LICENSE
@@ -141,12 +151,9 @@
%{_bindir}/lightdm-deepin-greeter
%{_sysconfdir}/deepin/greeters.d/lightdm-deepin-greeter
%{_sysconfdir}/deepin/greeters.d/10-cursor-theme
-# %dir %{_datadir}/lightdm
-# %dir %{_datadir}/lightdm/lightdm.conf.d
%{_datadir}/lightdm/lightdm.conf.d/60-deepin.conf
%dir %{_datadir}/xgreeters
%{_datadir}/xgreeters/lightdm-deepin-greeter.desktop
-%{_datadir}/dsg/apps/lightdm-deepin-greeter
%files devel
%{_includedir}/%{_name}
++++++ dde-session-shell-5.5.24.tar.gz -> dde-session-shell-5.5.48.tar.gz ++++++
++++ 6539 lines of diff (skipped)
++++++ remove-invalid-dependence.patch ++++++
diff -Nurp dde-session-shell-5.5.48/CMakeLists.txt dde-session-shell-5.5.48-new/CMakeLists.txt
--- dde-session-shell-5.5.48/CMakeLists.txt 2022-06-09 13:30:20.000000000 +0800
+++ dde-session-shell-5.5.48-new/CMakeLists.txt 2022-06-29 16:08:16.802382355 +0800
@@ -72,6 +72,22 @@ set(Qt_LIBS
Qt5::Svg
)
+try_compile(USE_DEEPIN_WAYLAND
+ ${CMAKE_CURRENT_BINARY_DIR}/try_compile
+ SOURCES
+ ${CMAKE_CURRENT_SOURCE_DIR}/tests/wayland_test.cc
+ LINK_LIBRARIES
+ ${Qt_LIBS}
+ ${Qt5Widgets_LIBRARIES}
+ KF5::WaylandClient
+)
+
+message(STATUS "USE_DEEPIN_WAYLAND ${USE_DEEPIN_WAYLAND}")
+
+if(USE_DEEPIN_WAYLAND)
+ add_definitions(-DUSE_DEEPIN_WAYLAND)
+endif()
+
function(generation_dbus_interface xml class_name class_file option)
execute_process(COMMAND qdbusxml2cpp ${option} -p ${class_file} -c ${class_name} ${xml}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
@@ -109,10 +125,10 @@ include_directories(${PROJECT_SOURCE_DIR
aux_source_directory(${PROJECT_SOURCE_DIR}/src/global_util GLOBAL_UTILS)
aux_source_directory(${PROJECT_SOURCE_DIR}/src/global_util/dbus GLOBAL_UTILS_DBUS)
-aux_source_directory(${PROJECT_SOURCE_DIR}/src/global_util/keyboardmonitor GLOBAL_UTILS_KEYBOARDMONITOR)
aux_source_directory(${PROJECT_SOURCE_DIR}/src/widgets WIDGETS)
aux_source_directory(${PROJECT_SOURCE_DIR}/src/session-widgets SESSION_WIDGETS)
aux_source_directory(${PROJECT_SOURCE_DIR}/src/libdde-auth AUTHENTICATE)
+aux_source_directory(${PROJECT_SOURCE_DIR}/src/global_util/keyboardmonitor GLOBAL_UTILS_KEYBOARDMONITOR)
aux_source_directory(${PROJECT_SOURCE_DIR}/interface INTERFACE)
set(QRCS
diff -Nurp dde-session-shell-5.5.48/src/global_util/keyboardmonitor/keyboardmonitor.cpp dde-session-shell-5.5.48-new/src/global_util/keyboardmonitor/keyboardmonitor.cpp
--- dde-session-shell-5.5.48/src/global_util/keyboardmonitor/keyboardmonitor.cpp 2022-06-09 13:30:20.000000000 +0800
+++ dde-session-shell-5.5.48-new/src/global_util/keyboardmonitor/keyboardmonitor.cpp 2022-06-29 16:08:16.802382355 +0800
@@ -35,7 +35,9 @@ KeyboardMonitor::KeyboardMonitor() : QTh
if (DGuiApplicationHelper::isXWindowPlatform()) {
keyBoardPlatform = new KeyboardPlantformX11();
} else {
+#ifdef USE_DEEPIN_WAYLAND
keyBoardPlatform = new KeyboardPlantformWayland();
+#endif
}
connect(keyBoardPlatform, &KeyBoardPlatform::capslockStatusChanged, this, &KeyboardMonitor::capslockStatusChanged);
connect(keyBoardPlatform, &KeyBoardPlatform::numlockStatusChanged, this, &KeyboardMonitor::numlockStatusChanged);
diff -Nurp dde-session-shell-5.5.48/src/global_util/keyboardmonitor/keyboardmonitor.h dde-session-shell-5.5.48-new/src/global_util/keyboardmonitor/keyboardmonitor.h
--- dde-session-shell-5.5.48/src/global_util/keyboardmonitor/keyboardmonitor.h 2022-06-09 13:30:20.000000000 +0800
+++ dde-session-shell-5.5.48-new/src/global_util/keyboardmonitor/keyboardmonitor.h 2022-06-29 16:08:16.802382355 +0800
@@ -30,7 +30,9 @@
#include <QThread>
#include "keyboardplantform_x11.h"
+#ifdef USE_DEEPIN_WAYLAND
#include "keyboardplantform_wayland.h"
+#endif
class KeyboardMonitor : public QThread
{
diff -Nurp dde-session-shell-5.5.48/src/global_util/keyboardmonitor/keyboardplantform_wayland.cpp dde-session-shell-5.5.48-new/src/global_util/keyboardmonitor/keyboardplantform_wayland.cpp
--- dde-session-shell-5.5.48/src/global_util/keyboardmonitor/keyboardplantform_wayland.cpp 2022-06-09 13:30:20.000000000 +0800
+++ dde-session-shell-5.5.48-new/src/global_util/keyboardmonitor/keyboardplantform_wayland.cpp 2022-06-29 16:08:16.802382355 +0800
@@ -23,6 +23,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifdef USE_DEEPIN_WAYLAND
#include "keyboardplantform_wayland.h"
#include <stdio.h>
@@ -137,3 +138,4 @@ void KeyboardPlantformWayland::setupRegi
registry->create(m_connectionThreadObject);
registry->setup();
}
+#endif
diff -Nurp dde-session-shell-5.5.48/src/global_util/keyboardmonitor/keyboardplantform_wayland.h dde-session-shell-5.5.48-new/src/global_util/keyboardmonitor/keyboardplantform_wayland.h
--- dde-session-shell-5.5.48/src/global_util/keyboardmonitor/keyboardplantform_wayland.h 2022-06-09 13:30:20.000000000 +0800
+++ dde-session-shell-5.5.48-new/src/global_util/keyboardmonitor/keyboardplantform_wayland.h 2022-06-29 16:08:16.802382355 +0800
@@ -22,6 +22,8 @@
#ifndef KEYBOARDPLANTFORM_WAYLAND_H
#define KEYBOARDPLANTFORM_WAYLAND_H
+#ifdef USE_DEEPIN_WAYLAND
+
#include "keyboardplatform.h"
class QThread;
@@ -68,4 +70,6 @@ private:
bool m_numLockOn;
};
+#endif
+
#endif // KEYBOARDPLANTFORM_WAYLAND_H
diff -Nurp dde-session-shell-5.5.48/tests/dde-lock/ut_keyboardplantformwayland.cpp dde-session-shell-5.5.48-new/tests/dde-lock/ut_keyboardplantformwayland.cpp
--- dde-session-shell-5.5.48/tests/dde-lock/ut_keyboardplantformwayland.cpp 2022-06-09 13:30:20.000000000 +0800
+++ dde-session-shell-5.5.48-new/tests/dde-lock/ut_keyboardplantformwayland.cpp 2022-06-29 16:08:16.802382355 +0800
@@ -2,6 +2,7 @@
#include <gtest/gtest.h>
+#ifdef USE_DEEPIN_WAYLAND
class UT_KeyboardPlantformWayland : public testing::Test
{
protected:
@@ -27,3 +28,4 @@ TEST_F(UT_KeyboardPlantformWayland, basi
m_keyboard->isNumlockOn();
m_keyboard->setNumlockStatus(false);
}
+#endif
diff -Nurp dde-session-shell-5.5.48/tests/wayland_test.cc dde-session-shell-5.5.48-new/tests/wayland_test.cc
--- dde-session-shell-5.5.48/tests/wayland_test.cc 1970-01-01 08:00:00.000000000 +0800
+++ dde-session-shell-5.5.48-new/tests/wayland_test.cc 2022-06-29 16:43:22.360728930 +0800
@@ -0,0 +1,7 @@
+#include <KF5/KWayland/KWayland/Client/ddeseat.h>
+
+int main(int argc, char *argv[])
+{
+
+ return 0;
+}
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package deepin-file-manager for openSUSE:Factory checked in at 2022-09-01 22:10:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/deepin-file-manager (Old)
and /work/SRC/openSUSE:Factory/.deepin-file-manager.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-file-manager"
Thu Sep 1 22:10:01 2022 rev:9 rq:999754 version:5.6.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/deepin-file-manager/deepin-file-manager.changes 2022-06-03 14:17:10.625356306 +0200
+++ /work/SRC/openSUSE:Factory/.deepin-file-manager.new.2083/deepin-file-manager.changes 2022-09-01 22:10:52.040194316 +0200
@@ -1,0 +2,9 @@
+Wed Jun 29 02:24:30 UTC 2022 - Hillwood Yang <hillwood(a)opensuse.org>
+
+- Update version to 5.6.4
+ * Optimize text box length
+ * Optimize draging for list mode
+ * Fix bugs
+ * Update translations
+
+-------------------------------------------------------------------
Old:
----
dde-file-manager-5.5.10.tar.gz
New:
----
dde-file-manager-5.6.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deepin-file-manager.spec ++++++
--- /var/tmp/diff_new_pack.mhTLtR/_old 2022-09-01 22:10:52.904196678 +0200
+++ /var/tmp/diff_new_pack.mhTLtR/_new 2022-09-01 22:10:52.908196689 +0200
@@ -20,7 +20,7 @@
%define sover 5
Name: deepin-file-manager
-Version: 5.5.10
+Version: 5.6.4
Release: 0
Summary: Deepin File Manager
License: GPL-3.0-or-later AND MIT
@@ -30,9 +30,9 @@
Source1: deepin-file-dbus-installer.in
Source2: deepin-file-polkit-installer.in
# PATCH-FIX-UPSTEAM fix-header-include.patch hillwood(a)opensuse.org - dfsearch is necessary
-Patch2: fix-header-include.patch
+Patch1: fix-header-include.patch
# PATCH-FIX-UPSTEAM gcc12.patch hillwood(a)opensuse.org - fix gcc 12 build
-Patch4: gcc-12.patch
+Patch2: gcc-12.patch
Patch3: harden_dde-filemanager-daemon.service.patch
%ifarch ppc ppc64 ppc64le s390 s390x
BuildRequires: deepin-desktop-base
++++++ dde-file-manager-5.5.10.tar.gz -> dde-file-manager-5.6.4.tar.gz ++++++
/work/SRC/openSUSE:Factory/deepin-file-manager/dde-file-manager-5.5.10.tar.gz /work/SRC/openSUSE:Factory/.deepin-file-manager.new.2083/dde-file-manager-5.6.4.tar.gz differ: char 18, line 1
1
0