SHA256
1
0
forked from pool/scribus

Accepting request 728996 from home:cgiboudeaux:branches:KDE:Extra

- Update to 1.5.5:
  * Development version using Qt5.
  * Large code refactoring
  * Many bugs fixed
- Check https://wiki.scribus.net/canvas/1.5.5_Release for more information
- Drop hunspell.patch
- Add 0001-Make-sure-information-displayed-on-the-about-window-.patch

OBS-URL: https://build.opensuse.org/request/show/728996
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/scribus?expand=0&rev=46
This commit is contained in:
Christophe Giboudeaux 2019-09-09 12:06:23 +00:00 committed by Git OBS Bridge
parent eedeb38901
commit 413a1835f5
12 changed files with 185 additions and 190 deletions

View File

@ -0,0 +1,56 @@
From c8877881e4439325137b5209037e76835a09444d Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Thu, 5 Sep 2019 12:16:58 +0200
Subject: [PATCH] Make sure information displayed on the about window are
available
The AUTHORS,COPYING,LINKS,TRANSLATION files are parsed to populate the
help/about window.
We must ensure these files are always available (including on live CD).
---
scribus/ui/about.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/scribus/ui/about.cpp b/scribus/ui/about.cpp
index b70d1eb..d1a4f1b 100644
--- a/scribus/ui/about.cpp
+++ b/scribus/ui/about.cpp
@@ -179,7 +179,7 @@ About::About( QWidget* parent, AboutMode diaMode ) : QDialog( parent )
tabLayout->setSpacing( 6 );
tabLayout->setMargin( 10 );
authorView = new QTextBrowser( tab_2 );
- authorView->setHtml(About::parseAuthorFile(ScPaths::instance().docDir() + "AUTHORS"));
+ authorView->setHtml(About::parseAuthorFile(ScPaths::instance().shareDir() + "/aboutData/AUTHORS"));
tabLayout->addWidget( authorView );
tabWidget2->addTab( tab_2, tr("A&uthors"));
@@ -189,14 +189,14 @@ About::About( QWidget* parent, AboutMode diaMode ) : QDialog( parent )
tabLayout_2->setSpacing( 6 );
tabLayout_2->setMargin( 10 );
transView = new QTextBrowser( tab_3);
- transView->setHtml(About::parseTranslationFile(ScPaths::instance().docDir() + "TRANSLATION"));
+ transView->setHtml(About::parseTranslationFile(ScPaths::instance().shareDir() + "/aboutData/TRANSLATION"));
tabLayout_2->addWidget( transView );
tabWidget2->addTab( tab_3, tr( "&Translations" ) );
/*! ONLINE tab (03/04/2004 petr vanek) */
tab_4 = new QWidget( tabWidget2 );
onlineView = new QTextBrowser( tab_4 );
- onlineView->setHtml(About::parseLinksFile(ScPaths::instance().docDir() + "LINKS"));
+ onlineView->setHtml(About::parseLinksFile(ScPaths::instance().shareDir() + "/aboutData/LINKS"));
onlineView->setOpenExternalLinks(true);
tabLayout_4 = new QHBoxLayout( tab_4 );
tabLayout_4->setSpacing( 6 );
@@ -225,7 +225,7 @@ About::About( QWidget* parent, AboutMode diaMode ) : QDialog( parent )
textViewLicence = new QTextBrowser( tab_Licence);
licenceLayout->addWidget( textViewLicence );
- QFile licenceFile(ScPaths::instance().docDir() + "/COPYING");
+ QFile licenceFile(ScPaths::instance().shareDir() + "/aboutData/COPYING");
if (!licenceFile.open(QIODevice::ReadOnly | QIODevice::Text))
textViewLicence->setPlainText(tr("Unable to open licence file. Please check your install directory or the Scribus website for licencing information.") );
else
--
2.23.0

View File

@ -1,20 +0,0 @@
From: Wolfgang Bauer <wbauer@tmo.at>
Subject: Try to build against any hunspell version
Necessary to have spellchecking support in Tumbleweed and Leap 15.0, which
have hunspell 1.6.2 that wasn't found and spellchecking got disabled...
Edited-by: Fabian Vogt <fabian@ritter-vogt.de>
---
diff -Nru a/cmake/modules/FindHUNSPELL.cmake b/cmake/modules/FindHUNSPELL.cmake
--- a/cmake/modules/FindHUNSPELL.cmake 2012-04-10 22:17:07.000000000 +0200
+++ b/cmake/modules/FindHUNSPELL.cmake 2016-04-26 13:59:20.473641707 +0200
@@ -9,7 +9,7 @@
#Based on examples at http://www.vtk.org/Wiki/CMake:How_To_Find_Libraries
FIND_PATH(HUNSPELL_INCLUDE_DIR hunspell/hunspell.hxx )
-FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.4 hunspell-1.3 hunspell-1.2 PATHS /opt/local/lib /usr/local/lib /usr/lib )
+FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell PATHS /opt/local/lib /usr/local/lib /usr/lib )
INCLUDE(FindPackageHandleStandardArgs)
# handle the QUIETLY and REQUIRED arguments and set HUNSPELL_FOUND to TRUE

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:42d335b4a59c26c8ae1e3f601676baa3c42b035b8cde326d195f7a30078e5fec
size 72763748

