update the LTO fix
This commit is contained in:
parent
5dfea79c65
commit
85fc263e99
2 changed files with 13 additions and 14 deletions
|
|
@ -1,16 +1,3 @@
|
|||
diff --git a/scribus/ui/colorlistmodel.cpp b/scribus/ui/colorlistmodel.cpp
|
||||
index a4905a5..8363e97 100644
|
||||
--- a/scribus/ui/colorlistmodel.cpp
|
||||
+++ b/scribus/ui/colorlistmodel.cpp
|
||||
@@ -10,8 +10,6 @@ for which a new license (GPL+exception) is in place.
|
||||
#include "colorlistbox.h"
|
||||
#include "commonstrings.h"
|
||||
|
||||
-ColorPixmapValue ColorListModel::m_NoneColor(ScColor(), nullptr, CommonStrings::None);
|
||||
-
|
||||
ColorListModel::ColorListModel(QObject *parent)
|
||||
: QAbstractItemModel(parent)
|
||||
{
|
||||
diff --git a/scribus/ui/colorlistmodel.h b/scribus/ui/colorlistmodel.h
|
||||
index 8f5bc65..892d0a7 100644
|
||||
--- a/scribus/ui/colorlistmodel.h
|
||||
|
|
@ -30,3 +17,15 @@ index 8f5bc65..892d0a7 100644
|
|||
-#endif // COLORLISTMODEL_H
|
||||
\ No newline at end of file
|
||||
+#endif // COLORLISTMODEL_H
|
||||
diff -up scribus-1.5.6.1/scribus/ui/colorlistmodel.cpp.orig scribus-1.5.6.1/scribus/ui/colorlistmodel.cpp
|
||||
--- scribus-1.5.6.1/scribus/ui/colorlistmodel.cpp.orig 2020-12-07 10:58:06.108966263 +0100
|
||||
+++ scribus-1.5.6.1/scribus/ui/colorlistmodel.cpp 2020-12-07 10:58:11.058358432 +0100
|
||||
@@ -31,8 +31,6 @@ ColorPixmapValue::ColorPixmapValue( cons
|
||||
m_name = colName;
|
||||
}
|
||||
|
||||
-ColorPixmapValue ColorListModel::m_NoneColor(ScColor(), nullptr, CommonStrings::None);
|
||||
-
|
||||
ColorListModel::ColorListModel(QObject *parent)
|
||||
: QAbstractItemModel(parent)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Source0: %{name}-%{version}-free.tar.xz
|
|||
#Source0: http://downloads.sourceforge.net/%%{name}/%%{name}-%%{version}.tar.xz
|
||||
#Source1: http://downloads.sourceforge.net/%%{name}/%%{name}-%%{version}.tar.xz.asc
|
||||
|
||||
#Patch0: scribus-ctorfix.patch
|
||||
Patch0: scribus-ctorfix.patch
|
||||
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: cmake
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue