From 008e62f84006f062bc572353b96731ceed171b6f Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Mon, 29 Jul 2019 19:50:35 +0200
Subject: [PATCH] inkscape-0.92.4-1: Remove C++ 11 ABI hack

MarIuX is finally [up to date with its dependencies][1], so building
ImageMagick separately is not needed anymore.

[1]: https://github.molgen.mpg.de/mariux64/bee-files/pull/1184
---
 inkscape-0.92.4-1.build.sh | 42 +-------------------------------------
 1 file changed, 1 insertion(+), 41 deletions(-)

diff --git a/inkscape-0.92.4-1.build.sh b/inkscape-0.92.4-1.build.sh
index 768da7a..9bc8961 100755
--- a/inkscape-0.92.4-1.build.sh
+++ b/inkscape-0.92.4-1.build.sh
@@ -16,48 +16,8 @@ EOF
 source $PREFIX/profile
 
 export PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig
-
-# what is the problem here?
-# https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html
-#
-# our installed Glib & friends are build with an old cxx( which didn't use the CXX11 ABI)
-# our installed imagemagick is build with a new cxx (which defaulted to CXX11 ABI)
-#
-# we want to use both libraries. So neither _GLIBCXX_USE_CXX11_ABI=1 (the default now) nor
-# _GLIBCXX_USE_CXX11_ABI=0 by it self is enough.
-#
-# with _GLIBCXX_USE_CXX11_ABI=1 (default)
-#   ./lib/libinkscape_base.so: undefined reference to `Magick::Blob::base64(std::string)'
-#   ...
-# with _GLIBCXX_USE_CXX11_ABI=0 (default)
-#   main.cpp:(.text+0x2a01): undefined reference to `Glib::build_filename(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)'
-#   ...
-#
-# As a quick fix we include ImageMagick with _GLIBCXX_USE_CXX11_ABI=0 here, so this ImageMagick
-# library is compatible to the installed Glib and friends.
-#
-# We can't use the newest ImageMagick:
-#
-#   /pkg/inkscape-0.92.1-0/build/inkscape-0.92.1/src/extension/internal/bitmap/channel.cpp: In member function ‘virtual void Inkscape::Extension::Internal::Bitmap::Channel::applyEffect(Magick::Image*)’:
-#   /pkg/inkscape-0.92.1-0/build/inkscape-0.92.1/src/extension/internal/bitmap/channel.cpp:31:58: error: ‘MatteChannel’ is not a member of ‘Magick’
-#
-
-# ImageMagick
-
-VER=6.9.10-53
-
 mkdir -p $PREFIX/build
-cd $PREFIX/build
-test -e ImageMagick-$VER.tar.xz || wget https://www.imagemagick.org/download/releases/ImageMagick-$VER.tar.xz
-test -d ImageMagick-$VER || tar xf ImageMagick-$VER.tar.xz
-cd  ImageMagick-$VER
-./configure --prefix=$PREFIX CXXFLAGS=-D_GLIBCXX_USE_CXX11_ABI=0
-make -j $(nproc)
-make install
 
-# inkscape
-
-mkdir -p $PREFIX/build
 cd $PREFIX/build
 
 test -e inkscape-$GITHASH.tar.bz2 || wget -O inkscape-$GITHASH.tar.bz2 https://gitlab.com/inkscape/inkscape/-/archive/$GITHASH/inkscape-$GITHASH.tar.bz2
@@ -105,6 +65,6 @@ index e5d8919..e253961 100644
 
 EOF
 
-cmake -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0 -DCMAKE_INSTALL_RPATH=$PREFIX/lib .
+cmake -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DCMAKE_INSTALL_RPATH=$PREFIX/lib .
 make -j $(nproc)
 make install