September 2022 - openSUSE Commits - openSUSE Mailing Lists

commit deepin-calendar for openSUSE:Factory
by Source-Sync 01 Sep '22

01 Sep '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package deepin-calendar for openSUSE:Factory checked in at 2022-09-01 22:10:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deepin-calendar (Old) and /work/SRC/openSUSE:Factory/.deepin-calendar.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "deepin-calendar" Thu Sep 1 22:10:00 2022 rev:7 rq:999753 version:5.8.30 Changes: -------- --- /work/SRC/openSUSE:Factory/deepin-calendar/deepin-calendar.changes 2022-04-22 21:54:27.870820371 +0200 +++ /work/SRC/openSUSE:Factory/.deepin-calendar.new.2083/deepin-calendar.changes 2022-09-01 22:10:50.580190323 +0200 @@ -1,0 +2,8 @@ +Sat Jul 2 14:38:17 UTC 2022 - Hillwood Yang <hillwood(a)opensuse.org> + +- Update version to 5.8.30 + * Optimmze ui + * Fix bugs + * Update translations + +------------------------------------------------------------------- @@ -6 +14 @@ - * Optmize ui + * Optimize ui Old: ---- dde-calendar-5.8.29.tar.gz New: ---- dde-calendar-5.8.30.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deepin-calendar.spec ++++++ --- /var/tmp/diff_new_pack.pARvCo/_old 2022-09-01 22:10:51.112191777 +0200 +++ /var/tmp/diff_new_pack.pARvCo/_new 2022-09-01 22:10:51.112191777 +0200 @@ -25,7 +25,7 @@ %endif Name: deepin-calendar -Version: 5.8.29 +Version: 5.8.30 Release: 0 Summary: A calendar application for Deepin Desktop License: GPL-3.0-or-later ++++++ dde-calendar-5.8.29.tar.gz -> dde-calendar-5.8.30.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-calendar-5.8.29/CMakeLists.txt new/dde-calendar-5.8.30/CMakeLists.txt --- old/dde-calendar-5.8.29/CMakeLists.txt 2022-03-09 03:08:24.000000000 +0100 +++ new/dde-calendar-5.8.30/CMakeLists.txt 2022-04-21 07:13:09.000000000 +0200 @@ -15,6 +15,12 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -O2 -Wl,--gc-sections") endif() +#�� +if(CMAKE_COVERAGE_ARG STREQUAL "CMAKE_COVERAGE_ARG_ON") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -fprofile-arcs -ftest-coverage") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -fprofile-arcs -ftest-coverage") +endif() + macro(SUBDIRLIST result curdir) file(GLOB children RELATIVE ${curdir} ${curdir}/*) set(dirlist "") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-calendar-5.8.29/calendar-client/CMakeLists.txt new/dde-calendar-5.8.30/calendar-client/CMakeLists.txt --- old/dde-calendar-5.8.29/calendar-client/CMakeLists.txt 2022-03-09 03:08:24.000000000 +0100 +++ new/dde-calendar-5.8.30/calendar-client/CMakeLists.txt 2022-04-21 07:13:09.000000000 +0200 @@ -18,7 +18,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) -set(CMAKE_CXX_FLAGS "-Wl,--as-needed -fPIE") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--as-needed -fPIE") set(CMAKE_EXE_LINKER_FLAGS "-pie") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-calendar-5.8.29/calendar-client/src/customWidget/ctitlewidget.cpp new/dde-calendar-5.8.30/calendar-client/src/customWidget/ctitlewidget.cpp --- old/dde-calendar-5.8.29/calendar-client/src/customWidget/ctitlewidget.cpp 2022-03-09 03:08:24.000000000 +0100 +++ new/dde-calendar-5.8.30/calendar-client/src/customWidget/ctitlewidget.cpp 2022-04-21 07:13:09.000000000 +0200 @@ -97,10 +97,18 @@ m_searchEdit->setAccessibleName("SearchEdit"); DFontSizeManager::instance()->bind(m_searchEdit, DFontSizeManager::T6); m_searchEdit->setFixedHeight(36); - // m_searchEdit->setMinimumWidth(240); - // m_searchEdit->setMaximumWidth(354); m_searchEdit->setFont(viewfont); m_searchEdit->lineEdit()->installEventFilter(this); + connect(m_searchEdit, &DSearchEdit::searchAborted, [&] { + //�� + slotSearchEditFocusChanged(false); + }); + + //�� + m_searchPush = new DIconButton(this); + m_searchPush->setFixedSize(36, 36); + m_searchPush->setIcon(QIcon::fromTheme("search")); + connect(m_searchPush, &DIconButton::clicked, this, &CTitleWidget::slotShowSearchEdit); //�� m_newScheduleBtn = new DIconButton(this); @@ -109,18 +117,34 @@ //��+ m_newScheduleBtn->setIcon(style.standardIcon(DStyle::SP_IncreaseElement)); + //��widget�� + QWidget *leftWidget = new QWidget(this); + { + QHBoxLayout *layout = new QHBoxLayout; + layout->setContentsMargins(0, 0, 0, 0); + layout->addWidget(m_buttonBox, Qt::AlignLeft); + layout->addStretch(); + layout->addWidget(m_searchEdit, Qt::AlignCenter); + layout->addStretch(); + layout->addWidget(m_searchPush, Qt::AlignRight); + leftWidget->setLayout(layout); + } + QHBoxLayout *layout = new QHBoxLayout; layout->setContentsMargins(0, 0, 0, 0); - layout->addWidget(m_buttonBox, Qt::AlignLeft); - layout->addStretch(); - layout->addWidget(m_searchEdit, Qt::AlignCenter); - layout->addStretch(); + layout->addWidget(leftWidget); layout->addWidget(m_newScheduleBtn, Qt::AlignRight); this->setLayout(layout); //��buttonBox setFocusProxy(m_buttonBox); } +void CTitleWidget::setShowState(CTitleWidget::Title_State state) +{ + m_showState = state; + stateUpdate(); +} + DButtonBox *CTitleWidget::buttonBox() const { return m_buttonBox; @@ -136,9 +160,43 @@ return m_newScheduleBtn; } -void CTitleWidget::resizeEvent(QResizeEvent *event) +void CTitleWidget::stateUpdate() +{ + switch (m_showState) { + case Title_State_Mini: { + //�� + if (m_searchEdit->text().isEmpty() && !m_searchEdit->lineEdit()->hasFocus()) { + m_searchPush->show(); + m_searchEdit->hide(); + } else { + miniStateShowSearchEdit(); + } + } break; + default: { + m_searchEdit->show(); + if (m_searchPush->hasFocus()) { + m_searchEdit->setFocus(); + } + m_buttonBox->show(); + m_searchPush->hide(); + normalStateUpdateSearchEditWidth(); + setFocusProxy(m_buttonBox); + } break; + } +} + +void CTitleWidget::miniStateShowSearchEdit() +{ + m_buttonBox->hide(); + m_searchPush->hide(); + m_searchEdit->setMaximumWidth(width()); + m_searchEdit->show(); + //�� + setFocusProxy(nullptr); +} + +void CTitleWidget::normalStateUpdateSearchEditWidth() { - QWidget::resizeEvent(event); int padding = qMax(m_buttonBox->width(), m_newScheduleBtn->width()); //��widget�� int searchWidth = width() - 2 * padding; @@ -148,7 +206,15 @@ } else if (searchWidth > 354) { searchWidth = 354; } - m_searchEdit->setFixedWidth(searchWidth); + m_searchEdit->setMaximumWidth(searchWidth); +} + +void CTitleWidget::resizeEvent(QResizeEvent *event) +{ + QWidget::resizeEvent(event); + if (m_showState == Title_State_Normal) { + normalStateUpdateSearchEditWidth(); + } } bool CTitleWidget::eventFilter(QObject *o, QEvent *e) @@ -168,7 +234,33 @@ if (focusOutEvent->reason() == Qt::TabFocusReason) { emit signalSearchFocusSwitch(); } + //�� + if (focusOutEvent->reason() == Qt::TabFocusReason + || focusOutEvent->reason() == Qt::MouseFocusReason) { + slotSearchEditFocusChanged(false); + } } } return QWidget::eventFilter(o, e); } + +void CTitleWidget::slotShowSearchEdit() +{ + miniStateShowSearchEdit(); + m_searchEdit->setFocus(); +} + +void CTitleWidget::slotSearchEditFocusChanged(bool onFocus) +{ + //�� + if (onFocus || !m_searchEdit->text().isEmpty()) { + return; + } + //�� + if (m_showState == Title_State_Mini) { + m_buttonBox->show(); + m_searchEdit->hide(); + m_searchPush->show(); + setFocusProxy(m_buttonBox); + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-calendar-5.8.29/calendar-client/src/customWidget/ctitlewidget.h new/dde-calendar-5.8.30/calendar-client/src/customWidget/ctitlewidget.h --- old/dde-calendar-5.8.29/calendar-client/src/customWidget/ctitlewidget.h 2022-03-09 03:08:24.000000000 +0100 +++ new/dde-calendar-5.8.30/calendar-client/src/customWidget/ctitlewidget.h 2022-04-21 07:13:09.000000000 +0200 @@ -33,7 +33,17 @@ { Q_OBJECT public: + enum Title_State { + Title_State_Mini, //�� + Title_State_Normal //�� + }; + explicit CTitleWidget(QWidget *parent = nullptr); + /** + * @brief setShowState �� + * @param state + */ + void setShowState(Title_State state); DButtonBox *buttonBox() const; @@ -41,6 +51,22 @@ DIconButton *newScheduleBtn() const; +private: + /** + * @brief stateUpdate �� + */ + void stateUpdate(); + + /** + * @brief miniStateShowSearchEdit �� + */ + void miniStateShowSearchEdit(); + + /** + * @brief normalStateUpdateSearchEditWidth �� + */ + void normalStateUpdateSearchEditWidth(); + protected: void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE; bool eventFilter(QObject *o, QEvent *e) override; @@ -48,10 +74,22 @@ void signalSetButtonFocus(); void signalSearchFocusSwitch(); public slots: + /** + * @brief slotShowSearchEdit �� + */ + void slotShowSearchEdit(); + /** + * @brief slotSearchEditFocusChanged �� + * @param onFocus �� + */ + void slotSearchEditFocusChanged(bool onFocus); + private: - CButtonBox *m_buttonBox {}; - DSearchEdit *m_searchEdit {}; - DIconButton *m_newScheduleBtn {}; //�� + CButtonBox *m_buttonBox {nullptr}; + DSearchEdit *m_searchEdit {nullptr}; + DIconButton *m_newScheduleBtn {nullptr}; //�� + DIconButton *m_searchPush {nullptr}; + Title_State m_showState {Title_State_Normal}; }; #endif // CTITLEWIDGET_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-calendar-5.8.29/calendar-client/src/customWidget/scheduleview.cpp new/dde-calendar-5.8.30/calendar-client/src/customWidget/scheduleview.cpp --- old/dde-calendar-5.8.29/calendar-client/src/customWidget/scheduleview.cpp 2022-03-09 03:08:24.000000000 +0100 +++ new/dde-calendar-5.8.30/calendar-client/src/customWidget/scheduleview.cpp 2022-04-21 07:13:09.000000000 +0200 @@ -435,10 +435,6 @@ connect(m_graphicsView, &CGraphicsView::signalGotoDayView, this, &CScheduleView::slotCurrentScheduleDate); - connect(m_alldaylist, &CAllDayEventWeekView::signalViewtransparentFrame, this, - &CScheduleView::signalViewtransparentFrame); - connect(m_graphicsView, &CGraphicsView::signalViewtransparentFrame, this, - &CScheduleView::signalViewtransparentFrame); //�� connect(m_graphicsView, &CAllDayEventWeekView::signalAngleDelta, this, &CScheduleView::signalAngleDelta); connect(m_alldaylist, &CAllDayEventWeekView::signalAngleDelta, this, &CScheduleView::signalAngleDelta); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-calendar-5.8.29/calendar-client/src/customWidget/scheduleview.h new/dde-calendar-5.8.30/calendar-client/src/customWidget/scheduleview.h --- old/dde-calendar-5.8.29/calendar-client/src/customWidget/scheduleview.h 2022-03-09 03:08:24.000000000 +0100 +++ new/dde-calendar-5.8.30/calendar-client/src/customWidget/scheduleview.h 2022-04-21 07:13:09.000000000 +0200 @@ -52,7 +52,6 @@ void setTimeFormat(QString timeformat); signals: void signalsCurrentScheduleDate(QDate date); - void signalViewtransparentFrame(int type); /** * @brief signalAngleDelta �� * @param delta �� diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-calendar-5.8.29/calendar-client/src/dialog/myscheduleview.cpp new/dde-calendar-5.8.30/calendar-client/src/dialog/myscheduleview.cpp --- old/dde-calendar-5.8.29/calendar-client/src/dialog/myscheduleview.cpp 2022-03-09 03:08:24.000000000 +0100 +++ new/dde-calendar-5.8.30/calendar-client/src/dialog/myscheduleview.cpp 2022-04-21 07:13:09.000000000 +0200 @@ -55,11 +55,6 @@ focusNextPrevChild(false); } -CMyScheduleView::~CMyScheduleView() -{ - emit signalViewtransparentFrame(0); -} - /** * @brief CMyScheduleView::AutoFeed �� * @param text @@ -157,12 +152,6 @@ widget->setPalette(palette); } -void CMyScheduleView::showEvent(QShowEvent *event) -{ - Q_UNUSED(event); - emit signalViewtransparentFrame(1); -} - bool CMyScheduleView::eventFilter(QObject *o, QEvent *e) { if (e->type() == QEvent::FontChange) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-calendar-5.8.29/calendar-client/src/dialog/myscheduleview.h new/dde-calendar-5.8.30/calendar-client/src/dialog/myscheduleview.h --- old/dde-calendar-5.8.29/calendar-client/src/dialog/myscheduleview.h 2022-03-09 03:08:24.000000000 +0100 +++ new/dde-calendar-5.8.30/calendar-client/src/dialog/myscheduleview.h 2022-04-21 07:13:09.000000000 +0200 @@ -40,14 +40,12 @@ Q_OBJECT public: explicit CMyScheduleView(const ScheduleDataInfo &schduleInfo, QWidget *parent = nullptr); - ~CMyScheduleView() override; ScheduleDataInfo getSchedules() { return m_scheduleInfo; } signals: void signalsEditorDelete(int type = 0); - void signalViewtransparentFrame(int type); public slots: //�� void slotBtClick(int buttonIndex, const QString &buttonName); @@ -62,7 +60,6 @@ //�� void setPaletteTextColor(QWidget *widget, QColor textColor); protected: - void showEvent(QShowEvent *event) override; bool eventFilter(QObject *o, QEvent *e) override; void updateDateTimeFormat() override; private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-calendar-5.8.29/calendar-client/src/dialog/scheduledlg.cpp new/dde-calendar-5.8.30/calendar-client/src/dialog/scheduledlg.cpp --- old/dde-calendar-5.8.29/calendar-client/src/dialog/scheduledlg.cpp 2022-03-09 03:08:24.000000000 +0100 +++ new/dde-calendar-5.8.30/calendar-client/src/dialog/scheduledlg.cpp 2022-04-21 07:13:09.000000000 +0200 @@ -521,12 +521,6 @@ return DCalendarDDialog::eventFilter(obj, pEvent); } -void CScheduleDlg::showEvent(QShowEvent *event) -{ - Q_UNUSED(event); - emit signalViewtransparentFrame(1); -} - void CScheduleDlg::closeEvent(QCloseEvent *event) { DDialog::closeEvent(event); @@ -536,7 +530,6 @@ } else { reject(); } - emit signalViewtransparentFrame(0); } void CScheduleDlg::changeEvent(QEvent *event) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-calendar-5.8.29/calendar-client/src/dialog/scheduledlg.h new/dde-calendar-5.8.30/calendar-client/src/dialog/scheduledlg.h --- old/dde-calendar-5.8.29/calendar-client/src/dialog/scheduledlg.h 2022-03-09 03:08:24.000000000 +0100 +++ new/dde-calendar-5.8.30/calendar-client/src/dialog/scheduledlg.h 2022-04-21 07:13:09.000000000 +0200 @@ -51,33 +51,32 @@ * @param begin ��DateTime�� * @param end �� (DateTime�� */ - void updateEndTimeListAndTimeDiff(const QDateTime &begin ,const QDateTime &end); + void updateEndTimeListAndTimeDiff(const QDateTime &begin, const QDateTime &end); /** * @brief updateEndTimeList �� * @param begin ��(time) * @param isShowTimeInterval �� */ - void updateEndTimeList(const QTime &begin,bool isShowTimeInterval); + void updateEndTimeList(const QTime &begin, bool isShowTimeInterval); signals: - void signalViewtransparentFrame(int type); void signalScheduleUpdate(int id = 0); public slots: /** * @brief �� - * + * */ void slotBeginTimeChange(); /** * @brief �� - * + * */ void slotEndTimeChange(); /** * @brief �� - * + * */ void slotEndDateChange(const QDate &date); //�� @@ -90,7 +89,6 @@ void sloteRpeatactivated(int index); protected: bool eventFilter(QObject *obj, QEvent *pEvent) override; - void showEvent(QShowEvent *event) override; void closeEvent(QCloseEvent *event) override; void changeEvent(QEvent *event) override; void updateDateTimeFormat() override; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-calendar-5.8.29/calendar-client/src/main.cpp new/dde-calendar-5.8.30/calendar-client/src/main.cpp --- old/dde-calendar-5.8.29/calendar-client/src/main.cpp 2022-03-09 03:08:24.000000000 +0100 +++ new/dde-calendar-5.8.30/calendar-client/src/main.cpp 2022-04-21 07:13:09.000000000 +0200 @@ -27,7 +27,7 @@ #include <DApplication> #include <DLog> -#include <DApplicationHelper> +#include <DGuiApplicationHelper> #include <DApplicationSettings> #include <QDBusConnection> @@ -101,7 +101,7 @@ if (!dbus.registerObject("/com/deepin/Calendar", &ww)) { qWarning() << "registerObject Error:" << dbus.lastError(); } - ww.slotTheme(DApplicationHelper::instance()->themeType()); + ww.slotTheme(DGuiApplicationHelper::instance()->themeType()); ww.show(); PERF_PRINT_END("POINT-01"); return app->exec(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-calendar-5.8.29/calendar-client/src/scheduleTask/cscheduleoperation.cpp new/dde-calendar-5.8.30/calendar-client/src/scheduleTask/cscheduleoperation.cpp --- old/dde-calendar-5.8.29/calendar-client/src/scheduleTask/cscheduleoperation.cpp 2022-03-09 03:08:24.000000000 +0100 +++ new/dde-calendar-5.8.30/calendar-client/src/scheduleTask/cscheduleoperation.cpp 2022-04-21 07:13:09.000000000 +0200 @@ -54,7 +54,6 @@ } else { //�� if (newInfo.getAllDay() != oldInfo.getAllDay()) { - emit signalViewtransparentFrame(1); CScheduleCtrlDlg msgBox(m_widget); msgBox.setText( tr("All occurrences of a repeating event must have the same all-day status.")); @@ -62,7 +61,6 @@ msgBox.addPushButton(tr("Cancel", "button"), true); msgBox.addWaringButton(tr("Change All"), true); msgBox.exec(); - emit signalViewtransparentFrame(0); if (msgBox.clickButton() == 0) { _result = false; @@ -72,14 +70,12 @@ } } else if (oldInfo.getRepetitionRule().getRuleId() != newInfo.getRepetitionRule().getRuleId()) { //�� - emit signalViewtransparentFrame(1); CScheduleCtrlDlg msgBox(m_widget); msgBox.setText(tr("You are changing the repeating rule of this event.")); msgBox.setInformativeText(tr("Do you want to change all occurrences?")); msgBox.addPushButton(tr("Cancel", "button"), true); msgBox.addWaringButton(tr("Change All"), true); msgBox.exec(); - emit signalViewtransparentFrame(0); if (msgBox.clickButton() == 0) { _result = false; } else if (msgBox.clickButton() == 1) { @@ -102,14 +98,12 @@ bool _restuleBool {false}; //�� if (scheduleInfo.getRepetitionRule().getRuleId() == 0) { - emit signalViewtransparentFrame(1); CScheduleCtrlDlg msgBox(m_widget); msgBox.setText(tr("You are deleting an event.")); msgBox.setInformativeText(tr("Are you sure you want to delete this event?")); msgBox.addPushButton(tr("Cancel", "button"), true); msgBox.addWaringButton(tr("Delete", "button"), true); msgBox.exec(); - emit signalViewtransparentFrame(0); if (msgBox.clickButton() == 0) { return false; } else if (msgBox.clickButton() == 1) { @@ -119,7 +113,6 @@ } else { //�� if (scheduleInfo.getRecurID() == 0) { - emit signalViewtransparentFrame(1); CScheduleCtrlDlg msgBox(m_widget); msgBox.setText(tr("You are deleting an event.")); msgBox.setInformativeText(tr("Do you want to delete all occurrences of this event, or only the selected occurrence?")); @@ -127,7 +120,6 @@ msgBox.addPushButton(tr("Delete All")); msgBox.addWaringButton(tr("Delete Only This Event")); msgBox.exec(); - emit signalViewtransparentFrame(0); if (msgBox.clickButton() == 0) { return false; } else if (msgBox.clickButton() == 1) { @@ -143,7 +135,6 @@ _restuleBool = true; } } else { - emit signalViewtransparentFrame(1); CScheduleCtrlDlg msgBox(m_widget); msgBox.setText(tr("You are deleting an event.")); msgBox.setInformativeText(tr("Do you want to delete this and all future occurrences of this event, or only the selected occurrence?")); @@ -151,7 +142,6 @@ msgBox.addPushButton(tr("Delete All Future Events")); msgBox.addWaringButton(tr("Delete Only This Event")); msgBox.exec(); - emit signalViewtransparentFrame(0); if (msgBox.clickButton() == 0) { return false; @@ -227,7 +217,6 @@ bool _result{false}; //�� if (newinfo.getRecurID() == 0) { - emit signalViewtransparentFrame(1); CScheduleCtrlDlg msgBox(m_widget); msgBox.setText(tr("You are changing a repeating event.")); msgBox.setInformativeText( @@ -237,7 +226,6 @@ msgBox.addPushButton(tr("All")); msgBox.addsuggestButton(tr("Only This Event")); msgBox.exec(); - emit signalViewtransparentFrame(0); if (msgBox.clickButton() == 0) { _result = false; @@ -261,7 +249,6 @@ _result = changeOnlyInfo(newinfo, oldinfo); } } else { - emit signalViewtransparentFrame(1); CScheduleCtrlDlg msgBox(m_widget); msgBox.setText(tr("You are changing a repeating event.")); msgBox.setInformativeText( @@ -271,7 +258,6 @@ msgBox.addPushButton(tr("All Future Events")); msgBox.addsuggestButton(tr("Only This Event")); msgBox.exec(); - emit signalViewtransparentFrame(0); if (msgBox.clickButton() == 0) { _result = false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-calendar-5.8.29/calendar-client/src/scheduleTask/cscheduleoperation.h new/dde-calendar-5.8.30/calendar-client/src/scheduleTask/cscheduleoperation.h --- old/dde-calendar-5.8.29/calendar-client/src/scheduleTask/cscheduleoperation.h 2022-03-09 03:08:24.000000000 +0100 +++ new/dde-calendar-5.8.30/calendar-client/src/scheduleTask/cscheduleoperation.h 2022-04-21 07:13:09.000000000 +0200 @@ -56,7 +56,6 @@ //�� void changeRepetitionRule(ScheduleDataInfo &newinfo, const ScheduleDataInfo &oldinfo); signals: - void signalViewtransparentFrame(const int id = 0); public slots: private: CScheduleDBus *m_DBusManager = nullptr; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-calendar-5.8.29/calendar-client/src/view/alldayeventview.cpp new/dde-calendar-5.8.30/calendar-client/src/view/alldayeventview.cpp --- old/dde-calendar-5.8.29/calendar-client/src/view/alldayeventview.cpp 2022-03-09 03:08:24.000000000 +0100 +++ new/dde-calendar-5.8.30/calendar-client/src/view/alldayeventview.cpp 2022-04-21 07:13:09.000000000 +0200 @@ -64,14 +64,12 @@ void CAllDayEventWeekView::slotCreate(const QDateTime &date) { - emit signalViewtransparentFrame(1); CScheduleDlg dlg(1, this); dlg.setDate(date); dlg.setAllDay(true); if (dlg.exec() == DDialog::Accepted) { emit signalsUpdateSchedule(); } - emit signalViewtransparentFrame(0); } bool CAllDayEventWeekView::IsEqualtime(const QDateTime &timeFirst, const QDateTime &timeSecond) @@ -326,12 +324,10 @@ m_createDate.setTime(QTime::currentTime()); slotCreate(m_createDate); } else { - emit signalViewtransparentFrame(1); m_updateDflag = false; CMyScheduleView dlg(item->getData(), this); connect(&dlg, &CMyScheduleView::signalsEditorDelete, this, &CAllDayEventWeekView::slotDoubleEvent); dlg.exec(); - emit signalViewtransparentFrame(0); disconnect(&dlg, &CMyScheduleView::signalsEditorDelete, this, &CAllDayEventWeekView::slotDoubleEvent); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-calendar-5.8.29/calendar-client/src/view/draginfographicsview.cpp new/dde-calendar-5.8.30/calendar-client/src/view/draginfographicsview.cpp --- old/dde-calendar-5.8.29/calendar-client/src/view/draginfographicsview.cpp 2022-03-09 03:08:24.000000000 +0100 +++ new/dde-calendar-5.8.30/calendar-client/src/view/draginfographicsview.cpp 2022-04-21 07:13:09.000000000 +0200 @@ -333,21 +333,17 @@ QAction *action_t = m_rightMenu->exec(QCursor::pos()); if (action_t == m_editAction) { - emit signalViewtransparentFrame(1); CScheduleDlg dlg(0, this); dlg.setData(infoitem->getData()); if (dlg.exec() == DDialog::Accepted) { emit signalsUpdateSchedule(); } - emit signalViewtransparentFrame(0); } else if (action_t == m_deleteAction) { DeleteItem(infoitem->getData()); } } else { - emit signalViewtransparentFrame(1); CMyScheduleView dlg(infoitem->getData(), this); dlg.exec(); - emit signalViewtransparentFrame(0); } } else { RightClickToCreate(listItem, event->pos()); @@ -493,8 +489,6 @@ void DragInfoGraphicsView::updateScheduleInfo(const ScheduleDataInfo &info) { CScheduleOperation _scheduleOperation(this); - //�� - connect(&_scheduleOperation, &CScheduleOperation::signalViewtransparentFrame, this, &DragInfoGraphicsView::signalViewtransparentFrame); if (_scheduleOperation.changeSchedule(info, m_PressScheduleInfo)) { //�� m_hasUpdateMark = true; @@ -575,7 +569,6 @@ if (MeetCreationConditions(m_MoveDate)) { //��leaveEvent�� m_DragStatus = NONE; - emit signalViewtransparentFrame(1); CScheduleDlg dlg(1, this); dlg.setData(m_DragScheduleInfo); //�� @@ -586,7 +579,6 @@ } //�� setPressSelectInfo(ScheduleDataInfo()); - emit signalViewtransparentFrame(0); } break; case ChangeBegin: @@ -653,11 +645,9 @@ */ void DragInfoGraphicsView::DeleteItem(const ScheduleDataInfo &info) { - emit signalViewtransparentFrame(1); //�� CScheduleOperation _scheduleOperation(this); _scheduleOperation.deleteSchedule(info); - emit signalViewtransparentFrame(0); } /** @@ -682,7 +672,6 @@ void DragInfoGraphicsView::slotCreate(const QDateTime &date) { - emit signalViewtransparentFrame(1); CScheduleDlg dlg(1, this); QDateTime tDatatime; tDatatime.setDate(date.date()); @@ -698,7 +687,6 @@ if (dlg.exec() == DDialog::Accepted) { emit signalsUpdateSchedule(); } - emit signalViewtransparentFrame(0); } ScheduleDataInfo DragInfoGraphicsView::getScheduleInfo(const QDateTime &beginDate, const QDateTime &endDate) @@ -870,13 +858,11 @@ QAction *action_t = m_rightMenu->exec(screen_pos); if (action_t == m_editAction) { - emit signalViewtransparentFrame(1); CScheduleDlg dlg(0, this); dlg.setData(infoitem->getData()); if (dlg.exec() == DDialog::Accepted) { emit signalsUpdateSchedule(); } - emit signalViewtransparentFrame(0); } else if (action_t == m_deleteAction) { DeleteItem(infoitem->getData()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-calendar-5.8.29/calendar-client/src/view/draginfographicsview.h new/dde-calendar-5.8.30/calendar-client/src/view/draginfographicsview.h --- old/dde-calendar-5.8.29/calendar-client/src/view/draginfographicsview.h 2022-03-09 03:08:24.000000000 +0100 +++ new/dde-calendar-5.8.30/calendar-client/src/view/draginfographicsview.h 2022-04-21 07:13:09.000000000 +0200 @@ -162,7 +162,6 @@ void signalAngleDelta(int delta); //�� void signalsUpdateSchedule(); - void signalViewtransparentFrame(const int id = 0); /** * @brief signalScheduleShow �� * @param isShow �� diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-calendar-5.8.29/calendar-client/src/view/graphicsview.cpp new/dde-calendar-5.8.30/calendar-client/src/view/graphicsview.cpp --- old/dde-calendar-5.8.29/calendar-client/src/view/graphicsview.cpp 2022-03-09 03:08:24.000000000 +0100 +++ new/dde-calendar-5.8.30/calendar-client/src/view/graphicsview.cpp 2022-04-21 07:13:09.000000000 +0200 @@ -113,14 +113,12 @@ void CGraphicsView::slotCreate(const QDateTime &date) { - emit signalViewtransparentFrame(1); CScheduleDlg dlg(1, this); dlg.setDate(date); if (dlg.exec() == DDialog::Accepted) { emit signalsUpdateSchedule(); } - emit signalViewtransparentFrame(0); } bool CGraphicsView::MeetCreationConditions(const QDateTime &date) @@ -390,26 +388,22 @@ if (item == nullptr) { QPointF scenePoss = mapToScene(event->pos()); - emit signalViewtransparentFrame(1); CScheduleDlg dlg(1, this); QDateTime tDatatime = m_coorManage->getDate(scenePoss); dlg.setDate(tDatatime); if (dlg.exec() == DDialog::Accepted) { emit signalsUpdateSchedule(); } - emit signalViewtransparentFrame(0); return; } if (item->getType() == 1) { emit signalsCurrentScheduleDate(item->getDate()); return; } - emit signalViewtransparentFrame(1); m_updateDflag = false; CMyScheduleView dlg(item->getData(), this); connect(&dlg, &CMyScheduleView::signalsEditorDelete, this, &CGraphicsView::slotDoubleEvent); dlg.exec(); - emit signalViewtransparentFrame(0); disconnect(&dlg, &CMyScheduleView::signalsEditorDelete, this, &CGraphicsView::slotDoubleEvent); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-calendar-5.8.29/calendar-client/src/view/monthgraphiview.cpp new/dde-calendar-5.8.30/calendar-client/src/view/monthgraphiview.cpp --- old/dde-calendar-5.8.29/calendar-client/src/view/monthgraphiview.cpp 2022-03-09 03:08:24.000000000 +0100 +++ new/dde-calendar-5.8.30/calendar-client/src/view/monthgraphiview.cpp 2022-04-21 07:13:09.000000000 +0200 @@ -211,7 +211,12 @@ info = m_lunarCache.value(date); if (info.mLunarDayName == "��") { - info.mLunarDayName = info.mLunarMonthName + info.mLunarDayName; + //�� + if (info.mLunarMonthName.contains("��")) { + info.mLunarDayName = info.mLunarMonthName; + } else { + info.mLunarDayName = info.mLunarMonthName + info.mLunarDayName; + } } if (info.mTerm.isEmpty()) { @@ -383,8 +388,6 @@ if (infoitem != nullptr) { CMyScheduleView dlg(infoitem->getData(), this); connect(&dlg, &CMyScheduleView::signalsEditorDelete, this, &CMonthGraphicsview::signalsUpdateSchedule); - connect(&dlg, &CMyScheduleView::signalViewtransparentFrame, - this, &CMonthGraphicsview::signalViewtransparentFrame); dlg.exec(); return; } @@ -535,7 +538,6 @@ void CMonthGraphicsview::slotCreate(const QDateTime &date) { - emit signalViewtransparentFrame(1); CScheduleDlg dlg(1, this); QDateTime tDatatime; tDatatime.setDate(date.date()); @@ -553,5 +555,4 @@ emit signalsUpdateSchedule(); emit signalsScheduleUpdate(0); } - emit signalViewtransparentFrame(0); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-calendar-5.8.29/calendar-client/src/widget/calendarmainwindow.cpp new/dde-calendar-5.8.30/calendar-client/src/widget/calendarmainwindow.cpp --- old/dde-calendar-5.8.29/calendar-client/src/widget/calendarmainwindow.cpp 2022-03-09 03:08:24.000000000 +0100 +++ new/dde-calendar-5.8.30/calendar-client/src/widget/calendarmainwindow.cpp 2022-04-21 07:13:09.000000000 +0200 @@ -55,8 +55,13 @@ DGUI_USE_NAMESPACE DWIDGET_USE_NAMESPACE -static const int CalendarMWidth = 860; +static const int CalendarMWidth = 646; static const int CalendarMHeight = 634; +const int CalendarSwitchWidth = 647; //�� +const int CalendarViewSwitchWidth = 804; //�� + +const int Calendar_Default_Width = 860; //�� +const int Calendar_Default_Height = 634; //�� Calendarmainwindow::Calendarmainwindow(int index, QWidget *w) : DMainWindow(w) @@ -106,11 +111,14 @@ int width = CConfigSettings::getInstance()->value("base.windowWidth").toInt(); int height = CConfigSettings::getInstance()->value("base.windowHeight").toInt(); QRect rect(0, 0, width, height); - rect.moveCenter(desktopwidget->geometry().center()); this->setGeometry(rect); } else { - Dtk::Widget::moveToCenter(this); + //�� + QRect rect(0, 0, Calendar_Default_Width, Calendar_Default_Height); + this->setGeometry(rect); } + //�� + Dtk::Widget::moveToCenter(this); //�� CalendarGlobalEnv::getGlobalEnv()->registerKey(DDECalendar::CursorPointKey, QPoint()); @@ -319,22 +327,22 @@ CDynamicIcon::getInstance()->setTitlebar(this->titlebar()); CDynamicIcon::getInstance()->setIcon(); - CTitleWidget *titleWidget = new CTitleWidget(this); - titleWidget->setFocusPolicy(Qt::TabFocus); - this->titlebar()->setCustomWidget(titleWidget); - setTabOrder(this->titlebar(), titleWidget); + m_titleWidget = new CTitleWidget(this); + m_titleWidget->setFocusPolicy(Qt::TabFocus); + this->titlebar()->setCustomWidget(m_titleWidget); + setTabOrder(this->titlebar(), m_titleWidget); //�� - this->titlebar()->setFocusProxy(titleWidget); + this->titlebar()->setFocusProxy(m_titleWidget); //�� - connect(titleWidget, &CTitleWidget::signalSetButtonFocus, [ = ] { + connect(m_titleWidget, &CTitleWidget::signalSetButtonFocus, [=] { m_setButtonFocus = true; }); - connect(titleWidget, &CTitleWidget::signalSearchFocusSwitch, this, + connect(m_titleWidget, &CTitleWidget::signalSearchFocusSwitch, this, &Calendarmainwindow::slotSearchFocusSwitch); - m_searchEdit = titleWidget->searchEdit(); - m_buttonBox = titleWidget->buttonBox(); - m_newScheduleBtn = titleWidget->newScheduleBtn(); + m_searchEdit = m_titleWidget->searchEdit(); + m_buttonBox = m_titleWidget->buttonBox(); + m_newScheduleBtn = m_titleWidget->newScheduleBtn(); m_stackWidget = new AnimationStackedWidget(); m_stackWidget->setObjectName("StackedWidget"); @@ -405,19 +413,10 @@ &Calendarmainwindow::slotSearchSelectSchedule); connect(m_scheduleSearchView, &CScheduleSearchView::signalScheduleHide, this, &Calendarmainwindow::setScheduleHide); - //�� - connect(m_scheduleSearchView, &CScheduleSearchView::signalViewtransparentFrame, this, - &Calendarmainwindow::slotViewtransparentFrame); + connect(m_scheduleSearchView, &CScheduleSearchView::signalSelectCurrentItem, this, &Calendarmainwindow::slotSetSearchFocus); - connect(m_yearwindow, &CYearWindow::signalViewtransparentFrame, this, - &Calendarmainwindow::slotViewtransparentFrame); - connect(m_monthWindow, &CMonthWindow::signalViewtransparentFrame, this, - &Calendarmainwindow::slotViewtransparentFrame); - connect(m_weekWindow, &CWeekWindow::signalViewtransparentFrame, this, - &Calendarmainwindow::slotViewtransparentFrame); - connect(m_DayWindow, &CDayWindow::signalViewtransparentFrame, this, - &Calendarmainwindow::slotViewtransparentFrame); + //�� connect(m_currentDateUpdateTimer, &QTimer::timeout, this, &Calendarmainwindow::slotCurrentDateUpdate); @@ -479,12 +478,29 @@ void Calendarmainwindow::resizeEvent(QResizeEvent *event) { + DMainWindow::resizeEvent(event); m_transparentFrame->resize(width(), height() - 50); - m_scheduleSearchViewMaxWidth = qRound(0.2325 * width() + 0.5); + + if (width() < CalendarSwitchWidth) { + m_titleWidget->setShowState(CTitleWidget::Title_State_Mini); + } else { + m_titleWidget->setShowState(CTitleWidget::Title_State_Normal); + } + + if (width() < CalendarViewSwitchWidth) { + m_isNormalStateShow = false; + m_stackWidget->setVisible(!m_contentBackground->isVisible()); + m_scheduleSearchViewMaxWidth = this->width(); + } else { + m_scheduleSearchViewMaxWidth = qRound(0.2325 * width() + 0.5); + m_isNormalStateShow = true; + m_stackWidget->setVisible(true); + m_contentBackground->setVisible(m_opensearchflag); + } m_scheduleSearchView->setMaxWidth(m_scheduleSearchViewMaxWidth); setSearchWidth(m_scheduleSearchViewMaxWidth); setScheduleHide(); - DMainWindow::resizeEvent(event); + //�� CConfigSettings::getInstance()->setOption("base.windowWidth", event->size().width()); CConfigSettings::getInstance()->setOption("base.windowHeight", event->size().height()); @@ -515,6 +531,13 @@ { if (!m_opensearchflag && !m_searchEdit->text().isEmpty()) { m_opensearchflag = true; + } + //�� + if (m_opensearchflag) { + //�� + if (!m_isNormalStateShow) { + m_stackWidget->setVisible(false); + } m_contentBackground->setVisible(true); } m_scheduleSearchView->slotsetSearch(m_searchEdit->text()); @@ -535,6 +558,7 @@ m_weekWindow->setSearchWFlag(false); m_DayWindow->setSearchWFlag(false); m_contentBackground->setVisible(false); + m_stackWidget->setVisible(true); m_opensearchflag = false; } updateHeight(); @@ -562,6 +586,20 @@ */ void Calendarmainwindow::slotSearchSelectSchedule(const ScheduleDataInfo &scheduleInfo) { + //�� + //�� + if (!m_isNormalStateShow) { + // CalendarGlobalEnv::getGlobalEnv()->registerKey("SearchItemEvent", "Keyboard"); + + QVariant variant; + CalendarGlobalEnv::getGlobalEnv()->getValueByKey("SearchItemEvent", variant); + QString searchItemEvent = variant.toString(); + //�� + if (searchItemEvent == "MousePress") { + m_stackWidget->setVisible(true); + m_contentBackground->setVisible(false); + } + } //�� CScheduleBaseWidget *_showWidget = dynamic_cast<CScheduleBaseWidget *> (m_stackWidget->currentWidget()); @@ -593,16 +631,12 @@ */ void Calendarmainwindow::slotViewtransparentFrame(const bool isShow) { - static int showFrameCount = 0; if (isShow) { m_transparentFrame->resize(width(), height() - 50); m_transparentFrame->move(0, 50); m_transparentFrame->show(); - ++showFrameCount; } else { - if (showFrameCount == 1) - m_transparentFrame->hide(); - --showFrameCount; + m_transparentFrame->hide(); } } @@ -662,9 +696,7 @@ CScheduleDlg _scheduleDig(1, this, false); //�� _scheduleDig.setDate(_beginTime); - slotViewtransparentFrame(true); _scheduleDig.exec(); - slotViewtransparentFrame(false); } void Calendarmainwindow::slotDeleteitem() @@ -736,5 +768,14 @@ if (event->type() == QEvent::Move) { setScheduleHide(); } + + //�� + if (event->type() == QEvent::WindowActivate) { + slotViewtransparentFrame(false); + } + //�� + if (event->type() == QEvent::WindowDeactivate) { + slotViewtransparentFrame(true); + } return DMainWindow::event(event); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-calendar-5.8.29/calendar-client/src/widget/calendarmainwindow.h new/dde-calendar-5.8.30/calendar-client/src/widget/calendarmainwindow.h --- old/dde-calendar-5.8.29/calendar-client/src/widget/calendarmainwindow.h 2022-03-09 03:08:24.000000000 +0100 +++ new/dde-calendar-5.8.30/calendar-client/src/widget/calendarmainwindow.h 2022-04-21 07:13:09.000000000 +0200 @@ -43,6 +43,8 @@ class CScheduleSearchView; class AnimationStackedWidget; class CScheduleDataManage; +class CTitleWidget; + class Calendarmainwindow : public DMainWindow { Q_OBJECT @@ -106,6 +108,7 @@ CMonthWindow *m_monthWindow = nullptr; CWeekWindow *m_weekWindow = nullptr; CDayWindow *m_DayWindow = nullptr; + CTitleWidget *m_titleWidget = nullptr; bool m_searchflag = false; CScheduleSearchView *m_scheduleSearchView = nullptr; DFrame *m_contentBackground = nullptr; @@ -119,6 +122,7 @@ //�� int m_defaultIndex; bool m_setButtonFocus {false}; + bool m_isNormalStateShow {true}; //�� }; #endif // CALENDARMAINWINDOW_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-calendar-5.8.29/calendar-client/src/widget/cschedulebasewidget.h new/dde-calendar-5.8.30/calendar-client/src/widget/cschedulebasewidget.h --- old/dde-calendar-5.8.29/calendar-client/src/widget/cschedulebasewidget.h 2022-03-09 03:08:24.000000000 +0100 +++ new/dde-calendar-5.8.30/calendar-client/src/widget/cschedulebasewidget.h 2022-04-21 07:13:09.000000000 +0200 @@ -65,8 +65,6 @@ signals: //�� 0:�� 1�� 2�� 3:�� void signalSwitchView(const int viewIndex = 0); - //�� - void signalViewtransparentFrame(int type); protected: static CalendarManager *m_calendarManager; QString m_lunarYear; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-calendar-5.8.29/calendar-client/src/widget/dayWidget/daywindow.cpp new/dde-calendar-5.8.30/calendar-client/src/widget/dayWidget/daywindow.cpp --- old/dde-calendar-5.8.29/calendar-client/src/widget/dayWidget/daywindow.cpp 2022-03-09 03:08:24.000000000 +0100 +++ new/dde-calendar-5.8.30/calendar-client/src/widget/dayWidget/daywindow.cpp 2022-04-21 07:13:09.000000000 +0200 @@ -301,7 +301,6 @@ { connect(m_daymonthView, &CDayMonthView::signalIsDragging, this, &CDayWindow::slotIsDragging); connect(m_daymonthView, &CDayMonthView::signalChangeSelectDate, this, &CDayWindow::slotChangeSelectDate); - connect(m_scheduleView, &CScheduleView::signalViewtransparentFrame, this, &CDayWindow::signalViewtransparentFrame); connect(m_scheduleView, &CScheduleView::signalSwitchPrePage, this, &CDayWindow::slotSwitchPrePage); connect(m_scheduleView, &CScheduleView::signalSwitchNextPage, this, &CDayWindow::slotSwitchNextPage); } @@ -368,7 +367,7 @@ void CDayWindow::resizeEvent(QResizeEvent *event) { Q_UNUSED(event); - qreal dw = 0.4046 * width(); + qreal dw = 0.4 * width(); int dh = height() - 20; if (m_searchFlag) { @@ -376,8 +375,6 @@ } else { m_mainLayout->setContentsMargins(10, 10, 10, 10); } - if (dw < 350) - dw = 350; m_daymonthView->setFixedSize(qRound(dw), dh); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-calendar-5.8.29/calendar-client/src/widget/monthWidget/monthscheduleview.h new/dde-calendar-5.8.30/calendar-client/src/widget/monthWidget/monthscheduleview.h --- old/dde-calendar-5.8.29/calendar-client/src/widget/monthWidget/monthscheduleview.h 2022-03-09 03:08:24.000000000 +0100 +++ new/dde-calendar-5.8.30/calendar-client/src/widget/monthWidget/monthscheduleview.h 2022-04-21 07:13:09.000000000 +0200 @@ -52,7 +52,6 @@ signals: void signalsUpdateSchedule(int id = 0); void signalsCurrentScheduleDate(QDate date); - void signalViewtransparentFrame(int type); void signalUpdateUI(int type); void signalPressScheduleShow(const bool isShow, const ScheduleDataInfo &out = ScheduleDataInfo()); public slots: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-calendar-5.8.29/calendar-client/src/widget/monthWidget/monthview.cpp new/dde-calendar-5.8.30/calendar-client/src/widget/monthWidget/monthview.cpp --- old/dde-calendar-5.8.29/calendar-client/src/widget/monthWidget/monthview.cpp 2022-03-09 03:08:24.000000000 +0100 +++ new/dde-calendar-5.8.30/calendar-client/src/widget/monthWidget/monthview.cpp 2022-04-21 07:13:09.000000000 +0200 @@ -49,7 +49,6 @@ m_monthGraphicsView = new CMonthGraphicsview(this); connect(m_monthGraphicsView, &CMonthGraphicsview::signalsViewSelectDate, this, &CMonthView::signalsViewSelectDate); - connect(m_monthGraphicsView, &CMonthGraphicsview::signalViewtransparentFrame, this, &CMonthView::signalViewtransparentFrame); connect(m_monthGraphicsView, &CMonthGraphicsview::signalScheduleShow, this, &CMonthView::slotScheduleRemindWidget); connect(m_monthGraphicsView, &CMonthGraphicsview::signalAngleDelta, this, &CMonthView::signalAngleDelta); connect(m_monthGraphicsView, &CMonthGraphicsview::signalSwitchPrePage, this, &CMonthView::signalSwitchPrePage); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-calendar-5.8.29/calendar-client/src/widget/monthWidget/monthview.h new/dde-calendar-5.8.30/calendar-client/src/widget/monthWidget/monthview.h --- old/dde-calendar-5.8.29/calendar-client/src/widget/monthWidget/monthview.h 2022-03-09 03:08:24.000000000 +0100 +++ new/dde-calendar-5.8.30/calendar-client/src/widget/monthWidget/monthview.h 2022-04-21 07:13:09.000000000 +0200 @@ -67,11 +67,6 @@ void deleteSelectSchedule(); signals: /** - * @brief signalViewtransparentFrame �� - * @param type - */ - void signalViewtransparentFrame(int type); - /** * @brief signalsViewSelectDate �� * @param date �� */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-calendar-5.8.29/calendar-client/src/widget/monthWidget/monthwindow.cpp new/dde-calendar-5.8.30/calendar-client/src/widget/monthWidget/monthwindow.cpp --- old/dde-calendar-5.8.29/calendar-client/src/widget/monthWidget/monthwindow.cpp 2022-03-09 03:08:24.000000000 +0100 +++ new/dde-calendar-5.8.30/calendar-client/src/widget/monthWidget/monthwindow.cpp 2022-04-21 07:13:09.000000000 +0200 @@ -357,7 +357,6 @@ { connect(m_today, &DPushButton::clicked, this, &CMonthWindow::slottoday); connect(m_monthDayView, &CMonthDayView::signalsSelectDate, this, &CMonthWindow::slotSetSelectDate); - connect(m_monthView, &CMonthView::signalViewtransparentFrame, this, &CMonthWindow::signalViewtransparentFrame); //�� connect(m_monthView, &CMonthView::signalsViewSelectDate, this, &CMonthWindow::slotViewSelectDate); connect(m_monthView, &CMonthView::signalAngleDelta, this, &CMonthWindow::slotAngleDelta); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-calendar-5.8.29/calendar-client/src/widget/schedulesearchview.cpp new/dde-calendar-5.8.30/calendar-client/src/widget/schedulesearchview.cpp --- old/dde-calendar-5.8.29/calendar-client/src/widget/schedulesearchview.cpp 2022-03-09 03:08:24.000000000 +0100 +++ new/dde-calendar-5.8.30/calendar-client/src/widget/schedulesearchview.cpp 2022-04-21 07:13:09.000000000 +0200 @@ -25,6 +25,7 @@ #include "cscheduleoperation.h" #include "scheduledaterangeinfo.h" #include "calendarmanage.h" +#include "calendarglobalenv.h" #include <DHiDPIHelper> #include <DPalette> @@ -150,20 +151,16 @@ } void CScheduleSearchItem::slotEdit() { - emit signalViewtransparentFrame(1); CScheduleDlg dlg(0, this); dlg.setData(m_ScheduleInfo); dlg.exec(); - emit signalViewtransparentFrame(0); } void CScheduleSearchItem::slotDelete() { - emit signalViewtransparentFrame(1); //�� CScheduleOperation _scheduleOperation(this); bool _isDelete = _scheduleOperation.deleteSchedule(m_ScheduleInfo); - emit signalViewtransparentFrame(0); //�� if (_isDelete) { parentWidget()->setFocus(Qt::TabFocusReason); @@ -351,10 +348,8 @@ void CScheduleSearchItem::mouseDoubleClickEvent(QMouseEvent *event) { Q_UNUSED(event); - emit signalViewtransparentFrame(1); CMyScheduleView dlg(m_ScheduleInfo, this); dlg.exec(); - emit signalViewtransparentFrame(0); } void CScheduleSearchItem::mousePressEvent(QMouseEvent *event) @@ -362,6 +357,10 @@ //�� m_tabFocus = false; if (event->button() == Qt::LeftButton) { + //�� + if (!CalendarGlobalEnv::getGlobalEnv()->registerKey("SearchItemEvent", "MousePress")) { + CalendarGlobalEnv::getGlobalEnv()->reviseValue("SearchItemEvent", "MousePress"); + } emit signalSelectSchedule(m_ScheduleInfo); } DLabel::mousePressEvent(event); @@ -407,6 +406,10 @@ void CScheduleSearchItem::focusInEvent(QFocusEvent *e) { if (e->reason() == Qt::TabFocusReason) { + //�� + if (!CalendarGlobalEnv::getGlobalEnv()->registerKey("SearchItemEvent", "Keyboard")) { + CalendarGlobalEnv::getGlobalEnv()->reviseValue("SearchItemEvent", "Keyboard"); + } emit signalSelectSchedule(m_ScheduleInfo); emit signalSelectCurrentItem(this, false); m_tabFocus = true; @@ -691,7 +694,6 @@ //�� m_scheduleSearchItem.append(gwi); connect(gwi, &CScheduleSearchItem::signalSelectSchedule, this, &CScheduleSearchView::slotSelectSchedule); - connect(gwi, &CScheduleSearchItem::signalViewtransparentFrame, this, &CScheduleSearchView::signalViewtransparentFrame); connect(gwi, &CScheduleSearchItem::signalSelectCurrentItem, this, &CScheduleSearchView::slotSelectCurrentItem); QListWidgetItem *listItem = new QListWidgetItem; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-calendar-5.8.29/calendar-client/src/widget/schedulesearchview.h new/dde-calendar-5.8.30/calendar-client/src/widget/schedulesearchview.h --- old/dde-calendar-5.8.29/calendar-client/src/widget/schedulesearchview.h 2022-03-09 03:08:24.000000000 +0100 +++ new/dde-calendar-5.8.30/calendar-client/src/widget/schedulesearchview.h 2022-04-21 07:13:09.000000000 +0200 @@ -49,7 +49,6 @@ void deleteSchedule(); signals: void signalSelectSchedule(const ScheduleDataInfo &scheduleInfo); - void signalViewtransparentFrame(int type); void signalScheduleHide(); void signalSelectCurrentItem(); void signalSchotCutClicked(); @@ -134,7 +133,6 @@ void signalsDelete(CScheduleSearchItem *item); void signalsEdit(CScheduleSearchItem *item); void signalSelectSchedule(const ScheduleDataInfo &scheduleInfo); - void signalViewtransparentFrame(int type); void signalSelectCurrentItem(CScheduleSearchItem *item, bool focusOutStatus); public slots: void slotEdit(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-calendar-5.8.29/calendar-client/src/widget/weekWidget/weekview.cpp new/dde-calendar-5.8.30/calendar-client/src/widget/weekWidget/weekview.cpp --- old/dde-calendar-5.8.29/calendar-client/src/widget/weekWidget/weekview.cpp 2022-03-09 03:08:24.000000000 +0100 +++ new/dde-calendar-5.8.30/calendar-client/src/widget/weekWidget/weekview.cpp 2022-04-21 07:13:09.000000000 +0200 @@ -61,7 +61,6 @@ hBoxLayout->addWidget(m_nextButton); //�� setLayout(hBoxLayout); - setMinimumWidth(150); connect(m_weekNumWidget, &CWeekNumWidget::signalsSelectDate, this, &CWeekView::signalsSelectDate); connect(m_weekNumWidget, &CWeekNumWidget::signalBtnPrev, this, &CWeekView::signalBtnPrev); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-calendar-5.8.29/calendar-client/src/widget/weekWidget/weekwindow.cpp new/dde-calendar-5.8.30/calendar-client/src/widget/weekWidget/weekwindow.cpp --- old/dde-calendar-5.8.29/calendar-client/src/widget/weekWidget/weekwindow.cpp 2022-03-09 03:08:24.000000000 +0100 +++ new/dde-calendar-5.8.30/calendar-client/src/widget/weekWidget/weekwindow.cpp 2022-04-21 07:13:09.000000000 +0200 @@ -198,7 +198,6 @@ //�� connect(m_weekview, &CWeekView::signalBtnNext, this, &CWeekWindow::slotnext); connect(m_weekview, &CWeekView::signalsSelectDate, this, &CWeekWindow::slotSelectDate); - connect(m_scheduleView, &CScheduleView::signalViewtransparentFrame, this, &CWeekWindow::signalViewtransparentFrame); connect(m_weekHeadView, &CWeekHeadView::signalsViewSelectDate, this, &CWeekWindow::slotViewSelectDate); connect(m_weekview, &CWeekView::signalIsDragging, this, &CWeekWindow::slotIsDragging); //�� @@ -521,11 +520,11 @@ m_tMainLayout->setContentsMargins(0, 0, 10, 0); } - //��2�� 36+36��m_weekview �� + //��1�� 36��m_weekview ��(��2��) if (!m_searchFlag) { - m_weekview->setFixedSize(qRound(dw + 72), dh); + m_weekview->setFixedSize(qRound(dw + 36), dh); } else { - m_weekview->setFixedSize(qRound(dw - 100 + 72), dh); + m_weekview->setFixedSize(qRound(dw - 100 + 36), dh); } m_weekHeadView->setFixedSize(width() - winframe, qRound(headH)); QWidget::resizeEvent(event); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-calendar-5.8.29/calendar-client/src/widget/yearWidget/yearscheduleview.cpp new/dde-calendar-5.8.30/calendar-client/src/widget/yearWidget/yearscheduleview.cpp --- old/dde-calendar-5.8.29/calendar-client/src/widget/yearWidget/yearscheduleview.cpp 2022-03-09 03:08:24.000000000 +0100 +++ new/dde-calendar-5.8.30/calendar-client/src/widget/yearWidget/yearscheduleview.cpp 2022-04-21 07:13:09.000000000 +0200 @@ -368,12 +368,10 @@ } else { //�� if (scheduleinfoList.at(currentIndex).getType() != DDECalendar::FestivalTypeID) { - emit signalViewtransparentFrame(1); //��CScheduleDlg�� CScheduleDlg dlg(0, qobject_cast<QWidget *>(this->parent())); dlg.setData(scheduleinfoList.at(currentIndex)); dlg.exec(); - emit signalViewtransparentFrame(0); } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-calendar-5.8.29/calendar-client/src/widget/yearWidget/yearscheduleview.h new/dde-calendar-5.8.30/calendar-client/src/widget/yearWidget/yearscheduleview.h --- old/dde-calendar-5.8.29/calendar-client/src/widget/yearWidget/yearscheduleview.h 2022-03-09 03:08:24.000000000 +0100 +++ new/dde-calendar-5.8.30/calendar-client/src/widget/yearWidget/yearscheduleview.h 2022-04-21 07:13:09.000000000 +0200 @@ -154,8 +154,6 @@ * @brief signalupdateschedule �� */ void signalupdateschedule(); - //�� - void signalViewtransparentFrame(int type); private: CYearScheduleView *yearscheduleview = nullptr; QVector<ScheduleDataInfo> scheduleinfoList; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-calendar-5.8.29/calendar-client/src/widget/yearWidget/yearwindow.cpp new/dde-calendar-5.8.30/calendar-client/src/widget/yearWidget/yearwindow.cpp --- old/dde-calendar-5.8.29/calendar-client/src/widget/yearWidget/yearwindow.cpp 2022-03-09 03:08:24.000000000 +0100 +++ new/dde-calendar-5.8.30/calendar-client/src/widget/yearWidget/yearwindow.cpp 2022-04-21 07:13:09.000000000 +0200 @@ -408,7 +408,6 @@ connect(m_firstYearWidget, &YearFrame::signalMousePress, this, &CYearWindow::slotMousePress); connect(m_secondYearWidget, &YearFrame::signalMousePress, this, &CYearWindow::slotMousePress); connect(m_scheduleView, &CYearScheduleOutView::signalsViewSelectDate, this, &CYearWindow::slotMousePress); - connect(m_scheduleView, &CYearScheduleOutView::signalViewtransparentFrame, this, &CYearWindow::signalViewtransparentFrame); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-calendar-5.8.29/tests/cmake/asan.cmake new/dde-calendar-5.8.30/tests/cmake/asan.cmake --- old/dde-calendar-5.8.29/tests/cmake/asan.cmake 2022-03-09 03:08:24.000000000 +0100 +++ new/dde-calendar-5.8.30/tests/cmake/asan.cmake 2022-04-21 07:13:09.000000000 +0200 @@ -15,8 +15,5 @@ #�� set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-strong -D_FORTITY_SOURCE=1 -z noexecstack -pie -fPIC -z lazy") -#�� -if(CMAKE_COVERAGE_ARG STREQUAL "CMAKE_COVERAGE_ARG_ON") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -fprofile-arcs -ftest-coverage") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -fprofile-arcs -ftest-coverage") -endif() \ No newline at end of file +# ��gocv�� +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fprofile-arcs -ftest-coverage") \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dde-calendar-5.8.29/tests/dde-calendar-client-test/CMakeLists.txt new/dde-calendar-5.8.30/tests/dde-calendar-client-test/CMakeLists.txt --- old/dde-calendar-5.8.29/tests/dde-calendar-client-test/CMakeLists.txt 2022-03-09 03:08:24.000000000 +0100 +++ new/dde-calendar-5.8.30/tests/dde-calendar-client-test/CMakeLists.txt 2022-04-21 07:13:09.000000000 +0200 @@ -26,7 +26,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) -set(CMAKE_CXX_FLAGS "-Wl,--as-needed -fPIE") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--as-needed -fPIE") set(CMAKE_EXE_LINKER_FLAGS "-pie") include_directories(${APP_CLIENT_DIR}/src) @@ -72,4 +72,4 @@ Qt5::Test pthread basestruct -) \ No newline at end of file +)

