[lilac] updated to 6667.e866497fe-2

4 files changed, 67 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 87ba05bff346..a683b9280785 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = dia-git
 	pkgdesc = A GTK+ based diagram creation program (GIT VERSION)
-	pkgver = 6621.bda0a93c
-	pkgrel = 1
+	pkgver = 6667.e866497fe
+	pkgrel = 2
 	url = http://live.gnome.org/Dia
 	arch = x86_64
 	license = GPL
@@ -10,20 +10,23 @@ pkgbase = dia-git
 	makedepends = meson
 	makedepends = intltool
 	makedepends = dblatex
+	makedepends = python
 	makedepends = docbook-xsl
+	depends = poppler
+	depends = python
 	depends = libxslt
 	depends = gtk2
-	depends = python
-	depends = poppler
+	depends = freetype2
+	depends = python2
 	depends = graphene
+	optdepends = python2
 	provides = dia
 	conflicts = dia
 	options = docs
 	options = !emptydirs
 	source = git+https://gitlab.gnome.org/GNOME/dia.git
-	source = poppler_fix.patch
-	sha256sums = SKIP
-	sha256sums = e3e80a5770e91110a47f3da1eaeab8f692408899aead71ff7c3726369ef9fa4c
+	source = pdf-import.patch
+	md5sums = SKIP
+	md5sums = dbf8336aeaa854be4a60d4588c8fb0b2
 
 pkgname = dia-git
-
diff --git a/PKGBUILD b/PKGBUILD
index df2b81e0be87..a637f1a45b4f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,53 @@
-# Contributor: Thorsten Töpper <atsutane-tu@freethoughts.de>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Gregor Ibic <gregor.ibic@intelicom.si>
-# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
 
 pkgname=dia-git
-pkgver=6621.bda0a93c
-pkgrel=1
+_pkgname=dia
+pkgver=6667.e866497fe
+pkgrel=2
 pkgdesc="A GTK+ based diagram creation program (GIT VERSION)"
 arch=('x86_64')
 license=('GPL')
 url="http://live.gnome.org/Dia"
-depends=('libxslt' 'gtk2' 'python' 'poppler' 'graphene')
-makedepends=('git' 'cmake' 'meson' 'intltool' 'dblatex' 'docbook-xsl')
+depends=('poppler' 'python' 'libxslt' 'gtk2' 'freetype2' 'python2' 'graphene')
+makedepends=('git' 'cmake' 'meson' 'intltool' 'dblatex' 'python' 'docbook-xsl')
+optdepends=('python2')
 provides=('dia')
 conflicts=('dia')
 options=('docs' '!emptydirs')
-source=("git+https://gitlab.gnome.org/GNOME/dia.git" poppler_fix.patch)
-sha256sums=('SKIP'
-            'e3e80a5770e91110a47f3da1eaeab8f692408899aead71ff7c3726369ef9fa4c')
-
-prepare() {
-  cd ${pkgname%-git}
-  git apply "$srcdir"/poppler_fix.patch
-}
+source=("git+https://gitlab.gnome.org/GNOME/dia.git" "pdf-import.patch")
+md5sums=('SKIP' 'dbf8336aeaa854be4a60d4588c8fb0b2')
 
 pkgver() {
-  cd ${pkgname%-git}
+  cd "${srcdir}/${_pkgname}"
   printf "%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
+prepare() {
+  cd "${srcdir}/${_pkgname}"
+  for file in `find -type f -name '*.py'`; do
+      sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' "$file"
+  done
+  sed -i "s/cc.find_library('emf'/cc.find_library('EMF'/g" meson.build
+  sed -i "s/cc.find_library('ogdf'/cc.find_library('OGDF'/g" meson.build
+  sed -i 's/python23/python3/g' build-aux/*.py
+  sed -i 's|#include "tool-icons.h"||g' objects/standard/outline.c
+  sed -i 's/22.0.0/99.0.0/g' meson.build
+  sed -i '/  sheet,/d' sheets/meson.build
+  patch -p0 < ../pdf-import.patch
+}
+
 build() {
-  cd ${pkgname%-git}
-  meson --prefix /usr --buildtype=plain  . build 
+  cd "${srcdir}/${_pkgname}"
+
+  export PYTHON=/usr/bin/python2
+  arch-meson . build
   ninja -j1 -C build
 }
 
 package() {
-  cd ${pkgname%-git}
+  cd "${srcdir}/${_pkgname}"
   DESTDIR="${pkgdir}" ninja -C build install
 }
diff --git a/pdf-import.patch b/pdf-import.patch
new file mode 100644
index 000000000000..fa8b5def0b21
--- /dev/null
+++ b/pdf-import.patch
@@ -0,0 +1,26 @@
+--- plug-ins/pdf/pdf-import.cpp	2022-03-12 08:17:49.242369295 +0800
++++ plug-ins/pdf/pdf-import.cpp	2022-03-12 08:19:04.302435181 +0800
+@@ -867,11 +867,11 @@ extern "C"
+ gboolean
+ import_pdf(const gchar *filename, DiagramData *dia, DiaContext *ctx, void* user_data)
+ {
+-  PDFDoc *doc;
++  std::unique_ptr<PDFDoc> doc;
+   GooString *fileName = new GooString(filename);
+   // no passwords yet
+-  GooString *ownerPW = NULL;
+-  GooString *userPW = NULL;
++  const std::optional<GooString> ownerPW;
++  const std::optional<GooString> userPW;
+   gboolean ret = FALSE;
+ 
+   // without this we will get strange crashes (at least with /O2 build)
+@@ -899,7 +899,7 @@ import_pdf(const gchar *filename, Diagra
+     delete diaOut;
+     ret = TRUE;
+   }
+-  delete doc;
++  doc.reset();
+   delete fileName;
+ 
+   return ret;
diff --git a/poppler_fix.patch b/poppler_fix.patch
deleted file mode 100644
index 21358e1d6b78..000000000000
--- a/poppler_fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/plug-ins/pdf/pdf-import.cpp b/plug-ins/pdf/pdf-import.cpp
-index 15100bc6..c45cf452 100644
---- a/plug-ins/pdf/pdf-import.cpp
-+++ b/plug-ins/pdf/pdf-import.cpp
-@@ -857,7 +857,7 @@ extern "C"
- gboolean
- import_pdf(const gchar *filename, DiagramData *dia, DiaContext *ctx, void* user_data)
- {
--  PDFDoc *doc;
-+  std::unique_ptr<PDFDoc> doc;
-   GooString *fileName = new GooString(filename);
-   // no passwords yet
-   GooString *ownerPW = NULL;
-@@ -889,7 +889,7 @@ import_pdf(const gchar *filename, DiagramData *dia, DiaContext *ctx, void* user_
-     delete diaOut;
-     ret = TRUE;
-   }
--  delete doc;
-+  doc.reset();
-   delete fileName;
- 
-   return ret;