-
-
Notifications
You must be signed in to change notification settings - Fork 12.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
deepin.dde-control-center: init at 5.6.3 #219121
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
140 changes: 140 additions & 0 deletions
140
pkgs/desktops/deepin/core/dde-control-center/default.nix
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,140 @@ | ||
{ stdenv | ||
, lib | ||
, fetchFromGitHub | ||
, fetchpatch | ||
, dtkwidget | ||
, qt5integration | ||
, qt5platform-plugins | ||
, dde-qt-dbus-factory | ||
, deepin-pw-check | ||
, udisks2-qt5 | ||
, cmake | ||
, qttools | ||
, qtbase | ||
, pkg-config | ||
, qtx11extras | ||
, qtmultimedia | ||
, wrapQtAppsHook | ||
, wrapGAppsHook | ||
, gsettings-qt | ||
, wayland | ||
, kwayland | ||
, qtwayland | ||
, polkit-qt | ||
, pcre | ||
, xorg | ||
, libselinux | ||
, libsepol | ||
, libxcrypt | ||
, librsvg | ||
, networkmanager-qt | ||
, glib | ||
, runtimeShell | ||
, tzdata | ||
, dbus | ||
, gtest | ||
}: | ||
|
||
stdenv.mkDerivation rec { | ||
pname = "dde-control-center"; | ||
version = "5.6.3"; | ||
|
||
src = fetchFromGitHub { | ||
owner = "linuxdeepin"; | ||
repo = pname; | ||
rev = version; | ||
sha256 = "sha256-/gzS+IbopIDRpufsa9cEfFBOqehPUnF4IozvwW8UEbY="; | ||
}; | ||
|
||
patches = [ | ||
# UserExperienceProgramLicenseAgreement comes from a non-open source component(deepin-deepinid-client) | ||
# If we don't block it, only an empty page will be displayed here | ||
# Remove this patch when dde-control-center is upgraded to 6.0.0 | ||
./dont-show-endUserLicenseAgreement-for-deepinos.patch | ||
]; | ||
|
||
postPatch = '' | ||
substituteInPlace src/frame/window/{mainwindow.cpp,insertplugin.cpp} com.deepin.controlcenter.develop.policy \ | ||
--replace "/usr/lib/dde-control-center" "/run/current-system/sw/lib/dde-control-center" | ||
|
||
substituteInPlace src/frame/modules/datetime/timezone_dialog/timezone.cpp \ | ||
--replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" | ||
|
||
substituteInPlace src/frame/modules/accounts/accountsworker.cpp \ | ||
--replace "/bin/bash" "${runtimeShell}" | ||
|
||
substituteInPlace dde-control-center-autostart.desktop \ | ||
--replace "/usr" "$out" | ||
|
||
substituteInPlace com.deepin.dde.ControlCenter.service \ | ||
--replace "/usr/bin/dbus-send" "${dbus}/bin/dbus-send" \ | ||
--replace "/usr/share" "$out/share" | ||
|
||
substituteInPlace include/widgets/utils.h src/{reboot-reminder-dialog/main.cpp,frame/main.cpp,reset-password-dialog/main.cpp} \ | ||
--replace "/usr/share/dde-control-center" "$out/share/dde-control-center" | ||
|
||
substituteInPlace dde-control-center-wapper \ | ||
--replace "qdbus" "${qttools.bin}/bin/qdbus" \ | ||
--replace "/usr/share" "$out/share" | ||
''; | ||
|
||
nativeBuildInputs = [ | ||
cmake | ||
qttools | ||
pkg-config | ||
wrapQtAppsHook | ||
wrapGAppsHook | ||
]; | ||
dontWrapGApps = true; | ||
|
||
buildInputs = [ | ||
dtkwidget | ||
qt5platform-plugins | ||
dde-qt-dbus-factory | ||
deepin-pw-check | ||
qtbase | ||
qtx11extras | ||
qtmultimedia | ||
gsettings-qt | ||
udisks2-qt5 | ||
wayland | ||
kwayland | ||
qtwayland | ||
polkit-qt | ||
pcre | ||
xorg.libXdmcp | ||
libselinux | ||
libsepol | ||
libxcrypt | ||
librsvg | ||
networkmanager-qt | ||
gtest | ||
]; | ||
|
||
cmakeFlags = [ | ||
"-DCVERSION=${version}" | ||
"-DDISABLE_AUTHENTICATION=YES" | ||
"-DDISABLE_ACTIVATOR=YES" | ||
"-DDISABLE_SYS_UPDATE=YES" | ||
"-DDISABLE_RECOVERY=YES" | ||
]; | ||
|
||
# qt5integration must be placed before qtsvg in QT_PLUGIN_PATH | ||
qtWrapperArgs = [ | ||
"--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" | ||
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ librsvg ]}" | ||
]; | ||
|
||
preFixup = '' | ||
glib-compile-schemas ${glib.makeSchemaPath "$out" "${pname}-${version}"} | ||
qtWrapperArgs+=("''${gappsWrapperArgs[@]}") | ||
''; | ||
|
||
meta = with lib; { | ||
description = "Control panel of Deepin Desktop Environment"; | ||
homepage = "https://github.com/linuxdeepin/dde-control-center"; | ||
license = licenses.gpl3Plus; | ||
platforms = platforms.linux; | ||
maintainers = teams.deepin.members; | ||
}; | ||
} |
29 changes: 29 additions & 0 deletions
29
...ktops/deepin/core/dde-control-center/dont-show-endUserLicenseAgreement-for-deepinos.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
From adcc5eb58e2dcd06810a40c237bc7984c2c5af4b Mon Sep 17 00:00:00 2001 | ||
From: rewine <luhongxu@deepin.org> | ||
Date: Sun, 8 Jan 2023 13:46:17 +0800 | ||
Subject: [PATCH] dont show endUserLicenseAgreement for deepinos | ||
|
||
--- | ||
src/frame/window/modules/systeminfo/systeminfowidget.cpp | 6 ++++++ | ||
1 file changed, 6 insertions(+) | ||
|
||
diff --git a/src/frame/window/modules/systeminfo/systeminfowidget.cpp b/src/frame/window/modules/systeminfo/systeminfowidget.cpp | ||
index 8e62604fb..0f443ee20 100644 | ||
--- a/src/frame/window/modules/systeminfo/systeminfowidget.cpp | ||
+++ b/src/frame/window/modules/systeminfo/systeminfowidget.cpp | ||
@@ -78,6 +78,12 @@ void SystemInfoWidget::initData() | ||
m_listView->setRowHidden(i, true); | ||
} | ||
} | ||
+ | ||
+ if (IsNotDeepinUos) { | ||
+ if (m.gsettingsName == "endUserLicenseAgreement") { | ||
+ m_listView->setRowHidden(i, true); | ||
+ } | ||
+ } | ||
} | ||
|
||
if (InsertPlugin::instance()->updatePluginInfo("systeminfo")) | ||
-- | ||
2.38.1 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This feels a bit sketchy to do
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should I replace the text?I don't find
endUserLicenseAgreement
for NixOS,There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
User-Experience-Program-License-Agreement-Community.md
comes from a non-open source component(deepin-deepinid-client),It's only blank page if we didn't install deepin-deepinid-clientdde-control-center 6.0.0 is completely rewritten,not based on 5.6.*, so this patch cannot merge by upstream
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you add a short comment with that info and a link to the upstream commit that removed it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Comment has been added. dde-control-center 6.0.0 is not a simple version upgrade, but a rewrite,this patch will remove in future