0001-fix-compile-error-of-kylin-photo-viewer.patch

@@ -1,61 +0,0 @@
-From f91d8c6daf58bd43e7e9619ca4536f3b1e970264 Mon Sep 17 00:00:00 2001
-From: peijiankang <peijiankang@kylinos.cn>
-Date: Tue, 7 Feb 2023 14:19:25 +0800
-Subject: [PATCH] fix compile error of kylin-photo-viewer
-
----
- codec/kylinimagecodec/image_load/image_load.cpp | 1 +
- codec/kylinimagecodec/image_save/image_save.cpp | 1 +
- codec/kylinimagecodec/kylinimagecodec.cpp       | 4 ++--
- codec/kylinimagecodec/kylinimagecodec.pro       | 2 +-
- 4 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/codec/kylinimagecodec/image_load/image_load.cpp b/codec/kylinimagecodec/image_load/image_load.cpp
-index ae4c559..4d6c182 100644
---- a/codec/kylinimagecodec/image_load/image_load.cpp
-+++ b/codec/kylinimagecodec/image_load/image_load.cpp
-@@ -1,3 +1,4 @@
-+#define STB_IMAGE_IMPLEMENTATION
- #include "kylinimagecodec.h"
- 
- MatResult KylinImageCodec::loadImageToMat(QString path)
-diff --git a/codec/kylinimagecodec/image_save/image_save.cpp b/codec/kylinimagecodec/image_save/image_save.cpp
-index 62ebd95..2d57ce7 100644
---- a/codec/kylinimagecodec/image_save/image_save.cpp
-+++ b/codec/kylinimagecodec/image_save/image_save.cpp
-@@ -1,3 +1,4 @@
-+#define STB_IMAGE_WRITE_IMPLEMENTATION
- #include "kylinimagecodec.h"
- 
- QStringList* KylinImageCodec::m_list = new QStringList;
-diff --git a/codec/kylinimagecodec/kylinimagecodec.cpp b/codec/kylinimagecodec/kylinimagecodec.cpp
-index 24a429b..09b9962 100644
---- a/codec/kylinimagecodec/kylinimagecodec.cpp
-+++ b/codec/kylinimagecodec/kylinimagecodec.cpp
-@@ -71,8 +71,8 @@ QHash<QString, int> KylinImageCodec::creatFormats()
-     tmpFormats.insert("DDS",FIF_DDS);
-     tmpFormats.insert("GIF",FIF_GIF);
-     tmpFormats.insert("HDR",FIF_HDR);
--    tmpFormats.insert("FAX",FIF_FAXG3);
--    tmpFormats.insert("G3",FIF_FAXG3);
-+//    tmpFormats.insert("FAX",FIF_FAXG3);
-+//    tmpFormats.insert("G3",FIF_FAXG3);
-     tmpFormats.insert("SGI",FIF_SGI);
-     tmpFormats.insert("CUT",FIF_CUT);
-     tmpFormats.insert("JNG",FIF_JNG);
-diff --git a/codec/kylinimagecodec/kylinimagecodec.pro b/codec/kylinimagecodec/kylinimagecodec.pro
-index 49413d6..1db55c5 100644
---- a/codec/kylinimagecodec/kylinimagecodec.pro
-+++ b/codec/kylinimagecodec/kylinimagecodec.pro
-@@ -24,7 +24,7 @@ LIBS += -lopencv_core \
-         -lopencv_imgproc \
- 
- #stb
--LIBS += -lstb \
-+#LIBS += -lstb \
- 
- #gif
- LIBS += -lgif \
--- 
-2.33.0
-

0001-kylin-photo-view-optimize-prompt.patch

@@ -1,78 +0,0 @@
-From 33ce1bd8026bad18a0a4022793ada89d605eea43 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=E4=BE=AF=E7=BA=A2=E5=8B=8B?= <houhongxun@kylinos.cn>
-Date: Tue, 16 Apr 2024 09:35:04 +0800
-Subject: [PATCH] kylin-photo-view: optimize prompt
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: 侯红勋 <houhongxun@kylinos.cn>
----
- src/view/openimage.cpp                   | 8 ++++----
- src/view/sizedate.h                      | 4 ++--
- translations/kylin-photo-viewer_zh_CN.ts | 4 ++--
- 3 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/src/view/openimage.cpp b/src/view/openimage.cpp
-index 828bf95..54d227a 100644
---- a/src/view/openimage.cpp
-+++ b/src/view/openimage.cpp
-@@ -8,19 +8,19 @@ OpenImage::OpenImage(QWidget *parent) : QWidget(parent)
-     m_openInCenter = new QPushButton(this);
-     m_openInCenter->setFocusPolicy(Qt::NoFocus);
-     m_openInCenter->setFixedSize(OPENINCENTER_SIZE);
--    m_openInCenter->move(0,0);
-+    m_openInCenter->move(110,110);
-     m_ft.setPixelSize(14);
-     //中间“+”号按钮
-     m_addFile = new QPushButton(m_openInCenter);
-     m_addFile->setFocusPolicy(Qt::NoFocus);
-     m_addFile->setFixedSize(ADD_FILESIZE);
--    m_addFile->move(m_openInCenter->geometry().center()-m_addFile->rect().center());
-+    m_addFile->move(44, 44);
-     //按钮下的“打开图片”文字
-     m_openText = new QLabel(this);   
--    m_openText->setText(tr("Load picture"));
-+    m_openText->setText(tr("Click or drag to load picture"));
-     m_openText->setFixedWidth(OPEN_IMAGEFIX);
-     m_openText->setAlignment(Qt::AlignCenter);
--    m_openText->move(0,OPEN_IMAGEFIX+25);
-+    m_openText->move(0,OPEN_IMAGEFIX - 80);
- //    m_openText->setFont(m_ft);
- 
-     this->setFixedSize(OPEN_IMAGESIZE);
-diff --git a/src/view/sizedate.h b/src/view/sizedate.h
-index 164bd50..4a3ed1f 100644
---- a/src/view/sizedate.h
-+++ b/src/view/sizedate.h
-@@ -10,10 +10,10 @@ static const QSize LOGO_BTN = QSize(24,24);//标题栏logo按钮尺寸
- static const QSize TITLE_BTN = QSize(30,30);//标题栏按钮尺寸
- static const int BAR_HEIGHT = 40;//标题栏和工具栏的高度
- static const QSize ICON_SIZE = QSize(30,30);//图标大小
--static const QSize OPEN_IMAGESIZE = QSize(128, 128 + 50 + 10);//打开图片界面尺寸
-+static const QSize OPEN_IMAGESIZE = QSize(350, 350 + 50 + 10);//打开图片界面尺寸
- static const QSize OPENINCENTER_SIZE = QSize(128, 128);//打开图片界面--中间打开圆形图标按钮尺寸
- static const QSize ADD_FILESIZE = QSize(40, 40);//打开图片界面--中间打开加号图标按钮尺寸
--static const int OPEN_IMAGEFIX = 128;//打开图片界面的固定值
-+static const int OPEN_IMAGEFIX = 350;//打开图片界面的固定值
- static const QSize NAVI_SIZE = QSize(200, 40);//导航栏尺寸
- static const QSize INFOR_SIZE = QSize(207 + 6,197 + 18 +20 + 8);//信息栏尺寸
- static const QSize TOOLBAR_SIZE = QSize(479 +4 + 40 ,40 + 4);//工具栏尺寸
-diff --git a/translations/kylin-photo-viewer_zh_CN.ts b/translations/kylin-photo-viewer_zh_CN.ts
-index 125e3ed..15dfadb 100644
---- a/translations/kylin-photo-viewer_zh_CN.ts
-+++ b/translations/kylin-photo-viewer_zh_CN.ts
-@@ -111,8 +111,8 @@
-     <name>OpenImage</name>
-     <message>
-         <location filename="../src/view/openimage.cpp" line="20"/>
--        <source>Load picture</source>
--        <translation>载入图片</translation>
-+        <source>Click or drag to load picture</source>
-+        <translation>点击或拖拽载入图片</translation>
-     </message>
-     <message>
-         <location filename="../src/view/openimage.cpp" line="93"/>
--- 
-2.43.0
-

