From 4959cff069e120bfc81b3b152a074bbe10568640 Mon Sep 17 00:00:00 2001 From: cui-gaoleng <562344211@qq.com> Date: Fri, 22 Nov 2024 13:10:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=A1=A5=E4=B8=81=E8=B0=83=E6=95=B4+?= =?UTF-8?q?=E5=8A=A0=E5=85=A5icon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 0001-branding-patch.patch | 6 +- 0006-modules-file.patch | 718 ----------------------- 0010-cDebugDelect.patch | 400 +++++++++++++ 0011-fix-87-position-and-translate.patch | 230 ++++++++ 0012-replace-icon.patch | 29 + calamares.spec | 10 +- openEuler-icon.png | Bin 0 -> 12843 bytes 7 files changed, 670 insertions(+), 723 deletions(-) create mode 100644 0010-cDebugDelect.patch create mode 100644 0011-fix-87-position-and-translate.patch create mode 100644 0012-replace-icon.patch create mode 100644 openEuler-icon.png diff --git a/0001-branding-patch.patch b/0001-branding-patch.patch index 52f9719..f8d2e8c 100644 --- a/0001-branding-patch.patch +++ b/0001-branding-patch.patch @@ -122,7 +122,7 @@ index f4c50e629..f91d520cd 100644 - width: 200; height: 200 + id: background1 + source: "Slide1.png" -+ width: 980; height: 980 ++ width: 800; height: 800 fillMode: Image.PreserveAspectFit - anchors.centerIn: parent - } @@ -148,7 +148,7 @@ index f4c50e629..f91d520cd 100644 + Image { + id: background2 + source: "Slide2.png" -+ width: 980; height: 980 ++ width: 800; height: 800 + fillMode: Image.PreserveAspectFit + anchors.horizontalCenter:parent.horizontalCenter + y:parent.height / 2 - height / 2 -25 @@ -161,7 +161,7 @@ index f4c50e629..f91d520cd 100644 + Image { + id: background3 + source: "Slide3.png" -+ width: 980; height: 980 ++ width: 800; height: 800 + fillMode: Image.PreserveAspectFit + anchors.horizontalCenter:parent.horizontalCenter + y:parent.height / 2 - height / 2 -25 diff --git a/0006-modules-file.patch b/0006-modules-file.patch index d7473ea..a03be44 100644 --- a/0006-modules-file.patch +++ b/0006-modules-file.patch @@ -36,7 +36,6 @@ Subject: [PATCH 4/4] modules Commit without .png, .svg, and .svgz files src/modules/unpackfs/main.py | 82 +- src/modules/unpackfs/unpackfs.conf | 12 +- src/modules/users/UsersPage.cpp | 2 +- - src/modules/users/page_usersetup.bak.ui | 710 ++++++++++++++++++ src/modules/users/page_usersetup.ui | 158 ++-- src/modules/users/users.conf | 2 +- src/modules/welcome/Config.cpp | 3 +- @@ -50,7 +49,6 @@ Subject: [PATCH 4/4] modules Commit without .png, .svg, and .svgz files mode change 100755 => 100644 src/modules/fstab/main.py mode change 100755 => 100644 src/modules/initramfscfg/encrypt_hook mode change 100755 => 100644 src/modules/initramfscfg/encrypt_hook_nokey - create mode 100644 src/modules/users/page_usersetup.bak.ui diff --git a/src/modules/bootloader/bootloader.conf b/src/modules/bootloader/bootloader.conf @@ -1324,722 +1322,6 @@ index 1ecc0eb..72fb3e0 100644 // Connect signals and slots ui->textBoxUserPassword->setText( config->userPassword() ); connect( ui->textBoxUserPassword, &QLineEdit::textChanged, config, &Config::setUserPassword ); -diff --git a/src/modules/users/page_usersetup.bak.ui b/src/modules/users/page_usersetup.bak.ui -new file mode 100644 -index 0000000..f808c89 ---- /dev/null -+++ b/src/modules/users/page_usersetup.bak.ui -@@ -0,0 +1,710 @@ -+ -+ -+ -+SPDX-FileCopyrightText: 2014 Teo Mrnjavac <teo@kde.org> -+SPDX-License-Identifier: GPL-3.0-or-later -+ -+ Page_UserSetup -+ -+ -+ -+ 0 -+ 0 -+ 862 -+ 683 -+ -+ -+ -+ Form -+ -+ -+ -+ -+ -+ Qt::Orientation::Vertical -+ -+ -+ QSizePolicy::Policy::Fixed -+ -+ -+ -+ 20 -+ 6 -+ -+ -+ -+ -+ -+ -+ -+ What is your name? -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ 200 -+ 0 -+ -+ -+ -+ Your Full Name -+ -+ -+ -+ -+ -+ -+ -+ 0 -+ 0 -+ -+ -+ -+ -+ 24 -+ 24 -+ -+ -+ -+ -+ 24 -+ 24 -+ -+ -+ -+ -+ -+ -+ true -+ -+ -+ -+ -+ -+ -+ -+ 1 -+ 0 -+ -+ -+ -+ -+ -+ -+ true -+ -+ -+ -+ -+ -+ -+ -+ -+ Qt::Orientation::Vertical -+ -+ -+ QSizePolicy::Policy::Fixed -+ -+ -+ -+ 20 -+ 20 -+ -+ -+ -+ -+ -+ -+ -+ What name do you want to use to log in? -+ -+ -+ false -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ 0 -+ 0 -+ -+ -+ -+ -+ 200 -+ 0 -+ -+ -+ -+ login -+ -+ -+ -+ -+ -+ -+ -+ 0 -+ 0 -+ -+ -+ -+ -+ 24 -+ 24 -+ -+ -+ -+ -+ 24 -+ 24 -+ -+ -+ -+ true -+ -+ -+ -+ -+ -+ -+ -+ 1 -+ 0 -+ -+ -+ -+ -+ 200 -+ 0 -+ -+ -+ -+ -+ -+ -+ Qt::AlignmentFlag::AlignVCenter -+ -+ -+ true -+ -+ -+ -+ -+ -+ -+ -+ -+ Qt::Orientation::Vertical -+ -+ -+ QSizePolicy::Policy::Fixed -+ -+ -+ -+ 20 -+ 20 -+ -+ -+ -+ -+ -+ -+ -+ What is the name of this computer? -+ -+ -+ false -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ 0 -+ 0 -+ -+ -+ -+ -+ 200 -+ 0 -+ -+ -+ -+ <small>This name will be used if you make the computer visible to others on a network.</small> -+ -+ -+ Computer Name -+ -+ -+ -+ -+ -+ -+ -+ 0 -+ 0 -+ -+ -+ -+ -+ 24 -+ 24 -+ -+ -+ -+ -+ 24 -+ 24 -+ -+ -+ -+ true -+ -+ -+ -+ -+ -+ -+ -+ 1 -+ 0 -+ -+ -+ -+ -+ 200 -+ 0 -+ -+ -+ -+ -+ -+ -+ Qt::AlignmentFlag::AlignVCenter -+ -+ -+ true -+ -+ -+ -+ -+ -+ -+ -+ -+ Qt::Orientation::Vertical -+ -+ -+ QSizePolicy::Policy::Fixed -+ -+ -+ -+ 20 -+ 20 -+ -+ -+ -+ -+ -+ -+ -+ Choose a password to keep your account safe. -+ -+ -+ false -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ 0 -+ 0 -+ -+ -+ -+ -+ 200 -+ 0 -+ -+ -+ -+ <small>Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.</small> -+ -+ -+ QLineEdit::EchoMode::Password -+ -+ -+ Password -+ -+ -+ -+ -+ -+ -+ -+ 0 -+ 0 -+ -+ -+ -+ -+ 200 -+ 0 -+ -+ -+ -+ <small>Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.</small> -+ -+ -+ QLineEdit::EchoMode::Password -+ -+ -+ Repeat Password -+ -+ -+ -+ -+ -+ -+ -+ 0 -+ 0 -+ -+ -+ -+ -+ 24 -+ 24 -+ -+ -+ -+ -+ 24 -+ 24 -+ -+ -+ -+ true -+ -+ -+ -+ -+ -+ -+ -+ 1 -+ 0 -+ -+ -+ -+ -+ 100 -+ 0 -+ -+ -+ -+ -+ -+ -+ Qt::AlignmentFlag::AlignVCenter -+ -+ -+ true -+ -+ -+ -+ -+ -+ -+ -+ -+ Qt::Orientation::Vertical -+ -+ -+ QSizePolicy::Policy::Fixed -+ -+ -+ -+ 20 -+ 20 -+ -+ -+ -+ -+ -+ -+ -+ When this box is checked, password-strength checking is done and you will not be able to use a weak password. -+ -+ -+ Require strong passwords. -+ -+ -+ -+ -+ -+ -+ Log in automatically without asking for the password. -+ -+ -+ -+ -+ -+ -+ Use the same password for the administrator account. -+ -+ -+ -+ -+ -+ -+ Qt::Orientation::Vertical -+ -+ -+ QSizePolicy::Policy::Fixed -+ -+ -+ -+ 20 -+ 20 -+ -+ -+ -+ -+ -+ -+ -+ Choose a password for the administrator account. -+ -+ -+ false -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ 0 -+ 0 -+ -+ -+ -+ -+ 200 -+ 0 -+ -+ -+ -+ <small>Enter the same password twice, so that it can be checked for typing errors.</small> -+ -+ -+ QLineEdit::EchoMode::Password -+ -+ -+ Password -+ -+ -+ -+ -+ -+ -+ -+ 0 -+ 0 -+ -+ -+ -+ -+ 200 -+ 0 -+ -+ -+ -+ <small>Enter the same password twice, so that it can be checked for typing errors.</small> -+ -+ -+ QLineEdit::EchoMode::Password -+ -+ -+ Repeat Password -+ -+ -+ -+ -+ -+ -+ -+ 0 -+ 0 -+ -+ -+ -+ -+ 24 -+ 24 -+ -+ -+ -+ -+ 24 -+ 24 -+ -+ -+ -+ true -+ -+ -+ -+ -+ -+ -+ -+ 1 -+ 0 -+ -+ -+ -+ -+ 100 -+ 0 -+ -+ -+ -+ -+ -+ -+ Qt::AlignmentFlag::AlignVCenter -+ -+ -+ true -+ -+ -+ -+ -+ -+ -+ -+ -+ Qt::Orientation::Vertical -+ -+ -+ QSizePolicy::Policy::Fixed -+ -+ -+ -+ 20 -+ 6 -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ Use Active Directory -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ Domain: -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ Domain Administrator: -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ Password: -+ -+ -+ -+ -+ -+ -+ QLineEdit::EchoMode::Password -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ IP Address (optional): -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ Qt::Orientation::Vertical -+ -+ -+ -+ 20 -+ 1 -+ -+ -+ -+ -+ -+ -+ -+ -+ diff --git a/src/modules/users/page_usersetup.ui b/src/modules/users/page_usersetup.ui index 6e6e542..2a5ccd2 100644 --- a/src/modules/users/page_usersetup.ui diff --git a/0010-cDebugDelect.patch b/0010-cDebugDelect.patch new file mode 100644 index 0000000..c5f63fe --- /dev/null +++ b/0010-cDebugDelect.patch @@ -0,0 +1,400 @@ +From 662c8f4cdf8838d44f4a5b8be5455f840c0e314c Mon Sep 17 00:00:00 2001 +From: cui-gaoleng <562344211@qq.com> +Date: Tue, 19 Nov 2024 13:43:48 +0800 +Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95=E4=BF=A1=E6=81=AF=E5=92=8C?= + =?UTF-8?q?=E5=B7=B2=E6=B3=A8=E9=87=8A=E4=BB=A3=E7=A0=81=E5=88=A0=E9=99=A4?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + src/calamares/CalamaresWindow.cpp | 3 - + .../progresstree/ProgressTreeDelegate.cpp | 9 - + .../progresstree/ProgressTreeView.cpp | 2 - + src/libcalamares/CalamaresAbout.cpp | 1 - + .../modulesystem/CppJobModule.cpp | 4 - + src/modules/keyboard/KeyboardPage.cpp | 19 - + src/modules/keyboard/KeyboardPage.ui | 3 - + src/modules/locale/LocalePage.cpp | 20 +- + .../packagechooser/packagechooser.conf | 16 +- + src/modules/welcome/WelcomePage.cpp | 74 +- + 11 files changed, 7 insertions(+), 862 deletions(-) + +diff --git a/src/calamares/CalamaresWindow.cpp b/src/calamares/CalamaresWindow.cpp +index 4721cb9..4917f75 100644 +--- a/src/calamares/CalamaresWindow.cpp ++++ b/src/calamares/CalamaresWindow.cpp +@@ -440,7 +440,6 @@ CalamaresWindow::CalamaresWindow( QWidget* parent ) + int h = qBound( minimumSize.height(), windowDimensionToPixels( brandingSizes.second ), availableSize.height() ); + + cDebug() << Logger::SubEntry << "Proposed window size:" << w << h; +- //resize( availableSize.width(), availableSize.height() );//通用桌面大小作为窗口大小 + resize( w, h );//通用桌面大小作为窗口大小 + QWidget* baseWidget = this; + if ( !( branding->imagePath( ImageEntry::ProductWallpaper ).isEmpty() ) ) +@@ -519,8 +518,6 @@ CalamaresWindow::CalamaresWindow( QWidget* parent ) + Calamares::unmarginLayout( contentsLayout ); + baseWidget->setLayout( mainLayout ); + setStyleSheet( Calamares::Branding::instance()->stylesheet() ); +- cDebug()<<"<---------------------------WindowWindowSize-------------------------------------->"<size(); +- cDebug()<< "<--------------------sideBox->size()-------------------->"<< sideBox->size(); + this->setFixedSize(this->size()); + } + +diff --git a/src/calamares/progresstree/ProgressTreeDelegate.cpp b/src/calamares/progresstree/ProgressTreeDelegate.cpp +index 6d5f865..7541356 100644 +--- a/src/calamares/progresstree/ProgressTreeDelegate.cpp ++++ b/src/calamares/progresstree/ProgressTreeDelegate.cpp +@@ -53,9 +53,6 @@ static QString getTypeOfStep(const QString& stepString){ + + // 将地区枚举值转换为字符串 + QString countryString = QLocale::countryToString(country); +- // 输出当前语言 +- cDebug() << "-------------------------------------------当前系统语言：" << languageString; +- cDebug() << "-------------------------------------------当前系统地区：" << countryString; + if(contains(baseSetting1,stepString)){ + return "BaseSetting"; + } +@@ -145,7 +142,6 @@ paintViewStep( QPainter* painter, const QStyleOptionViewItem& option, const QMod + shrinkSteps++; + + QRectF boundingBox; +- cDebug() << "index.data().toString()" << index.data().toString(); + QString text; + if(index.data().toString()=="欢迎" || index.data().toString()=="Welcome"||!isVisable(index.data().toString())){ + text = ""; +@@ -179,7 +175,6 @@ ProgressTreeDelegate::sizeHint( const QStyleOptionViewItem& option, const QModel + } + + QFont font = qApp->font(); +- cDebug() << "ProgressTreeDelegate::sizeHint"; + + font.setPointSize( item_fontsize() ); + QFontMetrics fm( font ); +@@ -190,14 +185,12 @@ ProgressTreeDelegate::sizeHint( const QStyleOptionViewItem& option, const QModel + }else{ + return QSize( (Calamares::windowMinimumWidth*0.9)/3, height*2 ); + } +-// return QSize( option.rect.width(), height ); + + } + + void + ProgressTreeDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const + { +- cDebug() << "ProgressTreeDelegate::paint----------"; + QStyleOptionViewItem opt = option; + + painter->save(); +@@ -209,11 +202,9 @@ ProgressTreeDelegate::paint( QPainter* painter, const QStyleOptionViewItem& opti + QColor( Calamares::Branding::instance()->styleString( Calamares::Branding::SidebarBackground ) ) ); + painter->setPen( QColor( Calamares::Branding::instance()->styleString( Calamares::Branding::SidebarText ) ) ); + if(index.data().toString()=="欢迎" || index.data().toString()=="Welcome"){ +- cDebug() << "ProgressTreeDelegate::欢迎Welcome--------Nopaint----------"; + }else{ + paintViewStep( painter, opt, index ); + } +- //paintViewStep( painter, opt, index ); + + painter->restore(); + } +diff --git a/src/calamares/progresstree/ProgressTreeView.cpp b/src/calamares/progresstree/ProgressTreeView.cpp +index 29ee7ee..a9a15b8 100644 +--- a/src/calamares/progresstree/ProgressTreeView.cpp ++++ b/src/calamares/progresstree/ProgressTreeView.cpp +@@ -68,14 +68,12 @@ ProgressTreeView::setModel( QAbstractItemModel* model ) + void + ProgressTreeView::update() + { +- cDebug() << "update ---------------------"; + viewport()->update(); + } + + void + ProgressTreeView::updateVisibility(int currentStep) + { +- cDebug() << "int currentStep ------------------ " << currentStep; + // 在第一个步骤隐藏，其他步骤显示 + this->setVisible(currentStep > 0); + } + +diff --git a/src/libcalamares/CalamaresAbout.cpp b/src/libcalamares/CalamaresAbout.cpp +index 65a1b9d..595efc7 100644 +--- a/src/libcalamares/CalamaresAbout.cpp ++++ b/src/libcalamares/CalamaresAbout.cpp +@@ -65,7 +65,6 @@ Calamares::aboutString() + { + return substituteVersions( QCoreApplication::translate( "AboutData", s_header ) ) + aboutMaintainers() + + QCoreApplication::translate( "AboutData", s_footer ); +- // return aboutMaintainers()+ QCoreApplication::translate( "AboutData", s_footer ); + } + + const QString +diff --git a/src/libcalamaresui/modulesystem/CppJobModule.cpp b/src/libcalamaresui/modulesystem/CppJobModule.cpp +index c211006..b35a457 100644 +--- a/src/libcalamaresui/modulesystem/CppJobModule.cpp ++++ b/src/libcalamaresui/modulesystem/CppJobModule.cpp +@@ -53,10 +53,6 @@ CppJobModule::loadSelf() + cDebug() << "Could not load module:" << m_loader->errorString(); + return; + } +- // cDebug() << "CppJobModule loading self for instance" << instanceKey() +- // << "\nCppJobModule at address" << this +- // << "\nCalamares::PluginFactory at address" << pf +- // << "\nCppJob at address" << cppJob; + + cppJob->setModuleInstanceKey( instanceKey() ); + cppJob->setConfigurationMap( m_configurationMap ); +diff --git a/src/modules/keyboard/KeyboardPage.cpp b/src/modules/keyboard/KeyboardPage.cpp +index 3f06158..be60521 100644 +--- a/src/modules/keyboard/KeyboardPage.cpp ++++ b/src/modules/keyboard/KeyboardPage.cpp +@@ -48,9 +48,6 @@ KeyboardPage::KeyboardPage( Config* config, QWidget* parent ) + { + ui->setupUi( this ); + this->setContentsMargins(50,0,50,0); +- // Keyboard Preview +- // ui->KBPreviewLayout->addWidget( m_keyboardPreview ); +- + + { + auto* model = config->keyboardModels(); +@@ -93,27 +90,11 @@ KeyboardPage::KeyboardPage( Config* config, QWidget* parent ) + &QItemSelectionModel::currentChanged, + [ this ]( const QModelIndex& current ) + { m_config->keyboardLayouts()->setCurrentIndex( current.row() ); } ); +- // connect( config->keyboardLayouts(), +- // &KeyboardLayoutModel::currentIndexChanged, +- // [ this ]( int index ) +- // { +- // ui->layoutSelector->setCurrentIndex( m_config->keyboardLayouts()->index( index ) ); +- // m_keyboardPreview->setLayout( m_config->keyboardLayouts()->key( index ) ); +- // m_keyboardPreview->setVariant( +- // m_config->keyboardVariants()->key( m_config->keyboardVariants()->currentIndex() ) ); +- // } ); + + connect( ui->variantSelector->selectionModel(), + &QItemSelectionModel::currentChanged, + [ this ]( const QModelIndex& current ) + { m_config->keyboardVariants()->setCurrentIndex( current.row() ); } ); +- // connect( config->keyboardVariants(), +- // &KeyboardVariantsModel::currentIndexChanged, +- // [ this ]( int index ) +- // { +- // ui->variantSelector->setCurrentIndex( m_config->keyboardVariants()->index( index ) ); +- // m_keyboardPreview->setVariant( m_config->keyboardVariants()->key( index ) ); +- // } ); + + connect( ui->groupSelector, + QOverload< int >::of( &QComboBox::currentIndexChanged ), +diff --git a/src/modules/keyboard/KeyboardPage.ui b/src/modules/keyboard/KeyboardPage.ui +index 1d6afbf..70cfca3 100644 +--- a/src/modules/keyboard/KeyboardPage.ui ++++ b/src/modules/keyboard/KeyboardPage.ui +@@ -45,9 +45,6 @@ SPDX-License-Identifier: GPL-3.0-or-later + + + +- + + + +diff --git a/src/modules/locale/LocalePage.cpp b/src/modules/locale/LocalePage.cpp +index 0568067..ed50574 100644 +--- a/src/modules/locale/LocalePage.cpp ++++ b/src/modules/locale/LocalePage.cpp +@@ -32,13 +32,6 @@ LocalePage::LocalePage( Config* config, QWidget* parent ) + { + QBoxLayout* mainLayout = new QVBoxLayout; + mainLayout->setContentsMargins(50,0,50,0); +- //QBoxLayout* tzwLayout = new QHBoxLayout; +- //m_tzWidget = new TimeZoneWidget( m_config->zonesModel(), this ); +- //tzwLayout->addStretch(); +- //tzwLayout->addWidget( m_tzWidget ); +- //tzwLayout->addStretch(); +- // Adjust for margins and spacing in this page +- //m_tzWidget->setMinimumHeight( m_tzWidget->minimumHeight() + 12 ); // 2 * spacing + + QBoxLayout* zoneAndRegionLayout = new QVBoxLayout; + m_regionLabel = new QLabel( this ); +@@ -90,7 +83,7 @@ LocalePage::LocalePage( Config* config, QWidget* parent ) + m_formatsChangeButton->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ); + formatsLayout->addWidget( m_formatsChangeButton ); + formatsLayout->addSpacing(20); +- //mainLayout->addLayout( tzwLayout ); ++ + mainLayout->addStretch(); + mainLayout->addLayout( zoneAndRegionLayout ); + mainLayout->addStretch(); +@@ -100,7 +93,7 @@ LocalePage::LocalePage( Config* config, QWidget* parent ) + mainLayout->addSpacing(20); + mainLayout->addLayout( timezoneLayout ); + mainLayout->addStretch(); +- //setMinimumWidth( m_tzWidget->width() ); ++ + setLayout( mainLayout ); + + m_localeChangeButton->hide(); +@@ -114,20 +107,15 @@ LocalePage::LocalePage( Config* config, QWidget* parent ) + zones->setRegion( location->region() ); + m_regionCombo->setModel( regions ); + m_zoneCombo->setModel( zones ); +- //m_tzWidget->setCurrentLocation( location ); ++ + locationChanged( location ); // doesn't inform TZ widget + } + + connect( config, &Config::currentLCStatusChanged, m_formatsLabel, &QLabel::setText ); + connect( config, &Config::currentLanguageStatusChanged, m_localeLabel, &QLabel::setText ); + connect( config, &Config::currentZoneChanged, m_timezoneLabel , &QLabel::setText); +- //connect( config, &Config::currentLocationChanged, m_tzWidget, &TimeZoneWidget::setCurrentLocation ); ++ + connect( config, &Config::currentLocationChanged, this, &LocalePage::locationChanged ); +- // connect( m_tzWidget, +- // &TimeZoneWidget::locationChanged, +- // config, +- // QOverload< const Calamares::Locale::TimeZoneData* >::of( &Config::setCurrentLocation ) ); +- + connect( m_regionCombo, QOverload< int >::of( &QComboBox::currentIndexChanged ), this, &LocalePage::regionChanged ); + connect( m_zoneCombo, QOverload< int >::of( &QComboBox::currentIndexChanged ), this, &LocalePage::zoneChanged ); + +diff --git a/src/modules/packagechooser/packagechooser.conf b/src/modules/packagechooser/packagechooser.conf +index e7b9b00..aa048e2 100644 +--- a/src/modules/packagechooser/packagechooser.conf ++++ b/src/modules/packagechooser/packagechooser.conf +@@ -157,11 +157,7 @@ items: + description[nl]: "Kies eventueel een desktop-omgeving uit deze lijst. Als u geen desktop-omgeving wenst te gebruiken, kies er dan geen. In dat geval start het systeem straks op in tekst-modus en kunt u later alsnog een desktop-omgeving installeren." + description[zh]: "请选择一个桌面环境。如果您不想安装桌面环境也没关系，您可以稍后再为系统安装桌面环境。" + screenshot: ":/images/Minimal-Install.png" +- # - id: kde +- # packages: [ kde-frameworks, kde-plasma, kde-gear ] +- # name: Plasma Desktop +- # description: "KDE Plasma Desktop, simple by default, a clean work area for real-world usage which intends to stay out of your way. Plasma is powerful when needed, enabling the user to create the workflow that makes them more effective to complete their tasks." +- # screenshot: ":/images/Plasma.png" ++ + - id: gnome + packages: [ checkpolicy, code, xorg-*, dejavu-fonts, liberation-fonts, gnu-*-fonts, google-*-fonts, adwaita-icon-theme, atk, atkmm, at-spi2-atk, at-spi2-core, baobab, abattis-cantarell-fonts, cheese, clutter, clutter-gst3, clutter-gtk, cogl, dconf, dconf-editor, devhelp, eog, epiphany, evince, evolution-data-server, file-roller, folks, gcab, gcr, gdk-pixbuf2, gdm, gedit, geocode-glib, gfbgraph, gjs, glib2, glibmm24, glib-networking, gmime30, gnome-autoar, gnome-backgrounds, gnome-bluetooth, gnome-builder, gnome-calculator, gnome-calendar, gnome-characters, gnome-clocks, gnome-color-manager, gnome-contacts, gnome-control-center, gnome-desktop3, gnome-disk-utility, gnome-font-viewer, gnome-getting-started-docs, gnome-initial-setup, gnome-keyring, gnome-logs, gnome-menus, gnome-music, gnome-online-accounts, gnome-online-miners, gnome-photos, gnome-remote-desktop, gnome-screenshot, gnome-session, gnome-settings-daemon, gnome-shell, gnome-shell-extensions, gnome-software, gnome-system-monitor, gnome-terminal, gnome-tour, gnome-user-docs, gnome-user-share, gnome-video-effects, gnome-weather, gobject-introspection, gom, grilo, grilo-plugins, gsettings-desktop-schemas, gsound, gspell, gssdp, gtk3, gtk4, gtk-doc, gtkmm30, gtksourceview4, gtk-vnc2, gupnp, gupnp-av, gupnp-dlna, gvfs, json-glib, libchamplain, libdazzle, libgdata, libgee, libgnomekbd, libgsf, libgtop2, libgweather, libgxps, libhandy, libmediaart, libnma, libnotify, libpeas, librsvg2, libsecret, libsigc++20, libsoup, mm-common, mutter, nautilus, orca, pango, pangomm, libphodav, python3-pyatspi, python3-gobject, rest, rygel, simple-scan, sushi, sysprof, tepl, totem, totem-pl-parser, tracker3, tracker3-miners, vala, vte291, yelp, yelp-tools, yelp-xsl, zenity, devstation-config, ibus-libpinyin ] + name: DevStation +@@ -169,13 +165,3 @@ items: + description: GNU Networked Object Modeling Environment Desktop + description[zh]: Devstation系统桌面 + screenshot: ":/images/gnome.png" +- #- id: ukui +- # packages: [ ukui ] +- # name: UKUI +- # description: Linux Desktop +- # screenshot: ":/images/UKUI.png" +- # - id: calamares +- # appdata: ../io.calamares.calamares.appdata.xml +- # screenshot: ":/images/calamares.png" +- # - id: kate +- # appstream: org.kde.kwrite.desktop +diff --git a/src/modules/welcome/WelcomePage.cpp b/src/modules/welcome/WelcomePage.cpp +index 88f38c2..471187b 100644 +--- a/src/modules/welcome/WelcomePage.cpp ++++ b/src/modules/welcome/WelcomePage.cpp +@@ -91,21 +91,7 @@ WelcomePage::WelcomePage( Config* config, QWidget* parent ) + } + + void +-WelcomePage::init() +-{ +- //setup the url buttons +- // setupButton( WelcomePage::Button::Support, m_conf->supportUrl() ); +- // setupButton( WelcomePage::Button::KnownIssues, m_conf->knownIssuesUrl() ); +- // setupButton( WelcomePage::Button::ReleaseNotes, m_conf->releaseNotesUrl() ); +- // setupButton( WelcomePage::Button::Donate, m_conf->donateUrl() ); +- +- //language icon +- // auto icon = Calamares::Branding::instance()->image( m_conf->languageIcon(), QSize( 48, 48 ) ); +- // if ( !icon.isNull() ) +- // { +- // setLanguageIcon( icon ); +- // } +-} ++WelcomePage::init(){} + + void + WelcomePage::initLanguages() +@@ -125,57 +111,6 @@ WelcomePage::initLanguages() + &Config::setLocaleIndex ); + } + +-// void +-// WelcomePage::setupButton( Button role, const QString& url ) +-// { +-// QPushButton* button = nullptr; +-// Calamares::ImageType icon = Calamares::Information; +- +-// switch ( role ) +-// { +-// case Button::Donate: +-// button = ui->donateButton; +-// icon = Calamares::Donate; +-// break; +-// case Button::KnownIssues: +-// button = ui->knownIssuesButton; +-// icon = Calamares::Bugs; +-// break; +-// case Button::ReleaseNotes: +-// button = ui->releaseNotesButton; +-// icon = Calamares::Release; +-// break; +-// case Button::Support: +-// button = ui->supportButton; +-// icon = Calamares::Help; +-// break; +-// } +-// if ( !button ) +-// { +-// cWarning() << "Unknown button role" << smash( role ); +-// return; +-// } +- +-// if ( url.isEmpty() ) +-// { +-// button->hide(); +-// return; +-// } +- +-// QUrl u( url ); +-// if ( u.isValid() ) +-// { +-// auto size = 2 * QSize( Calamares::defaultFontHeight(), Calamares::defaultFontHeight() ); +-// button->setIcon( Calamares::defaultPixmap( icon, Calamares::Original, size ) ); +-// connect( button, &QPushButton::clicked, [ u ]() { QDesktopServices::openUrl( u ); } ); +-// } +-// else +-// { +-// cWarning() << "Welcome button" << smash( role ) << "URL" << url << "is invalid."; +-// button->hide(); +-// } +-// } +- + void + WelcomePage::focusInEvent( QFocusEvent* e ) + { +@@ -201,11 +136,6 @@ WelcomePage::externallySelectedLanguage( int row ) + } + } + +-// void +-// WelcomePage::setLanguageIcon( QPixmap i ) +-// { +-// ui->languageIcon->setPixmap( i ); +-// } + + void + WelcomePage::retranslate() +@@ -214,8 +144,6 @@ WelcomePage::retranslate() + + ui->mainText->setText( message.arg( Calamares::Branding::instance()->versionedName() ) ); + ui->retranslateUi( this ); +- // ui->supportButton->setText( +- // tr( "%1 Support", "@action" ).arg( Calamares::Branding::instance()->shortProductName() ) ); + } + + void + diff --git a/0011-fix-87-position-and-translate.patch b/0011-fix-87-position-and-translate.patch new file mode 100644 index 0000000..0419506 --- /dev/null +++ b/0011-fix-87-position-and-translate.patch @@ -0,0 +1,230 @@ +From 057721ec933fc439d9e9b9887dc69704cd49472e Mon Sep 17 00:00:00 2001 +From: cui-gaoleng <562344211@qq.com> +Date: Fri, 22 Nov 2024 12:14:08 +0800 +Subject: [PATCH] =?UTF-8?q?fix=20progress=20bar=20has=20been=20at=20the=20?= + =?UTF-8?q?87%=20position=20for=20a=20long=20time+=E4=B8=A4=E5=A4=84?= + =?UTF-8?q?=E7=B9=81=E4=BD=93=E7=BF=BB=E8=AF=91=E8=A1=A5=E9=BD=90?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + calamares.desktop | 2 +- + lang/calamares_zh_TW.ts | 6 +-- + src/modules/packages/main.py | 70 +++++++++++++++++++------------- + src/modules/packages/module.desc | 1 + + src/modules/unpackfs/main.py | 24 ++++++++--- + 5 files changed, 65 insertions(+), 38 deletions(-) + +diff --git a/calamares.desktop b/calamares.desktop +index 9a1416e..9d33495 100644 +--- a/calamares.desktop ++++ b/calamares.desktop +@@ -5,7 +5,7 @@ Name=Install System + GenericName=System Installer + Keywords=calamares;system;installer; + TryExec=calamares +-Exec=sh -c "pkexec calamares" ++Exec=sh -c "pkexec calamares -style Adwaita" + Comment=Calamares — System Installer + Icon=calamares + Terminal=false +diff --git a/lang/calamares_zh_TW.ts b/lang/calamares_zh_TW.ts +index 8689629..3cc473c 100644 +--- a/lang/calamares_zh_TW.ts ++++ b/lang/calamares_zh_TW.ts +@@ -613,9 +613,9 @@ The system will reboot or you can enter the debug mode for further investigation + + + +- &Debug ++ &Try Now + @button +- 調試(&D) ++ 立即試用(&D) + + + Do you really want to cancel the current install process? +@@ -4526,7 +4526,7 @@ Output: + + + language +- ++ 語言 + + + Open donations website +diff --git a/src/modules/packages/main.py b/src/modules/packages/main.py +index 8c165e8..1fbe276 100644 +--- a/src/modules/packages/main.py ++++ b/src/modules/packages/main.py +@@ -138,10 +138,11 @@ class PackageManager(metaclass=abc.ABCMeta): + self.install([packagedata], from_local=from_local, options=options) + else: + self.run(packagedata["pre-script"]) +- if isinstance(packagedata["package"], list): +- self.install(packagedata["package"], from_local=from_local, options=options) +- else: +- self.install([packagedata["package"]], from_local=from_local, options=options) ++ if "package" in packagedata: ++ if isinstance(packagedata["package"], list): ++ self.install(packagedata["package"], from_local=from_local, options=options) ++ else: ++ self.install([packagedata["package"]], from_local=from_local, options=options) + if isinstance(packagedata["post-script"], list): + for script in packagedata["post-script"]: + self.run(script) +@@ -787,41 +788,54 @@ def run_operations(pkgman, entry, options): + names (strings) or package information dictionaries with pre- + and post-scripts. + """ +- global group_packages, completed_packages, mode_packages +- +- if "source" in entry and entry["source"] == "packagechooser@packagechooser": +- handle_packagechooser(entry) ++ global group_packages, completed_packages, mode_packages, custom_status_message + + for key in entry.keys(): + package_list = subst_locale(entry[key]) ++ libcalamares.utils.warning(str(package_list)) + group_packages = len(package_list) + +- if key == "install": +- _change_mode(INSTALL) +- pkgman.operation_install(package_list, options=options) +- elif key == "try_install": ++ if key in ["install", "try_install", "localInstall"]: + _change_mode(INSTALL) +- pkgman.operation_try_install(package_list, options=options) +- elif key == "remove": +- _change_mode(REMOVE) +- pkgman.operation_remove(package_list, options=options) +- elif key == "try_remove": ++ for package in package_list: ++ custom_status_message = f"Installing package: {package}" ++ try: ++ if key == "localInstall": ++ pkgman.operation_install([package], from_local=True, options=options) ++ elif key == "try_install": ++ pkgman.operation_try_install([package], options=options) ++ else: ++ pkgman.operation_install([package], options=options) ++ except Exception as e: ++ libcalamares.utils.warning("Failed to install package {}: {}".format(package, str(e))) ++ ++ completed_packages += 1 ++ progress = completed_packages / total_packages ++ libcalamares.job.setprogress(progress) ++ libcalamares.utils.debug("Progress: {:.2f}, Package: {}".format(progress, package)) ++ elif key in ["remove", "try_remove"]: + _change_mode(REMOVE) +- pkgman.operation_try_remove(package_list, options=options) +- elif key == "localInstall": +- _change_mode(INSTALL) +- pkgman.operation_install(package_list, from_local=True, options=options) +- elif key == "source": +- libcalamares.utils.debug("Package-list from {!s}".format(entry[key])) ++ for package in package_list: ++ try: ++ if key == "remove": ++ pkgman.operation_remove([package], options=options) ++ elif key == "try_remove": ++ pkgman.operation_try_remove([package], options=options) ++ except Exception as e: ++ libcalamares.utils.warning("Failed to remove package {}: {}".format(package, str(e))) ++ ++ completed_packages += 1 ++ progress = completed_packages / total_packages ++ libcalamares.job.setprogress(progress) ++ libcalamares.utils.debug("Progress: {:.2f}, Package: {}".format(progress, package)) + else: + libcalamares.utils.warning("Unknown package-operation key {!s}".format(key)) +- completed_packages += len(package_list) +- libcalamares.job.setprogress(completed_packages * 1.0 / total_packages) +- libcalamares.utils.debug("Pretty name: {!s}, setting progress..".format(pretty_name())) + ++ if "source" in entry and entry["source"] == "packagechooser@packagechooser": ++ packagemeta = handle_packagechooser() ++ pkgman.operation_install([packagemeta], from_local=True, options=options) + group_packages = 0 +- _change_mode(None) +- ++ _change_mode(None) + + def run(): + """ +diff --git a/src/modules/packages/module.desc b/src/modules/packages/module.desc +index 3e3053b..9529af6 100644 +--- a/src/modules/packages/module.desc ++++ b/src/modules/packages/module.desc +@@ -5,3 +5,4 @@ type: "job" + name: "packages" + interface: "python" + script: "main.py" ++weight: 50 +diff --git a/src/modules/unpackfs/main.py b/src/modules/unpackfs/main.py +index 4148720..4c5518e 100644 +--- a/src/modules/unpackfs/main.py ++++ b/src/modules/unpackfs/main.py +@@ -26,6 +26,8 @@ import libcalamares + import platform + + import gettext ++ ++import libcalamares.utils + _ = gettext.translation("calamares-python", + localedir=libcalamares.utils.gettext_path(), + languages=libcalamares.utils.gettext_languages(), +@@ -263,6 +265,7 @@ def file_copy(source, entry, progress_cb): + progress_cb(num_files_copied, num_files_total_local) + try: + returncode = 0 ++ + arch = platform.machine() + + libcalamares.utils.host_env_process_output(["mkdir", "-p", entry.destination + "/etc/yum.repos.d/"], output_cb) +@@ -272,6 +275,7 @@ def file_copy(source, entry, progress_cb): + libcalamares.utils.host_env_process_output(["cp", "-af", "/etc/add_selinux_policy.sh", entry.destination + "/etc/add_selinux_policy.sh"], output_cb) + libcalamares.utils.host_env_process_output(["chmod", "+x", entry.destination + "/etc/add_selinux_policy.sh"], output_cb) + ++ completed_packages = 0 + if os.path.exists("/etc/yum.repos.d/local.repo"): + libcalamares.utils.host_env_process_output( + ["cp", "-af", "/etc/yum.repos.d/local.repo", entry.destination + "/etc/yum.repos.d/"], output_cb) +@@ -281,9 +285,13 @@ def file_copy(source, entry, progress_cb): + else: + packages = ["yum", "grub2", "grub2-efi-x64", "grub2-pc", "passwd", "sudo"] + +- libcalamares.utils.host_env_process_output( +- ["yum", "--installroot=" + entry.destination, "--disablerepo=*", "--enablerepo=local-repo", +- "--releasever=/", "--nogpgcheck", "--setopt=sslverify=0", "install", "-y"] + packages, output_cb) ++ for package in packages: ++ libcalamares.job.setprogress(completed_packages / len(packages)) ++ libcalamares.utils.host_env_process_output( ++ ["yum", "--installroot=" + entry.destination, "--disablerepo=*", "--enablerepo=local-repo", ++ "--releasever=/", "--nogpgcheck", "--setopt=sslverify=0", "install", "-y", package], output_cb) ++ completed_packages += 1 ++ libcalamares.job.setprogress(completed_packages / len(packages)) + else: + libcalamares.utils.host_env_process_output( + ["cp", "-af", "/etc/yum.repos.d/openEuler.repo", entry.destination + "/etc/yum.repos.d/"], output_cb) +@@ -292,9 +300,13 @@ def file_copy(source, entry, progress_cb): + else: + packages = ["yum", "grub2", "grub2-efi-x64", "grub2-pc", "passwd", "sudo"] + +- libcalamares.utils.host_env_process_output( +- ["yum", "--installroot=" + entry.destination, "--releasever=/", "--nogpgcheck", "--setopt=sslverify=0", +- "install", "-y"] + packages, output_cb) ++ for package in packages: ++ libcalamares.job.setprogress(completed_packages / len(packages)) ++ libcalamares.utils.host_env_process_output( ++ ["yum", "--installroot=" + entry.destination, "--releasever=/", "--nogpgcheck", "--setopt=sslverify=0", ++ "install", "-y", package], output_cb) ++ completed_packages += 1 ++ libcalamares.job.setprogress(completed_packages / len(packages)) + + libcalamares.utils.host_env_process_output(["rm", "-f", entry.destination + "/etc/shadow"], output_cb) + libcalamares.utils.host_env_process_output(["cp", "-af", "/etc/shadow", entry.destination + "/etc/shadow"], output_cb) +-- +2.43.0 + diff --git a/0012-replace-icon.patch b/0012-replace-icon.patch new file mode 100644 index 0000000..b768ec0 --- /dev/null +++ b/0012-replace-icon.patch @@ -0,0 +1,29 @@ +From ec4ad9b45ba894afb73ae30ae6e8631fb701f1dd Mon Sep 17 00:00:00 2001 +From: cui-gaoleng <562344211@qq.com> +Date: Fri, 22 Nov 2024 12:44:38 +0800 +Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E6=A0=87=E9=85=8D?= + =?UTF-8?q?=E7=BD=AE?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + calamares.desktop | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/calamares.desktop b/calamares.desktop +index 9d33495..00c2368 100644 +--- a/calamares.desktop ++++ b/calamares.desktop +@@ -7,7 +7,7 @@ Keywords=calamares;system;installer; + TryExec=calamares + Exec=sh -c "pkexec calamares -style Adwaita" + Comment=Calamares — System Installer +-Icon=calamares ++Icon=/data/images/openEuler-icon.png + Terminal=false + StartupNotify=true + Categories=Qt;System; +-- +2.43.0 + diff --git a/calamares.spec b/calamares.spec index 6c36659..fa66cd2 100644 --- a/calamares.spec +++ b/calamares.spec @@ -38,7 +38,7 @@ Source16: information.svgz Source17: openEuler.png Source18: openEulerWord-blus.png Source19: openEulerWord.png - +Source20: openEuler-icon.png # patch Patch0: 0001-branding-patch.patch Patch1: 0002-lang.patch @@ -49,6 +49,10 @@ Patch5: 0006-modules-file.patch Patch6: 0007-root.patch Patch7: 0008-progromTree.patch Patch8: 0009-qss.patch +Patch9: 0010-cDebugDelect.patch +Patch10: 0011-fix-87-position-and-translate.patch +Patch11: 0012-replace-icon.patch + # Calamares is only supported where live images (and GRUB) are. (#1171380) # This list matches the arches where grub2-efi is used to boot the system ExclusiveArch: %{ix86} x86_64 aarch64 riscv64 @@ -213,6 +217,7 @@ mkdir -p %{_builddir}/calamares-3.3.7/data/images install -Dm 0644 %{SOURCE8} %{_builddir}/calamares-3.3.7/data/images/Biglogo.svgz install -Dm 0644 %{SOURCE9} %{_builddir}/calamares-3.3.7/data/images/Biglogo.svg install -Dm 0644 %{SOURCE16} %{_builddir}/calamares-3.3.7/data/images/information.svgz +install -Dm 0644 %{SOURCE20} %{_builddir}/calamares-3.3.7/data/images/openEuler-icon.png mkdir -p %{_builddir}/calamares-3.3.7/src/modules/packagechooser/images install -Dm 0644 %{SOURCE10} %{_builddir}/calamares-3.3.7/src/branding/default/Biglogo.png install -Dm 0644 %{SOURCE11} %{_builddir}/calamares-3.3.7/src/modules/packagechooser/images/Minimal-Install.png @@ -261,7 +266,7 @@ mkdir -p %{buildroot}/data/images install -Dm 0644 %{SOURCE8} %{buildroot}/data/images/Biglogo.svgz install -Dm 0644 %{SOURCE9} %{buildroot}/data/images/Biglogo.svg install -Dm 0644 %{SOURCE16} %{buildroot}/data/images/information.svgz - +install -Dm 0644 %{SOURCE20} %{buildroot}/data/images/openEuler-icon.png # calamares模块图片目录 mkdir -p %{buildroot}%{_datadir}/calamares/modules/packagechooser/images install -Dm 0644 %{SOURCE10} %{buildroot}%{_datadir}/calamares/branding/default/Biglogo.png @@ -303,6 +308,7 @@ install -Dm 0644 %{SOURCE19} %{buildroot}%{_datadir}/calamares/branding/default/ /data/images/Biglogo.svgz /data/images/Biglogo.svg /data/images/information.svgz +/data/images/openEuler-icon.png %dir /data/config-appimage/ %dir /data/config-appimage/branding/ %dir /data/config-appimage/branding/default/ diff --git a/openEuler-icon.png b/openEuler-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..db2afafdd36eabdd5c5fd083d9bc00aff9911e6c GIT binary patch literal 12843 zcmYj&cOcbm`1jX{gRF!ihlYeuS=lo}Ms}3dBQhfMAmfCDO2sj|-nIy^enG`+J{%p40c<*L~mD_4$16OSqnnIz251ErKBQ8dp{I5rnK7LC6sl6@2-l zH*^jDN9nGtVTgkN9-#hvj37LShN_YwCTU^J(kaFy<=1j{l7x2Qg4YcWACBOVn&EQy z`j9xq*jS0jm;5iz#M;Qn1YV+fQ6zqoY2nbu6}N#b9`A35nvF{JnL>LRX6)?@j`7n- zz8`$1rt&>Rlks%sbFW+WPegxoeZduMoDc5nwTNlGNKmld&fiR0t(}NE>Zx*MXHJJ` zFkL+@>v9d*nR@Eu+uK*m>dz9i^)(;uG2TZm~6aQ?vz}|z+^^= zE;>FQpY7Ht)u-?~CB|sJ3neIT^#dhqb-G&XKCUt~TFf5vvdo52ErwHoBZb0MEqI0u zv6J20)4&B@;9a%m(+C#Wx66~;v;iXC6EdFEVl4B+ccI>q?KODd+R2ZIZ^91ymltY z8Kxn%RD*4K*IrrWk#$rcw`M>zi<-`rq;gdB(Q;(99#e~pL8B=^fq z-$}`w?o>El#bdDNr48M%856%)J`cydgGTWoXQ9VOjWH<6IrD>B4N-WN%TfdXYFSXC z8$J)k9yRamf9QIO$b_D}d(Z;KO3t`Q=b{xMWbdeSjtS#xV)$>26Y7L|?H7(3#cE2$ zZZ9j?-ap0%o7*3>ab>_#OLo4r$#y%R`Dow!m9x(KAbjv{ieKQe6xT?cR|G4psBSlR z6{g*hbzANs_Mxey#1WB(@q5EU~9m9ja05qDdo*#EduSvej> z&RCzudnhVB{}A>RQ7>>j^F4Z(5MwiC-II=2E-UBZp+wI{#vbhrsbK5n#)kcU&3h`R3?E!4FmPBW{H2`}y|WOJ3roG<`I6kStDiiO88awtrmtrS{j*b|C8A=FQbty= zIniLlo~H92I@{I%Q2P|I=wew0o}sMVsu3mI`zZG4U^tBM1m8GpuYsilgVLj9^Pa^X zy&PJ>miH9j*aM$?>>cY{P_hrgVvmNqCjLFJwON0=!s z;=5jw_dctL?L19vXz^Q$Z=vTeIF4{K3kq!5$Lr6+-Z#KR@ziDIA*rPmG%gQf5!@IwLOR+397Bq7`=yzIvvk_&A zmc0hqypnmOJ4)6BvqW!b?CE4l&IV;CDN`1p?53i5Bn3*=9Om>stb#3<86)wA_mJx` zXQ7HyL?>7V)2XuZ!AJN~G9iA&_^y5%8uAV?SPSZPelrzi3V&G!a$VItQi;-{6MBQr zV1at@i+E<(jQk4W5H|KGlAE5-%R^})2V=bUDl6|jjx}L~c7x}K&1N6rS2>0Fk%}i3 zvA#US9T*VVw`J|QTX1nJ7(XIlrjPV;I}6G45Gx)+PuTGPJ-GK-v6aW6n+stTv9Qq+ zr1JjP`L^k(YBR77UNbVY7X}N#n=`@y^XleW^r-4SjEOXRY7g(VC~`!+MOc19Fdp5c zMmZi0Qzl3cn;EMTgw(ZYgF0X5Piau57}nfz)dYi~xQETyuE-Ff78BPC7stC7Hfmr&>eQ7y^mmBx~O$(}TG7Mf(N&Wt^(nLHT+-|v?@N+u1ih9T z>;HbIhZa6tJ?wE7x|e^@(ERd1|97>6u4CP@^P3m(a1)RdMT7k-BLg~#DgOy=P?5SK zaO94d&C|((dGVgc73G607_g+``xsnVPR#JLgI3BdDHUv`2a`~}VqC0#x`pdo0tf!u zLGRaX^YVGOvRI)5o|Y%&<&>2Tq>+g6ruUY+eI=e38gCXV!qTm@>tPQhi78cX5wJ-7 z-`RA_e zaY&Gr^W8*uclM4{zx|As;*nGH2vV={_C!_9kk%Zh`J|CRz5G!nYUF}o?qINq#EMhl z27dLEERIwDs0lrSc%3`9@f&AGm*Yq$>(XZMCxM0`3qj_Oz{Lw2H&b@m#h-=_jdO+8 z`Wa*!7!X3px{AxX!7I`Y?6^r9Y(voGQfpP2!<~FIW@>?3)3#99oeUvVl~iJ)t*!`C zgV!s1?~5R=x;7UZQ&!eQt6R3`?v>(bWb?~ET({6ol=ha$DNWZ{j%|q=c$u7pJ2O?A zVjyhUTjTO8_!#TsBGc=|E46%_H)=O~Elt=u77(Kbq5H3Ig|iP&t(WoNf9-Ej*RC08 z>E&jez}eHH(>|M9Wxm*Sh#2qop!jcz_n!{=+J;pKnf|<7@9YX_;3~+V$fT zOja7WZlO~zNmDZ&x#7P)+%2$Fg}?0?_E@TaAhW)$@np_#Vb< zM;sQ;i9T&8X`BJ(c&38 zCNnC7p@=ux;8;5cpyBAH9F;VNs&_vV{jNnJ@29V~neX~zf>d;p2U!vpQ^zn^y~=?!{sJFiJk0Aju!_9 zGO^>gG@nl4YNa#%CfX9wcdrQMtN9!{@=%#Tc9PlUuHi}(npb!Jy6*!`IBFkX)o>3E zOpI`u*r`WX+l~BOZ(?;B%4&a>MbGMG$7dI}R|=v97V=HHe2X5P z+j{MqV4R4+_MbeL+?@VjYCdw#n$?{JP1uc(7Bu{^Y%#4J{O-5S62iCp3oNV^$QgA` z6D0~Rh+5u|o0>K}Z!}&Ux4SdLv*!CfV&8S7J1RHr&fnVG!V1}Ief*i9voY#C5+Sf$ zRJFZUlrI0DR++rNdMrA3$zA)cEaPao>+;-P7JkGC^j{&6xsDUN(5&){27xx&GuN#y z!dRlavNRiyE5!t&r8A(Ss2uJ2D}?&H*K0kV;pn*+x-vznwWG-Bm@%&Xi(J|-FkDO$ z_lgQ5I~xs9vX>oS$4!fyj=?xO_aCyi0yyg@a(4OhGD!&g*f35Fn*z4d;ImvB*Ry4P z6Dir09)S;bH%sKiJy_Mf7FEm}n(!wxmZjI^yP{04?A15291JZP3^#nFSAVhN8h$kF z{>j`^*JzoF6o^F^Y;S%xuMols`^nw+>8KE5y>#1=YP$*}Nb!~}*jzYS>TP|kaL?_x zre>YrMDE~r9~cjP9m;ggr7q0Y4yRadJt=xaQ_;rYe;#F8TMI#$NzST{!L)SE$YJ{-gF1OOIOZ zp2NG(i!`;vOc)-bl^lzU>bbVIxwTN4mTRMhGk+2_zOwkecQK|QXQV{uv8{<#&Hv2P zv3!5qsnx9%{L9+p2X>!Nl~m-6H?@LrU=s1=#TWPnVbP2E1*x|TmXiIrsSvzO^ZaVGM`(Q_!qV~z%1IbY;vLc_QuPAzchD-e9+rY)X*PQahED?Y- zLmzw!ChZnP65ZX&caxS6a#okd#N{4cXIVnu|9<18%Lb3I()~wGcRVHiimGyhP6Fbp*1+&Hm@d*QX zqKoqV56Sq*_%WGRu{!FHgnq`lm!HZ*Q*D3r_)2iZJ$&BUF@t-dYZRZ;ad8`rVyho^ zs@%+?04^Y*W54~6kPf-XDX%4aeel>XE;l_-i0>CXo%#yhC}3UtIN)ys7q7@@&Pd_J zzX0=Mu;FG0;kVE&ulLE19g0z?)y8#PQZ11&OTDQ5%g{&!e^#`5m3GwkMA&(i^wd62 zy67Umo9oFj1&`2z)l8AyjqC5AXxpOZp6_ADP-{QYw`jwLd!FN#0pEX$%2_ZT)yFyH zq^d4TIy#&m&b~AdjZSsjc&Aoe_PU3C@hvz7a{k?C!(q)&zhp4vln>Q#rQ5BgE9kyL zlkW`!j^L}irh13Y{R15HHNqq}9IEobzXQ~N*VhAk>lAi^t5YPL_xD7z)Xfa07FPFP zr*)bC{pnIi^D}iRhsDq1yU3owSlzSS??NMGyW1VV|4!^h&s>)X5&HI=1Uw*6NBlQ< z-_-U8REUu+R{#9>W8OBL&~pCFLY+ea!xAlZVG{3Fvj>s{UjORU{PLf^h}wqa>`I)? z8;Ry_75da&{jYT1aEA=|qP#dqJ_*LMd5Fv8w>{m~TJjV?5Dsp8_zCGYe!jMBVmnS?4va!?;xgSdRKCdPgqpC?1d)y_mk!yTC@td_X%*rHy2Y{nG<^2&6Lt%@h@#}sI zHz8cP1lGMC9k{}(#fVEzGP1r?doQl3@>EOcNa9rYm~4fZicM#O-329q*wL+!nKurX zZO>+9(h2U1_l+Bw2j>}Ich(<@Xu^5{mF5UIog~Cj?zSB7AO9Zhp+Du}9zVA++dLPZ zh)%mR+DM0e>LfyDdK^slIkPH)(gJ0enyZ?iRX1amJ-dB^*#f>0zm~0#o3STyBa~ry zIx=*biR(uOR0{oohQk%YNwG&0zpZg$+JbxSZCAVp5(H3#hXGS{4Rsy;)AMeyI?-|` za)vo6Cc$+&vj~7t<}e+NlcBJ}Xa9EX_nHKd3|DDa!jv~aYZ5=g#g^HbH z57=b`XaRsL`GK6Q%ck0en|BWvH_y;{UyCX_3A19t2x`^rR+FIJn9TbM?C_wz&BDXA ztr+(SKU6gn!DDC^&@677z?&>x9LAFLHrz3njfLbTr2IzKj&XkC>`<}VuCNmu>=4cE zbAkg&a=qboTOGrDyLN`}6e<+-e zX=V3WvPACf|JBXOGq3ObEtJXS->*RkMX;6P;Hsxqa6DfFA4L`2s`<|Xe9RJ^~$NyUQ>%4%PAW9 zRE(VSM~`21s$PDj;H|z4i6mPL88Kr{;!CMyb2uI(U0zd%*dZ^w`DPjSpwsP-6#dfx zwpZ-u-G%D!Lo^HFN;&cmAdc;=r#iS)%D7}y7!|MSk>buQMbng{!K|D-^Q)q0l~B|6Q2;3LnM|=ElunLO4Ih^X+fR^r#VM}s{G^_OPd=L1Y($V)2@7_7S_}-1X`aj>pm-9@`^rm$` zf5IE8AQ;M22yjB4piFa0kr{dJ#efmD7aXZ~J zXMieMp+=1{`_Q}4@5`~yE4~g@k~jP})Qb8*`}qP$HNV>1X`KzAy*5jfI6!{wxXVp{U@zekY2c_^%{RW2bp+vqMrh4uoA z(LWv6A4%KKtWTXNxip`lnXp705-DHmn@ba@6tDM-WvP2iMc$zd@B;4Qk>7XQz#IEU zP3R4D6!6Q*PqpO~{)>DCtGB&Doy5C&+%@|J*jC>~j(c!52MSNyxyV?Gh&|ZQf-3`O z|Mkpu#54k5s_N)YqEUyPj7WCdF}3*0R5Oul7NGT;%#;Rehuv$^$(;Ce-zxVb4EadS z<+z;l4Uw5;elGdWd*4_YkPX7|6eXC~E6nC&V0hTjG4N%*emiRC8VdyStSv-_I>yG^ zslcTkF9OO+g6X5wBK-Gx;@MvO18N}-bnZfpbz9wQsCEJa`prY3ZwLtyLZo_fQygRa zv*#+;MBS^J!iF~4CAypH!V1%E;Ww>vQPl{5)Pnjw;nN*BxT5Rm)W<(1%YooOirR=r zH#*GZP6oD$>s=xAX}}_>p3Qd?yYAgCTnPuSg0nNA93K|81oevybr?IH4yTlt!O++} z%W{%sy(n6sL#S9fj+P2hV8WP}Rm#+^som~5X<`I60?2cE|J(d8_9Xe6+9dG6EQO~u zWX5oI4v(HAaSiriL6`IL#LvbO8)3V{WEH~VvC|XGstnl5XM0WUnSF_Le0z@qmu)k2 zZWr*$NO2DKF`E2banD<1(x4n?c^9Tlkjt41t<5Sv&Z0mR#I*@4FA2L6B%d0sunJpDC;v zdS^3}1{Z4P*U!B6nyG#x99%H4PNoww$dgUs;^KWXp*KyhEYnGK!=1c?bmwgO>~Ig< zqn_1_+WIDm->Q|!>@8d@`A9ACb;#h=fp6FeH%M*U?e_W|c>h8g18h!=@3zl@+qcyK z00zqeOf^(NS@Gp7-qHD<;pC6ntB-C$iGQJmq@3DY@XUANZ0VpEBue}gzmTm@-XvUE zP8f6R3#LUq8tBQwj<;w9F)kJAVwIp(V)XtSm^EBJWrnvb(gwt4yDC`zuFmGJ7#PZN{uA`P$h&eaCw=7 zVAH$E)%DREg#;AI69M52Sf!4!KMa=WbnKA3h`5HXW8=VhGt7CSgB{ceGI%bRVu`r7 z(OFyVDOjCS@o|iXBB-cDnrJ$fFAU_V=QI*zkVjt)><7N20i=Z~+W8(vTpyKVC3n;+ zp(n`)W$K?VcTynY#S+l2@2vkXo-}Giyy)P1eXyz_3qd1!9W5ZMN(h4lD4aaWLx<#j zYQbw&Kq9YP|CZGOm0VnfZ_4`vVdS-6rwtwS^^i@#ZIaLepnyhqp0A?NQn6G&`>bX_T)5q*baYPMLE8S(G(=w&se{U@J+sxh}8 z8YIxMfs#XVi=~NYNQ@TO+K~YD|7l`PfVgyv<%toQVSwqBey82(Ydnt>jf(#5O6AjL zEKZ?j+<$Fpxvwra()Y%$D!|_N#O2p!_r0Qp?jwf%TRz*?`XzdlKJ%1^sPd zytw?HE;2dUMCDb1SLOSgF%q%5W5^{c_JI@GEDntth!k2=NV)sUOY>Z)p;&dYVeQi8^KDbS{p9LCM zJ5`CYT9pp;{Z?72g1E-@U@LDzyCc*Bg*h6aL&6DnU`S}VW{Zp6{`j_`ZKr$g?#|Bx zwf)xTztVBzbYWH*pH}`64CFAKHX+}(d|>eB3W>>4q-0&{0Er!(66@B$vo{daox}D% ztsO%SN2(Hr-W}WCQP3P}~ARZ%-4?gJ@t(0y&}=oqc0EX}>SbBlBv68*h9&o)4VrQ?CwvcadinCEE(I z?$p|BP;@bZlBEMQW#h+!Jb;Q0_G_ZFrDS+@%9Kpl!JDyE2sbl^tyQOeMV1kHpiH>2 z2#Q^nI_l7(6gdy^yh(h*G!n^(LDL4|-4!1Vj5yt}epJbeTvsPZ1#NzCPM&b7LkMW{ z4l>}}6+bI}pT$zEqOsE`hFeY+)^}2bv=Pb_!NHd!vJAV(bCj$q{!ejLmO5fZ2IMg| zImuRrB?z?nlb@UY5qO+Djls@*V!iXrXM@HHo^3ndJmAE;0h{EPk!qc}hD4ntGHF5> z1i>7C2|n}rOfv9^lF3f_Wl<|S!+NsRU6sAu`u{{HkhHS#?sH2+ByoNK{To}@yRJaPP4TI&x#Ju)w!6l^{#TOIJh62fNaWn#b-?$a zZ);^Z?oa8*Le$L|bZUv4;3{a2Aipg%8GDFtVHU$KoF<-d z15ZG|;h6x^lEkB106l=bU#xvK@`Qw01DAR0!}PwJJyf|QIX_w=+FVgY@=U-njn8_1 z`3hK%+8Rhr#=)aZ!Wd-;ouKUJYyN91k91Z-aoX12;3V~3mdrm2GqC|qcv-jOmmC;1 zAb9cwFs!pPTU??FaQaG4%>$zHgoyyzp}94vpl zx=sv$^+|&6G2mF44WIpAV6vn;tF%a75L1^pQl`iXqzSMAYi{CeI2t4t@TsxjAI`Ww zBT9YR(?(*voAf3l&4vw9$H=8~@A`DFF%8BS($yK*sT-WD>@t1{Vw>*%_P#_w&I3Ra zLy-zyQK{Rf)7|3@Yi#aEZys(?$|If-ciY%7xD{bdV$2rD|MX(weizpYPswA#DO6s* zleb!R~`OP%ymfRio$ z452w^QMjl(SPKl4_dnRlYzEds@`F&naf>ah$#%c|jPCqo0y;^VAXUKOJH+&$TOM38 zh^%9;bgnhr^M|!c)zH|vF3YNt<`Q$;+y(649yNvIsB+wq8gmP|wEzOF=blFrxr1pG zo-P4SaI#MfUJ)#y(Q+4>$P@Kd5sIc_~gS6rI=Z_6G4O;9!y=5Yp4 zp~aED7l8K0WVSAlRgt~{89TL3Zo+azq_dcY^d$*u(QoXk_uLK{2jv0K63JOffu-{n z$*ufS1>c0>Rem0>t1qqM0kWJ^p1{afM2!u*I-^TzkpGC**rx~_-qpzf(<0CbVQ5~M z4DbD*=wKyyA!S@5^ z3t)w;q_T>kSrMPfXC!C-8G-DJlb0YC%6`sGx4Db$6U%VjLL`_~C)+!9tN$vdetA-4?%Hl}9(I$tXasArSAPu0B zrE(_0Ac6|oywA-eH-GiG8a$kDlrEF6<1vn!D}(hu^bY5yuQ8Iv8y~!5*`2WQQJ$Ku z7pm}|tbOEGpcKK32@;5V>lZb_v&IH<1~(F1q;j>%jlTOdB*VcI>fMRlRMh}KQ3##; zjHm?l5AkP6&#;pkNN$sP#og~?7H|&%c#MKT5t9*4Wxd+xSlp6^D=FXrE~g3V9XuVN zb7)IiW;dj*!-zN9K*tq7ciZC_o}{dkG>x|tF&3Zz0Ad*4ob{}@z^oH_yb>ccNrt7) zd$S@t_fgoAZesH3|FA^UzLP%%julpSJ@M=E-yn_BHC6<*fLRn zCC*#9#_iAuEnig4Z*92#i_FB7mlfHLhU3d-!f#J>xU;j@g~jIzc)_^kg`toX;f z0i=@jtXIi*#KY{(D?aA#5H<2vf`pd;pKF_)x2K(-g9oyY()TUlr7o$0GR1UEL-0_F zccy{u)R}TBF*YVM;46SwV=i|JFAcpXiFqaDZBx@8aODi(3Ie+W$~sg)S-YBVvl8Q% zU$n!Q${?$;GR|o%rBn0(i{;-Afu*6Ph9V&L4ZELp^^BFBv3;CHDW*QE z9|jC`ch}wpQkW+q$Ut5Z?ne3FZ6XKy@YTQXbWTI=No65hspFO0LgJaPoU4ZSzC=v> zAV`&e?qGU|o4ScVMdvV6jBVxm#=mjys?n$?3;Ov#Bg$vrF#X^A$so9ld_-W;CY!QL^D&?5}8n&9#>{kt_&Po(roWpUFqN z%9L-1QVj3@=aV7ky^bK*b8}f7Vq5QIugIbDX zGR8drtdk+up1Q>=MQ(+5JA0vXESQ%+Z$)U0gc)LwufG1+zlSW0 zY!gK@l_SU^|J*wcvH9tZDb3k~iG{RiMmp;tip?gG*&?M%4~hxog%MhF2$N@G zt!yo8J#~tqPwl3?pXNm_(G?i@PK@Ubdd5dMP64Xj%x{zyIB(uGbxpUYWQcM>UZMj= ztop^GR$T&pwZO0$!jt#luEug>f1>eDQE$J#JiJ~aLAo|ms{!R1TlLRa$KA@xk)V;; z&X?b*w_)50HpEqX%uIjB%7vgoD&iCn;`e=i>HgmmV=rn8R%ao^Dmw_u32Fo*NPa{r z-e<>C1v_Xg2b*I}u9(vy@irN}&5ZY`QdHp|l;5nhBDhEY&E<71WKg~ocD5{N+QsKW zekQVWM;nUg?ah`cpko4eD|F11@^4c3U#7z^zlXU}9So``m}?GYi}+}JN3x)DsV*oY z{+kc+au}&u^1m*V95t3z*8Z)e>xUC`|ArHD1bTndxEy;_K~;wMPGBU7U&9adS)`U$ z11g}Zr=U|NbQ-Ke1@p>yN70-v=mN?bicBZ-KXI#WS! z!U}y`|7p>2ZUb*{Et}M#ZuktO70Uu@%7a8eFlNPL(}NMdL8fMq)C(t#WeRL1>p1RA zW-mgn&+pS-6Dub77(~>3u!mv|EQ=0ACNMm4!US?$OS7nHD9Afp-~%bgbT-J5CIE6* z@y4Am^(FI&vyeoJlncN~N7D;>i`n_c6rCbIBu&4s>*W!q3bA0)Z(QfgBj=1UO3)Ay z;#XtBWOeqFt1=7mLw;-)?4c^8RI>39ouDogB;c9`<4b9rg%slA6oX*>< ze^aXn5l9}}hk)>Z`FF<5K$utIIGG~Q;ZJmO8myN(*A-)N30 zYDJWyWaFR#C1j6&X2w{)SB zi0DtfQhGVw`kRON=2O+txC+MHJcBHCvL~=bYdp;}t@bC0Z{WPEUcVvP_gcwJ|4leP z5;8BD=*u#K@QtV7mrhv*i4HD7BJ>6Rxe|_;|F(}9QKD1S%;`qev}ge(SbIX!uMkwz z7R$FH{bnu8cukc@)Z-jBvpQ|2Uql88!K8#{NI!KtMoI|IhlJpl2MNJGkZybxnnt2z zow%HZ-iny%6X?hp_tNqY?Lq2m?I|KbWY~;A4XMS{kd+(^Da8yz{BJqQ8Q0-7IzWyu zymF}Q`ow+rEt6}O;4?ldm>Rby_f?#tmlGRCfJsl;YbfDSvXq70{V$J2lx>U7j51%4hvB6JBk36qPsAm}WqY(J4|0bW;X%W)fA(#Bgj1of5=#`ewdmgfp zJyEiQ*(Ki+^snt^sn?&4@ie06xU+o(V44+7^CnCOKvI1GBLkbWPe{m&8GWqzQ*J|^8FX&RaL z5v=G@NSO5plRby5c63?!)>Fuarp1O4)ADU|VSVQy$D421OoEgo4F+~i&(Ab2%ivi9 zd;~rv7m~fgdIcM#QD2ALdO=@j*gT$Ydov}ED>?b0u}6bg z(LDUsq^~5{YW0CwRt`D5vRFJt%0CCsgv3Dhoa(Kf*XpQ(OMOvd^};6(MMw3m2`JfTPuia4m&uF^FB%-K*8o_Lp+ k#1Vr-+oGiKmiyeJld^PjqF>>UKM+LYijHc5vem=?1J;-Ewg3PC literal 0 HcmV?d00001 -- Gitee From 5998239dd8e82ef8c1489dc99e88fb11edaf55ab Mon Sep 17 00:00:00 2001 From: cui-gaoleng <562344211@qq.com> Date: Mon, 25 Nov 2024 09:44:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=A1=8C=E9=9D=A2icon=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 0012-replace-icon.patch | 2 +- calamares.spec | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/0012-replace-icon.patch b/0012-replace-icon.patch index b768ec0..bcfd6ba 100644 --- a/0012-replace-icon.patch +++ b/0012-replace-icon.patch @@ -20,7 +20,7 @@ index 9d33495..00c2368 100644 Exec=sh -c "pkexec calamares -style Adwaita" Comment=Calamares — System Installer -Icon=calamares -+Icon=/data/images/openEuler-icon.png ++Icon=/usr/share/calamares/branching/default/openEuler-icon.png Terminal=false StartupNotify=true Categories=Qt;System; diff --git a/calamares.spec b/calamares.spec index fa66cd2..e4cea87 100644 --- a/calamares.spec +++ b/calamares.spec @@ -217,7 +217,7 @@ mkdir -p %{_builddir}/calamares-3.3.7/data/images install -Dm 0644 %{SOURCE8} %{_builddir}/calamares-3.3.7/data/images/Biglogo.svgz install -Dm 0644 %{SOURCE9} %{_builddir}/calamares-3.3.7/data/images/Biglogo.svg install -Dm 0644 %{SOURCE16} %{_builddir}/calamares-3.3.7/data/images/information.svgz -install -Dm 0644 %{SOURCE20} %{_builddir}/calamares-3.3.7/data/images/openEuler-icon.png + mkdir -p %{_builddir}/calamares-3.3.7/src/modules/packagechooser/images install -Dm 0644 %{SOURCE10} %{_builddir}/calamares-3.3.7/src/branding/default/Biglogo.png install -Dm 0644 %{SOURCE11} %{_builddir}/calamares-3.3.7/src/modules/packagechooser/images/Minimal-Install.png @@ -231,6 +231,7 @@ install -Dm 0644 %{SOURCE15} %{_builddir}/calamares-3.3.7/src/branding/default/S install -Dm 0644 %{SOURCE17} %{_builddir}/calamares-3.3.7/src/branding/default/openEuler.png install -Dm 0644 %{SOURCE18} %{_builddir}/calamares-3.3.7/src/branding/default/openEulerWord-blus.png install -Dm 0644 %{SOURCE19} %{_builddir}/calamares-3.3.7/src/branding/default/openEulerWord.png +install -Dm 0644 %{SOURCE20} %{_builddir}/calamares-3.3.7/src/branding/default/openEuler-icon.png %build mkdir build cd build @@ -266,7 +267,6 @@ mkdir -p %{buildroot}/data/images install -Dm 0644 %{SOURCE8} %{buildroot}/data/images/Biglogo.svgz install -Dm 0644 %{SOURCE9} %{buildroot}/data/images/Biglogo.svg install -Dm 0644 %{SOURCE16} %{buildroot}/data/images/information.svgz -install -Dm 0644 %{SOURCE20} %{buildroot}/data/images/openEuler-icon.png # calamares模块图片目录 mkdir -p %{buildroot}%{_datadir}/calamares/modules/packagechooser/images install -Dm 0644 %{SOURCE10} %{buildroot}%{_datadir}/calamares/branding/default/Biglogo.png @@ -281,7 +281,7 @@ install -Dm 0644 %{SOURCE15} %{buildroot}%{_datadir}/calamares/branding/default/ install -Dm 0644 %{SOURCE17} %{buildroot}%{_datadir}/calamares/branding/default/openEuler.png install -Dm 0644 %{SOURCE18} %{buildroot}%{_datadir}/calamares/branding/default/openEulerWord-blus.png install -Dm 0644 %{SOURCE19} %{buildroot}%{_datadir}/calamares/branding/default/openEulerWord.png - +install -Dm 0644 %{SOURCE20} %{buildroot}%{_datadir}/calamares/branding/default/openEuler-icon.png %files %doc AUTHORS %license LICENSES/* @@ -308,7 +308,6 @@ install -Dm 0644 %{SOURCE19} %{buildroot}%{_datadir}/calamares/branding/default/ /data/images/Biglogo.svgz /data/images/Biglogo.svg /data/images/information.svgz -/data/images/openEuler-icon.png %dir /data/config-appimage/ %dir /data/config-appimage/branding/ %dir /data/config-appimage/branding/default/ @@ -319,7 +318,7 @@ install -Dm 0644 %{SOURCE19} %{buildroot}%{_datadir}/calamares/branding/default/ %{_datadir}/calamares/branding/default/openEulerWord-blus.png %{_datadir}/calamares/branding/default/openEulerWord.png %{_datadir}/calamares/branding/default/openEuler.png - +%{_datadir}/calamares/branding/default/openEuler-icon.png %files libs %{_libdir}/libcalamares.so.* %{_libdir}/libcalamaresui.so.* -- Gitee From d295b208f2b8e556dee01562e762dfef045ee6ed Mon Sep 17 00:00:00 2001 From: cui-gaoleng <562344211@qq.com> Date: Mon, 25 Nov 2024 16:18:59 +0800 Subject: [PATCH 3/3] =?UTF-8?q?bug=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 0012-replace-icon.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/0012-replace-icon.patch b/0012-replace-icon.patch index bcfd6ba..9a36c87 100644 --- a/0012-replace-icon.patch +++ b/0012-replace-icon.patch @@ -20,7 +20,7 @@ index 9d33495..00c2368 100644 Exec=sh -c "pkexec calamares -style Adwaita" Comment=Calamares — System Installer -Icon=calamares -+Icon=/usr/share/calamares/branching/default/openEuler-icon.png ++Icon=/usr/share/calamares/branding/default/openEuler-icon.png Terminal=false StartupNotify=true Categories=Qt;System; -- Gitee