!45 sync from openEuler-24.03-LTS
From: @peijiankang Reviewed-by: @hua_yadong Signed-off-by: @hua_yadong
This commit is contained in:
commit
3700558bc1
@ -1,7 +1,7 @@
|
|||||||
From f31aa728dc433f457267f45f58618db3c2b34604 Mon Sep 17 00:00:00 2001
|
From 223200225c3179362219fa579fd3f2ffadef2ca1 Mon Sep 17 00:00:00 2001
|
||||||
From: chenguanglee <lichenguang@kylinos.cn>
|
From: peijiankang <peijiankang@kylinos.cn>
|
||||||
Date: Thu, 21 Nov 2024 11:16:04 +0800
|
Date: Fri, 29 Mar 2024 17:38:30 +0800
|
||||||
Subject: [PATCH] fix missing LIBAVCODEC_VERSION_INT macro error
|
Subject: [PATCH] fix build error of kylin-screenshot
|
||||||
|
|
||||||
---
|
---
|
||||||
src/common/my_av.h | 2 +-
|
src/common/my_av.h | 2 +-
|
||||||
@ -21,5 +21,5 @@ index 0957f37..7f9f9b8 100644
|
|||||||
#include <libavutil/pixfmt.h>
|
#include <libavutil/pixfmt.h>
|
||||||
#include <libavutil/samplefmt.h>
|
#include <libavutil/samplefmt.h>
|
||||||
--
|
--
|
||||||
2.43.0
|
2.25.1
|
||||||
|
|
||||||
11
fix-kylin-screenshot-categories-error.patch
Normal file
11
fix-kylin-screenshot-categories-error.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
diff -Naur kylin-screenshot-1.0.5/docs/desktopEntry/package/kylin-screenshot.desktop kylin-screenshot-1.0.5~/docs/desktopEntry/package/kylin-screenshot.desktop
|
||||||
|
--- kylin-screenshot-1.0.5/docs/desktopEntry/package/kylin-screenshot.desktop 2022-03-03 15:43:55.000000000 +0800
|
||||||
|
+++ kylin-screenshot-1.0.5~/docs/desktopEntry/package/kylin-screenshot.desktop 2024-05-13 09:23:42.760372705 +0800
|
||||||
|
@@ -25,6 +25,6 @@
|
||||||
|
Icon=kylin-screenshot
|
||||||
|
Terminal=false
|
||||||
|
Type=Application
|
||||||
|
-Categories=Graphics;
|
||||||
|
+Categories=System;
|
||||||
|
StartupNotify=false
|
||||||
|
|
||||||
@ -1,13 +1,13 @@
|
|||||||
Name: kylin-screenshot
|
Name: kylin-screenshot
|
||||||
Version: 1.0.5
|
Version: 1.0.5
|
||||||
Release: 4
|
Release: 5
|
||||||
Summary: a powerful screenshot and screen recording tool
|
Summary: a powerful screenshot and screen recording tool
|
||||||
License: GPL-3+
|
License: GPL-3+
|
||||||
URL: https://github.com/ubuntukylin
|
URL: https://github.com/ubuntukylin
|
||||||
Source0: %{name}-%{version}.tar.gz
|
Source0: %{name}-%{version}.tar.gz
|
||||||
Patch01: 0001-fix-kylin-screenshot-not-work.patch
|
Patch01: 0001-fix-kylin-screenshot-not-work.patch
|
||||||
Patch02: 0002-fix-missing-LIBAVCODEC_VERSION_INT-macro-error.patch
|
Patch02: 0002-fix-build-error-of-kylin-screenshot.patch
|
||||||
|
Patch03: fix-kylin-screenshot-categories-error.patch
|
||||||
|
|
||||||
BuildRequires: qt5-qtx11extras-devel
|
BuildRequires: qt5-qtx11extras-devel
|
||||||
BuildRequires: qt5-qtx11extras
|
BuildRequires: qt5-qtx11extras
|
||||||
@ -40,9 +40,7 @@ Suggests: ca-certificates, openssl
|
|||||||
making screen recording.
|
making screen recording.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%autosetup -n %{name}-%{version} -p1
|
||||||
%patch 1 -p1
|
|
||||||
%patch 2 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%{qmake_qt5} %{_qt5_qmake_flags} CONFIG+=enable-by-default kylin-screenshot.pro
|
%{qmake_qt5} %{_qt5_qmake_flags} CONFIG+=enable-by-default kylin-screenshot.pro
|
||||||
@ -93,8 +91,11 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_datadir}/metainfo/kylinscreenshot.appdata.xml
|
%{_datadir}/metainfo/kylinscreenshot.appdata.xml
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Nov 21 2024 lichenguang <lichenguang@kylinos.cn> - 1.0.5-4
|
* Mon May 13 2024 douyan <douyan@kylinos.cn> - 1.0.5-5
|
||||||
- fix missing LIBAVCODEC_VERSION_INT macro error
|
- fix spec patch error and add fix-kylin-screenshot-categories-error.patch
|
||||||
|
|
||||||
|
* Fri Mar 29 2024 peijiankang <peijiankang@kylinos.cn> - 1.0.5-4
|
||||||
|
- add 0002-fix-build-error-of-kylin-screenshot.patch
|
||||||
|
|
||||||
* Mon Feb 06 2023 peijiankang <peijiankang@kylinos.cn> - 1.0.5-3
|
* Mon Feb 06 2023 peijiankang <peijiankang@kylinos.cn> - 1.0.5-3
|
||||||
- add build debuginfo and debugsource
|
- add build debuginfo and debugsource
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user