From 413a1835f5eeafc955134c7b69bc61f5063299224623a3333e22b871bc59d7a7 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Mon, 9 Sep 2019 12:06:23 +0000 Subject: [PATCH] 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 --- ...ation-displayed-on-the-about-window-.patch | 56 +++++ hunspell.patch | 20 -- scribus-1.4.7.tar.xz | 3 - scribus-1.5.5.tar.xz | 3 + scribus-icon128.png | 3 - scribus-icon24.png | 3 - scribus-icon256.png | 3 - scribus-icon32.png | 3 - scribus-icon64.png | 3 - scribus.appdata.xml | 35 --- scribus.changes | 11 + scribus.spec | 232 +++++++++--------- 12 files changed, 185 insertions(+), 190 deletions(-) create mode 100644 0001-Make-sure-information-displayed-on-the-about-window-.patch delete mode 100644 hunspell.patch delete mode 100644 scribus-1.4.7.tar.xz create mode 100644 scribus-1.5.5.tar.xz delete mode 100644 scribus-icon128.png delete mode 100644 scribus-icon24.png delete mode 100644 scribus-icon256.png delete mode 100644 scribus-icon32.png delete mode 100644 scribus-icon64.png delete mode 100644 scribus.appdata.xml diff --git a/0001-Make-sure-information-displayed-on-the-about-window-.patch b/0001-Make-sure-information-displayed-on-the-about-window-.patch new file mode 100644 index 0000000..a0560de --- /dev/null +++ b/0001-Make-sure-information-displayed-on-the-about-window-.patch @@ -0,0 +1,56 @@ +From c8877881e4439325137b5209037e76835a09444d Mon Sep 17 00:00:00 2001 +From: Christophe Giboudeaux +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 + diff --git a/hunspell.patch b/hunspell.patch deleted file mode 100644 index 4b8ef39..0000000 --- a/hunspell.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: Wolfgang Bauer -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 ---- -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 diff --git a/scribus-1.4.7.tar.xz b/scribus-1.4.7.tar.xz deleted file mode 100644 index 51218da..0000000 --- a/scribus-1.4.7.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:42d335b4a59c26c8ae1e3f601676baa3c42b035b8cde326d195f7a30078e5fec -size 72763748 diff --git a/scribus-1.5.5.tar.xz b/scribus-1.5.5.tar.xz new file mode 100644 index 0000000..cda3f6e --- /dev/null +++ b/scribus-1.5.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7908b21a6ce843269f58cedf5f8f791893257e6201cce5fbddc70daca2fe3f71 +size 73861836 diff --git a/scribus-icon128.png b/scribus-icon128.png deleted file mode 100644 index 03d0205..0000000 --- a/scribus-icon128.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b2dd2ae425f33a6b5d5e50452b7167764f324e5b2bc84133de81a7985b20d936 -size 14880 diff --git a/scribus-icon24.png b/scribus-icon24.png deleted file mode 100644 index a3df159..0000000 --- a/scribus-icon24.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1e39960309f4d5c8d98b82a4fb9ce9e610967e3f489a8ab983bdfcdc437326a4 -size 1573 diff --git a/scribus-icon256.png b/scribus-icon256.png deleted file mode 100644 index ac79965..0000000 --- a/scribus-icon256.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9ee630588a22f26e5653e96eddde1916842ba7df324423b849ab0a0ca23f6068 -size 42627 diff --git a/scribus-icon32.png b/scribus-icon32.png deleted file mode 100644 index 21de57c..0000000 --- a/scribus-icon32.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f14d678e29ab2ccc143adb09a4ae7de30d72f23ce046231614a2945454746068 -size 2268 diff --git a/scribus-icon64.png b/scribus-icon64.png deleted file mode 100644 index d1b1c2e..0000000 --- a/scribus-icon64.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:adb445babf7b4c42be3142c0bbfadcb6febbded47f9b789bbcb33986fc9240d5 -size 5776 diff --git a/scribus.appdata.xml b/scribus.appdata.xml deleted file mode 100644 index 5269503..0000000 --- a/scribus.appdata.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - scribus.desktop - CC0-1.0 - Scribus - GPL-2.0+ - Open Source Page Layout and Desktop Publishing (DTP) - http://www.scribus.net/ - -

Scribus is a open source page layout program which -produces commercial grade output in PDF and Postscript, primarily, -though not exclusively, for Linux.

-

-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.

