# HG changeset patch
# User Xander Ziiryanoff <psychomaniak@xakep.ru>
# Date 1413827934 -7200
# Node ID 3ba86ab5ebce28bbbd81e5240fbe5a66dfc6da2c
# Parent  4abd910b5ea93a98af5230375cd8b3b8c9805f5f
mc: patch syntax-hl,add subox launcher; pango: fix path

diff -r 4abd910b5ea9 -r 3ba86ab5ebce QtWeb/receipt
--- a/QtWeb/receipt	Mon Oct 20 12:52:14 2014 +0200
+++ b/QtWeb/receipt	Mon Oct 20 19:58:54 2014 +0200
@@ -36,7 +36,7 @@
 	sed -i 's/NTFS Disk Tools/WebkitVideo/' $RTOOLBAR
 	sed -i "15,29d" $RTOOLBAR
 	
-	qmake && sed -i 's/-O2/-Os/g' Makefile && make $MAKEFLAGS
+	qmake && sed -i 's|-O2|'"$CFLAGS"'|g' Makefile && make $MAKEFLAGS
 	mkdir -p $install
 	install $src/src/$PACKAGE $install/$PACKAGE
 	rm -rf  $src/src/$PACKAGE
@@ -75,6 +75,9 @@
 showPreferences=true
 showCompatibility=false
 showDisableJavascript=true
+[websettings]
+fixedFont=Monospace
+standardFont=Sans Serif
 EOT
 
 	for i in $(ls $1/home 2> /dev/null); do
diff -r 4abd910b5ea9 -r 3ba86ab5ebce mc/receipt
--- a/mc/receipt	Mon Oct 20 12:52:14 2014 +0200
+++ b/mc/receipt	Mon Oct 20 19:58:54 2014 +0200
@@ -14,10 +14,13 @@
 SUGGESTED="gpm"
 DEPENDS="ncursesw glib e2fsprogs"
 BUILD_DEPENDS="gpm-dev glib-dev ncursesw-dev"
+GENERIC_MENUS="no"
 
 # Rules to configure and make the package.
 compile_rules()
 {
+	sed 's#|profile|#&receipt|#' -i $src/misc/syntax/Syntax
+
 	./configure \
 		--prefix=/usr \
 		--with-gpm-mouse \
@@ -28,12 +31,15 @@
 	make && make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
+# Rules to gen a SliTaz package suitable for Tazpkg. --enable-vfs-sftp
 genpkg_rules()
 {
-	mkdir -p $fs/usr/share
+	mkdir -p $fs/usr/share/applications
 	cp -a $install/etc $fs/
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/lib $fs/usr
 	cp -a $install/usr/share/mc $fs/usr/share
+
+	cp -a $stuff/*.desktop $fs/usr/share/applications
+	chown -R root:root $fs
 }
diff -r 4abd910b5ea9 -r 3ba86ab5ebce pango-dev/receipt
--- a/pango-dev/receipt	Mon Oct 20 12:52:14 2014 +0200
+++ b/pango-dev/receipt	Mon Oct 20 19:58:54 2014 +0200
@@ -24,5 +24,5 @@
 		cp -a $install/usr/share/gir-1.0 $fs/usr/share
     cp -a $install/usr/include $fs/usr
     cp -a $install/usr/lib/pango $fs/usr/lib
-    rm -rf $fs/usr/lib/pango/1.6.0/modules/*.so
+    rm -rf $fs/usr/lib/pango/1.8.0/modules/*.so
 }
diff -r 4abd910b5ea9 -r 3ba86ab5ebce pango/receipt
--- a/pango/receipt	Mon Oct 20 12:52:14 2014 +0200
+++ b/pango/receipt	Mon Oct 20 19:58:54 2014 +0200
@@ -44,7 +44,7 @@
     cp -a $install/usr/bin/* $fs/usr/bin
     cp -a $install/usr/lib/*.so* $fs/usr/lib
     cp -a $install/usr/lib/pango $fs/usr/lib
-    rm -rf $fs/usr/lib/pango/1.6.0/modules/*.la
+    rm -rf $fs/usr/lib/pango/1.8.0/modules/*.la
     [ -d "$install/etc" ] && cp -a $install/etc $fs
     touch $fs/etc/pango/pango.modules
 }
diff -r 4abd910b5ea9 -r 3ba86ab5ebce qt4-examples/receipt
--- a/qt4-examples/receipt	Mon Oct 20 12:52:14 2014 +0200
+++ b/qt4-examples/receipt	Mon Oct 20 19:58:54 2014 +0200
@@ -10,7 +10,7 @@
 TAGS="qt"
 
 DEPENDS="libQtCore libQtGui"
-BUILD_DEPENDS="Qt4-dev qmake cmake xorg-libX11-dev"
+BUILD_DEPENDS="Qt4-dev qmake"
 
 # Rules to configure and make the package.
 compile_rules()
@@ -19,15 +19,17 @@
 
 	for i in desktop/screenshot dialogs/findfiles widgets/charactermap;
 	do
-		cd $WOK/qt4/source/qt4-$VERSION/examples/$i
+                ii=$(basename $i) && cd $WOK/qt4/source/qt4-$VERSION/examples/$i
 		rm -rf Makefile moc* *.o
-		qmake ${i:8}.pro
+		qmake	$ii.pro
 		sed 's|-O2|'"$CFLAGS"'|' -i Makefile
 		make $MAKEFLAGS &&
-		install ${i:8} $DESTDIR/usr/bin
-		install ${i:8}.desktop $DESTDIR/usr/share/applications
+		install $ii $DESTDIR/usr/bin
+		install $ii.desktop $DESTDIR/usr/share/applications
+		find $install -name $ii.desktop \
+		-exec echo 'Categories=Utility;'>>$install/usr/share/applications/$ii.desktop \; \
+		-exec sed 's|/opt/|/|g' -i {} \;
 	done
-	find $install -name *.desktop -exec sed 's|/opt/|/|g' -i {} \;
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.