3
scribus-1.5.5.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7908b21a6ce843269f58cedf5f8f791893257e6201cce5fbddc70daca2fe3f71
size 73861836

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b2dd2ae425f33a6b5d5e50452b7167764f324e5b2bc84133de81a7985b20d936
size 14880

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1e39960309f4d5c8d98b82a4fb9ce9e610967e3f489a8ab983bdfcdc437326a4
size 1573

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9ee630588a22f26e5653e96eddde1916842ba7df324423b849ab0a0ca23f6068
size 42627

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f14d678e29ab2ccc143adb09a4ae7de30d72f23ce046231614a2945454746068
size 2268

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:adb445babf7b4c42be3142c0bbfadcb6febbded47f9b789bbcb33986fc9240d5
size 5776

View File

@ -1,35 +0,0 @@
<?xml version='1.0' encoding='UTF-8'?>
<component>
<id type="desktop">scribus.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
<name>Scribus</name>
<project_license>GPL-2.0+</project_license>
<summary>Open Source Page Layout and Desktop Publishing (DTP)</summary>
<url type="homepage">http://www.scribus.net/</url>
<description>
<p>Scribus is a open source page layout program which
produces commercial grade output in PDF and Postscript, primarily,
though not exclusively, for Linux.</p>
<p>
While the goals of the program are ease of use and simple
easy-to-understand tools, Scribus support for professional
publishing features, such as CMYK and spot colors, easy PDF creation,
Encapsulated Postscript import and export and creation of color
separations.</p>
</description>
<screenshots>
<screenshot type="default">
<image height="708" width="1000">https://raw.githubusercontent.com/scribusproject/scribus/master/doc/en/images/Rembrandt2.png</image>
<caption>Main Window with blank page</caption>
</screenshot>
<screenshot>
<image height="702" width="1000">https://raw.githubusercontent.com/scribusproject/scribus/master/doc/en/images/Rembrandt18.png</image>
<caption>Properties window</caption>
</screenshot>
<screenshot>
<image height="477" width="629">https://raw.githubusercontent.com/scribusproject/scribus/master/doc/en/images/Rembrandt16.png</image>
<caption>Image effects tab</caption>
</screenshot>
</screenshots>
<update_contact>scribus-dev@lists.scribus.net</update_contact>
</component>

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Fri Aug 9 20:36:41 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 1.5.5:
* Development version using Qt5.
* Large code refactoring
* Many bugs fixed
- Check https://wiki.scribus.net/canvas/1.5.5_Release for more information
- Drop hunspell.patch
- Add 0001-Make-sure-information-displayed-on-the-about-window-.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Nov 24 16:26:56 UTC 2018 - Fabian Vogt <fabian@ritter-vogt.de> Sat Nov 24 16:26:56 UTC 2018 - Fabian Vogt <fabian@ritter-vogt.de>

View File

