From 0ed2142653800aad3b76ed4970a45fa0379f4926 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 17 May 2018 23:41:08 +0200 Subject: [PATCH] gimp: fix crossbuild --- srcpkgs/gimp/patches/fix-cross.patch | 18 ++++++++++++++++++ srcpkgs/gimp/template | 25 ++++++++++++++++++++----- 2 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/gimp/patches/fix-cross.patch diff --git a/srcpkgs/gimp/patches/fix-cross.patch b/srcpkgs/gimp/patches/fix-cross.patch new file mode 100644 index 0000000000..f34a548403 --- /dev/null +++ b/srcpkgs/gimp/patches/fix-cross.patch @@ -0,0 +1,18 @@ +--- plug-ins/script-fu/Makefile.am.orig 2018-05-18 00:03:53.095184079 +0200 ++++ plug-ins/script-fu/Makefile.am 2018-05-18 00:04:50.184762769 +0200 +@@ -14,6 +14,7 @@ else + libm = -lm + endif + ++libgimpmodule = $(top_builddir)/libgimpmodule/libgimpmodule-$(GIMP_API_VERSION).la + libgimpui = $(top_builddir)/libgimp/libgimpui-$(GIMP_API_VERSION).la + libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la + libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la +@@ -85,6 +86,7 @@ script_fu_SOURCES = \ + scheme-wrapper.h + + LDADD = \ ++ $(libgimpmodule) \ + $(libgimpui) \ + $(libgimpwidgets) \ + $(libgimpconfig) \ diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template index f19b0d72bd..baf7d4504a 100644 --- a/srcpkgs/gimp/template +++ b/srcpkgs/gimp/template @@ -4,12 +4,13 @@ version=2.10.0 revision=1 lib32disabled=yes build_style=gnu-configure -hostmakedepends="pkg-config intltool gettext-devel" +hostmakedepends="automake gegl gettext-devel glib-devel gtk+3-devel intltool libtool + pkg-config pygtk-devel" makedepends="aalib-devel alsa-lib-devel babl-devel dbus-glib-devel gegl-devel - ghostscript-devel glib-devel jasper-devel json-glib-devel lcms-devel - libXcursor-devel libXpm-devel libgexiv2-devel libgudev-devel - libmng-devel libmypaint-devel libopenexr-devel librsvg-devel libwmf-devel - mypaint-brushes poppler-glib-devel pygtk-devel webkitgtk2-devel" + ghostscript-devel jasper-devel lcms-devel libXcursor-devel libXpm-devel + libgexiv2-devel libgudev-devel libmng-devel libmypaint-devel + libopenexr-devel librsvg-devel libwmf-devel mypaint-brushes + poppler-glib-devel pygtk-devel webkitgtk2-devel" depends="desktop-file-utils gegl hicolor-icon-theme iso-codes mypaint-brushes" short_desc="The GNU image manipulation program" @@ -20,6 +21,20 @@ homepage="https://www.gimp.org" distfiles="https://download.gimp.org/pub/gimp/v${version%.*}/gimp-${version}.tar.bz2" checksum=7fcc96fb88cb0a0595d2610f63a15dec245bb37bf9db527d37a24fb75e547de2 +pre_configure() { + NOCONFIGURE=1 autoreconf -fi + if [ "$CROSS_BUILD" ]; then + sed -i 's:^py_prefix=`:py_prefix='"$XBPS_CROSS_BASE"'`:' configure + fi +} + +pre_build() { + if [ "$CROSS_BUILD" ]; then + make -C tools invert-svg \ + CFLAGS_FOR_BUILD="$BUILD_CFLAGS -fPIE -I/usr/lib/glib-2.0/include -I/usr/lib/glib-2.0" + fi +} + libgimp_package() { short_desc+=" - runtime libraries" pkg_install() {