kylin-photo-viewer.spec

@@ -1,20 +1,19 @@
+%define debug_package %{nil}
 Name:          kylin-photo-viewer
-Version:       1.2.0
+Version:       1.0.2
-Release:       3
+Release:       2
 Summary:       kylin-photo-viewer
 License:       BSL-1.0 and Libpng and zlib and GPL-2.0-or-later
 URL:           https://github.com/UbuntuKylin/kylin-photo-viewer
 Source0:       %{name}-%{version}.tar.gz
-Patch01:       0001-fix-compile-error-of-kylin-photo-viewer.patch
-Patch02:       0001-kylin-photo-view-optimize-prompt.patch
 
 BuildRequires: qt5-qtbase-devel
 BuildRequires: qtchooser
 BuildRequires: qt5-qtscript-devel
 BuildRequires: qt5-qttools-devel
+BuildRequires: qt5-linguist
 BuildRequires: opencv
 BuildRequires: qt5-qtsvg-devel
-BuildRequires: stb-devel
 BuildRequires: giflib-devel
 BuildRequires: libpng-devel
 BuildRequires: freeimage-devel
@@ -30,8 +29,6 @@ Photo viewer, support to view, zoom and rotate images of various formats
 
 %prep
 %setup -q
-%patch01 -p1
-%patch02 -p1
 
 %build
 export PATH=%{_qt5_bindir}:$PATH
@@ -46,19 +43,14 @@ pushd qmake-build
 %{make_install} INSTALL_ROOT=%{buildroot}
 popd 
 
-mkdir -p %{buildroot}/usr/share/kylin-user-guide/data/guide
-
-cp -r %{_builddir}/%{name}-%{version}/data/pictures %{buildroot}/usr/share/kylin-user-guide/data/guide/
-
-%post
-glib-compile-schemas /usr/share/glib-2.0/schemas &> /dev/null ||:
-
 %files
 %{_bindir}/kylin-photo-viewer
 %{_includedir}/kylin_image_codec/kylinimagecodec.h
 %{_includedir}/kylin_image_codec/kylinimagecodec_global.h
 %{_includedir}/kylin_image_codec/loadmovie.h
 %{_includedir}/kylin_image_codec/savemovie.h
+%{_includedir}/kylin_image_codec/stb_image.h
+%{_includedir}/kylin_image_codec/stb_image_write.h
 %{_prefix}/lib/libkylinimagecodec.so
 %{_prefix}/lib/libkylinimagecodec.so.1
 %{_prefix}/lib/libkylinimagecodec.so.1.0
@@ -69,26 +61,9 @@ glib-compile-schemas /usr/share/glib-2.0/schemas &> /dev/null ||:
 %{_datadir}/glib-2.0/schemas/org.kylin.photo.viewer.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.ukui.log4qt.kylin-photo-viewer.gschema.xml
 %{_datadir}/kylin-photo-viewer/translations/kylin-photo-viewer_zh_CN.qm
-%{_datadir}/kylin-photo-viewer/translations/kylin-photo-viewer_bo_CN.qm
 %{_datadir}/pixmaps/kyview_logo.png
-%{_datadir}/kylin-user-guide/data/guide/
 
 %changelog
-* Tue Apr 16 2024 houhongxun <houhongxun@kylinos.cn> - 1.2.0-3
-- prompt optimization
-
-* Wed Feb 1 2023 peijiankang <peijiankang@kylinos.cn> - 1.2.0-2
-- add build debuginfo and debugsource
-
-* Mon Oct 24 2022 tanyulong <tanyulong@kylinos.cn> - 1.2.0-1
-- update upstream version 1.2.0
-
-* Thu Jun 9 2022 peijiankang <peijiankang@kylinos.cn> - 1.0.2-4
-- add kylin-user-guide file
-
-* Thu Jun 9 2022 peijiankang <peijiankang@kylinos.cn> - 1.0.2-3
-- Fix the version of kylin-photo-viewer
-
 * Thu May 26 2022 peijiankang <peijiankang@kylinos.cn> - 1.0.2-2
 - remove {%if 0 and %endif}