From 248cd7c9d1667e3b9a138f8905b0e327cad310e6 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Sat, 7 Nov 2020 10:15:18 -0600 Subject: [PATCH] bluefish: update to 2.2.12 Set python to version 3 and as default option. Locally, cross-build worked fine with it --- srcpkgs/bluefish/template | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/srcpkgs/bluefish/template b/srcpkgs/bluefish/template index 3458bd484b3..62c17b4e891 100644 --- a/srcpkgs/bluefish/template +++ b/srcpkgs/bluefish/template @@ -1,6 +1,6 @@ # Template file for 'bluefish' pkgname=bluefish -version=2.2.11 +version=2.2.12 revision=1 build_style=gnu-configure configure_args="--enable-spell-check --disable-update-databases @@ -11,29 +11,20 @@ hostmakedepends="pkg-config intltool gdk-pixbuf-devel libxml2-devel makedepends="libxml2-devel gtk+3-devel enchant2-devel gucharmap-devel $(vopt_if python python-devel)" depends="hicolor-icon-theme desktop-file-utils xmlcatmgr - $(vopt_if python python)" + $(vopt_if python python3)" short_desc="Powerful HTML editor for experienced web designers and programmers" maintainer="Orphaned " license="GPL-3.0-only" homepage="http://bluefish.openoffice.nl/" distfiles="http://www.bennewitz.com/bluefish/stable/source/bluefish-${version}.tar.bz2" -checksum=454c877fc1dbddfcc65cc7ddaa3c5ceb17bc46e216baf7878f09dbf1dabdc2ff -python_version=2 #unverified +checksum=0df9905ba2c601cd767fa53e147969e9c90bc0cc4c005c4011c150b248979e6a +python_version=3 lib32disabled=yes xml_entries="nextCatalog /usr/share/xml/bluefish/catalog.xml --" -pre_configure() { - sed -e 's|\[enchant\]|\[enchant-2\]|g' \ - -e 's|\[enchant >|\[enchant-2 >|g' \ - -e 's|enchant/enchant.h|enchant-2/enchant.h|g' \ - -e 's|BF_dependencies enchant|BF_dependencies enchant-2|g' \ - -i configure.ac +build_options="python" +build_options_default="python" +pre_configure() { autoreconf -fi } - -# XXX python option broken with cross compilation -build_options="python" -if [ -z "$CROSS_BUILD" ]; then - build_options_default="python" -fi