1 0

commit deepin-calculator for openSUSE:Factory
by Source-Sync 01 Sep '22

01 Sep '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package deepin-calculator for openSUSE:Factory checked in at 2022-09-01 22:10:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deepin-calculator (Old) and /work/SRC/openSUSE:Factory/.deepin-calculator.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "deepin-calculator" Thu Sep 1 22:10:00 2022 rev:6 rq:999752 version:5.7.21 Changes: -------- --- /work/SRC/openSUSE:Factory/deepin-calculator/deepin-calculator.changes 2022-04-22 21:54:26.926819295 +0200 +++ /work/SRC/openSUSE:Factory/.deepin-calculator.new.2083/deepin-calculator.changes 2022-09-01 22:10:49.476187304 +0200 @@ -1,0 +2,7 @@ +Sat Jul 2 03:08:04 UTC 2022 - Hillwood Yang <hillwood(a)opensuse.org> + +- Update version to 5.7.21 + * Fix bugs + * Update translations + +------------------------------------------------------------------- @@ -4 +11 @@ -- Update version to 5.10.20 +- Update version to 5.7.20 Old: ---- deepin-calculator-5.7.20.tar.gz New: ---- deepin-calculator-5.7.21.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deepin-calculator.spec ++++++ --- /var/tmp/diff_new_pack.FjhmCx/_old 2022-09-01 22:10:49.960188628 +0200 +++ /var/tmp/diff_new_pack.FjhmCx/_new 2022-09-01 22:10:49.964188638 +0200 @@ -16,7 +16,7 @@ # Name: deepin-calculator -Version: 5.7.20 +Version: 5.7.21 Release: 0 Summary: The Deepin Calculator Application License: GPL-3.0-or-later ++++++ deepin-calculator-5.7.20.tar.gz -> deepin-calculator-5.7.21.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/deepin-calculator-5.7.20/.github/workflows/backup-to-gitlab.yml new/deepin-calculator-5.7.21/.github/workflows/backup-to-gitlab.yml --- old/deepin-calculator-5.7.20/.github/workflows/backup-to-gitlab.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/deepin-calculator-5.7.21/.github/workflows/backup-to-gitlab.yml 2022-04-21 09:02:14.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-calculator-5.7.20/.github/workflows/call-build-deb.yml new/deepin-calculator-5.7.21/.github/workflows/call-build-deb.yml --- old/deepin-calculator-5.7.20/.github/workflows/call-build-deb.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/deepin-calculator-5.7.21/.github/workflows/call-build-deb.yml 2022-04-21 09:02:14.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/deepin-calculator-5.7.20/.github/workflows/call-chatOps.yml new/deepin-calculator-5.7.21/.github/workflows/call-chatOps.yml --- old/deepin-calculator-5.7.20/.github/workflows/call-chatOps.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/deepin-calculator-5.7.21/.github/workflows/call-chatOps.yml 2022-04-21 09:02:14.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-calculator-5.7.20/.github/workflows/call-commitlint.yml new/deepin-calculator-5.7.21/.github/workflows/call-commitlint.yml --- old/deepin-calculator-5.7.20/.github/workflows/call-commitlint.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/deepin-calculator-5.7.21/.github/workflows/call-commitlint.yml 2022-04-21 09:02:14.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-calculator-5.7.20/.github/workflows/cppcheck.yml new/deepin-calculator-5.7.21/.github/workflows/cppcheck.yml --- old/deepin-calculator-5.7.20/.github/workflows/cppcheck.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/deepin-calculator-5.7.21/.github/workflows/cppcheck.yml 2022-04-21 09:02:14.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-calculator-5.7.20/CMakeLists.txt new/deepin-calculator-5.7.21/CMakeLists.txt --- old/deepin-calculator-5.7.20/CMakeLists.txt 2022-03-28 05:28:14.000000000 +0200 +++ new/deepin-calculator-5.7.21/CMakeLists.txt 2022-04-21 09:02:14.000000000 +0200 @@ -131,3 +131,10 @@ #if (NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "loongarch64") add_subdirectory(tests) #tests��ut�� #endif () + + +#�� +if(CMAKE_COVERAGE_ARG STREQUAL "CMAKE_COVERAGE_ARG_ON") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -fprofile-arcs -ftest-coverage") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -fprofile-arcs -ftest-coverage") +endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/deepin-calculator-5.7.20/tests/CMakeLists.txt new/deepin-calculator-5.7.21/tests/CMakeLists.txt --- old/deepin-calculator-5.7.20/tests/CMakeLists.txt 2022-03-28 05:28:14.000000000 +0200 +++ new/deepin-calculator-5.7.21/tests/CMakeLists.txt 2022-04-21 09:02:14.000000000 +0200 @@ -175,7 +175,7 @@ add_dependencies(test ${PROJECT_NAME_TEST}) # ��gocv�� -#set(CMAKE_CXX_FLAGS "-g -fprofile-arcs -ftest-coverage") +set(CMAKE_CXX_FLAGS "-g -fprofile-arcs -ftest-coverage") set(CMAKE_SAFETYTEST "${CMAKE_SAFETYTEST_ARG}") if(CMAKE_SAFETYTEST STREQUAL "") set(CMAKE_SAFETYTEST "CMAKE_SAFETYTEST_ARG_OFF") @@ -187,8 +187,3 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fsanitize=undefined,address -O2") endif() -#�� -if(CMAKE_COVERAGE_ARG STREQUAL "CMAKE_COVERAGE_ARG_ON") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -fprofile-arcs -ftest-coverage") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -fprofile-arcs -ftest-coverage") -endif()

