diff --git a/inkscape-0.92.5-ImageMagick-7.0.10.7.patch b/inkscape-0.92.5-ImageMagick-7.0.10.7.patch new file mode 100644 index 0000000..0572cd5 --- /dev/null +++ b/inkscape-0.92.5-ImageMagick-7.0.10.7.patch @@ -0,0 +1,106 @@ +diff -Naur orig/src/extension/CMakeLists.txt patched/src/extension/CMakeLists.txt +--- orig/src/extension/CMakeLists.txt 2017-03-24 00:51:36.134741323 +0100 ++++ patched/src/extension/CMakeLists.txt 2017-03-24 04:14:34.510756391 +0100 +@@ -218,8 +218,8 @@ + internal/bitmap/normalize.h + internal/bitmap/oilPaint.cpp + internal/bitmap/oilPaint.h +- internal/bitmap/opacity.cpp +- internal/bitmap/opacity.h ++# internal/bitmap/opacity.cpp ++# internal/bitmap/opacity.h + internal/bitmap/raise.cpp + internal/bitmap/raise.h + internal/bitmap/reduceNoise.cpp +diff -Naur orig/src/extension/init.cpp patched/src/extension/init.cpp +--- orig/src/extension/init.cpp 2017-03-24 00:51:36.134741323 +0100 ++++ patched/src/extension/init.cpp 2017-03-24 13:12:39.709882011 +0100 +@@ -88,7 +88,7 @@ + #include "internal/bitmap/negate.h" + #include "internal/bitmap/normalize.h" + #include "internal/bitmap/oilPaint.h" +-#include "internal/bitmap/opacity.h" ++//#include "internal/bitmap/opacity.h" + #include "internal/bitmap/raise.h" + #include "internal/bitmap/reduceNoise.h" + #include "internal/bitmap/sample.h" +@@ -224,7 +224,7 @@ + Internal::Bitmap::Negate::init(); + Internal::Bitmap::Normalize::init(); + Internal::Bitmap::OilPaint::init(); +- Internal::Bitmap::Opacity::init(); ++// Internal::Bitmap::Opacity::init(); + Internal::Bitmap::Raise::init(); + Internal::Bitmap::ReduceNoise::init(); + Internal::Bitmap::Sample::init(); +diff -Naur orig/src/extension/internal/bitmap/channel.cpp patched/src/extension/internal/bitmap/channel.cpp +--- orig/src/extension/internal/bitmap/channel.cpp 2017-03-24 00:51:36.134741323 +0100 ++++ patched/src/extension/internal/bitmap/channel.cpp 2017-03-24 03:06:36.164250664 +0100 +@@ -28,7 +28,7 @@ + else if (!strcmp(_layerName, "Yellow Channel")) layer = Magick::YellowChannel; + else if (!strcmp(_layerName, "Black Channel")) layer = Magick::BlackChannel; + else if (!strcmp(_layerName, "Opacity Channel")) layer = Magick::OpacityChannel; +- else if (!strcmp(_layerName, "Matte Channel")) layer = Magick::MatteChannel; ++ else if (!strcmp(_layerName, "Alpha Channel")) layer = Magick::AlphaChannel; + + image->channel(layer); + } +@@ -56,7 +56,7 @@ + "<_item value='Yellow Channel'>" N_("Yellow Channel") "\n" + "<_item value='Black Channel'>" N_("Black Channel") "\n" + "<_item value='Opacity Channel'>" N_("Opacity Channel") "\n" +- "<_item value='Matte Channel'>" N_("Matte Channel") "\n" ++ "<_item value='Alpha Channel'>" N_("Alpha Channel") "\n" + "\n" + "\n" + "all\n" +diff -Naur orig/src/extension/internal/bitmap/crop.cpp patched/src/extension/internal/bitmap/crop.cpp +--- orig/src/extension/internal/bitmap/crop.cpp 2017-03-24 00:51:36.134741323 +0100 ++++ patched/src/extension/internal/bitmap/crop.cpp 2017-03-24 02:31:09.915343848 +0100 +@@ -24,7 +24,7 @@ + int width = image->baseColumns() - (_left + _right); + int height = image->baseRows() - (_top + _bottom); + if (width > 0 and height > 0) { +- image->crop(Magick::Geometry(width, height, _left, _top, false, false)); ++ image->crop(Magick::Geometry(width, height, _left, _top)); + image->page("+0+0"); + } + } +diff -Naur orig/src/extension/internal/bitmap/levelChannel.cpp patched/src/extension/internal/bitmap/levelChannel.cpp +--- orig/src/extension/internal/bitmap/levelChannel.cpp 2017-03-24 00:51:36.134741323 +0100 ++++ patched/src/extension/internal/bitmap/levelChannel.cpp 2017-03-24 03:45:35.902823802 +0100 +@@ -28,9 +28,9 @@ + else if (!strcmp(_channelName, "Yellow Channel")) channel = Magick::YellowChannel; + else if (!strcmp(_channelName, "Black Channel")) channel = Magick::BlackChannel; + else if (!strcmp(_channelName, "Opacity Channel")) channel = Magick::OpacityChannel; +- else if (!strcmp(_channelName, "Matte Channel")) channel = Magick::MatteChannel; +- Magick::Quantum black_point = Magick::Color::scaleDoubleToQuantum(_black_point / 100.0); +- Magick::Quantum white_point = Magick::Color::scaleDoubleToQuantum(_white_point / 100.0); ++ else if (!strcmp(_channelName, "Alpha Channel")) channel = Magick::AlphaChannel; ++ Magick::Quantum black_point = static_cast(_black_point / 100.0); ++ Magick::Quantum white_point = static_cast(_white_point / 100.0); + image->levelChannel(channel, black_point, white_point, _mid_point); + } + +@@ -60,7 +60,7 @@ + "<_item value='Yellow Channel'>" N_("Yellow Channel") "\n" + "<_item value='Black Channel'>" N_("Black Channel") "\n" + "<_item value='Opacity Channel'>" N_("Opacity Channel") "\n" +- "<_item value='Matte Channel'>" N_("Matte Channel") "\n" ++ "<_item value='Alpha Channel'>" N_("Alpha Channel") "\n" + "\n" + "0.0\n" + "100.0\n" +diff -Naur orig/src/extension/internal/bitmap/level.cpp patched/src/extension/internal/bitmap/level.cpp +--- orig/src/extension/internal/bitmap/level.cpp 2017-03-24 00:51:36.134741323 +0100 ++++ patched/src/extension/internal/bitmap/level.cpp 2017-03-24 03:45:33.306793000 +0100 +@@ -19,8 +19,8 @@ + + void + Level::applyEffect(Magick::Image* image) { +- Magick::Quantum black_point = Magick::Color::scaleDoubleToQuantum(_black_point / 100.0); +- Magick::Quantum white_point = Magick::Color::scaleDoubleToQuantum(_white_point / 100.0); ++ Magick::Quantum black_point = static_cast(_black_point / 100.0); ++ Magick::Quantum white_point = static_cast(_white_point / 100.0); + image->level(black_point, white_point, _mid_point); + } diff --git a/inkscape.spec b/inkscape.spec index 6620af8..2cfce51 100644 --- a/inkscape.spec +++ b/inkscape.spec @@ -1,6 +1,6 @@ %define gittag INKSCAPE_%(echo %version | tr . _) Name: inkscape -Version: 0.92.4 +Version: 0.92.5 Release: 1mamba Summary: A SVG based generic vector-drawing application Group: Applications/Multimedia @@ -16,6 +16,7 @@ Patch2: %{name}-0.47-gcc45.patch Patch3: inkscape-0.48.5-libgc-7.4.2.patch Patch4: inkscape-0.91-libgtkmm-3.18.patch Patch5: inkscape-0.91-libgtk-3.22.patch +Patch6: inkscape-0.92.5-ImageMagick-7.0.10.7.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -90,29 +91,32 @@ Additional planned work includes conversion of the codebase from C/Gtk to C++/Gt #%patch3 -p1 #%patch4 -p0 #%patch5 -p0 +%patch6 -p1 -# Fixes build with gcc 4.8 -sed -e "s@commands_toolbox,@commands_toolbox@" -i src/widgets/desktop-widget.h +## Fixes build with gcc 4.8 +#sed -e "s@commands_toolbox,@commands_toolbox@" -i src/widgets/desktop-widget.h -./autogen.sh +#./autogen.sh %build -LDFLAGS="-ldl" \ -CXXFLAGS="--std=c++11" \ -%configure \ - --with-gnome-vfs \ - --with-python \ - --enable-strict-build=no +#LDFLAGS="-ldl" \ +#CXXFLAGS="--std=c++11" \ +#% configure \ +# --with-gnome-vfs \ +# --with-python \ +# --enable-strict-build=no # --with-gnome-print \ # --enable-inkboard # --with-perl \ +%cmake -d build + %make %install [ "%{buildroot}" != / ] && rm -rf %{buildroot} -%makeinstall +%makeinstall -C build %find_lang %{name} --all-name --with-man @@ -123,16 +127,21 @@ CXXFLAGS="--std=c++11" \ %defattr(-, root, root) %{_bindir}/inkscape %{_bindir}/inkview +%dir %{_prefix}/lib/inkscape +%{_prefix}/lib/inkscape/lib*.so %dir %{_datadir}/inkscape/ %{_datadir}/inkscape/* %{_datadir}/applications/%{name}.desktop -%{_datadir}/appdata/inkscape.appdata.xml %{_datadir}/icons/hicolor/*/apps/inkscape.png +%{_datadir}/metainfo/inkscape.appdata.xml %{_mandir}/man?/* %doc AUTHORS COPYING* #%doc ChaangeLog NEWS README %changelog +* Wed Apr 29 2020 Automatic Build System 0.92.5-1mamba +- automatic version update by autodist + * Mon Aug 19 2019 Silvan Calarco 0.92.4-1mamba - update to 0.92.4