@ -18,53 +18,74 @@
Name: scribus Name: scribus
Version: 1.4.7 Version: 1.5.5
Release: 0 Release: 0
Summary: Page Layout and Desktop Publishing (DTP) Summary: Page Layout and Desktop Publishing (DTP)
License: GPL-2.0-or-later License: GPL-2.0-or-later
Group: Productivity/Publishing/Other Group: Productivity/Publishing/Other
Url: http://www.scribus.net/ URL: https://www.scribus.net/
Source0: http://sourceforge.net/projects/%{name}/files/%{name}/%{version}/%{name}-%{version}.tar.xz # https://sourceforge.net/projects/scribus/files/scribus-devel/1.5.5/
Source1: %{name}-icon24.png Source: %{name}-%{version}.tar.xz
Source2: %{name}-icon32.png
Source3: %{name}-icon64.png
Source4: %{name}-icon128.png
Source5: %{name}-icon256.png
Source6: %{name}.appdata.xml
# PATCH-FIX-OPENSUSE # PATCH-FIX-OPENSUSE
Patch: hunspell.patch Patch0: 0001-Make-sure-information-displayed-on-the-about-window-.patch
BuildRequires: breeze5-icons
BuildRequires: cmake
BuildRequires: cups-devel
BuildRequires: dos2unix
BuildRequires: fdupes
BuildRequires: libcdr-devel
BuildRequires: libetonyek-devel
BuildRequires: libfreehand-devel
BuildRequires: libmspub-devel
BuildRequires: libpagemaker-devel
BuildRequires: libpodofo-devel
BuildRequires: libqxp-devel
BuildRequires: librevenge-devel
BuildRequires: libtiff-devel
BuildRequires: libvisio-devel
BuildRequires: libwpd-devel
BuildRequires: libwpg-devel
BuildRequires: libzmf-devel
BuildRequires: pkgconfig
BuildRequires: python-devel
BuildRequires: update-desktop-files
BuildRequires: cmake(Qt5Core) >= 5.7.0
BuildRequires: cmake(Qt5Gui) >= 5.7.0
BuildRequires: cmake(Qt5LinguistTools) >= 5.7.0
BuildRequires: cmake(Qt5Network) >= 5.7.0
BuildRequires: cmake(Qt5OpenGL) >= 5.7.0
BuildRequires: cmake(Qt5PrintSupport) >= 5.7.0
BuildRequires: cmake(Qt5Widgets) >= 5.7.0
BuildRequires: cmake(Qt5Xml) >= 5.7.0
BuildRequires: pkgconfig(GraphicsMagick)
BuildRequires: pkgconfig(GraphicsMagick++)
BuildRequires: pkgconfig(cairo)
BuildRequires: pkgconfig(fontconfig)
BuildRequires: pkgconfig(freetype2)
BuildRequires: pkgconfig(harfbuzz)
BuildRequires: pkgconfig(hunspell)
BuildRequires: pkgconfig(icu-i18n)
BuildRequires: pkgconfig(icu-uc)
BuildRequires: pkgconfig(lcms2)
BuildRequires: pkgconfig(libjpeg)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(poppler)
BuildRequires: pkgconfig(zlib)
Recommends: python2-Pillow
Recommends: python-tk
# Only available in graphics for the moment
Recommends: uniconvertor
Recommends: scribus-doc
BuildRoot: %{_tmppath}/%{name}-%{version}-build # Not packaged anymore
Provides: scribus-devel = %{version}
Obsoletes: scribus-devel < %{version}
%if 0%{?suse_version} > 1325 %if 0%{?suse_version} > 1325
BuildRequires: libboost_headers-devel BuildRequires: libboost_headers-devel
%else %else
BuildRequires: boost-devel BuildRequires: boost-devel
%endif %endif
BuildRequires: cairo-devel
BuildRequires: cmake >= 2.6.0
BuildRequires: cups-devel
BuildRequires: fdupes
BuildRequires: fontconfig-devel
BuildRequires: hicolor-icon-theme
BuildRequires: hunspell-devel
BuildRequires: liblcms2-devel
BuildRequires: libpodofo-devel
BuildRequires: libqt4-devel >= 4.6.0
BuildRequires: libtiff-devel
BuildRequires: libxml2-devel
BuildRequires: openssl-devel
BuildRequires: pkgconfig
BuildRequires: python-devel
BuildRequires: shared-mime-info
BuildRequires: update-desktop-files
%if 0%{?suse_version}
Requires: ghostscript-library
Requires: python-imaging
Requires: tk
Suggests: AdobeICCProfiles
Suggests: Uniconvertor
%endif
%description %description
Scribus is a page layout program which produces output in PDF and Scribus is a page layout program which produces output in PDF and
@ -74,104 +95,81 @@ Scribus supports publishing features such as CMYK and spot colors,
PDF creation, Encapsulated Postscript import and export and creation PDF creation, Encapsulated Postscript import and export and creation
of color separations. of color separations.
%package devel %package doc
Summary: Development files for Scribus Summary: Documentation for Scribus
Group: Development/Libraries/Other Group: Documentation/HTML
Requires: %{name} = %{version} Requires: %{name}
Requires: freetype2-devel
Requires: glibc-devel
Requires: libstdc++-devel
Requires: zlib-devel
%description devel %description doc
This package provides the development headers for Scribus, used for This package provides the documentation for Scribus.
developing Scribus plugins.
%prep %prep
%autosetup -p1
%setup -q # W: wrong-script-end-of-line-encoding
%patch -p1 dos2unix scribus/plugins/scriptplugin/scripts/Ligatursatz.py
%build %build
# Delete non-free colour swatches (bnc#763586) # Don't use the %%cmake macro, it causes crashes when starting scribus
rm resources/swatches/givelife_colors_license.rtf
rm resources/swatches/GiveLife_Color_System*.xml
# All .eps swatches come with the same non-free license by dtp studio Oldenburg.
rm resources/swatches/*.eps
rm resources/swatches/dtp-studio-free-palettes-license.rtf
export CXXFLAGS="%{optflags} -fno-strict-aliasing"
export CFLAGS="$CXXFLAGS"
mkdir build mkdir build
pushd build pushd build
cmake \ cmake .. \
-DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \
%if "%{_lib}" == "lib64" -DWANT_DISTROBUILD=1 \
-DWANT_LIB64=1 \
%endif
-DWANT_CAIRO=1 \
-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE \
-DCMAKE_SKIP_RPATH=TRUE \
-DWANT_HUNSPELL=1 \ -DWANT_HUNSPELL=1 \
../ -DWANT_GRAPHICSMAGICK=1 \
%if "%{_lib}" == "lib64"
make %{_smp_mflags} -DWANT_LIB64=1
%install
pushd build
%make_install
popd
# install hi-res icons for better appearance on gnome-shell
install -D -m 0644 %{S:1} %{buildroot}%{_datadir}/icons/hicolor/24x24/apps/%{name}.png
install -D -m 0644 %{S:2} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
install -D -m 0644 %{S:3} %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
install -D -m 0644 %{S:4} %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
install -D -m 0644 %{S:5} %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
%if 0%{?suse_version}
%suse_update_desktop_file -r -i %{name} Qt Office Publishing WordProcessor
%endif %endif
%fdupes %{buildroot}/%{_prefix} %cmake_build
popd
# INSTALL APPSTREAM METAINFO (SOURCE6) %install
install -Dm0644 %{S:6} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %cmake_install
#update the mime database mkdir -p %{buildroot}%{_datadir}/pixmaps
cp %{_datadir}/icons/breeze/apps/48/scribus.svg %{buildroot}%{_datadir}/pixmaps/
%post # These files are required at runtime to populate the help/about window
%mime_database_post mkdir -p %{buildroot}%{_datadir}/scribus/aboutData
%desktop_database_post mv %{buildroot}%{_datadir}/doc/scribus/{AUTHORS,COPYING,LINKS,TRANSLATION} %{buildroot}%{_datadir}/scribus/aboutData/
%icon_theme_cache_post
%postun # Already in %%doc
%mime_database_postun rm -f %{buildroot}%{_datadir}/doc/scribus/{ChangeLog,README}
%desktop_database_postun
%icon_theme_cache_postun %fdupes %{buildroot}%{_datadir}/doc/scribus
%fdupes %{buildroot}%{_datadir}/scribus
%suse_update_desktop_file -r scribus Qt Office WordProcessor
%files doc
%license COPYING
%doc ChangeLog README
%dir %{_datadir}/doc/scribus/
%lang(de) %{_datadir}/doc/scribus/de/
%lang(it) %{_datadir}/doc/scribus/it/
%{_datadir}/doc/scribus/en/
%files %files
%defattr(-,root,root) %license COPYING
%{_bindir}/scribus %doc ChangeLog README
%{_mandir}/man?/*.* %dir %{_datadir}/doc/scribus/
%{_mandir}/*/man?/*.* %dir %{_datadir}/icons/hicolor/1024x1024
%{_libdir}/scribus %dir %{_datadir}/icons/hicolor/1024x1024/apps
%{_datadir}/mime/packages/scribus.xml %lang(de) %dir %{_mandir}/de
%{_datadir}/scribus %lang(de) %dir %{_mandir}/de/man1
%{_datadir}/doc/scribus %lang(de) %{_mandir}/de/man1/scribus.1%{?ext_man}
%{_datadir}/applications/%{name}.desktop
# This should be owned by filesystem or man, but there are only scribus files:
%lang(pl) %dir %{_mandir}/pl %lang(pl) %dir %{_mandir}/pl
%lang(pl) %{_mandir}/pl/man1 %lang(pl) %dir %{_mandir}/pl/man1
%{_datadir}/icons/hicolor/*/apps/%{name}.png %lang(pl) %{_mandir}/pl/man1/scribus.1%{?ext_man}
%dir %{_datadir}/appdata %{_bindir}/scribus
%{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/scribus.desktop
%{_datadir}/icons/hicolor/*/apps/scribus.png
%files devel %{_datadir}/metainfo/scribus.appdata.xml
%defattr(-,root,root) %{_datadir}/mime/packages/scribus.xml
%{_includedir}/scribus %{_datadir}/pixmaps/scribus.svg
%{_datadir}/scribus/
%{_libdir}/scribus/
%{_mandir}/man1/scribus.1%{?ext_man}
%changelog %changelog