# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1529856217 -10800
# Node ID 659d94ea297b64ea947732f09851bce7cba3b5fc
# Parent  81b782d366186b3af7fd4261d180972b7b01fce8
Up xgalaga++; fix build: vzctl, vzquota, w3m

diff -r 81b782d36618 -r 659d94ea297b vzctl/stuff/patches/extern.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vzctl/stuff/patches/extern.patch	Sun Jun 24 19:03:37 2018 +0300
@@ -0,0 +1,29 @@
+--- a/src/vzlist.c
++++ b/src/vzlist.c
+@@ -255,7 +255,7 @@
+ 
+ /* Sort functions */
+ 
+-inline int check_empty_param(const void *val1, const void *val2)
++extern inline int check_empty_param(const void *val1, const void *val2)
+ {
+ 	if (val1 == NULL && val2 == NULL)
+ 		return 0;
+@@ -662,7 +662,7 @@
+ 	1 - match
+ 	0 - do not match
+ */
+-inline int check_pattern(char *str, char *pat)
++extern inline int check_pattern(char *str, char *pat)
+ {
+ 	if (pat == NULL)
+ 		return 1;
+@@ -748,7 +748,7 @@
+ 	return;
+ }
+ 
+-inline struct Cveinfo *find_ve(int veid)
++extern inline struct Cveinfo *find_ve(int veid)
+ {
+ 	return (struct Cveinfo *) bsearch(&veid, veinfo, n_veinfo,
+ 			sizeof(struct Cveinfo), id_search_fn);
diff -r 81b782d36618 -r 659d94ea297b vzctl/stuff/patches/series
--- a/vzctl/stuff/patches/series	Sun Jun 24 17:58:25 2018 +0300
+++ b/vzctl/stuff/patches/series	Sun Jun 24 19:03:37 2018 +0300
@@ -1,1 +1,2 @@
 -p1|vzctl-3.0.25.1-Makefile.u
+extern.patch
diff -r 81b782d36618 -r 659d94ea297b vzquota/stuff/patches/extern.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vzquota/stuff/patches/extern.patch	Sun Jun 24 19:03:37 2018 +0300
@@ -0,0 +1,31 @@
+--- a/src/quota_io.c
++++ b/src/quota_io.c
+@@ -39,7 +39,7 @@
+ 
+ #define min(a,b)	(((a) > (b)) ? (b) : (a))
+ 
+-inline int is_dummy_stat(struct dq_stat *stat)
++extern inline int is_dummy_stat(struct dq_stat *stat)
+ {
+ 	return !(stat->bhardlimit || stat->bsoftlimit || stat->bcurrent ||
+ 		stat->ihardlimit || stat->isoftlimit || stat->icurrent);
+@@ -54,7 +54,7 @@
+ }
+ 
+ /* Hash given id */
+-inline unsigned int hash_dquot(unsigned int id)
++extern inline unsigned int hash_dquot(unsigned int id)
+ {
+ 	return ((id ^ (id << 16)) * 997) & (DQUOTHASHSIZE - 1);
+ }
+--- a/src/quotacheck.c
++++ b/src/quotacheck.c
+@@ -31,7 +31,7 @@
+ #include "quotacheck.h"
+ 
+ 
+-inline struct dir * new_dir_entry(const char * item_name)
++extern inline struct dir * new_dir_entry(const char * item_name)
+ {
+ 	struct dir * new_dir = xmalloc(sizeof(struct dir));
+ 	new_dir->name = xstrdup(item_name);
diff -r 81b782d36618 -r 659d94ea297b vzquota/stuff/patches/series
--- a/vzquota/stuff/patches/series	Sun Jun 24 17:58:25 2018 +0300
+++ b/vzquota/stuff/patches/series	Sun Jun 24 19:03:37 2018 +0300
@@ -1,1 +1,2 @@
 -p1|vzquota-3.0.12.u
+extern.patch
diff -r 81b782d36618 -r 659d94ea297b w3m/receipt
--- a/w3m/receipt	Sun Jun 24 17:58:25 2018 +0300
+++ b/w3m/receipt	Sun Jun 24 19:03:37 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="w3m"
 VERSION="0.5.3"
@@ -7,22 +7,24 @@
 MAINTAINER="mojo@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="http://w3m.sourceforge.net"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$PACKAGE/$TARBALL"
-TAGS="web-browser"
 
-DEPENDS="gc openssl ncurses"
-BUILD_DEPENDS="gc gc-dev openssl-dev zlib-dev perl gettext"
+BUILD_DEPENDS="gc-dev openssl10-dev zlib-dev perl gettext"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries"
-       ./configure $CONFIGURE_ARGS && make && make install
+compile_rules() {
+	export CPPFLAGS="$CPPFLAGS -I/usr/include/openssl-1.0"
+	export LDFLAGS="$LDFLAGS -L/usr/lib/openssl-1.0"
+
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/* $fs
+genpkg_rules() {
+	copy @std
+	DEPENDS="gc ncurses openssl10 zlib"
+	SUGGESTED="perl"
+	TAGS="web-browser"
 }
diff -r 81b782d36618 -r 659d94ea297b xgalaga++/.icon.png
Binary file xgalaga++/.icon.png has changed
diff -r 81b782d36618 -r 659d94ea297b xgalaga++/receipt
--- a/xgalaga++/receipt	Sun Jun 24 17:58:25 2018 +0300
+++ b/xgalaga++/receipt	Sun Jun 24 19:03:37 2018 +0300
@@ -1,24 +1,24 @@
 # SliTaz package receipt v2.
 
 PACKAGE="xgalaga++"
-VERSION="0.8.4"
+VERSION="0.9"
 CATEGORY="games"
 SHORT_DESC="A clone of the classic game Galaga for the X Window System"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://marc.mongenet.ch/OSS/XGalaga"
+WEB_SITE="http://marc.mongenet.ch/OSS/XGalaga/"
 
 TARBALL="${PACKAGE}_$VERSION.tar.gz"
-WGET_URL="$WEB_SITE/$TARBALL"
+WGET_URL="http://marc.mongenet.ch/OSS/XGalaga/$TARBALL"
 
-BUILD_DEPENDS="xorg-dev"
+BUILD_DEPENDS="xorg-libX11-dev xorg-libXpm-dev"
 
 compile_rules() {
 	make xgalaga++ &&
-	install -Dm755 $src/xgalaga++ $install/usr/bin/xgalaga++
+	install -Dm755 xgalaga++ $install/usr/bin/xgalaga++
 }
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="xorg-libX11 xorg-libXpm xorg-libxcb xorg-libXau xorg-libXdmcp"
+	DEPENDS="xorg-libX11 xorg-libXpm"
 }
diff -r 81b782d36618 -r 659d94ea297b xgalaga++/stuff/xgalaga++.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xgalaga++/stuff/xgalaga++.desktop	Sun Jun 24 19:03:37 2018 +0300
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+Name=XGalaga++
+Comment=A classic shoot 'em up arcade game inspired by XGalaga
+Exec=xgalaga++
+Icon=xgalaga++
+Categories=Game;ArcadeGame;
diff -r 81b782d36618 -r 659d94ea297b xgalaga++/stuff/xgalaga++.png
Binary file xgalaga++/stuff/xgalaga++.png has changed
diff -r 81b782d36618 -r 659d94ea297b xgalaga/.icon.png
Binary file xgalaga/.icon.png has changed