1 0

commit dtkcommon for openSUSE:Factory
by Source-Sync 01 Sep '22

01 Sep '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package dtkcommon for openSUSE:Factory checked in at 2022-09-01 22:09:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dtkcommon (Old) and /work/SRC/openSUSE:Factory/.dtkcommon.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dtkcommon" Thu Sep 1 22:09:59 2022 rev:5 rq:999743 version:5.5.23 Changes: -------- --- /work/SRC/openSUSE:Factory/dtkcommon/dtkcommon.changes 2022-04-22 21:54:52.354848271 +0200 +++ /work/SRC/openSUSE:Factory/.dtkcommon.new.2083/dtkcommon.changes 2022-09-01 22:10:48.732185269 +0200 @@ -1,0 +2,7 @@ +Sat Jun 25 08:28:45 UTC 2022 - Hillwood Yang <hillwood(a)opensuse.org> + +- Update version to 5.5.23 + * use $${TARGET} for QRC_PATH + * modify dconfig's file install path + +------------------------------------------------------------------- Old: ---- dtkcommon-5.5.21.tar.gz New: ---- dtkcommon-5.5.23.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dtkcommon.spec ++++++ --- /var/tmp/diff_new_pack.7on2ft/_old 2022-09-01 22:10:49.240186658 +0200 +++ /var/tmp/diff_new_pack.7on2ft/_new 2022-09-01 22:10:49.244186669 +0200 @@ -17,7 +17,7 @@ # Name: dtkcommon -Version: 5.5.21 +Version: 5.5.23 Release: 0 Summary: The DTK Tools License: GPL-3.0+ @@ -25,7 +25,6 @@ URL: https://github.com/linuxdeepin/dtkcommon Source0: https://github.com/linuxdeepin/dtkcommon/archive/%{version}/%{name}-%{versi… BuildRequires: fdupes -BuildRequires: pkgconfig(Qt5Core) BuildRequires: glib2-tools BuildRequires: libQt5Core-private-headers-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ dtkcommon-5.5.21.tar.gz -> dtkcommon-5.5.23.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dtkcommon-5.5.21/.github/workflows/backup-to-gitlab.yml new/dtkcommon-5.5.23/.github/workflows/backup-to-gitlab.yml --- old/dtkcommon-5.5.21/.github/workflows/backup-to-gitlab.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/dtkcommon-5.5.23/.github/workflows/backup-to-gitlab.yml 2022-05-20 10:41:45.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/dtkcommon-5.5.21/.github/workflows/call-build-deb.yml new/dtkcommon-5.5.23/.github/workflows/call-build-deb.yml --- old/dtkcommon-5.5.21/.github/workflows/call-build-deb.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/dtkcommon-5.5.23/.github/workflows/call-build-deb.yml 2022-05-20 10:41:45.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/dtkcommon-5.5.21/.github/workflows/call-build-distribution.yml new/dtkcommon-5.5.23/.github/workflows/call-build-distribution.yml --- old/dtkcommon-5.5.21/.github/workflows/call-build-distribution.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/dtkcommon-5.5.23/.github/workflows/call-build-distribution.yml 2022-05-20 10:41:45.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/dtkcommon-5.5.21/.github/workflows/call-chatOps.yml new/dtkcommon-5.5.23/.github/workflows/call-chatOps.yml --- old/dtkcommon-5.5.21/.github/workflows/call-chatOps.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/dtkcommon-5.5.23/.github/workflows/call-chatOps.yml 2022-05-20 10:41:45.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/dtkcommon-5.5.21/.github/workflows/call-commitlint.yml new/dtkcommon-5.5.23/.github/workflows/call-commitlint.yml --- old/dtkcommon-5.5.21/.github/workflows/call-commitlint.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/dtkcommon-5.5.23/.github/workflows/call-commitlint.yml 2022-05-20 10:41:45.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/dtkcommon-5.5.21/cmake/Dtk/DtkInstallDConfigConfig.cmake new/dtkcommon-5.5.23/cmake/Dtk/DtkInstallDConfigConfig.cmake --- old/dtkcommon-5.5.21/cmake/Dtk/DtkInstallDConfigConfig.cmake 2021-12-21 04:23:24.000000000 +0100 +++ new/dtkcommon-5.5.23/cmake/Dtk/DtkInstallDConfigConfig.cmake 2022-05-20 10:41:45.000000000 +0200 @@ -13,10 +13,13 @@ set(${SUBPATH} ${SUBPATH_PATH} PARENT_SCOPE) endfunction() +if(NOT DEFINED DSG_DATA_DIR) + set(DSG_DATA_DIR ${CMAKE_INSTALL_PREFIX}/share/dsg) +endif() +add_definitions(-DDSG_DATA_DIR=${DSG_DATA_DIR}) # deploy some `meta` 's configure. # -# option USE_OPT_DIR - using uos standard to install destination directory. # FILES - deployed files. # BASE - used to get subpath, if it's empty, only copy files, and ignore it's subpath structure. # APPID - working for the app. @@ -26,18 +29,11 @@ # dconfig_meta_files(APPID dconfigexample BASE ./configs FILES ./configs/example.json ./configs/a/example.json) # function(DCONFIG_META_FILES) - set(options USE_OPT_DIR) set(oneValueArgs BASE APPID COMMONID) set(multiValueArgs FILES) cmake_parse_arguments(METAITEM "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) - if(DEFINED ENV{DSG_DATA_DIR}) - set(DSG_DATA_DIR $ENV{DSG_DATA_DIR}) - else() - set(DSG_DATA_DIR "/usr/share/dsg") - endif() - foreach(_current_FILE ${METAITEM_FILES}) set(SUBPATH "") if (DEFINED METAITEM_BASE) @@ -45,11 +41,7 @@ endif() if (DEFINED METAITEM_APPID) - if (${METAITEM_USE_OPT_DIR} STREQUAL "TRUE") - install(FILES "${_current_FILE}" DESTINATION /opt/apps/${METAITEM_APPID}/files/schemas/configs/${SUBPATH}) - else() - install(FILES "${_current_FILE}" DESTINATION /usr/share/dsg/apps/${METAITEM_APPID}/configs/${SUBPATH}) - endif() + install(FILES "${_current_FILE}" DESTINATION ${DSG_DATA_DIR}/configs/${METAITEM_APPID}/${SUBPATH}) elseif (DEFINED METAITEM_COMMONID) install(FILES ${_current_FILE} DESTINATION ${DSG_DATA_DIR}/configs/${SUBPATH}) else() @@ -82,12 +74,6 @@ message(FATAL_ERROR "Please set meta_name for the override configuration." ${FILES}) endif() - if(DEFINED ENV{DSG_DATA_DIR}) - set(DSG_DATA_DIR $ENV{DSG_DATA_DIR}) - else() - set(DSG_DATA_DIR "/usr/share/dsg") - endif() - foreach(_current_FILE ${OVERRIDEITEM_FILES}) set(SUBPATH "") if (DEFINED OVERRIDEITEM_BASE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dtkcommon-5.5.21/features/dtk_install_dconfig.prf new/dtkcommon-5.5.23/features/dtk_install_dconfig.prf --- old/dtkcommon-5.5.21/features/dtk_install_dconfig.prf 2021-12-21 04:23:24.000000000 +0100 +++ new/dtkcommon-5.5.23/features/dtk_install_dconfig.prf 2022-05-20 10:41:45.000000000 +0200 @@ -1,19 +1,20 @@ # This prf file is used to deploy files that dconfig's meta and override configure. # -# get enviroment `$$DSG_DATA_DIR` 's value, it��s consistent with class DConfigFile code. -defineReplace(getDSGDataDir) { - isEmpty($$DSG_DATA_DIR) return ("/usr/share/dsg") - return ($$DSG_DATA_DIR) +# get variable `$$DSG_DATA_DIR` 's value, it��s consistent with class DConfigFile code. +isEmpty(DSG_DATA_DIR) { + isEmpty(PREFIX) { + DSG_DATA_DIR=/usr/share/dsg + } else { + DSG_DATA_DIR=$$PREFIX/share/dsg + } } - # deploy some `meta` 's configure. # # files - deployed files. # base - used to get subpath, if it's empty, only copy files, and ignore it's subpath structure. # appid - working for the app, if it's empty, depending on `TEMPLATE`. # commonid - working for common, if it's empyt, depending on `TEMPLATE`. -# use_opt_dir - using uos standard to install destination directory. # # e.g: # dconfig_example.files += \ @@ -30,25 +31,18 @@ eval(dconfig_meta_$${metaitem}.files = $$eval($${metaitem}.files)) eval(dconfig_meta_$${metaitem}.base = $$eval($${metaitem}.base)) isEmpty($${metaitem}.appid) { + is_common_configuration=true isEmpty($${metaitem}.commonid) { equals(TEMPLATE, app) { - !isEmpty($${metaitem}.use_opt_dir) { - eval(dconfig_meta_$${metaitem}.path = /opt/apps/$$TARGET/files/schemas/configs) - } else { - eval(dconfig_meta_$${metaitem}.path = /usr/share/dsg/apps/$$TARGET/configs) - } - } else { - eval(dconfig_meta_$${metaitem}.path = $$getDSGDataDir()/configs/) + eval(dconfig_meta_$${metaitem}.path = $$DSG_DATA_DIR/configs/$$TARGET/) + is_common_configuration=false } - } else { - eval(dconfig_meta_$${metaitem}.path = $$getDSGDataDir()/configs/) } - } else { - !isEmpty($${metaitem}.use_opt_dir) { - eval(dconfig_meta_$${metaitem}.path = /opt/apps/$$eval($${overrideitem}.appid/files/schemas/configs)) - } else { - eval(dconfig_meta_$${metaitem}.path = /usr/share/dsg/apps/$$eval($${overrideitem}.appid/configs)) + if ($$is_common_configuration) { + eval(dconfig_meta_$${metaitem}.path = $$DSG_DATA_DIR/configs) } + } else { + eval(dconfig_meta_$${metaitem}.path = $$DSG_DATA_DIR/configs/$$eval($${metaitem}.appid)) } INSTALLS += dconfig_meta_$${metaitem} } @@ -81,9 +75,9 @@ eval(dconfig_override_$${overrideitem}.base = $$eval($${overrideitem}.base)) isEmpty($${overrideitem}.meta_name) : error("Please set meta_name for the override configuration." $${overrideitem}) isEmpty($${overrideitem}.appid) { - eval(dconfig_override_$${overrideitem}.path = $$getDSGDataDir()/configs/overrides/$$eval($${overrideitem}.meta_name)) + eval(dconfig_override_$${overrideitem}.path = $$DSG_DATA_DIR/configs/overrides/$$eval($${overrideitem}.meta_name)) } else { - eval(dconfig_override_$${overrideitem}.path = $$getDSGDataDir()/configs/overrides/$$eval($${overrideitem}.appid)/$$eval($${overrideitem}.meta_name)) + eval(dconfig_override_$${overrideitem}.path = $$DSG_DATA_DIR/configs/overrides/$$eval($${overrideitem}.appid)/$$eval($${overrideitem}.meta_name)) } INSTALLS += dconfig_override_$${overrideitem} } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dtkcommon-5.5.21/features/dtk_translation.prf new/dtkcommon-5.5.23/features/dtk_translation.prf --- old/dtkcommon-5.5.21/features/dtk_translation.prf 2021-12-21 04:23:24.000000000 +0100 +++ new/dtkcommon-5.5.23/features/dtk_translation.prf 2022-05-20 10:41:45.000000000 +0200 @@ -29,7 +29,7 @@ # <file>dtkwidget_ast.qm</file> # </qresource> #</RCC> - QRC_PATH = $$ROOT_DIR/translations/$${BASENAME}_translations.qrc + QRC_PATH = $$ROOT_DIR/translations/$${TARGET}_translations.qrc message ("Create static translations file $${QRC_PATH}") QRC_CONTENT = "<RCC>"

