Update package to version 23.08.4

This commit is contained in:
jxy_git 2024-01-11 13:34:41 +08:00
parent 8357321219
commit f2aa8d565d
5 changed files with 78 additions and 95 deletions

View File

@ -8,7 +8,7 @@
%endif
Name: kf5-%{framework}
Version: 23.04.3
Version: 23.08.4
Release: 1
Summary: The KPimTextEdit Library
@ -27,7 +27,7 @@ Source0: https://download.kde.org/%{stable}/release-service/%{version}/sr
# https://phabricator.kde.org/D17947
# Please DO NOT REMOVE OR COMMENT OUT THIS PATCH! Ask kkofler for help with
# rebasing if needed. The patch is usually trivial to rebase.
Patch100: kpimtextedit-21.12.1-install-and-export-for-blogilo.patch
Patch100: kpimtextedit-23.08.1-install-and-export-for-blogilo.patch
## upstream patches (21.12 branch):
@ -72,7 +72,7 @@ Conflicts: kde-l10n < 17.03
%package devel
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
Requires: cmake(KF5TextWidgets)
#Requires: kf5-ktextwidgets-devel
%description devel
@ -130,6 +130,9 @@ make test ARGS="--output-on-failure --timeout 30" -C %{_target_platform} ||:
%changelog
* Thu Jan 11 2024 jiangxinyu <jiangxinyu@kylinos.cn> - 23.08.4-1
- Update package to version 23.08.4
* Fri Aug 04 2023 lvgenggeng <lvgenggeng@uniontech.com> - 23.04.3-1
- bump to 23.04.3

View File

