diff --git a/0001-Incorrect-display-in-the-upper-left-corner-of-the-wi.patch b/0001-Incorrect-display-in-the-upper-left-corner-of-the-wi.patch deleted file mode 100644 index c3557eea8be452df383778a0bce300e93089d818..0000000000000000000000000000000000000000 --- a/0001-Incorrect-display-in-the-upper-left-corner-of-the-wi.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 875d98feae2af4670f8dc9f59cff917c5067e5c2 Mon Sep 17 00:00:00 2001 -From: huayadong -Date: Wed, 20 Nov 2024 07:25:34 +0800 -Subject: [PATCH] Incorrect display in the upper left corner of the window - ---- - src/mainwindow.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp -index e4b6728..099b30c 100755 ---- a/src/mainwindow.cpp -+++ b/src/mainwindow.cpp -@@ -444,6 +444,7 @@ void MainWindow::setTwoPageWindow() - m_continueButton->setFixedSize(56, 56); - m_continueButton->setButtonType(kdk::KPushButton::CircleType); - m_continueButton->setIconSize(QSize(23, 23)); -+ m_continueButton->setVisible(false); - m_continueButton->setTranslucent(true); - - --- -2.46.0 - diff --git a/0001-kylin-recorder-fix-build-error.patch b/kylin-recorder-1.3.0.2.0k3.3-kylin-fix-ffmpeg-build-error.patch similarity index 61% rename from 0001-kylin-recorder-fix-build-error.patch rename to kylin-recorder-1.3.0.2.0k3.3-kylin-fix-ffmpeg-build-error.patch index 6c94617049126857fba0e71fd347fabc9df847ff..9a3dd5c8ff123f98a02a91125095374a1fb23601 100644 --- a/0001-kylin-recorder-fix-build-error.patch +++ b/kylin-recorder-1.3.0.2.0k3.3-kylin-fix-ffmpeg-build-error.patch @@ -1,18 +1,14 @@ -From fe0c21e9287cd8a478bf143f218e37ac37a85207 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=E4=BE=AF=E7=BA=A2=E5=8B=8B?= -Date: Wed, 10 Apr 2024 09:26:33 +0800 -Subject: [PATCH] kylin-recorder: fix build error -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit +From 5d653ab53fafe882705d7e3f66f60e156a1373ce Mon Sep 17 00:00:00 2001 +From: Super User +Date: Fri, 15 Nov 2024 15:08:02 +0800 +Subject: [PATCH] kylin-recorder-1.3.0.2.0k3.3 -Signed-off-by: 侯红勋 --- - kylin-recorder.pro | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) + kylin-recorder.pro | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/kylin-recorder.pro b/kylin-recorder.pro -index bba5f3f..e6cf53a 100755 +index d32ec17..762fddd 100755 --- a/kylin-recorder.pro +++ b/kylin-recorder.pro @@ -15,7 +15,7 @@ QT += multimedia multimediawidgets @@ -24,18 +20,20 @@ index bba5f3f..e6cf53a 100755 LIBS += -lmpv PKGCONFIG += kysdk-kabase -@@ -57,7 +57,10 @@ schemes.files += \ +@@ -57,7 +57,12 @@ schemes.files += \ schemes.path = /usr/share/glib-2.0/schemas/ LIBS += -L/usr/lib/libukui-log4qt.so.1.0.0 -lukui-log4qt -INSTALLS += target desktop appdesktop icons schemes qm_files ++ +guide.files += $$PWD/data/kylin-recorder +guide.path = /usr/share/kylin-user-guide/data/guide/ + +INSTALLS += target desktop appdesktop icons schemes qm_files guide ++ # The following define makes your compiler emit warnings if you use # any feature of Qt which as been marked as deprecated (the exact warnings -- -2.33.0 +2.43.0 diff --git a/kylin-recorder-1.3.0.2.tar.gz b/kylin-recorder-1.3.0.2.tar.gz index e17caa403f3681ab1938371ac52e2f8d8ec70c9e..2e7e54aac009b099384a6865cfd435dde9be4f47 100644 Binary files a/kylin-recorder-1.3.0.2.tar.gz and b/kylin-recorder-1.3.0.2.tar.gz differ diff --git a/kylin-recorder.spec b/kylin-recorder.spec index 0316f132a1e74b61168a3a1466921bde61cb6496..5a3fa5d9b698009382ac17910b930533ea712552 100644 --- a/kylin-recorder.spec +++ b/kylin-recorder.spec @@ -1,78 +1,67 @@ -Name: kylin-recorder -Version: 1.3.0.2 -Release: 2 -Summary: kylin-recorder -License: GPL-3.0-or-later -URL: https://github.com/UbuntuKylin/kylin-recorder -Source0: %{name}-%{version}.tar.gz -Patch01: 0001-kylin-recorder-fix-build-error.patch -Patch02: 0001-Incorrect-display-in-the-upper-left-corner-of-the-wi.patch - -BuildRequires: qt5-qtbase-devel -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: lame-devel -BuildRequires: gsettings-qt-devel -BuildRequires: qt5-qtmultimedia-devel -BuildRequires: ffmpeg-devel -BuildRequires: mpv-libs-devel -BuildRequires: gstreamer1-devel -BuildRequires: gstreamer1-plugins-bad-free-devel -BuildRequires: gstreamer1-plugins-good -BuildRequires: kf5-kwindowsystem-devel -BuildRequires: opencv -BuildRequires: libkysdk-kabase-devel -BuildRequires: libkysdk-qtwidgets-devel -BuildRequires: libkysdk-waylandhelper-devel -BuildRequires: ukui-interface - +Summary: Recorder tool for UKUI +Name: kylin-recorder +Version: 1.3.0.2 +Release: 3 +License: GPL-3.0+ +URL: https://www.github.com/ukui/kylin-recorder +Source0: %{name}-%{version}.tar.gz -Requires: ffmpeg -Requires: gstreamer1 -Requires: gstreamer1-plugins-bad-free -Requires: gstreamer1-plugins-good +Patch1: kylin-recorder-1.3.0.2.0k3.3-kylin-fix-ffmpeg-build-error.patch +BuildRequires: ffmpeg +BuildRequires: ffmpeg-devel +BuildRequires: gsettings-qt-devel +BuildRequires: kf5-kwindowsystem-devel +BuildRequires: libkysdk-applications-devel +BuildRequires: libkysdk-base-devel +BuildRequires: libkysdk-kabase-devel +BuildRequires: lame-devel +BuildRequires: mpv-libs-devel +BuildRequires: qt5-qtx11extras-devel +BuildRequires: libukui-log4qt-devel +BuildRequires: pkgconf +BuildRequires: qt5-qtbase-devel +BuildRequires: qtchooser +BuildRequires: qt5-qtmultimedia-devel +BuildRequires: qt5-qttools-devel +BuildRequires: libpeony3 +BuildRequires: libpeony-devel +BuildRequires: libkysdk-systime-devel +BuildRequires: libkysdk-datacollect-devel + + +Requires: ffmpeg %description -kylin-recording + A user-friendly and easy to operate recording tool, supporting multi audio format recording, such as MP3, WAV, etc., supporting playback, clipping and other functions, to meet your recording needs in various aspects. %prep -%setup -q -%patch01 -p1 -%patch02 -p1 +%autosetup -n %{name}-%{version} -p1 -%build -export PATH=%{_qt5_bindir}:$PATH -mkdir qmake-build -pushd qmake-build -%{qmake_qt5} .. +%build +%{qmake_qt5} %{make_build} -popd %install -pushd qmake-build -%{make_install} INSTALL_ROOT=%{buildroot} -popd +make INSTALL_ROOT=%{buildroot} install %files +%license debian/copyright %doc debian/changelog -%license debian/copyright %{_bindir}/kylin-recorder %{_datadir}/applications/kylin-recorder.desktop -%{_datadir}/pixmaps/recording_128.svg -%{_datadir}/glib-2.0/schemas/* -%{_datadir}/kylin-recorder/translations/* -%{_datadir}/kylin-user-guide/data/guide/kylin-recorder +%{_datadir}/glib-2.0/schemas/org.kylin-recorder-data.gschema.xml +%{_datadir}/glib-2.0/schemas/org.ukui.log4qt.kylin-recorder.gschema.xml +%{_datadir}/kylin-recorder/* +%{_datadir}/kylin-user-guide/* +%{_datadir}/pixmaps/recording_128.svg + + %changelog +* Thu Aug 14 2025 douyan - 1.3.0.2-3 +- update to upstream version 1.3.0.2.0k3.3-ok5.14 + * Fri Nov 22 2024 huayadong - 1.3.0.2-2 - Type:bugfix - CVE: