rpms
/
inkscape
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: rpms:c9
Branches Tags
rpms:i10ce
rpms:i8c-stream-0.92.3
rpms:c8-stream-0.92.3
rpms:i9c
rpms:c9
...
pull from: rpms:c8-stream-0.92.3
Branches Tags
rpms:i10ce
rpms:i8c-stream-0.92.3
rpms:c8-stream-0.92.3
rpms:i9c
rpms:c9

No commits in common. 'c9' and 'c8-stream-0.92.3' have entirely different histories.
c9 ... c8-stream-

9 changed files with 1525 additions and 235 deletions
Show Stats

3
.gitignore vendored
Unescape View File

@ -1 +1,2 @@
SOURCES/inkscape-1.1.1.tar.xz
SOURCES/ImageMagick-6.9.9.38-1.fc32.src.rpm
SOURCES/inkscape-0.92.3.tar.bz2

3
.inkscape.metadata
Unescape View File

@ -1 +1,2 @@
203960527f27e9fedf3e662847f759a6b4781178 SOURCES/inkscape-1.1.1.tar.xz
2d9033b4b8e57adbd5ccfa945c0bbab460e205b1 SOURCES/ImageMagick-6.9.9.38-1.fc32.src.rpm
e1886317f8e6d4fb340f6a783fe410aaff9f28a7 SOURCES/inkscape-0.92.3.tar.bz2

71
SOURCES/0003-use-python2.patch
Unescape View File

