Crude fix for pango 1.44 compatibility.

3 files changed, 35 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 51226763eca0..1d48499225ea 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = inkscape-git
 	pkgdesc = An Open Source vector graphics editor, using SVG file format, from git master
-	pkgver = 1.0+devel.r2.g6edc3e959f
+	pkgver = 1.0+devel.r333.g278d08bb15
 	pkgrel = 1
 	epoch = 2
 	url = https://gitlab.com/inkscape/inkscape
@@ -42,7 +42,9 @@ pkgbase = inkscape-git
 	options = !libtool
 	options = !buildflags
 	source = inkscape.git::git+https://gitlab.com/inkscape/inkscape.git
+	source = pango-144.patch
 	sha1sums = SKIP
+	sha1sums = c2ec5c0809a4d3a98ac0df8637a8c8d86229911c
 
 pkgname = inkscape-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 8ca6f582a8ac..04538b22a7ec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Co-Maintainer: bartus <arch-user-repo@bartus.33mail.com>
 
 pkgname=inkscape-git
-pkgver=1.0+devel.r2.g6edc3e959f
+pkgver=1.0+devel.r333.g278d08bb15
 pkgrel=1
 epoch=2
 pkgdesc="An Open Source vector graphics editor, using SVG file format, from git master"
@@ -21,8 +21,10 @@ makedepends=('cmake' 'boost' 'intltool' 'git' 'gettext' 'pango' 'python' 'fontco
 provides=('inkscape')
 conflicts=('inkscape')
 options=('!libtool' '!buildflags')
-source=("inkscape.git::git+$url.git")
-sha1sums=('SKIP')
+source=("inkscape.git::git+$url.git"
+	pango-144.patch)
+sha1sums=('SKIP'
+          'c2ec5c0809a4d3a98ac0df8637a8c8d86229911c')
 _gitname="inkscape.git"
 
 pkgver() {
@@ -33,6 +35,7 @@ pkgver() {
 prepare() {
   cd "$_gitname"
   git submodule update --init --recursive
+  git apply -v ${srcdir}/*.patch
 }
 
 build() {
@@ -40,6 +43,7 @@ build() {
   [[ -d build ]] || mkdir build
   cd build
   export PKG_CONFIG_PATH="/usr/lib/imagemagick6/pkgconfig"
+  export CXXFLAGS="${CXXFLAGS} -fpermissive"
   cmake .. \
 	-DCMAKE_INSTALL_PREFIX=/usr \
 	-DCMAKE_BUILD_TYPE=RELEASE 
diff --git a/pango-144.patch b/pango-144.patch
new file mode 100644
index 000000000000..e4172564e2dd
--- /dev/null
+++ b/pango-144.patch
@@ -0,0 +1,25 @@
+diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp
+index 4464742dd3..c413920d1f 100644
+--- a/src/extension/internal/cairo-render-context.cpp
++++ b/src/extension/internal/cairo-render-context.cpp
+@@ -1756,7 +1756,7 @@ CairoRenderContext::renderGlyphtext(PangoFont *font, Geom::Affine const &font_ma
+     if(font_table.find(fonthash)!=font_table.end())
+         font_face = font_table[fonthash];
+ 
+-    FcPattern *fc_pattern = nullptr;
++//    FcPattern *fc_pattern = nullptr;
+ 
+ #ifdef USE_PANGO_WIN32
+ # ifdef CAIRO_HAS_WIN32_FONT
+@@ -1775,9 +1775,9 @@ CairoRenderContext::renderGlyphtext(PangoFont *font, Geom::Affine const &font_ma
+ #else
+ # ifdef CAIRO_HAS_FT_FONT
+     PangoFcFont *fc_font = PANGO_FC_FONT(font);
+-    fc_pattern = fc_font->font_pattern;
++//    fc_pattern = fc_font->pattern;
+     if(font_face == nullptr) {
+-        font_face = cairo_ft_font_face_create_for_pattern(fc_pattern);
++//        font_face = cairo_ft_font_face_create_for_pattern(fc_pattern);
+         font_table[fonthash] = font_face;
+     }
+ # endif