diff options
Diffstat (limited to 'source')
7 files changed, 73 insertions, 87 deletions
diff --git a/source/l/ncurses/ncurses.mkhashsize.diff b/source/l/ncurses/ncurses.mkhashsize.diff index 7694a39d..035956da 100644 --- a/source/l/ncurses/ncurses.mkhashsize.diff +++ b/source/l/ncurses/ncurses.mkhashsize.diff @@ -1,11 +1,11 @@ ---- ./include/MKhashsize.sh.orig 2006-10-21 19:45:39.000000000 -0500 -+++ ./include/MKhashsize.sh 2006-12-27 17:21:06.000000000 -0600 +--- ./include/MKhashsize.sh.orig 2019-04-22 14:07:41.451003244 -0500 ++++ ./include/MKhashsize.sh 2019-04-22 14:10:09.163003249 -0500 @@ -35,7 +35,7 @@ echo " */" - CAPS="${1-Caps}" --TABSIZE=`grep -v '^[ #]' $CAPS | grep -v "^$" | grep -v "^capalias"| grep -v "^infoalias" | wc -l` -+TABSIZE=$(grep -v '^[ #]' $CAPS | grep -v "^$" | grep -v "^capalias"| grep -v "^infoalias" | wc -l) + test $# = 0 && set Caps +-TABSIZE=`cat "$@" | grep -v '^[ #]' | grep -v "^$" | grep -v "^capalias"| grep -v "^infoalias" | grep -v "^userdef" | grep -v "^used_by" | wc -l` ++TABSIZE=$(cat "$@" | grep -v '^[ #]' | grep -v "^$" | grep -v "^capalias"| grep -v "^infoalias" | grep -v "^userdef" | grep -v "^used_by" | wc -l) echo "" echo "#define CAPTABSIZE ${TABSIZE}" diff --git a/source/n/wpa_supplicant/patches/wpa_supplicant-2.7-fix-undefined-remove-ie.patch b/source/n/wpa_supplicant/patches/wpa_supplicant-2.7-fix-undefined-remove-ie.patch deleted file mode 100644 index 97a8cc7f..00000000 --- a/source/n/wpa_supplicant/patches/wpa_supplicant-2.7-fix-undefined-remove-ie.patch +++ /dev/null @@ -1,38 +0,0 @@ -From f2973fa39d6109f0f34969e91551a98dc340d537 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <j@w1.fi> -Date: Mon, 3 Dec 2018 12:00:26 +0200 -Subject: FT: Fix CONFIG_IEEE80211X=y build without CONFIG_FILS=y - -remove_ie() was defined within an ifdef CONFIG_FILS block while it is -now needed even without CONFIG_FILS=y. Remove the CONFIG_FILS condition -there. - -Fixes 8c41734e5de1 ("FT: Fix Reassociation Request IEs during FT protocol") -Signed-off-by: Jouni Malinen <j@w1.fi> ---- - wpa_supplicant/sme.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/wpa_supplicant/sme.c b/wpa_supplicant/sme.c -index 39c8069..f77f751 100644 ---- a/wpa_supplicant/sme.c -+++ b/wpa_supplicant/sme.c -@@ -1386,7 +1386,6 @@ void sme_event_auth(struct wpa_supplicant *wpa_s, union wpa_event_data *data) - } - - --#ifdef CONFIG_FILS - #ifdef CONFIG_IEEE80211R - static void remove_ie(u8 *buf, size_t *len, u8 eid) - { -@@ -1401,7 +1400,6 @@ static void remove_ie(u8 *buf, size_t *len, u8 eid) - } - } - #endif /* CONFIG_IEEE80211R */ --#endif /* CONFIG_FILS */ - - - void sme_associate(struct wpa_supplicant *wpa_s, enum wpas_mode mode, --- -cgit v0.12 - diff --git a/source/n/wpa_supplicant/patches/wpa_supplicant-assoc-timeout.patch b/source/n/wpa_supplicant/patches/wpa_supplicant-assoc-timeout.patch deleted file mode 100644 index c3b3568c..00000000 --- a/source/n/wpa_supplicant/patches/wpa_supplicant-assoc-timeout.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up wpa_supplicant-0.7.3/wpa_supplicant/wpa_supplicant.c.assoc-timeout wpa_supplicant-0.7.3/wpa_supplicant/wpa_supplicant.c ---- wpa_supplicant-0.7.3/wpa_supplicant/wpa_supplicant.c.assoc-timeout 2010-09-07 10:43:39.000000000 -0500 -+++ wpa_supplicant-0.7.3/wpa_supplicant/wpa_supplicant.c 2010-12-07 18:57:45.163457000 -0600 -@@ -1262,10 +1262,10 @@ void wpa_supplicant_associate(struct wpa - - if (assoc_failed) { - /* give IBSS a bit more time */ -- timeout = ssid->mode == WPAS_MODE_IBSS ? 10 : 5; -+ timeout = ssid->mode == WPAS_MODE_IBSS ? 20 : 10; - } else if (wpa_s->conf->ap_scan == 1) { - /* give IBSS a bit more time */ -- timeout = ssid->mode == WPAS_MODE_IBSS ? 20 : 10; -+ timeout = ssid->mode == WPAS_MODE_IBSS ? 20 : 20; - } - wpa_supplicant_req_auth_timeout(wpa_s, timeout, 0); - } diff --git a/source/n/wpa_supplicant/patches/wpa_supplicant-dbus-service-file-args.patch b/source/n/wpa_supplicant/patches/wpa_supplicant-dbus-service-file-args.patch deleted file mode 100644 index b7478dad..00000000 --- a/source/n/wpa_supplicant/patches/wpa_supplicant-dbus-service-file-args.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in.fedora wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in ---- wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in.fedora 2008-03-02 20:58:35.000000000 -0500 -+++ wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in 2008-03-02 20:58:41.000000000 -0500 -@@ -1,5 +1,5 @@ - [D-BUS Service] - Name=fi.w1.wpa_supplicant1 --Exec=@BINDIR@/wpa_supplicant -u -+Exec=@BINDIR@/wpa_supplicant -B -u -f /var/log/wpa_supplicant.log -c /etc/wpa_supplicant/wpa_supplicant.conf -P /var/run/wpa_supplicant.pid - User=root - SystemdService=wpa_supplicant.service -diff -up wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in.fedora wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in ---- wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in.fedora 2008-03-02 20:58:35.000000000 -0500 -+++ wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in 2008-03-02 20:58:41.000000000 -0500 -@@ -1,5 +1,5 @@ - [D-BUS Service] - Name=fi.epitest.hostap.WPASupplicant --Exec=@BINDIR@/wpa_supplicant -u -+Exec=@BINDIR@/wpa_supplicant -B -u -f /var/log/wpa_supplicant.log -c /etc/wpa_supplicant/wpa_supplicant.conf -P /var/run/wpa_supplicant.pid - User=root - SystemdService=wpa_supplicant.service diff --git a/source/n/wpa_supplicant/wpa_supplicant.SlackBuild b/source/n/wpa_supplicant/wpa_supplicant.SlackBuild index f8386788..5273f8f1 100755 --- a/source/n/wpa_supplicant/wpa_supplicant.SlackBuild +++ b/source/n/wpa_supplicant/wpa_supplicant.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=wpa_supplicant VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-1} SRCVERSION=$(printf $VERSION | tr _ -) @@ -85,12 +85,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -zcat $CWD/patches/wpa_supplicant-assoc-timeout.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/wpa_supplicant-dbus-service-file-args.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/patches/wpa_supplicant-flush-debug-output.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/patches/wpa_supplicant-gui-qt4.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/patches/wpa_supplicant-quiet-scan-results-message.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/wpa_supplicant-2.7-fix-undefined-remove-ie.patch.gz | patch -p1 --verbose || exit 1 # Allow legacy tls to avoid breaking WPA2-Enterprise: zcat $CWD/patches/allow-tlsv1.patch.gz | patch -p1 --verbose || exit 1 diff --git a/source/xap/xpdf/xpdf.SlackBuild b/source/xap/xpdf/xpdf.SlackBuild index dd2f4815..5d5d05e4 100755 --- a/source/xap/xpdf/xpdf.SlackBuild +++ b/source/xap/xpdf/xpdf.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2017, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xpdf VERSION=4.00 PATCHLEVEL= -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -91,6 +91,7 @@ cd build -DMAN_INSTALL_DIR=/usr/man \ -DCMAKE_BUILD_TYPE=Release \ -DXPDFWIDGET_PRINTING=1 \ + -DSYSTEM_XPDFRC="/etc/xpdfrc" \ .. || exit 1 make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 @@ -110,10 +111,10 @@ mkdir -p $PKG/etc cat doc/sample-xpdfrc > $PKG/etc/xpdfrc mv $PKG/etc/xpdfrc $PKG/etc/xpdfrc.new -# Add desktop menu entry and icon +# Add desktop menu entry and icon: mkdir -p $PKG/usr/share/{applications,pixmaps} cat $CWD/xpdf.desktop > $PKG/usr/share/applications/xpdf.desktop -cat xpdf/xpdfIcon.xpm > $PKG/usr/share/pixmaps/xpdfIcon.xpm +cat $CWD/xpdfIcon.xpm > $PKG/usr/share/pixmaps/xpdfIcon.xpm # Add additional language support: for language in xpdf-arabic xpdf-chinese-simplified xpdf-chinese-traditional xpdf-cyrillic xpdf-greek xpdf-hebrew xpdf-japanese xpdf-korean xpdf-latin2 xpdf-thai xpdf-turkish ; do diff --git a/source/xap/xpdf/xpdfIcon.xpm b/source/xap/xpdf/xpdfIcon.xpm new file mode 100644 index 00000000..5e05d20e --- /dev/null +++ b/source/xap/xpdf/xpdfIcon.xpm @@ -0,0 +1,62 @@ +/* XPM */ +static char *xpdfIcon[] = { +/* width height num_colors chars_per_pixel */ +" 48 48 7 1", +/* colors */ +". c #000000", +"# c #a00000", +"a c #a0a0a0", +"b c #c0c0c0", +"c c #e00000", +"d c #e0e0e0", +"e c #ffffff", +/* pixels */ +"................................................", +"................................................", +"................................................", +"................................................", +"#ccccccc#................................#ccc#..", +".#ccccccc#..............................#ccc#...", +"..#ccccccc#............................#ccc#....", +"...#ccccccc#................bbba.....abbbc#.....", +"....#ccccccc#...............beea....debbed......", +".....#ccccccc#...............ee....bebccee......", +"......#ccccccc#..............ee....eecc#bb......", +".......#ccccccc#............aee...#eec#.........", +"........#ccccccc#...........bed..#beb#..........", +".........#ccccccc#..........beb.#cbeb...........", +"..........#ccccccc#.........beb#ccbeb...........", +"...........#ccccccc#........bebcccbeb...........", +"............#ccccccc#.......eebcc#dea...........", +".............#ccccccc#......eecc#.ee............", +".........ae...#ccccccc#....#eec#..ee............", +"........aeeaeeeebcccccabeeeaee#.beeeeee.........", +".......aeeeea..debcccaed##ceee....ee............", +"......addee.....eeccaedccccbed...beb............", +"......a.bee.....ee#cbeaccccbeb...beb............", +"........beb.....ee.#eecccccbeb...beb............", +"........beb.....ee..eecccccbeb...beb............", +"........beb.....ee..eeccccceeb...dea............", +"........deb....aeb.#eeccccceec#..ee.............", +"........eea....dea#cee##ccceecc#.ee.............", +"........eee...dea#ccbeda#cdeeccc#ee.............", +"........eeaeeeba#ccc#beeeeaeeecceeee............", +"........ee.....#ccc#......#ccccccc#.............", +".......bee....#ccc#........#ccccccc#............", +".......beb...#ccc#..........#ccccccc#...........", +".......beb..#ccc#............#ccccccc#..........", +".......beb.#ccc#..............#ccccccc#.........", +".......deb#ccc#................#ccccccc#........", +".......eeaccc#..................#ccccccc#.......", +".......eeccc#....................#ccccccc#......", +".......eecc#......................#ccccccc#.....", +"......beeb#........................#ccccccc#....", +".....#bbbb..........................#ccccccc#...", +"....#ccc#............................#ccccccc#..", +"...#ccc#..............................#ccccccc#.", +"..#ccc#................................#ccccccc.", +"................................................", +"................................................", +"................................................", +"................................................" +}; |