1 0

commit golang-github-linuxdeepin-go-dbus-factory for openSUSE:Factory
by Source-Sync 01 Sep '22

01 Sep '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package golang-github-linuxdeepin-go-dbus-factory for openSUSE:Factory checked in at 2022-09-01 22:09:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/golang-github-linuxdeepin-go-dbus-factory (Old) and /work/SRC/openSUSE:Factory/.golang-github-linuxdeepin-go-dbus-factory.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "golang-github-linuxdeepin-go-dbus-factory" Thu Sep 1 22:09:58 2022 rev:7 rq:999681 version:1.10.20 Changes: -------- --- /work/SRC/openSUSE:Factory/golang-github-linuxdeepin-go-dbus-factory/golang-github-linuxdeepin-go-dbus-factory.changes 2022-04-22 21:54:56.822853362 +0200 +++ /work/SRC/openSUSE:Factory/.golang-github-linuxdeepin-go-dbus-factory.new.2083/golang-github-linuxdeepin-go-dbus-factory.changes 2022-09-01 22:10:47.628182250 +0200 @@ -1,0 +2,7 @@ +Sat Aug 13 10:49:21 UTC 2022 - Hillwood Yang <hillwood(a)opensuse.org> + +- Update version to 1.10.20 + * Update org.kde.kwin interface + * Add org.desktopspec.ConfigManager interface + +------------------------------------------------------------------- Old: ---- go-dbus-factory-1.10.9.tar.gz New: ---- go-dbus-factory-1.10.20.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ golang-github-linuxdeepin-go-dbus-factory.spec ++++++ --- /var/tmp/diff_new_pack.w4CIjz/_old 2022-09-01 22:10:48.148183672 +0200 +++ /var/tmp/diff_new_pack.w4CIjz/_new 2022-09-01 22:10:48.148183672 +0200 @@ -22,7 +22,7 @@ %define import_path %{provider_prefix} Name: golang-%{provider}-%{project}-%{repo} -Version: 1.10.9 +Version: 1.10.20 Release: 0 Summary: Golang DBus factory License: GPL-3.0+ ++++++ go-dbus-factory-1.10.9.tar.gz -> go-dbus-factory-1.10.20.tar.gz ++++++ ++++ 1972 lines of diff (skipped)

