import inkscape-0.92.3-13.module+el8.4.0+9084+d4695395
This commit is contained in:
CentOS Sources
parent
00f31b158e
commit
93f36b059f
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,2 +1,2 @@
|
||||
SOURCES/ImageMagick-6.9.9.38-1.fc27.src.rpm
|
||||
SOURCES/ImageMagick-6.9.9.38-1.fc32.src.rpm
|
||||
SOURCES/inkscape-0.92.3.tar.bz2
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
c74c0a50b094874c47bcc6d64b6cc6fad96af28a SOURCES/ImageMagick-6.9.9.38-1.fc27.src.rpm
|
||||
2d9033b4b8e57adbd5ccfa945c0bbab460e205b1 SOURCES/ImageMagick-6.9.9.38-1.fc32.src.rpm
|
||||
e1886317f8e6d4fb340f6a783fe410aaff9f28a7 SOURCES/inkscape-0.92.3.tar.bz2
|
||||
|
||||
1041
SOURCES/inkscape-poppler-20.11.0.patch
Normal file
1041
SOURCES/inkscape-poppler-20.11.0.patch
Normal file
File diff suppressed because it is too large
Load Diff
@ -2,7 +2,7 @@
|
||||
|
||||
Name: inkscape
|
||||
Version: 0.92.3
|
||||
Release: 12%{?dist}
|
||||
Release: 13%{?dist}
|
||||
Summary: Vector-based drawing program using SVG
|
||||
|
||||
License: GPLv2+ and CC-BY
|
||||
@ -15,12 +15,13 @@ Source0: http://downloads.sourceforge.net/inkscape/%{name}-%{version}.tar
|
||||
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.fc27.src.rpm
|
||||
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
|
||||
|
||||
BuildRequires: aspell-devel aspell-en
|
||||
BuildRequires: atk-devel
|
||||
@ -81,14 +82,19 @@ Requires: perl(Image::Magick)
|
||||
Requires: transfig
|
||||
Requires: gimp
|
||||
%endif
|
||||
|
||||
%if !0%{?flatpak}
|
||||
Requires: python2-lxml
|
||||
Requires: python2-numpy
|
||||
Suggests: uniconvertor
|
||||
Requires: python2-scour
|
||||
%endif
|
||||
|
||||
# For ClipArt functionality
|
||||
Requires: gvfs
|
||||
|
||||
Provides: bundled(libcroco) = 0.6
|
||||
|
||||
# Weak dependencies for the LaTeX plugin
|
||||
Suggests: pstoedit
|
||||
Suggests: tex(latex)
|
||||
@ -126,11 +132,13 @@ graphics in W3C standard Scalable Vector Graphics (SVG) file format.
|
||||
|
||||
|
||||
%prep
|
||||
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
|
||||
|
||||
# https://bugs.launchpad.net/inkscape/+bug/314381
|
||||
# A couple of files have executable bits set,
|
||||
@ -174,29 +182,38 @@ function build_bundled_library() {
|
||||
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}'
|
||||
%filter_provides $BUNDLED_PREFIX%{_libdir}
|
||||
%filter_from_requires /libMagick*.so.*/d
|
||||
export PKG_CONFIG_PATH=$BUNDLED_PREFIX/usr/%{_lib}/pkgconfig
|
||||
#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="-DNDEBUG -fno-strict-aliasing -I$BUNDLED_PREFIX/usr/include/ImageMagick-6" \
|
||||
-DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG -I$BUNDLED_PREFIX/usr/include/ImageMagick-6" \
|
||||
-DCMAKE_Fortran_FLAGS_RELEASE:STRING="-DNDEBUG" \
|
||||
-DCMAKE_SHARED_LINKER_FLAGS:STRING="-L$BUNDLED_PREFIX%{_libdir} -Wl,-rpath,/usr/lib/inkscape" \
|
||||
-DCMAKE_EXE_LINKER_FLAGS:STRING="-L$BUNDLED_PREFIX%{_libdir} -Wl,-rpath,/usr/lib/inkscape" \
|
||||
-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" \
|
||||
-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" \
|
||||
-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
|
||||
-DCMAKE_INSTALL_PREFIX:PATH=/usr \
|
||||
-DINCLUDE_INSTALL_DIR:PATH=/usr/include \
|
||||
-DLIB_INSTALL_DIR:PATH=/usr/lib64 \
|
||||
-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=/usr/share \
|
||||
-DSHARE_INSTALL_PREFIX:PATH=/$INSTALL_PREFIX/share \
|
||||
%if "lib64" == "lib64"
|
||||
-DLIB_SUFFIX=64 \
|
||||
%endif
|
||||
@ -205,6 +222,8 @@ make %{?_smp_mflags}
|
||||
|
||||
|
||||
%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
|
||||
@ -217,6 +236,11 @@ desktop-file-install --vendor="%{?desktop_vendor}" --delete-original --remove-ke
|
||||
# No skencil anymore
|
||||
rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions/sk2svg.sh
|
||||
|
||||
%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
|
||||
@ -231,11 +255,11 @@ install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/inkscape/palettes/
|
||||
%if 0%{?bundle_im}
|
||||
BUNDLED_PREFIX="%{_topdir}/RPMS"
|
||||
# Remove extra files
|
||||
rm -rf $BUNDLED_PREFIX/usr/%{_lib}/pkgconfig
|
||||
rm -rf $BUNDLED_PREFIX/usr/%{_lib}/perl5
|
||||
rm -rf $BUNDLED_PREFIX%{_prefix}/%{_lib}/pkgconfig
|
||||
rm -rf $BUNDLED_PREFIX%{_prefix}/%{_lib}/perl5
|
||||
# Copy libraries to libdir
|
||||
%{__mkdir_p} $RPM_BUILD_ROOT/usr/%{_lib}
|
||||
cp -r $BUNDLED_PREFIX/usr/%{_lib}/* $RPM_BUILD_ROOT/usr/%{_lib}
|
||||
%{__mkdir_p} $RPM_BUILD_ROOT%{_prefix}/%{_lib}
|
||||
cp -r $BUNDLED_PREFIX%{_prefix}/%{_lib}/* $RPM_BUILD_ROOT%{_prefix}/%{_lib}
|
||||
%endif
|
||||
|
||||
#%check
|
||||
@ -270,11 +294,11 @@ cp -r $BUNDLED_PREFIX/usr/%{_lib}/* $RPM_BUILD_ROOT/usr/%{_lib}
|
||||
%{_datadir}/appdata/*inkscape.appdata.xml
|
||||
%{_datadir}/applications/*inkscape.desktop
|
||||
%{_datadir}/icons/hicolor/*/*/inkscape*
|
||||
%{_mandir}/*/*gz
|
||||
%{_mandir}/*/*
|
||||
%exclude %{_mandir}/man1/inkview.1*
|
||||
%{_datadir}/inkscape/tutorials
|
||||
%dir /usr/lib/inkscape
|
||||
/usr/lib/inkscape/lib*.so
|
||||
%dir %{_prefix}/lib/inkscape
|
||||
%{_prefix}/lib/inkscape/lib*.so
|
||||
|
||||
%if 0%{?bundle_im}
|
||||
%{_libdir}/libMagick*
|
||||
@ -296,10 +320,7 @@ cp -r $BUNDLED_PREFIX/usr/%{_lib}/* $RPM_BUILD_ROOT/usr/%{_lib}
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Nov 18 2019 Jan Horak <jhorak@redhat.com> - 0.92.3-12
|
||||
- Bump release due to rebuild
|
||||
|
||||
* Wed Jul 10 2019 Jan Horak <jhorak@redhat.com> - 0.92.3-12
|
||||
* Wed Jul 10 2019 Jan Horak <jhorak@redhat.com> - 0.92.3-13
|
||||
- Rebuild due to newer poppler
|
||||
|
||||
* Mon Oct 15 2018 Jan Horak <jhorak@redhat.com> - 0.92.3-11
|
||||
|
||||
Loading…
Reference in New Issue
Block a user