packages/ukui-media
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update version to 3.1.0

Browse Source
This commit is contained in:
peijiankang 2022-12-01 14:47:06 +08:00
parent 4e142aaf55
commit c696aff97b
6 changed files with 120 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
0001-fix-compile-error-of-ukui-media.patch Normal file
View File

@ -0,0 +1,85 @@
From 06aec2beb9230a5650fa6b0924b15ee074398748 Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Thu, 1 Dec 2022 14:04:34 +0800
Subject: [PATCH] fix compile error of ukui-media
---
audio/translate_generation.sh | 2 +-
ukui-media.pro | 12 ++++++++++
.../ukui-volume-control-applet-qt.pro | 22 ++++++++++++++-----
3 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/audio/translate_generation.sh b/audio/translate_generation.sh
index 72f748b..6ab2acc 100755
--- a/audio/translate_generation.sh
+++ b/audio/translate_generation.sh
@@ -10,6 +10,6 @@ do
if [ "$version" == "fedora" ] || [ "$version" == "opensuse-leap" ] || [ "$version" == "opensuse-tumbleweed" ];then
lrelease-qt5 "${ts}"
else
- lrelease "${ts}"
+ lrelease-qt5 "${ts}"
fi
done
diff --git a/ukui-media.pro b/ukui-media.pro
index 7bc990b..b345aae 100644
--- a/ukui-media.pro
+++ b/ukui-media.pro
@@ -7,4 +7,16 @@ SUBDIRS = \
ukui-volume-control-applet-qt \
ukui-media-control-led
+desktop.files = data/ukui-volume-control-applet.desktop
+desktop.path = /etc/xdg/autostart
+xml.files = data/org.ukui.media.sound.gschema.xml
+xml.path = /usr/share/glib-2.0/schemas
+
+scripts.files = scripts/detection_output_mode.sh
+scripts.path = /usr/share/ukui-media/scripts
+
+service.files = data/ukui-media-control-mute-led.service
+service.path = /lib/systemd/system
+
+INSTALLS += desktop xml scripts service
diff --git a/ukui-volume-control-applet-qt/ukui-volume-control-applet-qt.pro b/ukui-volume-control-applet-qt/ukui-volume-control-applet-qt.pro
index a2af743..0834ce5 100644
--- a/ukui-volume-control-applet-qt/ukui-volume-control-applet-qt.pro
+++ b/ukui-volume-control-applet-qt/ukui-volume-control-applet-qt.pro
@@ -83,16 +83,28 @@ TRANSLATIONS += \
translations/tr.ts \
translations/bo.ts
-system("lrelease translations/*.ts")
+system("lrelease-qt5 translations/*.ts")
qm_file.files = translations/*.qm
-qm_file.path = $${PREFIX}/translations/
+qm_file.path = /usr/share/ukui-media/translations/
-data_files.files = data/*
-data_files.path = $${PREFIX}/
+data_files.files = data/img data/qss
+data_files.path = /usr/share/ukui-media/
+
+data_sounds.files = data/sounds/ukui-sound.xml data/sounds/*.ogg
+data_sounds.path = /usr/share/ukui-media/sounds
+
+data_theme.files = data/sounds/index.theme
+data_theme.path = /usr/share/sounds/ukui
+
+sounds.file = data/sounds/*.ogg
+sounds.path = /usr/share/sounds
+
+xml.files = data/org.ukui.audio.gschema.xml data/org.ukui.sound.gschema.xml data/org.ukui.media.sound.gschema.xml
+xml.path = /usr/share/glib-2.0/schemas
INSTALLS += \
- target qm_file data_files
+ target qm_file data_files data_sounds data_theme sounds xml
#DISTFILES += \
# xatom/xatom.pri
--
2.33.0

22
0001-modify-and-update-desktop-file.patch
View File

@ -1,22 +0,0 @@
From e0002619e33d00ba0da99951c567487588c9747b Mon Sep 17 00:00:00 2001
From: tanyulong2021 <tanyulong@kylinos.cn>
Date: Thu, 28 Jul 2022 16:32:37 +0800
Subject: [PATCH] modify and update desktop file
---
data/ukui-volume-control-applet.desktop.in | 2 ++
1 file changed, 2 insertions(+)
diff --git a/data/ukui-volume-control-applet.desktop.in b/data/ukui-volume-control-applet.desktop.in
index fe6398a..726b031 100644
--- a/data/ukui-volume-control-applet.desktop.in
+++ b/data/ukui-volume-control-applet.desktop.in
@@ -15,3 +15,5 @@ X-UKUI-Bugzilla-Component=ukui-volume-control
# See http://bugzilla.ukui.org/show_bug.cgi?id=568320
#X-UKUI-Autostart-Phase=Panel
X-UKUI-AutoRestart=true
+X-UKUI-AutoRestart-Phase=Application
+
--
2.33.0

24
0002-Add-compilation-dependencies-libpulse.patch
View File

@ -1,24 +0,0 @@
From 2602ceff126fc1e53321c2f061fa17354fdd2acc Mon Sep 17 00:00:00 2001
From: tanyulong2021 <tanyulong@kylinos.cn>
Date: Thu, 28 Jul 2022 17:42:08 +0800
Subject: [PATCH] Add compilation dependencies
---
debian/control | 1 +
1 file changed, 1 insertion(+)
diff --git a/debian/control b/debian/control
index 1748ae2..c888064 100644
--- a/debian/control
+++ b/debian/control
@@ -21,6 +21,7 @@ Build-Depends: debhelper-compat (= 13),
qtmultimedia5-dev,
qttools5-dev-tools,
libkf5windowsystem-dev,
+ libpulse-dev,
Standards-Version: 4.5.0
Rules-Requires-Root: no
Homepage: http://www.ukui.org/
--
2.33.0

BIN
ukui-media-3.0.2.tar.gz
View File

Binary file not shown.

BIN
ukui-media-3.1.0.tar.gz Normal file
View File

Binary file not shown.

89
ukui-media.spec
View File

@ -1,41 +1,40 @@
Name: ukui-media
Version: 3.0.2
Release: 18
Summary: UKUI media utilities
License: GPL-2.0-or-later and GPL-3.0-or-later and BSD-3-Clause
URL: http://www.ukui.org
Source0: %{name}-%{version}.tar.gz
Autoreq : yes
Name: ukui-media
Version: 3.1.0
Release: 1
Summary: UKUI media utilities
License: GPL-2.0-or-later and GPL-3.0-or-later and BSD-3-Clause
URL: http://www.ukui.org
Source0: %{name}-%{version}.tar.gz
Patch01: 0001-fix-compile-error-of-ukui-media.patch
Autoreq: yes
BuildRequires: intltool
BuildRequires: qt5-qtbase-devel
BuildRequires: libcanberra-devel
BuildRequires: gsettings-qt-devel
BuildRequires: glib2-devel
BuildRequires: gsettings-qt-devel
BuildRequires: glib2-devel
BuildRequires: gtk3-devel
BuildRequires: mate-desktop-devel >= 1.18
BuildRequires: libmatemixer-devel >= 1.18
BuildRequires: libxml2-devel
BuildRequires: mate-common >= 1.18
BuildRequires: qt5-qtsvg-devel
BuildRequires: libqtxdg-devel
BuildRequires: qt5-qtmultimedia-devel
BuildRequires: qt5-qtmultimedia
BuildRequires: kf5-kwindowsystem-devel
BuildRequires: ukui-interface
BuildRequires: qt5-qttools-devel
BuildRequires: alsa-lib-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: dconf-devel
BuildRequires: libcanberra-devel
BuildRequires: libukcc-devel
BuildRequires: qt5-qtx11extras-devel
Requires: mate-desktop-libs >= 1.18
Requires: ukui-media-common = %{version}
Requires: ukui-control-center
Requires: glib2
Recommends: alsa-utils sound-theme-freedesktop
patch0: 0001-modify-and-update-desktop-file.patch
patch1: 0002-Add-compilation-dependencies-libpulse.patch
%description
A simple and lightweight screensaver written by Qt5.
The screensaver supports biometric auhentication which is
@ -52,40 +51,21 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch01 -p1
%build
./autogen.sh --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib64
make
cd %{_builddir}/%{name}-%{version}/ukui-volume-control-applet-qt
mkdir build && cd build
mkdir build && pushd build
qmake-qt5 ..
make -j32
make -j4
popd
%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
pushd build
make INSTALL_ROOT=$RPM_BUILD_ROOT install
popd
cp -r %{_builddir}/%{name}-%{version}/ukui-volume-control-applet-qt/build/ukui-volume-control-applet-qt %{buildroot}/usr/bin/
mkdir -p %{buildroot}/usr/share/ukui-media/translations
cp -r %{_builddir}/%{name}-%{version}/ukui-volume-control-applet-qt/translations/*.qm %{buildroot}/usr/share/ukui-media/translations/
mkdir -p %{buildroot}/usr/share/ukui-media/img
cp -r %{_builddir}/%{name}-%{version}/ukui-volume-control-applet-qt/data/img/* %{buildroot}/usr/share/ukui-media/img/
mkdir -p %{buildroot}/usr/share/ukui-media/qss
cp -r %{_builddir}/%{name}-%{version}/ukui-volume-control-applet-qt/data/qss/* %{buildroot}/usr/share/ukui-media/qss/
cp -r %{_builddir}/%{name}-%{version}/ukui-volume-control-applet-qt/data/sounds/*.ogg %{buildroot}/usr/share/sounds
##cp -r %{_builddir}/%{name}-%{version}/ukui-volume-control-applet-qt/data/sounds/ukui-new-sound.xml %{buildroot}/usr/share/ukui-media/sounds
mkdir -p %{buildroot}/usr/share/ukui-media/scripts
cp -r %{_builddir}/%{name}-%{version}/scripts/detection_output_mode.sh %{buildroot}/usr/share/ukui-media/scripts
cp -r %{_builddir}/%{name}-%{version}/data/org.ukui.media.sound.gschema.xml %{buildroot}/usr/share/glib-2.0/schemas
%clean
rm -rf $RPM_BUILD_ROOT
@ -95,26 +75,27 @@ glib-compile-schemas /usr/share/glib-2.0/schemas/ &> /dev/null ||:
%files
%doc debian/changelog debian/copyright
%{_bindir}/ukui-volume-control
%{_bindir}/ukui-volume-control-applet
%{_bindir}/ukui-volume-control-applet-qt
%{_datadir}/applications/
%{_bindir}/ukui-media-control-led
%{_datadir}/ukui-media/translations/
%{_datadir}/ukui-media/img/
%{_datadir}/ukui-media/qss/
%{_datadir}/ukui-media/scripts/
%{_datadir}/glib-2.0/schemas/org.ukui.audio.gschema.xml
%{_datadir}/glib-2.0/schemas/org.ukui.media.sound.gschema.xml
%{_datadir}/glib-2.0/schemas/org.ukui.sound.gschema.xml
%{_datadir}/sounds/*
%{_datadir}/ukui-media/sounds/*
/lib/systemd/system/ukui-media-control-mute-led.service
%{_libdir}/ukui-control-center/libaudio.so
%files common
%{_sysconfdir}/xdg/autostart/
%{_datadir}/locale/
%{_datadir}/man/*
%{_datadir}/ukui-media/icons
%{_datadir}/ukui-media/sounds/
%{_datadir}/sounds/*
%{_datadir}/glib-2.0/
%changelog
* Mon Dec 5 2022 peijiankang <peijiankang@kylinos.cn> - 3.1.0-1
- update version to 3.1.0
* Thu Jul 28 2022 tanyulong <tanyulong@kylinos.cn> - 3.0.2-18
- Add compilation dependencies: libpulse