1 0

commit deepin-daemon for openSUSE:Factory
by Source-Sync 01 Sep '22

01 Sep '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package deepin-daemon for openSUSE:Factory checked in at 2022-09-01 22:09:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deepin-daemon (Old) and /work/SRC/openSUSE:Factory/.deepin-daemon.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "deepin-daemon" Thu Sep 1 22:09:55 2022 rev:10 rq:999680 version:5.14.45 Changes: -------- --- /work/SRC/openSUSE:Factory/deepin-daemon/deepin-daemon.changes 2022-04-22 21:55:05.698863475 +0200 +++ /work/SRC/openSUSE:Factory/.deepin-daemon.new.2083/deepin-daemon.changes 2022-09-01 22:10:43.480170906 +0200 @@ -1,0 +2,8 @@ +Sat Aug 20 13:46:13 UTC 2022 - Hillwood Yang <hillwood(a)opensuse.org> + +- Update version to 5.14.45 + * Fix bugs + * Add HasAirplaneMode profile + * New feature: disable sleep on VM + +------------------------------------------------------------------- Old: ---- dde-daemon-5.14.18.tar.gz New: ---- dde-daemon-5.14.45.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deepin-daemon.spec ++++++ --- /var/tmp/diff_new_pack.9jQGeH/_old 2022-09-01 22:10:46.768179898 +0200 +++ /var/tmp/diff_new_pack.9jQGeH/_new 2022-09-01 22:10:46.772179909 +0200 @@ -19,7 +19,7 @@ %define import_path github.com/linuxdeepin/dde-daemon Name: deepin-daemon -Version: 5.14.18 +Version: 5.14.45 Release: 0 Summary: Daemon handling the DDE session settings License: GPL-3.0+ @@ -69,6 +69,7 @@ BuildRequires: pkgconfig(xcursor) BuildRequires: pkgconfig(xfixes) BuildRequires: pkgconfig(xkbfile) +BuildRequires: pkgconfig(ddcutil) BuildRequires: golang-github-linuxdeepin-go-dbus-factory BuildRequires: golang-github-linuxdeepin-dde-api %if 0%{?sle_version} == 150200 @@ -316,10 +317,9 @@ %{_datadir}/dde/ %{_datadir}/icons/hicolor/*/status/* %dir %{_datadir}/dsg -%dir %{_datadir}/dsg/apps -%dir %{_datadir}/dsg/apps/dde-session-daemon -%dir %{_datadir}/dsg/apps/dde-session-daemon/configs -%{_datadir}/dsg/apps/dde-session-daemon/configs/gesture.json +%dir %{_datadir}/dsg/configs +%dir %{_datadir}/dsg/configs/org.deepin.dde.daemon +%{_datadir}/dsg/configs/org.deepin.dde.daemon/org.deepin.dde.daemon.gesture.json %{_unitdir}/deepin-accounts-daemon.service %{_sbindir}/rcdeepin-accounts-daemon %{_sbindir}/rchwclock_stop ++++++ dde-daemon-5.14.18.tar.gz -> dde-daemon-5.14.45.tar.gz ++++++ ++++ 3911 lines of diff (skipped) ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/deepin-daemon/vendor.tar.gz /work/SRC/openSUSE:Factory/.deepin-daemon.new.2083/vendor.tar.gz differ: char 1, line 1

1 0

commit deepin-api for openSUSE:Factory
by Source-Sync 01 Sep '22

01 Sep '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package deepin-api for openSUSE:Factory checked in at 2022-09-01 22:09:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deepin-api (Old) and /work/SRC/openSUSE:Factory/.deepin-api.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "deepin-api" Thu Sep 1 22:09:51 2022 rev:10 rq:999679 version:5.5.25 Changes: -------- --- /work/SRC/openSUSE:Factory/deepin-api/deepin-api.changes 2022-04-22 21:54:25.558817736 +0200 +++ /work/SRC/openSUSE:Factory/.deepin-api.new.2083/deepin-api.changes 2022-09-01 22:10:39.892161094 +0200 @@ -1,0 +2,6 @@ +Sat Aug 13 08:33:23 UTC 2022 - Hillwood Yang <hillwood(a)opensuse.org> + +- Update version to 5.5.25 + * Fix bugs + +------------------------------------------------------------------- Old: ---- dde-api-5.5.12.tar.gz New: ---- dde-api-5.5.25.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deepin-api.spec ++++++ --- /var/tmp/diff_new_pack.PmPmjl/_old 2022-09-01 22:10:42.892169298 +0200 +++ /var/tmp/diff_new_pack.PmPmjl/_new 2022-09-01 22:10:42.900169320 +0200 @@ -23,7 +23,7 @@ %define import_path %{provider_prefix} Name: deepin-api -Version: 5.5.12 +Version: 5.5.25 Release: 0 Summary: Go-lang bingding for dde-daemon License: GPL-3.0+ ++++++ dde-api-5.5.12.tar.gz -> dde-api-5.5.25.tar.gz ++++++ /work/SRC/openSUSE:Factory/deepin-api/dde-api-5.5.12.tar.gz /work/SRC/openSUSE:Factory/.deepin-api.new.2083/dde-api-5.5.25.tar.gz differ: char 13, line 1 ++++++ harden_deepin-login-sound.service.patch ++++++ --- /var/tmp/diff_new_pack.PmPmjl/_old 2022-09-01 22:10:42.964169495 +0200 +++ /var/tmp/diff_new_pack.PmPmjl/_new 2022-09-01 22:10:42.964169495 +0200 @@ -1,8 +1,7 @@ -Index: dde-api-5.4.9/misc/systemd/system/deepin-login-sound.service -=================================================================== ---- dde-api-5.4.9.orig/misc/systemd/system/deepin-login-sound.service -+++ dde-api-5.4.9/misc/systemd/system/deepin-login-sound.service -@@ -4,6 +4,20 @@ Requires=sound.target +diff -Nurp dde-api-5.5.25/misc/systemd/system/deepin-login-sound.service dde-api-5.5.25-new/misc/systemd/system/deepin-login-sound.service +--- dde-api-5.5.25/misc/systemd/system/deepin-login-sound.service 2022-04-18 13:40:18.000000000 +0800 ++++ dde-api-5.5.25-new/misc/systemd/system/deepin-login-sound.service 2022-08-13 16:29:10.631634682 +0800 +@@ -4,6 +4,19 @@ Requires=sound.target After=dbus.service lightdm.service [Service] @@ -11,7 +10,6 @@ +ProtectSystem=full +ProtectHome=true +PrivateDevices=true -+DeviceAllow=char-snd rw +ProtectHostname=true +ProtectClock=true +ProtectKernelTunables=true @@ -21,6 +19,6 @@ +RestrictRealtime=true +# end of automatic additions Type=oneshot - ExecStart=/usr/bin/dbus-send --system --dest=com.deepin.api.SoundThemePlayer --print-reply /com/deepin/api/SoundThemePlayer com.deepin.api.SoundThemePlayer.PlaySoundDesktopLogin + ExecStart=/usr/bin/dbus-send --system --print-reply --dest=com.deepin.api.SoundThemePlayer /com/deepin/api/SoundThemePlayer com.deepin.api.SoundThemePlayer.PlaySoundDesktopLogin RemainAfterExit=yes ++++++ harden_deepin-shutdown-sound.service.patch ++++++ --- /var/tmp/diff_new_pack.PmPmjl/_old 2022-09-01 22:10:42.976169528 +0200 +++ /var/tmp/diff_new_pack.PmPmjl/_new 2022-09-01 22:10:42.980169539 +0200 @@ -1,9 +1,8 @@ -Index: dde-api-5.4.9/misc/systemd/system/deepin-shutdown-sound.service -=================================================================== ---- dde-api-5.4.9.orig/misc/systemd/system/deepin-shutdown-sound.service -+++ dde-api-5.4.9/misc/systemd/system/deepin-shutdown-sound.service -@@ -5,6 +5,20 @@ After=sound.target local-fs.target - Before=systemd-logind.service +diff -Nurp dde-api-5.5.25/misc/systemd/system/deepin-shutdown-sound.service dde-api-5.5.25-new/misc/systemd/system/deepin-shutdown-sound.service +--- dde-api-5.5.25/misc/systemd/system/deepin-shutdown-sound.service 2022-04-18 13:40:18.000000000 +0800 ++++ dde-api-5.5.25-new/misc/systemd/system/deepin-shutdown-sound.service 2022-08-13 16:31:17.223356184 +0800 +@@ -6,6 +6,19 @@ Conflicts=shutdown.target + Before=shutdown.target [Service] +# added automatically, for details please see @@ -11,7 +10,6 @@ +ProtectSystem=full +ProtectHome=true +PrivateDevices=true -+DeviceAllow=char-snd rw +ProtectHostname=true +ProtectClock=true +ProtectKernelTunables=true ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/deepin-api/vendor.tar.gz /work/SRC/openSUSE:Factory/.deepin-api.new.2083/vendor.tar.gz differ: char 5, line 1

1 0

commit schily for openSUSE:Factory
by Source-Sync 01 Sep '22

01 Sep '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package schily for openSUSE:Factory checked in at 2022-09-01 22:09:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/schily (Old) and /work/SRC/openSUSE:Factory/.schily.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "schily" Thu Sep 1 22:09:48 2022 rev:46 rq:1000489 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/schily/schily.changes 2022-08-29 09:42:22.503713952 +0200 +++ /work/SRC/openSUSE:Factory/.schily.new.2083/schily.changes 2022-09-01 22:10:38.288156708 +0200 @@ -1,0 +2,5 @@ +Wed Aug 31 14:28:57 UTC 2022 - Thorsten Kukuk <kukuk(a)suse.com> + +- pbosh.1: replace broken ".so sh.1" refernce with a symlink to bosh.1 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ schily.spec ++++++ --- /var/tmp/diff_new_pack.jNEWLe/_old 2022-09-01 22:10:38.928158458 +0200 +++ /var/tmp/diff_new_pack.jNEWLe/_new 2022-09-01 22:10:38.936158480 +0200 @@ -513,6 +513,7 @@ mv -fv "$b/%_mandir/man1/sh.1" "$b/%_mandir/man1/bosh.1" ln -fsv bosh.1 "$b/%_mandir/man1/jsh.1" ln -fsv bosh.1 "$b/%_mandir/man1/pfsh.1" +ln -fsv bosh.1 "$b/%_mandir/man1/pbosh.1" ln -fsv bosh "$b/%_bindir/jsh" ln -fsv bosh "$b/%_bindir/pfsh"

1 0

commit mariadb for openSUSE:Factory
by Source-Sync 01 Sep '22

