# HG changeset patch
# User Hans-G?nter Theisgen
# Date 1560438634 -3600
# Node ID b2bca81a399e79a61134f31f1b0009ba85aa2878
# Parent  1377136ab0ffa1547cb2a2a5d7e1ac7305909c14
updated qedit (2.6.8 -> 2.8.3)

diff -r 1377136ab0ff -r b2bca81a399e qedit/receipt
--- a/qedit/receipt	Thu Jun 13 16:11:30 2019 +0200
+++ b/qedit/receipt	Thu Jun 13 16:10:34 2019 +0100
@@ -1,25 +1,32 @@
 # SliTaz package receipt.
 
 PACKAGE="qedit"
-VERSION="2.6.8"
+VERSION="2.8.3"
 CATEGORY="editors"
-SHORT_DESC="Code editor"
+TAGS="text-editor"
+SHORT_DESC="Code editor."
 MAINTAINER="psychomaniak@xakep.ru"
 LICENSE="GPL2"
 WEB_SITE="http://hugo.pereira.free.fr/software"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/tgz/$TARBALL"
-TAGS="text-editor"
 
-DEPENDS="libQtGui libQtDBus libQtNetwork xcb-util-keysyms"
-BUILD_DEPENDS="Qt4-dev cmake qmake xcb-util-keysyms-dev"
+DEPENDS="gcc83-lib-base libQtDBus libQtGui libQtNetwork xcb-util-keysyms"
+BUILD_DEPENDS="cmake gcc83 qmake Qt4-dev xcb-util-keysyms-dev"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	patch $src/patterns/shell_patterns.xml $stuff/strvar_color_slitaz
-	cd $src && cmake -DCMAKE_INSTALL_PREFIX=/usr . &&
-	make && make DESTDIR=$DESTDIR install
+	patch $src/patterns/shell_patterns.xml \
+		$stuff/strvar_color_slitaz
+
+	export	CC=gcc-83
+	export	CXX=g++-83
+
+	cmake -DCMAKE_INSTALL_PREFIX=/usr . &&
+	make &&
+	make DESTDIR=$DESTDIR install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r 1377136ab0ff -r b2bca81a399e qedit/stuff/strvar_color_slitaz
--- a/qedit/stuff/strvar_color_slitaz	Thu Jun 13 16:11:30 2019 +0200
+++ b/qedit/stuff/strvar_color_slitaz	Thu Jun 13 16:10:34 2019 +0100
@@ -45,11 +45,11 @@
    </keyword_pattern>
    <keyword_pattern style="Keyword" parent="" name="Braces" >
     <comments></comments>
-@@ -86,7 +90,7 @@
+@@ -90,7 +90,7 @@
    </keyword_pattern>
    <keyword_pattern style="Function" parent="" name="Function" >
     <comments></comments>
--   <keyword>(\b|XML_AND)([^\s]+)\s*(?=\()</keyword>
+-   <keyword>(\b|&amp;)([^\s]+)\s*(?=\()</keyword>
 +   <keyword>(\b|XML_AND)([^\s]+)\s*(?=\()|sed|patch|(end)?if|fi|case|esac|for(each)?|do(ne)?|break|end|EOT</keyword>
    </keyword_pattern>