wok-next rev 20853
Up xgalaga++; fix build: vzctl, vzquota, w3m
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Sun Jun 24 19:03:37 2018 +0300 (2018-06-24) |
| parents | 81b782d36618 |
| children | 78e2f02bcc8c |
| files | vzctl/stuff/patches/extern.patch vzctl/stuff/patches/series vzquota/stuff/patches/extern.patch vzquota/stuff/patches/series w3m/receipt xgalaga++/.icon.png xgalaga++/receipt xgalaga++/stuff/xgalaga++.desktop xgalaga++/stuff/xgalaga++.png xgalaga/.icon.png |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/vzctl/stuff/patches/extern.patch Sun Jun 24 19:03:37 2018 +0300 1.3 @@ -0,0 +1,29 @@ 1.4 +--- a/src/vzlist.c 1.5 ++++ b/src/vzlist.c 1.6 +@@ -255,7 +255,7 @@ 1.7 + 1.8 + /* Sort functions */ 1.9 + 1.10 +-inline int check_empty_param(const void *val1, const void *val2) 1.11 ++extern inline int check_empty_param(const void *val1, const void *val2) 1.12 + { 1.13 + if (val1 == NULL && val2 == NULL) 1.14 + return 0; 1.15 +@@ -662,7 +662,7 @@ 1.16 + 1 - match 1.17 + 0 - do not match 1.18 + */ 1.19 +-inline int check_pattern(char *str, char *pat) 1.20 ++extern inline int check_pattern(char *str, char *pat) 1.21 + { 1.22 + if (pat == NULL) 1.23 + return 1; 1.24 +@@ -748,7 +748,7 @@ 1.25 + return; 1.26 + } 1.27 + 1.28 +-inline struct Cveinfo *find_ve(int veid) 1.29 ++extern inline struct Cveinfo *find_ve(int veid) 1.30 + { 1.31 + return (struct Cveinfo *) bsearch(&veid, veinfo, n_veinfo, 1.32 + sizeof(struct Cveinfo), id_search_fn);
2.1 --- a/vzctl/stuff/patches/series Sun Jun 24 17:58:25 2018 +0300 2.2 +++ b/vzctl/stuff/patches/series Sun Jun 24 19:03:37 2018 +0300 2.3 @@ -1,1 +1,2 @@ 2.4 -p1|vzctl-3.0.25.1-Makefile.u 2.5 +extern.patch
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/vzquota/stuff/patches/extern.patch Sun Jun 24 19:03:37 2018 +0300 3.3 @@ -0,0 +1,31 @@ 3.4 +--- a/src/quota_io.c 3.5 ++++ b/src/quota_io.c 3.6 +@@ -39,7 +39,7 @@ 3.7 + 3.8 + #define min(a,b) (((a) > (b)) ? (b) : (a)) 3.9 + 3.10 +-inline int is_dummy_stat(struct dq_stat *stat) 3.11 ++extern inline int is_dummy_stat(struct dq_stat *stat) 3.12 + { 3.13 + return !(stat->bhardlimit || stat->bsoftlimit || stat->bcurrent || 3.14 + stat->ihardlimit || stat->isoftlimit || stat->icurrent); 3.15 +@@ -54,7 +54,7 @@ 3.16 + } 3.17 + 3.18 + /* Hash given id */ 3.19 +-inline unsigned int hash_dquot(unsigned int id) 3.20 ++extern inline unsigned int hash_dquot(unsigned int id) 3.21 + { 3.22 + return ((id ^ (id << 16)) * 997) & (DQUOTHASHSIZE - 1); 3.23 + } 3.24 +--- a/src/quotacheck.c 3.25 ++++ b/src/quotacheck.c 3.26 +@@ -31,7 +31,7 @@ 3.27 + #include "quotacheck.h" 3.28 + 3.29 + 3.30 +-inline struct dir * new_dir_entry(const char * item_name) 3.31 ++extern inline struct dir * new_dir_entry(const char * item_name) 3.32 + { 3.33 + struct dir * new_dir = xmalloc(sizeof(struct dir)); 3.34 + new_dir->name = xstrdup(item_name);
4.1 --- a/vzquota/stuff/patches/series Sun Jun 24 17:58:25 2018 +0300 4.2 +++ b/vzquota/stuff/patches/series Sun Jun 24 19:03:37 2018 +0300 4.3 @@ -1,1 +1,2 @@ 4.4 -p1|vzquota-3.0.12.u 4.5 +extern.patch
5.1 --- a/w3m/receipt Sun Jun 24 17:58:25 2018 +0300 5.2 +++ b/w3m/receipt Sun Jun 24 19:03:37 2018 +0300 5.3 @@ -1,4 +1,4 @@ 5.4 -# SliTaz package receipt. 5.5 +# SliTaz package receipt v2. 5.6 5.7 PACKAGE="w3m" 5.8 VERSION="0.5.3" 5.9 @@ -7,22 +7,24 @@ 5.10 MAINTAINER="mojo@slitaz.org" 5.11 LICENSE="MIT" 5.12 WEB_SITE="http://w3m.sourceforge.net" 5.13 + 5.14 TARBALL="$PACKAGE-$VERSION.tar.gz" 5.15 WGET_URL="$SF_MIRROR/$PACKAGE/$PACKAGE/$TARBALL" 5.16 -TAGS="web-browser" 5.17 5.18 -DEPENDS="gc openssl ncurses" 5.19 -BUILD_DEPENDS="gc gc-dev openssl-dev zlib-dev perl gettext" 5.20 +BUILD_DEPENDS="gc-dev openssl10-dev zlib-dev perl gettext" 5.21 5.22 -# Rules to configure and make the package. 5.23 -compile_rules() 5.24 -{ 5.25 - export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries" 5.26 - ./configure $CONFIGURE_ARGS && make && make install 5.27 +compile_rules() { 5.28 + export CPPFLAGS="$CPPFLAGS -I/usr/include/openssl-1.0" 5.29 + export LDFLAGS="$LDFLAGS -L/usr/lib/openssl-1.0" 5.30 + 5.31 + ./configure $CONFIGURE_ARGS && 5.32 + make && 5.33 + make install 5.34 } 5.35 5.36 -# Rules to gen a SliTaz package suitable for Tazpkg. 5.37 -genpkg_rules() 5.38 -{ 5.39 - cp -a $install/* $fs 5.40 +genpkg_rules() { 5.41 + copy @std 5.42 + DEPENDS="gc ncurses openssl10 zlib" 5.43 + SUGGESTED="perl" 5.44 + TAGS="web-browser" 5.45 }
6.1 Binary file xgalaga++/.icon.png has changed
7.1 --- a/xgalaga++/receipt Sun Jun 24 17:58:25 2018 +0300 7.2 +++ b/xgalaga++/receipt Sun Jun 24 19:03:37 2018 +0300 7.3 @@ -1,24 +1,24 @@ 7.4 # SliTaz package receipt v2. 7.5 7.6 PACKAGE="xgalaga++" 7.7 -VERSION="0.8.4" 7.8 +VERSION="0.9" 7.9 CATEGORY="games" 7.10 SHORT_DESC="A clone of the classic game Galaga for the X Window System" 7.11 MAINTAINER="pascal.bellard@slitaz.org" 7.12 LICENSE="GPL2" 7.13 -WEB_SITE="http://marc.mongenet.ch/OSS/XGalaga" 7.14 +WEB_SITE="http://marc.mongenet.ch/OSS/XGalaga/" 7.15 7.16 TARBALL="${PACKAGE}_$VERSION.tar.gz" 7.17 -WGET_URL="$WEB_SITE/$TARBALL" 7.18 +WGET_URL="http://marc.mongenet.ch/OSS/XGalaga/$TARBALL" 7.19 7.20 -BUILD_DEPENDS="xorg-dev" 7.21 +BUILD_DEPENDS="xorg-libX11-dev xorg-libXpm-dev" 7.22 7.23 compile_rules() { 7.24 make xgalaga++ && 7.25 - install -Dm755 $src/xgalaga++ $install/usr/bin/xgalaga++ 7.26 + install -Dm755 xgalaga++ $install/usr/bin/xgalaga++ 7.27 } 7.28 7.29 genpkg_rules() { 7.30 copy @std 7.31 - DEPENDS="xorg-libX11 xorg-libXpm xorg-libxcb xorg-libXau xorg-libXdmcp" 7.32 + DEPENDS="xorg-libX11 xorg-libXpm" 7.33 }
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 8.2 +++ b/xgalaga++/stuff/xgalaga++.desktop Sun Jun 24 19:03:37 2018 +0300 8.3 @@ -0,0 +1,7 @@ 8.4 +[Desktop Entry] 8.5 +Type=Application 8.6 +Name=XGalaga++ 8.7 +Comment=A classic shoot 'em up arcade game inspired by XGalaga 8.8 +Exec=xgalaga++ 8.9 +Icon=xgalaga++ 8.10 +Categories=Game;ArcadeGame;
9.1 Binary file xgalaga++/stuff/xgalaga++.png has changed
10.1 Binary file xgalaga/.icon.png has changed