01 Sep '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mariadb for openSUSE:Factory checked in at 2022-09-01 22:09:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mariadb (Old) and /work/SRC/openSUSE:Factory/.mariadb.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mariadb" Thu Sep 1 22:09:47 2022 rev:124 rq:1000487 version:10.8.3 Changes: -------- --- /work/SRC/openSUSE:Factory/mariadb/mariadb.changes 2022-03-13 20:24:42.007622385 +0100 +++ /work/SRC/openSUSE:Factory/.mariadb.new.2083/mariadb.changes 2022-09-01 22:10:36.652152234 +0200 @@ -1,0 +2,35 @@ +Wed Aug 31 15:06:37 UTC 2022 - Danilo Spinella <danilo.spinella(a)suse.com> + +- Update mysql-systemd-helper to be aware of custom group, bsc#1200105 +- Respect socket setting in mysql-systemd-helper +- Fix my_print_defaults call in mysql-system-helper + +------------------------------------------------------------------- +Tue Aug 2 23:36:11 UTC 2022 - chris(a)computersalat.de + +- use the better collation as default + * DDEFAULT_COLLATION=utf8mb4_unicode_520_ci + +------------------------------------------------------------------- +Wed Jul 27 06:19:45 UTC 2022 - Danilo Spinella <danilo.spinella(a)suse.com> + +- Update list of skipped tests + * suse_skipped_tests.list + +------------------------------------------------------------------- +Mon May 23 09:03:33 UTC 2022 - Danilo Spinella <danilo.spinella(a)suse.com> + +- Update to 10.8.3: + * release notes and changelog: + https://mariadb.com/kb/en/library/mariadb-1083-release-notes + https://mariadb.com/kb/en/library/mariadb-1083-changelog + https://mariadb.com/kb/en/library/mariadb-1082-release-notes + https://mariadb.com/kb/en/library/mariadb-1082-changelog + https://mariadb.com/kb/en/library/mariadb-1081-release-notes + https://mariadb.com/kb/en/library/mariadb-1081-changelog + https://mariadb.com/kb/en/library/mariadb-1080-release-notes + https://mariadb.com/kb/en/library/mariadb-1080-changelog +- Remove upstreamed patch: + * bsc1194828.patch + +------------------------------------------------------------------- Old: ---- bsc1194828.patch mariadb-10.7.3.tar.gz mariadb-10.7.3.tar.gz.asc New: ---- mariadb-10.8.3.tar.gz mariadb-10.8.3.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mariadb.spec ++++++ --- /var/tmp/diff_new_pack.SxikCD/_old 2022-09-01 22:10:37.636154925 +0200 +++ /var/tmp/diff_new_pack.SxikCD/_new 2022-09-01 22:10:37.640154937 +0200 @@ -52,7 +52,7 @@ # Build with cracklib plugin when cracklib-dict-full >= 2.9.0 is available %define with_cracklib_plugin 0 Name: mariadb -Version: 10.7.3 +Version: 10.8.3 Release: 0 Summary: Server part of MariaDB License: SUSE-GPL-2.0-with-FLOSS-exception @@ -80,8 +80,6 @@ Patch7: mariadb-10.4.12-fix-install-db.patch Patch9: func_math_tests_MDEV-26645.diff Patch10: fix-pamdir.patch -# PATCH-FIX-UPSTREAM danilo.spinella(a)suse.com bsc#1194828 MDEV-26645 -Patch11: bsc1194828.patch # needed for bison SQL parser and wsrep API BuildRequires: bison BuildRequires: cmake @@ -367,7 +365,6 @@ %if 0%{?suse_version} > 1500 %patch10 -p1 %endif -%patch11 -p1 cp %{_sourcedir}/suse-test-run . @@ -423,7 +420,7 @@ -DWITH_COMMENT="MariaDB rpm" \ -DWITH_EXTRA_CHARSET=all \ -DDEFAULT_CHARSET=utf8mb4 \ - -DDEFAULT_COLLATION=utf8mb4_general_ci \ + -DDEFAULT_COLLATION=utf8mb4_unicode_520_ci \ -DWITH_INNOBASE_STORAGE_ENGINE=1 \ -DWITH_PERFSCHEMA_STORAGE_ENGINE=1 \ %if 0%{with_oqgraph} < 1 @@ -611,10 +608,10 @@ %if %{with galera} # mariadb-galera.files -filelist galera_new_cluster galera_recovery wsrep_sst_common wsrep_sst_mariabackup wsrep_sst_mysqldump wsrep_sst_rsync wsrep_sst_rsync_wan >mariadb-galera.files +filelist galera_new_cluster galera_recovery wsrep_sst_common wsrep_sst_mariabackup wsrep_sst_mysqldump wsrep_sst_rsync wsrep_sst_rsync_wan wsrep_sst_backup >mariadb-galera.files touch mariadb-galera-exclude.files %else -filelist_excludes galera_new_cluster galera_recovery wsrep_sst_common wsrep_sst_mariabackup wsrep_sst_mysqldump wsrep_sst_rsync wsrep_sst_rsync_wan >mariadb-galera-exclude.files +filelist_excludes galera_new_cluster galera_recovery wsrep_sst_common wsrep_sst_mariabackup wsrep_sst_mysqldump wsrep_sst_rsync wsrep_sst_rsync_wan wsrep_sst_backup >mariadb-galera-exclude.files echo "%exclude %{_datadir}/mysql/systemd/use_galera_new_cluster.conf" >>mariadb-galera-exclude.files echo "%exclude %{_datadir}/mysql/wsrep_notify" >>mariadb-galera-exclude.files %endif @@ -941,6 +938,7 @@ %files bench -f mariadb-bench.files %{_datadir}/sql-bench +%{_datadir}/mysql/mini-benchmark %files test -f mariadb-test.files %{_bindir}/test-connect-t ++++++ mariadb-10.7.3.tar.gz -> mariadb-10.8.3.tar.gz ++++++ /work/SRC/openSUSE:Factory/mariadb/mariadb-10.7.3.tar.gz /work/SRC/openSUSE:Factory/.mariadb.new.2083/mariadb-10.8.3.tar.gz differ: char 5, line 1 ++++++ mysql-systemd-helper ++++++ --- /var/tmp/diff_new_pack.SxikCD/_old 2022-09-01 22:10:37.880155592 +0200 +++ /var/tmp/diff_new_pack.SxikCD/_new 2022-09-01 22:10:37.884155603 +0200 @@ -23,7 +23,7 @@ # Read options - important for multi setup if [[ -n "$INSTANCE" ]]; then - opts="$(/usr/bin/my_print_defaults mysqld mysqld_multi "$INSTANCE" --defaults-extra-file=/etc/my${INSTANCE}.cnf)" + opts="$(/usr/bin/my_print_defaults --defaults-extra-file=/etc/my${INSTANCE}.cnf mysqld mysqld_multi "$INSTANCE")" tmp_opts="$opts" config="/etc/my${INSTANCE}.cnf" else @@ -39,6 +39,7 @@ --socket=*) socket="$(echo "$arg" | sed -e 's/^[^=]*=//')" ;; --datadir=*) datadir="$(echo "$arg" | sed -e 's/^[^=]*=//')" ;; --user=*) mysql_daemon_user="$(echo "$arg" | sed -e 's/^[^=]*=//')" ;; + --group=*) mysql_daemon_group="$(echo "$arg" | sed -e 's/^[^=]*=//')" ;; esac done @@ -171,7 +172,8 @@ exec /usr/sbin/mysqld \ --defaults-file="$config" \ $ignore_db_dir \ - --user="$mysql_daemon_user" + --user="$mysql_daemon_user" \ + --socket="$socket" } # We rely on output in english at some points ++++++ suse_skipped_tests.list ++++++ --- /var/tmp/diff_new_pack.SxikCD/_old 2022-09-01 22:10:37.936155745 +0200 +++ /var/tmp/diff_new_pack.SxikCD/_new 2022-09-01 22:10:37.940155756 +0200 @@ -80,4 +80,11 @@ main.mysql_upgrade : since 10.7.3 - x86_64 perfschema.privilege_table_io : since 10.7.3 - x86_64 +perfschema.threads_mysql : since 10.8.3 - x86_64 (MDEV-28674) +disks.disks : since 10.8.3 - x86_64 +disks.disks_notembedded : since 10.8.3 - x86_64 +innodb.row_size_error_log_warnings_3 : since 10.8.3 - s390x +main.func_json_notembedded : since 10.8.3 - s390x, ppc64 +main.func_math : since 10.8.3 - ppc64le +

1 0

commit DirectX-Headers for openSUSE:Factory
by Source-Sync 01 Sep '22

