diff --git a/0001-set-isUserManualExists-return-false.patch b/0001-set-isUserManualExists-return-false.patch new file mode 100644 index 0000000000000000000000000000000000000000..96df68e5c1502151cce6f3009182c4b3f0712e0e --- /dev/null +++ b/0001-set-isUserManualExists-return-false.patch @@ -0,0 +1,25 @@ +From ab33d725c9daf6d10fde235fc10a8ff3eb5dd57a Mon Sep 17 00:00:00 2001 +From: root +Date: Wed, 13 Dec 2023 16:01:35 +0800 +Subject: [PATCH] set isUserManualExists return false + +--- + src/widgets/dapplication.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/widgets/dapplication.cpp b/src/widgets/dapplication.cpp +index 41f799c2..87fad7fc 100644 +--- a/src/widgets/dapplication.cpp ++++ b/src/widgets/dapplication.cpp +@@ -414,7 +414,7 @@ void DApplicationPrivate::handleSizeModeChangeEvent(QWidget *widget, QEvent *eve + + bool DApplicationPrivate::isUserManualExists() + { +- return DGuiApplicationHelper::instance()->hasUserManual(); ++ return 0; + } + + /*! +-- +2.39.3 + diff --git a/README.en.md b/README.en.md deleted file mode 100644 index fe3b38a0ae52f8f747f9c6ac42af08601cedf994..0000000000000000000000000000000000000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# dtkwidget - -#### Description -dtkwidget - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md deleted file mode 100644 index e27c315954830844c77115640d066e8d26795092..0000000000000000000000000000000000000000 --- a/README.md +++ /dev/null @@ -1,37 +0,0 @@ -# dtkwidget - -#### 介绍 -dtkwidget - -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request - - -#### 码云特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目 -5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/dtkwidget-5.5.59.tar.gz b/dtkwidget-5.6.11.6.tar.gz similarity index 32% rename from dtkwidget-5.5.59.tar.gz rename to dtkwidget-5.6.11.6.tar.gz index 5a97816083dbfbf73dcd5f502e7b91adcf957aab..c1ebf1a70f9a00aa6941bc41fc320205d7f5596c 100644 Binary files a/dtkwidget-5.5.59.tar.gz and b/dtkwidget-5.6.11.6.tar.gz differ diff --git a/dtkwidget.spec b/dtkwidget.spec index 1e1cfd3eb56cd2ceaebac2d469a98c532a78ddd1..cc0a2157d717f64b986c798451ece5478e34b0f7 100644 --- a/dtkwidget.spec +++ b/dtkwidget.spec @@ -1,16 +1,19 @@ +%define __cmake_builddir $(pwd) Name: dtkwidget -Version: 5.5.59 -Release: 1 +Version: 5.6.11.6 +Release: 3%{?dist} Summary: Deepin tool kit widget modules License: LGPLv3+ URL: https://github.com/linuxdeepin/dtkwidget -Source0: %{name}-%{version}.tar.gz +Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +Patch1: 0001-set-isUserManualExists-return-false.patch BuildRequires: gcc-c++ BuildRequires: qt5-linguist BuildRequires: qt5-qtbase-static BuildRequires: dtkgui-devel BuildRequires: dtkcore-devel +BuildRequires: gtest-devel BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Concurrent) BuildRequires: pkgconfig(Qt5DBus) @@ -32,13 +35,16 @@ BuildRequires: pkgconfig(xcb-util) BuildRequires: pkgconfig(xkbcommon) BuildRequires: pkgconfig(xrender) BuildRequires: cups-devel -BuildRequires: gtest-devel # libQt5Gui.so.5(Qt_5.10.1_PRIVATE_API)(64bit) needed by dtkwidget-2.0.6.1-1.fc29.x86_64 BuildRequires: qt5-qtbase-private-devel +BuildRequires: qt5-qttools-devel +BuildRequires: make +BuildRequires: cmake +BuildRequires: doxygen + %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} -Obsoletes: dtkwidget2 %description DtkWidget is Deepin graphical user interface for deepin desktop development. @@ -53,10 +59,14 @@ Header files and libraries for %{name}. %prep %setup -q +%ifarch loongarch64 sw_64 +%patch1 -p1 +%endif %build +# help find (and prefer) qt5 utilities, e.g. qmake, lrelease export PATH=%{_qt5_bindir}:$PATH -%qmake_qt5 PREFIX=%{_prefix} LIB_INSTALL_DIR=%{_libdir} DBUS_VERSION_0_4_2=YES +%cmake %make_build %install @@ -66,38 +76,32 @@ export PATH=%{_qt5_bindir}:$PATH %doc README.md %license LICENSE %{_libdir}/lib%{name}.so.5* -%{_libdir}/libdtk-*/ -%{_datadir}/libdtk-*/ -%{_libdir}/examples/collections +%{_libdir}/dtk5/DWidget/bin +%{_libdir}/dtk5/DWidget/examples +%{_datadir}/* %files devel -%{_includedir}/libdtk-*/ +%{_includedir}/dtk5/ %{_qt5_archdatadir}/mkspecs/modules/*.pri %{_libdir}/cmake/DtkWidget/ %{_libdir}/pkgconfig/%{name}.pc %{_libdir}/lib%{name}.so %changelog -* Mon Jul 24 2023 leeffo - 5.5.59-1 -- upgrade to version 5.5.59 - -* Thu Mar 23 2023 liweiganga - 5.5.28-1 -- update to 5.5.28 - -* Thu Jul 28 2022 liweiganga - 5.4.11.3-2 -- fix install conflict +* Wed Dec 13 2023 mahailiang - 5.6.11.6-3 +- fix: set isUserManualExists return false on loongarch64 sw_64(bugid:226963) -* Tue Jul 19 2022 konglidong - 5.4.11.3-1 -- Update to 5.4.11.3 +* Wed Oct 11 2023 liweigang - 5.6.11.6-2 +- spec: change DWidget bin path -* Thu Jul 15 2021 weidong - 5.2.2.3-2 -- Format spec +* Mon Oct 09 2023 liweigang - 5.6.11.6-1 +- update: update to verison 5.6.11.6 -* Mon Jul 12 2021 weidong - 5.2.2.3-1 -- Update to 5.2.2.3 +* Wed Aug 16 2023 liuzhilin - 5.6.11.5-1 +- update: update to 5.6.11.5 -* Thu Sep 3 2020 weidong - 5.2.0-2 -- fix source url in spec +* Fri Dec 23 2022 liweiganga - 5.5.59-1 +- update: update to 5.5.59 -* Thu Jul 30 2020 openEuler Buildteam - 5.2.0-1 -- Package init +* Fri Jun 10 2022 uoser - 5.5.28-1.01 +- update: update to 5.5.28-1.01 diff --git a/dtkwidget.yaml b/dtkwidget.yaml deleted file mode 100644 index c5616629735ed654bde2f59656ed1b7c8b92719f..0000000000000000000000000000000000000000 --- a/dtkwidget.yaml +++ /dev/null @@ -1,4 +0,0 @@ -version_control: github -src_repo: linuxdeepin/dtkwidget -tag_prefix: ^v -seperator: .