diff --git a/0001-fix-compile-error-of-kylin-music.patch b/0001-fix-compile-error-of-kylin-music.patch new file mode 100644 index 0000000..1e2dbb5 --- /dev/null +++ b/0001-fix-compile-error-of-kylin-music.patch @@ -0,0 +1,25 @@ +From dd2a1f9c19bc0109a7a9dc3db5b87885030c9a47 Mon Sep 17 00:00:00 2001 +From: peijiankang +Date: Fri, 10 Jun 2022 11:18:20 +0800 +Subject: [PATCH] fix compile error of kylin-music + +--- + kylin-music.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kylin-music.pro b/kylin-music.pro +index 3c2b7e0..0cfa118 100644 +--- a/kylin-music.pro ++++ b/kylin-music.pro +@@ -5,7 +5,7 @@ QT += dbus x11extras KWindowSystem network + + CONFIG += c++11 + +-INCLUDEPATH += /usr/include/mpv/ ++INCLUDEPATH += /usr/include/mpv/ /usr/include/ffmpeg + LIBS += -lmpv \ + + LIBS += -lpeony \ +-- +2.33.0 + diff --git a/0001-modify-kylin-music-complier-error.patch b/0001-modify-kylin-music-complier-error.patch deleted file mode 100644 index aa067b2..0000000 --- a/0001-modify-kylin-music-complier-error.patch +++ /dev/null @@ -1,41 +0,0 @@ -From b42f9f7df7f61d1fd894da7fc49909b5744e7fa5 Mon Sep 17 00:00:00 2001 -From: peijiankang -Date: Thu, 19 Aug 2021 10:54:38 +0800 -Subject: [PATCH] modify kylin-music complier error - ---- - res.qrc | 1 - - xatom-helper.h | 2 +- - 2 files changed, 1 insertion(+), 2 deletions(-) - -diff --git a/res.qrc b/res.qrc -index cd9260c..5c47630 100644 ---- a/res.qrc -+++ b/res.qrc -@@ -93,7 +93,6 @@ - img/dark/icon_volume_small_w@2x.png - img/fengmian.png - translations/kylin-music_zh_CN.ts -- translations/kylin-music_zh_CN.qm - img/promptwhile.png - img/promptblack.png - img/kylin-music-logo.png -diff --git a/xatom-helper.h b/xatom-helper.h -index f5b3e6d..854ff7e 100644 ---- a/xatom-helper.h -+++ b/xatom-helper.h -@@ -18,10 +18,10 @@ - #ifndef XATOMHELPER_H - #define XATOMHELPER_H - -+#include - #include - - #include --#include - - struct UnityCorners { - ulong topLeft = 0; --- -2.27.0 - diff --git a/0001_fix_chinese_translation_issue.patch b/0001_fix_chinese_translation_issue.patch deleted file mode 100644 index a7e1c2e..0000000 --- a/0001_fix_chinese_translation_issue.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur kylin-music-1.0.44/main.cpp kylin-music-1.0.44~/main.cpp ---- kylin-music-1.0.44/main.cpp 2021-01-29 14:38:53.000000000 +0800 -+++ kylin-music-1.0.44~/main.cpp 2021-09-03 23:20:43.491981530 +0800 -@@ -120,8 +120,8 @@ - QString locale = QLocale::system().name(); - QTranslator trans_global, trans_menu; - if(locale == "zh_CN"){ -- trans_global.load(":/translations/kylin-music_zh_CN.qm"); -- trans_menu.load(":/translations/qt_zh_CN.qm"); -+ trans_global.load("kylin-music_zh_CN.qm","/usr/share/kylin-music"); -+ trans_menu.load("qt_zh_CN.qm","/usr/share/kylin-music"); - a.installTranslator(&trans_global); - a.installTranslator(&trans_menu); - } diff --git a/0002-modify-version-is-error.patch b/0002-modify-version-is-error.patch deleted file mode 100644 index 1c66e15..0000000 --- a/0002-modify-version-is-error.patch +++ /dev/null @@ -1,427 +0,0 @@ -From 9df3962f678c098f307454dcfe86863a816a6a49 Mon Sep 17 00:00:00 2001 -From: pei-jiankang -Date: Thu, 7 Apr 2022 13:33:57 +0800 -Subject: [PATCH] modify version is error - ---- - menumodule.cpp | 22 ++++ - translations/kylin-music_zh_CN.ts | 210 +++++++++++++++--------------- - 2 files changed, 127 insertions(+), 105 deletions(-) - -diff --git a/menumodule.cpp b/menumodule.cpp -index 806c98d..40472c3 100644 ---- a/menumodule.cpp -+++ b/menumodule.cpp -@@ -237,6 +237,28 @@ QVBoxLayout* menuModule::initBody(){ - // bodyAppName->setText(tr(appShowingName.toLocal8Bit())); - bodyAppName->setText(tr("kylin music")); - bodyAppName->setStyleSheet("font-size:18px;"); -+ FILE *pp = NULL; -+ char *line = NULL; -+ char *q = NULL; -+ size_t len = 0; -+ ssize_t read; -+ -+ pp = popen("rpm -qa kylin-music", "r"); -+ if(pp) { while((read = getline(&line, &len, pp)) != -1){ -+ q = strrchr(line, '\n'); -+ *q = '\0'; -+ QString content = line; -+ QStringList list = content.split("-"); -+ if (list.size() >= 3) -+ appVersion = list.at(2); -+ } -+ } -+ if(line){ -+ free(line); -+ line = NULL; -+ } -+ pclose(pp); -+ - QLabel* bodyAppVersion = new QLabel(); - bodyAppVersion->setFixedHeight(24); - bodyAppVersion->setText(tr("Version: ") + appVersion); -diff --git a/translations/kylin-music_zh_CN.ts b/translations/kylin-music_zh_CN.ts -index e45eb8f..8e8a3c0 100644 ---- a/translations/kylin-music_zh_CN.ts -+++ b/translations/kylin-music_zh_CN.ts -@@ -121,40 +121,40 @@ - 播放/暂停 - - -- -+ - Kylin music - 麒麟音乐 - - -- -+ - maximize - 最大化 - - -- -+ - reduction - 还原 - - -- -+ - rename - 重命名 - - -- -+ - Delete the playlist - 删除歌单 - - -- -- -- -- -+ -+ -+ -+ - play - 播放 - - -- -+ - The following piece - 下一首 - -@@ -163,69 +163,69 @@ - 添加到我喜欢 - - -- -+ - Remove from the song list - 从歌曲列表中删除 - - -- -+ - Add to playlist - 添加到歌单 - - -- -+ - Song information - 歌曲信息 - - -- -+ - pause - 暂停 - - -- -+ - The song name: - 歌曲名称: - - -- -+ - singer: - 歌曲歌手: - - -- -+ - album: - 歌曲专辑: - - -- -+ - The file type: - 文件类型: - - -- -+ - The file size: - 文件大小: - - -- -+ - File length: - 文件时长: - - -- -+ - File location: - 文件位置: - - -- -- -+ -+ - 警告 - - - -- -- -+ -+ - 暂无法打开文件，请检查路径和文件名称 - - -@@ -234,7 +234,7 @@ - 麒麟音乐 - - -- -+ - volume - 音量调节 - -@@ -263,52 +263,52 @@ - 默认歌单无法重命名！ - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - A total of - 共 - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - The first - 首 - -@@ -341,49 +341,49 @@ - 文件位置 - - -- -- -- -+ -+ -+ - 00:00 - 00:00 - - -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ - A list of circulation - 列表循环 - - -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ - Random broadcast - 随机播放 - - -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ - Order of play - 顺序播放 - - -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ - Single cycle - 单曲循环 - -@@ -796,8 +796,8 @@ - 麒麟音乐 - - -- -- -+ -+ - Service & Support: - 服务与支持： - -@@ -821,7 +821,7 @@ - 深色主题 - - -- -+ - Version: - 版本号： - -@@ -830,8 +830,8 @@ - 开发者：support@kylinos.cn - - -- -- -+ -+ - kylin music - 麒麟音乐 - -@@ -844,23 +844,23 @@ - 麒麟音乐 - - -- -- -+ -+ - 列表循环 - - - -- -+ - 随机播放 - - - -- -+ - 顺序播放 - - - -- -+ - 单曲循环 - - --- -2.33.0 - diff --git a/fix_title_bar_issue.patch b/fix_title_bar_issue.patch deleted file mode 100644 index 711ca29..0000000 --- a/fix_title_bar_issue.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Naur kylin-music-1.0.44/mainwid.cpp kylin-music-1.0.44~/mainwid.cpp ---- kylin-music-1.0.44/mainwid.cpp 2021-01-29 14:38:53.000000000 +0800 -+++ kylin-music-1.0.44~/mainwid.cpp 2021-09-08 15:37:33.642743012 +0800 -@@ -44,6 +44,11 @@ - } - initStyle();//初始化样式 - -+ //hide title bar -+ Qt::WindowFlags flags = this->windowFlags(); -+ flags |= Qt::FramelessWindowHint; -+ this->setWindowFlags(Qt::FramelessWindowHint | Qt::Widget); -+ - qDebug()<<"--------------------程序初始化完成--------------------"; - } - -diff -Naur kylin-music-1.0.44/miniwidget.cpp kylin-music-1.0.44~/miniwidget.cpp ---- kylin-music-1.0.44/miniwidget.cpp 2021-01-29 14:38:53.000000000 +0800 -+++ kylin-music-1.0.44~/miniwidget.cpp 2021-09-08 15:36:58.098540593 +0800 -@@ -45,6 +45,11 @@ - initMyApp(); // liucong add 20201222 - - initAction(); -+ -+ //hide title bar -+ Qt::WindowFlags flags = this->windowFlags(); -+ flags |= Qt::FramelessWindowHint; -+ this->setWindowFlags(Qt::FramelessWindowHint | Qt::Widget); - } - - void miniWidget::initAction() diff --git a/kylin-music-1.0.44.tar.gz b/kylin-music-1.0.44.tar.gz deleted file mode 100644 index 2d963ec..0000000 Binary files a/kylin-music-1.0.44.tar.gz and /dev/null differ diff --git a/kylin-music-1.1.2.tar.gz b/kylin-music-1.1.2.tar.gz new file mode 100644 index 0000000..70f6a9d Binary files /dev/null and b/kylin-music-1.1.2.tar.gz differ diff --git a/kylin-music.spec b/kylin-music.spec index 0935422..c0e390c 100644 --- a/kylin-music.spec +++ b/kylin-music.spec @@ -1,42 +1,31 @@ %define debug_package %{nil} Name: kylin-music -Version: 1.0.44 -Release: 4 +Version: 1.1.2 +Release: 3 Summary: kylin-music -License: GPL-3.0 License +License: GPL-3.0-or-later and MIT URL: https://github.com/UbuntuKylin/kylin-music Source0: %{name}-%{version}.tar.gz -Source1: kylin-music_zh_CN.qm +Source1: libsimple.so - -patch0: 0001-modify-kylin-music-complier-error.patch -patch1: 0001_fix_chinese_translation_issue.patch -patch2: fix_title_bar_issue.patch -patch3: 0002-modify-version-is-error.patch +patch0: 0001-fix-compile-error-of-kylin-music.patch BuildRequires: qt5-qtbase-devel +BuildRequires: qtchooser BuildRequires: qt5-qtscript-devel BuildRequires: qt5-qttools-devel BuildRequires: qt5-linguist -BuildRequires: qt5-qtbase-private-devel -BuildRequires: qt5-qtx11extras-devel -BuildRequires: zlib-devel -BuildRequires: libX11-devel -BuildRequires: libcrystalhd-devel -BuildRequires: qt5-qtsvg-devel -BuildRequires: libXext-devel -BuildRequires: taglib-devel BuildRequires: qt5-qtmultimedia-devel -BuildRequires: gstreamer1-devel -BuildRequires: gstreamer1-plugins-bad-free-devel -BuildRequires: gstreamer1-plugins-good +BuildRequires: taglib-devel BuildRequires: gsettings-qt-devel +BuildRequires: qt5-qtx11extras-devel BuildRequires: kf5-kwindowsystem-devel +BuildRequires: ffmpeg-devel +BuildRequires: ukui-interface libpeony3 libpeony-dev +BuildRequires: mpv-libs-devel +BuildRequires: sqlite-devel libXtst-devel -Requires: gstreamer1 -Requires: gstreamer1-plugins-bad-free -Requires: gstreamer1-plugins-good %description kylin-music @@ -45,15 +34,10 @@ kylin-music %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build export PATH=%{_qt5_bindir}:$PATH -sed -i 's|/usr/lib/libtag.so|/usr/lib64/libtag.so|g' kylin-music.pro -sed -i 's|/usr/lib/libtag_c.so|/usr/lib64/libtag_c.so|g' kylin-music.pro mkdir qmake-build pushd qmake-build @@ -67,23 +51,40 @@ pushd qmake-build %{make_install} INSTALL_ROOT=%{buildroot} popd -mkdir -p %{buildroot}/usr/share/kylin-music/data/ +mkdir -p %{buildroot}/usr/share/kylin-user-guide/data/guide +mkdir -p %{buildroot}/usr/lib64 -cp -r %{_builddir}/%{name}-%{version}/data/kylin-music %{buildroot}/usr/share/kylin-music/data -cp -r %{_builddir}/%{name}-%{version}/translations/* %{buildroot}/usr/share/kylin-music -cp -r %{SOURCE1} %{buildroot}/usr/share/kylin-music +cp -r %{_builddir}/%{name}-%{version}/data/kylin-music %{buildroot}/usr/share/kylin-user-guide/data/guide/ +cp -r %{SOURCE1} %{buildroot}/usr/lib64 %files %doc debian/changelog %license debian/copyright %{_bindir}/kylin-music +%{_libdir}/* %{_datadir}/applications/kylin-music.desktop -%{_datadir}/glib-2.0/schemas/org.kylin-music-data.gschema.xml +%{_datadir}/glib-2.0/schemas/*.xml %{_datadir}/pixmaps/kylin-music.png %{_datadir}/kylin-music/ +%{_datadir}/kylin-user-guide/data/guide/* %changelog -* Thu Apr 7 2021 pei-jiankang - 1.0.44-4 +* Thu Jun 16 2022 peijiankang - 1.1.2-3 +- remove kylin-music_zh_CN.qm + +* Tue Jun 14 2022 peijiankang - 1.1.2-2 +- add libsimple.so + +* Tue Jun 14 2022 peijiankang - 1.1.2-1 +- update version to 1.1.2 + +* Tue Jun 7 2022 peijiankang - 1.0.44-6 +- add kylin-user-guide file + +* Wed May 18 2022 tanyulong - 1.0.44-5 +- Improve the project according to the requirements of compliance improvement + +* Thu Apr 7 2022 peijiankang - 1.0.44-4 - modify version is error * Wed Sep 08 2021 douyan - 1.0.44-3 diff --git a/kylin-music.yaml b/kylin-music.yaml new file mode 100644 index 0000000..dd347bb --- /dev/null +++ b/kylin-music.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: UbuntuKylin/kylin-music +tag_prefix: "^v" +separator: "." diff --git a/kylin-music_zh_CN.qm b/kylin-music_zh_CN.qm deleted file mode 100644 index 16e1d89..0000000 Binary files a/kylin-music_zh_CN.qm and /dev/null differ diff --git a/libsimple.so b/libsimple.so new file mode 100644 index 0000000..e32dd7f Binary files /dev/null and b/libsimple.so differ