diff options
| -rw-r--r-- | community/inkscape/APKBUILD | 63 | ||||
| -rw-r--r-- | community/inkscape/fix-python.patch | 57 | ||||
| -rw-r--r-- | community/inkscape/poppler-082.patch | 41 | ||||
| -rw-r--r-- | community/inkscape/poppler-083.patch | 70 |
4 files changed, 77 insertions, 154 deletions
diff --git a/community/inkscape/APKBUILD b/community/inkscape/APKBUILD index 11ac51982c..d78773252c 100644 --- a/community/inkscape/APKBUILD +++ b/community/inkscape/APKBUILD @@ -1,21 +1,20 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=inkscape -pkgver=0.92.4 -pkgrel=8 +pkgver=0.92.5 +pkgrel=0 pkgdesc="A vector-based drawing program - svg compliant" url="https://inkscape.org/" arch="all" license="GPL-2.0-or-later AND LGPL-2.1-or-later" makedepends=" - autoconf - automake boost-dev + cmake dbus-dev gc-dev gsl-dev gtkmm-dev gtkspell-dev - imagemagick-dev + imagemagick6-dev lcms-dev libtool libxml2-dev @@ -27,42 +26,26 @@ makedepends=" depends="desktop-file-utils" checkdepends="bash py3-lxml py3-numpy>=1.14.3-r1" subpackages="$pkgname-doc $pkgname-lang $pkgname-view" -source="https://launchpad.net/inkscape/${pkgver%.*}.x/$pkgver/+download/inkscape-$pkgver.tar.bz2 - poppler-082.patch - poppler-083.patch +source="https://media.inkscape.org/dl/resources/file/inkscape-$pkgver.tar.bz2 fix-python.patch " options="!check" # cxxtest hangs at least on x86_64 -prepare() { - default_prepare - ./autogen.sh - #aclocal -I m4 && autoconf && automake -a && autoheader - # we enable fortify source by default so to silence warnings we - # remove it from cmdline - sed -i -e '/CPPFLAGS=/s/-D_FORTIFY_SOURCE=2//' configure - - sed -i 's| abs(| std::fabs(|g' src/ui/tools/flood-tool.cpp - # Fix build with poppler 0.71 - sed -e 's|gTrue|true|g' -e 's|gFalse|false|g' -e 's|GBool|bool|g' -i src/extension/internal/pdfinput/pdf-parser.* - # Fix build with poppler 0.72 - sed -e 's|getCString|c_str|g' -i src/extension/internal/pdfinput/* - # Fix build with poppler 0.76 - sed -e 's|new Lexer(xref, obj)|obj|g' -i src/extension/internal/pdfinput/pdf-parser.cpp - -} - build() { - CXXFLAGS="$CXXFLAGS -std=c++11" ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --without-gnome-vfs \ - --enable-lcms \ - --enable-poppler-cairo \ - --enable-dbusapi \ - --disable-strict-build - make + export CXXFLAGS="$CXXFLAGS -std=c++11" + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake -B build \ + -DCMAKE_BUILD_TYPE=None \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DBUILD_STATIC_LIBS=False \ + -DBUILD_TESTS=ON \ + -DWITH_GNOME_VFS=OFF \ + $CMAKE_CROSSOPTS . + make -C build } check() { @@ -70,7 +53,7 @@ check() { } package() { - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" make -C build install } view() { @@ -87,7 +70,5 @@ doc() { "$subpkgdir"/usr/share/inkscape } -sha512sums="b9034605a79cd8aea808edf42e284819951ae1ea67778f0922f4c10224e94aca6c844acbc2294625773f0a7047d4e32ccdada876238a792a2c17db172c88e120 inkscape-0.92.4.tar.bz2 -adf360e99aaf2635a227bd3b59e03db688eef4713858cfbae2f02ed6368d4314cd490f53da3126555d6fc9a2b28072137c79169c18515331acd83ca643287432 poppler-082.patch -12c16bf84b467cb4e4f5d970bcdf6db15e55d61dad73bef2fa9e63bd046a027f5667c58e38876b9836d235a85390c5aa2a3241664d69c94b1951c231acc0d971 poppler-083.patch -b4910e42b6f3f73bbf91c9c566dfed2cf8d7d7426e84063dd6036cfef8ee52b4e9538d9d7833338bef06774022bc33c8f7f09ea601a7b81dfd91b8b5be0ff7a9 fix-python.patch" +sha512sums="cad2b0f66ce828ad40b1caf740e23d7d7b285b615899601f7584edca50b758d9453774cb7f20f9cab87c2a44ec0bdcc39f350351edf6b2221f8bd2de4049535c inkscape-0.92.5.tar.bz2 +6b6d17260847973ae385cc735176ec3fc666e43f244df60eacfc8ebeec05042b8b7063e9f8d93bf6bd7cfa16e5e9d48cdae66b51cc23df5e77cc2a27238ec6a4 fix-python.patch" diff --git a/community/inkscape/fix-python.patch b/community/inkscape/fix-python.patch index 7d3fe561cb..f6d8fab540 100644 --- a/community/inkscape/fix-python.patch +++ b/community/inkscape/fix-python.patch @@ -1778,10 +1778,10 @@ import sys --- a/src/extension/implementation/script.cpp +++ b/src/extension/implementation/script.cpp -@@ -87,7 +87,7 @@ - #ifdef WIN32 +@@ -88,7 +88,7 @@ {"python", "python-interpreter", "pythonw" }, #else + {"perl", "perl-interpreter", "perl" }, - {"python", "python-interpreter", "python" }, + {"python", "python-interpreter", "python3" }, #endif @@ -1815,3 +1815,56 @@ if (p) { printf("python in %s\n\n", p); g_free(p); +--- a/share/templates/CMakeLists.txt ++++ b/share/templates/CMakeLists.txt +@@ -2,7 +2,7 @@ + + 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 python3 ${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} + ) +--- a/share/palettes/CMakeLists.txt ++++ b/share/palettes/CMakeLists.txt +@@ -2,7 +2,7 @@ + + 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 python3 ${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} + ) +--- a/share/patterns/CMakeLists.txt ++++ b/share/patterns/CMakeLists.txt +@@ -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 python3 ${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 + ) +--- a/share/filters/CMakeLists.txt ++++ b/share/filters/CMakeLists.txt +@@ -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 python3 ${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 + ) +--- a/share/symbols/CMakeLists.txt ++++ b/share/symbols/CMakeLists.txt +@@ -2,7 +2,7 @@ + + 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 python3 ${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 --git a/community/inkscape/poppler-082.patch b/community/inkscape/poppler-082.patch deleted file mode 100644 index 69b8b5414b..0000000000 --- a/community/inkscape/poppler-082.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp -index c52675e..0b9ba15 100644 ---- a/src/extension/internal/pdfinput/pdf-parser.cpp -+++ b/src/extension/internal/pdfinput/pdf-parser.cpp -@@ -2414,7 +2414,7 @@ void PdfParser::doShowText(GooString *s) { - int wMode; - double riseX, riseY; - CharCode code; -- Unicode *u = NULL; -+ const Unicode *u = NULL; - double x, y, dx, dy, tdx, tdy; - double originX, originY, tOriginX, tOriginY; - double oldCTM[6], newCTM[6]; - -diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp -index dd5e710..036fc70 100644 ---- a/src/extension/internal/pdfinput/svg-builder.cpp -+++ b/src/extension/internal/pdfinput/svg-builder.cpp -@@ -1379,7 +1379,7 @@ void SvgBuilder::beginString(GfxState *state) { - void SvgBuilder::addChar(GfxState *state, double x, double y, - double dx, double dy, - double originX, double originY, -- CharCode /*code*/, int /*nBytes*/, Unicode *u, int uLen) { -+ CharCode /*code*/, int /*nBytes*/, const Unicode *u, int uLen) { - - - bool is_space = ( uLen == 1 && u[0] == 32 ); -diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h -index 34b42e1..6fe62cc 100644 ---- a/src/extension/internal/pdfinput/svg-builder.h -+++ b/src/extension/internal/pdfinput/svg-builder.h -@@ -141,7 +141,7 @@ public: - void addChar(GfxState *state, double x, double y, - double dx, double dy, - double originX, double originY, -- CharCode code, int nBytes, Unicode *u, int uLen); -+ CharCode code, int nBytes, const Unicode *u, int uLen); - void beginTextObject(GfxState *state); - void endTextObject(GfxState *state); - - diff --git a/community/inkscape/poppler-083.patch b/community/inkscape/poppler-083.patch deleted file mode 100644 index 03f921f2c4..0000000000 --- a/community/inkscape/poppler-083.patch +++ /dev/null @@ -1,70 +0,0 @@ ---- a/src/extension/internal/pdfinput/pdf-input.cpp -+++ b/src/extension/internal/pdfinput/pdf-input.cpp -@@ -689,12 +689,12 @@ - // - gchar const *poppler_datadir = g_getenv("POPPLER_DATADIR"); - if (poppler_datadir != NULL) { -- globalParams = new GlobalParams(poppler_datadir); -+ globalParams = std::unique_ptr<GlobalParams>(new GlobalParams(poppler_datadir)); - } else { -- globalParams = new GlobalParams(); -+ globalParams = std::unique_ptr<GlobalParams>(new GlobalParams()); - } - #else -- globalParams = new GlobalParams(); -+ globalParams = std::unique_ptr<GlobalParams>(new GlobalParams()); - #endif // ENABLE_OSX_APP_LOCATIONS - } - ---- a/src/extension/internal/pdfinput/pdf-parser.cpp -+++ b/src/extension/internal/pdfinput/pdf-parser.cpp -@@ -265,14 +265,14 @@ - class ClipHistoryEntry { - public: - -- ClipHistoryEntry(GfxPath *clipPath = NULL, GfxClipType clipType = clipNormal); -+ ClipHistoryEntry(const GfxPath *clipPath = NULL, GfxClipType clipType = clipNormal); - virtual ~ClipHistoryEntry(); - - // Manipulate clip path stack - ClipHistoryEntry *save(); - ClipHistoryEntry *restore(); - GBool hasSaves() { return saved != NULL; } -- void setClip(GfxPath *newClipPath, GfxClipType newClipType = clipNormal); -+ void setClip(const GfxPath *newClipPath, GfxClipType newClipType = clipNormal); - GfxPath *getClipPath() { return clipPath; } - GfxClipType getClipType() { return clipType; } - -@@ -3379,7 +3379,7 @@ - // ClipHistoryEntry - //------------------------------------------------------------------------ - --ClipHistoryEntry::ClipHistoryEntry(GfxPath *clipPathA, GfxClipType clipTypeA) : -+ClipHistoryEntry::ClipHistoryEntry(const GfxPath *clipPathA, GfxClipType clipTypeA) : - saved(NULL), - clipPath((clipPathA) ? clipPathA->copy() : NULL), - clipType(clipTypeA) -@@ -3394,7 +3394,7 @@ - } - } - --void ClipHistoryEntry::setClip(GfxPath *clipPathA, GfxClipType clipTypeA) { -+void ClipHistoryEntry::setClip(const GfxPath *clipPathA, GfxClipType clipTypeA) { - // Free previous clip path - if (clipPath) { - delete clipPath; ---- a/src/extension/internal/pdfinput/svg-builder.cpp -+++ b/src/extension/internal/pdfinput/svg-builder.cpp -@@ -264,10 +264,10 @@ - /** - * \brief Generates a SVG path string from poppler's data structure - */ --static gchar *svgInterpretPath(GfxPath *path) { -+static gchar *svgInterpretPath(const GfxPath *path) { - Inkscape::SVG::PathString pathString; - for (int i = 0 ; i < path->getNumSubpaths() ; ++i ) { -- GfxSubpath *subpath = path->getSubpath(i); -+ const GfxSubpath *subpath = path->getSubpath(i); - if (subpath->getNumPoints() > 0) { - pathString.moveTo(subpath->getX(0), subpath->getY(0)); - int j = 1; |