@ -1,92 +0,0 @@
diff -ur kpimtextedit-21.12.1/src/CMakeLists.txt kpimtextedit-21.12.1-install-and-export-for-blogilo/src/CMakeLists.txt
--- kpimtextedit-21.12.1/src/CMakeLists.txt 2021-12-10 07:04:52.000000000 +0100
+++ kpimtextedit-21.12.1-install-and-export-for-blogilo/src/CMakeLists.txt 2022-01-25 21:07:34.081052275 +0100
@@ -179,6 +179,9 @@
ecm_generate_headers(KPimTextEdit_CamelCase_HEADERS
HEADER_NAMES
EditorUtil
+ InsertHtmlDialog
+ InsertImageWidget
+ InsertTableWidget
SelectSpecialCharDialog
SlideContainer
TextEditorCompleter
@@ -190,6 +193,7 @@
ecm_generate_headers(KPimTextEdit_CamelCaseemoticon_HEADERS
HEADER_NAMES
+ EmoticonTextEditAction
EmoticonUnicodeTab
PREFIX KPIMTextEdit
REQUIRED_HEADERS kpimtextedit_HEADERS
diff -ur kpimtextedit-21.12.1/src/emoticon/emoticontexteditaction.h kpimtextedit-21.12.1-install-and-export-for-blogilo/src/emoticon/emoticontexteditaction.h
--- kpimtextedit-21.12.1/src/emoticon/emoticontexteditaction.h 2021-12-10 07:04:52.000000000 +0100
+++ kpimtextedit-21.12.1-install-and-export-for-blogilo/src/emoticon/emoticontexteditaction.h 2022-01-25 21:09:22.799390272 +0100
@@ -13,7 +13,7 @@
namespace KPIMTextEdit
{
-class EmoticonTextEditAction : public KActionMenu
+class KPIMTEXTEDIT_EXPORT EmoticonTextEditAction : public KActionMenu
{
Q_OBJECT
public:
diff -ur kpimtextedit-21.12.1/src/inserthtmldialog.h kpimtextedit-21.12.1-install-and-export-for-blogilo/src/inserthtmldialog.h
--- kpimtextedit-21.12.1/src/inserthtmldialog.h 2021-12-10 07:04:52.000000000 +0100
+++ kpimtextedit-21.12.1-install-and-export-for-blogilo/src/inserthtmldialog.h 2022-01-25 21:10:13.991607681 +0100
@@ -10,12 +10,12 @@
#include <QDialog>
#include "kpimtextedit/plaintexteditor.h"
-#include "kpimtextedit_private_export.h"
+#include "kpimtextedit_export.h"
namespace KPIMTextEdit
{
class InsertHtmlDialogPrivate;
-class KPIMTEXTEDIT_TESTS_EXPORT InsertHtmlDialog : public QDialog
+class KPIMTEXTEDIT_EXPORT InsertHtmlDialog : public QDialog
{
Q_OBJECT
public:
diff -ur kpimtextedit-21.12.1/src/insertimagewidget.h kpimtextedit-21.12.1-install-and-export-for-blogilo/src/insertimagewidget.h
--- kpimtextedit-21.12.1/src/insertimagewidget.h 2021-12-10 07:04:52.000000000 +0100
+++ kpimtextedit-21.12.1-install-and-export-for-blogilo/src/insertimagewidget.h 2022-01-25 21:07:34.082052260 +0100
@@ -6,6 +6,8 @@
*/
#pragma once
+#include "kpimtextedit_export.h"
+
#include <QUrl>
#include <QWidget>
@@ -14,7 +16,7 @@
{
class InsertImageWidgetPrivate;
-class InsertImageWidget : public QWidget
+class KPIMTEXTEDIT_EXPORT InsertImageWidget : public QWidget
{
Q_OBJECT
public:
diff -ur kpimtextedit-21.12.1/src/inserttablewidget.h kpimtextedit-21.12.1-install-and-export-for-blogilo/src/inserttablewidget.h
--- kpimtextedit-21.12.1/src/inserttablewidget.h 2021-12-10 07:04:52.000000000 +0100
+++ kpimtextedit-21.12.1-install-and-export-for-blogilo/src/inserttablewidget.h 2022-01-25 21:12:51.349202308 +0100
@@ -7,13 +7,15 @@
#pragma once
+#include "kpimtextedit_export.h"
+
#include <QWidget>
#include <QTextLength>
namespace KPIMTextEdit
{
-class InsertTableWidget : public QWidget
+class KPIMTEXTEDIT_EXPORT InsertTableWidget : public QWidget
{
Q_OBJECT
public:

Binary file not shown.

View File

@ -0,0 +1,72 @@
diff -ur kpimtextedit-23.08.1/src/CMakeLists.txt kpimtextedit-23.08.1-install-and-export-for-blogilo/src/CMakeLists.txt
--- kpimtextedit-23.08.1/src/CMakeLists.txt 2023-09-03 06:09:00.000000000 +0200
+++ kpimtextedit-23.08.1-install-and-export-for-blogilo/src/CMakeLists.txt 2023-09-20 06:42:51.719871321 +0200
@@ -202,6 +202,9 @@
ecm_generate_headers(KPimTextEdit_CamelCase_HEADERS
HEADER_NAMES
EditorUtil
+ InsertHtmlDialog
+ InsertImageWidget
+ InsertTableWidget
SelectSpecialCharDialog
SlideContainer
TextEditorCompleter
diff -ur kpimtextedit-23.08.1/src/inserthtmldialog.h kpimtextedit-23.08.1-install-and-export-for-blogilo/src/inserthtmldialog.h
--- kpimtextedit-23.08.1/src/inserthtmldialog.h 2023-09-03 06:09:00.000000000 +0200
+++ kpimtextedit-23.08.1-install-and-export-for-blogilo/src/inserthtmldialog.h 2023-09-20 06:42:51.719871321 +0200
@@ -10,12 +10,12 @@
#include <QDialog>
#include "kpimtextedit/plaintexteditor.h"
-#include "kpimtextedit_private_export.h"
+#include "kpimtextedit_export.h"
namespace KPIMTextEdit
{
class InsertHtmlDialogPrivate;
-class KPIMTEXTEDIT_TESTS_EXPORT InsertHtmlDialog : public QDialog
+class KPIMTEXTEDIT_EXPORT InsertHtmlDialog : public QDialog
{
Q_OBJECT
public:
diff -ur kpimtextedit-23.08.1/src/insertimagewidget.h kpimtextedit-23.08.1-install-and-export-for-blogilo/src/insertimagewidget.h
--- kpimtextedit-23.08.1/src/insertimagewidget.h 2023-09-03 06:09:00.000000000 +0200
+++ kpimtextedit-23.08.1-install-and-export-for-blogilo/src/insertimagewidget.h 2023-09-20 06:42:51.846869477 +0200
@@ -6,6 +6,8 @@
*/
#pragma once
+#include "kpimtextedit_export.h"
+
#include <QUrl>
#include <QWidget>
@@ -14,7 +16,7 @@
{
class InsertImageWidgetPrivate;
-class InsertImageWidget : public QWidget
+class KPIMTEXTEDIT_EXPORT InsertImageWidget : public QWidget
{
Q_OBJECT
public:
diff -ur kpimtextedit-23.08.1/src/inserttablewidget.h kpimtextedit-23.08.1-install-and-export-for-blogilo/src/inserttablewidget.h
--- kpimtextedit-23.08.1/src/inserttablewidget.h 2023-09-03 06:09:00.000000000 +0200
+++ kpimtextedit-23.08.1-install-and-export-for-blogilo/src/inserttablewidget.h 2023-09-20 06:42:51.847869462 +0200
@@ -7,13 +7,15 @@
#pragma once
+#include "kpimtextedit_export.h"
+
#include <QWidget>
#include <QTextLength>
namespace KPIMTextEdit
{
-class InsertTableWidget : public QWidget
+class KPIMTEXTEDIT_EXPORT InsertTableWidget : public QWidget
{
Q_OBJECT
public:

BIN
kpimtextedit-23.08.4.tar.xz Normal file

Binary file not shown.