wok-next rev 20617
Fix build xchat, xchat-plugin, xget, xine-plugin; xorg-xf86-video-geode isn't compatible with 64-bit arch
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Sat Apr 21 13:54:55 2018 +0300 (2018-04-21) |
| parents | b4e75a82fdf3 |
| children | d329acd936d3 |
| files | xchat-plugin/receipt xchat-plugin/stuff/xc286-smallfixes.diff xchat-plugin/stuff/xchat-2.8.6-gtk+-2.13.patch xchat/receipt xchat/stuff/patches/series xchat/stuff/patches/ssl.patch xchat/stuff/xc286-smallfixes.diff xchat/stuff/xchat-2.8.6-gtk+-2.13.patch xget/receipt xine-plugin/receipt xorg-xf86-video-geode/receipt |
line diff
1.1 --- a/xchat-plugin/receipt Sat Apr 21 05:15:11 2018 +0300 1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 1.3 @@ -1,38 +0,0 @@ 1.4 -# SliTaz package receipt v2. 1.5 - 1.6 -PACKAGE="xchat-plugin" 1.7 -VERSION="2.8.8" 1.8 -CATEGORY="network" 1.9 -SHORT_DESC="IRC client using GTK+ with plugins support" 1.10 -MAINTAINER="lenios@slitaz.org" 1.11 -LICENSE="GPL2" 1.12 -WEB_SITE="http://www.xchat.org/" 1.13 - 1.14 -TARBALL="xchat-$VERSION.tar.bz2" 1.15 -WGET_URL="http://www.xchat.org/files/source/${VERSION%.*}/$TARBALL" 1.16 - 1.17 -BUILD_DEPENDS="gtk+-dev dbus-dev openssl shared-mime-info \ 1.18 -gettext-tools perl-dev" 1.19 - 1.20 -compile_rules() { 1.21 - sed -i -e 's|glib/gslist.h|glib.h|' -e 's|glib/giochannel.h|glib.h|' \ 1.22 - -e 's|glib/glist.h|glib.h|' -e 's|glib/gstrfuncs.h|glib.h|' \ 1.23 - -e 's|glib/gutils.h|glib.h|' src/common/xchat.h 1.24 - sed -i 's|glib/ghash.h|glib.h|' src/common/servlist.c src/common/text.c 1.25 - sed -i 's|glib/gmarkup.h|glib.h|' src/common/util.c 1.26 - 1.27 - ./configure \ 1.28 - --disable-tcl \ 1.29 - --enable-spell=static \ 1.30 - --enable-ipv6 \ 1.31 - $CONFIGURE_ARGS && 1.32 - fix libtool && 1.33 - make && 1.34 - make DESTDIR=$DESTDIR install 1.35 -} 1.36 - 1.37 -genpkg_rules() { 1.38 - copy @std 1.39 - DEPENDS="gtk+ dbus openssl gettext-base dbus-glib xorg-libXdamage" 1.40 - PROVIDE="xchat" 1.41 -}
2.1 --- a/xchat-plugin/stuff/xc286-smallfixes.diff Sat Apr 21 05:15:11 2018 +0300 2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 2.3 @@ -1,68 +0,0 @@ 2.4 -# 2.5 -# Various small fixes from CVS that are considered safe to apply to 2.8.6. 2.6 -# 2.7 ---- xchat-2.8.6/src/common/cfgfiles.c 2008-02-05 21:02:47.000000000 +1100 2.8 -+++ xchat-2.8.6p1/src/common/cfgfiles.c 2008-06-15 13:45:43.000000000 +1000 2.9 -@@ -886,7 +886,6 @@ 2.10 - set_showval (session *sess, const struct prefs *var, char *tbuf) 2.11 - { 2.12 - int len, dots, j; 2.13 -- static const char *offon[] = { "OFF", "ON" }; 2.14 - 2.15 - len = strlen (var->name); 2.16 - memcpy (tbuf, var->name, len); 2.17 -@@ -909,8 +908,10 @@ 2.18 - *((int *) &prefs + var->offset)); 2.19 - break; 2.20 - case TYPE_BOOL: 2.21 -- sprintf (tbuf + len, "\0033:\017 %s\n", offon[ 2.22 -- *((int *) &prefs + var->offset)]); 2.23 -+ if (*((int *) &prefs + var->offset)) 2.24 -+ sprintf (tbuf + len, "\0033:\017 %s\n", "ON"); 2.25 -+ else 2.26 -+ sprintf (tbuf + len, "\0033:\017 %s\n", "OFF"); 2.27 - break; 2.28 - } 2.29 - PrintText (sess, tbuf); 2.30 ---- xchat-2.8.6/src/common/chanopt.c 2008-06-10 22:00:55.000000000 +1000 2.31 -+++ xchat-2.8.6p1/src/common/chanopt.c 2008-06-15 13:48:04.000000000 +1000 2.32 -@@ -32,7 +32,7 @@ 2.33 - 2.34 - #define S_F(xx) STRUCT_OFFSET_STR(struct session,xx) 2.35 - 2.36 --channel_options chanopt[] = 2.37 -+static const channel_options chanopt[] = 2.38 - { 2.39 - {"alert_beep", "BEEP", S_F(alert_beep)}, 2.40 - {"alert_taskbar", NULL, S_F(alert_taskbar)}, 2.41 ---- xchat-2.8.6/src/common/servlist.c 2008-04-01 19:22:34.000000000 +1100 2.42 -+++ xchat-2.8.6p1/src/common/servlist.c 2008-06-15 13:57:41.000000000 +1000 2.43 -@@ -509,6 +509,8 @@ 2.44 - list = g_slist_nth (net->servlist, net->selected); 2.45 - if (!list) 2.46 - list = net->servlist; 2.47 -+ if (!list) 2.48 -+ return; 2.49 - ircserv = list->data; 2.50 - 2.51 - /* incase a protocol switch is added to the servlist gui */ 2.52 ---- xchat-2.8.6/src/common/text.c 2008-03-28 13:20:04.000000000 +1100 2.53 -+++ xchat-2.8.6p1/src/common/text.c 2008-06-15 13:59:59.000000000 +1000 2.54 -@@ -216,7 +216,7 @@ 2.55 - static void 2.56 - scrollback_save (session *sess, char *text) 2.57 - { 2.58 -- char buf[1024]; 2.59 -+ char buf[512 * 4]; 2.60 - time_t stamp; 2.61 - int len; 2.62 - 2.63 -@@ -266,7 +266,7 @@ 2.64 - scrollback_load (session *sess) 2.65 - { 2.66 - int fh; 2.67 -- char buf[1024]; 2.68 -+ char buf[512 * 4]; 2.69 - char *text; 2.70 - time_t stamp; 2.71 - int lines;
3.1 --- a/xchat-plugin/stuff/xchat-2.8.6-gtk+-2.13.patch Sat Apr 21 05:15:11 2018 +0300 3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 3.3 @@ -1,10 +0,0 @@ 3.4 ---- xchat-2.8.6/src/fe-gtk/xtext.h.orig 2008-02-24 05:48:02.000000000 +0100 3.5 -+++ xchat-2.8.6/src/fe-gtk/xtext.h 2008-09-06 02:18:39.000000000 +0200 3.6 -@@ -270,6 +270,6 @@ 3.7 - xtext_buffer *gtk_xtext_buffer_new (GtkXText *xtext); 3.8 - void gtk_xtext_buffer_free (xtext_buffer *buf); 3.9 - void gtk_xtext_buffer_show (GtkXText *xtext, xtext_buffer *buf, int render); 3.10 --GtkType gtk_xtext_get_type (void); 3.11 -+GType gtk_xtext_get_type (void); 3.12 - 3.13 - #endif
4.1 --- a/xchat/receipt Sat Apr 21 05:15:11 2018 +0300 4.2 +++ b/xchat/receipt Sat Apr 21 13:54:55 2018 +0300 4.3 @@ -11,21 +11,31 @@ 4.4 TARBALL="$PACKAGE-$VERSION.tar.bz2" 4.5 WGET_URL="http://www.xchat.org/files/source/${VERSION%.*}/$TARBALL" 4.6 4.7 -BUILD_DEPENDS="gtk+-dev dbus-dev openssl-dev shared-mime-info \ 4.8 +BUILD_DEPENDS="gtk+-dev dbus-dev openssl10-dev shared-mime-info \ 4.9 gettext-tools perl-dev" 4.10 +SPLIT="xchat-plugin:plugin" 4.11 4.12 compile_rules() { 4.13 + export CPPFLAGS="$CPPFLAGS -I/usr/include/openssl-1.0" 4.14 + export LDFLAGS="$LDFLAGS -L/usr/lib/openssl-1.0 -lgmodule-2.0" 4.15 + 4.16 sed -i -e 's|glib/gslist.h|glib.h|' -e 's|glib/giochannel.h|glib.h|' \ 4.17 -e 's|glib/glist.h|glib.h|' -e 's|glib/gstrfuncs.h|glib.h|' \ 4.18 -e 's|glib/gutils.h|glib.h|' src/common/xchat.h 4.19 sed -i 's|glib/ghash.h|glib.h|' src/common/servlist.c src/common/text.c 4.20 sed -i 's|glib/gmarkup.h|glib.h|' src/common/util.c 4.21 4.22 + case $SET in 4.23 + '') SET_ARGS='--disable-plugin';; 4.24 + plugin) SET_ARGS='';; 4.25 + esac 4.26 + 4.27 ./configure \ 4.28 - --disable-plugin \ 4.29 --disable-tcl \ 4.30 --enable-spell=static \ 4.31 --enable-ipv6 \ 4.32 + --enable-openssl=/usr/lib/openssl-1.0 \ 4.33 + $SET_ARGS \ 4.34 $CONFIGURE_ARGS && 4.35 fix libtool && 4.36 make && 4.37 @@ -33,6 +43,16 @@ 4.38 } 4.39 4.40 genpkg_rules() { 4.41 - copy @std 4.42 - DEPENDS="gtk+ dbus openssl gettext-base dbus-glib xorg-libXdamage" 4.43 + case $PACKAGE in 4.44 + xchat) 4.45 + copy @std 4.46 + DEPENDS="gdk-pixbuf glib gtk+ openssl10 pango perl-core xorg-libX11" 4.47 + ;; 4.48 + xchat-plugin) 4.49 + copy @std 4.50 + DEPENDS="gdk-pixbuf glib gtk+ openssl10 pango perl-core xorg-libX11" 4.51 + PROVIDE="xchat" 4.52 + CAT="network|with plugins support" 4.53 + ;; 4.54 + esac 4.55 }
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/xchat/stuff/patches/series Sat Apr 21 13:54:55 2018 +0300 5.3 @@ -0,0 +1,2 @@ 5.4 +# from https://bugzilla.redhat.com/show_bug.cgi?id=1198317 5.5 +ssl.patch
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 6.2 +++ b/xchat/stuff/patches/ssl.patch Sat Apr 21 13:54:55 2018 +0300 6.3 @@ -0,0 +1,37 @@ 6.4 +From 527eb322a5bfa97d5716e7f8178e319c515065a2 Mon Sep 17 00:00:00 2001 6.5 +From: Marc Deslauriers <marc.deslauriers@ubuntu.com> 6.6 +Date: Mon, 20 Oct 2014 10:08:26 -0400 6.7 +Subject: [PATCH] Don't force the use of SSLv3. 6.8 + 6.9 +SSLv3 should no longer be used for security reasons. Let the best 6.10 +connection method be automatically determined by using SSLv23_client_method() 6.11 +and SSLv23_server_method(). 6.12 +--- 6.13 + src/common/ssl.c | 4 ++-- 6.14 + 1 file changed, 2 insertions(+), 2 deletions(-) 6.15 + 6.16 +diff --git a/src/common/ssl.c b/src/common/ssl.c 6.17 +index a18ad47..35eb237 100644 6.18 +--- a/src/common/ssl.c 6.19 ++++ b/src/common/ssl.c 6.20 +@@ -70,7 +70,7 @@ _SSL_context_init (void (*info_cb_func), int server) 6.21 + 6.22 + SSLeay_add_ssl_algorithms (); 6.23 + SSL_load_error_strings (); 6.24 +- ctx = SSL_CTX_new (server ? SSLv3_server_method() : SSLv3_client_method ()); 6.25 ++ ctx = SSL_CTX_new (server ? SSLv23_server_method() : SSLv23_client_method ()); 6.26 + 6.27 + SSL_CTX_set_session_cache_mode (ctx, SSL_SESS_CACHE_BOTH); 6.28 + SSL_CTX_set_timeout (ctx, 300); 6.29 +@@ -281,7 +281,7 @@ _SSL_socket (SSL_CTX *ctx, int sd) 6.30 + __SSL_critical_error ("SSL_new"); 6.31 + 6.32 + SSL_set_fd (ssl, sd); 6.33 +- if (ctx->method == SSLv3_client_method()) 6.34 ++ if (ctx->method == SSLv23_client_method()) 6.35 + SSL_set_connect_state (ssl); 6.36 + else 6.37 + SSL_set_accept_state(ssl); 6.38 +-- 6.39 +2.1.0 6.40 +
7.1 --- a/xchat/stuff/xc286-smallfixes.diff Sat Apr 21 05:15:11 2018 +0300 7.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 7.3 @@ -1,68 +0,0 @@ 7.4 -# 7.5 -# Various small fixes from CVS that are considered safe to apply to 2.8.6. 7.6 -# 7.7 ---- xchat-2.8.6/src/common/cfgfiles.c 2008-02-05 21:02:47.000000000 +1100 7.8 -+++ xchat-2.8.6p1/src/common/cfgfiles.c 2008-06-15 13:45:43.000000000 +1000 7.9 -@@ -886,7 +886,6 @@ 7.10 - set_showval (session *sess, const struct prefs *var, char *tbuf) 7.11 - { 7.12 - int len, dots, j; 7.13 -- static const char *offon[] = { "OFF", "ON" }; 7.14 - 7.15 - len = strlen (var->name); 7.16 - memcpy (tbuf, var->name, len); 7.17 -@@ -909,8 +908,10 @@ 7.18 - *((int *) &prefs + var->offset)); 7.19 - break; 7.20 - case TYPE_BOOL: 7.21 -- sprintf (tbuf + len, "\0033:\017 %s\n", offon[ 7.22 -- *((int *) &prefs + var->offset)]); 7.23 -+ if (*((int *) &prefs + var->offset)) 7.24 -+ sprintf (tbuf + len, "\0033:\017 %s\n", "ON"); 7.25 -+ else 7.26 -+ sprintf (tbuf + len, "\0033:\017 %s\n", "OFF"); 7.27 - break; 7.28 - } 7.29 - PrintText (sess, tbuf); 7.30 ---- xchat-2.8.6/src/common/chanopt.c 2008-06-10 22:00:55.000000000 +1000 7.31 -+++ xchat-2.8.6p1/src/common/chanopt.c 2008-06-15 13:48:04.000000000 +1000 7.32 -@@ -32,7 +32,7 @@ 7.33 - 7.34 - #define S_F(xx) STRUCT_OFFSET_STR(struct session,xx) 7.35 - 7.36 --channel_options chanopt[] = 7.37 -+static const channel_options chanopt[] = 7.38 - { 7.39 - {"alert_beep", "BEEP", S_F(alert_beep)}, 7.40 - {"alert_taskbar", NULL, S_F(alert_taskbar)}, 7.41 ---- xchat-2.8.6/src/common/servlist.c 2008-04-01 19:22:34.000000000 +1100 7.42 -+++ xchat-2.8.6p1/src/common/servlist.c 2008-06-15 13:57:41.000000000 +1000 7.43 -@@ -509,6 +509,8 @@ 7.44 - list = g_slist_nth (net->servlist, net->selected); 7.45 - if (!list) 7.46 - list = net->servlist; 7.47 -+ if (!list) 7.48 -+ return; 7.49 - ircserv = list->data; 7.50 - 7.51 - /* incase a protocol switch is added to the servlist gui */ 7.52 ---- xchat-2.8.6/src/common/text.c 2008-03-28 13:20:04.000000000 +1100 7.53 -+++ xchat-2.8.6p1/src/common/text.c 2008-06-15 13:59:59.000000000 +1000 7.54 -@@ -216,7 +216,7 @@ 7.55 - static void 7.56 - scrollback_save (session *sess, char *text) 7.57 - { 7.58 -- char buf[1024]; 7.59 -+ char buf[512 * 4]; 7.60 - time_t stamp; 7.61 - int len; 7.62 - 7.63 -@@ -266,7 +266,7 @@ 7.64 - scrollback_load (session *sess) 7.65 - { 7.66 - int fh; 7.67 -- char buf[1024]; 7.68 -+ char buf[512 * 4]; 7.69 - char *text; 7.70 - time_t stamp; 7.71 - int lines;
8.1 --- a/xchat/stuff/xchat-2.8.6-gtk+-2.13.patch Sat Apr 21 05:15:11 2018 +0300 8.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 8.3 @@ -1,10 +0,0 @@ 8.4 ---- xchat-2.8.6/src/fe-gtk/xtext.h.orig 2008-02-24 05:48:02.000000000 +0100 8.5 -+++ xchat-2.8.6/src/fe-gtk/xtext.h 2008-09-06 02:18:39.000000000 +0200 8.6 -@@ -270,6 +270,6 @@ 8.7 - xtext_buffer *gtk_xtext_buffer_new (GtkXText *xtext); 8.8 - void gtk_xtext_buffer_free (xtext_buffer *buf); 8.9 - void gtk_xtext_buffer_show (GtkXText *xtext, xtext_buffer *buf, int render); 8.10 --GtkType gtk_xtext_get_type (void); 8.11 -+GType gtk_xtext_get_type (void); 8.12 - 8.13 - #endif
9.1 --- a/xget/receipt Sat Apr 21 05:15:11 2018 +0300 9.2 +++ b/xget/receipt Sat Apr 21 13:54:55 2018 +0300 9.3 @@ -1,30 +1,30 @@ 9.4 -# SliTaz package receipt. 9.5 +# SliTaz package receipt v2. 9.6 9.7 PACKAGE="xget" 9.8 -SOURCE="xcpu" 9.9 VERSION="1.2.3" 9.10 CATEGORY="network" 9.11 -SHORT_DESC="Scalable file-transfer agent." 9.12 +SHORT_DESC="Scalable file-transfer agent" 9.13 MAINTAINER="pascal.bellard@slitaz.org" 9.14 LICENSE="MIT GPL" 9.15 -TARBALL="${SOURCE}1-$VERSION.tar.gz" 9.16 -WEB_SITE="http://xcpu.sourceforge.net/xget" 9.17 -WGET_URL="$SF_MIRROR/xcpu/$VERSION/$TARBALL" 9.18 +WEB_SITE="http://xcpu.sourceforge.net/xget/" 9.19 9.20 -DEPENDS="" 9.21 -BUILD_DEPENDS="openssl openssl-dev elfutils-dev zlib-dev" 9.22 +TARBALL="xcpu1-$VERSION.tar.gz" 9.23 +WGET_URL="$SF_MIRROR/xcpu/$TARBALL" 9.24 9.25 -# Rules to configure and make the package. 9.26 -compile_rules() 9.27 -{ 9.28 +BUILD_DEPENDS="openssl10-dev elfutils-dev zlib-dev" 9.29 + 9.30 +compile_rules() { 9.31 + sed -i '/^CFLAGS/ s|$| -I/usr/include/openssl-1.0|' \ 9.32 + libxauth/Makefile statfs/Makefile 9.33 sed -i 's|<stdio.h>|&\n#include <sys/resource.h>|' xcpufs/xcpufs.c 9.34 + 9.35 make -j 1 && 9.36 - make INSTALLPREFIX=$DESTDIR/usr install 9.37 + make INSTALLPREFIX=$DESTDIR/usr install || return 1 9.38 + 9.39 + cook_pick_docs doc/*.pdf 9.40 } 9.41 9.42 -# Rules to gen a SliTaz package suitable for Tazpkg. 9.43 -genpkg_rules() 9.44 -{ 9.45 - mkdir -p $fs/usr/sbin 9.46 - cp -a $install/usr/sbin/xget $fs/usr/sbin 9.47 +genpkg_rules() { 9.48 + copy @std 9.49 + DEPENDS="zlib" 9.50 }
10.1 --- a/xine-plugin/receipt Sat Apr 21 05:15:11 2018 +0300 10.2 +++ b/xine-plugin/receipt Sat Apr 21 13:54:55 2018 +0300 10.3 @@ -11,7 +11,7 @@ 10.4 TARBALL="$PACKAGE-$VERSION.tar.bz2" 10.5 WGET_URL="$SF_MIRROR/xine/$TARBALL" 10.6 10.7 -BUILD_DEPENDS="xine-lib xine-lib-dev xorg-dev gfortran" 10.8 +BUILD_DEPENDS="shared-mime-info xine-lib xine-lib-dev xorg-dev gfortran" 10.9 10.10 compile_rules() { 10.11 mkdir -p $DESTDIR/root/.mozilla/plugins 10.12 @@ -23,7 +23,7 @@ 10.13 10.14 mkdir -p $install/usr/share/xine 10.15 mv $install/root/.mozilla/plugins/* $install/usr/share/xine/ 10.16 - rm -r $install/root/.mozilla/plugins/ 10.17 + rm -r $install/root/ 10.18 } 10.19 10.20 genpkg_rules() {
11.1 --- a/xorg-xf86-video-geode/receipt Sat Apr 21 05:15:11 2018 +0300 11.2 +++ b/xorg-xf86-video-geode/receipt Sat Apr 21 13:54:55 2018 +0300 11.3 @@ -7,12 +7,12 @@ 11.4 MAINTAINER="pankso@slitaz.org" 11.5 LICENSE="MIT" 11.6 WEB_SITE="https://www.x.org/wiki/GeodeDriver/" 11.7 +HOST_ARCH="i486" 11.8 11.9 TARBALL="xf86-video-geode-$VERSION.tar.bz2" 11.10 WGET_URL="$XORG_MIRROR/driver/$TARBALL" 11.11 11.12 BUILD_DEPENDS="xorg-server-dev" 11.13 -SPLIT="xorg-xf86-video-geode-dev" 11.14 11.15 compile_rules() { 11.16 ./configure $CONFIGURE_ARGS && 11.17 @@ -22,15 +22,7 @@ 11.18 } 11.19 11.20 genpkg_rules() { 11.21 - case $PACKAGE in 11.22 - *-geode) 11.23 - copy @std 11.24 - DEPENDS="xorg-server" 11.25 - TAGS="xorg display" 11.26 - ;; 11.27 - *-dev) 11.28 - copy @dev 11.29 - DEPENDS="xorg-xf86-video-geode xorg-server-dev" 11.30 - ;; 11.31 - esac 11.32 + copy @std 11.33 + DEPENDS="xorg-server" 11.34 + TAGS="xorg display" 11.35 }