Compare commits
2 Commits
| Author | SHA1 | Date |
|---|---|---|
Dan Horák
|
032b2672b1 | |
|
Dan Horák
|
a332b264e2 |
|
|
@ -6,6 +6,3 @@ scribus-1.3.8.tar.bz2
|
|||
/scribus-1.4.1.tar.xz.asc
|
||||
/scribus-1.4.2-free.tar.xz
|
||||
/scribus-1.4.3-free.tar.xz
|
||||
/scribus-1.4.4-free.tar.xz
|
||||
/scribus-1.4.5-free.tar.xz
|
||||
/scribus-1.4.6-free.tar.xz
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@ nv=scribus-${version}
|
|||
archive=${nv}.tar.xz
|
||||
freearchive=${nv}-free.tar.xz
|
||||
|
||||
[ -f ${archive} ] || curl -OL http://downloads.sourceforge.net/scribus/scribus-${version}.tar.xz
|
||||
[ -f ${archive} ] || curl -O http://downloads.sourceforge.net/scribus/scribus-${version}.tar.xz
|
||||
|
||||
echo "Extracting sources ..."
|
||||
rm -rf ${nv}
|
||||
tar -xJf $archive
|
||||
xzcat $archive | tar xf -
|
||||
|
||||
pushd ${nv}
|
||||
|
||||
|
|
@ -29,25 +29,11 @@ rm scribus/profiles/{sRGB.icm,srgb.license}
|
|||
rm resources/swatches/*.eps
|
||||
rm resources/swatches/dtp-studio-free-palettes-license.rtf
|
||||
|
||||
rm resources/swatches/Galaxy_*
|
||||
rm resources/swatches/Resene_*
|
||||
rm resources/swatches/COPYING_RESENE.txt
|
||||
rm resources/swatches/NAA*
|
||||
|
||||
rm resources/swatches/GiveLife_Color_System_*.xml
|
||||
rm resources/swatches/givelife_colors_license.rtf
|
||||
|
||||
rm resources/swatches/Federal_Identity_Program.xml
|
||||
|
||||
# Remove non-free (CC-BY-SA-NC) dot files
|
||||
rm resources/editorconfig/dot.*
|
||||
|
||||
# Remove non-free dic files
|
||||
rm resources/dicts/hyph_fi.dic
|
||||
|
||||
# Remove license unknown dic files
|
||||
rm resources/dicts/hyph_ia.dic resources/dicts/hyph_sv.dic
|
||||
|
||||
popd
|
||||
|
||||
echo "Creating sources ..."
|
||||
|
|
|
|||
|
|
@ -0,0 +1,15 @@
|
|||
diff -up scribus-1.4.0/CMakeLists.txt.docdir scribus-1.4.0/CMakeLists.txt
|
||||
--- scribus-1.4.0/CMakeLists.txt.docdir 2012-01-02 15:06:44.000000000 +0100
|
||||
+++ scribus-1.4.0/CMakeLists.txt 2012-01-02 15:06:57.000000000 +0100
|
||||
@@ -266,11 +266,7 @@ ELSE (WIN32 OR OS2)
|
||||
IF(TAG_VERSION OR BUILD_OSX_BUNDLE)
|
||||
SET(DOCDIR "share/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
|
||||
ELSE(TAG_VERSION OR BUILD_OSX_BUNDLE)
|
||||
- IF(NOT WANT_VERSIONING)
|
||||
- SET(DOCDIR "share/doc/${MAIN_DIR_NAME}/")
|
||||
- ELSE(NOT WANT_VERSIONING)
|
||||
SET(DOCDIR "share/doc/${MAIN_DIR_NAME}-${VERSION}/")
|
||||
- ENDIF(NOT WANT_VERSIONING)
|
||||
ENDIF (TAG_VERSION OR BUILD_OSX_BUNDLE)
|
||||
ENDIF (WIN32 OR OS2)
|
||||
ADD_DEFINITIONS("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"")
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
Index: scribus-1.4.2/scribus/CMakeLists.txt
|
||||
===================================================================
|
||||
--- scribus-1.4.2.orig/scribus/CMakeLists.txt
|
||||
+++ scribus-1.4.2/scribus/CMakeLists.txt
|
||||
diff -up scribus-1.4.2/scribus/CMakeLists.txt.nonfree scribus-1.4.2/scribus/CMakeLists.txt
|
||||
--- scribus-1.4.2/scribus/CMakeLists.txt.nonfree 2012-06-07 22:01:10.000000000 +0200
|
||||
+++ scribus-1.4.2/scribus/CMakeLists.txt 2013-01-15 18:50:11.000000000 +0100
|
||||
@@ -2,7 +2,6 @@ IF(WIN32)
|
||||
ADD_DEFINITIONS(-DQT_DLL)
|
||||
ENDIF(WIN32)
|
||||
|
|
@ -10,10 +9,9 @@ Index: scribus-1.4.2/scribus/CMakeLists.txt
|
|||
ADD_SUBDIRECTORY(dtd)
|
||||
ADD_SUBDIRECTORY(manpages)
|
||||
ADD_SUBDIRECTORY(colormgmt)
|
||||
Index: scribus-1.4.2/scribus/helpbrowser.cpp
|
||||
===================================================================
|
||||
--- scribus-1.4.2.orig/scribus/helpbrowser.cpp
|
||||
+++ scribus-1.4.2/scribus/helpbrowser.cpp
|
||||
diff -up scribus-1.4.2/scribus/helpbrowser.cpp.nonfree scribus-1.4.2/scribus/helpbrowser.cpp
|
||||
--- scribus-1.4.2/scribus/helpbrowser.cpp.nonfree 2012-06-24 22:43:17.000000000 +0200
|
||||
+++ scribus-1.4.2/scribus/helpbrowser.cpp 2013-01-15 18:50:11.000000000 +0100
|
||||
@@ -716,7 +716,7 @@ QString HelpBrowser::historyFile()
|
||||
|
||||
void HelpBrowser::displayNoHelp()
|
||||
|
|
@ -23,10 +21,9 @@ Index: scribus-1.4.2/scribus/helpbrowser.cpp
|
|||
"HTML message for no documentation available to show");
|
||||
|
||||
textBrowser->setText(noHelpMsg);
|
||||
Index: scribus-1.4.2/scribus/profiles/CMakeLists.txt
|
||||
===================================================================
|
||||
--- scribus-1.4.2.orig/scribus/profiles/CMakeLists.txt
|
||||
+++ scribus-1.4.2/scribus/profiles/CMakeLists.txt
|
||||
diff -up scribus-1.4.2/scribus/profiles/CMakeLists.txt.nonfree scribus-1.4.2/scribus/profiles/CMakeLists.txt
|
||||
--- scribus-1.4.2/scribus/profiles/CMakeLists.txt.nonfree 2012-01-03 22:47:01.000000000 +0100
|
||||
+++ scribus-1.4.2/scribus/profiles/CMakeLists.txt 2013-01-15 18:50:11.000000000 +0100
|
||||
@@ -6,7 +6,5 @@ INSTALL(FILES
|
||||
GenericCMYK.icm
|
||||
GenericCMYK.txt
|
||||
|
|
@ -35,26 +32,3 @@ Index: scribus-1.4.2/scribus/profiles/CMakeLists.txt
|
|||
-srgb.license
|
||||
DESTINATION ${SHAREDIR}profiles
|
||||
)
|
||||
diff -up scribus-1.4.4/resources/editorconfig/CMakeLists.txt.no-dot scribus-1.4.4/resources/editorconfig/CMakeLists.txt
|
||||
--- scribus-1.4.4/resources/editorconfig/CMakeLists.txt.no-dot 2014-06-06 17:22:12.258966553 -0400
|
||||
+++ scribus-1.4.4/resources/editorconfig/CMakeLists.txt 2014-06-06 17:22:16.326936717 -0400
|
||||
@@ -12,7 +12,6 @@ gnuplot.png
|
||||
300_lilypond.xml
|
||||
lilypond.png
|
||||
400_dot.xml
|
||||
-dot.svg
|
||||
500_povray.xml
|
||||
povray_32.png
|
||||
|
||||
diff -up scribus-1.4.5/resources/swatches/CMakeLists.txt.nonfree scribus-1.4.5/resources/swatches/CMakeLists.txt
|
||||
--- scribus-1.4.5/resources/swatches/CMakeLists.txt.nonfree 2016-01-12 17:41:12.379774049 -0500
|
||||
+++ scribus-1.4.5/resources/swatches/CMakeLists.txt 2016-01-12 17:41:22.219677148 -0500
|
||||
@@ -8,7 +8,7 @@ FILE( GLOB EPS_PALETTES *.eps )
|
||||
FILE( GLOB RTF_LICENSES *.rtf )
|
||||
|
||||
#Avoid CMakeLists.txt
|
||||
-SET(TXT_LICENSES "${CMAKE_CURRENT_SOURCE_DIR}/COPYING_RESENE.txt" "${CMAKE_CURRENT_SOURCE_DIR}/Japanese_Traditional_README.txt")
|
||||
+SET(TXT_LICENSES "${CMAKE_CURRENT_SOURCE_DIR}/Japanese_Traditional_README.txt")
|
||||
|
||||
INSTALL(FILES ${GIMP_STYLE_PALETTES} ${XML_PALETTES} ${EPS_PALETTES} ${RTF_LICENSES} ${TXT_LICENSES}
|
||||
DESTINATION ${SHAREDIR}swatches
|
||||
|
|
|
|||
|
|
@ -0,0 +1,49 @@
|
|||
diff -up scribus-1.4.3/scribus/ui/modetoolbar.cpp.double scribus-1.4.3/scribus/ui/modetoolbar.cpp
|
||||
--- scribus-1.4.3/scribus/ui/modetoolbar.cpp.double 2012-05-21 18:00:08.000000000 +0200
|
||||
+++ scribus-1.4.3/scribus/ui/modetoolbar.cpp 2013-09-19 21:50:48.000000000 +0200
|
||||
@@ -40,7 +40,7 @@ ModeToolBar::ModeToolBar(ScribusMainWind
|
||||
{
|
||||
SubMode = 0;
|
||||
ValCount = 32;
|
||||
- static qreal AutoShapes0[] = {0.0, 0.0, 0.0, 0.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0,
|
||||
+ static double AutoShapes0[] = {0.0, 0.0, 0.0, 0.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0,
|
||||
100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 0.0, 100.0, 0.0, 100.0,
|
||||
0.0, 100.0, 0.0, 100.0, 0.0, 0.0, 0.0, 0.0};
|
||||
ShapeVals = AutoShapes0;
|
||||
@@ -84,7 +84,7 @@ ModeToolBar::ModeToolBar(ScribusMainWind
|
||||
this->addAction(m_ScMW->scrActions["toolsEyeDropper"]);
|
||||
|
||||
languageChange();
|
||||
- connect(Rechteck, SIGNAL(FormSel(int, int, qreal *)), this, SLOT(SelShape(int, int, qreal *)));
|
||||
+ connect(Rechteck, SIGNAL(FormSel(int, int, qreal *)), this, SLOT(SelShape(int, int, double *)));
|
||||
}
|
||||
|
||||
void ModeToolBar::GetPolyProps()
|
||||
@@ -98,7 +98,7 @@ void ModeToolBar::GetPolyProps()
|
||||
delete dia;
|
||||
}
|
||||
|
||||
-void ModeToolBar::SelShape(int s, int c, qreal *vals)
|
||||
+void ModeToolBar::SelShape(int s, int c, double *vals)
|
||||
{
|
||||
m_ScMW->scrActions["toolsInsertShape"]->setIcon(QIcon(Rechteck->getIconPixmap(s,16)));
|
||||
// insertShapeButtonMenu->hide();
|
||||
diff -up scribus-1.4.3/scribus/ui/modetoolbar.h.double scribus-1.4.3/scribus/ui/modetoolbar.h
|
||||
--- scribus-1.4.3/scribus/ui/modetoolbar.h.double 2012-02-14 23:57:05.000000000 +0100
|
||||
+++ scribus-1.4.3/scribus/ui/modetoolbar.h 2013-08-19 17:13:59.000000000 +0200
|
||||
@@ -51,13 +51,13 @@ public:
|
||||
|
||||
int SubMode;
|
||||
int ValCount;
|
||||
- qreal *ShapeVals;
|
||||
+ double *ShapeVals;
|
||||
|
||||
virtual void changeEvent(QEvent *e);
|
||||
|
||||
public slots:
|
||||
void GetPolyProps();
|
||||
- void SelShape(int s, int c, qreal *vals);
|
||||
+ void SelShape(int s, int c, double *vals);
|
||||
void languageChange();
|
||||
|
||||
protected:
|
||||
|
|
@ -1,138 +0,0 @@
|
|||
Description: Avoid qreal/double type clashes on ARM
|
||||
Author: Colin Watson <cjwatson@ubuntu.com>
|
||||
Forwarded: no
|
||||
Last-Update: 2013-05-16
|
||||
|
||||
--- scribus-1.4.2.dfsg+r18267.orig/scribus/scribus.h
|
||||
+++ scribus-1.4.2.dfsg+r18267/scribus/scribus.h
|
||||
@@ -466,7 +466,7 @@ public slots:
|
||||
/** Fragt nach den Farben */
|
||||
// void GetBrushPen();
|
||||
/** Erzeugt einen Rahmen */
|
||||
- void MakeFrame(int f, int c, double *vals);
|
||||
+ void MakeFrame(int f, int c, qreal *vals);
|
||||
//** Loescht ein Element */
|
||||
//void DeleteObjekt();
|
||||
/** Duplicate current item */
|
||||
--- scribus-1.4.2.dfsg+r18267.orig/scribus/pageitem.cpp
|
||||
+++ scribus-1.4.2.dfsg+r18267/scribus/pageitem.cpp
|
||||
@@ -4597,7 +4597,7 @@ void PageItem::copyToCopyPasteBuffer(str
|
||||
|
||||
|
||||
//Moved from View
|
||||
-void PageItem::SetFrameShape(int count, double *vals)
|
||||
+void PageItem::SetFrameShape(int count, qreal *vals)
|
||||
{
|
||||
PoLine.resize(0);
|
||||
for (int a = 0; a < count-3; a += 4)
|
||||
@@ -4620,7 +4620,7 @@ void PageItem::SetFrameShape(int count,
|
||||
|
||||
void PageItem::SetRectFrame()
|
||||
{
|
||||
- static double rect[] = { 0.0, 0.0, 0.0, 0.0,
|
||||
+ static qreal rect[] = { 0.0, 0.0, 0.0, 0.0,
|
||||
100.0, 0.0, 100.0, 0.0,
|
||||
100.0, 0.0, 100.0, 0.0,
|
||||
100.0, 100.0, 100.0, 100.0,
|
||||
@@ -4635,7 +4635,7 @@ void PageItem::SetRectFrame()
|
||||
|
||||
void PageItem::SetOvalFrame()
|
||||
{
|
||||
- static double rect[] = { 100.0, 50.0, 100.0, 77.615235,
|
||||
+ static qreal rect[] = { 100.0, 50.0, 100.0, 77.615235,
|
||||
50.0, 100.0, 77.615235, 100.0,
|
||||
50.0, 100.0, 22.385765, 100.0,
|
||||
0.0, 50.0, 0.0, 77.615235,
|
||||
--- scribus-1.4.2.dfsg+r18267.orig/scribus/pageitem.h
|
||||
+++ scribus-1.4.2.dfsg+r18267/scribus/pageitem.h
|
||||
@@ -298,7 +298,7 @@ protected:
|
||||
void DrawObj_PathText(ScPainter *p, double sc);
|
||||
public:
|
||||
void DrawObj_Embedded(ScPainter *p, QRectF e, const CharStyle& style, PageItem* cembedded);
|
||||
- void SetFrameShape(int count, double *vals);
|
||||
+ void SetFrameShape(int count, qreal *vals);
|
||||
void SetRectFrame();
|
||||
void SetOvalFrame();
|
||||
void SetFrameRound();
|
||||
--- scribus-1.4.2.dfsg+r18267.orig/scribus/propertiespalette.cpp
|
||||
+++ scribus-1.4.2.dfsg+r18267/scribus/propertiespalette.cpp
|
||||
@@ -4622,7 +4622,7 @@ void PropertiesPalette::MakeIrre(int f,
|
||||
doc->setRedrawBounding(CurItem);
|
||||
break;
|
||||
default:
|
||||
- CurItem->SetFrameShape(c, (double*)vals);
|
||||
+ CurItem->SetFrameShape(c, vals);
|
||||
doc->setRedrawBounding(CurItem);
|
||||
CurItem->FrameType = f+2;
|
||||
break;
|
||||
--- scribus-1.4.2.dfsg+r18267.orig/scribus/scribusdoc.h
|
||||
+++ scribus-1.4.2.dfsg+r18267/scribus/scribusdoc.h
|
||||
@@ -1005,7 +1005,7 @@ public: // Public attributes
|
||||
DocumentInformation documentInfo;
|
||||
int appMode;
|
||||
int SubMode;
|
||||
- double *ShapeValues;
|
||||
+ qreal *ShapeValues;
|
||||
int ValCount;
|
||||
QString DocName;
|
||||
QMap<QString,int> UsedFonts;
|
||||
--- scribus-1.4.2.dfsg+r18267.orig/scribus/canvasmode_create.cpp
|
||||
+++ scribus-1.4.2.dfsg+r18267/scribus/canvasmode_create.cpp
|
||||
@@ -122,7 +122,7 @@ void CreateMode::drawControls(QPainter*
|
||||
{
|
||||
FPointArray poly;
|
||||
int valCount = m_doc->ValCount;
|
||||
- double *vals = m_doc->ShapeValues;
|
||||
+ qreal *vals = m_doc->ShapeValues;
|
||||
for (int a = 0; a < valCount-3; a += 4)
|
||||
{
|
||||
if (vals[a] < 0)
|
||||
--- scribus-1.4.2.dfsg+r18267.orig/scribus/scribus.cpp
|
||||
+++ scribus-1.4.2.dfsg+r18267/scribus/scribus.cpp
|
||||
@@ -7599,7 +7599,7 @@ void ScribusMainWindow::GetBrushPen()
|
||||
}
|
||||
*/
|
||||
//CB-->??
|
||||
-void ScribusMainWindow::MakeFrame(int f, int c, double *vals)
|
||||
+void ScribusMainWindow::MakeFrame(int f, int c, qreal *vals)
|
||||
{
|
||||
PageItem *currItem = doc->m_Selection->itemAt(0);
|
||||
switch (f)
|
||||
--- scribus-1.4.2.dfsg+r18267.orig/scribus/plugins/imposition/imposition.cpp
|
||||
+++ scribus-1.4.2.dfsg+r18267/scribus/plugins/imposition/imposition.cpp
|
||||
@@ -542,7 +542,7 @@ void Imposition::booklet4p(QList<int>* p
|
||||
}
|
||||
groupcontrol->SetRectFrame();
|
||||
|
||||
- double points[32] = {
|
||||
+ qreal points[32] = {
|
||||
//left upper corner - left lower corner
|
||||
targetDoc->Pages->at(0)->guides.vertical(1,targetDoc->Pages->at(0)->guides.Standard),
|
||||
targetDoc->Pages->at(0)->guides.horizontal(0,targetDoc->Pages->at(i)->guides.Standard),
|
||||
@@ -730,7 +730,7 @@ void Imposition::booklet4p(QList<int>* p
|
||||
}
|
||||
groupcontrol->SetRectFrame();
|
||||
|
||||
- double points[32] = {
|
||||
+ qreal points[32] = {
|
||||
//left upper corner - left lower corner
|
||||
0,
|
||||
0,
|
||||
@@ -893,7 +893,7 @@ void Imposition::booklet4p(QList<int>* p
|
||||
}
|
||||
groupcontrol->SetRectFrame();
|
||||
|
||||
- double points[32] = {
|
||||
+ qreal points[32] = {
|
||||
//left upper corner - left lower corner
|
||||
0,
|
||||
0,
|
||||
@@ -1047,7 +1047,7 @@ void Imposition::booklet4p(QList<int>* p
|
||||
}
|
||||
groupcontrol->SetRectFrame();
|
||||
|
||||
- double points[32] = {
|
||||
+ qreal points[32] = {
|
||||
//left upper corner - left lower corner
|
||||
targetDoc->Pages->at(0)->guides.vertical(1,targetDoc->Pages->at(0)->guides.Standard),
|
||||
targetDoc->Pages->at(0)->guides.horizontal(0,targetDoc->Pages->at(i)->guides.Standard),
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
diff -up scribus-1.4.5/resources/dicts/README_hyph_da_DK.txt.lppl scribus-1.4.5/resources/dicts/README_hyph_da_DK.txt
|
||||
--- scribus-1.4.5/resources/dicts/README_hyph_da_DK.txt.lppl 2015-05-07 16:50:30.664715518 -0400
|
||||
+++ scribus-1.4.5/resources/dicts/README_hyph_da_DK.txt 2015-05-07 16:50:53.288550546 -0400
|
||||
@@ -3,6 +3,9 @@ Hyphenation dictionary
|
||||
|
||||
Language: Danish (da DK).
|
||||
Origin: Based on the TeX hyphenation tables
|
||||
+ http://www.ctan.org/tex-archive/language/hyphenation/dkhyphn/dkhyphn.tex
|
||||
+ The TeX hyphenation tables are released under the LaTeX Project
|
||||
+ Public License (LPPL)
|
||||
License: GNU LGPL license.
|
||||
Author: conversion author is Marco Huggenberger<marco@by-night.ch>
|
||||
|
||||
diff -up scribus-1.4.5/resources/dicts/README_is_IS.txt.lppl scribus-1.4.5/resources/dicts/README_is_IS.txt
|
||||
--- scribus-1.4.5/resources/dicts/README_is_IS.txt.lppl 2015-05-07 16:51:32.623263721 -0400
|
||||
+++ scribus-1.4.5/resources/dicts/README_is_IS.txt 2015-05-07 16:51:53.072114610 -0400
|
||||
@@ -2,15 +2,14 @@ Hyphenation dictionary
|
||||
----------------------
|
||||
|
||||
Language: Icelandic (Iceland) (is IS).
|
||||
-Origin: Based on the TeX hyphenation tables
|
||||
+Origin: Based on the TeX hyphenation tables by J�rgen Pind (1987).
|
||||
+ http://www.ctan.org/tex-archive/language/hyphenation/dkhyphn/dkhyphn.tex
|
||||
+ The TeX hyphenation tables are released under the LaTeX Project
|
||||
+ Public License (LPPL)
|
||||
License: LGPL/SISSL license, 2003
|
||||
Author: akig@hi.is (Áki G. Karlsson)
|
||||
|
||||
HYPH is IS hyph_is_IS
|
||||
-
|
||||
-
|
||||
- These patterns were converted from TeX hyphenation patterns by Jörgen Pind
|
||||
- (1987).
|
||||
|
||||
--
|
||||
Áki G. Karlsson
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
--- scribus-1.4.6-orig/scribus/plugins/import/ps/import.prolog 2009-05-08 21:04:32.000000000 +0200
|
||||
+++ scribus-1.4.6/scribus/plugins/import/ps/import.prolog 2018-09-17 16:05:24.988900385 +0200
|
||||
@@ -75,6 +75,7 @@
|
||||
//doimage exec
|
||||
} .forceput
|
||||
end
|
||||
+/.currentopacityalpha {//.currentopacityalpha} bind def
|
||||
setglobal
|
||||
.bindnow
|
||||
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
--- a/cmake/modules/FindHUNSPELL.cmake
|
||||
+++ b/cmake/modules/FindHUNSPELL.cmake
|
||||
@@ -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.3 hunspell-1.2 PATHS /opt/local/lib /usr/local/lib /usr/lib )
|
||||
+FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.7 hunspell-1.6 hunspell-1.5 hunspell-1.4 hunspell-1.3 hunspell-1.2 PATHS /opt/local/lib /usr/local/lib /usr/lib )
|
||||
|
||||
INCLUDE(FindPackageHandleStandardArgs)
|
||||
# handle the QUIETLY and REQUIRED arguments and set HUNSPELL_FOUND to TRUE
|
||||
|
||||
BIN
scribus.png
BIN
scribus.png
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB |
212
scribus.spec
212
scribus.spec
|
|
@ -1,25 +1,24 @@
|
|||
Name: scribus
|
||||
Version: 1.4.6
|
||||
Release: 17%{?dist}
|
||||
Version: 1.4.3
|
||||
Release: 2%{?dist}
|
||||
|
||||
Summary: DeskTop Publishing application written in Qt
|
||||
# swatches bring in the fun licenses
|
||||
License: GPLv2+ and OGL and CC0 and CC-BY and CC-BY-SA and Public Domain and ASL 2.0 and LGPLv2+
|
||||
|
||||
Group: Applications/Productivity
|
||||
License: GPLv2+
|
||||
URL: http://www.scribus.net/
|
||||
# ./make-free-archive %{version}
|
||||
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
|
||||
Source2: scribus.png
|
||||
Patch1: %{name}-1.4.4-qreal_double.patch
|
||||
# use versioned documentation directory
|
||||
Patch0: %{name}-1.4.0-docdir.patch
|
||||
Patch1: %{name}-1.4.3-to-double.patch
|
||||
# fix build with non-free content removed
|
||||
Patch2: %{name}-1.4.2-nonfree.patch
|
||||
# Fix necessary LPPL attribution
|
||||
Patch3: %{name}-1.4.5-lppl-fixes.patch
|
||||
# Fix detection of hunspell-1.4+
|
||||
Patch4: %{name}-1.4.6-hunspell.patch
|
||||
Patch5: %{name}-1.4.6-gs-9.24.patch
|
||||
|
||||
BuildRequires: cmake
|
||||
|
||||
BuildRequires: cups-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: lcms2-devel
|
||||
|
|
@ -29,8 +28,8 @@ BuildRequires: libpng-devel
|
|||
BuildRequires: libtiff-devel
|
||||
BuildRequires: libxml2-devel
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python2-imaging-devel
|
||||
BuildRequires: python-devel
|
||||
BuildRequires: python-imaging-devel
|
||||
BuildRequires: qt4-devel
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: freetype-devel
|
||||
|
|
@ -41,9 +40,9 @@ BuildRequires: boost-devel
|
|||
BuildRequires: podofo-devel
|
||||
BuildRequires: hyphen-devel
|
||||
Requires: ghostscript
|
||||
Requires: python2
|
||||
Requires: python2-imaging
|
||||
Requires: python2-tkinter
|
||||
Requires: python
|
||||
Requires: python-imaging
|
||||
Requires: tkinter
|
||||
Requires: shared-mime-info
|
||||
Obsoletes: %{name}-doc < %{version}-%{release}
|
||||
Obsoletes: %{name}-devel < %{version}-%{release}
|
||||
|
|
@ -65,11 +64,9 @@ import/export and creation of color separations.
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .docdir
|
||||
%patch1 -p1 -b .double
|
||||
%patch2 -p1 -b .nonfree
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
|
||||
# recode man page to UTF-8
|
||||
pushd scribus/manpages
|
||||
|
|
@ -104,66 +101,36 @@ pushd build
|
|||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
popd
|
||||
|
||||
install -p -D -m0644 %SOURCE2 ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/scribus.png
|
||||
install -p -D -m0644 ${RPM_BUILD_ROOT}%{_datadir}/scribus/icons/scribus.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/scribus.png
|
||||
install -p -D -m0644 ${RPM_BUILD_ROOT}%{_datadir}/scribus/icons/scribusdoc.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/x-scribus.png
|
||||
|
||||
find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
|
||||
|
||||
# install the global desktop file
|
||||
rm -f ${RPM_BUILD_ROOT}%{_datadir}/mimelnk/application/*scribus.desktop
|
||||
desktop-file-install \
|
||||
%if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7)
|
||||
--vendor="fedora" \
|
||||
%endif
|
||||
desktop-file-install --vendor="fedora" \
|
||||
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
|
||||
scribus.desktop
|
||||
|
||||
# remove unwanted stuff
|
||||
rm -rf ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}
|
||||
|
||||
# Register as an application to be visible in the software center
|
||||
#
|
||||
# NOTE: It would be *awesome* if this file was maintained by the upstream
|
||||
# project, translated and installed into the right place during `make install`.
|
||||
#
|
||||
# See http://www.freedesktop.org/software/appstream/docs/ for more details.
|
||||
#
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
|
||||
cat > $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml <<EOF
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
|
||||
<!--
|
||||
BugReportURL: http://bugs.scribus.net/view.php?id=12708
|
||||
SentUpstream: 2014-09-18
|
||||
-->
|
||||
<application>
|
||||
<id type="desktop">scribus.desktop</id>
|
||||
<metadata_license>CC0-1.0</metadata_license>
|
||||
<description>
|
||||
<p>
|
||||
Scribus is a desktop publishing application that allows you to create posters,
|
||||
magazines and books ready to send off to a printing house.
|
||||
It supports professional publishing features, such color separations, CMYK and
|
||||
spot colors, ICC color management, and versatile PDF creation.
|
||||
</p>
|
||||
<!-- FIXME: Probably needs another paragraph or two -->
|
||||
</description>
|
||||
<url type="homepage">http://scribus.net/</url>
|
||||
<screenshots>
|
||||
<screenshot type="default">http://upload.wikimedia.org/wikipedia/commons/f/f4/Scribus-1.3-Linux.png</screenshot>
|
||||
</screenshots>
|
||||
<!-- FIXME: change this to an upstream email address for spec updates
|
||||
<updatecontact>someone_who_cares@upstream_project.org</updatecontact>
|
||||
-->
|
||||
</application>
|
||||
EOF
|
||||
|
||||
%post
|
||||
update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
|
||||
update-desktop-database &> /dev/null || :
|
||||
|
||||
|
||||
%postun
|
||||
update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
|
||||
update-desktop-database &> /dev/null || :
|
||||
|
||||
|
||||
%files
|
||||
%doc AUTHORS ChangeLog COPYING LINKS README
|
||||
%{_bindir}/%{name}
|
||||
%{_libdir}/%{name}/
|
||||
%{_datadir}/appdata/*%{name}.appdata.xml
|
||||
%{_datadir}/applications/*%{name}.desktop
|
||||
%{_datadir}/applications/fedora-%{name}.desktop
|
||||
%{_datadir}/mime/packages/%{name}.xml
|
||||
%{_datadir}/pixmaps/*
|
||||
%{_datadir}/%{name}/
|
||||
|
|
@ -175,132 +142,11 @@ EOF
|
|||
|
||||
|
||||
%changelog
|
||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.6-17
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.6-16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Tue Nov 13 2018 Caolán McNamara <caolanm@redhat.com> - 1.4.6-15
|
||||
- rebuild for hunspell-1.7.0
|
||||
|
||||
* Mon Sep 17 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.4.6-14
|
||||
- fix EPS import (bz #1628943)
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.6-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Wed Jul 11 2018 Sandro Mani <manisandro@gmail.com> - 1.4.6-12
|
||||
- Rebuild (podofo)
|
||||
|
||||
* Mon Feb 12 2018 Iryna Shcherbina <ishcherb@redhat.com> - 1.4.6-11
|
||||
- Update Python 2 dependency declarations to new packaging standards
|
||||
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.6-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.6-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.6-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Fri Jul 07 2017 Igor Gnatenko <ignatenko@redhat.com> - 1.4.6-7
|
||||
- Rebuild due to bug in RPM (RHBZ #1468476)
|
||||
|
||||
* Fri Apr 07 2017 Yaakov Selkowitz <yselkowi@redhat.com> - 1.4.6-6
|
||||
- Fix detection of latest hunspell for spell-checking support (#1425305)
|
||||
|
||||
* Mon Feb 06 2017 Kalev Lember <klember@redhat.com> - 1.4.6-5
|
||||
- Rebuilt for Boost 1.63
|
||||
|
||||
* Thu Feb 02 2017 Sandro Mani <manisandro@gmail.com> - 1.4.6-4
|
||||
- Rebuild (podofo)
|
||||
|
||||
* Fri Jan 27 2017 Jonathan Wakely <jwakely@redhat.com> - 1.4.6-3
|
||||
- Rebuilt for Boost 1.63
|
||||
|
||||
* Fri Sep 23 2016 Jon Ciesla <limburgher@gmail.com> - 1.4.6-2
|
||||
- podofo rebuild.
|
||||
|
||||
* Tue May 24 2016 Jon Ciesla <limburgher@gmail.com> - 1.4.6-1
|
||||
- 1.4.6
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.5-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Fri Jan 15 2016 Jonathan Wakely <jwakely@redhat.com> - 1.4.5-8
|
||||
- Rebuilt for Boost 1.60
|
||||
|
||||
* Tue Jan 12 2016 Tom Callaway <spot@fedoraproject.org> - 1.4.5-7
|
||||
- fix license tag, remove found non-free swatches (bz 1297262)
|
||||
|
||||
* Fri Sep 18 2015 Richard Hughes <rhughes@redhat.com> - 1.4.5-6
|
||||
- Use a bigger resolution application icon
|
||||
|
||||
* Thu Aug 27 2015 Jonathan Wakely <jwakely@redhat.com> - 1.4.5-5
|
||||
- Rebuilt for Boost 1.59
|
||||
|
||||
* Wed Jul 29 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.5-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
|
||||
|
||||
* Wed Jul 22 2015 David Tardon <dtardon@redhat.com> - 1.4.5-3
|
||||
- rebuild for Boost 1.58
|
||||
|
||||
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.5-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Thu May 7 2015 Tom Callaway <spot@fedoraproject.org> 1.4.5-1
|
||||
- update to 1.4.5
|
||||
- drop non-free and questionable hyphen dic files (bz 1219415)
|
||||
- fix necessary LPPL attributions
|
||||
|
||||
* Thu Mar 26 2015 Richard Hughes <rhughes@redhat.com> - 1.4.4-7
|
||||
- Add an AppData file for the software center
|
||||
|
||||
* Tue Jan 27 2015 Petr Machata <pmachata@redhat.com> - 1.4.4-6
|
||||
- Rebuild for boost 1.57.0
|
||||
|
||||
* Thu Aug 28 2014 Dan Horák <dan[at]danny.cz> - 1.4.4-5
|
||||
- switch to Debian patch for the qreal vs double conflict on ARM (fixes #1076885)
|
||||
|
||||
* Wed Aug 20 2014 Kevin Fenzi <kevin@scrye.com> - 1.4.4-4
|
||||
- Rebuild for rpm bug 1131892
|
||||
|
||||
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.4-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Sat Aug 09 2014 Rex Dieter <rdieter@fedoraproject.org> 1.4.4-2
|
||||
- optimize/update scriptlets
|
||||
|
||||
* Fri Jun 6 2014 Tom Callaway <spot@fedoraproject.org> - 1.4.4-1
|
||||
- update to 1.4.4, drop non-free dot files
|
||||
|
||||
* Fri May 23 2014 Petr Machata <pmachata@redhat.com> - 1.4.3-3
|
||||
- Rebuild for boost 1.55.0
|
||||
|
||||
* Thu Sep 19 2013 Dan Horák <dan[at]danny.cz> - 1.4.3-2
|
||||
- fix the double patch (#1009979)
|
||||
|
||||
* Mon Aug 19 2013 Dan Horák <dan[at]danny.cz> - 1.4.3-1
|
||||
- update to 1.4.3 (#990030)
|
||||
- update for unversioned docdir
|
||||
|
||||
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.2-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Tue Jul 30 2013 Petr Machata <pmachata@redhat.com> - 1.4.2-6
|
||||
- Rebuild for boost 1.54.0
|
||||
|
||||
* Mon Feb 25 2013 Toshio Kuratomi <toshio@fedoraproject.org> - 1.4.2-5
|
||||
- Remove --vendor from desktop-file-install for F19+ https://fedorahosted.org/fesco/ticket/1077
|
||||
|
||||
* Wed Jan 30 2013 Dan Horák <dan[at]danny.cz> - 1.4.2-4
|
||||
- update for Pillow (#896301)
|
||||
|
||||
* Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 1.4.2-3
|
||||
- rebuild due to "jpeg8-ABI" feature drop
|
||||
|
||||
* Fri Jan 18 2013 Dan Horák <dan[at]danny.cz> - 1.4.2-2
|
||||
- use hunspell to be consistent with the rest of the system
|
||||
|
|
|
|||
Loading…
Reference in New Issue