@ -0,0 +1,71 @@
diff -up inkscape-0.92.3/share/filters/CMakeLists.txt.python2 inkscape-0.92.3/share/filters/CMakeLists.txt
--- inkscape-0.92.3/share/filters/CMakeLists.txt.python2 2018-07-13 09:49:16.745284660 +0200
+++ inkscape-0.92.3/share/filters/CMakeLists.txt 2018-07-13 09:49:19.718289481 +0200
@@ -1,6 +1,6 @@
add_custom_command(
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg.h
- COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg > ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg.h
+ COMMAND python2 ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg > ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg.h
MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py
)
diff -up inkscape-0.92.3/share/palettes/CMakeLists.txt.python2 inkscape-0.92.3/share/palettes/CMakeLists.txt
--- inkscape-0.92.3/share/palettes/CMakeLists.txt.python2 2018-07-13 09:48:29.279207685 +0200
+++ inkscape-0.92.3/share/palettes/CMakeLists.txt 2018-07-13 09:48:32.351212667 +0200
@@ -2,7 +2,7 @@ set(I18N_FILES "inkscape.gpl" "svg.gpl"
add_custom_command(
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/palettes.h
- COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${I18N_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/palettes.h
+ COMMAND python2 ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${I18N_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/palettes.h
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${I18N_FILES}
)
diff -up inkscape-0.92.3/share/patterns/CMakeLists.txt.python2 inkscape-0.92.3/share/patterns/CMakeLists.txt
--- inkscape-0.92.3/share/patterns/CMakeLists.txt.python2 2018-07-13 09:48:48.886239480 +0200
+++ inkscape-0.92.3/share/patterns/CMakeLists.txt 2018-07-13 09:48:51.762244143 +0200
@@ -1,6 +1,6 @@
add_custom_command(
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg.h
- COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg > ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg.h
+ COMMAND python2 ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg > ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg.h
MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py
)
diff -up inkscape-0.92.3/share/symbols/CMakeLists.txt.python2 inkscape-0.92.3/share/symbols/CMakeLists.txt
--- inkscape-0.92.3/share/symbols/CMakeLists.txt.python2 2018-07-13 09:49:03.745263577 +0200
+++ inkscape-0.92.3/share/symbols/CMakeLists.txt 2018-07-13 09:49:05.959267167 +0200
@@ -2,7 +2,7 @@ file(GLOB _FILES RELATIVE ${CMAKE_CURREN
add_custom_command(
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/symbols.h
- COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/symbols.h
+ COMMAND python2 ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/symbols.h
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES}
)
diff -up inkscape-0.92.3/share/templates/CMakeLists.txt.python2 inkscape-0.92.3/share/templates/CMakeLists.txt
--- inkscape-0.92.3/share/templates/CMakeLists.txt.python2 2018-07-12 14:53:11.195317573 +0200
+++ inkscape-0.92.3/share/templates/CMakeLists.txt 2018-07-12 14:53:13.824322527 +0200
@@ -2,7 +2,7 @@ file(GLOB _FILES RELATIVE ${CMAKE_CURREN
add_custom_command(
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/templates.h
- COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/templates.h
+ COMMAND python2 ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/templates.h
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES}
)
diff -up inkscape-0.92.3/src/extension/implementation/implementation.cpp.python2 inkscape-0.92.3/src/extension/implementation/implementation.cpp
diff -up inkscape-0.92.3/src/extension/implementation/script.cpp.python2 inkscape-0.92.3/src/extension/implementation/script.cpp
--- inkscape-0.92.3/src/extension/implementation/script.cpp.python2 2018-07-12 14:54:09.974428340 +0200
+++ inkscape-0.92.3/src/extension/implementation/script.cpp 2018-07-12 14:54:19.590446461 +0200
@@ -87,7 +87,7 @@ Script::interpreter_t const Script::inte
#ifdef WIN32
{"python", "python-interpreter", "pythonw" },
#else
- {"python", "python-interpreter", "python" },
+ {"python", "python-interpreter", "python2" },
#endif
{"ruby", "ruby-interpreter", "ruby" },
{"shell", "shell-interpreter", "sh" },

12
SOURCES/0004-text-input-crash.patch
Unescape View File

@ -0,0 +1,12 @@
--- src/libnrtype/Layout-TNG-OutIter.cpp~ 2018-03-11 16:38:09.000000000 -0400
+++ src/libnrtype/Layout-TNG-OutIter.cpp 2018-06-16 13:17:03.129605681 -0400
@@ -182,6 +182,8 @@
if (_input_stream[source_index]->Type() != TEXT_SOURCE)
return iterator(this, char_index);
+ if (char_index >= _characters.size())
+ return end();
return iterator(this, char_index);
/* This code was never used, the text_iterator argument was "NULL" in all calling code
InputStreamTextSource const *text_source = static_cast<InputStreamTextSource const *>(_input_stream[source_index]);

120
SOURCES/inkscape-poppler-0.64.0.patch
Unescape View File

@ -0,0 +1,120 @@
From a600c6438fef2f4c06f9a4a7d933d99fb054a973 Mon Sep 17 00:00:00 2001
From: Eduard Braun <eduard.braun2@gmx.de>
Date: Tue, 24 Apr 2018 19:18:26 +0200
Subject: [PATCH] Fix compilation with poppler 0.64
---
src/extension/internal/pdfinput/pdf-parser.cpp | 10 +++++-----
src/extension/internal/pdfinput/pdf-parser.h | 2 +-
src/extension/internal/pdfinput/svg-builder.cpp | 4 ++--
src/extension/internal/pdfinput/svg-builder.h | 3 +--
4 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
index 15bc2d746d..6c498f9812 100644
--- a/src/extension/internal/pdfinput/pdf-parser.cpp
+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
@@ -2582,7 +2582,7 @@ void PdfParser::opShowSpaceText(Object args[], int /*numArgs*/)
}
}
-void PdfParser::doShowText(GooString *s) {
+void PdfParser::doShowText(const GooString *s) {
GfxFont *font;
int wMode;
double riseX, riseY;
@@ -2601,7 +2601,7 @@ void PdfParser::doShowText(GooString *s) {
font = state->getFont();
wMode = font->getWMode();
- builder->beginString(state, s);
+ builder->beginString(state);
// handle a Type 3 char
if (font->getType() == fontType3 && 0) {//out->interpretType3Chars()) {
@@ -2631,7 +2631,7 @@ void PdfParser::doShowText(GooString *s) {
double lineX = state->getLineX();
double lineY = state->getLineY();
oldParser = parser;
- p = s->getCString();
+ p = g_strdup(s->getCString());
len = s->getLength();
while (len > 0) {
n = font->getNextChar(p, len, &code,
@@ -2686,7 +2686,7 @@ void PdfParser::doShowText(GooString *s) {
} else {
state->textTransformDelta(0, state->getRise(), &riseX, &riseY);
- p = s->getCString();
+ p = g_strdup(s->getCString());
len = s->getLength();
while (len > 0) {
n = font->getNextChar(p, len, &code,
@@ -2732,7 +2732,7 @@ void PdfParser::opXObject(Object args[], int /*numArgs*/)
{
Object obj1, obj2, obj3, refObj;
- char *name = args[0].getName();
+ char *name = g_strdup(args[0].getName());
#if defined(POPPLER_NEW_OBJECT_API)
if ((obj1 = res->lookupXObject(name)).isNull()) {
#else
diff --git a/src/extension/internal/pdfinput/pdf-parser.h b/src/extension/internal/pdfinput/pdf-parser.h
index e28fecc2e1..f985b15cad 100644
--- a/src/extension/internal/pdfinput/pdf-parser.h
+++ b/src/extension/internal/pdfinput/pdf-parser.h
@@ -287,7 +287,7 @@ private:
void opMoveShowText(Object args[], int numArgs);
void opMoveSetShowText(Object args[], int numArgs);
void opShowSpaceText(Object args[], int numArgs);
- void doShowText(GooString *s);
+ void doShowText(const GooString *s);
// XObject operators
void opXObject(Object args[], int numArgs);
diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
index 158c5ae068..8e5a5f6396 100644
--- a/src/extension/internal/pdfinput/svg-builder.cpp
+++ b/src/extension/internal/pdfinput/svg-builder.cpp
@@ -1021,7 +1021,7 @@ void SvgBuilder::updateFont(GfxState *state) {
GfxFont *font = state->getFont();
// Store original name
if (font->getName()) {
- _font_specification = font->getName()->getCString();
+ _font_specification = g_strdup(font->getName()->getCString());
} else {
_font_specification = (char*) "Arial";
}
@@ -1362,7 +1362,7 @@ void SvgBuilder::_flushText() {
_glyphs.clear();
}
-void SvgBuilder::beginString(GfxState *state, GooString * /*s*/) {
+void SvgBuilder::beginString(GfxState *state) {
if (_need_font_update) {
updateFont(state);
}
diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
index ad15c9c06f..ed2a4d48e0 100644
--- a/src/extension/internal/pdfinput/svg-builder.h
+++ b/src/extension/internal/pdfinput/svg-builder.h
@@ -29,7 +29,6 @@ namespace Inkscape {
#include <glibmm/ustring.h>
#include "CharTypes.h"
-class GooString;
class Function;
class GfxState;
struct GfxColor;
@@ -136,7 +135,7 @@ public:
void clearSoftMask(GfxState *state);
// Text handling
- void beginString(GfxState *state, GooString *s);
+ void beginString(GfxState *state);
void endString(GfxState *state);
void addChar(GfxState *state, double x, double y,
double dx, double dy,
--
2.17.1

29
SOURCES/inkscape-poppler-0.65.0.patch
Unescape View File

@ -0,0 +1,29 @@
From fa1c469aa8c005e07bb8676d72af9f7c16fae3e0 Mon Sep 17 00:00:00 2001
From: Jan Palus <atler@pld-linux.org>
Date: Fri, 25 May 2018 00:30:17 +0200
Subject: [PATCH] Fix compilation with poppler 0.65.0
replace unused includes with one that is actually used
Signed-off-by: Jan Palus <atler@pld-linux.org>
---
src/extension/internal/pdfinput/pdf-parser.cpp | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
index 6c498f9812..caaeca18e0 100644
--- a/src/extension/internal/pdfinput/pdf-parser.cpp
+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
@@ -37,8 +37,7 @@ extern "C" {
#include "util/units.h"
#include "goo/gmem.h"
-#include "goo/GooTimer.h"
-#include "goo/GooHash.h"
+#include "goo/GooString.h"
#include "GlobalParams.h"
#include "CharTypes.h"
#include "Object.h"
--
2.17.1

1041
SOURCES/inkscape-poppler-20.11.0.patch
View File

File diff suppressed because it is too large Load Diff

31
SOURCES/inkscape.appdata.xml
Unescape View File

@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
<!--
BugReportURL: http://inkscape.13.x6.nabble.com/Inkscape-and-AppData-td4967842.html
SentUpstream: 2013-09-06
-->
<application>
<id type="desktop">inkscape.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
<description>
<p>
An Open Source vector graphics editor, with capabilities similar to Illustrator,
CorelDraw, or Xara X, using the W3C standard Scalable Vector Graphics (SVG) file
format.
</p>
<p>
Inkscape supports many advanced SVG features (markers, clones, alpha blending,
etc.) and great care is taken in designing a streamlined interface. It is very
easy to edit nodes, perform complex path operations, trace bitmaps and much more.
We also aim to maintain a thriving user and developer community by using open,
community-oriented development.
</p>
</description>
<url type="homepage">http://inkscape.org/</url>
<screenshots>
<screenshot type="default">https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/inkscape/a.png</screenshot>
</screenshots>
<!-- FIXME: change this to an upstream email address for spec updates
<updatecontact>someone_who_cares@upstream_project.org</updatecontact>
-->
</application>

450
SPECS/inkscape.spec
Unescape View File

@ -1,43 +1,41 @@
%define debug_package %{nil}
%global bundle_im 0
Name: inkscape
Version: 1.1.1
Release: 6%{?dist}
Version: 0.92.3
Release: 16%{?dist}
Summary: Vector-based drawing program using SVG
# Inkscape tags their releases with underscores and in ALLCAPS
%global repotag %(echo %{name}_%{version} |tr "." "_" |tr "[:lower:]" "[:upper:]")
License: GPLv2+ and CC-BY
URL: https://inkscape.org/
Source0: https://inkscape.org/gallery/item/29255/inkscape-1.1.1.tar.xz
URL: http://inkscape.sourceforge.net/
Source0: http://downloads.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2
#Source0: https://inkscape.org/en/gallery/item/10682/inkscape-0.92.1.tar_XlpI7qT.bz2
#Source0: inkscape-r15740.tar.bz2
# AppData file. Upstream has merged a patch adding an appdata file
# after into the 0.92 release branch.
Source1: %{name}.appdata.xml
# Fedora Color Palette, GIMP format, CC-BY 3.0
Source2: Fedora-Color-Palette.gpl
Source3: ImageMagick-6.9.9.38-1.fc32.src.rpm
# https://gitlab.com/inkscape/inkscape/commit/9418824967eb4c53371ef8588243fed4cab496e0
#Patch0: 0001-adapt-to-poppler-0.58.patch
Patch1: 0003-use-python2.patch
Patch2: inkscape-poppler-0.64.0.patch
Patch3: inkscape-poppler-0.65.0.patch
Patch4: inkscape-poppler-20.11.0.patch
Patch5: 0004-text-input-crash.patch
Provides: bundled(libcroco)
Provides: bundled(autotrace)
Provides: bundled(libdepixelize)
Provides: bundled(libuemf)
Provides: bundled(adaptagrams)
Provides: bundled(lib2geom)
BuildRequires: gcc-c++
BuildRequires: aspell-devel aspell-en
BuildRequires: atk-devel
BuildRequires: boost-devel
BuildRequires: cairo-devel
BuildRequires: dos2unix
BuildRequires: desktop-file-utils
BuildRequires: double-conversion-devel
BuildRequires: freetype-devel
BuildRequires: gc-devel >= 6.4
BuildRequires: gettext
BuildRequires: gsl-devel
BuildRequires: gtkmm30-devel
%if ! 0%{?flatpak} && ! 0%{?rhel} >= 8
BuildRequires: ImageMagick-c++-devel
%endif
BuildRequires: gtkmm24-devel
BuildRequires: gtkspell3-devel
BuildRequires: intltool
BuildRequires: lcms2-devel
BuildRequires: libpng-devel >= 1.2
@ -46,8 +44,7 @@ BuildRequires: libxml2-devel >= 2.6.11
BuildRequires: libxslt-devel >= 1.0.15
BuildRequires: pango-devel
BuildRequires: pkgconfig
BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: python2-devel
BuildRequires: poppler-glib-devel
BuildRequires: popt-devel
BuildRequires: libappstream-glib
@ -56,11 +53,27 @@ BuildRequires: potrace-devel
BuildRequires: cmake
BuildRequires: libwpd-devel
BuildRequires: dbus-glib-devel
BuildRequires: gtk3-devel
BuildRequires: libjpeg-devel
BuildRequires: libsigc++20-devel
BuildRequires: libsoup-devel
BuildRequires: gspell-devel
BuildRequires: make
# ImageMagick BuildRequires
%if 0%{?bundle_im}
BuildRequires: bzip2-devel, freetype-devel
BuildRequires: libtiff-devel, giflib-devel, zlib-devel, perl-devel >= 5.8.1
BuildRequires: perl-generators
BuildRequires: ghostscript-devel
BuildRequires: libwmf-devel, jasper-devel
BuildRequires: libtool-ltdl-devel
BuildRequires: libX11-devel, libXext-devel, libXt-devel
BuildRequires: lcms2-devel, libxml2-devel, librsvg2-devel, OpenEXR-devel
BuildRequires: fftw-devel, OpenEXR-devel, libwebp-devel
BuildRequires: jbigkit-devel
BuildRequires: openjpeg2-devel >= 2.1.0
%endif
#BuildRequires: autoconf automake gcc gcc-c++
# Disable all for now. TODO: Be smarter
%if 0
@ -70,11 +83,20 @@ Requires: perl(Image::Magick)
Requires: transfig
Requires: gimp
%endif
Requires: python3
Requires: python3-lxml
Requires: python3-numpy
Requires: python3-scour
Requires: python3-appdirs
Requires: python2-lxml
Requires: python2-numpy
Suggests: uniconvertor
Requires: python2-scour
# For ClipArt functionality
%if 0%{?flatpak}
Requires: gvfs-client
%else
Requires: gvfs
%endif
Provides: bundled(libcroco) = 0.6
# Weak dependencies for the LaTeX plugin
Suggests: pstoedit
@ -97,6 +119,7 @@ trace bitmaps and much more.
%package view
Summary: Viewing program for SVG files
Requires: inkscape = %{version}-%{release}
%description view
Viewer for files in W3C standard Scalable Vector Graphics (SVG) file
@ -112,101 +135,197 @@ graphics in W3C standard Scalable Vector Graphics (SVG) file format.
%prep
%autosetup -n inkscape-1.1.1_2021-09-20_3bf5ae0d25 -p1
pathfix.py -pni "%{__python3} %{py3_shbang_opts}" .
find . -name CMakeLists.txt | xargs sed -i 's|COMMAND python |COMMAND %{__python3} |g'
#strip invalid tag
sed -i /url/d org.inkscape.Inkscape.appdata.xml.in
rpmbuild --showrc
%setup -q
#%%patch0 -p1 -b.poppler
%patch1 -p1 -b .python2
%patch2 -p1 -b .poppler-0.64.0
%patch3 -p1 -b .poppler-0.65.0
%patch4 -p1 -b .poppler-20.11.0
%patch5 -p0 -b .text-input-crash
# https://bugs.launchpad.net/inkscape/+bug/314381
# A couple of files have executable bits set,
# despite not being executable
find . -name '*.cpp' | xargs chmod -x
find . -name '*.h' | xargs chmod -x
find share/extensions -name '*.py' | xargs chmod -x
# Explicitly use python2 for the extensions
sed -i -e "s|#![ ]*/usr/bin/env python[ ]*\$|#!/usr/bin/env python2|" share/extensions/*.py
# Fix end of line encodings
dos2unix -k -q share/extensions/*.py
%build
%cmake3 \
BUNDLED_PREFIX="%{_topdir}/RPMS"
function build_bundled_library() {
PACKAGE_RPM=$1
PACKAGE_SOURCE=$2
PACKAGE_DIR="%{_topdir}/RPMS"
echo "Rebuilding library $PACKAGE_RPM from $PACKAGE_SOURCE for bundling"; echo "==============================="
rpmbuild --nodeps --define "_exec_prefix $BUNDLED_PREFIX" --rebuild $PACKAGE_SOURCE
if [ ! -f $PACKAGE_DIR/$PACKAGE_RPM ]; then
# Hack for tps tests
ARCH_STR=%{_arch}
%ifarch i386 i686
ARCH_STR="i?86"
%endif
PACKAGE_DIR="$PACKAGE_DIR/$ARCH_STR"
fi
# Get rid of -debug package that we don't unpack them later
rm -f $PACKAGE_DIR/*debug*.rpm
# Unpack all rpm with given name to the .../rpmbuild/bundle
for rpm in $PACKAGE_DIR/$PACKAGE_RPM; do
echo "Installing $rpm" to $BUNDLED_PREFIX; echo "==============================="
pushd $BUNDLED_PREFIX
rpm2cpio $rpm | cpio -iduv
rm -f $rpm
popd
done
}
INSTALL_PREFIX="usr"
%if 0%{?flatpak}
export DEVLIBS_PATH=/app
export RHEL_ALLOW_PYTHON2_FOR_BUILD=1
INSTALL_PREFIX="app"
%endif
%if 0%{?bundle_im}
# First build and install bundled ImageMagick
build_bundled_library 'ImageMagick*.rpm' '%{SOURCE3}'
#FIXME %filter_provides $BUNDLED_PREFIX%{_libdir}
#FIXME %filter_from_requires /libMagick*.so.*/d
export PKG_CONFIG_PATH=$BUNDLED_PREFIX/$INSTALL_PREFIX/%{_lib}/pkgconfig
%endif
echo "==============================="
echo "Building Inkscape"
echo "==============================="
%cmake \
-DCMAKE_C_FLAGS_RELEASE:STRING="$CFLAGS -DNDEBUG -fno-strict-aliasing -I$BUNDLED_PREFIX/$INSTALL_PREFIX/include/ImageMagick-6" \
-DCMAKE_CXX_FLAGS_RELEASE:STRING="$CXXFLAGS -DNDEBUG -I$BUNDLED_PREFIX/$INSTALL_PREFIX/include/ImageMagick-6" \
-DCMAKE_Fortran_FLAGS_RELEASE:STRING="$FCFLAGS -DNDEBUG" \
%if 0%{?bundle_im}
-DCMAKE_SHARED_LINKER_FLAGS:STRING="$LDFLAGS -L$BUNDLED_PREFIX%{_libdir} -Wl,-rpath,/$INSTALL_PREFIX/lib/inkscape" \
-DCMAKE_EXE_LINKER_FLAGS:STRING="$LDFLAGS -L$BUNDLED_PREFIX%{_libdir} -Wl,-rpath,/$INSTALL_PREFIX/lib/inkscape" \
%endif
-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
-DBUILD_SHARED_LIBS:BOOL=OFF . \
-DCMAKE_SKIP_RPATH=TRUE
%cmake_build
-DCMAKE_INSTALL_PREFIX:PATH=/$INSTALL_PREFIX \
-DINCLUDE_INSTALL_DIR:PATH=/$INSTALL_PREFIX/include \
-DLIB_INSTALL_DIR:PATH=/$INSTALL_PREFIX/lib64 \
-DSYSCONF_INSTALL_DIR:PATH=/etc \
-DSHARE_INSTALL_PREFIX:PATH=/$INSTALL_PREFIX/share \
%if "lib64" == "lib64"
-DLIB_SUFFIX=64 \
%endif
-DBUILD_SHARED_LIBS:BOOL=OFF .
make %{?_smp_mflags}
%install
%cmake_install
rpmbuild --showrc
make install DESTDIR=$RPM_BUILD_ROOT
sed -i 's/Drawing Shortcut Group/X-Drawing Shortcut Group/g' $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
find $RPM_BUILD_ROOT -type f -name 'lib*.a' | xargs rm -f
desktop-file-install --vendor="%{?desktop_vendor}" --delete-original --remove-key=TargetEnvironment \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
# No skencil anymore
rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions/sk2svg.sh
# Don't install development files for bundled libraries
rm -r $RPM_BUILD_ROOT%{_includedir}/2geom-1.1.0/
rm -r $RPM_BUILD_ROOT%{_libdir}/cmake/2Geom
rm $RPM_BUILD_ROOT%{_prefix}/lib/pkgconfig/2geom.pc
%if 0%{?flatpak}
# Pulls in ruby
rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions/simplepath.rb
%endif
# Install and validate appdata file
mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/appdata
appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/appdata/*.appdata.xml
# Install Fedora Color Pallette
install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/inkscape/palettes/
%find_lang %{name} --with-man
rm -rf $RPM_BUILD_ROOT%{_datadir}/inkscape/doc
rm -f $RPM_BUILD_ROOT%{_datadir}/doc/inkscape/copyright
# Add ImageMagick libraries and modules
%if 0%{?bundle_im}
BUNDLED_PREFIX="%{_topdir}/RPMS"
# Remove extra files
rm -rf $BUNDLED_PREFIX%{_prefix}/%{_lib}/pkgconfig
rm -rf $BUNDLED_PREFIX%{_prefix}/%{_lib}/perl5
# Copy libraries to libdir
%{__mkdir_p} $RPM_BUILD_ROOT%{_prefix}/%{_lib}
cp -r $BUNDLED_PREFIX%{_prefix}/%{_lib}/* $RPM_BUILD_ROOT%{_prefix}/%{_lib}
%endif
%if 0%{?flatpak}
# Remove /usr/bin/env/python2? in a way that works for both /usr/bin/python2
# and /app/bin/python2 (brp-mangle-shebangs doesn't)
grep -E -rl '^#!\s*/usr/bin/env\s+python' --include=\*.py "%{buildroot}" |
while read file; do
sed -r '1s,^#!\s*/usr/bin/env\s+python(2?)(\s|$),#!%{__python2}\2,' -i "$file"
done
%endif
%check
# Validate appdata file
appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/*.appdata.xml
#%check
# XXX: Tests fail, ignore it for now
#make -k check || :
# Validate desktop file
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.inkscape.Inkscape.desktop
%files -f %{name}.lang
%{!?_licensedir:%global license %%doc}
%license COPYING
%doc AUTHORS NEWS.md README.md
%doc AUTHORS NEWS README
%{_bindir}/inkscape
%dir %{_datadir}/inkscape
%{_datadir}/inkscape/attributes
%{_datadir}/inkscape/branding
%{_datadir}/inkscape/extensions
%if 0%{?flatpak}
# Pulls in ruby
%exclude %{_datadir}/inkscape/extensions/simplepath.rb
%endif
# Pulls in perl, if needed should go into a -perl subpackage
%exclude %{_datadir}/inkscape/extensions/embed_raster_in_svg.pl
%{_datadir}/inkscape/filters
%{_datadir}/inkscape/fonts
%{_datadir}/inkscape/gradients
%{_datadir}/inkscape/icons
%{_datadir}/inkscape/keys
%{_datadir}/inkscape/markers
%{_datadir}/inkscape/palettes
%{_datadir}/inkscape/paint
%{_datadir}/inkscape/pixmaps
%{_datadir}/inkscape/patterns
%{_datadir}/inkscape/screens
%{_datadir}/inkscape/symbols
%{_datadir}/inkscape/templates
%{_datadir}/inkscape/ui
%{_datadir}/metainfo/org.inkscape.Inkscape.appdata.xml
%{_datadir}/applications/org.inkscape.Inkscape.desktop
%{_mandir}/man1/*.1*
%{_datadir}/appdata/*inkscape.appdata.xml
%{_datadir}/applications/*inkscape.desktop
%{_datadir}/icons/hicolor/*/*/inkscape*
%{_mandir}/*/*
%exclude %{_mandir}/man1/inkview.1*
%{_datadir}/inkscape/tutorials
%{_datadir}/inkscape/themes
%{_datadir}/icons/hicolor/*/apps/*.png
%{_datadir}/icons/hicolor/*/apps/*.svg
%{_datadir}/bash-completion/completions/inkscape
%dir %{_prefix}/lib/inkscape
%{_prefix}/lib/inkscape/lib*.so
%if 0%{?bundle_im}
%{_libdir}/libMagick*
%{_libdir}/ImageMagick-*
%endif
%files view
%{!?_licensedir:%global license %%doc}
%license COPYING
%doc AUTHORS NEWS.md README.md
%doc AUTHORS NEWS README
%{_bindir}/inkview
%{_mandir}/man1/inkview.1*
%{_mandir}/*/man1/inkview.1*
%files docs
@ -216,179 +335,44 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.inkscape.Inksc
%changelog
* Wed Jan 19 2022 Jan Horak <jhorak@redhat.com> - 1.1.1-6
- Stripping extra rpath again
* Tue Jan 18 2022 Jan Horak <jhorak@redhat.com> - 1.1.1-5
- Using system build flags
* Thu Jan 13 2022 Jan Horak <jhorak@redhat.com> - 1.1.1-3
- Sync to Fedora branch
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.1-3
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Thu Jul 15 2021 Jan Horak <jhorak@redhat.com> - 1.1-2
- Removed libgdl dependency
* Wed Jun 23 2021 Jan Horak <jhorak@redhat.com> - 1.1-1
- Enable gspell
- Don't install development files for bundled 2geom
- Update to 1.1
* Wed May 19 2021 Jan Horak <jhorak@redhat.com> - 1.0.2-6
- Resolves: #1958287 Rebuild due to updated poppler
* Mon May 17 2021 Jan Horak <jhorak@redhat.com> - 1.0.2-5
- Resolves: #1958287 Rebuild due to updated poppler
* Tue May 04 2021 Jan Horak <jhorak@redhat.com> - 1.0.2-4
- Fix rhbz#1956875 - extra rpath
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.0.2-3
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Thu Feb 11 2021 Jan Horak <jhorak@redhat.com> - 1.0.2-2
- Added missing bundled source, removed libgdlmm depencency
* Mon Feb 01 2021 Gwyn Ciesla <gwync@protonmail.com> - 1.0.2-1
- 1.0.2
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jan 12 2021 Gwyn Ciesla <gwync@protonmail.com> - 1.0.1-4
- Poppler rebuild.
* Mon Jan 04 2021 Tomas Popela <tpopela@redhat.com> - 1.0.1-3
- Don't build with ImageMagick support in ELN/RHEL
* Fri Sep 11 2020 Kalev Lember <klember@redhat.com> - 1.0.1-2
- Fix appdata 1.0.1 release info
* Tue Sep 08 2020 Gwyn Ciesla <gwync@protonmail.com> - 1.0.1-1
- 1.0.1
* Thu Sep 03 2020 Jeff Law <law@redhat.com> - 1.0-8
- Refine dynamic casts to avoid -Wnonnull warning with gcc-11
* Mon Aug 17 2020 Kalev Lember <klember@redhat.com> - 1.0-7
- Drop two unneeded dependencies
- Validate appdata file in check rather than install section
- Use desktop-file-validate instead of desktop-file-install
- Drop unused gtk2 buildrequires
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 1.0-5
- Use make macros
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
* Mon Jul 13 2020 Gwyn Ciesla <gwync@protonmail.com> - 1.0-4
- Poppler 0.90.0 rebuild.
* Tue Jun 23 2020 Gwyn Ciesla <gwync@protonmail.com> - 1.0-3
- BR python3-setuptools.
* Thu May 07 2020 Gwyn Ciesla <gwync@protonmail.com> - 1.0-2
- Fix runtime dependencies.
* Fri May 01 2020 Gwyn Ciesla <gwync@protonmail.com> - 1.0-1
- 1.0 final
* Wed Apr 15 2020 Gwyn Ciesla <gwync@protonmail.com> - 1.0-0.rc1.1
- Download version with extensions.
* Sat Apr 11 2020 Gwyn Ciesla <gwync@protonmail.com> - 1.0-0.rc1
- 1.0 RC1
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-0.beta.5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Jan 17 2020 Marek Kasik <mkasik@redhat.com> - 1.0-0.beta.4
- Rebuild for poppler-0.84.0
* Wed Dec 04 2019 Gwyn Ciesla <gwync@protonmail.com> - 1.0-0.beta.3
- 1.0 beta 2
* Mon Oct 14 2019 Gwyn Ciesla <gwync@protonmail.com> - 1.0-0.beta.2
- 1.0 beta 1
* Tue Sep 24 2019 Christoph Junghans <junghans@votca.org> - 1.0-0.beta.1
- Rebuild for libdouble-conversion
* Mon Sep 09 2019 Gwyn Ciesla <gwync@protonmail.com> - 1.0-0.beta
- 1.0 beta
* Mon Sep 09 2019 Kalev Lember <klember@redhat.com> - 0.92.4-12.git179c1e14
- Use upstream appdata
* Fri Aug 30 2019 Miro Hrončok <mhroncok@redhat.com> - 0.92.4-11.git179c1e14
- Explicitly depend on Python 3 interpreter
- Use python3 explicitly when building
* Mon Aug 26 2019 Gwyn Ciesla <gwync@protonmail.com> - 0.92.4-10.git179c1e14
- git snapshot for Python 3.
* Tue Aug 20 2019 Susi Lehtola <jussilehtola@fedoraproject.org> - 0.92.4-9
- Rebuilt for GSL 2.6.
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.92.4-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jun 20 2019 Kalev Lember <klember@redhat.com> - 0.92.4-7
- Don't hardcode /usr prefix
* Wed Jun 12 2019 Kalev Lember <klember@redhat.com> - 0.92.4-6
- Avoid ruby dep for flatpak builds
* Wed Mar 27 2019 Gwyn Ciesla <gwync@protonmail.com> - 0.92.4-5
- Build without -D_FORTIFY_SOURCE=2 to work around https://bugs.launchpad.net/inkscape/+bug/1778951
* Fri Feb 08 2019 Gwyn Ciesla <gwync@protonmail.com> - 0.92.4-4
- Drop gvfs.
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.92.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jan 25 2019 Marek Kasik <mkasik@redhat.com> - 0.92.4-2
- Rebuild for poppler-0.73.0
* Thu Jan 17 2019 Gwyn Ciesla <limburgher@gmail.com> - 0.92.4-1
- 0.92.4
* Mon Nov 08 2021 Jan Horak <jhorak@redhat.com> - 0.92.3-16
- Fixing crashes on text input, rhbz#1997106
* Tue Jan 15 2019 Gwyn Ciesla <limburgher@gmail.com> - 0.92.3-11
- End of line patch.
* Thu May 13 2021 Jan Horak <jhorak@redhat.com> - 0.92.3-15
- Added python dependency for the flatpak too
* Mon Jan 14 2019 Gwyn Ciesla <limburgher@gmail.com> - 0.92.3-10
- Alternate out of bounds patch.
* Mon May 10 2021 Jan Horak <jhorak@redhat.com> - 0.92.3-14
- Use rpath only for the bundled im
* Fri Jan 11 2019 Gwyn Ciesla <limburgher@gmail.com> - 0.92.3-9
- Patch for out of bounds.
* Wed Jul 10 2019 Jan Horak <jhorak@redhat.com> - 0.92.3-13
- Rebuild due to newer poppler
* Tue Dec 04 2018 Gwyn Ciesla <limburgher@gmail.com> - 0.92.3-8
- Add bundled provides.
* Mon Oct 15 2018 Jan Horak <jhorak@redhat.com> - 0.92.3-11
- Fixed cflags and inkscape-view dependency
* Tue Sep 11 2018 Gwyn Ciesla <limburgher@gmail.com> - 0.92.3-7
- Fix shebang handling.
* Wed Sep 5 2018 Jan Horak <jhorak@redhat.com> - 0.92.3-10
- Stop using bundled ImageMagick
* Tue Aug 28 2018 Michael Cronenworth <mike@cchtml.com> - 0.92.3-6
- Rebuild for ImageMagick 6.9.10
* Thu Aug 9 2018 Jan Horak <jhorak@redhat.com> - 0.92.3-8
- Filtering magick from requires/provides
- Removed libgdl depedency
* Tue Aug 14 2018 Marek Kasik <mkasik@redhat.com> - 0.92.3-5
- Rebuild for poppler-0.67.0
* Wed Jul 25 2018 Jan Horak <jhorak@redhat.com> - 0.92.3-6
- Enable s390x again
* Fri Jul 20 2018 Debarshi Ray <rishi@fedoraproject.org> - 0.92.3-4
- Fix FTBFS due to Python2
- Remove GTK3-based BuildRequires
* Fri Jul 13 2018 Jan Horak <jhorak@redhat.com> - 0.92.3-5
- Use python2 for building
- Fix building with poppler 0.66.0
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.92.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Tue May 22 2018 Jan Horak <jhorak@redhat.com> - 0.92.3-3
- Use python2 for the extensions explicitly
- Exluding s390x, build problems, making no sense to build Inkscape for
mainframe hardware
* Wed Jun 27 2018 Gwyn Ciesla <limburgher@gmail.com> - 0.92.3-2
- Fix for crash, 1575842.
* Thu May 10 2018 Jan Horak <jhorak@redhat.com> - 0.92.3-2
- Bundle ImageMagick into the package
- Removed gnome-vfs2-devel requirement
- Make uniconvertor weak dependency
* Tue Apr 17 2018 Gwyn Ciesla <limburgher@gmail.com> - 0.92.3-1
- 0.92.3.

Write Preview
Loading…
Cancel
Save