01 Sep '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package DirectX-Headers for openSUSE:Factory checked in at 2022-09-01 22:09:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/DirectX-Headers (Old) and /work/SRC/openSUSE:Factory/.DirectX-Headers.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "DirectX-Headers" Thu Sep 1 22:09:47 2022 rev:3 rq:1000484 version:1.606.4 Changes: -------- --- /work/SRC/openSUSE:Factory/DirectX-Headers/DirectX-Headers.changes 2022-08-17 18:32:55.168585850 +0200 +++ /work/SRC/openSUSE:Factory/.DirectX-Headers.new.2083/DirectX-Headers.changes 2022-09-01 22:10:34.636146721 +0200 @@ -1,0 +2,7 @@ +Tue Aug 30 23:51:37 UTC 2022 - Scott Bradnick <scott.bradnick(a)suse.com> + +- Update to 1.606.4: + * Update D3DX12.H to support new ABI for MinGW (#73) + * dxguids: Add new GUIDs from the last several releases + +------------------------------------------------------------------- Old: ---- DirectX-Headers-1.606.3.tar.gz New: ---- DirectX-Headers-1.606.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ DirectX-Headers.spec ++++++ --- /var/tmp/diff_new_pack.GmCQfn/_old 2022-09-01 22:10:35.372148733 +0200 +++ /var/tmp/diff_new_pack.GmCQfn/_new 2022-09-01 22:10:35.376148744 +0200 @@ -11,21 +11,23 @@ # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# + # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + Name: DirectX-Headers -Version: 1.606.3 +Version: 1.606.4 Release: 0 Summary: DirectX Headers for Mesa License: MIT URL: https://github.com/microsoft/DirectX-Headers +# osc service runall download_files Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz Source1: %{name}-rpmlintrc +BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: meson -BuildRequires: fdupes ExclusiveArch: %{ix86} x86_64 %description ++++++ DirectX-Headers-1.606.3.tar.gz -> DirectX-Headers-1.606.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DirectX-Headers-1.606.3/CMakeLists.txt new/DirectX-Headers-1.606.4/CMakeLists.txt --- old/DirectX-Headers-1.606.3/CMakeLists.txt 2022-07-14 19:35:53.000000000 +0200 +++ new/DirectX-Headers-1.606.4/CMakeLists.txt 2022-08-29 22:59:34.000000000 +0200 @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10.2) project(DirectX-Headers LANGUAGES CXX - VERSION 1.606.3 + VERSION 1.606.4 ) set(CMAKE_CXX_STANDARD 14) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DirectX-Headers-1.606.3/include/directx/d3dx12.h new/DirectX-Headers-1.606.4/include/directx/d3dx12.h --- old/DirectX-Headers-1.606.3/include/directx/d3dx12.h 2022-07-14 19:35:53.000000000 +0200 +++ new/DirectX-Headers-1.606.4/include/directx/d3dx12.h 2022-08-29 22:59:34.000000000 +0200 @@ -76,7 +76,12 @@ FLOAT minDepth = D3D12_MIN_DEPTH, FLOAT maxDepth = D3D12_MAX_DEPTH ) noexcept { +#if defined(_MSC_VER) || !defined(_WIN32) const auto Desc = pResource->GetDesc(); +#else + D3D12_RESOURCE_DESC tmpDesc; + const auto& Desc = *pResource->GetDesc(&tmpDesc); +#endif const UINT64 SubresourceWidth = Desc.Width >> mipSlice; const UINT64 SubresourceHeight = Desc.Height >> mipSlice; switch (Desc.Dimension) @@ -2165,7 +2170,12 @@ _In_range_(0,D3D12_REQ_SUBRESOURCES) UINT FirstSubresource, _In_range_(0,D3D12_REQ_SUBRESOURCES-FirstSubresource) UINT NumSubresources) noexcept { +#if defined(_MSC_VER) || !defined(_WIN32) const auto Desc = pDestinationResource->GetDesc(); +#else + D3D12_RESOURCE_DESC tmpDesc; + const auto& Desc = *pDestinationResource->GetDesc(&tmpDesc); +#endif UINT64 RequiredSize = 0; ID3D12Device* pDevice = nullptr; @@ -2191,8 +2201,14 @@ _In_reads_(NumSubresources) const D3D12_SUBRESOURCE_DATA* pSrcData) noexcept { // Minor validation +#if defined(_MSC_VER) || !defined(_WIN32) const auto IntermediateDesc = pIntermediate->GetDesc(); const auto DestinationDesc = pDestinationResource->GetDesc(); +#else + D3D12_RESOURCE_DESC tmpDesc1, tmpDesc2; + const auto& IntermediateDesc = *pIntermediate->GetDesc(&tmpDesc1); + const auto& DestinationDesc = *pDestinationResource->GetDesc(&tmpDesc2); +#endif if (IntermediateDesc.Dimension != D3D12_RESOURCE_DIMENSION_BUFFER || IntermediateDesc.Width < RequiredSize + pLayouts[0].Offset || RequiredSize > SIZE_T(-1) || @@ -2250,8 +2266,14 @@ _In_reads_(NumSubresources) const D3D12_SUBRESOURCE_INFO* pSrcData) noexcept { // Minor validation +#if defined(_MSC_VER) || !defined(_WIN32) const auto IntermediateDesc = pIntermediate->GetDesc(); const auto DestinationDesc = pDestinationResource->GetDesc(); +#else + D3D12_RESOURCE_DESC tmpDesc1, tmpDesc2; + const auto& IntermediateDesc = *pIntermediate->GetDesc(&tmpDesc1); + const auto& DestinationDesc = *pDestinationResource->GetDesc(&tmpDesc2); +#endif if (IntermediateDesc.Dimension != D3D12_RESOURCE_DIMENSION_BUFFER || IntermediateDesc.Width < RequiredSize + pLayouts[0].Offset || RequiredSize > SIZE_T(-1) || @@ -2319,7 +2341,12 @@ auto pRowSizesInBytes = reinterpret_cast<UINT64*>(pLayouts + NumSubresources); auto pNumRows = reinterpret_cast<UINT*>(pRowSizesInBytes + NumSubresources); +#if defined(_MSC_VER) || !defined(_WIN32) const auto Desc = pDestinationResource->GetDesc(); +#else + D3D12_RESOURCE_DESC tmpDesc; + const auto& Desc = *pDestinationResource->GetDesc(&tmpDesc); +#endif ID3D12Device* pDevice = nullptr; pDestinationResource->GetDevice(IID_ID3D12Device, reinterpret_cast<void**>(&pDevice)); pDevice->GetCopyableFootprints(&Desc, FirstSubresource, NumSubresources, IntermediateOffset, pLayouts, pNumRows, pRowSizesInBytes, &RequiredSize); @@ -2357,7 +2384,12 @@ auto pRowSizesInBytes = reinterpret_cast<UINT64*>(pLayouts + NumSubresources); auto pNumRows = reinterpret_cast<UINT*>(pRowSizesInBytes + NumSubresources); +#if defined(_MSC_VER) || !defined(_WIN32) const auto Desc = pDestinationResource->GetDesc(); +#else + D3D12_RESOURCE_DESC tmpDesc; + const auto& Desc = *pDestinationResource->GetDesc(&tmpDesc); +#endif ID3D12Device* pDevice = nullptr; pDestinationResource->GetDevice(IID_ID3D12Device, reinterpret_cast<void**>(&pDevice)); pDevice->GetCopyableFootprints(&Desc, FirstSubresource, NumSubresources, IntermediateOffset, pLayouts, pNumRows, pRowSizesInBytes, &RequiredSize); @@ -2385,7 +2417,12 @@ UINT NumRows[MaxSubresources]; UINT64 RowSizesInBytes[MaxSubresources]; +#if defined(_MSC_VER) || !defined(_WIN32) const auto Desc = pDestinationResource->GetDesc(); +#else + D3D12_RESOURCE_DESC tmpDesc; + const auto& Desc = *pDestinationResource->GetDesc(&tmpDesc); +#endif ID3D12Device* pDevice = nullptr; pDestinationResource->GetDevice(IID_ID3D12Device, reinterpret_cast<void**>(&pDevice)); pDevice->GetCopyableFootprints(&Desc, FirstSubresource, NumSubresources, IntermediateOffset, Layouts, NumRows, RowSizesInBytes, &RequiredSize); @@ -2412,7 +2449,12 @@ UINT NumRows[MaxSubresources]; UINT64 RowSizesInBytes[MaxSubresources]; +#if defined(_MSC_VER) || !defined(_WIN32) const auto Desc = pDestinationResource->GetDesc(); +#else + D3D12_RESOURCE_DESC tmpDesc; + const auto& Desc = *pDestinationResource->GetDesc(&tmpDesc); +#endif ID3D12Device* pDevice = nullptr; pDestinationResource->GetDevice(IID_ID3D12Device, reinterpret_cast<void**>(&pDevice)); pDevice->GetCopyableFootprints(&Desc, FirstSubresource, NumSubresources, IntermediateOffset, Layouts, NumRows, RowSizesInBytes, &RequiredSize); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DirectX-Headers-1.606.3/include/dxguids/dxguids.h new/DirectX-Headers-1.606.4/include/dxguids/dxguids.h --- old/DirectX-Headers-1.606.3/include/dxguids/dxguids.h 2022-07-14 19:35:53.000000000 +0200 +++ new/DirectX-Headers-1.606.4/include/dxguids/dxguids.h 2022-08-29 22:59:34.000000000 +0200 @@ -104,8 +104,10 @@ WINADAPTER_IID(ID3D12Device5, 0x8b4f173b, 0x2fea, 0x4b80, 0x8f, 0x58, 0x43, 0x07, 0x19, 0x1a, 0xb9, 0x5d); WINADAPTER_IID(ID3D12DeviceRemovedExtendedDataSettings, 0x82BC481C, 0x6B9B, 0x4030, 0xAE, 0xDB, 0x7E, 0xE3, 0xD1, 0xDF, 0x1E, 0x63); WINADAPTER_IID(ID3D12DeviceRemovedExtendedDataSettings1, 0xDBD5AE51, 0x3317, 0x4F0A, 0xAD, 0xF9, 0x1D, 0x7C, 0xED, 0xCA, 0xAE, 0x0B); +WINADAPTER_IID(ID3D12DeviceRemovedExtendedDataSettings2, 0x61552388, 0x01ab, 0x4008, 0xa4, 0x36, 0x83, 0xdb, 0x18, 0x95, 0x66, 0xea); WINADAPTER_IID(ID3D12DeviceRemovedExtendedData, 0x98931D33, 0x5AE8, 0x4791, 0xAA, 0x3C, 0x1A, 0x73, 0xA2, 0x93, 0x4E, 0x71); WINADAPTER_IID(ID3D12DeviceRemovedExtendedData1, 0x9727A022, 0xCF1D, 0x4DDA, 0x9E, 0xBA, 0xEF, 0xFA, 0x65, 0x3F, 0xC5, 0x06); +WINADAPTER_IID(ID3D12DeviceRemovedExtendedData2, 0x67FC5816, 0xE4CA, 0x4915, 0xBF, 0x18, 0x42, 0x54, 0x12, 0x72, 0xDA, 0x54); WINADAPTER_IID(ID3D12Device6, 0xc70b221b, 0x40e4, 0x4a17, 0x89, 0xaf, 0x02, 0x5a, 0x07, 0x27, 0xa6, 0xdc); WINADAPTER_IID(ID3D12ProtectedResourceSession1, 0xD6F12DD6, 0x76FB, 0x406E, 0x89, 0x61, 0x42, 0x96, 0xEE, 0xFC, 0x04, 0x09); WINADAPTER_IID(ID3D12Device7, 0x5c014b53, 0x68a1, 0x4b9b, 0x8b, 0xd1, 0xdd, 0x60, 0x46, 0xb9, 0x35, 0x8b); @@ -119,12 +121,17 @@ WINADAPTER_IID(ID3D12ShaderCacheSession, 0x28e2495d, 0x0f64, 0x4ae4, 0xa6, 0xec, 0x12, 0x92, 0x55, 0xdc, 0x49, 0xa8); WINADAPTER_IID(ID3D12Device9, 0x4c80e962, 0xf032, 0x4f60, 0xbc, 0x9e, 0xeb, 0xc2, 0xcf, 0xa1, 0xd8, 0x3c); WINADAPTER_IID(ID3D12Device10, 0x517f8718, 0xaa66, 0x49f9, 0xb0, 0x2b, 0xa7, 0xab, 0x89, 0xc0, 0x60, 0x31); +WINADAPTER_IID(ID3D12Device11, 0x5405c344, 0xd457, 0x444e, 0xb4, 0xdd, 0x23, 0x66, 0xe4, 0x5a, 0xee, 0x39); WINADAPTER_IID(ID3D12VirtualizationGuestDevice, 0xbc66d368, 0x7373, 0x4943, 0x87, 0x57, 0xfc, 0x87, 0xdc, 0x79, 0xe4, 0x76); WINADAPTER_IID(ID3D12Tools, 0x7071e1f0, 0xe84b, 0x4b33, 0x97, 0x4f, 0x12, 0xfa, 0x49, 0xde, 0x65, 0xc5); WINADAPTER_IID(ID3D12SDKConfiguration, 0xe9eb5314, 0x33aa, 0x42b2, 0xa7, 0x18, 0xd7, 0x7f, 0x58, 0xb1, 0xf1, 0xc7); +WINADAPTER_IID(ID3D12SDKConfiguration1, 0x8aaf9303, 0xad25, 0x48b9, 0x9a, 0x57, 0xd9, 0xc3, 0x7e, 0x00, 0x9d, 0x9f); +WINADAPTER_IID(ID3D12DeviceFactory, 0x61f307d3, 0xd34e, 0x4e7c, 0x83, 0x74, 0x3b, 0xa4, 0xde, 0x23, 0xcc, 0xcb); +WINADAPTER_IID(ID3D12DeviceConfiguration, 0x78dbf87b, 0xf766, 0x422b, 0xa6, 0x1c, 0xc8, 0xc4, 0x46, 0xbd, 0xb9, 0xad); WINADAPTER_IID(ID3D12GraphicsCommandList5, 0x55050859, 0x4024, 0x474c, 0x87, 0xf5, 0x64, 0x72, 0xea, 0xee, 0x44, 0xea); WINADAPTER_IID(ID3D12GraphicsCommandList6, 0xc3827890, 0xe548, 0x4cfa, 0x96, 0xcf, 0x56, 0x89, 0xa9, 0x37, 0x0f, 0x80); WINADAPTER_IID(ID3D12GraphicsCommandList7, 0xdd171223, 0x8b61, 0x4769, 0x90, 0xe3, 0x16, 0x0c, 0xcd, 0xe4, 0xe2, 0xc1); +WINADAPTER_IID(ID3D12GraphicsCommandList8, 0xee936ef9, 0x599d, 0x4d28, 0x93, 0x8e, 0x23, 0xc4, 0xad, 0x05, 0xce, 0x51); #endif // Direct3D Video @@ -147,12 +154,15 @@ WINADAPTER_IID(ID3D12VideoExtensionCommand,0x554E41E8,0xAE8E,0x4A8C,0xB7,0xD2,0x5B,0x4F,0x27,0x4A,0x30,0xE4); WINADAPTER_IID(ID3D12VideoDevice2,0xF019AC49,0xF838,0x4A95,0x9B,0x17,0x57,0x94,0x37,0xC8,0xF5,0x13); WINADAPTER_IID(ID3D12VideoDecodeCommandList2,0x6e120880,0xc114,0x4153,0x80,0x36,0xd2,0x47,0x05,0x1e,0x17,0x29); +WINADAPTER_IID(ID3D12VideoDecodeCommandList3,0x2aee8c37,0x9562,0x42da,0x8a,0xbf,0x61,0xef,0xeb,0x2e,0x45,0x13); WINADAPTER_IID(ID3D12VideoProcessCommandList2,0xdb525ae4,0x6ad6,0x473c,0xba,0xa7,0x59,0xb2,0xe3,0x70,0x82,0xe4); +WINADAPTER_IID(ID3D12VideoProcessCommandList3,0x1a0a4ca4,0x9f08,0x40ce,0x95,0x58,0xb4,0x11,0xfd,0x26,0x66,0xff); WINADAPTER_IID(ID3D12VideoEncodeCommandList1,0x94971eca,0x2bdb,0x4769,0x88,0xcf,0x36,0x75,0xea,0x75,0x7e,0xbc); WINADAPTER_IID(ID3D12VideoEncoder,0x2E0D212D,0x8DF9,0x44A6,0xA7,0x70,0xBB,0x28,0x9B,0x18,0x27,0x37); WINADAPTER_IID(ID3D12VideoEncoderHeap,0x22B35D96,0x876A,0x44C0,0xB2,0x5E,0xFB,0x8C,0x9C,0x7F,0x1C,0x4A); WINADAPTER_IID(ID3D12VideoDevice3,0x4243ADB4,0x3A32,0x4666,0x97,0x3C,0x0C,0xCC,0x56,0x25,0xDC,0x44); WINADAPTER_IID(ID3D12VideoEncodeCommandList2,0x895491e2,0xe701,0x46a9,0x9a,0x1f,0x8d,0x34,0x80,0xed,0x86,0x7a); +WINADAPTER_IID(ID3D12VideoEncodeCommandList3,0x7f027b22,0x1515,0x4e85,0xaa,0x0d,0x02,0x64,0x86,0x58,0x05,0x76); #endif #ifdef __d3d12sdklayers_h__ @@ -167,9 +177,11 @@ WINADAPTER_IID(ID3D12DebugDevice, 0x3febd6dd, 0x4973, 0x4787, 0x81, 0x94, 0xe4, 0x5f, 0x9e, 0x28, 0x92, 0x3e); WINADAPTER_IID(ID3D12DebugDevice2, 0x60eccbc1, 0x378d, 0x4df1, 0x89, 0x4c, 0xf8, 0xac, 0x5c, 0xe4, 0xd7, 0xdd); WINADAPTER_IID(ID3D12DebugCommandQueue, 0x09e0bf36, 0x54ac, 0x484f, 0x88, 0x47, 0x4b, 0xae, 0xea, 0xb6, 0x05, 0x3a); +WINADAPTER_IID(ID3D12DebugCommandQueue1, 0x16be35a2, 0xbfd6, 0x49f2, 0xbc, 0xae, 0xea, 0xae, 0x4a, 0xff, 0x86, 0x2d); WINADAPTER_IID(ID3D12DebugCommandList1, 0x102ca951, 0x311b, 0x4b01, 0xb1, 0x1f, 0xec, 0xb8, 0x3e, 0x06, 0x1b, 0x37); WINADAPTER_IID(ID3D12DebugCommandList, 0x09e0bf36, 0x54ac, 0x484f, 0x88, 0x47, 0x4b, 0xae, 0xea, 0xb6, 0x05, 0x3f); WINADAPTER_IID(ID3D12DebugCommandList2, 0xaeb575cf, 0x4e06, 0x48be, 0xba, 0x3b, 0xc4, 0x50, 0xfc, 0x96, 0x65, 0x2e); +WINADAPTER_IID(ID3D12DebugCommandList3, 0x197d5e15, 0x4d37, 0x4d34, 0xaf, 0x78, 0x72, 0x4c, 0xd7, 0x0f, 0xdb, 0x1f); WINADAPTER_IID(ID3D12SharingContract, 0x0adf7d52, 0x929c, 0x4e61, 0xad, 0xdb, 0xff, 0xed, 0x30, 0xde, 0x66, 0xef); WINADAPTER_IID(ID3D12InfoQueue, 0x0742a90b, 0xc387, 0x483f, 0xb9, 0x46, 0x30, 0xa7, 0xe4, 0xe6, 0x14, 0x58); WINADAPTER_IID(ID3D12InfoQueue1, 0x2852dd88, 0xb484, 0x4c0c, 0xb6, 0xb1, 0x67, 0x16, 0x85, 0x00, 0xe6, 0x00); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DirectX-Headers-1.606.3/meson.build new/DirectX-Headers-1.606.4/meson.build --- old/DirectX-Headers-1.606.3/meson.build 2022-07-14 19:35:53.000000000 +0200 +++ new/DirectX-Headers-1.606.4/meson.build 2022-08-29 22:59:34.000000000 +0200 @@ -1,7 +1,7 @@ # Copyright (c) Microsoft Corporation. # Licensed under the MIT License. -project('DirectX-Headers', 'cpp', version : '1.606.3', +project('DirectX-Headers', 'cpp', version : '1.606.4', default_options : ['cpp_std=c++14']) inc_dirs = [include_directories('include', is_system : true)]

1 0

commit kdump for openSUSE:Factory
by Source-Sync 01 Sep '22

01 Sep '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kdump for openSUSE:Factory checked in at 2022-09-01 22:09:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdump (Old) and /work/SRC/openSUSE:Factory/.kdump.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdump" Thu Sep 1 22:09:45 2022 rev:127 rq:1000481 version:1.0.2+git19.g0c60ffb Changes: -------- --- /work/SRC/openSUSE:Factory/kdump/kdump.changes 2022-07-31 23:00:14.963570660 +0200 +++ /work/SRC/openSUSE:Factory/.kdump.new.2083/kdump.changes 2022-09-01 22:10:33.092142498 +0200 @@ -1,0 +2,5 @@ +Wed Aug 31 12:04:40 UTC 2022 - Jiri Bohac <jbohac(a)suse.com> + +- mkdumprd: replace mkinitrd with native dracut (bsc#1202443) + +------------------------------------------------------------------- Old: ---- kdump-1.0.2+git17.g491c742.tar.xz New: ---- kdump-1.0.2+git19.g0c60ffb.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdump.spec ++++++ --- /var/tmp/diff_new_pack.9sSx0F/_old 2022-09-01 22:10:33.724144227 +0200 +++ /var/tmp/diff_new_pack.9sSx0F/_new 2022-09-01 22:10:33.732144249 +0200 @@ -49,7 +49,7 @@ %define dracutlibdir %{_prefix}/lib/dracut Name: kdump -Version: 1.0.2+git17.g491c742 +Version: 1.0.2+git19.g0c60ffb Release: 0 Summary: Script for kdump License: GPL-2.0-or-later ++++++ kdump-1.0.2+git17.g491c742.tar.xz -> kdump-1.0.2+git19.g0c60ffb.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdump-1.0.2+git17.g491c742/doc/implementation/Implementation_Guide.txt new/kdump-1.0.2+git19.g0c60ffb/doc/implementation/Implementation_Guide.txt --- old/kdump-1.0.2+git17.g491c742/doc/implementation/Implementation_Guide.txt 2022-07-08 21:02:04.000000000 +0200 +++ new/kdump-1.0.2+git19.g0c60ffb/doc/implementation/Implementation_Guide.txt 2022-08-31 14:02:57.000000000 +0200 @@ -160,7 +160,7 @@ the copy process (via external binary or a library). We need both network access and disk access in the initrd. For this, we need the disk drivers and network drivers and network configuration. This is only a configuration problem since -everything is already implemented in +mkinitrd+ to provide network boot (NFS +everything is already implemented in +dracut+ to provide network boot (NFS root) facility. Filtering diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdump-1.0.2+git17.g491c742/doc/man/mkdumprd.8.txt.in new/kdump-1.0.2+git19.g0c60ffb/doc/man/mkdumprd.8.txt.in --- old/kdump-1.0.2+git17.g491c742/doc/man/mkdumprd.8.txt.in 2022-07-08 21:02:04.000000000 +0200 +++ new/kdump-1.0.2+git19.g0c60ffb/doc/man/mkdumprd.8.txt.in 2022-08-31 14:02:57.000000000 +0200 @@ -54,7 +54,7 @@ * the kdump initrd should use no splash screen, * the kdump initrd includes *kdumptool*(8) and all required libraries. -This script calls *mkinitrd*(8) with all required parameters. If the initrd +This script calls *dracut*(8) with all required parameters. If the initrd already exists, it checks first if the configuration file or the kernel are newer, and only rebuilds the initrd if necessary. @@ -102,7 +102,7 @@ SEE ALSO -------- -*kdumptool*(8), *mkinitrd*(8), +*kdumptool*(8), *dracut*(8), http://en.opensuse.org/Kdump[_http://en.opensuse.org/Kdump_] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdump-1.0.2+git17.g491c742/init/mkdumprd new/kdump-1.0.2+git19.g0c60ffb/init/mkdumprd --- old/kdump-1.0.2+git17.g491c742/init/mkdumprd 2022-07-08 21:02:04.000000000 +0200 +++ new/kdump-1.0.2+git19.g0c60ffb/init/mkdumprd 2022-08-31 14:02:57.000000000 +0200 @@ -24,6 +24,7 @@ QUIET=0 DEBUG=false DRACUT=/usr/bin/dracut +UPDATE_BOOTLOADER=/sbin/update-bootloader # # Prints usage. {{{ @@ -76,12 +77,13 @@ { # With fadump, this script has no control over which kernel will # be booted after a crash, but any installed kernel can be used - # to save the dump. Consequently, let mkinitrd regenerate initrd + # to save the dump. Consequently, let dracut regenerate initrd # for all installed kernels. - $DEBUG && export dracut_args="--debug" + DRACUT_ARGS="--force --regenerate-all" + $DEBUG && DRACUT_ARGS="--debug $DRACUT_ARGS" echo "Regenerating all initrds ..." >&2 - eval "bash -$- /sbin/mkinitrd" + eval "bash -$- $DRACUT $DRACUT_ARGS && type -P $UPDATE_BOOTLOADER &> /dev/null && $UPDATE_BOOTLOADER --refresh" } # }}} #

1 0