- - - - https://raw.githubusercontent.com/scribusproject/scribus/master/doc/en/images/Rembrandt2.png - Main Window with blank page - - - https://raw.githubusercontent.com/scribusproject/scribus/master/doc/en/images/Rembrandt18.png - Properties window - - - https://raw.githubusercontent.com/scribusproject/scribus/master/doc/en/images/Rembrandt16.png - Image effects tab - - - scribus-dev@lists.scribus.net - diff --git a/scribus.changes b/scribus.changes index e6eac70..d61a21d 100644 --- a/scribus.changes +++ b/scribus.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Aug 9 20:36:41 UTC 2019 - Christophe Giboudeaux + +- 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 diff --git a/scribus.spec b/scribus.spec index 81e8c6a..a044ba1 100644 --- a/scribus.spec +++ b/scribus.spec @@ -18,53 +18,74 @@ Name: scribus -Version: 1.4.7 +Version: 1.5.5 Release: 0 Summary: Page Layout and Desktop Publishing (DTP) License: GPL-2.0-or-later Group: Productivity/Publishing/Other -Url: http://www.scribus.net/ -Source0: http://sourceforge.net/projects/%{name}/files/%{name}/%{version}/%{name}-%{version}.tar.xz -Source1: %{name}-icon24.png -Source2: %{name}-icon32.png -Source3: %{name}-icon64.png -Source4: %{name}-icon128.png -Source5: %{name}-icon256.png -Source6: %{name}.appdata.xml +URL: https://www.scribus.net/ +# https://sourceforge.net/projects/scribus/files/scribus-devel/1.5.5/ +Source: %{name}-%{version}.tar.xz # 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 BuildRequires: libboost_headers-devel %else BuildRequires: boost-devel %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 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 of color separations. -%package devel -Summary: Development files for Scribus -Group: Development/Libraries/Other -Requires: %{name} = %{version} -Requires: freetype2-devel -Requires: glibc-devel -Requires: libstdc++-devel -Requires: zlib-devel +%package doc +Summary: Documentation for Scribus +Group: Documentation/HTML +Requires: %{name} -%description devel -This package provides the development headers for Scribus, used for -developing Scribus plugins. +%description doc +This package provides the documentation for Scribus. %prep - -%setup -q -%patch -p1 +%autosetup -p1 +# W: wrong-script-end-of-line-encoding +dos2unix scribus/plugins/scriptplugin/scripts/Ligatursatz.py %build -# Delete non-free colour swatches (bnc#763586) -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" - +# Don't use the %%cmake macro, it causes crashes when starting scribus mkdir build pushd build -cmake \ +cmake .. \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - %if "%{_lib}" == "lib64" - -DWANT_LIB64=1 \ - %endif - -DWANT_CAIRO=1 \ - -DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE \ - -DCMAKE_SKIP_RPATH=TRUE \ + -DWANT_DISTROBUILD=1 \ -DWANT_HUNSPELL=1 \ - ../ - -make %{_smp_mflags} - -%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 - + -DWANT_GRAPHICSMAGICK=1 \ +%if "%{_lib}" == "lib64" + -DWANT_LIB64=1 %endif -%fdupes %{buildroot}/%{_prefix} +%cmake_build +popd -# INSTALL APPSTREAM METAINFO (SOURCE6) -install -Dm0644 %{S:6} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml +%install +%cmake_install -#update the mime database +mkdir -p %{buildroot}%{_datadir}/pixmaps +cp %{_datadir}/icons/breeze/apps/48/scribus.svg %{buildroot}%{_datadir}/pixmaps/ -%post -%mime_database_post -%desktop_database_post -%icon_theme_cache_post +# These files are required at runtime to populate the help/about window +mkdir -p %{buildroot}%{_datadir}/scribus/aboutData +mv %{buildroot}%{_datadir}/doc/scribus/{AUTHORS,COPYING,LINKS,TRANSLATION} %{buildroot}%{_datadir}/scribus/aboutData/ -%postun -%mime_database_postun -%desktop_database_postun -%icon_theme_cache_postun +# Already in %%doc +rm -f %{buildroot}%{_datadir}/doc/scribus/{ChangeLog,README} + +%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 -%defattr(-,root,root) -%{_bindir}/scribus -%{_mandir}/man?/*.* -%{_mandir}/*/man?/*.* -%{_libdir}/scribus -%{_datadir}/mime/packages/scribus.xml -%{_datadir}/scribus -%{_datadir}/doc/scribus -%{_datadir}/applications/%{name}.desktop -# This should be owned by filesystem or man, but there are only scribus files: +%license COPYING +%doc ChangeLog README +%dir %{_datadir}/doc/scribus/ +%dir %{_datadir}/icons/hicolor/1024x1024 +%dir %{_datadir}/icons/hicolor/1024x1024/apps +%lang(de) %dir %{_mandir}/de +%lang(de) %dir %{_mandir}/de/man1 +%lang(de) %{_mandir}/de/man1/scribus.1%{?ext_man} %lang(pl) %dir %{_mandir}/pl -%lang(pl) %{_mandir}/pl/man1 -%{_datadir}/icons/hicolor/*/apps/%{name}.png -%dir %{_datadir}/appdata -%{_datadir}/appdata/%{name}.appdata.xml - -%files devel -%defattr(-,root,root) -%{_includedir}/scribus +%lang(pl) %dir %{_mandir}/pl/man1 +%lang(pl) %{_mandir}/pl/man1/scribus.1%{?ext_man} +%{_bindir}/scribus +%{_datadir}/applications/scribus.desktop +%{_datadir}/icons/hicolor/*/apps/scribus.png +%{_datadir}/metainfo/scribus.appdata.xml +%{_datadir}/mime/packages/scribus.xml +%{_datadir}/pixmaps/scribus.svg +%{_datadir}/scribus/ +%{_libdir}/scribus/ +%{_mandir}/man1/scribus.1%{?ext_man} %changelog