wok-next rev 21121
Up libfilezilla, filezilla, wxhexeditor, libarchive, ntop, pugixml, rapidsvn, serf, xchm
line diff
1.1 Binary file filezilla/.icon.png has changed
2.1 --- a/filezilla/receipt Mon Jan 14 04:27:33 2019 +0200 2.2 +++ b/filezilla/receipt Mon Jan 14 05:10:43 2019 +0200 2.3 @@ -1,7 +1,7 @@ 2.4 # SliTaz package receipt v2. 2.5 2.6 PACKAGE="filezilla" 2.7 -VERSION="3.7.3" 2.8 +VERSION="3.39.0" 2.9 CATEGORY="network" 2.10 SHORT_DESC="FTP Client" 2.11 MAINTAINER="devel@slitaz.org" 2.12 @@ -9,24 +9,27 @@ 2.13 WEB_SITE="https://filezilla-project.org/" 2.14 2.15 TARBALL="FileZilla_${VERSION}_src.tar.bz2" 2.16 -WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 2.17 +WGET_URL="https://download.filezilla-project.org/client/$TARBALL" 2.18 +TARBALL_SHA1="a8e8b1f4090def74b45bc29d4835e0247b211176" 2.19 2.20 -BUILD_DEPENDS="xdg-utils gettext-dev wxWidgets28-dev gnutls-dev libidn-dev \ 2.21 -sqlite3-dev" 2.22 +BUILD_DEPENDS="libfilezilla-dev wxwidgets-dev cppunit-dev gnutls-dev \ 2.23 +pugixml-dev dbus-dev xdg-utils gtk2-dev sqlite3-dev gettext-dev" 2.24 +SPLIT="$PACKAGE-noarch" 2.25 + 2.26 +COPY_std="bin/" 2.27 +COPY_noarch="@std @rm" 2.28 + 2.29 +CAT_noarch="network|architecture-agnostic files" 2.30 + 2.31 +DEPENDS_std="$PACKAGE-noarch dbus glib gtk2 libfilezilla libgnutls libsqlite3 \ 2.32 +nettle pugixml wxwidgets" 2.33 +DEPENDS_noarch=" " 2.34 + 2.35 +TAGS="FTP client" 2.36 2.37 compile_rules() { 2.38 - ./configure \ 2.39 - --with-tinyxml=builtin \ 2.40 - --without-dbus \ 2.41 - $CONFIGURE_ARGS && 2.42 + ./configure $CONFIGURE_ARGS && 2.43 fix libtool && 2.44 make && 2.45 - make DESTDIR=$install install 2.46 + make install 2.47 } 2.48 - 2.49 -genpkg_rules() { 2.50 - copy @std 2.51 - rm -rf $fs/usr/share/fileszilla/docs 2.52 - DEPENDS="wxWidgets28 gnutls libidn libxxf86vm libtasn1 sqlite3" 2.53 - TAGS="ftp client" 2.54 -}
3.1 --- a/libarchive/receipt Mon Jan 14 04:27:33 2019 +0200 3.2 +++ b/libarchive/receipt Mon Jan 14 05:10:43 2019 +0200 3.3 @@ -11,30 +11,23 @@ 3.4 3.5 TARBALL="$PACKAGE-$VERSION.tar.gz" 3.6 WGET_URL="${WEB_SITE}downloads/$TARBALL" 3.7 +TARBALL_SHA1="499a8f48a895faff4151d7398b24070d578f0b2e" 3.8 3.9 BUILD_DEPENDS="e2fsprogs-dev zlib-dev bzip2-dev gettext-dev lz4-dev zstd-dev \ 3.10 -xz-dev lzo-dev libxml2-dev expat-dev attr-dev acl-dev nettle-dev openssl-dev" 3.11 +xz-dev lzo-dev libxml2-dev expat-dev attr-dev acl-dev openssl-dev" # nettle-dev 3.12 SPLIT="$PACKAGE-dev" 3.13 3.14 +DEPENDS_std="acl libbzip2 liblz4 liblzma libxml2 libzstd openssl zlib" 3.15 +DEPENDS_dev="$PACKAGE acl-dev bzip2-dev libxml2-dev lz4-dev openssl-dev xz-dev \ 3.16 +zlib-dev zstd-dev" 3.17 + 3.18 compile_rules() { 3.19 + # --without-nettle: choose between nettle and openssl 3.20 ./configure \ 3.21 --disable-static \ 3.22 + --without-nettle \ 3.23 $CONFIGURE_ARGS && 3.24 fix libtool && 3.25 make && 3.26 - make -j1 DESTDIR=$install install 3.27 + make install 3.28 } 3.29 - 3.30 -genpkg_rules() { 3.31 - case $PACKAGE in 3.32 - libarchive) 3.33 - copy @std 3.34 - DEPENDS="acl libbzip2 liblzma libxml2 lz4-lib nettle zlib libzstd" 3.35 - ;; 3.36 - *-dev) 3.37 - copy @dev 3.38 - DEPENDS="libarchive acl-dev bzip2-dev libxml2-dev lz4-dev \ 3.39 - nettle-dev xz-dev zlib-dev zstd-dev" 3.40 - ;; 3.41 - esac 3.42 -}
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/libfilezilla/receipt Mon Jan 14 05:10:43 2019 +0200 4.3 @@ -0,0 +1,28 @@ 4.4 +# SliTaz package receipt v2. 4.5 + 4.6 +PACKAGE="libfilezilla" 4.7 +VERSION="0.15.1" 4.8 +CATEGORY="network" 4.9 +SHORT_DESC="Basic functionality to build high-performing, platform-independent programs" 4.10 +MAINTAINER="al.bobylev@gmail.com" 4.11 +LICENSE="GPL2" 4.12 +WEB_SITE="https://lib.filezilla-project.org/" 4.13 + 4.14 +TARBALL="$PACKAGE-$VERSION.tar.bz2" 4.15 +WGET_URL="https://download.filezilla-project.org/libfilezilla/$TARBALL" 4.16 +TARBALL_SHA1="a51116de85232b186c4345433106ade192387e55" 4.17 + 4.18 +BUILD_DEPENDS="nettle-dev cppunit-dev" 4.19 +SPLIT="$PACKAGE-dev" 4.20 + 4.21 +DEPENDS_std="nettle" 4.22 +DEPENDS_dev="$PACKAGE nettle-dev" 4.23 + 4.24 +compile_rules() { 4.25 + ./configure \ 4.26 + --disable-static \ 4.27 + $CONFIGURE_ARGS && 4.28 + fix libtool && 4.29 + make && 4.30 + make install 4.31 +}
5.1 --- a/ntop/receipt Mon Jan 14 04:27:33 2019 +0200 5.2 +++ b/ntop/receipt Mon Jan 14 05:10:43 2019 +0200 5.3 @@ -10,46 +10,46 @@ 5.4 5.5 TARBALL="$PACKAGE-$VERSION.tar.gz" 5.6 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 5.7 +TARBALL_SHA1="bbb8de893b1d0bb3c20785445ff62c7dbf398d0b" 5.8 5.9 BUILD_DEPENDS="libtool automake autoconf wget subversion libpcap-dev gdbm-dev \ 5.10 pcre-dev rrdtool-dev openssl-dev zlib-dev python-dev geoip-dev" 5.11 SPLIT="$PACKAGE-dev" 5.12 + 5.13 +CONFIG_FILES_std="/etc/ntop/" 5.14 +DEPENDS_std="gdbm geoip libpcap openssl python rrdtool zlib" # ? libpng perl pcre libwrap 5.15 +TAGS_std="network" 5.16 + 5.17 COOKOPTS="skip-log-errors" 5.18 5.19 compile_rules() { 5.20 + # config nDPI 5.21 + cd nDPI 5.22 + ./configure --with-pic $CONFIGURE_ARGS 5.23 + cd .. 5.24 + 5.25 + export DISTRO="SliTaz" 5.26 + export DISTRO_VERSION="Next" 5.27 ./autogen.sh \ 5.28 - --prefix=/usr \ 5.29 - --sysconfdir=/usr/share \ 5.30 - --localstatedir=/var/lib \ 5.31 --disable-snmp \ 5.32 $CONFIGURE_ARGS && 5.33 + fix libtool && 5.34 make && 5.35 make install-recursive || return 1 5.36 5.37 mkdir -p $install/var/lib/ntop $install/var/lib/ntop/rrd 5.38 5.39 for i in $install/usr/lib/ntop/plugins/*.so; do 5.40 + cmp -s "../../lib$(basename $i)" $i && 5.41 ln -sf "../../lib$(basename $i)" $i 5.42 done 5.43 5.44 - install -Dm755 $stuff/ntop $install/etc/init.d/ntop 5.45 + install -Dm755 $stuff/ntop $install/etc/init.d/ntop 5.46 + install -Dm644 $stuff/ntop.conf $install/etc/daemons.conf.d/ntop.conf 5.47 + 5.48 mkdir -p $install/var/log/ntop/ 5.49 chown -R root:root $install 5.50 -} 5.51 - 5.52 -genpkg_rules() { 5.53 - case $PACKAGE in 5.54 - ntop) 5.55 - copy @std 5.56 - chown -R www:www $fs/usr/share/ntop/ 5.57 - CONFIG_FILES="/etc/ntop/" 5.58 - DEPENDS="libgdbm geoip libpcap openssl python rrdtool zlib" # ? libpng perl pcre libwrap 5.59 - TAGS="network" 5.60 - ;; 5.61 - ntop-dev) 5.62 - copy @dev 5.63 - ;; 5.64 - esac 5.65 + find $install -type f -exec chmod g-w '{}' \; # 664->644, 775->755 5.66 } 5.67 5.68 post_install_ntop() { 5.69 @@ -65,7 +65,7 @@ 5.70 chroot "$1/" chown -R $user.$group /var/lib/ntop /var/log/ntop 5.71 5.72 # Start package daemon if we are on running system 5.73 - [ "$1" ] || /etc/init.d/$PACKAGE start 5.74 + [ "$1" ] || /etc/init.d/ntop start 5.75 5.76 # post_install message 5.77 [ -n "$quiet" ] || cat <<EOT 5.78 @@ -80,7 +80,7 @@ 5.79 } 5.80 5.81 pre_remove_ntop() { 5.82 - [ "$1" ] || /etc/init.d/$PACKAGE stop 5.83 + [ "$1" ] || /etc/init.d/ntop stop 5.84 } 5.85 5.86 post_remove_ntop() {
6.1 --- a/ntop/stuff/ntop Mon Jan 14 04:27:33 2019 +0200 6.2 +++ b/ntop/stuff/ntop Mon Jan 14 05:10:43 2019 +0200 6.3 @@ -1,64 +1,58 @@ 6.4 #!/bin/sh 6.5 -# /etc/init.d/ntop : Start, stop and restart ntop daemon on SliTaz, at 6.6 -# boot time or with the command line. 6.7 +# /etc/init.d/ntop: Start, stop and restart ntop daemon on SliTaz, 6.8 +# at boot time or with the command line. 6.9 # 6.10 -# To start SSH server at boot time, just put ntop in the $RUN_DAEMONS 6.11 -# variable of /etc/rcS.conf and configure options with /etc/daemons.conf 6.12 +# To start ntop server at boot time, just put the 'ntop' in the $RUN_DAEMONS 6.13 +# variable of /etc/rcS.conf and configure options with 6.14 +# /etc/daemons.conf.d/ntop.conf 6.15 # 6.16 . /etc/init.d/rc.functions 6.17 - 6.18 +. /etc/daemons.conf.d/ntop.conf 6.19 6.20 NAME=ntop 6.21 DESC="$(_ '%s server' ntop)" 6.22 DAEMON=/usr/bin/ntop 6.23 - 6.24 -HTTP_PORT="3000" 6.25 -NTOP_USER="ntop" 6.26 - 6.27 -LOGFILE=/var/log/ntop/ntop.log 6.28 PIDFILE=/var/run/ntop.pid 6.29 6.30 -OPTIONS="-w $HTTP_PORT -L -u $NTOP_USER -d" 6.31 - 6.32 case "$1" in 6.33 - start) 6.34 - if active_pidfile $PIDFILE $NAME ; then 6.35 - _ '%s is already running.' $NAME 6.36 - exit 1 6.37 - fi 6.38 - # We need to set ntop admin password. 6.39 - if [ ! -f /var/ntop/ntop_pw.db ] ; then 6.40 - ntop -A || exit 6.41 - fi 6.42 - action 'Starting %s: %s...' "$DESC" $NAME 6.43 - $DAEMON $OPTIONS >> $LOGFILE 6.44 - status 6.45 - ;; 6.46 - stop) 6.47 - if ! active_pidfile $PIDFILE $NAME ; then 6.48 - _ '%s is not running.' $NAME 6.49 - exit 1 6.50 - fi 6.51 - action 'Stopping %s: %s...' "$DESC" $NAME 6.52 - kill $(cat $PIDFILE) && rm -f $PIDFILE 6.53 - status 6.54 - ;; 6.55 - restart) 6.56 - if ! active_pidfile $PIDFILE $NAME ; then 6.57 - _ '%s is not running.' $NAME 6.58 - exit 1 6.59 - fi 6.60 - action 'Restarting %s: %s...' "$DESC" $NAME 6.61 - kill $(cat $PIDFILE) && rm -f $PIDFILE 6.62 - sleep 2 6.63 - $DAEMON $OPTIONS 6.64 - status 6.65 - ;; 6.66 - *) 6.67 - emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]" 6.68 - newline 6.69 - exit 1 6.70 - ;; 6.71 + start) 6.72 + if active_pidfile $PIDFILE $NAME; then 6.73 + _ '%s is already running.' $NAME 6.74 + exit 1 6.75 + fi 6.76 + # We need to set ntop admin password. # 6.77 + if [ ! -f /var/ntop/ntop_pw.db ]; then # 6.78 + ntop -A || exit # 6.79 + fi # 6.80 + action 'Starting %s: %s...' "$DESC" $NAME 6.81 + $DAEMON $OPTIONS >> $LOGFILE 6.82 + status 6.83 + ;; 6.84 + stop) 6.85 + if ! active_pidfile $PIDFILE $NAME; then 6.86 + _ '%s is not running.' $NAME 6.87 + exit 1 6.88 + fi 6.89 + action 'Stopping %s: %s...' "$DESC" $NAME 6.90 + kill $(cat $PIDFILE) && rm -f $PIDFILE # 6.91 + status 6.92 + ;; 6.93 + restart) 6.94 + if ! active_pidfile $PIDFILE $NAME; then 6.95 + _ '%s is not running.' $NAME 6.96 + exit 1 6.97 + fi 6.98 + action 'Restarting %s: %s...' "$DESC" $NAME 6.99 + kill $(cat $PIDFILE) && rm -f $PIDFILE # 6.100 + sleep 2 6.101 + $DAEMON $OPTIONS 6.102 + status 6.103 + ;; 6.104 + *) 6.105 + emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]" 6.106 + newline 6.107 + exit 1 6.108 + ;; 6.109 esac 6.110 6.111 exit 0
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 7.2 +++ b/ntop/stuff/ntop.conf Mon Jan 14 05:10:43 2019 +0200 7.3 @@ -0,0 +1,8 @@ 7.4 +# ntop server options. 7.5 + 7.6 +HTTP_PORT="3000" 7.7 +NTOP_USER="ntop" 7.8 + 7.9 +LOGFILE=/var/log/ntop/ntop.log 7.10 + 7.11 +OPTIONS="-w $HTTP_PORT -L -u $NTOP_USER -d"
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 8.2 +++ b/ntop/stuff/patches/0001-nDPI-Include-sys-types.h.patch Mon Jan 14 05:10:43 2019 +0200 8.3 @@ -0,0 +1,26 @@ 8.4 +From 6543f3e2d5fe214e2fc6c050289bf1ae73b18724 Mon Sep 17 00:00:00 2001 8.5 +From: Khem Raj <raj.khem@gmail.com> 8.6 +Date: Wed, 30 Aug 2017 13:56:24 -0700 8.7 +Subject: [PATCH] nDPI: Include sys/types.h 8.8 + 8.9 +Needed for uint_t types 8.10 + 8.11 +Signed-off-by: Khem Raj <raj.khem@gmail.com> 8.12 +--- 8.13 +Upstream-Status: Pending 8.14 + 8.15 + nDPI/src/include/ipq_api.h | 1 + 8.16 + 1 file changed, 1 insertion(+) 8.17 + 8.18 +Index: ntop-5.0.1/nDPI/src/include/ipq_api.h 8.19 +=================================================================== 8.20 +--- ntop-5.0.1.orig/nDPI/src/include/ipq_api.h 8.21 ++++ ntop-5.0.1/nDPI/src/include/ipq_api.h 8.22 +@@ -24,6 +24,7 @@ 8.23 + #ifndef __IPOQUE_API_INCLUDE_FILE__ 8.24 + #define __IPOQUE_API_INCLUDE_FILE__ 8.25 + 8.26 ++#include <sys/types.h> 8.27 + 8.28 + #if defined(HAVE_NTOP) && defined(WIN32) 8.29 + #include <winsock2.h>
9.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 9.2 +++ b/ntop/stuff/patches/0001-plugins-Makefile.am-fix-for-automake-1.16.1.patch Mon Jan 14 05:10:43 2019 +0200 9.3 @@ -0,0 +1,74 @@ 9.4 +From d22ddc73f00ed056032a635ee8379305ec83bf81 Mon Sep 17 00:00:00 2001 9.5 +From: Robert Yang <liezhi.yang@windriver.com> 9.6 +Date: Wed, 11 Jul 2018 12:02:50 +0800 9.7 +Subject: [PATCH] plugins/Makefile.am: fix for automake 1.16.1 9.8 + 9.9 +Fixed: 9.10 +| i586-poky-linux-gcc: error: netflowPlugin.o: No such file or directory 9.11 +| i586-poky-linux-gcc: error: unrecognized command line option '-flat_namespace'; did you mean '-Wnamespaces'? 9.12 +| i586-poky-linux-gcc: fatal error: no input files 9.13 + 9.14 +The previous code make things complicated, but we don't have to, let libtool do 9.15 +most of the things can fix the problem. 9.16 + 9.17 +Upstream-Status: Pending [ntop is not longer maintained any more, we need consider moving to ntopng] 9.18 + 9.19 +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> 9.20 +--- 9.21 + plugins/Makefile.am | 34 ++++++---------------------------- 9.22 + 1 file changed, 6 insertions(+), 28 deletions(-) 9.23 + 9.24 +diff --git a/plugins/Makefile.am b/plugins/Makefile.am 9.25 +index 64492e0..bcd0c10 100644 9.26 +--- a/plugins/Makefile.am 9.27 ++++ b/plugins/Makefile.am 9.28 +@@ -69,40 +69,18 @@ libsflowPlugin_la_CFLAGS = $(AM_CFLAGS) 9.29 + # by default ntop looks for plugins in the plugins/ subdirectory 9.30 + # 9.31 + 9.32 +- 9.33 +-.libs/libnetflowPlugin.so@SO_VERSION_PATCH@: 9.34 +- @if test -f libnetflowPlugin_la-netflowPlugin.o; then \ 9.35 +- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libnetflowPlugin.so@SO_VERSION_PATCH@ libnetflowPlugin_la-netflowPlugin.o; \ 9.36 +- else \ 9.37 +- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libnetflowPlugin.so@SO_VERSION_PATCH@ netflowPlugin.o; \ 9.38 +- fi 9.39 +- 9.40 +-netflowPlugin.so$(EXEEXT): .libs/libnetflowPlugin.so@SO_VERSION_PATCH@ 9.41 +- @$(LN_S) .libs/libnetflowPlugin.so netflowPlugin.so 9.42 ++netflowPlugin.so$(EXEEXT): libnetflowPlugin.la 9.43 ++ @$(LN_S) -f .libs/libnetflowPlugin.so netflowPlugin.so 9.44 + 9.45 + ############### 9.46 + 9.47 +-.libs/librrdPlugin.so@SO_VERSION_PATCH@: 9.48 +- @if test -f librrdPlugin_la-rrdPlugin.o; then \ 9.49 +- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/librrdPlugin.so@SO_VERSION_PATCH@ librrdPlugin_la-rrdPlugin.o; \ 9.50 +- else \ 9.51 +- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/librrdPlugin.so@SO_VERSION_PATCH@ rrdPlugin.o; \ 9.52 +- fi 9.53 +- 9.54 +-rrdPlugin.so$(EXEEXT): .libs/librrdPlugin.so@SO_VERSION_PATCH@ 9.55 +- @$(LN_S) .libs/librrdPlugin.so rrdPlugin.so 9.56 ++rrdPlugin.so$(EXEEXT): librrdPlugin.la 9.57 ++ @$(LN_S) -f .libs/librrdPlugin.so rrdPlugin.so 9.58 + 9.59 + ############### 9.60 + 9.61 +-.libs/libsflowPlugin.so@SO_VERSION_PATCH@: 9.62 +- @if test -f libsflowPlugin_la-sflowPlugin.o; then \ 9.63 +- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libsflowPlugin.so@SO_VERSION_PATCH@ libsflowPlugin_la-sflowPlugin.o; \ 9.64 +- else \ 9.65 +- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libsflowPlugin.so@SO_VERSION_PATCH@ sflowPlugin.o; \ 9.66 +- fi 9.67 +- 9.68 +-sflowPlugin.so$(EXEEXT): .libs/libsflowPlugin.so@SO_VERSION_PATCH@ 9.69 +- @$(LN_S) .libs/libsflowPlugin.so sflowPlugin.so 9.70 ++sflowPlugin.so$(EXEEXT): libsflowPlugin.la 9.71 ++ @$(LN_S) -f .libs/libsflowPlugin.so sflowPlugin.so 9.72 + 9.73 + ############### 9.74 + 9.75 +-- 9.76 +2.7.4 9.77 +
10.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 10.2 +++ b/ntop/stuff/patches/configure.patch Mon Jan 14 05:10:43 2019 +0200 10.3 @@ -0,0 +1,48 @@ 10.4 +Convert a series of `sed` to patch. 10.5 +http://cgit.openembedded.org/meta-openembedded/tree/meta-networking/recipes-support/ntop/ntop_5.0.1.bb 10.6 + 10.7 +--- a/configure.in 10.8 ++++ b/configure.in 10.9 +@@ -366,8 +366,8 @@ 10.10 + 10.11 + *-*-linux*:* ) 10.12 + DEFINEOS="LINUX" 10.13 +- DISTRO=`utils/linuxrelease --distro` 10.14 +- RELEASE=`utils/linuxrelease --release` 10.15 ++ DISTRO="${DISTRO}" 10.16 ++ RELEASE="${DISTRO_VERSION}" 10.17 + echo "* This appears to be ${DEFINEOS} ${DISTRO} ${RELEASE}" 10.18 + ;; 10.19 + 10.20 +@@ -469,10 +469,9 @@ 10.21 + LOCALEDIR="/usr/lib/locale" 10.22 + fi 10.23 + 10.24 +-dnl> Add /usr/local/ /opt/local 10.25 +-CFLAGS="${CFLAGS} -I/usr/local/include -I/opt/local/include" 10.26 +-CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/opt/local/include" 10.27 +-LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/opt/local/lib" 10.28 ++CFLAGS="${CFLAGS}" 10.29 ++CPPFLAGS="${CPPFLAGS}" 10.30 ++LDFLAGS="${LDFLAGS}" 10.31 + 10.32 + PWD=`pwd` 10.33 + 10.34 +@@ -1871,7 +1870,7 @@ 10.35 + AC_DEFINE_UNQUOTED(CFG_PLUGIN_DIR,"$CFG_PLUGIN_DIR", [Plugin installation directory]) 10.36 + echo " Plugin files are in $CFG_PLUGIN_DIR" 10.37 + 10.38 +-CFG_DBFILE_DIR=$localstatedir/ntop 10.39 ++CFG_DBFILE_DIR=$localstatedir/lib/ntop 10.40 + CFG_DBFILE_DIR=`( 10.41 + test "x$prefix" = xNONE && prefix=${ac_default_prefix} 10.42 + eval echo "$CFG_DBFILE_DIR" 10.43 +@@ -1930,7 +1929,7 @@ 10.44 + /bin/rm -f version.c 10.45 + echo $PACKAGE_VERSION $NTOP_VERSION_EXTRA | sed -e 's/.*/char * version = "&";/' > version.c 10.46 + osRelease=`uname -r` 10.47 +-osName=`./config.guess | sed -e "s/unknown/${osRelease}/g"` 10.48 ++osName=${HOST_SYSTEM} 10.49 + echo "${osName}" | sed -e 's/.*/char * osName = "&";/' >> version.c 10.50 + echo "char * ntop_author = \"Luca Deri <deri@ntop.org>\";" >> version.c 10.51 + dnl> This is an odd format, but it matches cpp's __DATE__ and __TIME__ macros...
11.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 11.2 +++ b/ntop/stuff/patches/ntop_configure_in.patch Mon Jan 14 05:10:43 2019 +0200 11.3 @@ -0,0 +1,164 @@ 11.4 +1)add --with-pcap-config option to use libpcap's pcap-config 11.5 +2)add AC_CHECK_LIB if user didn't specify PCAP_ROOT and pcap-config 11.6 + put it before host check to make cross-compiling easier. 11.7 + pcap doesn't need extra include and libs so it is fine. 11.8 +3)remove old rrd configure code but use pkg-config to config rrd 11.9 + rrdtool should have the pkg-config file installed. 11.10 +4)fix python-config 11.11 +5)change AC_TRY_RUN to AC_COMPILE_IFELSE for pthread_rwlock_t checking 11.12 +6)fix a net-snmp-config bug 11.13 + 11.14 +Upstream-Status: Pending 11.15 + 11.16 +Signed-off-by: Yao Zhao <yao.zhao@windriver.com> 11.17 +--- 11.18 +diff --git a/configure.in b/configure.in 11.19 +index 0c7c0a5..cad40be 100644 11.20 +--- a/configure.in 11.21 ++++ b/configure.in 11.22 +@@ -230,14 +230,14 @@ dnl> 11.23 + AC_ARG_WITH(void, 11.24 + [ +-External-source-locations:-------------------------------------------------+]) 11.25 + 11.26 +-AC_ARG_WITH( rrd-home, 11.27 +- [ --with-rrd-home=DIR Usually /usr/local/rrdtool-1.2.x], 11.28 +- RRD_HOME="$withval", 11.29 +- RRD_HOME=/usr/local/rrdtool-1.2.19) 11.30 + AC_ARG_WITH( pcap-root, 11.31 + [ --with-pcap-root=DIR LBNL pcap located in DIR], 11.32 + PCAP_ROOT="$withval", 11.33 + PCAP_ROOT=) 11.34 ++AC_ARG_WITH( pcap-config, 11.35 ++ [ --with-pcap-config=path/pcap-config where to find pcap-config], 11.36 ++ PCAP_CONFIG="$withval", 11.37 ++ PCAP_CONFIG=) 11.38 + AC_ARG_WITH( gdbm-root, 11.39 + [ --with-gdbm-root=DIR gdbm located in DIR], 11.40 + GDBM_DIRECTORY="$withval", 11.41 +@@ -556,6 +556,7 @@ if test ".${PCAPRING_DIR}" != .; then 11.42 + else 11.43 + 11.44 + TMP_ROOT=${HOME}/PF_RING/userland/libpcap/ 11.45 ++FOUND_PCAP=1 11.46 + if test ".${PCAP_ROOT}" == . && 11.47 + test -d ${TMP_ROOT} && 11.48 + test -r ${TMP_ROOT}/libpcap.a; then 11.49 +@@ -563,6 +564,18 @@ if test ".${PCAP_ROOT}" == . && 11.50 + CORELIBS="${CORELIBS} -L${TMP_ROOT} -L${HOME}/PF_RING/userland/lib -lpfring -lpcap " 11.51 + INCS="${INCS} -I ${PCAP_ROOT}" 11.52 + AC_MSG_RESULT([found in $PCAP_ROOT]) 11.53 ++elif test -n "${PCAP_CONFIG}" && test -x "${PCAP_CONFIG}"; then 11.54 ++ CORELIBS="${CORELIBS} $(${PCAP_CONFIG} --libs)" 11.55 ++ INCS="${INCS} $(${PCAP_CONFIG} --cflags)" 11.56 ++ AC_DEFINE_UNQUOTED(HAVE_LIBPCAP, 1, [have libpcap ]) 11.57 ++ AC_MSG_RESULT([found pcap-config: $PCAP_CONFIG, libs:$(${PCAP_CONFIG} --libs) cflags:$(${PCAP_CONFIG} --cflags)]) 11.58 ++else 11.59 ++ AC_CHECK_LIB(pcap, pcap_lookupdev, , 11.60 ++ [FOUND_PCAP=]) 11.61 ++fi 11.62 ++ 11.63 ++if test -n "$FOUND_PCAP"; then 11.64 ++ : 11.65 + elif test ".${PCAP_ROOT}" != .; then 11.66 + if test -d $PCAP_ROOT && 11.67 + test -r $PCAP_ROOT/lib/libpcap.a && 11.68 +@@ -880,44 +893,11 @@ AC_CHECK_LIB([z], [zlibVersion], [], [ 11.69 + exit -1 11.70 + ]) 11.71 + 11.72 +-# RRD 11.73 +-if test -d "$RRD_HOME"; then 11.74 +- AC_MSG_RESULT(checking for RRD home... yes) 11.75 +-else 11.76 +- RRD_HOME=/usr/local/rrdtool 11.77 +- if test -d "$RRD_HOME"; then 11.78 +- AC_MSG_RESULT(Checking rrdtool in $RRD_HOME) 11.79 +- else 11.80 +- RRD_HOME=/usr/local 11.81 +- fi 11.82 +-fi 11.83 +- 11.84 +-RRD_LIB="-L${RRD_HOME}/lib -lrrd_th" 11.85 +- 11.86 +-if test -f "$RRD_HOME/lib/librrd_th.so"; then 11.87 +- AC_MSG_RESULT(checking for rrdtool... yes) 11.88 +-else 11.89 +- if test -f "$RRD_HOME/lib/librrd_th.dylib"; then # OSX 11.90 +- AC_MSG_RESULT(checking for rrdtool... yes) 11.91 +- else 11.92 +- if test -f "$RRD_HOME/lib/librrd_th.a"; then 11.93 +- AC_MSG_RESULT(checking for rrdtool... yes) 11.94 +- else 11.95 +- AC_CHECK_LIB([rrd_th], [main]) 11.96 +- if test ".${ac_cv_lib_rrd_th_main}" != ".yes"; then 11.97 +- AC_MSG_ERROR(Unable to find RRD at $RRD_HOME: please use --with-rrd-home=DIR); 11.98 +- AC_MSG_ERROR(RRD source can be downloaded from http://www.rrdtool.org/); 11.99 +- else 11.100 +- RRD_LIB= 11.101 +- fi 11.102 +- fi 11.103 +- fi 11.104 +-fi 11.105 +- 11.106 +-RRD_INC= 11.107 +-if test -d "${RRD_HOME}/include"; then 11.108 +- RRD_INC="-I${RRD_HOME}/include" 11.109 +-fi 11.110 ++PKG_CHECK_MODULES( [RRD], [librrd] ) 11.111 ++AC_SUBST(RRD_CFLAGS) 11.112 ++AC_SUBST(RRD_LIBS) 11.113 ++RRD_INC=$RRD_FLAGS 11.114 ++RRD_LIB=$RRD_LIBS 11.115 + 11.116 + dnl> The failed recheck stuff below is courtesy of Chris Turbeville [turbo@verio.net] 11.117 + dnl> Chris developed this for Solaris 9, confirming work I had done earlier for FreeBSD 11.118 +@@ -1041,7 +1021,7 @@ AC_CHECK_HEADERS([sched.h sys/sched.h]) 11.119 + AC_CHECK_HEADERS([pthread.h]) 11.120 + 11.121 + AC_MSG_CHECKING([if r/w locks are supported]) 11.122 +-AC_TRY_RUN([ 11.123 ++AC_COMPILE_IFELSE([ 11.124 + #include <pthread.h> 11.125 + 11.126 + int main() 11.127 +@@ -1443,15 +1423,15 @@ dnl> NET-SNMP 11.128 + dnl> 11.129 + if test ".${ac_disable_snmp}" != ".yes"; then 11.130 + AC_CHECK_TOOL(NETSNMP, net-snmp-config) 11.131 +- if test "x$ac_cv_prog_ac_ct_NETSNMP" = "xnet-snmp-config"; then 11.132 ++ if test -n "$NETSNMP"; then 11.133 + AC_DEFINE_UNQUOTED(HAVE_SNMP, 1, [SNMP is supported]) 11.134 +- SNMPLIBS="`net-snmp-config --libs`" 11.135 ++ SNMPLIBS="`$NETSNMP --libs`" 11.136 + SNMPLIBS="`echo ${SNMPLIBS}|sed -e s,'-R../lib',,g`" 11.137 + echo "net-snmp libs: ${SNMPLIBS}" 11.138 + LIBS="${LIBS} ${SNMPLIBS}" 11.139 + dnl remove unecessary path 11.140 + LIBS=`echo ${LIBS}|sed -e s,'-R../lib',,g` 11.141 +- INCS="${INCS} `net-snmp-config --cflags`" 11.142 ++ INCS="${INCS} `$NETSNMP --cflags`" 11.143 + else 11.144 + AC_MSG_RESULT(NETSNMP is not present: SNMP support is disabled) 11.145 + fi 11.146 +@@ -1464,10 +1444,9 @@ SAVED_LIBS=$LIBS 11.147 + dnl> 11.148 + dnl> PYTHON 11.149 + dnl> 11.150 +- AC_CHECK_TOOL(PYTHON, python-config) 11.151 +- PYTHON_CONFIG="" 11.152 ++ AC_CHECK_TOOL(PYTHON_CONFIG, python-config) 11.153 + 11.154 +- if test "x$ac_cv_prog_ac_ct_PYTHON" != "xpython-config"; then 11.155 ++ if test -z "$PYTHON_CONFIG"; then 11.156 + if test -f "/etc/debian_version"; then 11.157 + AC_MSG_RESULT(Please install python-dev and rerun configure) 11.158 + exit 1 11.159 +@@ -1481,8 +1460,6 @@ dnl> 11.160 + PYTHON_CONFIG="python-config" 11.161 + fi 11.162 + fi 11.163 +- else 11.164 +- PYTHON_CONFIG="python-config" 11.165 + fi 11.166 + 11.167 + if test "x$PYTHON_CONFIG" != "x"; then
12.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 12.2 +++ b/ntop/stuff/patches/ntop_webInterface.patch Mon Jan 14 05:10:43 2019 +0200 12.3 @@ -0,0 +1,19 @@ 12.4 +change osName to version as it prints out "ntop Version". 12.5 + 12.6 +Upstream-Status: Pending 12.7 + 12.8 +Signed-off-by: Yao Zhao <yao.zhao@windriver.com> 12.9 +--- 12.10 +diff --git a/webInterface.c b/webInterface.c 12.11 +index 5622e69..8cb7a67 100644 12.12 +--- a/webInterface.c 12.13 ++++ b/webInterface.c 12.14 +@@ -5816,7 +5816,7 @@ static void printNtopConfigInfoData(int textPrintFlag, UserPref *pref) { 12.15 + printInfoSectionTitle(textPrintFlag, "Basic Information"); 12.16 + 12.17 + safe_snprintf(__FILE__, __LINE__, formatBuf, sizeof(formatBuf), "%s (%d bit)", 12.18 +- osName, sizeof(long) == 8 ? 64 : 32); 12.19 ++ version, sizeof(long) == 8 ? 64 : 32); 12.20 + printFeatureConfigInfo(textPrintFlag, "ntop Version", formatBuf); 12.21 + 12.22 + #ifndef WIN32
13.1 --- a/ntop/stuff/patches/series Mon Jan 14 04:27:33 2019 +0200 13.2 +++ b/ntop/stuff/patches/series Mon Jan 14 05:10:43 2019 +0200 13.3 @@ -1,2 +1,11 @@ 13.4 # from https://www.archlinux.org/packages/community/x86_64/ntop/ 13.5 -ntop-rrdtool-1.6.0.patch 13.6 +# ntop-rrdtool-1.6.0.patch 13.7 + 13.8 +# from http://cgit.openembedded.org/meta-openembedded/tree/meta-networking/recipes-support/ntop 13.9 +ntop_configure_in.patch 13.10 +ntop_webInterface.patch 13.11 +use-static-inline.patch 13.12 +0001-nDPI-Include-sys-types.h.patch 13.13 +0001-plugins-Makefile.am-fix-for-automake-1.16.1.patch 13.14 + 13.15 +configure.patch
14.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 14.2 +++ b/ntop/stuff/patches/use-static-inline.patch Mon Jan 14 05:10:43 2019 +0200 14.3 @@ -0,0 +1,32 @@ 14.4 +[PATCH] replace 'inline' with 'static inline' for gcc 5.x 14.5 + 14.6 +gcc 5.x defaults to -std=gnu11 instead of -std=gnu89 which change 14.7 +the semantics for inline functions and the standalone 'inline' 14.8 +causes error with "gcc5 -g -o0" 14.9 + 14.10 +Replace inline with static inline to be compatible with both gcc 4 14.11 +and 5. 14.12 + 14.13 +Upstream-status: Pending 14.14 + 14.15 +Signed-off-by: Roy Li <rongqing.li@windriver.com> 14.16 +--- 14.17 + nDPI/src/lib/protocols/ssl.c | 2 +- 14.18 + 1 file changed, 1 insertion(+), 1 deletion(-) 14.19 + 14.20 +diff --git a/nDPI/src/lib/protocols/ssl.c b/nDPI/src/lib/protocols/ssl.c 14.21 +index 245b8c3..72beda9 100644 14.22 +--- a/nDPI/src/lib/protocols/ssl.c 14.23 ++++ b/nDPI/src/lib/protocols/ssl.c 14.24 +@@ -39,7 +39,7 @@ static void ipoque_int_ssl_add_connection(struct ipoque_detection_module_struct 14.25 + 14.26 + #ifdef HAVE_NTOP 14.27 + #ifndef WIN32 14.28 +-inline int min(int a, int b) { return(a < b ? a : b); } 14.29 ++static inline int min(int a, int b) { return(a < b ? a : b); } 14.30 + #endif 14.31 + 14.32 + static void stripCertificateTrailer(char *buffer, int buffer_len) { 14.33 +-- 14.34 +1.9.1 14.35 +
15.1 --- a/pugixml/receipt Mon Jan 14 04:27:33 2019 +0200 15.2 +++ b/pugixml/receipt Mon Jan 14 05:10:43 2019 +0200 15.3 @@ -1,28 +1,29 @@ 15.4 -# SliTaz package receipt. 15.5 +# SliTaz package receipt v2. 15.6 15.7 PACKAGE="pugixml" 15.8 -VERSION="1.6" 15.9 +VERSION="1.9" 15.10 CATEGORY="misc" 15.11 SHORT_DESC="Light-weight, simple and fast XML parser for C++ with XPath support" 15.12 MAINTAINER="pascal.bellard@slitaz.org" 15.13 LICENSE="MIT" 15.14 +WEB_SITE="https://pugixml.org/" 15.15 + 15.16 TARBALL="$PACKAGE-$VERSION.tar.gz" 15.17 -WEB_SITE="https://pugixml.org/" 15.18 WGET_URL="https://github.com/zeux/pugixml/releases/download/v$VERSION/$TARBALL" 15.19 +TARBALL_SHA1="752958e524b67bea879d420c6d961d594920c5cc" 15.20 15.21 -SUGGESTED="cmake" 15.22 BUILD_DEPENDS="cmake" 15.23 +SPLIT="$PACKAGE-dev" 15.24 15.25 compile_rules() { 15.26 mkdir build 15.27 cd build 15.28 cmake \ 15.29 -DCMAKE_INSTALL_PREFIX=/usr \ 15.30 - ../scripts && 15.31 + -DCMAKE_INSTALL_LIBDIR=lib \ 15.32 + -DBUILD_SHARED_LIBS=True \ 15.33 + -DCMAKE_BUILD_TYPE=Release \ 15.34 + .. && 15.35 make && 15.36 - make DESTDIR=$install install 15.37 + make install 15.38 } 15.39 - 15.40 -genpkg_rules() { 15.41 - cp -a $install/* $fs/ 15.42 -}
16.1 Binary file rapidsvn/.icon.png has changed
17.1 --- a/rapidsvn/receipt Mon Jan 14 04:27:33 2019 +0200 17.2 +++ b/rapidsvn/receipt Mon Jan 14 05:10:43 2019 +0200 17.3 @@ -1,4 +1,4 @@ 17.4 -# SliTaz package receipt. 17.5 +# SliTaz package receipt v2. 17.6 17.7 PACKAGE="rapidsvn" 17.8 VERSION="0.12.1" 17.9 @@ -7,22 +7,26 @@ 17.10 MAINTAINER="devel@slitaz.org" 17.11 LICENSE="GPL3" 17.12 WEB_SITE="http://rapidsvn.tigris.org/" 17.13 + 17.14 TARBALL="$PACKAGE-$VERSION.tar.gz" 17.15 WGET_URL="http://www.rapidsvn.org/download/release/$VERSION/$TARBALL" 17.16 +TARBALL_SHA1="65d051b5a84fe8b5b0ce906f2ba5cf134a560feb" 17.17 + 17.18 +BUILD_DEPENDS="automake libtool apr-dev apr-util-dev subversion-dev \ 17.19 +wxwidgets-dev" 17.20 +DEPENDS="apr libsvn wxwidgets" 17.21 + 17.22 TAGS="subversion svn version-control versioning" 17.23 17.24 -BUILD_DEPENDS="libxxf86vm libtool wxWidgets28-dev subversion-dev apr-dev \ 17.25 -apr-util-dev cyrus-sasl-dev neon-dev libproxy-dev sqlite3-dev expat-dev python \ 17.26 -util-linux-uuid-dev" 17.27 - 17.28 compile_rules() { 17.29 - cp $stuff/client_ls.cpp src/svncpp/client_ls.cpp 17.30 + autoreconf -vi 17.31 + export CPPFLAGS="$CPPFLAGS -DNDEBUG" 17.32 + sed -i 's|src/tests/svncpp/Makefile||' configure 17.33 17.34 ./configure \ 17.35 --prefix=/usr \ 17.36 --with-apr-config=apr-1-config \ 17.37 --with-apu-config=apu-1-config \ 17.38 - --with-neon-config=neon-config \ 17.39 --with-wx-config=wx-config \ 17.40 --with-svn-include=/usr/include \ 17.41 --with-svn-lib=/usr/lib \ 17.42 @@ -31,11 +35,3 @@ 17.43 make && 17.44 make install 17.45 } 17.46 - 17.47 -genpkg_rules() { 17.48 - mkdir -p $fs/usr/lib 17.49 - cp -a $install/usr/lib/*.so* $fs/usr/lib 17.50 - cp -a $install/usr/bin $fs/usr 17.51 - DEPENDS="wxWidgets28 libsvn apr libltdl libxxf86vm libproxy libsqlite3 \ 17.52 - libsasl apr-util" 17.53 -}
18.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 18.2 +++ b/rapidsvn/stuff/patches/rapidsvn-assertion.patch Mon Jan 14 05:10:43 2019 +0200 18.3 @@ -0,0 +1,20 @@ 18.4 +--- a/src/rapidsvn_frame.cpp 18.5 ++++ b/src/rapidsvn_frame.cpp 18.6 +@@ -869,7 +869,6 @@ 18.7 + wxTE_MULTILINE | wxTE_READONLY); 18.8 + 18.9 + // as much as the widget can stand 18.10 +- m->log->SetMaxLength(0); 18.11 + 18.12 + m->logTracer = new EventTracer(this); 18.13 + m->listener.SetTracer(m->logTracer, false); 18.14 +--- a/src/report_dlg.cpp 18.15 ++++ b/src/report_dlg.cpp 18.16 +@@ -46,7 +46,6 @@ 18.17 + wxDefaultPosition, 18.18 + wxSize(500, 200), 18.19 + wxTE_MULTILINE | wxTE_READONLY | wxTE_RICH); 18.20 +- m_text->SetMaxLength(0); 18.21 + 18.22 + if (type == ERROR_REPORT) 18.23 + {
19.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 19.2 +++ b/rapidsvn/stuff/patches/rapidsvn-subversion1.9.patch Mon Jan 14 05:10:43 2019 +0200 19.3 @@ -0,0 +1,148 @@ 19.4 +Description: Fix FTBFS with newer subversion 19.5 +Origin: https://github.com/RapidSVN/RapidSVN/issues/6 19.6 +Bug-Debian: #796450 19.7 +Forwarded: not-needed 19.8 +Applied-Upstream: https://github.com/jsonn/pkgsrc/commit/9a2dbd9a13f94539cebf27d9de18a8014323c87a 19.9 +--- 19.10 +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ 19.11 +--- rapidsvn-0.12.1/src/svncpp/client_ls.cpp.old 2012-06-28 13:39:33.000000000 +0700 19.12 ++++ rapidsvn-0.12.1/src/svncpp/client_ls.cpp 2016-01-05 07:13:33.309097969 +0700 19.13 +@@ -29,6 +29,7 @@ 19.14 + #include "svn_client.h" 19.15 + #include "svn_path.h" 19.16 + #include "svn_sorts.h" 19.17 ++#include "svn_version.h" 19.18 + //#include "svn_utf.h" 19.19 + 19.20 + // svncpp 19.21 +@@ -37,6 +38,8 @@ 19.22 + #include "svncpp/exception.hpp" 19.23 + 19.24 + 19.25 ++#if SVN_VER_MAJOR == 1 && SVN_VER_MINOR < 8 19.26 ++ 19.27 + static int 19.28 + compare_items_as_paths(const svn_sort__item_t *a, const svn_sort__item_t *b) 19.29 + { 19.30 +@@ -90,8 +93,75 @@ 19.31 + } 19.32 + } 19.33 + 19.34 ++#else 19.35 ++ 19.36 ++#include <algorithm> 19.37 ++ 19.38 ++static svn_error_t* store_entry( 19.39 ++ void *baton, 19.40 ++ const char *path, 19.41 ++ const svn_dirent_t *dirent, 19.42 ++ const svn_lock_t *, 19.43 ++ const char *abs_path, 19.44 ++ const char *, 19.45 ++ const char *, 19.46 ++ apr_pool_t *scratch_pool) 19.47 ++{ 19.48 ++ svn::DirEntries *entries = reinterpret_cast<svn::DirEntries*>(baton); 19.49 ++ if (path[0] == '\0') { 19.50 ++ if (dirent->kind == svn_node_file) { 19.51 ++ // for compatibility with svn_client_ls behaviour, listing a file 19.52 ++ // stores that file name 19.53 ++ entries->push_back(svn::DirEntry(svn_path_basename(abs_path, scratch_pool), dirent)); 19.54 ++ } 19.55 ++ } else { 19.56 ++ entries->push_back(svn::DirEntry(path, dirent)); 19.57 ++ } 19.58 ++ return SVN_NO_ERROR; 19.59 ++} 19.60 ++ 19.61 ++static bool sort_by_path(svn::DirEntry const& a, svn::DirEntry const& b) 19.62 ++{ 19.63 ++ return svn_path_compare_paths(a.name(), b.name()) < 0; 19.64 ++} 19.65 ++ 19.66 ++namespace svn 19.67 ++{ 19.68 ++ DirEntries 19.69 ++ Client::list(const char * pathOrUrl, 19.70 ++ svn_opt_revision_t * revision, 19.71 ++ bool recurse) throw(ClientException) 19.72 ++ { 19.73 ++ Pool pool; 19.74 ++ DirEntries entries; 19.75 ++ 19.76 ++ svn_error_t * error = 19.77 ++ svn_client_list3(pathOrUrl, 19.78 ++ revision, 19.79 ++ revision, 19.80 ++ SVN_DEPTH_INFINITY_OR_IMMEDIATES(recurse), 19.81 ++ SVN_DIRENT_ALL, 19.82 ++ FALSE, // fetch locks 19.83 ++ FALSE, // include externals 19.84 ++ &store_entry, 19.85 ++ &entries, 19.86 ++ *m_context, 19.87 ++ pool); 19.88 ++ 19.89 ++ if (error != SVN_NO_ERROR) 19.90 ++ throw ClientException(error); 19.91 ++ 19.92 ++ std::sort(entries.begin(), entries.end(), &sort_by_path); 19.93 ++ 19.94 ++ return entries; 19.95 ++ } 19.96 ++} 19.97 ++ 19.98 ++#endif 19.99 ++ 19.100 + /* ----------------------------------------------------------------- 19.101 + * local variables: 19.102 + * eval: (load-file "../../rapidsvn-dev.el") 19.103 + * end: 19.104 + */ 19.105 ++ 19.106 +50c50 19.107 +< Data(const char * _name, svn_dirent_t * dirEntry) 19.108 +--- 19.109 +> Data(const char * _name, const svn_dirent_t * dirEntry) 19.110 +81c81 19.111 +< DirEntry::DirEntry(const char * name, svn_dirent_t * DirEntry) 19.112 +--- 19.113 +> DirEntry::DirEntry(const char * name, const svn_dirent_t * DirEntry) 19.114 +153a154 19.115 +> 19.116 +--- rapidsvn-0.12.1/include/svncpp/dirent.hpp.old 2012-06-28 13:39:20.000000000 +0700 19.117 ++++ rapidsvn-0.12.1/include/svncpp/dirent.hpp 2016-01-05 07:11:10.337456433 +0700 19.118 +@@ -41,7 +41,7 @@ 19.119 + /** 19.120 + * constructor for existing @a svn_dirent_t entries 19.121 + */ 19.122 +- DirEntry(const char * name, svn_dirent_t * dirEntry); 19.123 ++ DirEntry(const char * name, const svn_dirent_t * dirEntry); 19.124 + 19.125 + /** 19.126 + * copy constructor 19.127 +@@ -91,3 +91,4 @@ 19.128 + * eval: (load-file "../../rapidsvn-dev.el") 19.129 + * end: 19.130 + */ 19.131 ++ 19.132 +--- rapidsvn-0.12.1/src/svncpp/dirent.cpp.old 2016-01-05 07:22:32.647100607 +0700 19.133 ++++ rapidsvn-0.12.1/src/svncpp/dirent.cpp 2016-01-05 07:23:15.778197025 +0700 19.134 +@@ -47,7 +47,7 @@ 19.135 + { 19.136 + } 19.137 + 19.138 +- Data(const char * _name, svn_dirent_t * dirEntry) 19.139 ++ Data(const char * _name, const svn_dirent_t * dirEntry) 19.140 + : name(_name), kind(dirEntry->kind), size(dirEntry->size), 19.141 + hasProps(dirEntry->has_props != 0), 19.142 + createdRev(dirEntry->created_rev), time(dirEntry->time) 19.143 +@@ -78,7 +78,7 @@ 19.144 + { 19.145 + } 19.146 + 19.147 +- DirEntry::DirEntry(const char * name, svn_dirent_t * DirEntry) 19.148 ++ DirEntry::DirEntry(const char * name, const svn_dirent_t * DirEntry) 19.149 + : m(new Data(name, DirEntry)) 19.150 + { 19.151 + }
20.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 20.2 +++ b/rapidsvn/stuff/patches/rapidsvn-wx3.0.patch Mon Jan 14 05:10:43 2019 +0200 20.3 @@ -0,0 +1,203 @@ 20.4 +Description: Update for wx 3.0.0 20.5 + Update configure to recognise that wx 3.0.0 >= 2.4.2. 20.6 + Fix code for wx API changes. 20.7 +Author: Olly Betts <olly@survex.com> 20.8 +Origin: debian 20.9 +Forwarded: no 20.10 +Last-Update: 2014-04-10 20.11 + 20.12 +--- a/configure 20.13 ++++ b/configure 20.14 +@@ -15176,6 +15176,8 @@ 20.15 + ;; 20.16 + 2.[5-9].*) 20.17 + ;; 20.18 ++ 3.*) 20.19 ++ ;; 20.20 + *) 20.21 + as_fn_error $? "wxWidgets >= 2.4.2 required, found version $WX_VERSION" "$LINENO" 5 20.22 + as_fn_error $? "Try --with-wx-config." "$LINENO" 5 20.23 +--- a/configure.in 20.24 ++++ b/configure.in 20.25 +@@ -171,6 +171,8 @@ 20.26 + ;; 20.27 + [2.[5-9].*]) 20.28 + ;; 20.29 ++ 3.*) 20.30 ++ ;; 20.31 + *) 20.32 + AC_MSG_ERROR([wxWidgets >= 2.4.2 required, found version $WX_VERSION]) 20.33 + AC_MSG_ERROR([Try --with-wx-config.]) 20.34 +--- a/src/filelist_ctrl.cpp 20.35 ++++ b/src/filelist_ctrl.cpp 20.36 +@@ -1029,7 +1029,7 @@ 20.37 + 20.38 + // Workaround for issue 324 (only local+non-flat+update): 20.39 + // we chdir to the requested dir and pass "." to svn 20.40 +- if (!pathUtf8.isUrl() && m->WithUpdate && !m->FlatMode) 20.41 ++ if (!pathUtf8.isUrl() && m->WithUpdate && !m->FlatMode && !m->Path.empty()) 20.42 + { 20.43 + m->IsRelative = true; 20.44 + ::wxSetWorkingDirectory(m->Path); 20.45 +@@ -1606,7 +1606,7 @@ 20.46 + } 20.47 + } 20.48 + 20.49 +-inline void 20.50 ++bool 20.51 + FileListCtrl::SetColumnWidth(const int col, const int width) 20.52 + { 20.53 + m->ColumnWidth[col] = width; 20.54 +@@ -1614,8 +1614,9 @@ 20.55 + int index = m->ColumnIndex[col]; 20.56 + if (index != -1) 20.57 + { 20.58 +- wxListCtrl::SetColumnWidth(index, width); 20.59 ++ return wxListCtrl::SetColumnWidth(index, width); 20.60 + } 20.61 ++ return false; 20.62 + } 20.63 + 20.64 + int 20.65 +--- a/src/filelist_ctrl.hpp 20.66 ++++ b/src/filelist_ctrl.hpp 20.67 +@@ -118,7 +118,7 @@ 20.68 + * @param col column number 20.69 + * @param width 20.70 + */ 20.71 +- void 20.72 ++ bool 20.73 + SetColumnWidth(const int col, const int width); 20.74 + 20.75 + /** 20.76 +--- a/src/hist_val.cpp 20.77 ++++ b/src/hist_val.cpp 20.78 +@@ -113,7 +113,7 @@ 20.79 + } 20.80 + 20.81 + // if we have an entry, select it 20.82 +- if (!comboBox->IsEmpty()) 20.83 ++ if (!comboBox->IsListEmpty()) 20.84 + comboBox->SetSelection(0, 0); 20.85 + } 20.86 + 20.87 +--- a/src/listener.cpp 20.88 ++++ b/src/listener.cpp 20.89 +@@ -167,7 +167,7 @@ 20.90 + wxMutexLocker lock(mutex); 20.91 + wxString localCertFile = wxFileSelector( 20.92 + _("Select Certificate File"), wxT(""), wxT(""), wxT(""), 20.93 +- wxT("*.*"), wxOPEN | wxFILE_MUST_EXIST, parent); 20.94 ++ wxT("*.*"), wxFD_OPEN | wxFD_FILE_MUST_EXIST, parent); 20.95 + LocalToUtf8(localCertFile, certFile); 20.96 + 20.97 + dataReceived = !localCertFile.empty(); 20.98 +--- a/src/log_dlg.cpp 20.99 ++++ b/src/log_dlg.cpp 20.100 +@@ -211,7 +211,7 @@ 20.101 + 20.102 + for (size_t idx = 0; idx < str.Length(); idx++) 20.103 + { 20.104 +- switch (str[idx]) 20.105 ++ switch ((wchar_t)str[idx]) 20.106 + { 20.107 + case wxT('\r'): 20.108 + case wxT('\n'): 20.109 +--- a/src/preferences_dlg.cpp 20.110 ++++ b/src/preferences_dlg.cpp 20.111 +@@ -126,7 +126,7 @@ 20.112 + PreferencesDlg::SelectExecutable(const wxString & title, wxTextCtrl * textCtrl) 20.113 + { 20.114 + wxFileDialog dlg(this, title, wxEmptyString, wxEmptyString, 20.115 +- EXECUTABLE_WILDCARD, wxOPEN); 20.116 ++ EXECUTABLE_WILDCARD, wxFD_OPEN); 20.117 + dlg.SetPath(textCtrl->GetValue()); 20.118 + 20.119 + if (dlg.ShowModal() != wxID_OK) 20.120 +--- a/src/verblist.cpp 20.121 ++++ b/src/verblist.cpp 20.122 +@@ -71,7 +71,7 @@ 20.123 + const wxString & 20.124 + VerbList::GetName(size_t /*index*/) const 20.125 + { 20.126 +- return wxT(""); 20.127 ++ return wxEmptyString; 20.128 + } 20.129 + 20.130 + 20.131 +--- a/src/checkout_action.cpp 20.132 ++++ b/src/checkout_action.cpp 20.133 +@@ -120,7 +120,8 @@ 20.134 + pegRevision = svn::Revision(revnum); 20.135 + } 20.136 + 20.137 +- wxSetWorkingDirectory(m_data.DestFolder); 20.138 ++ if (!m_data.DestFolder.empty()) 20.139 ++ wxSetWorkingDirectory(m_data.DestFolder); 20.140 + 20.141 + svn::Path repUrlUtf8(PathUtf8(m_data.RepUrl)); 20.142 + svn::Path destFolderUtf8(PathUtf8(dest_folder)); 20.143 +--- a/src/action.cpp 20.144 ++++ b/src/action.cpp 20.145 +@@ -218,7 +218,9 @@ 20.146 + bool 20.147 + Action::Prepare() 20.148 + { 20.149 +- wxSetWorkingDirectory(Utf8ToLocal(m->path.c_str())); 20.150 ++ const wxString & dir = Utf8ToLocal(m->path.c_str()); 20.151 ++ if (!dir.empty()) 20.152 ++ wxSetWorkingDirectory(dir); 20.153 + 20.154 + return true; 20.155 + } 20.156 +--- a/src/cleanup_action.cpp 20.157 ++++ b/src/cleanup_action.cpp 20.158 +@@ -52,7 +52,9 @@ 20.159 + svn::Client client(GetContext()); 20.160 + const svn::Path & path = GetPath(); 20.161 + 20.162 +- wxSetWorkingDirectory(Utf8ToLocal(path.c_str())); 20.163 ++ const wxString & dir = Utf8ToLocal(path.c_str()); 20.164 ++ if (!dir.empty()) 20.165 ++ wxSetWorkingDirectory(dir); 20.166 + client.cleanup(path.c_str()); 20.167 + 20.168 + return true; 20.169 +--- a/src/export_action.cpp 20.170 ++++ b/src/export_action.cpp 20.171 +@@ -111,7 +111,8 @@ 20.172 + pegRevision = svn::Revision(revnum); 20.173 + } 20.174 + 20.175 +- wxSetWorkingDirectory(m_data.DestPath); 20.176 ++ if (!m_data.DestPath.empty()) 20.177 ++ wxSetWorkingDirectory(m_data.DestPath); 20.178 + 20.179 + svn::Path srcPathUtf8(PathUtf8(m_data.SrcPath)); 20.180 + svn::Path destPathUtf8(PathUtf8(m_data.DestPath)); 20.181 +--- a/src/get_action.cpp 20.182 ++++ b/src/get_action.cpp 20.183 +@@ -56,7 +56,9 @@ 20.184 + m_data.revision.revnum()); 20.185 + Trace(msg); 20.186 + 20.187 +- wxSetWorkingDirectory(Utf8ToLocal(GetPath().c_str())); 20.188 ++ const wxString & dir = Utf8ToLocal(GetPath().c_str()); 20.189 ++ if (!dir.empty()) 20.190 ++ wxSetWorkingDirectory(dir); 20.191 + client.update(svn::Path(LocalToUtf8(m_data.path)), 20.192 + m_data.revision, 20.193 + true, false); 20.194 +--- a/src/update_action.cpp 20.195 ++++ b/src/update_action.cpp 20.196 +@@ -75,7 +75,9 @@ 20.197 + } 20.198 + } 20.199 + 20.200 +- wxSetWorkingDirectory(Utf8ToLocal(GetPath().c_str())); 20.201 ++ const wxString & dir = Utf8ToLocal(GetPath().c_str()); 20.202 ++ if (!dir.empty()) 20.203 ++ wxSetWorkingDirectory(dir); 20.204 + svn::Client client(GetContext()); 20.205 + 20.206 + client.update(GetTargets(), revision, m_data.recursive,
21.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 21.2 +++ b/rapidsvn/stuff/patches/series Mon Jan 14 05:10:43 2019 +0200 21.3 @@ -0,0 +1,7 @@ 21.4 +# from Arch Linux: https://aur.archlinux.org/cgit/aur.git/tree/?h=rapidsvn 21.5 +# Fix build with WxGTK 3 (Debian) 21.6 +-p1|rapidsvn-wx3.0.patch 21.7 +# Fix assertion at startup 21.8 +rapidsvn-assertion.patch 21.9 +# Fix build with subversion 1.9 (Debian) 21.10 +-p1|rapidsvn-subversion1.9.patch
22.1 --- a/serf/receipt Mon Jan 14 04:27:33 2019 +0200 22.2 +++ b/serf/receipt Mon Jan 14 05:10:43 2019 +0200 22.3 @@ -11,30 +11,18 @@ 22.4 22.5 TARBALL="$PACKAGE-$VERSION.tar.bz2" 22.6 WGET_URL="https://archive.apache.org/dist/serf/$TARBALL" 22.7 +TARBALL_SHA1="26015c63e3bbb108c1689bf2090e4c26351db674" 22.8 22.9 BUILD_DEPENDS="scons2 apr-dev apr-util-dev" 22.10 SPLIT="$PACKAGE-dev" 22.11 22.12 +DEPENDS_std="apr apr-util openssl zlib" # expat libgdbm libldap util-linux-uuid ? 22.13 +DEPENDS_dev="$PACKAGE apr-dev apr-util-dev expat-dev gdbm-dev openldap-dev \ 22.14 +openssl-dev util-linux-uuid-dev zlib-dev" 22.15 + 22.16 compile_rules() { 22.17 - sed -i "/Append/s:RPATH=libdir,::" SConstruct && 22.18 - sed -i "/Default/s:lib_static,::" SConstruct && 22.19 - sed -i "/Alias/s:install_static,::" SConstruct && 22.20 + scons PREFIX=/usr && 22.21 + scons PREFIX=/usr install --install-sandbox=$install || return 1 22.22 22.23 - scons PREFIX=/usr && 22.24 - scons PREFIX=/usr install --install-sandbox=$install 22.25 + find $install -type f -name '*.h' -exec chmod go-w '{}' \; # 666->644 22.26 } 22.27 - 22.28 -genpkg_rules() { 22.29 - case $PACKAGE in 22.30 - serf) 22.31 - copy @std 22.32 - DEPENDS="apr apr-util expat libgdbm libldap openssl util-linux-uuid zlib" 22.33 - ;; 22.34 - *-dev) 22.35 - copy @dev 22.36 - DEPENDS="serf expat-dev gdbm-dev openldap-dev openssl-dev \ 22.37 - util-linux-uuid-dev zlib-dev" 22.38 - ;; 22.39 - esac 22.40 -} 22.41 -
23.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 23.2 +++ b/serf/stuff/patches/serf-blfs.patch Mon Jan 14 05:10:43 2019 +0200 23.3 @@ -0,0 +1,38 @@ 23.4 +--- a/SConstruct 23.5 ++++ b/SConstruct 23.6 +@@ -183,7 +183,7 @@ 23.7 + 23.8 + unknown = opts.UnknownVariables() 23.9 + if unknown: 23.10 +- print 'Warning: Used unknown variables:', ', '.join(unknown.keys()) 23.11 ++ print( 'Warning: Used unknown variables:', ', '.join(unknown.keys())) 23.12 + 23.13 + apr = str(env['APR']) 23.14 + apu = str(env['APU']) 23.15 +@@ -224,7 +224,7 @@ 23.16 + else: 23.17 + LIBNAMESTATIC = 'serf-${MAJOR}' 23.18 + 23.19 +-env.Append(RPATH=libdir, 23.20 ++env.Append( 23.21 + PDB='${TARGET.filebase}.pdb') 23.22 + 23.23 + if sys.platform == 'darwin': 23.24 +@@ -404,7 +404,7 @@ 23.25 + env.get('GSSAPI_LIBS', '')), 23.26 + }) 23.27 + 23.28 +-env.Default(lib_static, lib_shared, pkgconfig) 23.29 ++env.Default(lib_shared, pkgconfig) 23.30 + 23.31 + if CALLOUT_OKAY: 23.32 + conf = Configure(env) 23.33 +@@ -434,7 +434,7 @@ 23.34 + % (target_install_shared_path, 23.35 + install_shared_path))) 23.36 + 23.37 +-env.Alias('install-lib', [install_static, install_shared, 23.38 ++env.Alias('install-lib', [install_shared, 23.39 + ]) 23.40 + env.Alias('install-inc', env.Install(incdir, HEADER_FILES)) 23.41 + env.Alias('install-pc', env.Install(os.path.join(libdir, 'pkgconfig'),
24.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 24.2 +++ b/serf/stuff/patches/series Mon Jan 14 05:10:43 2019 +0200 24.3 @@ -0,0 +1,2 @@ 24.4 +# constructed from series of `sed` from BLFS 24.5 +serf-blfs.patch
25.1 Binary file subversion/.icon.png has changed
26.1 --- a/wxHexEditor/receipt Mon Jan 14 04:27:33 2019 +0200 26.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 26.3 @@ -1,38 +0,0 @@ 26.4 -# SliTaz package receipt. 26.5 - 26.6 -PACKAGE="wxHexEditor" 26.7 -VERSION="0.21" 26.8 -CATEGORY="development" 26.9 -SHORT_DESC="Hex editor for massive files" 26.10 -MAINTAINER="al.bobylev@gmail.com" 26.11 -LICENSE="GPL" 26.12 -WEB_SITE="http://www.wxhexeditor.org/" 26.13 -REPOLOGY="wxhexeditor" 26.14 - 26.15 -TARBALL="$PACKAGE-v$VERSION-src.tar.bz2" 26.16 -SF_PROJECT="wxhexeditor" 26.17 -WGET_URL="$SF_MIRROR/$SF_PROJECT/$TARBALL" 26.18 - 26.19 -BUILD_DEPENDS="wxWidgets28-dev libffi libtool autoconf automake gettext" 26.20 - 26.21 -compile_rules() { 26.22 - sed -i 's|^PREFIX\ *= /usr/local|PREFIX = /usr|' $src/makefile 26.23 - sed -i 's|^HOST=|HOST = '$HOST_SYSTEM'|' $src/makefile 26.24 - 26.25 - # don't know why but `backticks` unusable in this makefile 26.26 - # mhash/configure:14063 say "libtool.m4: error: problem compiling CXX test program" 26.27 - # mhash/config.log beginning from "configure:13977" 26.28 - sed -i "s|^CC =.*|CC = $(wx-config --cc)|" $src/makefile 26.29 - sed -i "s|^CXX =.*|CXX = $(wx-config --cxx)|" $src/makefile 26.30 - sed -i "s|^CXXFLAGS=.*|CXXFLAGS = $(wx-config --cxxflags) -Iudis86 -Imhash/include -MMD -O2 -c \${OPTFLAGS}|" $src/makefile 26.31 - sed -i "s|^LDFLAGS =.*|LDFLAGS = $(wx-config --libs)|" $src/makefile 26.32 - sed -i "s|^RC =.*|$(wx-config --rescomp)|" $src/makefile 26.33 - sed -i "s|^RCFLAGS =.*|RCFLAGS = $(wx-config --cxxflags | sed s/' '-m.*//g;)|" $src/makefile 26.34 - 26.35 - make OPTFLAGS="-fopenmp" && make install 26.36 -} 26.37 - 26.38 -genpkg_rules() { 26.39 - cp -a $install/* $fs 26.40 - DEPENDS="libgomp wxWidgets28" 26.41 -}
27.1 --- a/wxHexEditor/stuff/wxHexEditor.desktop Mon Jan 14 04:27:33 2019 +0200 27.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 27.3 @@ -1,10 +0,0 @@ 27.4 -[Desktop Entry] 27.5 -Type=Application 27.6 -Name=wxHexEditor 27.7 -Comment=A hex editor for huge files and devices 27.8 -Comment[ru]=Шестнадцатеричный редактор для огромных файлов и устройств 27.9 -Exec=wxHexEditor 27.10 -Terminal=false 27.11 -Icon=wxHexEditor 27.12 -Categories=Utility;FileTools; 27.13 -MimeType=*
28.1 Binary file wxhexeditor/.icon.png has changed
29.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 29.2 +++ b/wxhexeditor/receipt Mon Jan 14 05:10:43 2019 +0200 29.3 @@ -0,0 +1,23 @@ 29.4 +# SliTaz package receipt. 29.5 + 29.6 +PACKAGE="wxhexeditor" 29.7 +VERSION="0.24" 29.8 +CATEGORY="development" 29.9 +SHORT_DESC="Hex editor for massive files" 29.10 +MAINTAINER="al.bobylev@gmail.com" 29.11 +LICENSE="GPL" 29.12 +WEB_SITE="https://github.com/EUA/wxHexEditor" 29.13 + 29.14 +TARBALL="$PACKAGE-$VERSION.tar.gz" 29.15 +WGET_URL="https://github.com/EUA/wxHexEditor/archive/v$VERSION.tar.gz" 29.16 +TARBALL_SHA1="4821ccb37015830f872b7ce87e0ee9084b6b7dc1" 29.17 + 29.18 +BUILD_DEPENDS="automake libtool gfortran gettext wxwidgets-dev" 29.19 +DEPENDS="libgomp wxwidgets" 29.20 + 29.21 +compile_rules() { 29.22 + sed -i 's|VERSION = 0.24 Beta|VERSION = 0.24|' Makefile 29.23 + 29.24 + make && 29.25 + make install 29.26 +}
30.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 30.2 +++ b/wxhexeditor/stuff/patches/desktop.patch Mon Jan 14 05:10:43 2019 +0200 30.3 @@ -0,0 +1,16 @@ 30.4 +--- a/resources/wxHexEditor.desktop 30.5 ++++ b/resources/wxHexEditor.desktop 30.6 +@@ -4,10 +4,12 @@ 30.7 + Name=wxHexEditor 30.8 + GenericName=wxHexEditor 30.9 + Comment=A hex editor for huge files and devices 30.10 ++Comment[ru]=Шестнадцатеричный редактор для огромных файлов и устройств 30.11 + Exec=wxHexEditor 30.12 + Icon=wxHexEditor 30.13 + Terminal=false 30.14 + Type=Application 30.15 +-Categories=Utility;TextEditor;Utility; 30.16 ++Categories=Utility;FileTools; 30.17 ++MimeType=* 30.18 + Keywords[en_GB]=disk;drive;volume;harddisk;hdd;disc;cdrom;dvd;partition;iso;image;backup;restore;editor; 30.19 +
31.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 31.2 +++ b/wxhexeditor/stuff/patches/series Mon Jan 14 05:10:43 2019 +0200 31.3 @@ -0,0 +1,1 @@ 31.4 +desktop.patch
32.1 Binary file xchm/.icon.png has changed
33.1 --- a/xchm/receipt Mon Jan 14 04:27:33 2019 +0200 33.2 +++ b/xchm/receipt Mon Jan 14 05:10:43 2019 +0200 33.3 @@ -1,28 +1,31 @@ 33.4 -# SliTaz package receipt. 33.5 +# SliTaz package receipt v2. 33.6 33.7 PACKAGE="xchm" 33.8 -VERSION="1.19" 33.9 +VERSION="1.23" 33.10 CATEGORY="utilities" 33.11 SHORT_DESC="Cross-platform GUI for chmlib" 33.12 -MAINTAINER="allan316@gmail.com" 33.13 +MAINTAINER="devel@slitaz.org" 33.14 LICENSE="GPL2" 33.15 WEB_SITE="http://xchm.sourceforge.net/" 33.16 33.17 TARBALL="$PACKAGE-$VERSION.tar.gz" 33.18 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 33.19 +TARBALL_SHA1="d0de589775164ee8123b25082c54587f0cc72e1d" 33.20 33.21 -BUILD_DEPENDS="wxWidgets28-dev chmlib-dev" 33.22 +BUILD_DEPENDS="wxwidgets-dev chmlib-dev" 33.23 +DEPENDS="chmlib wxwidgets" 33.24 33.25 compile_rules() { 33.26 ./configure $CONFIGURE_ARGS && 33.27 make && 33.28 - make install 33.29 + make install || return 1 33.30 + 33.31 + rm -r $install/usr/share/pixmaps/ 33.32 + 33.33 + install -Dm644 art/xchm-16.png $install/usr/share/icons/hicolor/16x16/apps/xchm.png 33.34 + install -Dm644 art/xchm-48.png $install/usr/share/icons/hicolor/48x48/apps/xchm.png 33.35 + install -Dm644 art/xchmdoc-16.png $install/usr/share/icons/hicolor/16x16/mimetypes/application-vnd.ms-htmlhelp.png 33.36 + install -Dm644 art/xchmdoc-48.png $install/usr/share/icons/hicolor/48x48/mimetypes/application-vnd.ms-htmlhelp.png 33.37 + 33.38 + install -Dm644 $stuff/xchm.desktop $install/usr/share/applications/xchm.desktop 33.39 } 33.40 - 33.41 -genpkg_rules() { 33.42 - mkdir -p $fs/usr/share/locale 33.43 - cp -a $install/usr/bin $fs/usr 33.44 - cp -a $install/usr/share/locale/fr $fs/usr/share/locale 33.45 - cp -a $install/usr/share/pixmaps $fs/usr/share 33.46 - DEPENDS="wxWidgets28 chmlib libxdamage libxxf86vm" 33.47 -}
34.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 34.2 +++ b/xchm/stuff/patches/series Mon Jan 14 05:10:43 2019 +0200 34.3 @@ -0,0 +1,3 @@ 34.4 +# from Arch Linux 34.5 +# https://www.archlinux.org/packages/community/x86_64/xchm/ 34.6 +xchm-wx3.0-compat.patch
35.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 35.2 +++ b/xchm/stuff/patches/xchm-wx3.0-compat.patch Mon Jan 14 05:10:43 2019 +0200 35.3 @@ -0,0 +1,32 @@ 35.4 +Description: Fix code to compile with wxwidgets 3.0 35.5 + Drops support for wx < 2.7, which is just not relevant now. And in fact 35.6 + configure.ac checks for at least 2.8.0. 35.7 +Author: Olly Betts <olly@survex.com> 35.8 +Last-Update: 2014-03-07 35.9 + 35.10 +--- xchm-1.23.orig/src/chmframe.cpp 35.11 ++++ xchm-1.23/src/chmframe.cpp 35.12 +@@ -265,11 +265,7 @@ void CHMFrame::OnChangeFonts(wxCommandEv 35.13 + enu.EnumerateFacenames(); 35.14 + _normalFonts = new wxArrayString; 35.15 + 35.16 +-#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7 35.17 + *_normalFonts = enu.GetFacenames(); 35.18 +-#else 35.19 +- *_normalFonts = *enu.GetFacenames(); 35.20 +-#endif 35.21 + _normalFonts->Sort(); 35.22 + } 35.23 + 35.24 +@@ -278,11 +274,7 @@ void CHMFrame::OnChangeFonts(wxCommandEv 35.25 + enu.EnumerateFacenames(wxFONTENCODING_SYSTEM, TRUE); 35.26 + _fixedFonts = new wxArrayString; 35.27 + 35.28 +-#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7 35.29 + *_fixedFonts = enu.GetFacenames(); 35.30 +-#else 35.31 +- *_fixedFonts = *enu.GetFacenames(); 35.32 +-#endif 35.33 + _fixedFonts->Sort(); 35.34 + } 35.35 +
36.1 --- a/xchm/stuff/xchm.desktop Mon Jan 14 04:27:33 2019 +0200 36.2 +++ b/xchm/stuff/xchm.desktop Mon Jan 14 05:10:43 2019 +0200 36.3 @@ -1,15 +1,9 @@ 36.4 [Desktop Entry] 36.5 -Encoding=UTF-8 36.6 +Type=Application 36.7 Name=xCHM 36.8 -GenericName=chm file viewer 36.9 -GenericName[it]=Visore di file chm 36.10 -GenericName[fr]=Visualisation de fichiers chm 36.11 Comment=wxGTK based GUI front-end to chmlib 36.12 Comment[fr]=Une interface pour chmlib utilisant wxGTK 36.13 Exec=xchm 36.14 -Icon=xchm-32 36.15 -Terminal=false 36.16 -Type=Application 36.17 -MimeType=application/x-chm; 36.18 -Categories=GTK;Utility; 36.19 - 36.20 +Icon=xchm 36.21 +Categories=GTK;Graphics;Viewer; 36.22 +MimeType=application/vnd.ms-htmlhelp;